From nobody Sun Sep 14 20:12:49 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C29D6C32793 for ; Wed, 18 Jan 2023 12:16:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230323AbjARMQm (ORCPT ); Wed, 18 Jan 2023 07:16:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbjARMQG (ORCPT ); Wed, 18 Jan 2023 07:16:06 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD69E875BB; Wed, 18 Jan 2023 03:37:53 -0800 (PST) Date: Wed, 18 Jan 2023 11:37:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1674041871; 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=zVrowPVlkqAmIujgyVf+EEgLijVC+lYFOBUR5Zwa8wE=; b=LaAR433FVGITqKJYmekkmjNcvfI1S71MLXcc0nSYe0NW8cqHld8YGIkiG607o00+p6eEL8 FbBFc3mUqwy98e5YmUZUbKzYh73QBLr+TpGlRd+8mfWYWUOtbobnvxcFfSKXiKiUtxMk9+ OZ0cGKIUp1KxZEZQmqnN/TaSAeVZo7VTUpNmO51eC998Pn9oLsiQfNs8QJUYXXpDjX5uAU CioCQZw4+cd7rBlmAK0CF+9qJSEK2m56UKmXzjs2prnqgrggqPRXROAO4LfjzJ1ZvtgS7+ bscJC5coz/JPO+lefgf3HPUH1UIjiE52/DTt0vGuHCChX2Z9ciqdQUJqeMVskw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1674041871; 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=zVrowPVlkqAmIujgyVf+EEgLijVC+lYFOBUR5Zwa8wE=; b=SaVgS1kwa/S5KKkZJ9k8sNxMjkq1dfcRrEV4CQ8I7l2B2pITrGVv1lmEzF25Es3BfIDe4/ zZZPwhKSh8XAbVCA== 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: Call perf_prepare_sample() before running BPF Cc: Namhyung Kim , Ingo Molnar , Jiri Olsa , Song Liu , Peter Zijlstra , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230118060559.615653-9-namhyung@kernel.org> References: <20230118060559.615653-9-namhyung@kernel.org> MIME-Version: 1.0 Message-ID: <167404187070.4906.11315546110666794035.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 0eed28220598cd990d094b7b9f8c832c425080c0 Gitweb: https://git.kernel.org/tip/0eed28220598cd990d094b7b9f8c832c4= 25080c0 Author: Namhyung Kim AuthorDate: Tue, 17 Jan 2023 22:05:59 -08:00 Committer: Ingo Molnar CommitterDate: Wed, 18 Jan 2023 11:57:21 +01:00 perf/core: Call perf_prepare_sample() before running BPF As BPF can access sample data, it needs to populate the data. Also remove the logic to get the callchain specifically as it's covered by the perf_prepare_sample() now. Signed-off-by: Namhyung Kim Signed-off-by: Ingo Molnar Tested-by: Jiri Olsa Acked-by: Jiri Olsa Acked-by: Song Liu Acked-by: Peter Zijlstra Link: https://lore.kernel.org/r/20230118060559.615653-9-namhyung@kernel.org --- kernel/events/core.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 4aa73ed..380476a 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10356,13 +10356,7 @@ static void bpf_overflow_handler(struct perf_event= *event, rcu_read_lock(); prog =3D READ_ONCE(event->prog); if (prog) { - if (prog->call_get_stack && - (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN) && - !(data->sample_flags & PERF_SAMPLE_CALLCHAIN)) { - data->callchain =3D perf_callchain(event, regs); - data->sample_flags |=3D PERF_SAMPLE_CALLCHAIN; - } - + perf_prepare_sample(data, event, regs); ret =3D bpf_prog_run(prog, &ctx); } rcu_read_unlock();