Commit 3e99fa9f authored by Bastien Curutchet (eBPF Foundation)'s avatar Bastien Curutchet (eBPF Foundation) Committed by Martin KaFai Lau
Browse files

selftests/bpf: Migrate test_xdp_redirect.c to test_xdp_do_redirect.c 



prog_tests/xdp_do_redirect.c is the only user of the BPF programs
located in progs/test_xdp_do_redirect.c and progs/test_xdp_redirect.c.
There is no need to keep both files with such close names.

Move test_xdp_redirect.c contents to test_xdp_do_redirect.c and remove
progs/test_xdp_redirect.c

Signed-off-by: default avatarBastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20250110-xdp_redirect-v2-3-b8f3ae53e894@bootlin.com
parent a94df601

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

+3 −4
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <bpf/bpf_endian.h>

#include <uapi/linux/netdev.h>

#include "test_xdp_do_redirect.skel.h"

#include "test_xdp_redirect.skel.h"

#include "xdp_dummy.skel.h"



struct udp_packet {
@@ -324,7 +323,7 @@ static int ping_setup(struct test_data *data) 


static void ping_test(struct test_data *data)

{

	struct test_xdp_redirect *skel = NULL;

	struct test_xdp_do_redirect *skel = NULL;

	struct xdp_dummy *skel_dummy = NULL;

	struct nstoken *nstoken = NULL;

	int i, ret;
@@ -351,7 +350,7 @@ static void ping_test(struct test_data *data) 
		nstoken = NULL;

	}



	skel = test_xdp_redirect__open_and_load();

	skel = test_xdp_do_redirect__open_and_load();

	if (!ASSERT_OK_PTR(skel, "open and load skeleton"))

		goto close;
@@ -383,7 +382,7 @@ static void ping_test(struct test_data *data) 
close:

	close_netns(nstoken);

	xdp_dummy__destroy(skel_dummy);

	test_xdp_redirect__destroy(skel);

	test_xdp_do_redirect__destroy(skel);

}

tools/testing/selftests/bpf/progs/test_xdp_do_redirect.c

+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,18 @@ int xdp_count_pkts(struct xdp_md *xdp) 
	return XDP_DROP;

}



SEC("xdp")

int xdp_redirect_to_111(struct xdp_md *xdp)

{

	return bpf_redirect(111, 0);

}



SEC("xdp")

int xdp_redirect_to_222(struct xdp_md *xdp)

{

	return bpf_redirect(222, 0);

}



SEC("tc")

int tc_count_pkts(struct __sk_buff *skb)

{

tools/testing/selftests/bpf/progs/test_xdp_redirect.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/* Copyright (c) 2017 VMware

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 */

#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



SEC("xdp")

int xdp_redirect_to_111(struct xdp_md *xdp)

{

	return bpf_redirect(111, 0);

}

SEC("xdp")

int xdp_redirect_to_222(struct xdp_md *xdp)

{

	return bpf_redirect(222, 0);

}



char _license[] SEC("license") = "GPL";