From nobody Mon Feb 9 04:29:37 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 450D21DD0EF for ; Sat, 24 Jan 2026 16:47:04 +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=1769273224; cv=none; b=Se9fDveMNum0U7v0U45y2iIdI7xe7fTs3Ue4NcNvqrGaAsHjMKsNlU+QrgSe5A87pzb45E9GBotefBDKKucyuTVrxzVasntLPt+JEyiX3YKlkH8z7QkYbvcKlJpOpaUOimtQ8e2G3KxPpzyAkY+04jgwB/XfEvEAzBNRJXlVB9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769273224; c=relaxed/simple; bh=b3Id3PPIN4zo1LkXARAADpXfvNcm56DyHgcf0+VWAy8=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Nzxmq2ICUYTv+ZAb/Ih05Rj8VPX6zaCWXN+ORwaGn/b2tyRzk1LnAeHRJyb3YcvYtG71W4I+dRwUVYhlg1jRuEheP0YT66cOPJm/KPKJIeONrc7Vk9A95rhXnERpnqtddA9cDf69rB3owHWa/pC2SJz+ZqYhOSgAKMbWMiVnG4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ql1VggrZ; 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="ql1VggrZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09138C19423; Sat, 24 Jan 2026 16:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769273224; bh=b3Id3PPIN4zo1LkXARAADpXfvNcm56DyHgcf0+VWAy8=; h=Date:From:To:Cc:Subject:References:From; b=ql1VggrZFh2zAWEEZN0qkxGuHIg07Ahd+QB/Pmh7Sa2GLeXJR6gwS0xGIiYzfD1pT sODM5fo/VMHN9UsIeik04KG/ow+NxGY/eIWtumiIkMbwDjCBksIFPW9qoMn1/ydnbp a2jU6kX2mDT8Qf7/VmGLsU1AzQIZjN93kgm1MeKsg5bdeRsDWthIe4qHqLG4hHU2VC unqFzT44DHIgrbQetDKwnoTn8hCRaLnFTO7dEBfycjwUrsMP9LGBrKA2v8DbBlZ7WN aR705n6o0jfiEjB/gzk4ljINE4T7toOJWPCuK88fnWS4miNaQqNnsdYkVvZItx8par G2aeFa0nkJDqw== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vjgnP-00000003Cns-0Rzc; Sat, 24 Jan 2026 11:47:35 -0500 Message-ID: <20260124164734.989597992@kernel.org> User-Agent: quilt/0.68 Date: Sat, 24 Jan 2026 11:29:46 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Donglin Peng Subject: [for-linus][PATCH 3/4] function_graph: Fix args pointer mismatch in print_graph_retval() References: <20260124162943.928691049@kernel.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: Donglin Peng When funcgraph-args and funcgraph-retaddr are both enabled, many kernel functions display invalid parameters in trace logs. The issue occurs because print_graph_retval() passes a mismatched args pointer to print_function_args(). Fix this by retrieving the correct args pointer using the FGRAPH_ENTRY_ARGS() macro. Link: https://patch.msgid.link/20260112021601.1300479-1-dolinux.peng@gmail.= com Fixes: f83ac7544fbf ("function_graph: Enable funcgraph-args and funcgraph-r= etaddr to work simultaneously") Acked-by: Masami Hiramatsu (Google) Signed-off-by: Donglin Peng Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_functions_graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_func= tions_graph.c index b1e9c9913309..1de6f1573621 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -901,7 +901,7 @@ static void print_graph_retval(struct trace_seq *s, str= uct ftrace_graph_ent_entr trace_seq_printf(s, "%ps", func); =20 if (args_size >=3D FTRACE_REGS_MAX_ARGS * sizeof(long)) { - print_function_args(s, entry->args, (unsigned long)func); + print_function_args(s, FGRAPH_ENTRY_ARGS(entry), (unsigned long)func); trace_seq_putc(s, ';'); } else trace_seq_puts(s, "();"); --=20 2.51.0