MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

linux-raspberrypi: Fix building selftest/bpf

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2020-03-14 09:15:44 -07:00 committed by Andrei Gherzan
parent e9d258ec59
commit 2aab60f22c
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
recipes-kernel/linux/files/0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch Normal file
View File

@ -0,0 +1,46 @@
From 552084d4da41833a97d19d12f5ee5c3ba02e400a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 14 Mar 2020 07:31:34 -0700
Subject: [PATCH V2] selftest/bpf: Use CHECK macro instead of RET_IF
backporting 634efb750435d0a489dc58477d4fcb88b2692942 causes build
failures because RET_IF is defined in 7ee0d4e97b889c0478af9c1a6e5af658b181423f
but that is not backported
Upstream-Status: Submitted
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Jakub Sitnicki <jakub@cloudflare.com>
Cc: Alexei Starovoitov <ast@kernel.org>
---
v2: Add return on check to get complete logic of RET_IF
tools/testing/selftests/bpf/test_select_reuseport.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_select_reuseport.c b/tools/testing/selftests/bpf/test_select_reuseport.c
index cdbbdab2725f..093ef8547abb 100644
--- a/tools/testing/selftests/bpf/test_select_reuseport.c
+++ b/tools/testing/selftests/bpf/test_select_reuseport.c
@@ -616,13 +616,15 @@ static void cleanup_per_test(void)
for (i = 0; i < NR_RESULTS; i++) {
err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY);
- RET_IF(err, "reset elem in result_map",
- "i:%u err:%d errno:%d\n", i, err, errno);
+ if (CHECK(err, "reset elem in result_map",
+ "i:%u err:%d errno:%d\n", i, err, errno))
+ return;
}
err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY);
- RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n",
- err, errno);
+ if (CHECK(err, "reset line number in linum_map", "err:%d errno:%d\n",
+ err, errno))
+ return;
for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++)
close(sk_fds[i]);
--
2.25.1

4
recipes-kernel/linux/linux-raspberrypi_4.19.bb
View File

@ -5,4 +5,6 @@ SRCREV = "2fab54c74bf956951e61c6d4fe473995e8d07010"
require linux-raspberrypi_4.19.inc
SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch"
SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \
file://0001-selftest-bpf-Use-CHECK-macro-instead-of-RET_IF.patch \
"