Commit e7c9e73d authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Alexei Starovoitov
Browse files

samples/bpf: Remove the xdp_monitor utility 



This utility has been ported as-is to xdp-tools as 'xdp-monitor'. The only
difference in usage between the samples and xdp-tools versions is that the
'-v' command line parameter has been changed to '-e' in the xdp-tools
version for consistency with the other utilities.

Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20230824102255.1561885-2-toke@redhat.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 001fedac

samples/bpf/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ tprogs-y += xdp_redirect_cpu 
tprogs-y += xdp_redirect_map_multi

tprogs-y += xdp_redirect_map

tprogs-y += xdp_redirect

tprogs-y += xdp_monitor



# Libbpf dependencies

LIBBPF_SRC = $(TOOLS_PATH)/lib/bpf
@@ -116,7 +115,6 @@ xdp_redirect_map_multi-objs := xdp_redirect_map_multi_user.o $(XDP_SAMPLE) 
xdp_redirect_cpu-objs := xdp_redirect_cpu_user.o $(XDP_SAMPLE)

xdp_redirect_map-objs := xdp_redirect_map_user.o $(XDP_SAMPLE)

xdp_redirect-objs := xdp_redirect_user.o $(XDP_SAMPLE)

xdp_monitor-objs := xdp_monitor_user.o $(XDP_SAMPLE)

xdp_router_ipv4-objs := xdp_router_ipv4_user.o $(XDP_SAMPLE)



# Tell kbuild to always build the programs
@@ -207,7 +205,6 @@ TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib 
endif



TPROGS_LDLIBS			+= $(LIBBPF) -lelf -lz

TPROGLDLIBS_xdp_monitor		+= -lm

TPROGLDLIBS_xdp_redirect	+= -lm

TPROGLDLIBS_xdp_redirect_cpu	+= -lm

TPROGLDLIBS_xdp_redirect_map	+= -lm
@@ -330,7 +327,6 @@ $(obj)/xdp_redirect_cpu_user.o: $(obj)/xdp_redirect_cpu.skel.h 
$(obj)/xdp_redirect_map_multi_user.o: $(obj)/xdp_redirect_map_multi.skel.h

$(obj)/xdp_redirect_map_user.o: $(obj)/xdp_redirect_map.skel.h

$(obj)/xdp_redirect_user.o: $(obj)/xdp_redirect.skel.h

$(obj)/xdp_monitor_user.o: $(obj)/xdp_monitor.skel.h

$(obj)/xdp_router_ipv4_user.o: $(obj)/xdp_router_ipv4.skel.h



$(obj)/tracex5.bpf.o: $(obj)/syscall_nrs.h
@@ -387,7 +383,6 @@ $(obj)/xdp_redirect_cpu.bpf.o: $(obj)/xdp_sample.bpf.o 
$(obj)/xdp_redirect_map_multi.bpf.o: $(obj)/xdp_sample.bpf.o

$(obj)/xdp_redirect_map.bpf.o: $(obj)/xdp_sample.bpf.o

$(obj)/xdp_redirect.bpf.o: $(obj)/xdp_sample.bpf.o

$(obj)/xdp_monitor.bpf.o: $(obj)/xdp_sample.bpf.o

$(obj)/xdp_router_ipv4.bpf.o: $(obj)/xdp_sample.bpf.o



$(obj)/%.bpf.o: $(src)/%.bpf.c $(obj)/vmlinux.h $(src)/xdp_sample.bpf.h $(src)/xdp_sample_shared.h
@@ -399,7 +394,7 @@ $(obj)/%.bpf.o: $(src)/%.bpf.c $(obj)/vmlinux.h $(src)/xdp_sample.bpf.h $(src)/x 
		-c $(filter %.bpf.c,$^) -o $@



LINKED_SKELS := xdp_redirect_cpu.skel.h xdp_redirect_map_multi.skel.h \

		xdp_redirect_map.skel.h xdp_redirect.skel.h xdp_monitor.skel.h \

		xdp_redirect_map.skel.h xdp_redirect.skel.h \

		xdp_router_ipv4.skel.h

clean-files += $(LINKED_SKELS)
@@ -407,7 +402,6 @@ xdp_redirect_cpu.skel.h-deps := xdp_redirect_cpu.bpf.o xdp_sample.bpf.o 
xdp_redirect_map_multi.skel.h-deps := xdp_redirect_map_multi.bpf.o xdp_sample.bpf.o

xdp_redirect_map.skel.h-deps := xdp_redirect_map.bpf.o xdp_sample.bpf.o

xdp_redirect.skel.h-deps := xdp_redirect.bpf.o xdp_sample.bpf.o

xdp_monitor.skel.h-deps := xdp_monitor.bpf.o xdp_sample.bpf.o

xdp_router_ipv4.skel.h-deps := xdp_router_ipv4.bpf.o xdp_sample.bpf.o



LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.bpf.c,$(foreach skel,$(LINKED_SKELS),$($(skel)-deps)))

samples/bpf/xdp_monitor.bpf.c

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*  Copyright(c) 2017-2018 Jesper Dangaard Brouer, Red Hat Inc.

 *

 * XDP monitor tool, based on tracepoints

 */

#include "xdp_sample.bpf.h"



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

samples/bpf/xdp_monitor_user.c

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2017 Jesper Dangaard Brouer, Red Hat, Inc. */

static const char *__doc__=

"XDP monitor tool, based on tracepoints\n";



static const char *__doc_err_only__=

" NOTICE: Only tracking XDP redirect errors\n"

"         Enable redirect success stats via '-s/--stats'\n"

"         (which comes with a per packet processing overhead)\n";



#include <errno.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdbool.h>

#include <stdint.h>

#include <string.h>

#include <ctype.h>

#include <unistd.h>

#include <locale.h>

#include <getopt.h>

#include <net/if.h>

#include <time.h>

#include <signal.h>

#include <bpf/bpf.h>

#include <bpf/libbpf.h>

#include "bpf_util.h"

#include "xdp_sample_user.h"

#include "xdp_monitor.skel.h"



static int mask = SAMPLE_REDIRECT_ERR_CNT | SAMPLE_CPUMAP_ENQUEUE_CNT |

		  SAMPLE_CPUMAP_KTHREAD_CNT | SAMPLE_EXCEPTION_CNT |

		  SAMPLE_DEVMAP_XMIT_CNT | SAMPLE_DEVMAP_XMIT_CNT_MULTI;



DEFINE_SAMPLE_INIT(xdp_monitor);



static const struct option long_options[] = {

	{ "help", no_argument, NULL, 'h' },

	{ "stats", no_argument, NULL, 's' },

	{ "interval", required_argument, NULL, 'i' },

	{ "verbose", no_argument, NULL, 'v' },

	{}

};



int main(int argc, char **argv)

{

	unsigned long interval = 2;

	int ret = EXIT_FAIL_OPTION;

	struct xdp_monitor *skel;

	bool errors_only = true;

	int longindex = 0, opt;

	bool error = true;



	/* Parse commands line args */

	while ((opt = getopt_long(argc, argv, "si:vh",

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

		switch (opt) {

		case 's':

			errors_only = false;

			mask |= SAMPLE_REDIRECT_CNT;

			break;

		case 'i':

			interval = strtoul(optarg, NULL, 0);

			break;

		case 'v':

			sample_switch_mode();

			break;

		case 'h':

			error = false;

		default:

			sample_usage(argv, long_options, __doc__, mask, error);

			return ret;

		}

	}



	skel = xdp_monitor__open();

	if (!skel) {

		fprintf(stderr, "Failed to xdp_monitor__open: %s\n",

			strerror(errno));

		ret = EXIT_FAIL_BPF;

		goto end;

	}



	ret = sample_init_pre_load(skel);

	if (ret < 0) {

		fprintf(stderr, "Failed to sample_init_pre_load: %s\n", strerror(-ret));

		ret = EXIT_FAIL_BPF;

		goto end_destroy;

	}



	ret = xdp_monitor__load(skel);

	if (ret < 0) {

		fprintf(stderr, "Failed to xdp_monitor__load: %s\n", strerror(errno));

		ret = EXIT_FAIL_BPF;

		goto end_destroy;

	}



	ret = sample_init(skel, mask);

	if (ret < 0) {

		fprintf(stderr, "Failed to initialize sample: %s\n", strerror(-ret));

		ret = EXIT_FAIL_BPF;

		goto end_destroy;

	}



	if (errors_only)

		printf("%s", __doc_err_only__);



	ret = sample_run(interval, NULL, NULL);

	if (ret < 0) {

		fprintf(stderr, "Failed during sample run: %s\n", strerror(-ret));

		ret = EXIT_FAIL;

		goto end_destroy;

	}

	ret = EXIT_OK;

end_destroy:

	xdp_monitor__destroy(skel);

end:

	sample_exit(ret);

}