Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20250110-xdp_redirect-v2-3-b8f3ae53e894@bootlin.com
This commit is contained in:
Bastien Curutchet (eBPF Foundation) 2025-01-10 10:21:11 +01:00 committed by Martin KaFai Lau
parent a94df60109
commit 3e99fa9fab
3 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
View File

@ -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 @@ fail:
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);
}

12
tools/testing/selftests/bpf/progs/test_xdp_do_redirect.c
View File

@ -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)
{

26
tools/testing/selftests/bpf/progs/test_xdp_redirect.c
View File

@ -1,26 +0,0 @@
/* 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";