Merge branch 'reuseport_to_test_progs' (7708bd43) · Commits · 戴 / test

Jakub Sitnicki says: ==================== This change has been suggested by Martin Lau [0] during a review of a related patch set that extends reuseport tests [1]. Patches 1 & 2 address a warning due to unrecognized section name from libbpf when running reuseport tests. We don't want to carry this warning into test_progs. Patches 3-8 massage the reuseport tests to ease the switch to test_progs framework. The intention here is to show the work. Happy to squash these, if needed. Patches 9-10 do the actual move and conversion to test_progs. Output from a test_progs run after changes pasted below. Thanks, Jakub [0] https://lore.kernel.org/bpf/20191123110751.6729-1-jakub@cloudflare.com/T/#m607d822caeb1eb5db101172821a78cc3896ff1c3 [1] https://lore.kernel.org/bpf/20191123110751.6729-1-jakub@cloudflare.com/T/#m55881bae9fb6e34837d07a0c0a7ffbc138f8d06f ==================== Acked-by:

tools/lib/bpf/libbpf.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4983,6 +4983,7 @@ static const struct {
		enum bpf_attach_type attach_type;
		} section_names[] = {
		BPF_PROG_SEC("socket", BPF_PROG_TYPE_SOCKET_FILTER),
		BPF_PROG_SEC("sk_reuseport", BPF_PROG_TYPE_SK_REUSEPORT),
		BPF_PROG_SEC("kprobe/", BPF_PROG_TYPE_KPROBE),
		BPF_PROG_SEC("uprobe/", BPF_PROG_TYPE_KPROBE),
		BPF_PROG_SEC("kretprobe/", BPF_PROG_TYPE_KPROBE),

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ LDLIBS += -lcap -lelf -lrt -lpthread
		TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \
		test_align test_verifier_log test_dev_cgroup test_tcpbpf_user \
		test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \
		test_cgroup_storage test_select_reuseport \
		test_cgroup_storage \
		test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \
		test_cgroup_attach test_progs-no_alu32

+289 −225

File changed and moved.

Preview size limit exceeded, changes collapsed.

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ struct {
		goto done; \
		})

		SEC("select_by_skb_data")
		SEC("sk_reuseport")
		int _select_by_skb_data(struct sk_reuseport_md *reuse_md)
		{
		__u32 linum, index = 0, flags = 0, index_zero = 0;