From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jesper Dangaard Brouer <brouer@redhat.com>,
John Fastabend <john.fastabend@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Shuah Khan <shuah@kernel.org>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
linux-rdma@vger.kernel.org,
"open list\:KERNEL SELFTEST FRAMEWORK"
<linux-kselftest@vger.kernel.org>,
clang-built-linux@googlegroups.com
Subject: Re: [PATCH bpf-next v3 04/11] tools/runqslower: Use consistent include paths for libbpf
Date: Fri, 17 Jan 2020 10:46:58 +0100 [thread overview]
Message-ID: <87tv4uqust.fsf@toke.dk> (raw)
In-Reply-To: <CAEf4BzbJZ7JUyr8p3YKX-Rrth_B7OMbih50xxyt_YNBd--107w@mail.gmail.com>
Andrii Nakryiko <andrii.nakryiko@gmail.com> writes:
> On Thu, Jan 16, 2020 at 5:23 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
>>
>> From: Toke Høiland-Jørgensen <toke@redhat.com>
>>
>> Fix the runqslower tool to include libbpf header files with the bpf/
>> prefix, to be consistent with external users of the library. Also ensure
>> that all includes of exported libbpf header files (those that are exported
>> on 'make install' of the library) use bracketed includes instead of quoted.
>>
>> To not break the build, keep the old include path until everything has been
>> changed to the new one; a subsequent patch will remove that.
>>
>> Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
>> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>> ---
>> tools/bpf/runqslower/Makefile | 5 +++--
>> tools/bpf/runqslower/runqslower.bpf.c | 2 +-
>> tools/bpf/runqslower/runqslower.c | 4 ++--
>> 3 files changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile
>> index 89fb7cd30f1a..c0512b830805 100644
>> --- a/tools/bpf/runqslower/Makefile
>> +++ b/tools/bpf/runqslower/Makefile
>> @@ -5,6 +5,7 @@ LLC := llc
>> LLVM_STRIP := llvm-strip
>> DEFAULT_BPFTOOL := $(OUTPUT)/sbin/bpftool
>> BPFTOOL ?= $(DEFAULT_BPFTOOL)
>> +LIBBPF_INCLUDE := -I$(abspath ../../lib) -I$(abspath ../../lib/bpf)
>
> I'd probably put all the -I's into single INCLUDES var and include
> that one instead of mixing -I$(OUTPUT) and $(LIBBPF_INCLUDE), but this
> works too.
Hmm, yeah, not a bad idea, actually. Since it seems I'm respinning
anyway, I'll fix that up as well.
-Toke
next prev parent reply other threads:[~2020-01-17 9:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 13:22 [PATCH bpf-next v3 00/11] tools: Use consistent libbpf include paths everywhere Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 01/11] samples/bpf: Don't try to remove user's homedir on clean Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 02/11] tools/bpf/runqslower: Fix override option for VMLINUX_BTF Toke Høiland-Jørgensen
2020-01-16 18:54 ` Andrii Nakryiko
2020-01-17 9:44 ` Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 03/11] selftests: Pass VMLINUX_BTF to runqslower Makefile Toke Høiland-Jørgensen
2020-01-16 18:56 ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 04/11] tools/runqslower: Use consistent include paths for libbpf Toke Høiland-Jørgensen
2020-01-16 21:56 ` Andrii Nakryiko
2020-01-17 9:46 ` Toke Høiland-Jørgensen [this message]
2020-01-16 13:22 ` [PATCH bpf-next v3 05/11] selftests: " Toke Høiland-Jørgensen
2020-01-16 21:57 ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 06/11] bpftool: " Toke Høiland-Jørgensen
2020-01-16 22:21 ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 07/11] perf: " Toke Høiland-Jørgensen
2020-01-16 22:22 ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 08/11] samples/bpf: " Toke Høiland-Jørgensen
2020-01-16 22:23 ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 09/11] selftests: Remove tools/lib/bpf from include path Toke Høiland-Jørgensen
2020-01-16 22:41 ` Andrii Nakryiko
2020-01-16 23:05 ` Andrii Nakryiko
2020-01-17 9:50 ` Toke Høiland-Jørgensen
2020-01-17 9:49 ` Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 10/11] tools/runqslower: " Toke Høiland-Jørgensen
2020-01-16 22:44 ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 11/11] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system Toke Høiland-Jørgensen
2020-01-16 22:43 ` Andrii Nakryiko
2020-01-17 4:14 ` [PATCH bpf-next v3 00/11] tools: Use consistent libbpf include paths everywhere Alexei Starovoitov
2020-01-17 8:57 ` Jesper Dangaard Brouer
2020-01-17 9:58 ` Toke Høiland-Jørgensen
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=87tv4uqust.fsf@toke.dk \
--to=toke@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=clang-built-linux@googlegroups.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=john.fastabend@gmail.com \
--cc=jolsa@redhat.com \
--cc=kafai@fb.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=shuah@kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.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).