[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <174782975929.406.15710486577051819524.tip-bot2@tip-bot2>
Date: Wed, 21 May 2025 12:15:59 -0000
From: "tip-bot2 for Kan Liang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Kan Liang <kan.liang@...ux.intel.com>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Thomas Richter <tmricht@...ux.ibm.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: perf/core] s390/perf: Remove driver-specific throttle support
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 6792f74e8d6cbb062396ce4baabad21836b39ad2
Gitweb: https://git.kernel.org/tip/6792f74e8d6cbb062396ce4baabad21836b39ad2
Author: Kan Liang <kan.liang@...ux.intel.com>
AuthorDate: Tue, 20 May 2025 11:16:35 -07:00
Committer: Peter Zijlstra <peterz@...radead.org>
CommitterDate: Wed, 21 May 2025 13:57:44 +02:00
s390/perf: Remove driver-specific throttle support
The throttle support has been added in the generic code. Remove
the driver-specific throttle support.
Besides the throttle, perf_event_overflow may return true because of
event_limit. It already does an inatomic event disable. The pmu->stop
is not required either.
Signed-off-by: Kan Liang <kan.liang@...ux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Tested-by: Thomas Richter <tmricht@...ux.ibm.com>
Link: https://lore.kernel.org/r/20250520181644.2673067-8-kan.liang@linux.intel.com
---
arch/s390/kernel/perf_cpum_cf.c | 2 --
arch/s390/kernel/perf_cpum_sf.c | 5 +----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index e657fad..6a262e1 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -980,8 +980,6 @@ static int cfdiag_push_sample(struct perf_event *event,
}
overflow = perf_event_overflow(event, &data, ®s);
- if (overflow)
- event->pmu->stop(event, 0);
perf_event_update_userpage(event);
return overflow;
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index ad22799..9146940 100644
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1072,10 +1072,7 @@ static int perf_push_sample(struct perf_event *event,
overflow = 0;
if (perf_event_exclude(event, ®s, sde_regs))
goto out;
- if (perf_event_overflow(event, &data, ®s)) {
- overflow = 1;
- event->pmu->stop(event, 0);
- }
+ overflow = perf_event_overflow(event, &data, ®s);
perf_event_update_userpage(event);
out:
return overflow;
Powered by blists - more mailing lists