From nobody Wed Apr 15 12:55:54 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 1B0EF3D6CD0; Tue, 3 Mar 2026 21:49:07 +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=1772574548; cv=none; b=FRCE+ePlei0RW+SouUewIaVA85C2Ps2GtuoLVyY43xQmtOzR021dwqwC9DSkoL1G7mcEg2QzwYuDJbNQPXOOcZ+uBKd2VhEGcVSzUmc97OOMCCj2yKIFdS80KVNmLJW5ya3GNlgibTguEjmCuOXyv+TUuCRW9CFqhadEkV9ZcXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772574548; c=relaxed/simple; bh=2O18WCD7nVs8vUnPwUpgTth3IEgvnga+ovswvO2RXro=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=D37zTliGENTmbO+mrjn0eUmcU+Dxqv/Ptv/eaWMV4ipOFB+DiENCCA9LjoObUQKZOrSSIkId9v8enjtwFoxX7rrevGc33oMyR7U8JXuai0m/jPU+wbXaNrRc7aw8JRMazQd5SG93y6iLLlgF32ryo4qygTGkb9ZXjDSsVsujzQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AJjojWng; 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="AJjojWng" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87645C19425; Tue, 3 Mar 2026 21:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772574547; bh=2O18WCD7nVs8vUnPwUpgTth3IEgvnga+ovswvO2RXro=; h=Date:From:To:Cc:Subject:References:From; b=AJjojWng1Td+NviD4/KI7t2XdIcBYtTkGF9TBU6hIjmpwxURIBS5p3X34y4kLKbxk WE2AOVIbpgc6sQJFXA9PrM4gZXvNt7di29OZmHOu92qgY+lpktdn9REL1K45+3/fW5 mzj5z/MZhkBDR+uVkFDE7w9Wgv0itckwSVx+/MjsQtraVM795Ij6mJjwzI+IZixBIj MpS++vSCC1AOcqKZ03+JsntMfzv3y6y9EM+2uuvtQINRwPLxhtMndKEV8OwWI/dcVs 4dZJhoA/WUhpIi5LrdkF37AffsFZknniy4l9wmRkvtZAJxqCcxkjfPo8OZGYqVFeNJ gwc996sk+iSAQ== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vxXcc-00000002tlD-2OHc; Tue, 03 Mar 2026 16:49:42 -0500 Message-ID: <20260303214942.428502100@kernel.org> User-Agent: quilt/0.69 Date: Tue, 03 Mar 2026 16:47:36 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Brian Geffon , John Stultz , Ian Rogers , Suleiman Souhlal Subject: [PATCH 1/2] tracing: Have futex syscall trace event show specific user data References: <20260303214735.002154462@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 Add specific reporting of the futex system call. This allows for debugging the futex code a bit easier. Instead of just showing the values passed into the futex system call, read the value of the user space memory pointed to by the addr parameter. Also make the op parameter more readable by parsing the values to show what the command is: futex_requeue_p-3251 [002] ..... 2101.068479: sys_futex(uaddr: 0x55e79= a4da834 (0x80000cb1), FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG, val: 0) futex_requeue_p-3248 [001] ..... 2101.068970: sys_futex(uaddr: 0x7f859= 072f990 (0xcb2), FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, val: 3250) futex_requeue_p-3252 [005] ..... 2101.069108: sys_futex(uaddr: 0x55e79= a4da838 (0), FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG, val: 0, timespec: 0x= 7ffe61076aa0, uaddr2: 0x55e79a4da834, uaddr2: 94453214586932, val3: 0) futex_requeue_p-3252 [005] ..... 2101.069410: sys_futex(uaddr: 0x55e79= a4da834 (0x80000cb1), FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG, val: 0) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_syscalls.c | 266 +++++++++++++++++++++++++++++++++- 1 file changed, 263 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index e96d0063cbcf..bc60a0497bcc 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -11,6 +11,8 @@ #include #include =20 +#include + #include "trace_output.h" #include "trace.h" =20 @@ -237,6 +239,125 @@ sys_enter_openat_print(struct syscall_trace_enter *tr= ace, struct syscall_metadat return trace_handle_return(s); } =20 +static const char * __futex_cmds[] =3D +{ + "FUTEX_WAIT", "FUTEX_WAKE", "FUTEX_FD", "FUTEX_REQUEUE", + "FUTEX_CMP_REQUEUE", "FUTEX_WAKE_OP", "FUTEX_LOCK_PI", + "FUTEX_UNLOCK_PI", "FUTEX_TRYLOCK_PI", "FUTEX_WAIT_BITSET", + "FUTEX_WAKE_BITSET", "FUTEX_WAIT_REQUEUE_PI", "FUTEX_CMP_REQUEUE_PI", + "FUTEX_LOCK_PI2", }; + +/* From futex/syscalls.c */ +static __always_inline bool futex_cmd_has_timeout(u32 cmd) +{ + switch (cmd) { + case FUTEX_WAIT: + case FUTEX_LOCK_PI: + case FUTEX_LOCK_PI2: + case FUTEX_WAIT_BITSET: + case FUTEX_WAIT_REQUEUE_PI: + return true; + } + return false; +} + +static __always_inline bool futex_cmd_has_addr2(u32 cmd) +{ + switch (cmd) { + case FUTEX_REQUEUE: + case FUTEX_CMP_REQUEUE: + case FUTEX_WAKE_OP: + case FUTEX_WAIT_REQUEUE_PI: + return true; + } + return false; +} + +static enum print_line_t +sys_enter_futex_print(struct syscall_trace_enter *trace, struct syscall_me= tadata *entry, + struct trace_seq *s, struct trace_event *event, int ent_size) +{ + bool done =3D false; + unsigned int op, cmd; + void *end =3D (void *)trace + ent_size; + void *ptr; + int i; + + /* Set ptr to the user space copied area */ + ptr =3D (void *)trace->args + sizeof(unsigned long) * entry->nb_args; + if (ptr + 4 > end) + ptr =3D NULL; + + trace_seq_printf(s, "%s(", entry->name); + + for (i =3D 0; !done && i < entry->nb_args; i++) { + + if (trace_seq_has_overflowed(s)) + goto end; + + switch (i) { + case 0: + trace_seq_printf(s, "uaddr: 0x%lx", trace->args[i]); + if (ptr) { + u32 val =3D *(u32 *)ptr; + if (val < 10) + trace_seq_printf(s, " (%u)", val); + else + trace_seq_printf(s, " (0x%x)", val); + } + continue; + case 1: + op =3D trace->args[i]; + cmd =3D op & FUTEX_CMD_MASK; + if (cmd <=3D FUTEX_LOCK_PI2) + trace_seq_printf(s, ", %s", __futex_cmds[cmd]); + else + trace_seq_puts(s, ", UNKNOWN"); + + if (op & FUTEX_PRIVATE_FLAG) + trace_seq_puts(s, "|FUTEX_PRIVATE_FLAG"); + if (op & FUTEX_CLOCK_REALTIME) + trace_seq_puts(s, "|FUTEX_CLOCK_REALTIME"); + continue; + case 3: + if (!futex_cmd_has_timeout(cmd)) { + + if (!futex_cmd_has_addr2(cmd)) { + done =3D true; + continue; + } + + trace_seq_printf(s, ", val2: 0x%x", + (u32)(long)trace->args[i]); + continue; + } + + if (!trace->args[i]) + continue; + + trace_seq_printf(s, ", timespec: 0x%lx", + trace->args[i]); + + continue; + + case 4: + if (!futex_cmd_has_addr2(cmd)) { + done =3D true; + continue; + } + trace_seq_printf(s, ", uaddr2: 0x%lx", trace->args[i]); + } + + trace_seq_printf(s, ", %s: %lu", entry->args[i], + trace->args[i]); + } + trace_seq_putc(s, ')'); +end: + trace_seq_putc(s, '\n'); + + return trace_handle_return(s); +} + static enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags, struct trace_event *event) @@ -267,6 +388,10 @@ print_syscall_enter(struct trace_iterator *iter, int f= lags, if (!tr || !(tr->trace_flags & TRACE_ITER(VERBOSE))) return sys_enter_openat_print(trace, entry, s, event); break; + case __NR_futex: + if (!tr || !(tr->trace_flags & TRACE_ITER(VERBOSE))) + return sys_enter_futex_print(trace, entry, s, event, iter->ent_size); + break; default: break; } @@ -437,6 +562,69 @@ sys_enter_openat_print_fmt(struct syscall_metadata *en= try, char *buf, int len) return pos; } =20 +static int __init +sys_enter_futex_print_fmt(struct syscall_metadata *entry, char *buf, int l= en) +{ + int pos =3D 0; + + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "\"uaddr: 0x%%lx (0x%%lx) cmd=3D%%s%%s%%s"); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " val: 0x%%x timeout/val2: 0x%%llx"); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " uaddr2: 0x%%lx val3: 0x%%x\", "); + + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " REC->uaddr,"); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " REC->__value,"); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " __print_symbolic(REC->op & 0x%x, ", FUTEX_CMD_MASK); + + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_WAIT\"}, ", FUTEX_WAIT); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_WAKE\"}, ", FUTEX_WAKE); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_FD\"}, ", FUTEX_FD); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_REQUEUE\"}, ", FUTEX_REQUEUE); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_CMP_REQUEUE\"}, ", FUTEX_CMP_REQUEUE); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_WAKE_OP\"}, ", FUTEX_WAKE_OP); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_LOCK_PI\"}, ", FUTEX_LOCK_PI); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_UNLOCK_PI\"}, ", FUTEX_UNLOCK_PI); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_TRYLOCK_PI\"}, ", FUTEX_TRYLOCK_PI); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_WAIT_BITSET\"}, ", FUTEX_WAIT_BITSET); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_WAKE_BITSET\"}, ", FUTEX_WAKE_BITSET); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_WAIT_REQUEUE_PI\"}, ", FUTEX_WAIT_REQUEUE_PI); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_CMP_REQUEUE_PI\"}, ", FUTEX_CMP_REQUEUE_PI); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + "{%d, \"FUTEX_LOCK_PI2\"}),", FUTEX_LOCK_PI2); + + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " (REC->op & %d) ? \"|FUTEX_PRIVATE_FLAG\" : \"\",", + FUTEX_PRIVATE_FLAG); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " (REC->op & %d) ? \"|FUTEX_CLOCK_REALTIME\" : \"\",", + FUTEX_CLOCK_REALTIME); + + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " REC->val, REC->utime,"); + + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " REC->uaddr, REC->val3"); + return pos; +} + static int __init __set_enter_print_fmt(struct syscall_metadata *entry, char *buf, int len) { @@ -447,6 +635,8 @@ __set_enter_print_fmt(struct syscall_metadata *entry, c= har *buf, int len) switch (entry->syscall_nr) { case __NR_openat: return sys_enter_openat_print_fmt(entry, buf, len); + case __NR_futex: + return sys_enter_futex_print_fmt(entry, buf, len); default: break; } @@ -523,6 +713,21 @@ static void __init free_syscall_print_fmt(struct trace= _event_call *call) kfree(call->print_fmt); } =20 +static int __init futex_fields(struct trace_event_call *call, int offset) +{ + char *arg; + int ret; + + arg =3D kstrdup("__value", GFP_KERNEL); + if (WARN_ON_ONCE(!arg)) + return -ENOMEM; + ret =3D trace_define_field(call, "u32", arg, offset, sizeof(int), 0, + FILTER_OTHER); + if (ret) + kfree(arg); + return ret; +} + static int __init syscall_enter_define_fields(struct trace_event_call *cal= l) { struct syscall_trace_enter trace; @@ -544,6 +749,9 @@ static int __init syscall_enter_define_fields(struct tr= ace_event_call *call) offset +=3D sizeof(unsigned long); } =20 + if (!ret && meta->syscall_nr =3D=3D __NR_futex) + return futex_fields(call, offset); + if (ret || !meta->user_mask) return ret; =20 @@ -689,6 +897,48 @@ static int syscall_copy_user_array(char *buf, const ch= ar __user *ptr, return 0; } =20 +static int +syscall_get_futex(unsigned long *args, char **buffer, int *size, int buf_s= ize) +{ + struct syscall_user_buffer *sbuf; + const char __user *ptr; + char *buf; + + /* buf_size of zero means user doesn't want user space read */ + if (!buf_size) + return -1; + + /* If the syscall_buffer is NULL, tracing is being shutdown */ + sbuf =3D READ_ONCE(syscall_buffer); + if (!sbuf) + return -1; + + ptr =3D (char __user *)args[0]; + + *buffer =3D trace_user_fault_read(&sbuf->buf, ptr, 4, NULL, NULL); + if (!*buffer) + return -1; + + /* Add room for the value */ + *size +=3D 4; + + buf =3D *buffer; + + return 0; +} + +static void syscall_put_futex(struct syscall_metadata *sys_data, + struct syscall_trace_enter *entry, + char *buffer) +{ + u32 *ptr; + + /* Place the futex key into the storage */ + ptr =3D (void *)entry->args + sizeof(unsigned long) * sys_data->nb_args; + + *ptr =3D *(u32 *)buffer; +} + static char *sys_fault_user(unsigned int buf_size, struct syscall_metadata *sys_data, struct syscall_user_buffer *sbuf, @@ -905,6 +1155,9 @@ static void ftrace_syscall_enter(void *data, struct pt= _regs *regs, long id) if (syscall_get_data(sys_data, args, &user_ptr, &size, user_sizes, &uargs, tr->syscall_buf_sz) < 0) return; + } else if (syscall_nr =3D=3D __NR_futex) { + if (syscall_get_futex(args, &user_ptr, &size, tr->syscall_buf_sz) < 0) + return; } =20 size +=3D sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args; @@ -921,6 +1174,9 @@ static void ftrace_syscall_enter(void *data, struct pt= _regs *regs, long id) if (mayfault) syscall_put_data(sys_data, entry, user_ptr, size, user_sizes, uargs); =20 + else if (syscall_nr =3D=3D __NR_futex) + syscall_put_futex(sys_data, entry, user_ptr); + trace_event_buffer_commit(&fbuffer); } =20 @@ -971,14 +1227,18 @@ static int reg_event_syscall_enter(struct trace_even= t_file *file, { struct syscall_metadata *sys_data =3D call->data; struct trace_array *tr =3D file->tr; + bool enable_faults; int ret =3D 0; int num; =20 num =3D sys_data->syscall_nr; if (WARN_ON_ONCE(num < 0 || num >=3D NR_syscalls)) return -ENOSYS; + + enable_faults =3D sys_data->user_mask || num =3D=3D __NR_futex; + guard(mutex)(&syscall_trace_lock); - if (sys_data->user_mask) { + if (enable_faults) { ret =3D syscall_fault_buffer_enable(); if (ret < 0) return ret; @@ -986,7 +1246,7 @@ static int reg_event_syscall_enter(struct trace_event_= file *file, if (!tr->sys_refcount_enter) { ret =3D register_trace_sys_enter(ftrace_syscall_enter, tr); if (ret < 0) { - if (sys_data->user_mask) + if (enable_faults) syscall_fault_buffer_disable(); return ret; } @@ -1011,7 +1271,7 @@ static void unreg_event_syscall_enter(struct trace_ev= ent_file *file, WRITE_ONCE(tr->enter_syscall_files[num], NULL); if (!tr->sys_refcount_enter) unregister_trace_sys_enter(ftrace_syscall_enter, tr); - if (sys_data->user_mask) + if (sys_data->user_mask || num =3D=3D __NR_futex) syscall_fault_buffer_disable(); } =20 --=20 2.51.0 From nobody Wed Apr 15 12:55:54 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 59119379EE0; Tue, 3 Mar 2026 21:49:08 +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=1772574548; cv=none; b=kFnYZR+175Cb0qfZTsuVd9RNYSPRSVMSh7zb5mijx9c0Ha5hIO0GaFQKQMekZOXDsKi0In5bGd9NGkMg9gM6e/fWZhu+x+PxSuP+qZIg4sJrpRJgW1VcNomYmnGo303vqykIPUtljtzSD21WKPtaNmCz8jcL9ADeM1XGjGHPv3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772574548; c=relaxed/simple; bh=5sPfSnHFUqU/XesMMQKQat8eiF520UxlVhfmd26L8ZQ=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=UrXx32+27YjQTOjZRBmroCuewE5s/B1aOYjLSfv5mFNhuaz2XKb0qfzOq5QXpbEuxsS1CiZGe+AwHKxqHgtfgLzVekcH4dfsE0X+pGA0buOdDCBlhcnd8L8Mmcpf97hmaNFlPit6M8g+S6z4IYKBsr58gn0RXQ1lIgyt2M1NPrQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OByp72Nt; 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="OByp72Nt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0E63C2BCB0; Tue, 3 Mar 2026 21:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772574547; bh=5sPfSnHFUqU/XesMMQKQat8eiF520UxlVhfmd26L8ZQ=; h=Date:From:To:Cc:Subject:References:From; b=OByp72NtYygps+BjIpC8rNF7PmgfTDl4/NOFesxwHjhnH6wDK6xikQ4ezTuUIEBy8 W7Slb+/58G/pfA7jU1B63JqbWdQfXRROGF4WFGPwGbRXukZcqeYZDV2/mmWQk+8T5/ OzfrKZhuLd4xY6mRRuOgYXxLXtrOwlDitrjYNbZaMjpuaDJBmgkkOD+59zQMyPP18O Pu+rwDbDMUGNSMh+axfmFVq9ld0aRgJmprFk0F2D7uvG21fDEOClVMj0YFJk3HSY1c vuFeCmcdo6cdCZAeINZnWy80gmMOLGT17aoYE41rkUnF3kPgdZGkNyyW64rpkdrBvq d7110xAXLrHVg== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vxXcc-00000002tm4-3H2Z; Tue, 03 Mar 2026 16:49:42 -0500 Message-ID: <20260303214942.587739736@kernel.org> User-Agent: quilt/0.69 Date: Tue, 03 Mar 2026 16:47:37 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Brian Geffon , John Stultz , Ian Rogers , Suleiman Souhlal Subject: [PATCH 2/2] tracing: Update futex syscall trace event to show more commands References: <20260303214735.002154462@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 Make the futex syscall trace event a little more smart. Have it read the futex_op instruction to determine what else it can save and print. For the appropriate options, it will read the utime (timespec) parameter and show its output as well as the uaddr2. futex_requeue_p-1154 [004] ..... 144.568339: sys_futex(uaddr: 0x5652b= 178d834 (0x482), FUTEX_UNLOCK_PI|FUTEX_PRIVATE_FLAG, val: 0) futex_requeue_p-1162 [002] ..... 144.568696: sys_futex(uaddr: 0x7f763= b7fece0 (2), FUTEX_WAIT|FUTEX_PRIVATE_FLAG, val: 2) futex_requeue_p-1151 [000] ..... 144.568700: sys_futex(uaddr: 0x7f763= b7fece0 (0), FUTEX_WAKE|FUTEX_PRIVATE_FLAG, val: 1) futex_requeue_p-1162 [002] ..... 144.568705: sys_futex(uaddr: 0x7f763= b7fece0 (0), FUTEX_WAKE|FUTEX_PRIVATE_FLAG, val: 1) futex_requeue_p-1151 [000] ..... 144.568715: sys_futex(uaddr: 0x7f764= 369e990 (0x483), FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, val: 1155) futex_requeue_p-1155 [005] ..... 144.569420: sys_futex(uaddr: 0x5652b= 178d838 (0), FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG, val: 0, timespec: 0x= 7ffdacfba500 (143.890024054), uaddr2: 0x5652b178d834 (0), val3: 0) futex_requeue_p-1155 [005] ..... 144.569454: sys_futex(uaddr: 0x5652b= 178d834 (0), FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG, val: 0) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_syscalls.c | 138 +++++++++++++++++++++++++++++----- 1 file changed, 121 insertions(+), 17 deletions(-) diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index bc60a0497bcc..d128dcb218a7 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -273,10 +273,18 @@ static __always_inline bool futex_cmd_has_addr2(u32 c= md) return false; } =20 +struct futex_data { + u32 val1; + u32 val2; + unsigned long ts1; + unsigned long ts2; +}; + static enum print_line_t sys_enter_futex_print(struct syscall_trace_enter *trace, struct syscall_me= tadata *entry, struct trace_seq *s, struct trace_event *event, int ent_size) { + struct futex_data *data; bool done =3D false; unsigned int op, cmd; void *end =3D (void *)trace + ent_size; @@ -285,8 +293,10 @@ sys_enter_futex_print(struct syscall_trace_enter *trac= e, struct syscall_metadata =20 /* Set ptr to the user space copied area */ ptr =3D (void *)trace->args + sizeof(unsigned long) * entry->nb_args; - if (ptr + 4 > end) - ptr =3D NULL; + if (ptr + sizeof(*data) > end) + data =3D NULL; + else + data =3D ptr; =20 trace_seq_printf(s, "%s(", entry->name); =20 @@ -298,8 +308,8 @@ sys_enter_futex_print(struct syscall_trace_enter *trace= , struct syscall_metadata switch (i) { case 0: trace_seq_printf(s, "uaddr: 0x%lx", trace->args[i]); - if (ptr) { - u32 val =3D *(u32 *)ptr; + if (data) { + u32 val =3D data->val1; if (val < 10) trace_seq_printf(s, " (%u)", val); else @@ -338,6 +348,15 @@ sys_enter_futex_print(struct syscall_trace_enter *trac= e, struct syscall_metadata trace_seq_printf(s, ", timespec: 0x%lx", trace->args[i]); =20 + if (!data) + continue; + + if (!data->ts1 && !data->ts2) { + trace_seq_puts(s, " (0)"); + continue; + } + trace_seq_printf(s, " (%lu.%09lu)", + data->ts1, data->ts2); continue; =20 case 4: @@ -346,6 +365,12 @@ sys_enter_futex_print(struct syscall_trace_enter *trac= e, struct syscall_metadata continue; } trace_seq_printf(s, ", uaddr2: 0x%lx", trace->args[i]); + + if (!data) + continue; + + trace_seq_printf(s, " (%x)", data->val2); + continue; } =20 trace_seq_printf(s, ", %s: %lu", entry->args[i], @@ -570,9 +595,9 @@ sys_enter_futex_print_fmt(struct syscall_metadata *entr= y, char *buf, int len) pos +=3D snprintf(buf + pos, LEN_OR_ZERO, "\"uaddr: 0x%%lx (0x%%lx) cmd=3D%%s%%s%%s"); pos +=3D snprintf(buf + pos, LEN_OR_ZERO, - " val: 0x%%x timeout/val2: 0x%%llx"); + " val: 0x%%x timeout/val2: 0x%%llx (%%lu.%%lu)"); pos +=3D snprintf(buf + pos, LEN_OR_ZERO, - " uaddr2: 0x%%lx val3: 0x%%x\", "); + " uaddr2: 0x%%lx (0x%%lx) val3: 0x%%x\", "); =20 pos +=3D snprintf(buf + pos, LEN_OR_ZERO, " REC->uaddr,"); @@ -618,10 +643,12 @@ sys_enter_futex_print_fmt(struct syscall_metadata *en= try, char *buf, int len) FUTEX_CLOCK_REALTIME); =20 pos +=3D snprintf(buf + pos, LEN_OR_ZERO, - " REC->val, REC->utime,"); + " REC->val, REC->utime, REC->__ts1, REC->__ts2,"); =20 pos +=3D snprintf(buf + pos, LEN_OR_ZERO, - " REC->uaddr, REC->val3"); + " REC->uaddr,"); + pos +=3D snprintf(buf + pos, LEN_OR_ZERO, + " REC->__value2, REC->val3"); return pos; } =20 @@ -724,7 +751,39 @@ static int __init futex_fields(struct trace_event_call= *call, int offset) ret =3D trace_define_field(call, "u32", arg, offset, sizeof(int), 0, FILTER_OTHER); if (ret) - kfree(arg); + goto free; + offset +=3D sizeof(int); + + arg =3D kstrdup("__value2", GFP_KERNEL); + if (WARN_ON_ONCE(!arg)) + return -ENOMEM; + ret =3D trace_define_field(call, "u32", arg, offset, sizeof(int), 0, + FILTER_OTHER); + if (ret) + goto free; + offset +=3D sizeof(int); + + arg =3D kstrdup("__ts1", GFP_KERNEL); + if (WARN_ON_ONCE(!arg)) + return -ENOMEM; + ret =3D trace_define_field(call, "unsigned long", arg, offset, + sizeof(unsigned long), 0, FILTER_OTHER); + if (ret) + goto free; + offset +=3D sizeof(long); + + arg =3D kstrdup("__ts2", GFP_KERNEL); + if (WARN_ON_ONCE(!arg)) + return -ENOMEM; + ret =3D trace_define_field(call, "unsigned long", arg, offset, + sizeof(unsigned long), 0, FILTER_OTHER); + if (ret) + goto free; + + return 0; + +free: + kfree(arg); return ret; } =20 @@ -897,11 +956,51 @@ static int syscall_copy_user_array(char *buf, const c= har __user *ptr, return 0; } =20 +struct tp_futex_data { + u32 cmd; + const u32 __user *val1; + const u32 __user *val2; + void __user *timeout; +}; + +static int syscall_copy_futex(char *buf, const char __user *ptr, + size_t size, void *data) +{ + struct tp_futex_data *tp_data =3D data; + struct futex_data *fdata =3D (void *)buf; + int cmd =3D tp_data->cmd & FUTEX_CMD_MASK; + int ret; + + memset(fdata, 0, sizeof(*fdata)); + + if (tp_data->val1) { + ret =3D __copy_from_user(&fdata->val1, tp_data->val1, 4); + if (ret) + return -1; + } + + if (tp_data->val2 && futex_cmd_has_addr2(cmd)) { + ret =3D __copy_from_user(&fdata->val2, tp_data->val2, 4); + if (ret) + return -1; + } + + if (tp_data->timeout && futex_cmd_has_timeout(cmd)) { + /* Copies both ts1 and ts2 */ + ret =3D __copy_from_user(&fdata->ts1, tp_data->timeout, + sizeof(long) * 2); + if (ret) + return -1; + } + + return 0; +} + static int syscall_get_futex(unsigned long *args, char **buffer, int *size, int buf_s= ize) { struct syscall_user_buffer *sbuf; - const char __user *ptr; + struct tp_futex_data tp_data; char *buf; =20 /* buf_size of zero means user doesn't want user space read */ @@ -913,14 +1012,18 @@ syscall_get_futex(unsigned long *args, char **buffer= , int *size, int buf_size) if (!sbuf) return -1; =20 - ptr =3D (char __user *)args[0]; + tp_data.cmd =3D args[1]; + tp_data.val1 =3D (u32 __user *)args[0]; + tp_data.val2 =3D (u32 __user *)args[4]; + tp_data.timeout =3D (u64 __user *)args[3]; =20 - *buffer =3D trace_user_fault_read(&sbuf->buf, ptr, 4, NULL, NULL); + *buffer =3D trace_user_fault_read(&sbuf->buf, NULL, 0, + syscall_copy_futex, &tp_data); if (!*buffer) return -1; =20 - /* Add room for the value */ - *size +=3D 4; + /* Add room for values */ + *size +=3D sizeof(struct futex_data); =20 buf =3D *buffer; =20 @@ -931,12 +1034,13 @@ static void syscall_put_futex(struct syscall_metadat= a *sys_data, struct syscall_trace_enter *entry, char *buffer) { - u32 *ptr; + struct futex_data *fdata =3D (void *)buffer; + struct futex_data *data; =20 /* Place the futex key into the storage */ - ptr =3D (void *)entry->args + sizeof(unsigned long) * sys_data->nb_args; + data =3D (void *)entry->args + sizeof(unsigned long) * sys_data->nb_args; =20 - *ptr =3D *(u32 *)buffer; + *data =3D *fdata; } =20 static char *sys_fault_user(unsigned int buf_size, --=20 2.51.0 From nobody Wed Apr 15 12:55:54 2026 Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) (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 173A9359A80; Tue, 3 Mar 2026 22:44:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.40.44.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772577861; cv=none; b=FTjhda8M+hJaiTIip7q7DLzov67TF7roURtXWotwNrq4Nn6+BV0bBz6i3LYgf8sl64ioABl5u4wy79TPQ7da+Vs1CBaWZ6mB6h2XQWfezAYYiRObMDSzkUV6tiNKisgkXtaulvT/bGofiq2uypzXEZbXbMCmKnU/pqgB8TSAjbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772577861; c=relaxed/simple; bh=4Ih/2o/t9doKo62D+kFikmb1MNMCyvP4c2VW3hJ0Kmc=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VWc3bidJZRZ5mrIXxwMc1xALJRAUOoXo99AwvL8sddODzXLpPvrkCqjCztKgoABJqQPrWi0fOXh1RPiJ7r5+3bSF1+1rMhDUOgjpiWlpcNqzMZgMn3LBV2TkwzLes+41RBVpt7UZNdxDEYnvMSkCv1Pt3MpURQAZgEhJGfYRKbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=goodmis.org; spf=pass smtp.mailfrom=goodmis.org; arc=none smtp.client-ip=216.40.44.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=goodmis.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=goodmis.org Received: from omf19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D3ED0140107; Tue, 3 Mar 2026 22:44:09 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: rostedt@goodmis.org) by omf19.hostedemail.com (Postfix) with ESMTPA id 530B220028; Tue, 3 Mar 2026 22:44:07 +0000 (UTC) Date: Tue, 3 Mar 2026 17:44:42 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Brian Geffon , John Stultz , Ian Rogers , Suleiman Souhlal Subject: [PATCH 3/2] tracing: Show TID and flags for PI futex system call trace event Message-ID: <20260303174442.548b6524@gandalf.local.home> In-Reply-To: <20260303214735.002154462@kernel.org> References: <20260303214735.002154462@kernel.org> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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 X-Rspamd-Queue-Id: 530B220028 X-Rspamd-Server: rspamout06 X-Stat-Signature: 8s5yqswghkyr3p1j18bswtjszc6m3hu4 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Session-ID: U2FsdGVkX199QX2aqCE6wlXIzurzdMJRFtW9F45R+pU= X-HE-Tag: 1772577847-32625 X-HE-Meta: U2FsdGVkX18yDN8+OAhsaIQqgqHZeika6QDM1Ooh57Z4i4MlA89QFDkWFkGnCB7qM6srYmrasfQ01NhhBDlSad8X3a/hAiddu0a1AJR2eUGmb0eBmeNaKXW79XhkIaiwZ1Z7Bg2V1Qtbo5Jxz6j9FjaoxQRFFgL6z4yED14vzORZtKX49Ah8OWWbDh5lkPAVNjEhnMnU4YzOVk8EgIt7Sr7QY/PCK4rI2Tlrs0toiHau4LDdXwdKOAsBOtOR6St5ARBNYq57IwBUvdwRWN1iaz2znUBUJq6xqc/dCgmiLPCQSMTETDYMjonU/Z8p6FuIB9Hint6Un0fUA9YLI8GH+ydUq+SwYFhHCG0WJ0dEkvVpFFbAC2GoKsuRKRfzdxRH Content-Type: text/plain; charset="utf-8" From: Steven Rostedt For the futex system call trace event for FUTEX_LOCK_PI and FUTEX_UNLOCK_PI commands, show the TID from the value (which is usually in hex) as well as translate the flags (DIED and WAITERS). pi_mutex_hammer-1098 [000] ..... 121.876928: sys_futex(uaddr: 0x560f4= 0cc8180 (0x450) tid: 1104, FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG, val: 0, timesp= ec: 0x7f2f9d4b1e50 (0.000100000)) pi_mutex_hammer-1128 [000] ..... 121.877120: sys_futex(uaddr: 0x560f4= 0cc8180 (0x8000042a) tid: 1066 (WAITERS), FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG,= val: 0, timespec: 0x7f2f8e493e50 (0.000100000)) pi_mutex_hammer-1106 [000] ..... 121.877242: sys_futex(uaddr: 0x560f4= 0cc8180 (0x80000452) tid: 1106 (WAITERS), FUTEX_UNLOCK_PI|FUTEX_PRIVATE_FLA= G, val: 0) This makes it easier to see the hand off of a mutex and who the owner was. Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_syscalls.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index d128dcb218a7..b3eddfee1a6b 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -300,6 +300,9 @@ sys_enter_futex_print(struct syscall_trace_enter *trace= , struct syscall_metadata =20 trace_seq_printf(s, "%s(", entry->name); =20 + op =3D trace->args[1]; + cmd =3D op & FUTEX_CMD_MASK; + for (i =3D 0; !done && i < entry->nb_args; i++) { =20 if (trace_seq_has_overflowed(s)) @@ -314,11 +317,29 @@ sys_enter_futex_print(struct syscall_trace_enter *tra= ce, struct syscall_metadata trace_seq_printf(s, " (%u)", val); else trace_seq_printf(s, " (0x%x)", val); + + switch(cmd) { + case FUTEX_LOCK_PI: + case FUTEX_UNLOCK_PI: + trace_seq_printf(s, " tid: %d", val & FUTEX_TID_MASK); + + if (!(val & (FUTEX_OWNER_DIED|FUTEX_WAITERS))) + break; + + trace_seq_puts(s, " ("); + if (val & FUTEX_WAITERS) + trace_seq_puts(s, "WAITERS"); + if (val & FUTEX_OWNER_DIED) { + if (op & FUTEX_WAITERS) + trace_seq_putc(s, '|'); + trace_seq_puts(s, "DIED"); + } + trace_seq_putc(s, ')'); + break; + } } continue; case 1: - op =3D trace->args[i]; - cmd =3D op & FUTEX_CMD_MASK; if (cmd <=3D FUTEX_LOCK_PI2) trace_seq_printf(s, ", %s", __futex_cmds[cmd]); else --=20 2.51.0