From nobody Fri Oct 10 13:51:42 2025 Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) (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 C626D1BD035; Sat, 14 Jun 2025 02:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.40.44.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749869207; cv=none; b=lLZWqIiilR3NHcSp7ynsc1Nqugf95fhhS2otcprctqm+Bpnxdd1n17YqBWvt7SWRtvYyttylpj0qFrtnAzDTwOUmZTGT3u0gOjgzp+XSlGYn8WsFz9NFo3Ap1I5SrcNhYKp8h5qm5DYMThQClXbq8BEWQmTEFK2+5H5EQgVV1+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749869207; c=relaxed/simple; bh=lt7DBzVZ0SoABgMFm7JNxTEnMkJMIrhCu2w6wwf7hLI=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=F2nllTAo5LJBsNTAdRyR4IWaJpgAb9oL5uNLWC9/maVey53vSXtl6bnlnOoHAjN8HfaxkUj5NgpanCpwePa0Ln6zIWh8GpZxSu+LxtYtZbzlzH2IKOqffd9JqRQttc+YGv282B58jJcp16wNzB6wskDxgZuPjiAZPUfPDxF8JNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org; spf=pass smtp.mailfrom=goodmis.org; arc=none smtp.client-ip=216.40.44.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=goodmis.org Received: from omf03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8BFA2121AFB; Sat, 14 Jun 2025 02:45:40 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: nevets@goodmis.org) by omf03.hostedemail.com (Postfix) with ESMTPA id 38D276000A; Sat, 14 Jun 2025 02:45:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1uQGvL-00000002SmS-3q0l; Fri, 13 Jun 2025 22:47:15 -0400 Message-ID: <20250614024715.762033414@goodmis.org> User-Agent: quilt/0.68 Date: Fri, 13 Jun 2025 22:46:06 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, x86@kernel.org Cc: Masami Hiramatsu , Mathieu Desnoyers , Josh Poimboeuf , Peter Zijlstra , Ingo Molnar , Jiri Olsa , Namhyung Kim , Thomas Gleixner , Andrii Nakryiko , Indu Bhagat , "Jose E. Marchesi" , Beau Belgrave , Jens Remus , Linus Torvalds , Andrew Morton , Namhyung Kim , Alexei Starovoitov Subject: [PATCH v10 01/11] perf: Remove get_perf_callchain() init_nr argument References: <20250614024605.597728558@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Server: rspamout03 X-Rspamd-Queue-Id: 38D276000A X-Stat-Signature: a5gt49hunicgp3dy4d134i3mhtqo8o98 X-Session-Marker: 6E657665747340676F6F646D69732E6F7267 X-Session-ID: U2FsdGVkX18KhkqmGpccPj9KThDkg1SuvGPu76LLjaI= X-HE-Tag: 1749869137-893533 X-HE-Meta: U2FsdGVkX19CcLHetooGJB31CKUcZCZUmW9SkCFcfeIUcK8qNJ6rVrVkqdaAfwVw7oIMMQuTPmnELywl/4U7gRk5E03roG4HBqbhvdIFQ4g+haZnaoVZY3wyidDFVukG1aJtTy8GKoBcIDr4besGNnTxZUUHLHA0knrhrcVOS7iEPZL+SnlpVek333SvgKp9BtnoVMuqLz7Rgfawb0Krqb8eJKK05TAxYLY9eDCa4GhqqzlXP3BL7fXWYhQwndiDmidjvxCtzHpuR7DAw7VOl+yDb/aWboEA8dQJf/ldSTjC00kOAgDLw3O5BXSZrQGJ8s+KprkcFkG7zT1saRhrFPV9qLwb2hSWxA+ATZLbodDna9JSCa5wy/i/e3/y4mnCPe+3LuZ11Ylwd6Ii5Qo8oWZPQKqn4pvmKzGq5LLOkEc= Content-Transfer-Encoding: quoted-printable 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 52dc7cfab0e0..75a0413172b1 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1681,7 +1681,7 @@ DECLARE_PER_CPU(struct perf_callchain_entry, perf_cal= lchain_entry); extern void perf_callchain_user(struct perf_callchain_entry_ctx *entry, st= ruct 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 us= er, +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, 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, 0, kernel, user, max_depth, + trace =3D get_perf_callchain(regs, kernel, user, max_depth, false, false); =20 if (unlikely(!trace)) @@ -451,7 +451,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, 0, kernel, user, max_depth, + trace =3D get_perf_callchain(regs, kernel, user, max_depth, crosstask, false); =20 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 p= erf_callchain_entry *entr } =20 struct perf_callchain_entry * -get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool us= er, +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; =20 - ctx.entry =3D entry; - ctx.max_stack =3D max_stack; - ctx.nr =3D entry->nr =3D init_nr; - ctx.contexts =3D 0; - ctx.contexts_maxed =3D false; + ctx.entry =3D entry; + ctx.max_stack =3D max_stack; + ctx.nr =3D entry->nr =3D 0; + ctx.contexts =3D 0; + ctx.contexts_maxed =3D false; =20 if (kernel && !user_mode(regs)) { if (add_mark) diff --git a/kernel/events/core.c b/kernel/events/core.c index f34c99f8ce8f..d8688668d21a 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8153,7 +8153,7 @@ perf_callchain(struct perf_event *event, struct pt_re= gs *regs) if (!kernel && !user) return &__empty_callchain; =20 - callchain =3D get_perf_callchain(regs, 0, kernel, user, + callchain =3D get_perf_callchain(regs, kernel, user, max_stack, crosstask, true); return callchain ?: &__empty_callchain; } --=20 2.47.2