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 827103596EF; Wed, 3 Dec 2025 16:45:03 +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=1764780303; cv=none; b=rs3yimzL22Wjr279TycrMtOnXyxN7K/0P2ioVxCUHCHJyrnpTjU155lEMWkAySzrNH3xiQA8/Pzd1ftqNYUlkJ16Dx8aqDPctXawRiCYEMXoXP3Yad5id28OQFqpjwIzWJjVzvG6jlR7hBi7rO0z3yBF/S4pi+O6w7MxDtF20wk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764780303; c=relaxed/simple; bh=ia/9yqmAZaV7S4srLvSQo36lf0bhKvcnq4eoHegp6VY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RMmthHH+cPv3LrlOHQQfaUWgiJet0S/ldBLPdIilY+3CdD/FsDSv7MPjrO/N+rb3+tkfIB3XIuDCu4Ad0ZJSQg2OLN6GGDvXItpOPE2HfX8Ik8q7r7wg0QG/KlO940uXio+bkzL0h/c+r7Lc2tla3nG95dCVXl6WLa38puA6mpo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=f20ztH03; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="f20ztH03" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D07B9C4CEF5; Wed, 3 Dec 2025 16:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764780303; bh=ia/9yqmAZaV7S4srLvSQo36lf0bhKvcnq4eoHegp6VY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f20ztH03xTx1h2FGzaSnTS9SdxE3/bBvHqvZKn7orQrzYp47vwiRWs5QsHTIKxTgC G7nZWKukz8SM2qq+gAvTgF5qSE8N+uq5f9IM+AuHZvJd82SUT4i/44GzM1T2keAKww Z/6KHh5rUSekB8wkBu+vXkipaQNMW85gZfLKT0Uc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Song Liu , Jiri Olsa , Alexei Starovoitov , "Steven Rostedt (Google)" Subject: [PATCH 6.1 516/568] Revert "perf/x86: Always store regs->ip in perf_callchain_kernel()" Date: Wed, 3 Dec 2025 16:28:38 +0100 Message-ID: <20251203152459.614315710@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiri Olsa commit 6d08340d1e354787d6c65a8c3cdd4d41ffb8a5ed upstream. This reverts commit 83f44ae0f8afcc9da659799db8693f74847e66b3. Currently we store initial stacktrace entry twice for non-HW ot_regs, which means callers that fail perf_hw_regs(regs) condition in perf_callchain_kernel. It's easy to reproduce this bpftrace: # bpftrace -e 'tracepoint:sched:sched_process_exec { print(kstack()); }' Attaching 1 probe... bprm_execve+1767 bprm_execve+1767 do_execveat_common.isra.0+425 __x64_sys_execve+56 do_syscall_64+133 entry_SYSCALL_64_after_hwframe+118 When perf_callchain_kernel calls unwind_start with first_frame, AFAICS we do not skip regs->ip, but it's added as part of the unwind process. Hence reverting the extra perf_callchain_store for non-hw regs leg. I was not able to bisect this, so I'm not really sure why this was needed in v5.2 and why it's not working anymore, but I could see double entries as far as v5.10. I did the test for both ORC and framepointer unwind with and without the this fix and except for the initial entry the stacktraces are the same. Acked-by: Song Liu Signed-off-by: Jiri Olsa Link: https://lore.kernel.org/r/20251104215405.168643-2-jolsa@kernel.org Signed-off-by: Alexei Starovoitov Acked-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- arch/x86/events/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2794,13 +2794,13 @@ perf_callchain_kernel(struct perf_callch return; } - if (perf_callchain_store(entry, regs->ip)) - return; - - if (perf_hw_regs(regs)) + if (perf_hw_regs(regs)) { + if (perf_callchain_store(entry, regs->ip)) + return; unwind_start(&state, current, regs, NULL); - else + } else { unwind_start(&state, current, NULL, (void *)regs->sp); + } for (; !unwind_done(&state); unwind_next_frame(&state)) { addr = unwind_get_return_address(&state);