samples-bpf-test_overhead_kprobe_kern-replace-bpf_probe_read_kernel-with-bpf_probe_read_kernel_str-to-get-task-comm.patch removed from -mm tree
The patch titled
Subject: samples/bpf/test_overhead_kprobe_kern: replace bpf_probe_read_kernel with bpf_probe_read_kernel_str to get task comm
has been removed from the -mm tree. Its filename was
samples-bpf-test_overhead_kprobe_kern-replace-bpf_probe_read_kernel-with-bpf_probe_read_kernel_str-to-get-task-comm.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yafang Shao <[email protected]>
Subject: samples/bpf/test_overhead_kprobe_kern: replace bpf_probe_read_kernel with bpf_probe_read_kernel_str to get task comm
bpf_probe_read_kernel_str() will add a nul terminator to the dst, then we don't care about if the dst size is big enough. This patch also replaces the hard-coded 16 with TASK_COMM_LEN to make it grepable.
---
samples/bpf/offwaketime_kern.c | 4 ++-- samples/bpf/test_overhead_kprobe_kern.c | 11 ++++++----- samples/bpf/test_overhead_tp_kern.c | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-)
samples/bpf/offwaketime_kern.c renamed from samples/bpf/offwaketime_kern.c~samples-bpf-test_overhead_kprobe_kern-replace-bpf_probe_read_kernel-with-bpf_probe_read_kernel_str-to-get-task-comm +2 -2
@@ -113,11 +113,11 @@ static inline int update_counts(void *ct/* taken from /sys/kernel/debug/tracing/events/sched/sched_switch/format */ struct sched_switch_args {unsigned long long pad; -char prev_comm[16 ]; +char prev_comm[TASK_COMM_LEN ];int prev_pid;int prev_prio;long long prev_state; -char next_comm[16 ]; +char next_comm[TASK_COMM_LEN ];int next_pid;int next_prio; };
samples/bpf/test_overhead_kprobe_kern.c renamed from samples/bpf/test_overhead_kprobe_kern.c~samples-bpf-test_overhead_kprobe_kern-replace-bpf_probe_read_kernel-with-bpf_probe_read_kernel_str-to-get-task-comm +6 -5
@@ -6,6 +6,7 @@*/ #include <linux/version.h> #include <linux/ptrace.h> +#include <linux/sched.h> #include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h>
@@ -22,17 +23,17 @@ int prog(struct pt_regs *ctx) {struct signal_struct *signal;struct task_struct *tsk; -char oldcomm[16 ] = {}; -char newcomm[16 ] = {}; +char oldcomm[TASK_COMM_LEN ] = {}; +char newcomm[TASK_COMM_LEN ] = {};u16 oom_score_adj;u32 pid; tsk = (void *)PT_REGS_PARM1 (ctx); pid =_ (tsk->pid); -bpf_probe_read_kernel (oldcomm,sizeof (oldcomm), &tsk->comm); -bpf_probe_read_kernel (newcomm,sizeof (newcomm), - (void *)PT_REGS_PARM2 (ctx)); +bpf_probe_read_kernel_str (oldcomm,sizeof (oldcomm), &tsk->comm); +bpf_probe_read_kernel_str (newcomm,sizeof (newcomm), + (void *)PT_REGS_PARM2 (ctx)); signal =_ (tsk->signal); oom_score_adj =_ (signal->oom_score_adj);return 0 ;
samples/bpf/test_overhead_tp_kern.c renamed from samples/bpf/test_overhead_tp_kern.c~samples-bpf-test_overhead_kprobe_kern-replace-bpf_probe_read_kernel-with-bpf_probe_read_kernel_str-to-get-task-comm +3 -2
@@ -4,6 +4,7 @@* modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ +#include <linux/sched.h> #include <uapi/linux/bpf.h> #include <bpf/bpf_helpers.h>
@@ -11,8 +12,8 @@struct task_rename {__u64 pad;__u32 pid; -char oldcomm[16 ]; -char newcomm[16 ]; +char oldcomm[TASK_COMM_LEN ]; +char newcomm[TASK_COMM_LEN ];__u16 oom_score_adj; };SEC ("tracepoint/task/task_rename" )
_
Patches currently in -mm which might be from [email protected] are