From: Song Liu <song@kernel.org>
To: Jiri Olsa <jolsa@redhat.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Kernel Team <kernel-team@fb.com>
Subject: Re: [PATCH v2 bpf-next 3/4] selftests/bpf: Add profiler test
Date: Tue, 13 Oct 2020 17:21:39 -0700 [thread overview]
Message-ID: <CAPhsuW4ZnYmfSGAXibVEZVA79opyWxRnw2-m7VfsQngi9NLBBg@mail.gmail.com> (raw)
In-Reply-To: <20201013195622.GB1305928@krava>
On Tue, Oct 13, 2020 at 12:57 PM Jiri Olsa <jolsa@redhat.com> wrote:
>
> On Thu, Oct 08, 2020 at 06:12:39PM -0700, Alexei Starovoitov wrote:
>
> SNIP
>
> > +
> > +#ifdef UNROLL
> > +#pragma unroll
> > +#endif
> > + for (int i = 0; i < MAX_CGROUPS_PATH_DEPTH; i++) {
> > + filepart_length =
> > + bpf_probe_read_str(payload, MAX_PATH, BPF_CORE_READ(cgroup_node, name));
> > + if (!cgroup_node)
> > + return payload;
> > + if (cgroup_node == cgroup_root_node)
> > + *root_pos = payload - payload_start;
> > + if (filepart_length <= MAX_PATH) {
> > + barrier_var(filepart_length);
> > + payload += filepart_length;
> > + }
> > + cgroup_node = BPF_CORE_READ(cgroup_node, parent);
> > + }
> > + return payload;
> > +}
> > +
> > +static ino_t get_inode_from_kernfs(struct kernfs_node* node)
> > +{
> > + struct kernfs_node___52* node52 = (void*)node;
> > +
> > + if (bpf_core_field_exists(node52->id.ino)) {
> > + barrier_var(node52);
> > + return BPF_CORE_READ(node52, id.ino);
> > + } else {
> > + barrier_var(node);
> > + return (u64)BPF_CORE_READ(node, id);
> > + }
> > +}
> > +
> > +int pids_cgrp_id = 1;
>
>
> hi,
> I'm getting compilation failure with this:
>
> CLNG-LLC [test_maps] profiler2.o
> In file included from progs/profiler2.c:6:
> progs/profiler.inc.h:246:5: error: redefinition of 'pids_cgrp_id' as different kind of symbol
> int pids_cgrp_id = 1;
> ^
> /home/jolsa/linux-qemu/tools/testing/selftests/bpf/tools/include/vmlinux.h:14531:2: note: previous definition is here
> pids_cgrp_id = 11,
> ^
> 1 error generated.
> /opt/clang/bin/llc: error: /opt/clang/bin/llc: <stdin>:1:1: error: expected top-level entity
> BPF obj compilation failed
> ^
> make: *** [Makefile:396: /home/jolsa/linux-qemu/tools/testing/selftests/bpf/profiler2.o] Error 1
I got the same error with some .config. We should fix it with something below.
I will send official patch soon.
Thanks,
Song
diff --git i/tools/testing/selftests/bpf/progs/profiler.inc.h
w/tools/testing/selftests/bpf/progs/profiler.inc.h
index 00578311a4233..54f594efccbca 100644
--- i/tools/testing/selftests/bpf/progs/profiler.inc.h
+++ w/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_cgrp_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_cgrp_id_) {
proc_kernfs =
BPF_CORE_READ(subsys, cgroup, kn);
root_kernfs =
BPF_CORE_READ(subsys, ss, root, kf_root, kn);
break;
next prev parent reply other threads:[~2020-10-14 0:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 1:12 [PATCH v2 bpf-next 0/4] bpf: Make the verifier recognize llvm register allocation patterns Alexei Starovoitov
2020-10-09 1:12 ` [PATCH v2 bpf-next 1/4] bpf: Propagate scalar ranges through register assignments Alexei Starovoitov
2020-10-09 19:42 ` John Fastabend
2020-10-09 1:12 ` [PATCH v2 bpf-next 2/4] bpf: Track spill/fill of bounded scalars Alexei Starovoitov
2020-10-09 19:49 ` John Fastabend
2020-10-09 1:12 ` [PATCH v2 bpf-next 3/4] selftests/bpf: Add profiler test Alexei Starovoitov
2020-10-09 6:49 ` Yonghong Song
2020-10-09 15:08 ` Alexei Starovoitov
2020-10-09 15:13 ` Yonghong Song
2020-10-13 19:56 ` Jiri Olsa
2020-10-13 21:03 ` Alexei Starovoitov
2020-10-13 21:56 ` Andrii Nakryiko
2020-10-15 6:09 ` Song Liu
2020-11-04 16:45 ` Jiri Olsa
2020-11-04 20:50 ` Andrii Nakryiko
2020-11-04 21:57 ` Jiri Olsa
2020-10-13 21:59 ` Jiri Olsa
2020-10-14 0:21 ` Song Liu [this message]
2020-10-09 1:12 ` [PATCH v2 bpf-next 4/4] selftests/bpf: Asm tests for the verifier regalloc tracking Alexei Starovoitov
2020-10-09 20:06 ` John Fastabend
2020-10-09 20:10 ` [PATCH v2 bpf-next 0/4] bpf: Make the verifier recognize llvm register allocation patterns patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPhsuW4ZnYmfSGAXibVEZVA79opyWxRnw2-m7VfsQngi9NLBBg@mail.gmail.com \
--to=song@kernel.org \
--cc=alexei.starovoitov@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=jolsa@redhat.com \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).