From nobody Wed Dec 17 21:26:11 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64B331FAC48; Fri, 6 Dec 2024 10:15:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733480158; cv=none; b=VQVWAzs93tVu86I8IZizbZLHic6X6yaDvWAGO9sNJVUKMuE/Hw6dedCnOVNOX4dZeohsOKoIeVrZa9JslmPrzvMDs0txfoqwBEG86OG0qbGjvStJvQC2EEeG6CXQuyyXaVTldXiS0xRyvUM/2mGRR8QxH1br0sRFUbRBDzJbGYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733480158; c=relaxed/simple; bh=/5fi7mBnkZqA607ruRaZhUBCMMm/7/5pfdXkBQG0nV8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Q4RoQPF8MfrrbityCUaAnUk11vk+LP3a/ZcP8pB+kei0RHKQUQqk0Bama2J4lkr52Ln0oeRhMNie9jDhoaIk0sCkvJJ59zd4yworxdieT+q3dFlVeFGV2I1lKvChImcklNeBjo1rULgwqMP5juTbVJrEOKm5keydEeTs66+UheY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=h5PS//Gj; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=0A2yRD1z; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="h5PS//Gj"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="0A2yRD1z" Date: Fri, 06 Dec 2024 10:15:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1733480154; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CqX6AbWNwsfZ0vBZAAlGT7/3bPDey02v8YpgWR650yo=; b=h5PS//GjM6iMrzubgetC7brjvuQH+RWJIgR8oTQXvUYW/5RmWlKlHT+mUFpSLDSBwV2rc6 k7iB9ZpuVwDtR2lkdZN9SbhwL552PrAvJLXyWdGw/l9YJ4li12BEMWDEsgVKxLRCm3wqk8 0Pn7KbQxCCK4TI7zRIrht+A9/AlOIQO6IGjHavd16V9jjai1touRd5jn3/JnI7MveWWCRJ 4+vSZ7anZvUP0KG02Bwu0svRdGYGDQETBlWgieYVlNrzTrT3g6SJW0X1J5CGMxbGZ8yICq qu2/xdLynZNfZl2A90BNM19afSTEvGcqOnaJ3/QRf86oSflDOWKTHfeChjrtPQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1733480154; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CqX6AbWNwsfZ0vBZAAlGT7/3bPDey02v8YpgWR650yo=; b=0A2yRD1zDlOhBi8y0C2VdYwwK0TXtxYvjCBFZ0LfyUdro3axvi/pqXkcrpK9F8Mljefcld Nn4wFNpaOM22aPBg== From: "tip-bot2 for Namhyung Kim" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/core: Export perf_exclude_event() Cc: Namhyung Kim , Ingo Molnar , Ravi Bangoria , Thomas Richter , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20241203180441.1634709-2-namhyung@kernel.org> References: <20241203180441.1634709-2-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <173348015400.412.4172649301357140657.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: 370514034cc0a38270c1717eda7f598422fd5c4c Gitweb: https://git.kernel.org/tip/370514034cc0a38270c1717eda7f59842= 2fd5c4c Author: Namhyung Kim AuthorDate: Tue, 03 Dec 2024 10:04:40 -08:00 Committer: Ingo Molnar CommitterDate: Fri, 06 Dec 2024 10:32:44 +01:00 perf/core: Export perf_exclude_event() While at it, rename the same function in s390 cpum_sf PMU. Signed-off-by: Namhyung Kim Signed-off-by: Ingo Molnar Tested-by: Ravi Bangoria Reviewed-by: Ravi Bangoria Acked-by: Thomas Richter Link: https://lore.kernel.org/r/20241203180441.1634709-2-namhyung@kernel.org --- arch/s390/kernel/perf_cpum_sf.c | 6 +++--- include/linux/perf_event.h | 6 ++++++ kernel/events/core.c | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_s= f.c index 1e99514..5f60248 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -981,7 +981,7 @@ static void cpumsf_pmu_disable(struct pmu *pmu) cpuhw->flags &=3D ~PMU_F_ENABLED; } =20 -/* perf_exclude_event() - Filter event +/* perf_event_exclude() - Filter event * @event: The perf event * @regs: pt_regs structure * @sde_regs: Sample-data-entry (sde) regs structure @@ -990,7 +990,7 @@ static void cpumsf_pmu_disable(struct pmu *pmu) * * Return non-zero if the event shall be excluded. */ -static int perf_exclude_event(struct perf_event *event, struct pt_regs *re= gs, +static int perf_event_exclude(struct perf_event *event, struct pt_regs *re= gs, struct perf_sf_sde_regs *sde_regs) { if (event->attr.exclude_user && user_mode(regs)) @@ -1073,7 +1073,7 @@ static int perf_push_sample(struct perf_event *event, data.tid_entry.pid =3D basic->hpp & LPP_PID_MASK; =20 overflow =3D 0; - if (perf_exclude_event(event, ®s, sde_regs)) + if (perf_event_exclude(event, ®s, sde_regs)) goto out; if (perf_event_overflow(event, &data, ®s)) { overflow =3D 1; diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index bf831b1..8333f13 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1690,6 +1690,8 @@ static inline int perf_allow_tracepoint(struct perf_e= vent_attr *attr) return security_perf_event_open(attr, PERF_SECURITY_TRACEPOINT); } =20 +extern int perf_exclude_event(struct perf_event *event, struct pt_regs *re= gs); + extern void perf_event_init(void); extern void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size, struct pt_regs *regs, @@ -1895,6 +1897,10 @@ static inline u64 perf_event_pause(struct perf_event= *event, bool reset) { return 0; } +static inline int perf_exclude_event(struct perf_event *event, struct pt_r= egs *regs) +{ + return 0; +} #endif =20 #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL) diff --git a/kernel/events/core.c b/kernel/events/core.c index 4c6f6c2..1089c41 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10081,8 +10081,7 @@ static void perf_swevent_event(struct perf_event *e= vent, u64 nr, perf_swevent_overflow(event, 0, data, regs); } =20 -static int perf_exclude_event(struct perf_event *event, - struct pt_regs *regs) +int perf_exclude_event(struct perf_event *event, struct pt_regs *regs) { if (event->hw.state & PERF_HES_STOPPED) return 1;