From: Alexei Starovoitov <ast@fb.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Wang Nan <wangnan0@huawei.com>, <joe@ovn.org>
Subject: Re: linux-next: build failure after merge of the net tree
Date: Mon, 13 Feb 2017 15:31:56 -0800 [thread overview]
Message-ID: <58A241EC.8050400@fb.com> (raw)
In-Reply-To: <20170214091250.57d054b2@canb.auug.org.au>
On 2/13/17 2:12 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net tree, today's linux-next build (powerpc64le perf)
> failed like this:
>
> Warning: tools/include/uapi/linux/bpf.h differs from kernel
> bpf.c: In function 'bpf_prog_attach':
> bpf.c:180:6: error: 'union bpf_attr' has no member named 'attach_flags'; did you mean 'map_flags'?
> attr.attach_flags = flags;
> ^
>
> Caused by commit
>
> 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
>
> Unfortunately, the perf header files are kept separate from the kernel
> header files proper and are not automatically copied over :-(
>
> I have applied the following build fix patch for today.
Yes. Thanks for the fix. It's more than a merge conflict.
I should have added it in the first place. Now we have both
perf and samples/bpf depend on tools/lib/bpf and I simply
forgot about this dependency, since building perf
is not my typical workflow.
Joe,
can you think of a way to make tools/lib/bpf to
use tools/include only?
Right now we just pull tools/lib/bpf/bpf.o in samples/bpf/Makefile
and that's a hack that caused this issue.
samples/bpf/ needs to depend on libbpf.a properly.
For the patch:
Acked-by: Alexei Starovoitov <ast@kernel.org>
Dave,
can you apply it to 'net' tree,
since the patch properly made it into patchwork ?
or I can resubmit it.
Thanks!
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 14 Feb 2017 08:22:20 +1100
> Subject: [PATCH] bpf: kernel header files need to be copied into the tools directory
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> tools/include/uapi/linux/bpf.h | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> index 0eb0e87dbe9f..d2b0ac799d03 100644
> --- a/tools/include/uapi/linux/bpf.h
> +++ b/tools/include/uapi/linux/bpf.h
> @@ -116,6 +116,12 @@ enum bpf_attach_type {
>
> #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
>
> +/* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command
> + * to the given target_fd cgroup the descendent cgroup will be able to
> + * override effective bpf program that was inherited from this cgroup
> + */
> +#define BPF_F_ALLOW_OVERRIDE (1U << 0)
> +
> #define BPF_PSEUDO_MAP_FD 1
>
> /* flags for BPF_MAP_UPDATE_ELEM command */
> @@ -171,6 +177,7 @@ union bpf_attr {
> __u32 target_fd; /* container object to attach to */
> __u32 attach_bpf_fd; /* eBPF program to attach */
> __u32 attach_type;
> + __u32 attach_flags;
> };
> } __attribute__((aligned(8)));
>
>
next prev parent reply other threads:[~2017-02-13 23:31 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-13 22:12 linux-next: build failure after merge of the net tree Stephen Rothwell
2017-02-13 23:31 ` Alexei Starovoitov [this message]
2017-02-14 7:59 ` Joe Stringer
2017-02-14 6:35 ` Ingo Molnar
2017-02-14 6:42 ` Ingo Molnar
2017-02-14 9:19 ` Jiri Olsa
2017-02-14 12:50 ` Arnaldo Carvalho de Melo
2017-02-14 13:23 ` Jiri Olsa
2017-02-14 13:54 ` Arnaldo Carvalho de Melo
2017-02-16 3:02 ` Stephen Rothwell
2017-02-16 3:06 ` Alexei Starovoitov
2017-02-16 3:27 ` David Miller
2017-02-16 3:30 ` Alexei Starovoitov
2017-02-16 3:42 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-04-10 22:42 Stephen Rothwell
2023-05-17 23:06 Stephen Rothwell
2023-05-17 23:29 ` Stephen Rothwell
2023-05-18 4:42 ` Jakub Kicinski
2023-05-18 6:47 ` Paolo Abeni
2023-05-18 6:52 ` Dario Binacchi
2023-05-18 7:14 ` Paolo Abeni
2023-05-18 9:37 ` Marc Kleine-Budde
2021-07-06 23:11 Stephen Rothwell
2021-07-08 4:01 ` Stephen Rothwell
2018-11-15 6:02 Stephen Rothwell
2017-06-08 0:08 Stephen Rothwell
2017-06-08 0:17 ` David Miller
2017-06-08 7:22 ` Greg Kroah-Hartman
2017-06-08 9:00 ` Stephen Rothwell
2016-10-20 22:27 Stephen Rothwell
2016-10-20 22:42 ` Florian Fainelli
2016-10-21 0:30 ` Florian Fainelli
2016-10-21 0:43 ` Stephen Rothwell
2016-10-21 0:46 ` Florian Fainelli
2014-10-14 23:44 Stephen Rothwell
2014-10-15 2:02 ` David Miller
2014-10-15 5:24 ` Giuseppe CAVALLARO
2014-09-17 1:04 Stephen Rothwell
2014-09-17 1:12 ` Stephen Rothwell
2014-09-17 1:48 ` David Miller
2014-09-17 2:18 ` Stephen Rothwell
2014-09-16 0:24 Stephen Rothwell
2014-08-26 2:05 Stephen Rothwell
2014-08-26 3:22 ` David Miller
2014-08-26 3:33 ` Stephen Rothwell
2014-07-30 0:36 Stephen Rothwell
2014-07-30 8:26 ` Oliver Neukum
2014-07-04 1:39 Stephen Rothwell
2014-07-08 2:53 ` David Miller
2014-07-08 16:28 ` Florian Fainelli
2014-07-23 18:38 ` Vince Bridgers
2014-07-23 18:40 ` Florian Fainelli
2014-07-23 18:42 ` Vince Bridgers
2014-05-20 0:59 Stephen Rothwell
2014-05-20 14:50 ` Vlad Yasevich
2012-10-04 0:18 Stephen Rothwell
2012-10-04 0:50 ` David Miller
2012-10-04 1:06 ` Stephen Rothwell
2012-10-04 1:47 ` David Miller
2012-10-04 2:12 ` Jay Hernandez
2011-08-16 3:26 Stephen Rothwell
2011-08-16 4:03 ` David Miller
2011-08-12 2:02 Stephen Rothwell
2011-08-12 2:31 ` Jeff Kirsher
2011-08-12 2:51 ` David Miller
2011-08-12 3:05 ` Jeff Kirsher
2011-08-12 4:34 ` Stephen Rothwell
2011-08-12 5:22 ` Jeff Kirsher
2011-06-09 4:56 Stephen Rothwell
2011-06-09 5:17 ` Greg K-H
2011-06-09 5:39 ` Stephen Rothwell
2011-06-09 19:29 ` Greg KH
2011-06-10 20:28 ` Geert Uytterhoeven
2011-06-11 4:26 ` Stephen Rothwell
2011-06-11 11:39 ` Geert Uytterhoeven
2011-06-14 22:56 ` Stephen Rothwell
2011-06-20 4:58 ` Stephen Rothwell
2011-06-20 5:36 ` David Miller
2011-04-26 3:51 Stephen Rothwell
2011-04-26 19:43 ` David Miller
2011-04-13 2:03 Stephen Rothwell
2011-04-13 2:28 ` David Miller
2011-04-04 1:28 Stephen Rothwell
2011-04-04 2:43 ` David Miller
2011-03-14 4:24 Stephen Rothwell
2011-03-14 4:59 ` Ben Hutchings
2011-03-14 5:31 ` Stephen Rothwell
2011-03-14 5:53 ` David Miller
2011-03-14 6:05 ` Stephen Rothwell
2011-03-14 6:18 ` David Miller
2011-03-14 9:44 ` Thomas Gleixner
2011-03-14 9:56 ` Thomas Gleixner
2011-03-15 0:30 ` Stephen Rothwell
2011-03-15 4:07 ` David Miller
2011-03-15 6:25 ` Stephen Rothwell
2011-03-15 10:29 ` Thomas Gleixner
2011-03-15 22:07 ` David Miller
2011-03-09 2:42 Stephen Rothwell
2011-03-09 6:45 ` David Miller
2011-01-21 1:05 Stephen Rothwell
2011-01-21 1:10 ` David Miller
2010-12-09 2:28 Stephen Rothwell
2010-12-09 2:39 ` David Miller
2010-12-09 3:02 ` Stephen Rothwell
2010-12-07 1:00 Stephen Rothwell
2010-12-07 4:46 ` David Miller
2010-12-07 4:57 ` Joe Perches
2010-12-07 18:34 ` Breno Leitao
2010-11-29 0:08 Stephen Rothwell
2010-11-29 2:11 ` David Miller
2010-11-29 7:25 ` Peppe CAVALLARO
2010-11-16 0:34 Stephen Rothwell
2010-11-16 4:15 ` David Miller
2010-10-15 0:38 Stephen Rothwell
2010-10-14 22:07 ` Jeff Kirsher
2010-08-27 1:14 Stephen Rothwell
2010-08-27 3:32 ` David Miller
2010-06-15 2:00 Stephen Rothwell
2010-06-15 2:13 ` David Miller
2010-06-15 3:42 ` Stephen Rothwell
2010-05-03 2:08 Stephen Rothwell
2010-05-03 2:37 ` David Miller
2010-05-03 4:44 ` Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 3:12 ` David Miller
2010-04-07 5:28 ` Stephen Rothwell
2010-02-15 4:20 Stephen Rothwell
2010-02-15 6:22 ` David Miller
2010-02-08 2:22 Stephen Rothwell
2010-02-08 3:40 ` David Miller
2010-02-08 3:58 ` Stephen Rothwell
2010-02-05 5:50 Stephen Rothwell
2010-02-05 6:32 ` David Miller
2010-02-05 11:49 ` Stephen Rothwell
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=58A241EC.8050400@fb.com \
--to=ast@fb.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=joe@ovn.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=wangnan0@huawei.com \
/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).