From mboxrd@z Thu Jan 1 00:00:00 1970 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 DCB2825A347; Wed, 20 Aug 2025 18:04:25 +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=1755713066; cv=none; b=kAhx5IlS3IqrqKAD45GocktkVg3fXNyN3xYIrSWzjAm1l4BWMm+7A3vU9YNEXAzbyT4ZMWYJOTOXOlJkvxptHD/thQPicz6qcHxFS9RZMQ/fmXhDWfhjAXjdj9aUvN9z4v6GyFmTMOKQ/EpMt3gbmPsMJfz0DK39+aZwpE80ttY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755713066; c=relaxed/simple; bh=afU/A3StCx9YLGmfDh35NaMhlfdeBazTCAoTQ4T0M/w=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=g14qGDLa1A+hmcfkA4ABk/A48ltI1AbOJbNOqce+f86ZdtfejDoH0YA4ohUxCXZmHXQUSxAQIMxvMdN8RyXd3ngf4PQZz8duJ200n4AsQc4fLmRlPx4RfUWhZt2b7EVyvRAZV5gdTT68EvFiheT8JCTe2djVtYAPXXgdJvfZ7as= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tRqC8vig; 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="tRqC8vig" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 838E4C4CEE7; Wed, 20 Aug 2025 18:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755713065; bh=afU/A3StCx9YLGmfDh35NaMhlfdeBazTCAoTQ4T0M/w=; h=Date:From:To:Cc:Subject:References:From; b=tRqC8vig5sCZZufsOzEnJfB0XTDyy5Lc7IsQLCuOKecptdLxQBL1PQrImuvuvUPW6 SXoLkD/lM+4vLqESWqm7FLBOqlocq8LWiQrfLRQB1z5doPEonA6HLkQFDEeOYmt4rf /c81aPdAHx1eLIvOngWy2nLt3IlN3vAhX9QZYQBOX9oSPWSutRfgXuTcdQVZEq1G54 4M1lDGxVsufRSWb1i4Prob77dymt6s5Iz1mniEes+o0tesdl70sKn9PsBYxhdo5alb BseetJhCaM8bz+JbKmVt+6DTiuf5kM9hnyHDVzD/yx4kjfIcGLI8SbpCI9tF434WZH flE6Mfv81CFeQ== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1uonAi-00000000rtG-1i0V; Wed, 20 Aug 2025 14:04:28 -0400 Message-ID: <20250820180428.259565081@kernel.org> User-Agent: quilt/0.68 Date: Wed, 20 Aug 2025 14:03:39 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Thomas Gleixner , Namhyung Kim , Alexei Starovoitov , Josh Poimboeuf Subject: [RESEND][PATCH 1/5] perf: Remove get_perf_callchain() init_nr argument References: <20250820180338.701352023@kernel.org> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Josh Poimboeuf The 'init_nr' argument has double duty: it's used to initialize both the number of contexts and the number of stack entries. That's confusing and the callers always pass zero anyway. Hard code the zero. Acked-by: Namhyung Kim Acked-by: Alexei Starovoitov Signed-off-by: Josh Poimboeuf Signed-off-by: Steven Rostedt (Google) --- include/linux/perf_event.h | 2 +- kernel/bpf/stackmap.c | 4 ++-- kernel/events/callchain.c | 12 ++++++------ kernel/events/core.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index bfbf9ea53f25..fd1d91017b99 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1719,7 +1719,7 @@ DECLARE_PER_CPU(struct perf_callchain_entry, perf_callchain_entry); extern void perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs); 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, u32 init_nr, bool kernel, bool user, +get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, u32 max_stack, bool crosstask, bool add_mark); extern int get_callchain_buffers(int max_stack); extern void put_callchain_buffers(void); diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index 3615c06b7dfa..ec3a57a5fba1 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -314,7 +314,7 @@ BPF_CALL_3(bpf_get_stackid, struct pt_regs *, regs, struct bpf_map *, map, if (max_depth > sysctl_perf_event_max_stack) max_depth = sysctl_perf_event_max_stack; - trace = get_perf_callchain(regs, 0, kernel, user, max_depth, + trace = get_perf_callchain(regs, kernel, user, max_depth, false, false); if (unlikely(!trace)) @@ -451,7 +451,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task, else if (kernel && task) trace = get_callchain_entry_for_task(task, max_depth); else - trace = get_perf_callchain(regs, 0, kernel, user, max_depth, + trace = get_perf_callchain(regs, kernel, user, max_depth, crosstask, false); if (unlikely(!trace) || trace->nr < skip) { diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 6c83ad674d01..b0f5bd228cd8 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -217,7 +217,7 @@ static void fixup_uretprobe_trampoline_entries(struct perf_callchain_entry *entr } struct perf_callchain_entry * -get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user, +get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, u32 max_stack, bool crosstask, bool add_mark) { struct perf_callchain_entry *entry; @@ -228,11 +228,11 @@ get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user, if (!entry) return NULL; - ctx.entry = entry; - ctx.max_stack = max_stack; - ctx.nr = entry->nr = init_nr; - ctx.contexts = 0; - ctx.contexts_maxed = false; + ctx.entry = entry; + ctx.max_stack = max_stack; + ctx.nr = entry->nr = 0; + ctx.contexts = 0; + ctx.contexts_maxed = false; if (kernel && !user_mode(regs)) { if (add_mark) diff --git a/kernel/events/core.c b/kernel/events/core.c index ea357044d780..bade8e0fced7 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8210,7 +8210,7 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs) if (!kernel && !user) return &__empty_callchain; - callchain = get_perf_callchain(regs, 0, kernel, user, + callchain = get_perf_callchain(regs, kernel, user, max_stack, crosstask, true); return callchain ?: &__empty_callchain; } -- 2.50.1