From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
"Ingo Molnar" <mingo@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
"Michael Petlan" <mpetlan@redhat.com>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Alexei Starovoitov" <alexei.starovoitov@gmail.com>,
"Martin KaFai Lau" <kafai@fb.com>,
"Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>,
"Andrii Nakryiko" <andriin@fb.com>,
"Quentin Monnet" <quentin.monnet@netronome.com>
Subject: [PATCH 6/6] selftests, bpftool: Add build test for libbpf dynamic linking
Date: Mon, 2 Dec 2019 14:18:46 +0100 [thread overview]
Message-ID: <20191202131847.30837-7-jolsa@kernel.org> (raw)
In-Reply-To: <20191202131847.30837-1-jolsa@kernel.org>
Adding new test to test_bpftool_build.sh script to
test the dynamic linkage of libbpf for bpftool:
$ ./test_bpftool_build.sh
[SNIP]
... with dynamic libbpf
$PWD: /home/jolsa/kernel/linux-perf/tools/bpf/bpftool
command: make -s -C ../../build/feature clean >/dev/null
command: make -s -C ../../lib/bpf clean >/dev/null
command: make -s -C ../../lib/bpf prefix=/tmp/tmp.fG8O2Ps8ER install_lib install_headers >/dev/null
Parsed description of 117 helper function(s)
command: make -s clean >/dev/null
command: make -s LIBBPF_DYNAMIC=1 LIBBPF_DIR=/tmp/tmp.fG8O2Ps8ER >/dev/null
binary: /home/jolsa/kernel/linux-perf/tools/bpf/bpftool/bpftool
binary: linked with libbpf
The test installs libbpf into temp directory
and links bpftool dynamically with it.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
.../selftests/bpf/test_bpftool_build.sh | 53 +++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/tools/testing/selftests/bpf/test_bpftool_build.sh b/tools/testing/selftests/bpf/test_bpftool_build.sh
index ac349a5cea7e..e4a6a0520f8e 100755
--- a/tools/testing/selftests/bpf/test_bpftool_build.sh
+++ b/tools/testing/selftests/bpf/test_bpftool_build.sh
@@ -85,6 +85,55 @@ make_with_tmpdir() {
echo
}
+# Assumes current directory is tools/bpf/bpftool
+make_with_dynamic_libbpf() {
+ TMPDIR=$(mktemp -d)
+ echo -e "\$PWD: $PWD"
+
+ # It might be needed to clean build tree first because features
+ # framework does not detect the change properly
+ echo -e "command: make -s -C ../../build/feature clean >/dev/null"
+ make $J -s -C ../../build/feature clean >/dev/null
+ if [ $? -ne 0 ] ; then
+ ERROR=1
+ fi
+ echo -e "command: make -s -C ../../lib/bpf clean >/dev/null"
+ make $J -s -C ../../lib/bpf clean >/dev/null
+ if [ $? -ne 0 ] ; then
+ ERROR=1
+ fi
+
+ # Now install libbpf into TMPDIR
+ echo -e "command: make -s -C ../../lib/bpf prefix=$TMPDIR install_lib install_headers >/dev/null"
+ make $J -s -C ../../lib/bpf prefix=$TMPDIR install_lib install_headers >/dev/null
+ if [ $? -ne 0 ] ; then
+ ERROR=1
+ fi
+
+ # And final bpftool build (with clean first) with libbpf dynamic link
+ echo -e "command: make -s clean >/dev/null"
+ if [ $? -ne 0 ] ; then
+ ERROR=1
+ fi
+ echo -e "command: make -s LIBBPF_DYNAMIC=1 LIBBPF_DIR=$TMPDIR >/dev/null"
+ make $J -s LIBBPF_DYNAMIC=1 LIBBPF_DIR=$TMPDIR >/dev/null
+ if [ $? -ne 0 ] ; then
+ ERROR=1
+ fi
+
+ check .
+ ldd bpftool | grep -q libbpf.so
+ if [ $? -ne 0 ] ; then
+ printf "FAILURE: Did not find libbpf linked\n"
+ else
+ echo "binary: linked with libbpf"
+ fi
+ make -s -C ../../lib/bpf clean
+ make -s clean
+ rm -rf -- $TMPDIR
+ echo
+}
+
echo "Trying to build bpftool"
echo -e "... through kbuild\n"
@@ -145,3 +194,7 @@ make_and_clean
make_with_tmpdir OUTPUT
make_with_tmpdir O
+
+echo -e "... with dynamic libbpf\n"
+
+make_with_dynamic_libbpf
--
2.21.0
next prev parent reply other threads:[~2019-12-02 13:19 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 13:18 [PATCHv4 0/6] perf/bpftool: Allow to link libbpf dynamically Jiri Olsa
2019-12-02 13:18 ` [PATCH 1/6] perf tools: Allow to specify libbpf install directory Jiri Olsa
2019-12-02 13:18 ` [PATCH 2/6] bpftool: Allow to link libbpf dynamically Jiri Olsa
2019-12-02 13:18 ` [PATCH 3/6] bpftool: Rename BPF_DIR Makefile variable to LIBBPF_SRC_DIR Jiri Olsa
2019-12-02 13:18 ` [PATCH 4/6] bpftool: Rename LIBBPF_OUTPUT Makefile variable to LIBBPF_BUILD_OUTPUT Jiri Olsa
2019-12-02 13:18 ` [PATCH 5/6] bpftool: Rename LIBBPF_PATH Makefile variable to LIBBPF_BUILD_PATH Jiri Olsa
2019-12-02 13:18 ` Jiri Olsa [this message]
2019-12-02 15:38 ` [PATCH 6/6] selftests, bpftool: Add build test for libbpf dynamic linking Quentin Monnet
2019-12-02 19:41 ` [PATCHv4 0/6] perf/bpftool: Allow to link libbpf dynamically Andrii Nakryiko
2019-12-02 21:15 ` Toke Høiland-Jørgensen
2019-12-04 5:52 ` Alexei Starovoitov
2019-12-04 9:01 ` Jiri Olsa
2019-12-04 10:57 ` Toke Høiland-Jørgensen
2019-12-04 17:39 ` Alexei Starovoitov
2019-12-04 18:27 ` Daniel Borkmann
2019-12-04 20:22 ` Toke Høiland-Jørgensen
2019-12-04 21:16 ` Andrii Nakryiko
2019-12-04 21:54 ` Jakub Kicinski
2019-12-04 23:39 ` Alexei Starovoitov
2019-12-05 0:23 ` Jakub Kicinski
2019-12-05 0:29 ` David Miller
2019-12-05 1:25 ` Alexei Starovoitov
2019-12-05 1:09 ` Alexei Starovoitov
2019-12-05 2:10 ` Jakub Kicinski
2019-12-05 3:17 ` Alexei Starovoitov
2019-12-05 4:26 ` Jakub Kicinski
2019-12-05 6:44 ` Alexei Starovoitov
2019-12-05 8:35 ` Jesper Dangaard Brouer
2019-12-05 12:09 ` Michal Rostecki
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=20191202131847.30837-7-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexei.starovoitov@gmail.com \
--cc=andriin@fb.com \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=quentin.monnet@netronome.com \
--cc=songliubraving@fb.com \
--cc=toke@redhat.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).