Skip to content

Commit 5d54d92

Browse files
committed
Sync with kernel-patches/vmtest
Signed-off-by: Ihor Solodrai <[email protected]>
1 parent ae7d600 commit 5d54d92

16 files changed

+219
-226
lines changed

.github/workflows/kernel-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
BPF_NEXT_BASE_BRANCH: 'master'
6161
BPF_NEXT_FETCH_DEPTH: 64 # A bit of history is needed to facilitate incremental builds
6262
CROSS_COMPILE: ${{ inputs.arch != 'x86_64' && 'true' || '' }}
63-
# BUILD_SCHED_EXT_SELFTESTS: ${{ inputs.arch == 'x86_64' || inputs.arch == 'aarch64' && 'true' || '' }}
63+
BUILD_SCHED_EXT_SELFTESTS: ${{ inputs.arch == 'x86_64' || inputs.arch == 'aarch64' && 'true' || '' }}
6464
KBUILD_OUTPUT: ${{ github.workspace }}/kbuild-output
6565
KERNEL: ${{ inputs.kernel }}
6666
KERNEL_ROOT: ${{ github.workspace }}

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
arch: ["x86_64"]
2020
kernel_compiler: ["gcc", "llvm"]
2121
gcc_version: [14]
22-
llvm_version: [18]
22+
llvm_version: [20]
2323
kernel: ["LATEST"]
2424
build_release: [false]
2525
tests:
@@ -28,7 +28,7 @@ jobs:
2828
- {"test": "test_progs_no_alu32", "continue_on_error": false, "timeout_minutes": 360}
2929
- {"test": "test_verifier", "continue_on_error": false, "timeout_minutes": 360}
3030
- {"test": "test_maps", "continue_on_error": false, "timeout_minutes": 360}
31-
# - {"test": "sched_ext", "continue_on_error": false, "timeout_minutes": 360}
31+
- {"test": "sched_ext", "continue_on_error": false, "timeout_minutes": 360}
3232
# - {"test": "test_progs-bpf_gcc", "continue_on_error": false, "timeout_minutes": 360}
3333
fail-fast: false
3434

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 42839864a62ee244ec280b09149b1cb439f681db Mon Sep 17 00:00:00 2001
2+
From: Manu Bretelle <[email protected]>
3+
Date: Fri, 27 Oct 2023 18:25:39 -0700
4+
Subject: [PATCH bpf-next] selftests/bpf: disable detection of llvm when
5+
building bpftool
6+
7+
The VMs in which we run the selftests do not have llvm installed.
8+
We build selftests/bpftool in a host that have llvm.
9+
bpftool currently will use llvm first and fallback to libbfd but there
10+
is no way to disable detection from the command line.
11+
12+
Removing it from the feature detection should force us to use libbfd.
13+
14+
Signed-off-by: Manu Bretelle <[email protected]>
15+
---
16+
tools/bpf/bpftool/Makefile | 2 --
17+
1 file changed, 2 deletions(-)
18+
19+
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
20+
index e9154ace80ff..01314458e25e 100644
21+
--- a/tools/bpf/bpftool/Makefile
22+
+++ b/tools/bpf/bpftool/Makefile
23+
@@ -95,7 +95,6 @@ RM ?= rm -f
24+
FEATURE_USER = .bpftool
25+
26+
FEATURE_TESTS := clang-bpf-co-re
27+
-FEATURE_TESTS += llvm
28+
FEATURE_TESTS += libcap
29+
FEATURE_TESTS += libbfd
30+
FEATURE_TESTS += libbfd-liberty
31+
@@ -104,7 +103,6 @@ FEATURE_TESTS += disassembler-four-args
32+
FEATURE_TESTS += disassembler-init-styled
33+
34+
FEATURE_DISPLAY := clang-bpf-co-re
35+
-FEATURE_DISPLAY += llvm
36+
FEATURE_DISPLAY += libcap
37+
FEATURE_DISPLAY += libbfd
38+
FEATURE_DISPLAY += libbfd-liberty
39+
--
40+
2.39.3
41+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From d31a7125891994681503770cff46a119692fb2b9 Mon Sep 17 00:00:00 2001
2+
From: Andrii Nakryiko <[email protected]>
3+
Date: Mon, 11 Dec 2023 17:09:38 -0800
4+
Subject: [PATCH 1/1] selftests/bpf: work around latest Clang smartness
5+
6+
Work around the issue while we deal with it in the Clang itself.
7+
See [0].
8+
9+
[0] https://github.com/llvm/llvm-project/pull/73662#issuecomment-1849281758
10+
11+
Signed-off-by: Andrii Nakryiko <[email protected]>
12+
---
13+
tools/testing/selftests/bpf/progs/iters.c | 2 +-
14+
1 file changed, 1 insertion(+), 1 deletion(-)
15+
16+
diff --git a/tools/testing/selftests/bpf/progs/iters.c b/tools/testing/selftests/bpf/progs/iters.c
17+
index 3aca3dc145b5..929ba6fa2105 100644
18+
--- a/tools/testing/selftests/bpf/progs/iters.c
19+
+++ b/tools/testing/selftests/bpf/progs/iters.c
20+
@@ -1420,7 +1420,7 @@ SEC("raw_tp")
21+
__success
22+
int iter_arr_with_actual_elem_count(const void *ctx)
23+
{
24+
- int i, n = loop_data.n, sum = 0;
25+
+ unsigned i, n = loop_data.n, sum = 0;
26+
27+
if (n > ARRAY_SIZE(loop_data.data))
28+
return 0;
29+
--
30+
2.34.1
31+

ci/diffs/20250602-0001-selftests-bpf-Fix-bpf-selftest-build-error.patch

Lines changed: 0 additions & 59 deletions
This file was deleted.

ci/diffs/20250602-0002-selftests-bpf-Fix-selftest-btf_tag-btf_type_tag_perc.patch

Lines changed: 0 additions & 59 deletions
This file was deleted.

ci/diffs/20250602-0003-perf-Fix-the-throttle-error-of-some-clock-events.patch

Lines changed: 0 additions & 98 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From 423112d2e9b591999efa4ad74000f8f6f3f381ea Mon Sep 17 00:00:00 2001
2+
From: Xing Guo <[email protected]>
3+
Date: Tue, 14 Oct 2025 16:03:23 +0800
4+
Subject: [PATCH 20251015/20251015] selftests: arg_parsing: Ensure data is
5+
flushed to disk before reading.
6+
7+
Recently, I noticed a selftest failure in my local environment. The
8+
test_parse_test_list_file writes some data to
9+
/tmp/bpf_arg_parsing_test.XXXXXX and parse_test_list_file() will read
10+
the data back. However, after writing data to that file, we forget to
11+
call fsync() and it's causing testing failure in my laptop. This patch
12+
helps fix it by adding the missing fsync() call.
13+
14+
Signed-off-by: Xing Guo <[email protected]>
15+
---
16+
tools/testing/selftests/bpf/prog_tests/arg_parsing.c | 1 +
17+
1 file changed, 1 insertion(+)
18+
19+
diff --git a/tools/testing/selftests/bpf/prog_tests/arg_parsing.c b/tools/testing/selftests/bpf/prog_tests/arg_parsing.c
20+
index fbf0d9c2f58b..d9fcbfb72aaa 100644
21+
--- a/tools/testing/selftests/bpf/prog_tests/arg_parsing.c
22+
+++ b/tools/testing/selftests/bpf/prog_tests/arg_parsing.c
23+
@@ -140,6 +140,7 @@ static void test_parse_test_list_file(void)
24+
fprintf(fp, "testA/subtest2\n");
25+
fprintf(fp, "testC_no_eof_newline");
26+
fflush(fp);
27+
+ fsync(fd);
28+
29+
if (!ASSERT_OK(ferror(fp), "prepare tmp"))
30+
goto out_fclose;
31+
--
32+
2.51.0
33+

0 commit comments

Comments
 (0)