Commit b640d556 authored by Mykyta Yatsenko's avatar Mykyta Yatsenko Committed by Andrii Nakryiko
Browse files

selftests/bpf: Remove xxd util dependency 



The verification signature header generation requires converting a
binary certificate to a C array. Previously this only worked with
xxd (part of vim-common package).
As xxd may not be available on some systems building selftests, it makes
sense to substitute it with more common utils: hexdump, wc, sed to
generate equivalent C array output.

Tested by generating header with both xxd and hexdump and comparing
them.

Signed-off-by: default avatarMykyta Yatsenko <yatsenko@meta.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Tested-by: default avatarAlan Maguire <alan.maguire@oracle.com>
Link: https://lore.kernel.org/bpf/20260128190552.242335-1-mykyta.yatsenko5@gmail.com
parent ba225407

tools/testing/selftests/bpf/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ test_tcpnotify_user 
test_libbpf

xdping

test_cpp

test_progs_verification_cert

*.d

*.subskel.h

*.skel.h

tools/testing/selftests/bpf/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -720,9 +720,12 @@ $(VERIFICATION_CERT) $(PRIVATE_KEY): $(VERIFY_SIG_SETUP) 
	$(Q)mkdir -p $(BUILD_DIR)

	$(Q)$(VERIFY_SIG_SETUP) genkey $(BUILD_DIR)



# Generates a header with C array declaration, containing test_progs_verification_cert bytes

$(VERIFY_SIG_HDR): $(VERIFICATION_CERT)

	$(Q)ln -fs $< test_progs_verification_cert && \

	xxd -i test_progs_verification_cert > $@

	$(Q)(echo "unsigned char test_progs_verification_cert[] = {"; \

	 hexdump -v -e '12/1 "  0x%02x," "\n"' $< | sed 's/0x  ,//g; $$s/,$$//'; \

	 echo "};"; \

	 echo "unsigned int test_progs_verification_cert_len = $$(wc -c < $<);") > $@



# Define test_progs test runner.

TRUNNER_TESTS_DIR := prog_tests
@@ -898,8 +901,7 @@ EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ 
			       *.BTF *.BTF_ids *.BTF.base		\

			       no_alu32 cpuv4 bpf_gcc			\

			       liburandom_read.so)			\

	$(OUTPUT)/FEATURE-DUMP.selftests				\

	test_progs_verification_cert

	$(OUTPUT)/FEATURE-DUMP.selftests



.PHONY: docs docs-clean