From patchwork Wed Jul 27 00:11:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_M=C3=BCller?= X-Patchwork-Id: 12929937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14509C00144 for ; Wed, 27 Jul 2022 00:12:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232373AbiG0AMD (ORCPT ); Tue, 26 Jul 2022 20:12:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230315AbiG0AMD (ORCPT ); Tue, 26 Jul 2022 20:12:03 -0400 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07097E0FB for ; Tue, 26 Jul 2022 17:12:02 -0700 (PDT) Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A9A60240109 for ; Wed, 27 Jul 2022 02:12:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1658880720; bh=11eMSyD8csDMvi5prmpPvqxoSYzCD4UOLYwo5dt3tKo=; h=From:To:Cc:Subject:Date:From; b=TEMzzW7VN1+kBjOnaDPbT4SZKs0r/k+k9oYpkvpTOMGxVTvkYca9vAN1rQmOAEc+B wVZikX/KszNo87qrmbxgTMD+i2lFYcZzrIm6VYjpTmOHBgWr+xNwvB/3xP/uSnEP4Q viHWZaUSVCM0RgoVkA6DYWEjK6AV9lC5d02OrCW/4MRuSVM6rHj0ZjKGgrlwCrIRJh Iny/5l5yZxuxZ4AYQ3sCfFov41O2TMhLBBRmrXh+JsNbABQaqJAqtQg3yBjcp5pnqq VKvwS5fYDYr0ePxu5+m62f2DiCYocaTszYXpwO0Lr9vad04WXe86LuRRfH5qYD2IyJ V7UAA3chskGew== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4LsvNH5dXFz6tnX; Wed, 27 Jul 2022 02:11:59 +0200 (CEST) From: =?utf-8?q?Daniel_M=C3=BCller?= 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 Subject: [PATCH bpf-next v4 0/3] Maintain selftest configuration in-tree Date: Wed, 27 Jul 2022 00:11:53 +0000 Message-Id: <20220727001156.3553701-1-deso@posteo.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net 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 Acked-by: Martin KaFai Lau Acked-by: Mykola Lysenko --- 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