tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

rust_binder: remove "rust_" prefix from tracepoints

Remove the "rust_" prefix as the name is part of the uapi, and
userspace expects tracepoints to have the old names.

Link: https://github.com/Rust-for-Linux/linux/issues/1226
Suggested-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Mohamad Alsadhan <mo@sdhn.cc>
Link: https://patch.msgid.link/20260317-rust-binder-trace-v3-1-6fae4fbcf637@sdhn.cc
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Mohamad Alsadhan and committed by
Greg Kroah-Hartman e3007a92 f698a253

+6 -6
+2 -2
drivers/android/binder/rust_binder_events.h
··· 15 15 16 16 #include <linux/tracepoint.h> 17 17 18 - TRACE_EVENT(rust_binder_ioctl, 18 + TRACE_EVENT(binder_ioctl, 19 19 TP_PROTO(unsigned int cmd, unsigned long arg), 20 20 TP_ARGS(cmd, arg), 21 21 ··· 30 30 TP_printk("cmd=0x%x arg=0x%lx", __entry->cmd, __entry->arg) 31 31 ); 32 32 33 - TRACE_EVENT(rust_binder_transaction, 33 + TRACE_EVENT(binder_transaction, 34 34 TP_PROTO(bool reply, rust_binder_transaction t, struct task_struct *thread), 35 35 TP_ARGS(reply, t, thread), 36 36 TP_STRUCT__entry(
+4 -4
drivers/android/binder/trace.rs
··· 10 10 use kernel::tracepoint::declare_trace; 11 11 12 12 declare_trace! { 13 - unsafe fn rust_binder_ioctl(cmd: c_uint, arg: c_ulong); 14 - unsafe fn rust_binder_transaction(reply: bool, t: rust_binder_transaction, thread: *mut task_struct); 13 + unsafe fn binder_ioctl(cmd: c_uint, arg: c_ulong); 14 + unsafe fn binder_transaction(reply: bool, t: rust_binder_transaction, thread: *mut task_struct); 15 15 } 16 16 17 17 #[inline] ··· 22 22 #[inline] 23 23 pub(crate) fn trace_ioctl(cmd: u32, arg: usize) { 24 24 // SAFETY: Always safe to call. 25 - unsafe { rust_binder_ioctl(cmd, arg as c_ulong) } 25 + unsafe { binder_ioctl(cmd, arg as c_ulong) } 26 26 } 27 27 28 28 #[inline] ··· 33 33 }; 34 34 // SAFETY: The raw transaction is valid for the duration of this call. The thread pointer is 35 35 // valid or null. 36 - unsafe { rust_binder_transaction(reply, raw_transaction(t), thread) } 36 + unsafe { binder_transaction(reply, raw_transaction(t), thread) } 37 37 }