Commit 743e568c authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Daniel Borkmann
Browse files

samples/bpf: Add a "force" flag to XDP samples 



Make xdp samples consistent with iproute2 behavior and set the
XDP_FLAGS_UPDATE_IF_NOEXIST by default when setting the xdp program on
interface. Provide an option for user to force the program loading,
which as a result will not include the mentioned flag in
bpf_set_link_xdp_fd call.

Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 01dde20c

samples/bpf/xdp1_user.c

+7 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "bpf/libbpf.h"



static int ifindex;

static __u32 xdp_flags;

static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;



static void int_exit(int sig)

{
@@ -63,7 +63,8 @@ static void usage(const char *prog) 
		"usage: %s [OPTS] IFACE\n\n"

		"OPTS:\n"

		"    -S    use skb-mode\n"

		"    -N    enforce native mode\n",

		"    -N    enforce native mode\n"

		"    -F    force loading prog\n",

		prog);

}
@@ -73,7 +74,7 @@ int main(int argc, char **argv) 
	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	const char *optstr = "SN";

	const char *optstr = "FSN";

	int prog_fd, map_fd, opt;

	struct bpf_object *obj;

	struct bpf_map *map;
@@ -87,6 +88,9 @@ int main(int argc, char **argv) 
		case 'N':

			xdp_flags |= XDP_FLAGS_DRV_MODE;

			break;

		case 'F':

			xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;

			break;

		default:

			usage(basename(argv[0]));

			return 1;

samples/bpf/xdp_adjust_tail_user.c

+6 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define STATS_INTERVAL_S 2U



static int ifindex = -1;

static __u32 xdp_flags;

static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;



static void int_exit(int sig)

{
@@ -60,6 +60,7 @@ static void usage(const char *cmd) 
	printf("    -T <stop-after-X-seconds> Default: 0 (forever)\n");

	printf("    -S use skb-mode\n");

	printf("    -N enforce native mode\n");

	printf("    -F force loading prog\n");

	printf("    -h Display this help\n");

}
@@ -70,8 +71,8 @@ int main(int argc, char **argv) 
		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	unsigned char opt_flags[256] = {};

	const char *optstr = "i:T:SNFh";

	unsigned int kill_after_s = 0;

	const char *optstr = "i:T:SNh";

	int i, prog_fd, map_fd, opt;

	struct bpf_object *obj;

	struct bpf_map *map;
@@ -96,6 +97,9 @@ int main(int argc, char **argv) 
		case 'N':

			xdp_flags |= XDP_FLAGS_DRV_MODE;

			break;

		case 'F':

			xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;

			break;

		default:

			usage(argv[0]);

			return 1;

samples/bpf/xdp_redirect_cpu_user.c

+6 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static int ifindex = -1; 
static char ifname_buf[IF_NAMESIZE];

static char *ifname;



static __u32 xdp_flags;

static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;

static int cpu_map_fd;

static int rx_cnt_map_fd;

static int redirect_err_cnt_map_fd;
@@ -62,6 +62,7 @@ static const struct option long_options[] = { 
	{"cpu",		required_argument,	NULL, 'c' },

	{"stress-mode", no_argument,		NULL, 'x' },

	{"no-separators", no_argument,		NULL, 'z' },

	{"force",	no_argument,		NULL, 'F' },

	{0, 0, NULL,  0 }

};
@@ -651,7 +652,7 @@ int main(int argc, char **argv) 
	mark_cpus_unavailable();



	/* Parse commands line args */

	while ((opt = getopt_long(argc, argv, "hSd:",

	while ((opt = getopt_long(argc, argv, "hSd:s:p:q:c:xzF",

				  long_options, &longindex)) != -1) {

		switch (opt) {

		case 'd':
@@ -700,6 +701,9 @@ int main(int argc, char **argv) 
		case 'q':

			qsize = atoi(optarg);

			break;

		case 'F':

			xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;

			break;

		case 'h':

		error:

		default:

samples/bpf/xdp_redirect_map_user.c

+7 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int ifindex_in; 
static int ifindex_out;

static bool ifindex_out_xdp_dummy_attached = true;



static __u32 xdp_flags;

static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;

static int rxcnt_map_fd;



static void int_exit(int sig)
@@ -70,7 +70,8 @@ static void usage(const char *prog) 
		"usage: %s [OPTS] IFINDEX_IN IFINDEX_OUT\n\n"

		"OPTS:\n"

		"    -S    use skb-mode\n"

		"    -N    enforce native mode\n",

		"    -N    enforce native mode\n"

		"    -F    force loading prog\n",

		prog);

}
@@ -82,7 +83,7 @@ int main(int argc, char **argv) 
	};

	struct bpf_program *prog, *dummy_prog;

	int prog_fd, dummy_prog_fd;

	const char *optstr = "SN";

	const char *optstr = "FSN";

	struct bpf_object *obj;

	int ret, opt, key = 0;

	char filename[256];
@@ -96,6 +97,9 @@ int main(int argc, char **argv) 
		case 'N':

			xdp_flags |= XDP_FLAGS_DRV_MODE;

			break;

		case 'F':

			xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;

			break;

		default:

			usage(basename(argv[0]));

			return 1;

samples/bpf/xdp_redirect_user.c

+7 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int ifindex_in; 
static int ifindex_out;

static bool ifindex_out_xdp_dummy_attached = true;



static __u32 xdp_flags;

static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;

static int rxcnt_map_fd;



static void int_exit(int sig)
@@ -70,7 +70,8 @@ static void usage(const char *prog) 
		"usage: %s [OPTS] IFINDEX_IN IFINDEX_OUT\n\n"

		"OPTS:\n"

		"    -S    use skb-mode\n"

		"    -N    enforce native mode\n",

		"    -N    enforce native mode\n"

		"    -F    force loading prog\n",

		prog);

}
@@ -83,7 +84,7 @@ int main(int argc, char **argv) 
	};

	struct bpf_program *prog, *dummy_prog;

	int prog_fd, tx_port_map_fd, opt;

	const char *optstr = "SN";

	const char *optstr = "FSN";

	struct bpf_object *obj;

	char filename[256];

	int dummy_prog_fd;
@@ -97,6 +98,9 @@ int main(int argc, char **argv) 
		case 'N':

			xdp_flags |= XDP_FLAGS_DRV_MODE;

			break;

		case 'F':

			xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;

			break;

		default:

			usage(basename(argv[0]));

			return 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE