Commit 5305b378 authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

Merge branch 'use network helpers, part 2' 



Geliang Tang says:

====================
This patchset uses more network helpers in test_sock_addr.c, but
first of all, patch 2 is needed to make network_helpers.c independent
of test_progs.c. Then network_helpers.h can be included into
test_sock_addr.c without compile errors.

Patch 1 and patch 2 address Martin's comments for the previous series
too.

v2:
 - Only a few minor cleanups to patch 5.
====================

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents 55d30cc9 e4c68bba

tools/testing/selftests/bpf/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -290,11 +290,12 @@ UNPRIV_HELPERS := $(OUTPUT)/unpriv_helpers.o 
TRACE_HELPERS	:= $(OUTPUT)/trace_helpers.o

JSON_WRITER		:= $(OUTPUT)/json_writer.o

CAP_HELPERS	:= $(OUTPUT)/cap_helpers.o

NETWORK_HELPERS := $(OUTPUT)/network_helpers.o



$(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS)

$(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)

$(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS)

$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS)

$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(NETWORK_HELPERS)

$(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS)

$(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS)

$(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)

tools/testing/selftests/bpf/network_helpers.c

+16 −5
Original line number Diff line number Diff line
@@ -459,25 +459,35 @@ struct nstoken *open_netns(const char *name) 
	struct nstoken *token;



	token = calloc(1, sizeof(struct nstoken));

	if (!ASSERT_OK_PTR(token, "malloc token"))

	if (!token) {

		log_err("Failed to malloc token");

		return NULL;

	}



	token->orig_netns_fd = open("/proc/self/ns/net", O_RDONLY);

	if (!ASSERT_GE(token->orig_netns_fd, 0, "open /proc/self/ns/net"))

	if (token->orig_netns_fd == -1) {

		log_err("Failed to open(/proc/self/ns/net)");

		goto fail;

	}



	snprintf(nspath, sizeof(nspath), "%s/%s", "/var/run/netns", name);

	nsfd = open(nspath, O_RDONLY | O_CLOEXEC);

	if (!ASSERT_GE(nsfd, 0, "open netns fd"))

	if (nsfd == -1) {

		log_err("Failed to open(%s)", nspath);

		goto fail;

	}



	err = setns(nsfd, CLONE_NEWNET);

	close(nsfd);

	if (!ASSERT_OK(err, "setns"))

	if (err) {

		log_err("Failed to setns(nsfd)");

		goto fail;

	}



	return token;

fail:

	if (token->orig_netns_fd != -1)

		close(token->orig_netns_fd);

	free(token);

	return NULL;

}
@@ -487,7 +497,8 @@ void close_netns(struct nstoken *token) 
	if (!token)

		return;



	ASSERT_OK(setns(token->orig_netns_fd, CLONE_NEWNET), "setns");

	if (setns(token->orig_netns_fd, CLONE_NEWNET))

		log_err("Failed to setns(orig_netns_fd)");

	close(token->orig_netns_fd);

	free(token);

}

tools/testing/selftests/bpf/network_helpers.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ typedef __u16 __sum16; 
#include <linux/ipv6.h>

#include <linux/ethtool.h>

#include <linux/sockios.h>

#include <linux/err.h>

#include <netinet/tcp.h>

#include <bpf/bpf_endian.h>

#include <net/if.h>

tools/testing/selftests/bpf/prog_tests/empty_skb.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ void test_empty_skb(void) 


	SYS(out, "ip netns add empty_skb");

	tok = open_netns("empty_skb");

	if (!ASSERT_OK_PTR(tok, "setns"))

		goto out;

	SYS(out, "ip link add veth0 type veth peer veth1");

	SYS(out, "ip link set dev veth0 up");

	SYS(out, "ip link set dev veth1 up");

tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ static int attach(struct ip_check_defrag *skel, bool ipv6) 
	int err = -1;



	nstoken = open_netns(NS1);

	if (!ASSERT_OK_PTR(nstoken, "setns"))

		goto out;



	skel->links.defrag = bpf_program__attach_netfilter(skel->progs.defrag, &opts);

	if (!ASSERT_OK_PTR(skel->links.defrag, "program attach"))