From nobody Fri Dec 19 13:23:10 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 EDB2E3451D4 for ; Thu, 18 Dec 2025 13:53:38 +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=N1hymenBAgWj2sVCQ7ojAzEesrHMLJnLl4+zFwxfCp3c7n9RgL4EF5pNO3AWlRMrQJRxcuWD8TS2vcR13PoQG1wCnu7Melceb1mYKiP2jnf3pG7aK7HCQusihBLpMeETa8TEGAvwAV8i7JVWNiC6NTvds4vd3xJZTs2W1LxUWXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766066019; c=relaxed/simple; bh=pzK9pkmMBYXf7AUse0gpN+KoZLBJRA+g8aJtYiirils=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=H6VW7P9fXYaxGmCiZMYQUQrpdIZNjx4X1NSiQeJeJV9pyvuxWhZWTX8WYXB/sZrJY8sF8x8tE/qra6gcD2bnHMnXWpSJbFA2GQceSp2Ej6oIriY3Aub+7xqq9oXoQdi8h9mh0X1qUf1SuLZMGlt6gWdc/krHaXSgBG8K11MIJ3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F0ReBUGe; 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="F0ReBUGe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95A72C116B1; Thu, 18 Dec 2025 13:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766066018; bh=pzK9pkmMBYXf7AUse0gpN+KoZLBJRA+g8aJtYiirils=; h=Date:From:To:Cc:Subject:References:From; b=F0ReBUGeeUZ7s0K+sRJiQh1MxrLbqMt8MjghRgX7LSi8d2FE1mbTub1VqRODOwhnM G5Ee9Co3RrkJpOyHF0P4ghRd2WK67cZRi9CHpmg5T4GOqr3IpHxJ0YsEwwOSSsF2hc 0yQnjTDlILvajY7ceJ2lnXca5OkYRwySvFTB+Q/tLJz56WvMVVK+Q8FeAmp1POe6Ho eU8Jzj0h8xdbV2bferPtpfq9MhKDEBPav4CZhBZglFBKnL7pPbw1e7NyFqHHmutPEm G4F/vyjJR7p2UTYYe4ZbW0ACc1Jz7GGqSTvQM9N2vKJgr63eR9L1FMP7OhJvxzmxex k/F2Tg4JPwlRw== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vWETN-0000000Aux7-0gIM; Thu, 18 Dec 2025 08:55:17 -0500 Message-ID: <20251218135517.018776152@kernel.org> User-Agent: quilt/0.68 Date: Thu, 18 Dec 2025 08:55:05 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Lukas Bulwahn Subject: [for-linus][PATCH 1/4] MAINTAINERS: add tracepoint core-api doc files to TRACING 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: Lukas Bulwahn The files in Documentation/core-api/ are by virtue of their top-level directory part of the Documentation section in MAINTAINERS. Each file in Documentation/core-api/ should however also have a further section in MAINTAINERS it belongs to, which fits to the technical area of the documented API in that file. The tracepoint.rst provides some explanation to tracepoints defined in selected files under include/trace/events/, which itself is part of the TRACING section. So, add this core-api document to TRACING. Cc: Mathieu Desnoyers Link: https://patch.msgid.link/20251105092428.153378-1-lukas.bulwahn@redhat= .com Signed-off-by: Lukas Bulwahn Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5b11839cba9d..8e90454bb817 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -26464,6 +26464,7 @@ L: linux-trace-kernel@vger.kernel.org S: Maintained Q: https://patchwork.kernel.org/project/linux-trace-kernel/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +F: Documentation/core-api/tracepoint.rst F: Documentation/trace/* F: fs/tracefs/ F: include/linux/trace*.h --=20 2.51.0 From nobody Fri Dec 19 13:23:10 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 EDC8B3451DB; Thu, 18 Dec 2025 13:53:38 +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=ApC0WZWw3x2TRXwKF9JdQ2FmYo0PeXLXKS6i5WV5fFc4G4mQrPxxaG8UaGWvlU1AH7X1UsTlv5WTc2GGEj6nJjq1VwjIR54eg0qqp7Iu2KHbfC8p4qImF6+yo8iQd0knesAjPQHBcnLolYKeFwiDicq8a+0/K+TbpjqLgN38i3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766066019; c=relaxed/simple; bh=/eiW+1iP3cjjvkC7U5SzOqVLF6O6+71Wi1CUP+IL8dk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=dYmOEX3xFgGtJhYZGfWz9kZeXtlBQdM1HnYH/LaHxMnw2AqGYQ8oCITm/kWmnADm3wv4/HhEvTYf4J6Uu0ZJHZ2PJQ8mvCjVeKAB344KGAy/V1GVNpd3Ug7ZusYgLkYwhN+zj5SeKIn6bvHYq3pk2DLCLK1fWAi9ysEhNioKrYE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Wd8tgZkt; 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="Wd8tgZkt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3FD0C19421; Thu, 18 Dec 2025 13:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766066018; bh=/eiW+1iP3cjjvkC7U5SzOqVLF6O6+71Wi1CUP+IL8dk=; h=Date:From:To:Cc:Subject:References:From; b=Wd8tgZkt+d5N2E8oBx9cmrl9rXEhHmI7X+uRvix98E5iuTg51QHeek/indsMI5fH+ C3QtCp0TXfSPTalKZzlvZppuWRhcJsQ4/i8eeJgP0nPXfaLzApCFmL9HcZ7wPbGF8J kcPmPvlg0EafLMPSaPtjMyi6qY9cV3A1aBeSENlpNwi5Ic32jeGsR/6xQTmrm8CWhJ UZia/rBcMAcZA7gEC7q6bEsAQROhGDi8H9rmoiri4GZd6ySFHLFjTT8t2T2+FRpfmb jRm7HjZJ6jjxuIFM+PwmyCnB6YAkfiqc6kOsTaksP/WMdwmh6x9A2vM2kRyxFdvw0O 6d/9jtLyapoXA== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vWETN-0000000Auxd-1NKk; Thu, 18 Dec 2025 08:55:17 -0500 Message-ID: <20251218135517.182085932@kernel.org> User-Agent: quilt/0.68 Date: Thu, 18 Dec 2025 08:55:06 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org, Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers Subject: [for-linus][PATCH 2/4] tracing: Do not register unsupported perf events 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: Steven Rostedt Synthetic events currently do not have a function to register perf events. This leads to calling the tracepoint register functions with a NULL function pointer which triggers: ------------[ cut here ]------------ WARNING: kernel/tracepoint.c:175 at tracepoint_add_func+0x357/0x370, CPU#2= : perf/2272 Modules linked in: kvm_intel kvm irqbypass CPU: 2 UID: 0 PID: 2272 Comm: perf Not tainted 6.18.0-ftest-11964-ge022764= 176fc-dirty #323 PREEMPTLAZY Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.17.0-debian-1.1= 7.0-1 04/01/2014 RIP: 0010:tracepoint_add_func+0x357/0x370 Code: 28 9c e8 4c 0b f5 ff eb 0f 4c 89 f7 48 c7 c6 80 4d 28 9c e8 ab 89 f4= ff 31 c0 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc cc <0f> 0b 49 c7 c6 = ea ff ff ff e9 ee fe ff ff 0f 0b e9 f9 fe ff ff 0f RSP: 0018:ffffabc0c44d3c40 EFLAGS: 00010246 RAX: 0000000000000001 RBX: ffff9380aa9e4060 RCX: 0000000000000000 RDX: 000000000000000a RSI: ffffffff9e1d4a98 RDI: ffff937fcf5fd6c8 RBP: 0000000000000001 R08: 0000000000000007 R09: ffff937fcf5fc780 R10: 0000000000000003 R11: ffffffff9c193910 R12: 000000000000000a R13: ffffffff9e1e5888 R14: 0000000000000000 R15: ffffabc0c44d3c78 FS: 00007f6202f5f340(0000) GS:ffff93819f00f000(0000) knlGS:00000000000000= 00 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055d3162281a8 CR3: 0000000106a56003 CR4: 0000000000172ef0 Call Trace: tracepoint_probe_register+0x5d/0x90 synth_event_reg+0x3c/0x60 perf_trace_event_init+0x204/0x340 perf_trace_init+0x85/0xd0 perf_tp_event_init+0x2e/0x50 perf_try_init_event+0x6f/0x230 ? perf_event_alloc+0x4bb/0xdc0 perf_event_alloc+0x65a/0xdc0 __se_sys_perf_event_open+0x290/0x9f0 do_syscall_64+0x93/0x7b0 ? entry_SYSCALL_64_after_hwframe+0x76/0x7e ? trace_hardirqs_off+0x53/0xc0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Instead, have the code return -ENODEV, which doesn't warn and has perf error out with: # perf record -e synthetic:futex_wait Error: The sys_perf_event_open() syscall returned with 19 (No such device) for eve= nt (synthetic:futex_wait). "dmesg | grep -i perf" may provide additional information. Ideally perf should support synthetic events, but for now just fix the warning. The support can come later. Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Namhyung Kim Link: https://patch.msgid.link/20251216182440.147e4453@gandalf.local.home Fixes: 4b147936fa509 ("tracing: Add support for 'synthetic' events") Reported-by: Ian Rogers Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index b16a5a158040..76067529db61 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -700,6 +700,8 @@ int trace_event_reg(struct trace_event_call *call, =20 #ifdef CONFIG_PERF_EVENTS case TRACE_REG_PERF_REGISTER: + if (!call->class->perf_probe) + return -ENODEV; return tracepoint_probe_register(call->tp, call->class->perf_probe, call); --=20 2.51.0 From nobody Fri Dec 19 13:23:10 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 2477B3451DF 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=F2sJPVPsZkdUw090Tjg/gSK6nlPAiV1Ur2cuSQrGz8eOSnVfY+dpU/uhWOxm07WwoU2oAZDaQlYOQRg3RP1W1WykC7CYQvHp7hxiDWYMw4PqpASCnwQZ0+utgbEI8ByiE421TU4MqU/RHWWJFe+7isC1v2EMDfY2Cj/+BX3TeL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766066019; c=relaxed/simple; bh=2XwPXkjPp5itaGHFJrhw5rUJ97gaqRAYu3kx2ZDaiWI=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=ogyqQpkf+45qv7P5zskrjU6k6oKgug7UdYXOWgfkueAQ+0SjW/7flPGyCZXzyCu7PbwvHVvCQllqYe8BHkzsuVB1YtHGi/r21cSXIiGKHBWvIlGOUoRVdL1rrPoD4qTM8YuVL3tJU3gXX/wtqgEVWm/337PBhge12hSAapN2WvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RAwnINF2; 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="RAwnINF2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02575C116C6; 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=2XwPXkjPp5itaGHFJrhw5rUJ97gaqRAYu3kx2ZDaiWI=; h=Date:From:To:Cc:Subject:References:From; b=RAwnINF24Ph4wVCyGvV2z9bCgqVOwqtObgYJCGYdOQ+cH77xdYvKeDtt2E+36mKMm CoorcyW7ZUYkfV2O+lS3OLnYe9HsmKJ387mtPxRfy3JNCj0Y4EroP5aNPo//eH2Trw PUKSq5+YmauL+srUfOzKmmwI5BNyEsKmt6HOB21EoLsZUqO6TMi5LF2+1YHl6qTYWk js1YhDfdrY9Y+m2hmNH+Ijo1bp8cZfoYBvIQQSi2t/JQ6uuFJIMBejboB81ZHzjH/q 5xoaB7eI22zBgXZveKsjQ9uFCKcocXPoBvQWvEkhICev9IE/wC6eGg0CEsPrq+FuNl SzNw/HBv0bLPw== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vWETN-0000000Auy8-24kk; Thu, 18 Dec 2025 08:55:17 -0500 Message-ID: <20251218135517.348757919@kernel.org> User-Agent: quilt/0.68 Date: Thu, 18 Dec 2025 08:55:07 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , "Darrick J. Wong" Subject: [for-linus][PATCH 3/4] tracing: Fix UBSAN warning in __remove_instance() 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: "Darrick J. Wong" xfs/558 triggers the following UBSAN warning: ------------[ cut here ]------------ UBSAN: shift-out-of-bounds in kernel/trace/trace.c:10510:10 shift exponent 32 is too large for 32-bit type 'int' CPU: 1 UID: 0 PID: 888674 Comm: rmdir Not tainted 6.19.0-rc1-xfsx #rc1 PRE= EMPT(lazy) dbf607ef4c142c563f76d706e71af9731d7b9c90 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-4.modul= e+el8.8.0+21164+ed375313 04/01/2014 Call Trace: dump_stack_lvl+0x4a/0x70 ubsan_epilogue+0x5/0x2b __ubsan_handle_shift_out_of_bounds.cold+0x5e/0x113 __remove_instance.part.0.constprop.0.cold+0x18/0x26f instance_rmdir+0xf3/0x110 tracefs_syscall_rmdir+0x4d/0x90 vfs_rmdir+0x139/0x230 do_rmdir+0x143/0x230 __x64_sys_rmdir+0x1d/0x20 do_syscall_64+0x44/0x230 entry_SYSCALL_64_after_hwframe+0x4b/0x53 RIP: 0033:0x7f7ae8e51f17 Code: f0 ff ff 73 01 c3 48 8b 0d de 2e 0e 00 f7 d8 64 89 01 48 83 c8 ff c3= 66 2e 0f 1f 84 00 00 00 00 00 66 90 b8 54 00 00 00 0f 05 <48> 3d 00 f0 ff = ff 77 01 c3 48 8b 15 b1 2e 0e 00 f7 d8 64 89 02 b8 RSP: 002b:00007ffd90743f08 EFLAGS: 00000246 ORIG_RAX: 0000000000000054 RAX: ffffffffffffffda RBX: 00007ffd907440f8 RCX: 00007f7ae8e51f17 RDX: 00007f7ae8f3c5c0 RSI: 00007ffd90744a21 RDI: 00007ffd90744a21 RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 R10: 00007f7ae8f35ac0 R11: 0000000000000246 R12: 00007ffd90744a21 R13: 0000000000000001 R14: 00007f7ae8f8b000 R15: 000055e5283e6a98 ---[ end trace ]--- whilst tearing down an ftrace instance. TRACE_FLAGS_MAX_SIZE is now 64bit, so the mask comparison expression must be typecast to a u64 value to avoid an overflow. AFAICT, ZEROED_TRACE_FLAGS is already cast to ULL so this is ok. Link: https://patch.msgid.link/20251216174950.GA7705@frogsfrogsfrogs Fixes: bbec8e28cac592 ("tracing: Allow tracer to add more than 32 options") Signed-off-by: "Darrick J. Wong" Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e575956ef9b5..6f2148df14d9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10507,7 +10507,7 @@ static int __remove_instance(struct trace_array *tr) =20 /* Disable all the flags that were enabled coming in */ for (i =3D 0; i < TRACE_FLAGS_MAX_SIZE; i++) { - if ((1 << i) & ZEROED_TRACE_FLAGS) + if ((1ULL << i) & ZEROED_TRACE_FLAGS) set_tracer_flag(tr, 1ULL << i, 0); } =20 --=20 2.51.0 From nobody Fri Dec 19 13:23:10 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