From: Greg Kroah-Hartman Date: Sat, 3 Feb 2024 03:37:16 +0000 (-0800) Subject: 6.7-stable patches X-Git-Tag: v6.1.77~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74aba1ba1b9069477dd05c85e89bceb2675ef687;p=thirdparty%2Fkernel%2Fstable-queue.git 6.7-stable patches added patches: selftests-bpf-remove-flaky-test_btf_id-test.patch --- diff --git a/queue-6.7/selftests-bpf-remove-flaky-test_btf_id-test.patch b/queue-6.7/selftests-bpf-remove-flaky-test_btf_id-test.patch new file mode 100644 index 00000000000..05baaf4e351 --- /dev/null +++ b/queue-6.7/selftests-bpf-remove-flaky-test_btf_id-test.patch @@ -0,0 +1,53 @@ +From 56925f389e152dcb8d093435d43b78a310539c23 Mon Sep 17 00:00:00 2001 +From: Yonghong Song +Date: Thu, 14 Dec 2023 12:38:20 -0800 +Subject: selftests/bpf: Remove flaky test_btf_id test + +From: Yonghong Song + +commit 56925f389e152dcb8d093435d43b78a310539c23 upstream. + +With previous patch, one of subtests in test_btf_id becomes +flaky and may fail. The following is a failing example: + + Error: #26 btf + Error: #26/174 btf/BTF ID + Error: #26/174 btf/BTF ID + btf_raw_create:PASS:check 0 nsec + btf_raw_create:PASS:check 0 nsec + test_btf_id:PASS:check 0 nsec + ... + test_btf_id:PASS:check 0 nsec + test_btf_id:FAIL:check BTF lingersdo_test_get_info:FAIL:check failed: -1 + +The test tries to prove a btf_id not available after the map is closed. +But btf_id is freed only after workqueue and a rcu grace period, compared +to previous case just after a rcu grade period. +Depending on system workload, workqueue could take quite some time +to execute function bpf_map_free_deferred() which may cause the test failure. +Instead of adding arbitrary delays, let us remove the logic to +check btf_id availability after map is closed. + +Signed-off-by: Yonghong Song +Link: https://lore.kernel.org/r/20231214203820.1469402-1-yonghong.song@linux.dev +Signed-off-by: Alexei Starovoitov +Signed-off-by: Samasth Norway Ananda +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/bpf/prog_tests/btf.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/tools/testing/selftests/bpf/prog_tests/btf.c ++++ b/tools/testing/selftests/bpf/prog_tests/btf.c +@@ -4630,11 +4630,6 @@ static int test_btf_id(unsigned int test + /* The map holds the last ref to BTF and its btf_id */ + close(map_fd); + map_fd = -1; +- btf_fd[0] = bpf_btf_get_fd_by_id(map_info.btf_id); +- if (CHECK(btf_fd[0] >= 0, "BTF lingers")) { +- err = -1; +- goto done; +- } + + fprintf(stderr, "OK"); + diff --git a/queue-6.7/series b/queue-6.7/series index 852515dcb1a..d5d60057bfe 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -350,3 +350,4 @@ arm64-irq-set-the-correct-node-for-shadow-call-stack.patch mm-kmsan-fix-infinite-recursion-due-to-rcu-critical-section.patch revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch drm-msm-dsi-enable-runtime-pm.patch +selftests-bpf-remove-flaky-test_btf_id-test.patch