From nobody Fri Dec 19 14:59:06 2025 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 975E8345759 for ; Thu, 18 Dec 2025 13:53:39 +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=1766066019; cv=none; b=F9htilJG70V1ByeT5xgBtTdTnre9fUfwP7yzHVENKniRXisiORzaLRxSVYz5lEPCI12MryImzSKC2xMbEameC/N0Kj7qf+PRQEStLPnDiikv/6JI7Jqbob+Y/4WWLD4umwnU93+P0ldVFKTSPudOtqtG5NyurJKUfQOc+yMKyEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766066019; c=relaxed/simple; bh=ylhqKoiUaDkPnTcLjV0YRuukXyvMNsmSlzBF7G+fXdo=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=rKj06W4wQkyzFS4BX+nGVIVqZ7fo1Xzu/CUvOPC3GGwyk7mCP5k647qlBEmvp9KovGMNp7snR6rboQOF4rFXpeu10k8eYR7lQtni6nY9a3Vhpz2KaxZwXHij6onGTWgmzTXumFRJ1jy8k0jEPnEZK3rgbVEgMFPKmqoXhzl8Rqo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HL/4rgH4; 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="HL/4rgH4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22D4EC19421; Thu, 18 Dec 2025 13:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766066019; bh=ylhqKoiUaDkPnTcLjV0YRuukXyvMNsmSlzBF7G+fXdo=; h=Date:From:To:Cc:Subject:References:From; b=HL/4rgH40Zi8Sid1QaEztvWDrcmil6eTHtnhX4g7QsKDBgelhatrw56GP+3I5eqY6 4fIcELBdB3qHMz7R2tTPNIAt1J44tr1btvSfk0VXEZd8rd/99s2Ntl8szsXVXlskpG 8a0/Aqg4fQvmDH/vimeZMCCKpB5P1hohAHlCCU62nSh3fDigHcZwi93mIpu2voemRv MxByrgfAZ5RXLku2V5USx1sWaFsZccW6/Wg0KqkZgzhZqtRIRd1L3RVLHWMMY2pFXl 22ZWAC8JADxPMBMBp/xHfFG+S9cpm53EkZZhyYWLmqZOJ5kL28A8QDzguyZSm0RXvi vbiZ0ZRXH7H+A== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vWETN-0000000Auyc-2mt0; Thu, 18 Dec 2025 08:55:17 -0500 Message-ID: <20251218135517.514623104@kernel.org> User-Agent: quilt/0.68 Date: Thu, 18 Dec 2025 08:55:08 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Menglong Dong Subject: [for-linus][PATCH 4/4] ftrace: Fix address for jmp mode in t_show() References: <20251218135504.301981830@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: Menglong Dong The address from ftrace_find_rec_direct() is printed directly in t_show(). This can mislead symbol offsets if it has the "jmp" bit in the last bit. Fix this by printing the address that returned by ftrace_jmp_get(). Link: https://patch.msgid.link/20251217030053.80343-1-dongml2@chinatelecom.= cn Fixes: 25e4e3565d45 ("ftrace: Introduce FTRACE_OPS_FL_JMP") Signed-off-by: Menglong Dong Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 3ec2033c0774..ef2d5dca6f70 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4518,8 +4518,11 @@ static int t_show(struct seq_file *m, void *v) unsigned long direct; =20 direct =3D ftrace_find_rec_direct(rec->ip); - if (direct) - seq_printf(m, "\n\tdirect-->%pS", (void *)direct); + if (direct) { + seq_printf(m, "\n\tdirect%s-->%pS", + ftrace_is_jmp(direct) ? "(jmp)" : "", + (void *)ftrace_jmp_get(direct)); + } } } =20 --=20 2.51.0