tools-testing-selftests-bpf-replace-open-coded-16-with-task_comm_len.patch removed from -mm tree
The patch titled
Subject: tools/testing/selftests/bpf: replace open-coded 16 with TASK_COMM_LEN
has been removed from the -mm tree. Its filename was
tools-testing-selftests-bpf-replace-open-coded-16-with-task_comm_len.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yafang Shao <[email protected]>
Subject: tools/testing/selftests/bpf: replace open-coded 16 with TASK_COMM_LEN
As the sched:sched_switch tracepoint args are derived from the kernel, we'd better make it same with the kernel. So the macro TASK_COMM_LEN is converted to type enum, then all the BPF programs can get it through BTF.
The BPF program which wants to use TASK_COMM_LEN should include the header vmlinux.h. Regarding the test_stacktrace_map and test_tracepoint, as the type defined in linux/bpf.h are also defined in vmlinux.h, so we don't need to include linux/bpf.h again.
---
include/linux/sched.h | 9 +++++++-- tools/testing/selftests/bpf/progs/test_stacktrace_map.c | 6 +++--- tools/testing/selftests/bpf/progs/test_tracepoint.c | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-)
include/linux/sched.h renamed from include/linux/sched.h~tools-testing-selftests-bpf-replace-open-coded-16-with-task_comm_len +7 -2
@@ -274,8 +274,13 @@ struct task_group;#define get_current_state () READ_ONCE(current->__state) -/* Task command name length: */ -#define TASK_COMM_LEN 16 +/* +* Define the task command name length as enum, then it can be visible to +* BPF programs. +*/ +enum { +TASK_COMM_LEN =16 , +};extern void scheduler_tick (void );
tools/testing/selftests/bpf/progs/test_stacktrace_map.c renamed from tools/testing/selftests/bpf/progs/test_stacktrace_map.c~tools-testing-selftests-bpf-replace-open-coded-16-with-task_comm_len +3 -3
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2018 Facebook -#include <linux/bpf.h> +#include <vmlinux.h> #include <bpf/bpf_helpers.h> #ifndef PERF_MAX_STACK_DEPTH
@@ -41,11 +41,11 @@ struct {/* 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; };
tools/testing/selftests/bpf/progs/test_tracepoint.c renamed from tools/testing/selftests/bpf/progs/test_tracepoint.c~tools-testing-selftests-bpf-replace-open-coded-16-with-task_comm_len +3 -3
@@ -1,17 +1,17 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2017 Facebook -#include <linux/bpf.h> +#include <vmlinux.h> #include <bpf/bpf_helpers.h> /* 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; };
_
Patches currently in -mm which might be from [email protected] are