Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/kernel-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
BPF_NEXT_BASE_BRANCH: 'master'
BPF_NEXT_FETCH_DEPTH: 64 # A bit of history is needed to facilitate incremental builds
CROSS_COMPILE: ${{ inputs.arch != 'x86_64' && 'true' || '' }}
# BUILD_SCHED_EXT_SELFTESTS: ${{ inputs.arch == 'x86_64' || inputs.arch == 'aarch64' && 'true' || '' }}
BUILD_SCHED_EXT_SELFTESTS: ${{ inputs.arch == 'x86_64' || inputs.arch == 'aarch64' && 'true' || '' }}
KBUILD_OUTPUT: ${{ github.workspace }}/kbuild-output
KERNEL: ${{ inputs.kernel }}
KERNEL_ROOT: ${{ github.workspace }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
arch: ["x86_64"]
kernel_compiler: ["gcc", "llvm"]
gcc_version: [14]
llvm_version: [18]
llvm_version: [20]
kernel: ["LATEST"]
build_release: [false]
tests:
Expand All @@ -28,7 +28,7 @@ jobs:
- {"test": "test_progs_no_alu32", "continue_on_error": false, "timeout_minutes": 360}
- {"test": "test_verifier", "continue_on_error": false, "timeout_minutes": 360}
- {"test": "test_maps", "continue_on_error": false, "timeout_minutes": 360}
# - {"test": "sched_ext", "continue_on_error": false, "timeout_minutes": 360}
- {"test": "sched_ext", "continue_on_error": false, "timeout_minutes": 360}
# - {"test": "test_progs-bpf_gcc", "continue_on_error": false, "timeout_minutes": 360}
fail-fast: false

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 42839864a62ee244ec280b09149b1cb439f681db Mon Sep 17 00:00:00 2001
From: Manu Bretelle <chantr4@gmail.com>
Date: Fri, 27 Oct 2023 18:25:39 -0700
Subject: [PATCH bpf-next] selftests/bpf: disable detection of llvm when
building bpftool

The VMs in which we run the selftests do not have llvm installed.
We build selftests/bpftool in a host that have llvm.
bpftool currently will use llvm first and fallback to libbfd but there
is no way to disable detection from the command line.

Removing it from the feature detection should force us to use libbfd.

Signed-off-by: Manu Bretelle <chantr4@gmail.com>
---
tools/bpf/bpftool/Makefile | 2 --
1 file changed, 2 deletions(-)

diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index e9154ace80ff..01314458e25e 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -95,7 +95,6 @@ RM ?= rm -f
FEATURE_USER = .bpftool

FEATURE_TESTS := clang-bpf-co-re
-FEATURE_TESTS += llvm
FEATURE_TESTS += libcap
FEATURE_TESTS += libbfd
FEATURE_TESTS += libbfd-liberty
@@ -104,7 +103,6 @@ FEATURE_TESTS += disassembler-four-args
FEATURE_TESTS += disassembler-init-styled

FEATURE_DISPLAY := clang-bpf-co-re
-FEATURE_DISPLAY += llvm
FEATURE_DISPLAY += libcap
FEATURE_DISPLAY += libbfd
FEATURE_DISPLAY += libbfd-liberty
--
2.39.3

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From d31a7125891994681503770cff46a119692fb2b9 Mon Sep 17 00:00:00 2001
From: Andrii Nakryiko <andrii@kernel.org>
Date: Mon, 11 Dec 2023 17:09:38 -0800
Subject: [PATCH 1/1] selftests/bpf: work around latest Clang smartness

Work around the issue while we deal with it in the Clang itself.
See [0].

[0] https://github.com/llvm/llvm-project/pull/73662#issuecomment-1849281758

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/testing/selftests/bpf/progs/iters.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/progs/iters.c b/tools/testing/selftests/bpf/progs/iters.c
index 3aca3dc145b5..929ba6fa2105 100644
--- a/tools/testing/selftests/bpf/progs/iters.c
+++ b/tools/testing/selftests/bpf/progs/iters.c
@@ -1420,7 +1420,7 @@ SEC("raw_tp")
__success
int iter_arr_with_actual_elem_count(const void *ctx)
{
- int i, n = loop_data.n, sum = 0;
+ unsigned i, n = loop_data.n, sum = 0;

if (n > ARRAY_SIZE(loop_data.data))
return 0;
--
2.34.1

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 423112d2e9b591999efa4ad74000f8f6f3f381ea Mon Sep 17 00:00:00 2001
From: Xing Guo <higuoxing@gmail.com>
Date: Tue, 14 Oct 2025 16:03:23 +0800
Subject: [PATCH 20251015/20251015] selftests: arg_parsing: Ensure data is
flushed to disk before reading.

Recently, I noticed a selftest failure in my local environment. The
test_parse_test_list_file writes some data to
/tmp/bpf_arg_parsing_test.XXXXXX and parse_test_list_file() will read
the data back. However, after writing data to that file, we forget to
call fsync() and it's causing testing failure in my laptop. This patch
helps fix it by adding the missing fsync() call.

Signed-off-by: Xing Guo <higuoxing@gmail.com>
---
tools/testing/selftests/bpf/prog_tests/arg_parsing.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/bpf/prog_tests/arg_parsing.c b/tools/testing/selftests/bpf/prog_tests/arg_parsing.c
index fbf0d9c2f58b..d9fcbfb72aaa 100644
--- a/tools/testing/selftests/bpf/prog_tests/arg_parsing.c
+++ b/tools/testing/selftests/bpf/prog_tests/arg_parsing.c
@@ -140,6 +140,7 @@ static void test_parse_test_list_file(void)
fprintf(fp, "testA/subtest2\n");
fprintf(fp, "testC_no_eof_newline");
fflush(fp);
+ fsync(fd);

if (!ASSERT_OK(ferror(fp), "prepare tmp"))
goto out_fclose;
--
2.51.0

Loading
Loading