From nobody Mon Nov 25 09:58:25 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 63C6B201269; Mon, 28 Oct 2024 21:48:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730152103; cv=none; b=o+QlGH+qcAY5GI9cFT+IbhOixPN2SgM4OwJrP6NPR+v+gTHzMJOkRVdNgsl0zA1ytzb5fPl8iPt3e0cRooKKs271LxDDMXrYwzXc16gQBejbFra7OFNS9OFhhuZ5HPI7CKuGWDMcub6qVAe/HGMH1KGjYEcR+nKuz/hT72VWQ1E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730152103; c=relaxed/simple; bh=Kt5MpGbZ70VVAEdbCmfBd2vF0ClYcpLyRPJ/jXeS8c4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ksCH0douKyjA5x2wceOyOA8ci3XSxGPLBYpuQC792lJnLFOtRltM5l/8s7ePGZnRVo/MfvuKL8pdS2nldq61l2zgs65asffBSvSseaHVc8NUmitGV57EgT3cguQTEEAphDt3uUjXULRdOJiEL/gaqZUO/w0VYb0sts6AP/qwgug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RaTz2P6n; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RaTz2P6n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E857C4CEE9; Mon, 28 Oct 2024 21:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730152102; bh=Kt5MpGbZ70VVAEdbCmfBd2vF0ClYcpLyRPJ/jXeS8c4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RaTz2P6nJCej4XpXPNWOEklykI/2pXMRZHFDUcKvLTCeHIfsbBHgbNljW44Ya8rXA hJaoL/dz/s9xNNLm7SX1OUkhsEBDIHQdgp16soCZfES3Ro5pUuQySKqqK2OpYXBG4E dwom9jF6FKffFKVf7lch59EVfHaXEqKDA8/sQNYjYbUVCz9fOZxxAl40Ef6OeMfmdn D0ZS4N7HGgaqGO/EFzd6cvnWXwO7nRgiHP8eodZyB8QJfKFZJruQsuc8EIFs3OQcs1 1i/gwH+l3HU196/D51YBA4E5XG6Bp2ZTl98YmzfSBiZNCZFNyODaKJUmwriDZSjQqs +AquqsbqscKHQ== From: Josh Poimboeuf To: x86@kernel.org Cc: Peter Zijlstra , Steven Rostedt , Ingo Molnar , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org, Indu Bhagat , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, Mark Brown , linux-toolchains@vger.kernel.org, Jordan Rome , Sam James , linux-trace-kernel@vger.kerne.org, Andrii Nakryiko , Jens Remus , Mathieu Desnoyers , Florian Weimer , Andy Lutomirski Subject: [PATCH v3 13/19] perf: Remove get_perf_callchain() 'crosstask' argument Date: Mon, 28 Oct 2024 14:47:40 -0700 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" get_perf_callchain() doesn't support cross-task unwinding, so it doesn't make much sense to have 'crosstask' as an argument. Acked-by: Namhyung Kim Signed-off-by: Josh Poimboeuf --- include/linux/perf_event.h | 2 +- kernel/bpf/stackmap.c | 12 ++++-------- kernel/events/callchain.c | 6 +----- kernel/events/core.c | 9 +++++---- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 1e956ff9acd3..788f6971d32d 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1569,7 +1569,7 @@ extern void perf_callchain_user(struct perf_callchain= _entry_ctx *entry, struct p extern void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, = struct pt_regs *regs); extern struct perf_callchain_entry * get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, - u32 max_stack, bool crosstask, bool add_mark); + u32 max_stack, bool add_mark); extern int get_callchain_buffers(int max_stack); extern void put_callchain_buffers(void); extern struct perf_callchain_entry *get_callchain_entry(int *rctx); diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index ec3a57a5fba1..ee9701337912 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -314,8 +314,7 @@ BPF_CALL_3(bpf_get_stackid, struct pt_regs *, regs, str= uct bpf_map *, map, if (max_depth > sysctl_perf_event_max_stack) max_depth =3D sysctl_perf_event_max_stack; =20 - trace =3D get_perf_callchain(regs, kernel, user, max_depth, - false, false); + trace =3D get_perf_callchain(regs, kernel, user, max_depth, false); =20 if (unlikely(!trace)) /* couldn't fetch the stack trace */ @@ -430,10 +429,8 @@ static long __bpf_get_stack(struct pt_regs *regs, stru= ct task_struct *task, if (task && user && !user_mode(regs)) goto err_fault; =20 - /* get_perf_callchain does not support crosstask user stack walking - * but returns an empty stack instead of NULL. - */ - if (crosstask && user) { + /* get_perf_callchain() does not support crosstask stack walking */ + if (crosstask) { err =3D -EOPNOTSUPP; goto clear; } @@ -451,8 +448,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struc= t task_struct *task, else if (kernel && task) trace =3D get_callchain_entry_for_task(task, max_depth); else - trace =3D get_perf_callchain(regs, kernel, user, max_depth, - crosstask, false); + trace =3D get_perf_callchain(regs, kernel, user, max_depth,false); =20 if (unlikely(!trace) || trace->nr < skip) { if (may_fault) diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 83834203e144..655fb25a725b 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -217,7 +217,7 @@ static void fixup_uretprobe_trampoline_entries(struct p= erf_callchain_entry *entr =20 struct perf_callchain_entry * get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, - u32 max_stack, bool crosstask, bool add_mark) + u32 max_stack, bool add_mark) { struct perf_callchain_entry *entry; struct perf_callchain_entry_ctx ctx; @@ -248,9 +248,6 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, b= ool user, } =20 if (regs) { - if (crosstask) - goto exit_put; - if (add_mark) perf_callchain_store_context(&ctx, PERF_CONTEXT_USER); =20 @@ -260,7 +257,6 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, b= ool user, } } =20 -exit_put: put_callchain_entry(rctx); =20 return entry; diff --git a/kernel/events/core.c b/kernel/events/core.c index 1654d6e7c148..ebf143aa427b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7792,16 +7792,17 @@ perf_callchain(struct perf_event *event, struct pt_= regs *regs) { bool kernel =3D !event->attr.exclude_callchain_kernel; bool user =3D !event->attr.exclude_callchain_user; - /* Disallow cross-task user callchains. */ - bool crosstask =3D event->ctx->task && event->ctx->task !=3D current; const u32 max_stack =3D event->attr.sample_max_stack; struct perf_callchain_entry *callchain; =20 if (!kernel && !user) return &__empty_callchain; =20 - callchain =3D get_perf_callchain(regs, kernel, user, - max_stack, crosstask, true); + /* Disallow cross-task callchains. */ + if (event->ctx->task && event->ctx->task !=3D current) + return &__empty_callchain; + + callchain =3D get_perf_callchain(regs, kernel, user, max_stack, true); return callchain ?: &__empty_callchain; } =20 --=20 2.47.0