From: Greg Kroah-Hartman Date: Sun, 10 Apr 2022 15:01:14 +0000 (+0200) Subject: fix up libbpf patch to apply with quilt properly X-Git-Tag: v4.9.310~106 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4752bd3e0eb1c9433eb6f5428f65db7ca7af5818;p=thirdparty%2Fkernel%2Fstable-queue.git fix up libbpf patch to apply with quilt properly --- diff --git a/queue-5.10/libbpf-fix-build-issue-with-llvm-readelf.patch b/queue-5.10/libbpf-fix-build-issue-with-llvm-readelf.patch index b144e94c045..25a5b646222 100644 --- a/queue-5.10/libbpf-fix-build-issue-with-llvm-readelf.patch +++ b/queue-5.10/libbpf-fix-build-issue-with-llvm-readelf.patch @@ -12,38 +12,38 @@ readelf is a symbolic link to llvm-readelf. In such cases, llvm-readelf will be used instead of default binutils readelf, and the following error will appear during libbpf build: - Warning: Num of global symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) - does NOT match with num of versioned symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). - Please make sure all LIBBPF_API symbols are versioned in libbpf.map. - --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... - +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... - @@ -324,6 +324,22 @@ - btf__str_by_offset - btf__type_by_id - btf__type_cnt - +LIBBPF_0.0.1 - +LIBBPF_0.0.2 - +LIBBPF_0.0.3 - +LIBBPF_0.0.4 - +LIBBPF_0.0.5 - +LIBBPF_0.0.6 - +LIBBPF_0.0.7 - +LIBBPF_0.0.8 - +LIBBPF_0.0.9 - +LIBBPF_0.1.0 - +LIBBPF_0.2.0 - +LIBBPF_0.3.0 - +LIBBPF_0.4.0 - +LIBBPF_0.5.0 - +LIBBPF_0.6.0 - +LIBBPF_0.7.0 - libbpf_attach_type_by_name - libbpf_find_kernel_btf - libbpf_find_vmlinux_btf_id - make[2]: *** [Makefile:184: check_abi] Error 1 - make[1]: *** [Makefile:140: all] Error 2 +# Warning: Num of global symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) +# does NOT match with num of versioned symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). +# Please make sure all LIBBPF_API symbols are versioned in libbpf.map. +# --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... +# +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... +# @@ -324,6 +324,22 @@ +# btf__str_by_offset +# btf__type_by_id +# btf__type_cnt +# +LIBBPF_0.0.1 +# +LIBBPF_0.0.2 +# +LIBBPF_0.0.3 +# +LIBBPF_0.0.4 +# +LIBBPF_0.0.5 +# +LIBBPF_0.0.6 +# +LIBBPF_0.0.7 +# +LIBBPF_0.0.8 +# +LIBBPF_0.0.9 +# +LIBBPF_0.1.0 +# +LIBBPF_0.2.0 +# +LIBBPF_0.3.0 +# +LIBBPF_0.4.0 +# +LIBBPF_0.5.0 +# +LIBBPF_0.6.0 +# +LIBBPF_0.7.0 +# libbpf_attach_type_by_name +# libbpf_find_kernel_btf +# libbpf_find_vmlinux_btf_id +# make[2]: *** [Makefile:184: check_abi] Error 1 +# make[1]: *** [Makefile:140: all] Error 2 The above failure is due to different printouts for some ABS versioned symbols. For example, with the same libbpf.so, @@ -66,15 +66,14 @@ Signed-off-by: Yonghong Song Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220204214355.502108-1-yhs@fb.com Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - tools/lib/bpf/Makefile | 4 ++-- + tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile -index 154b75fc1373..f2a353bba25f 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile -@@ -147,7 +147,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ +@@ -147,7 +147,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s -- sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ @@ -83,7 +82,7 @@ index 154b75fc1373..f2a353bba25f 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) -@@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_SCRIPT) +@@ -216,7 +216,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ @@ -92,6 +91,3 @@ index 154b75fc1373..f2a353bba25f 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ diff -u $(OUTPUT)libbpf_global_syms.tmp \ --- -2.35.1 - diff --git a/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch b/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch index 53ad0aebecf..64534e6e8ea 100644 --- a/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch +++ b/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch @@ -12,38 +12,38 @@ readelf is a symbolic link to llvm-readelf. In such cases, llvm-readelf will be used instead of default binutils readelf, and the following error will appear during libbpf build: - Warning: Num of global symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) - does NOT match with num of versioned symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). - Please make sure all LIBBPF_API symbols are versioned in libbpf.map. - --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... - +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... - @@ -324,6 +324,22 @@ - btf__str_by_offset - btf__type_by_id - btf__type_cnt - +LIBBPF_0.0.1 - +LIBBPF_0.0.2 - +LIBBPF_0.0.3 - +LIBBPF_0.0.4 - +LIBBPF_0.0.5 - +LIBBPF_0.0.6 - +LIBBPF_0.0.7 - +LIBBPF_0.0.8 - +LIBBPF_0.0.9 - +LIBBPF_0.1.0 - +LIBBPF_0.2.0 - +LIBBPF_0.3.0 - +LIBBPF_0.4.0 - +LIBBPF_0.5.0 - +LIBBPF_0.6.0 - +LIBBPF_0.7.0 - libbpf_attach_type_by_name - libbpf_find_kernel_btf - libbpf_find_vmlinux_btf_id - make[2]: *** [Makefile:184: check_abi] Error 1 - make[1]: *** [Makefile:140: all] Error 2 +# Warning: Num of global symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) +# does NOT match with num of versioned symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). +# Please make sure all LIBBPF_API symbols are versioned in libbpf.map. +# --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... +# +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... +# @@ -324,6 +324,22 @@ +# btf__str_by_offset +# btf__type_by_id +# btf__type_cnt +# +LIBBPF_0.0.1 +# +LIBBPF_0.0.2 +# +LIBBPF_0.0.3 +# +LIBBPF_0.0.4 +# +LIBBPF_0.0.5 +# +LIBBPF_0.0.6 +# +LIBBPF_0.0.7 +# +LIBBPF_0.0.8 +# +LIBBPF_0.0.9 +# +LIBBPF_0.1.0 +# +LIBBPF_0.2.0 +# +LIBBPF_0.3.0 +# +LIBBPF_0.4.0 +# +LIBBPF_0.5.0 +# +LIBBPF_0.6.0 +# +LIBBPF_0.7.0 +# libbpf_attach_type_by_name +# libbpf_find_kernel_btf +# libbpf_find_vmlinux_btf_id +# make[2]: *** [Makefile:184: check_abi] Error 1 +# make[1]: *** [Makefile:140: all] Error 2 The above failure is due to different printouts for some ABS versioned symbols. For example, with the same libbpf.so, @@ -66,6 +66,7 @@ Signed-off-by: Yonghong Song Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220204214355.502108-1-yhs@fb.com Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/queue-5.16/libbpf-fix-build-issue-with-llvm-readelf.patch b/queue-5.16/libbpf-fix-build-issue-with-llvm-readelf.patch index 1e57e69acf6..ea8d9bd1bb9 100644 --- a/queue-5.16/libbpf-fix-build-issue-with-llvm-readelf.patch +++ b/queue-5.16/libbpf-fix-build-issue-with-llvm-readelf.patch @@ -12,38 +12,38 @@ readelf is a symbolic link to llvm-readelf. In such cases, llvm-readelf will be used instead of default binutils readelf, and the following error will appear during libbpf build: - Warning: Num of global symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) - does NOT match with num of versioned symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). - Please make sure all LIBBPF_API symbols are versioned in libbpf.map. - --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... - +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... - @@ -324,6 +324,22 @@ - btf__str_by_offset - btf__type_by_id - btf__type_cnt - +LIBBPF_0.0.1 - +LIBBPF_0.0.2 - +LIBBPF_0.0.3 - +LIBBPF_0.0.4 - +LIBBPF_0.0.5 - +LIBBPF_0.0.6 - +LIBBPF_0.0.7 - +LIBBPF_0.0.8 - +LIBBPF_0.0.9 - +LIBBPF_0.1.0 - +LIBBPF_0.2.0 - +LIBBPF_0.3.0 - +LIBBPF_0.4.0 - +LIBBPF_0.5.0 - +LIBBPF_0.6.0 - +LIBBPF_0.7.0 - libbpf_attach_type_by_name - libbpf_find_kernel_btf - libbpf_find_vmlinux_btf_id - make[2]: *** [Makefile:184: check_abi] Error 1 - make[1]: *** [Makefile:140: all] Error 2 +# Warning: Num of global symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) +# does NOT match with num of versioned symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). +# Please make sure all LIBBPF_API symbols are versioned in libbpf.map. +# --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... +# +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... +# @@ -324,6 +324,22 @@ +# btf__str_by_offset +# btf__type_by_id +# btf__type_cnt +# +LIBBPF_0.0.1 +# +LIBBPF_0.0.2 +# +LIBBPF_0.0.3 +# +LIBBPF_0.0.4 +# +LIBBPF_0.0.5 +# +LIBBPF_0.0.6 +# +LIBBPF_0.0.7 +# +LIBBPF_0.0.8 +# +LIBBPF_0.0.9 +# +LIBBPF_0.1.0 +# +LIBBPF_0.2.0 +# +LIBBPF_0.3.0 +# +LIBBPF_0.4.0 +# +LIBBPF_0.5.0 +# +LIBBPF_0.6.0 +# +LIBBPF_0.7.0 +# libbpf_attach_type_by_name +# libbpf_find_kernel_btf +# libbpf_find_vmlinux_btf_id +# make[2]: *** [Makefile:184: check_abi] Error 1 +# make[1]: *** [Makefile:140: all] Error 2 The above failure is due to different printouts for some ABS versioned symbols. For example, with the same libbpf.so, @@ -66,15 +66,14 @@ Signed-off-by: Yonghong Song Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220204214355.502108-1-yhs@fb.com Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - tools/lib/bpf/Makefile | 4 ++-- + tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile -index b393b5e82380..d1b474f3c586 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile -@@ -129,7 +129,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ +@@ -129,7 +129,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s -- sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ @@ -83,7 +82,7 @@ index b393b5e82380..d1b474f3c586 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) -@@ -192,7 +192,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_SCRIPT) +@@ -192,7 +192,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ @@ -92,6 +91,3 @@ index b393b5e82380..d1b474f3c586 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ diff -u $(OUTPUT)libbpf_global_syms.tmp \ --- -2.35.1 - diff --git a/queue-5.17/libbpf-fix-build-issue-with-llvm-readelf.patch b/queue-5.17/libbpf-fix-build-issue-with-llvm-readelf.patch index 559f03e7eed..9ae22c051cc 100644 --- a/queue-5.17/libbpf-fix-build-issue-with-llvm-readelf.patch +++ b/queue-5.17/libbpf-fix-build-issue-with-llvm-readelf.patch @@ -12,38 +12,38 @@ readelf is a symbolic link to llvm-readelf. In such cases, llvm-readelf will be used instead of default binutils readelf, and the following error will appear during libbpf build: - Warning: Num of global symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) - does NOT match with num of versioned symbols in - /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). - Please make sure all LIBBPF_API symbols are versioned in libbpf.map. - --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... - +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... - @@ -324,6 +324,22 @@ - btf__str_by_offset - btf__type_by_id - btf__type_cnt - +LIBBPF_0.0.1 - +LIBBPF_0.0.2 - +LIBBPF_0.0.3 - +LIBBPF_0.0.4 - +LIBBPF_0.0.5 - +LIBBPF_0.0.6 - +LIBBPF_0.0.7 - +LIBBPF_0.0.8 - +LIBBPF_0.0.9 - +LIBBPF_0.1.0 - +LIBBPF_0.2.0 - +LIBBPF_0.3.0 - +LIBBPF_0.4.0 - +LIBBPF_0.5.0 - +LIBBPF_0.6.0 - +LIBBPF_0.7.0 - libbpf_attach_type_by_name - libbpf_find_kernel_btf - libbpf_find_vmlinux_btf_id - make[2]: *** [Makefile:184: check_abi] Error 1 - make[1]: *** [Makefile:140: all] Error 2 +# Warning: Num of global symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) +# does NOT match with num of versioned symbols in +# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). +# Please make sure all LIBBPF_API symbols are versioned in libbpf.map. +# --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... +# +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... +# @@ -324,6 +324,22 @@ +# btf__str_by_offset +# btf__type_by_id +# btf__type_cnt +# +LIBBPF_0.0.1 +# +LIBBPF_0.0.2 +# +LIBBPF_0.0.3 +# +LIBBPF_0.0.4 +# +LIBBPF_0.0.5 +# +LIBBPF_0.0.6 +# +LIBBPF_0.0.7 +# +LIBBPF_0.0.8 +# +LIBBPF_0.0.9 +# +LIBBPF_0.1.0 +# +LIBBPF_0.2.0 +# +LIBBPF_0.3.0 +# +LIBBPF_0.4.0 +# +LIBBPF_0.5.0 +# +LIBBPF_0.6.0 +# +LIBBPF_0.7.0 +# libbpf_attach_type_by_name +# libbpf_find_kernel_btf +# libbpf_find_vmlinux_btf_id +# make[2]: *** [Makefile:184: check_abi] Error 1 +# make[1]: *** [Makefile:140: all] Error 2 The above failure is due to different printouts for some ABS versioned symbols. For example, with the same libbpf.so, @@ -66,15 +66,14 @@ Signed-off-by: Yonghong Song Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220204214355.502108-1-yhs@fb.com Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - tools/lib/bpf/Makefile | 4 ++-- + tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile -index f947b61b2107..b8b37fe76006 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile -@@ -131,7 +131,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ +@@ -131,7 +131,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s -- sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ @@ -83,7 +82,7 @@ index f947b61b2107..b8b37fe76006 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) -@@ -194,7 +194,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_SCRIPT) +@@ -194,7 +194,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ @@ -92,6 +91,3 @@ index f947b61b2107..b8b37fe76006 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ diff -u $(OUTPUT)libbpf_global_syms.tmp \ --- -2.35.1 -