From: "Daniel Müller" <deso@posteo.net>
To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org,
daniel@iogearbox.net, kernel-team@fb.com
Cc: mykolal@fb.com, Martin KaFai Lau <kafai@fb.com>
Subject: [PATCH bpf-next v4 0/3] Maintain selftest configuration in-tree
Date: Wed, 27 Jul 2022 00:11:53 +0000 [thread overview]
Message-ID: <20220727001156.3553701-1-deso@posteo.net> (raw)
BPF selftests mandate certain kernel configuration options to be present in
order to pass. Currently the "reference" config files containing these options
are hosted in a separate repository [0]. From there they are picked up by the
BPF continuous integration system as well as the in-tree vmtest.sh helper
script, which allows for running tests in a VM-based setup locally.
But it gets worse, as "BPF CI" is really two CI systems: one for libbpf
(mentioned above) and one for the bpf-next kernel repository (or more precisely:
family of repositories, as bpf-rc is using the system). As such, we have an
additional -- and slightly divergent -- copy of these configurations.
This patch set proposes the merging of said configurations into this repository.
Doing so provides several benefits:
1) the vmtest.sh script is now self-contained, no longer requiring to pull
configurations over the network
2) we can have a single copy of these configurations, eliminating the
maintenance burden of keeping two versions in-sync
3) the kernel tree is the place where most development happens, so it is the
most natural to adjust configurations as changes are proposed there, as
opposed to out-of-tree, where they would always remain an afterthought
The patch set is structured in such a way that we first integrate the external
configuration [0] and then adjust the vmtest.sh script to pick up the local
configuration instead of reaching out to GitHub.
[0] https://github.com/libbpf/libbpf/tree/20f03302350a4143825cedcbd210c4d7112c1898/travis-ci/vmtest/configs
Signed-off-by: Daniel Müller <deso@posteo.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Mykola Lysenko <mykolal@fb.com>
---
Changelog:
v3 -> v4:
- corrected version in cover letter
v2 -> v3:
- removed seven more options from s390x configuration that overlapped with
pre-existing config
v1 -> v2:
- minimized imported kernel configs and made them build on top of existing
tools/testing/selftests/bpf/config
- moved them directly into tools/testing/selftests/bpf/
- sorted and cleaned up tools/testing/selftests/bpf/config
- removed "selftests/bpf: Integrate vmtest configs" from patch set
- removed 4.9 & 5.5 configs
Daniel Müller (3):
selftests/bpf: Sort configuration
selftests/bpf: Copy over libbpf configs
selftests/bpf: Adjust vmtest.sh to use local kernel configuration
tools/testing/selftests/bpf/DENYLIST | 6 +
tools/testing/selftests/bpf/DENYLIST.s390x | 67 ++++++
tools/testing/selftests/bpf/config | 101 ++++-----
tools/testing/selftests/bpf/config.s390x | 147 ++++++++++++
tools/testing/selftests/bpf/config.x86_64 | 251 +++++++++++++++++++++
tools/testing/selftests/bpf/vmtest.sh | 51 +++--
6 files changed, 554 insertions(+), 69 deletions(-)
create mode 100644 tools/testing/selftests/bpf/DENYLIST
create mode 100644 tools/testing/selftests/bpf/DENYLIST.s390x
create mode 100644 tools/testing/selftests/bpf/config.s390x
create mode 100644 tools/testing/selftests/bpf/config.x86_64
--
2.30.2
next reply other threads:[~2022-07-27 0:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 0:11 Daniel Müller [this message]
2022-07-27 0:11 ` [PATCH bpf-next v4 1/3] selftests/bpf: Sort configuration Daniel Müller
2022-07-27 0:11 ` [PATCH bpf-next v4 2/3] selftests/bpf: Copy over libbpf configs Daniel Müller
2022-07-27 0:11 ` [PATCH bpf-next v4 3/3] selftests/bpf: Adjust vmtest.sh to use local kernel configuration Daniel Müller
2022-07-27 15:10 ` [PATCH bpf-next v4 0/3] Maintain selftest configuration in-tree 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=20220727001156.3553701-1-deso@posteo.net \
--to=deso@posteo.net \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-team@fb.com \
--cc=mykolal@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