From nobody Thu Feb 12 23:17:22 2026 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 8906919596A for ; Thu, 6 Jun 2024 12:11:02 +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=1717675862; cv=none; b=bb0bT7myTeadtnomn457TBskuSVUO78gR5S5labj93WXaO0wT34kerxIYOuXcgzBNhKDjfEvOMptJsVBtWYftAtSCg5ufRgUC9Ul4m9apBbUl12Vttf8C+DKPrLtnqBwXPDIriX3I+XX88+FBHLj4iNBKLDOxrPdEeRbBMDuHEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717675862; c=relaxed/simple; bh=5LVh91AFmjjDLQKZB1oxRIdLI2t5YNNMCvA9sshgB5Y=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Gfnyp9bVqNkxEDUht9m2YLjW2YUCagpBnRC++Hacye1UuEB6yC31d/430ICcF5+36e/T07OArPqci0bpzhuMQtLeJmeyZZ5he+uAZc0K5VWqzZk1Mjf8nB1+z/ibSkOnzP18KHbP0mS6ZaSwwY+opK761iBTZWslLInBySChG7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34F9EC4AF68; Thu, 6 Jun 2024 12:11:02 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1sFBxS-00000000nPK-3Cmr; Thu, 06 Jun 2024 08:11:06 -0400 Message-ID: <20240606121106.626743588@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 06 Jun 2024 08:10:18 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tatsuya S Subject: [for-next][PATCH 14/15] ftrace: Hide one more entry in stack trace when ftrace_pid is enabled References: <20240606121004.857581251@goodmis.org> 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" From: Tatsuya S On setting set_ftrace_pid, a extra entry generated by ftrace_pid_func() is shown on stack trace(CONFIG_UNWINDER_FRAME_POINTER=3Dy). [004] ..... 68.459382: =3D> 0xffffffffa00090af =3D> ksys_read =3D> __x64_sys_read =3D> x64_sys_call =3D> do_syscall_64 =3D> entry_SYSCALL_64_after_hwframe To resolve this issue, increment skip count in function_stack_trace_call() if pids are set. Link: https://lore.kernel.org/linux-trace-kernel/20240528032604.6813-3-tats= uya.s2862@gmail.com Signed-off-by: Tatsuya S [ Rebased to current tree ] Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_functions.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 13bf2415245d..3b0cea37e029 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -231,6 +231,7 @@ function_stack_trace_call(unsigned long ip, unsigned lo= ng parent_ip, long disabled; int cpu; unsigned int trace_ctx; + int skip =3D STACK_SKIP; =20 if (unlikely(!tr->function_enabled)) return; @@ -247,7 +248,11 @@ function_stack_trace_call(unsigned long ip, unsigned l= ong parent_ip, if (likely(disabled =3D=3D 1)) { trace_ctx =3D tracing_gen_ctx_flags(flags); trace_function(tr, ip, parent_ip, trace_ctx); - __trace_stack(tr, trace_ctx, STACK_SKIP); +#ifdef CONFIG_UNWINDER_FRAME_POINTER + if (ftrace_pids_enabled(op)) + skip++; +#endif + __trace_stack(tr, trace_ctx, skip); } =20 atomic_dec(&data->disabled); --=20 2.43.0