[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 51f1892b5289f0c09745d3bedb36493555d6d90c WARNING: Author mismatch between patch and upstream commit: Backport author: Shung-Hsi Yu <shung-hsi.yu@xxxxxxxx> Commit author: Daniel Borkmann <daniel@xxxxxxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-26 08:22:18.936605010 -0500 +++ /tmp/tmp.xbIXWjRPTW 2024-11-26 08:22:18.933319684 -0500 @@ -1,3 +1,5 @@ +[ Upstream commit 51f1892b5289f0c09745d3bedb36493555d6d90c ] + Add a minimal netlink helper library for the BPF selftests. This has been taken and cut down and cleaned up from iproute2. This covers basics such as netdevice creation which we need for BPF selftests / BPF CI given @@ -13,6 +15,7 @@ Acked-by: Martin KaFai Lau <martin.lau@xxxxxxxxxx> Link: https://lore.kernel.org/r/20231024214904.29825-7-daniel@xxxxxxxxxxxxx Signed-off-by: Martin KaFai Lau <martin.lau@xxxxxxxxxx> +Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@xxxxxxxx> --- tools/testing/selftests/bpf/Makefile | 19 +- tools/testing/selftests/bpf/netlink_helpers.c | 358 ++++++++++++++++++ @@ -22,10 +25,10 @@ create mode 100644 tools/testing/selftests/bpf/netlink_helpers.h diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile -index 4225f975fce3f..9c27b67bc7b13 100644 +index f5a3a84fac95..4e569d155da5 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile -@@ -585,11 +585,20 @@ endef +@@ -590,11 +590,20 @@ endef # Define test_progs test runner. TRUNNER_TESTS_DIR := prog_tests TRUNNER_BPF_PROGS_DIR := progs @@ -53,7 +56,7 @@ $(OUTPUT)/liburandom_read.so \ diff --git a/tools/testing/selftests/bpf/netlink_helpers.c b/tools/testing/selftests/bpf/netlink_helpers.c new file mode 100644 -index 0000000000000..caf36eb1d0323 +index 000000000000..caf36eb1d032 --- /dev/null +++ b/tools/testing/selftests/bpf/netlink_helpers.c @@ -0,0 +1,358 @@ @@ -417,7 +420,7 @@ +} diff --git a/tools/testing/selftests/bpf/netlink_helpers.h b/tools/testing/selftests/bpf/netlink_helpers.h new file mode 100644 -index 0000000000000..68116818a47e5 +index 000000000000..68116818a47e --- /dev/null +++ b/tools/testing/selftests/bpf/netlink_helpers.h @@ -0,0 +1,46 @@ @@ -467,3 +470,6 @@ +struct rtattr *addattr_nest(struct nlmsghdr *n, int maxlen, int type); +int addattr_nest_end(struct nlmsghdr *n, struct rtattr *nest); +#endif /* NETLINK_HELPERS_H */ +-- +2.47.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success | | stable/linux-6.1.y | Failed | N/A |
