| Message ID | 20201014043638.3770558-1-songliubraving@fb.com |
|---|---|
| State | New |
| Headers | show |
| Series | [bpf-next] selftests/bpf: fix compilation error in progs/profiler.inc.h | expand |
> On Oct 13, 2020, at 9:36 PM, Song Liu <songliubraving@fb.com> 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@fb.com> I forgot to mention Reported-by: Jiri Olsa <jolsa@kernel.org> > --- > 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; > > 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 >
Song Liu wrote: > > > > On Oct 13, 2020, at 9:36 PM, Song Liu <songliubraving@fb.com> 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@fb.com> > > I forgot to mention > > Reported-by: Jiri Olsa <jolsa@kernel.org> Acked-by: John Fastabend <john.fastabend@gmail.com>
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@fb.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 >
> On Oct 14, 2020, at 9:29 PM, Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote: > > 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@fb.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. Ah, I missed that email (because of vger lag, I guess). Just verified Andrii's version works. Thanks, Song
On 10/15/20 7:50 AM, Song Liu wrote: >> On Oct 14, 2020, at 9:29 PM, Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote: >> 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@fb.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. > > Ah, I missed that email (because of vger lag, I guess). Just verified > Andrii's version works. Pls either you or Andrii respin in that case.
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; 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;
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@fb.com> --- tools/testing/selftests/bpf/progs/profiler.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)