lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 14 Oct 2020 21:29:28 -0700 From: Alexei Starovoitov <alexei.starovoitov@...il.com> To: Song Liu <songliubraving@...com> Cc: netdev@...r.kernel.org, bpf@...r.kernel.org, kernel-team@...com, ast@...nel.org, daniel@...earbox.net, john.fastabend@...il.com, kpsingh@...omium.org Subject: Re: [PATCH bpf-next] selftests/bpf: fix compilation error in progs/profiler.inc.h On Tue, Oct 13, 2020 at 09:36:38PM -0700, Song Liu wrote: > Fix the following error when compiling selftests/bpf > > progs/profiler.inc.h:246:5: error: redefinition of 'pids_cgrp_id' as different kind of symbol > > pids_cgrp_id is used in cgroup code, and included in vmlinux.h. Fix the > error by renaming pids_cgrp_id as pids_cgroup_id. > > Fixes: 03d4d13fab3f ("selftests/bpf: Add profiler test") > Signed-off-by: Song Liu <songliubraving@...com> > --- > tools/testing/selftests/bpf/progs/profiler.inc.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/bpf/progs/profiler.inc.h b/tools/testing/selftests/bpf/progs/profiler.inc.h > index 00578311a4233..b554c1e40b9fb 100644 > --- a/tools/testing/selftests/bpf/progs/profiler.inc.h > +++ b/tools/testing/selftests/bpf/progs/profiler.inc.h > @@ -243,7 +243,7 @@ static ino_t get_inode_from_kernfs(struct kernfs_node* node) > } > } > > -int pids_cgrp_id = 1; > +int pids_cgroup_id = 1; I would prefer to try one of three options that Andrii suggested. > static INLINE void* populate_cgroup_info(struct cgroup_data_t* cgroup_data, > struct task_struct* task, > @@ -262,7 +262,7 @@ static INLINE void* populate_cgroup_info(struct cgroup_data_t* cgroup_data, > BPF_CORE_READ(task, cgroups, subsys[i]); > if (subsys != NULL) { > int subsys_id = BPF_CORE_READ(subsys, ss, id); > - if (subsys_id == pids_cgrp_id) { > + if (subsys_id == pids_cgroup_id) { > proc_kernfs = BPF_CORE_READ(subsys, cgroup, kn); > root_kernfs = BPF_CORE_READ(subsys, ss, root, kf_root, kn); > break; > -- > 2.24.1 >
Powered by blists - more mailing lists