samples/bpf: Remove the xdp1 and xdp2 utilities

The functionality of these utilities have been incorporated into the
xdp-bench utility in xdp-tools.

Equivalent functionality is:

xdp1 eth0
  --> xdp-bench drop -p parse-ip -l load-bytes eth0

xdp2 eth0
  --> xdp-bench drop -p swap-macs eth0

Note that there's a slight difference in behaviour of those examples: the
swap-macs operation of xdp-bench doesn't use the bpf_xdp_load_bytes()
helper to load the packet data, whereas the xdp2 utility did so
unconditionally. For the parse-ip action the use of bpf_xdp_load_bytes()
can be selected by the '-l load-bytes' switch, with the difference that the
xdp-bench utility will perform two separate calls to the helper, one to
load the ethernet header and another to load the IP header; where the xdp1
utility only performed one call always loading 60 bytes of data.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20230824102255.1561885-5-toke@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index fb1dc9d..decd311 100644 (file)
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -30,8 +30,6 @@ tprogs-y += test_cgrp2_array_pin
 tprogs-y += test_cgrp2_attach
 tprogs-y += test_cgrp2_sock
 tprogs-y += test_cgrp2_sock2
 tprogs-y += test_cgrp2_attach
 tprogs-y += test_cgrp2_sock
 tprogs-y += test_cgrp2_sock2

-tprogs-y += xdp1
-tprogs-y += xdp2

 tprogs-y += xdp_router_ipv4
 tprogs-y += test_current_task_under_cgroup
 tprogs-y += trace_event
 tprogs-y += xdp_router_ipv4
 tprogs-y += test_current_task_under_cgroup
 tprogs-y += trace_event


@@ -83,9 +81,6 @@ test_cgrp2_array_pin-objs := test_cgrp2_array_pin.o
 test_cgrp2_attach-objs := test_cgrp2_attach.o
 test_cgrp2_sock-objs := test_cgrp2_sock.o
 test_cgrp2_sock2-objs := test_cgrp2_sock2.o
 test_cgrp2_attach-objs := test_cgrp2_attach.o
 test_cgrp2_sock-objs := test_cgrp2_sock.o
 test_cgrp2_sock2-objs := test_cgrp2_sock2.o

-xdp1-objs := xdp1_user.o
-# reuse xdp1 source intentionally
-xdp2-objs := xdp1_user.o

 test_current_task_under_cgroup-objs := $(CGROUP_HELPERS) \
                                       test_current_task_under_cgroup_user.o
 trace_event-objs := trace_event_user.o $(TRACE_HELPERS)
 test_current_task_under_cgroup-objs := $(CGROUP_HELPERS) \
                                       test_current_task_under_cgroup_user.o
 trace_event-objs := trace_event_user.o $(TRACE_HELPERS)


@@ -132,8 +127,6 @@ always-y += test_overhead_raw_tp.bpf.o
 always-y += test_overhead_kprobe.bpf.o
 always-y += parse_varlen.o parse_simple.o parse_ldabs.o
 always-y += test_cgrp2_tc.bpf.o
 always-y += test_overhead_kprobe.bpf.o
 always-y += parse_varlen.o parse_simple.o parse_ldabs.o
 always-y += test_cgrp2_tc.bpf.o

-always-y += xdp1_kern.o
-always-y += xdp2_kern.o

 always-y += test_current_task_under_cgroup.bpf.o
 always-y += trace_event_kern.o
 always-y += sampleip_kern.o
 always-y += test_current_task_under_cgroup.bpf.o
 always-y += trace_event_kern.o
 always-y += sampleip_kern.o

diff --git a/samples/bpf/xdp1_kern.c b/samples/bpf/xdp1_kern.c
deleted file mode 100644 (file)
index d91f27c..0000000
--- a/samples/bpf/xdp1_kern.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (c) 2016 PLUMgrid
- *
- * 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.
- */
-#define KBUILD_MODNAME "foo"
-#include <uapi/linux/bpf.h>
-#include <linux/in.h>
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
-#include <linux/if_vlan.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <bpf/bpf_helpers.h>
-
-struct {
-       __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
-       __type(key, u32);
-       __type(value, long);
-       __uint(max_entries, 256);
-} rxcnt SEC(".maps");
-
-static int parse_ipv4(void *data, u64 nh_off, void *data_end)
-{
-       struct iphdr *iph = data + nh_off;
-
-       if (iph + 1 > data_end)
-               return 0;
-       return iph->protocol;
-}
-
-static int parse_ipv6(void *data, u64 nh_off, void *data_end)
-{
-       struct ipv6hdr *ip6h = data + nh_off;
-
-       if (ip6h + 1 > data_end)
-               return 0;
-       return ip6h->nexthdr;
-}
-
-#define XDPBUFSIZE     60
-SEC("xdp.frags")
-int xdp_prog1(struct xdp_md *ctx)
-{
-       __u8 pkt[XDPBUFSIZE] = {};
-       void *data_end = &pkt[XDPBUFSIZE-1];
-       void *data = pkt;
-       struct ethhdr *eth = data;
-       int rc = XDP_DROP;
-       long *value;
-       u16 h_proto;
-       u64 nh_off;
-       u32 ipproto;
-
-       if (bpf_xdp_load_bytes(ctx, 0, pkt, sizeof(pkt)))
-               return rc;
-
-       nh_off = sizeof(*eth);
-       if (data + nh_off > data_end)
-               return rc;
-
-       h_proto = eth->h_proto;
-
-       /* Handle VLAN tagged packet */
-       if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) {
-               struct vlan_hdr *vhdr;
-
-               vhdr = data + nh_off;
-               nh_off += sizeof(struct vlan_hdr);
-               if (data + nh_off > data_end)
-                       return rc;
-               h_proto = vhdr->h_vlan_encapsulated_proto;
-       }
-       /* Handle double VLAN tagged packet */
-       if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) {
-               struct vlan_hdr *vhdr;
-
-               vhdr = data + nh_off;
-               nh_off += sizeof(struct vlan_hdr);
-               if (data + nh_off > data_end)
-                       return rc;
-               h_proto = vhdr->h_vlan_encapsulated_proto;
-       }
-
-       if (h_proto == htons(ETH_P_IP))
-               ipproto = parse_ipv4(data, nh_off, data_end);
-       else if (h_proto == htons(ETH_P_IPV6))
-               ipproto = parse_ipv6(data, nh_off, data_end);
-       else
-               ipproto = 0;
-
-       value = bpf_map_lookup_elem(&rxcnt, &ipproto);
-       if (value)
-               *value += 1;
-
-       return rc;
-}
-
-char _license[] SEC("license") = "GPL";

diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
deleted file mode 100644 (file)
index f05e797..0000000
--- a/samples/bpf/xdp1_user.c
+++ /dev/null
@@ -1,166 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016 PLUMgrid
- */
-#include <linux/bpf.h>
-#include <linux/if_link.h>
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <libgen.h>
-#include <net/if.h>
-
-#include "bpf_util.h"
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
-static int ifindex;
-static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;
-static __u32 prog_id;
-
-static void int_exit(int sig)
-{
-       __u32 curr_prog_id = 0;
-
-       if (bpf_xdp_query_id(ifindex, xdp_flags, &curr_prog_id)) {
-               printf("bpf_xdp_query_id failed\n");
-               exit(1);
-       }
-       if (prog_id == curr_prog_id)
-               bpf_xdp_detach(ifindex, xdp_flags, NULL);
-       else if (!curr_prog_id)
-               printf("couldn't find a prog id on a given interface\n");
-       else
-               printf("program on interface changed, not removing\n");
-       exit(0);
-}
-
-/* simple per-protocol drop counter
- */
-static void poll_stats(int map_fd, int interval)
-{
-       unsigned int nr_cpus = bpf_num_possible_cpus();
-       __u64 values[nr_cpus], prev[UINT8_MAX] = { 0 };
-       int i;
-
-       while (1) {
-               __u32 key = UINT32_MAX;
-
-               sleep(interval);
-
-               while (bpf_map_get_next_key(map_fd, &key, &key) == 0) {
-                       __u64 sum = 0;
-
-                       assert(bpf_map_lookup_elem(map_fd, &key, values) == 0);
-                       for (i = 0; i < nr_cpus; i++)
-                               sum += values[i];
-                       if (sum > prev[key])
-                               printf("proto %u: %10llu pkt/s\n",
-                                      key, (sum - prev[key]) / interval);
-                       prev[key] = sum;
-               }
-       }
-}
-
-static void usage(const char *prog)
-{
-       fprintf(stderr,
-               "usage: %s [OPTS] IFACE\n\n"
-               "OPTS:\n"
-               "    -S    use skb-mode\n"
-               "    -N    enforce native mode\n"
-               "    -F    force loading prog\n",
-               prog);
-}
-
-int main(int argc, char **argv)
-{
-       struct bpf_prog_info info = {};
-       __u32 info_len = sizeof(info);
-       const char *optstr = "FSN";
-       int prog_fd, map_fd, opt;
-       struct bpf_program *prog;
-       struct bpf_object *obj;
-       struct bpf_map *map;
-       char filename[256];
-       int err;
-
-       while ((opt = getopt(argc, argv, optstr)) != -1) {
-               switch (opt) {
-               case 'S':
-                       xdp_flags |= XDP_FLAGS_SKB_MODE;
-                       break;
-               case 'N':
-                       /* default, set below */
-                       break;
-               case 'F':
-                       xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;
-                       break;
-               default:
-                       usage(basename(argv[0]));
-                       return 1;
-               }
-       }
-
-       if (!(xdp_flags & XDP_FLAGS_SKB_MODE))
-               xdp_flags |= XDP_FLAGS_DRV_MODE;
-
-       if (optind == argc) {
-               usage(basename(argv[0]));
-               return 1;
-       }
-
-       ifindex = if_nametoindex(argv[optind]);
-       if (!ifindex) {
-               perror("if_nametoindex");
-               return 1;
-       }
-
-       snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
-       obj = bpf_object__open_file(filename, NULL);
-       if (libbpf_get_error(obj))
-               return 1;
-
-       prog = bpf_object__next_program(obj, NULL);
-       bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);
-
-       err = bpf_object__load(obj);
-       if (err)
-               return 1;
-
-       prog_fd = bpf_program__fd(prog);
-
-       map = bpf_object__next_map(obj, NULL);
-       if (!map) {
-               printf("finding a map in obj file failed\n");
-               return 1;
-       }
-       map_fd = bpf_map__fd(map);
-
-       if (!prog_fd) {
-               printf("bpf_prog_load_xattr: %s\n", strerror(errno));
-               return 1;
-       }
-
-       signal(SIGINT, int_exit);
-       signal(SIGTERM, int_exit);
-
-       if (bpf_xdp_attach(ifindex, prog_fd, xdp_flags, NULL) < 0) {
-               printf("link set xdp fd failed\n");
-               return 1;
-       }
-
-       err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);
-       if (err) {
-               printf("can't get prog info - %s\n", strerror(errno));
-               return err;
-       }
-       prog_id = info.id;
-
-       poll_stats(map_fd, 1);
-
-       return 0;
-}

diff --git a/samples/bpf/xdp2_kern.c b/samples/bpf/xdp2_kern.c
deleted file mode 100644 (file)
index 8bca674..0000000
--- a/samples/bpf/xdp2_kern.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright (c) 2016 PLUMgrid
- *
- * 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.
- */
-#define KBUILD_MODNAME "foo"
-#include <uapi/linux/bpf.h>
-#include <linux/in.h>
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
-#include <linux/if_vlan.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <bpf/bpf_helpers.h>
-
-struct {
-       __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
-       __type(key, u32);
-       __type(value, long);
-       __uint(max_entries, 256);
-} rxcnt SEC(".maps");
-
-static void swap_src_dst_mac(void *data)
-{
-       unsigned short *p = data;
-       unsigned short dst[3];
-
-       dst[0] = p[0];
-       dst[1] = p[1];
-       dst[2] = p[2];
-       p[0] = p[3];
-       p[1] = p[4];
-       p[2] = p[5];
-       p[3] = dst[0];
-       p[4] = dst[1];
-       p[5] = dst[2];
-}
-
-static int parse_ipv4(void *data, u64 nh_off, void *data_end)
-{
-       struct iphdr *iph = data + nh_off;
-
-       if (iph + 1 > data_end)
-               return 0;
-       return iph->protocol;
-}
-
-static int parse_ipv6(void *data, u64 nh_off, void *data_end)
-{
-       struct ipv6hdr *ip6h = data + nh_off;
-
-       if (ip6h + 1 > data_end)
-               return 0;
-       return ip6h->nexthdr;
-}
-
-#define XDPBUFSIZE     60
-SEC("xdp.frags")
-int xdp_prog1(struct xdp_md *ctx)
-{
-       __u8 pkt[XDPBUFSIZE] = {};
-       void *data_end = &pkt[XDPBUFSIZE-1];
-       void *data = pkt;
-       struct ethhdr *eth = data;
-       int rc = XDP_DROP;
-       long *value;
-       u16 h_proto;
-       u64 nh_off;
-       u32 ipproto;
-
-       if (bpf_xdp_load_bytes(ctx, 0, pkt, sizeof(pkt)))
-               return rc;
-
-       nh_off = sizeof(*eth);
-       if (data + nh_off > data_end)
-               return rc;
-
-       h_proto = eth->h_proto;
-
-       /* Handle VLAN tagged packet */
-       if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) {
-               struct vlan_hdr *vhdr;
-
-               vhdr = data + nh_off;
-               nh_off += sizeof(struct vlan_hdr);
-               if (data + nh_off > data_end)
-                       return rc;
-               h_proto = vhdr->h_vlan_encapsulated_proto;
-       }
-       /* Handle double VLAN tagged packet */
-       if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) {
-               struct vlan_hdr *vhdr;
-
-               vhdr = data + nh_off;
-               nh_off += sizeof(struct vlan_hdr);
-               if (data + nh_off > data_end)
-                       return rc;
-               h_proto = vhdr->h_vlan_encapsulated_proto;
-       }
-
-       if (h_proto == htons(ETH_P_IP))
-               ipproto = parse_ipv4(data, nh_off, data_end);
-       else if (h_proto == htons(ETH_P_IPV6))
-               ipproto = parse_ipv6(data, nh_off, data_end);
-       else
-               ipproto = 0;
-
-       value = bpf_map_lookup_elem(&rxcnt, &ipproto);
-       if (value)
-               *value += 1;
-
-       if (ipproto == IPPROTO_UDP) {
-               swap_src_dst_mac(data);
-
-               if (bpf_xdp_store_bytes(ctx, 0, pkt, sizeof(pkt)))
-                       return rc;
-
-               rc = XDP_TX;
-       }
-
-       return rc;
-}
-
-char _license[] SEC("license") = "GPL";