selftests/bpf: Fix a selftest compilation error with CONFIG_SMP=n
Subsystems (3)
PATCH v2 1/1 selftests/bpf: Fix a selftest compilation error with CONFIG_SMP=n
Kernel test robot reported bpf selftest build failure when CONFIG_SMP is not set. The error message looks below:
Quoted 1 line
Quoted 1 line
progs/rcu_read_lock.c:256:34: error: no member named 'last_wakee' in 'structtask_struct'
last_wakee = task->real_parent->last_wakee;
~~~~~~~~~~~~~~~~~ ^
1 error generated.When CONFIG_SMP is not set, the field 'last_wakee' is not available in struct 'task_struct'. Hence the above compilation failure. To fix the issue, let us choose another field 'group_leader' which is available regardless of CONFIG_SMP set or not.
--- tools/testing/selftests/bpf/progs/rcu_read_lock.c | 8 ++++---- tools/testing/selftests/bpf/progs/task_kfunc_failure.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/progs/rcu_read_lock.c +4 -4
@@ -288,13 +288,13 @@ int nested_rcu_region(void *ctx) SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")int task_untrusted_non_rcuptr (void *ctx) { -struct task_struct *task, *last_wakee; +struct task_struct *task, *group_leader; task =bpf_get_current_task_btf ();bpf_rcu_read_lock (); -/* the pointer last_wakee marked as untrusted */ - last_wakee = task->real_parent->last_wakee; - (void )bpf_task_storage_get (&map_a, last_wakee,0 ,0 ); +/* the pointer group_leader marked as untrusted */ + group_leader = task->real_parent->group_leader; + (void )bpf_task_storage_get (&map_a, group_leader,0 ,0 );bpf_rcu_read_unlock ();return 0 ; }
tools/testing/selftests/bpf/progs/task_kfunc_failure.c +1 -1
@@ -73,7 +73,7 @@ int BPF_PROG(task_kfunc_acquire_trusted_walked, struct task_struct *task, u64 clstruct task_struct *acquired;/* Can't invoke bpf_task_acquire() on a trusted pointer obtained from walking a struct. */ - acquired =bpf_task_acquire (task->last_wakee); + acquired =bpf_task_acquire (task->group_leader);bpf_task_release (acquired);return 0 ;
Signature · 1 line
2.30.2
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Mon, 12 Dec 2022 17:22:24 -0800 you wrote:
Kernel test robot reported bpf selftest build failure when
CONFIG_SMPis not set. The error message looks below:Quoted 1 line
Quoted 1 line
progs/rcu_read_lock.c:256:34: error: no member named 'last_wakee' in 'structtask_struct'last_wakee = task->real_parent->last_wakee; ~~~~~~~~~~~~~~~~~ ^ 1 error generated.[...]
Here is the summary with links:
- [bpf,v2] selftests/bpf: Fix a selftest compilation error with CONFIG_SMP=n
https://git.kernel.org/bpf/bpf-next/c/711dfe1d66b1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html