samples: bpf: Do not unload prog within xdpsock

[sfrench/cifs-2.6.git] / samples / bpf / xdpsock_user.c

diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index 1e2a1105d0e67aba88a2bd4a3ab4998b549acdcb..aa696854be787e117a878fd9b8f4ab38af99fa8e 100644 (file)
--- a/samples/bpf/xdpsock_user.c
+++ b/samples/bpf/xdpsock_user.c
@@ -96,7 +96,6 @@ static int opt_xsk_frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;
 static int opt_timeout = 1000;
 static bool opt_need_wakeup = true;
 static u32 opt_num_xsks = 1;
-static u32 prog_id;
 static bool opt_busy_poll;
 static bool opt_reduced_cap;
 
@@ -462,59 +461,37 @@ static void *poller(void *arg)
        return NULL;
 }
 
-static void remove_xdp_program(void)
+static void int_exit(int sig)
 {
-       u32 curr_prog_id = 0;
-       int cmd = CLOSE_CONN;
-
-       if (bpf_get_link_xdp_id(opt_ifindex, &curr_prog_id, opt_xdp_flags)) {
-               printf("bpf_get_link_xdp_id failed\n");
-               exit(EXIT_FAILURE);
-       }
-       if (prog_id == curr_prog_id)
-               bpf_set_link_xdp_fd(opt_ifindex, -1, opt_xdp_flags);
-       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");
-
-       if (opt_reduced_cap) {
-               if (write(sock, &cmd, sizeof(int)) < 0) {
-                       fprintf(stderr, "Error writing into stream socket: %s", strerror(errno));
-                       exit(EXIT_FAILURE);
-               }
-       }
+       benchmark_done = true;
 }
 
-static void int_exit(int sig)
+static void __exit_with_error(int error, const char *file, const char *func,
+                             int line)
 {
-       benchmark_done = true;
+       fprintf(stderr, "%s:%s:%i: errno: %d/\"%s\"\n", file, func,
+               line, error, strerror(error));
+       exit(EXIT_FAILURE);
 }
 
+#define exit_with_error(error) __exit_with_error(error, __FILE__, __func__, __LINE__)
+
 static void xdpsock_cleanup(void)
 {
        struct xsk_umem *umem = xsks[0]->umem->umem;
-       int i;
+       int i, cmd = CLOSE_CONN;
 
        dump_stats();
        for (i = 0; i < num_socks; i++)
                xsk_socket__delete(xsks[i]->xsk);
        (void)xsk_umem__delete(umem);
-       remove_xdp_program();
-}
 
-static void __exit_with_error(int error, const char *file, const char *func,
-                             int line)
-{
-       fprintf(stderr, "%s:%s:%i: errno: %d/\"%s\"\n", file, func,
-               line, error, strerror(error));
-       dump_stats();
-       remove_xdp_program();
-       exit(EXIT_FAILURE);
+       if (opt_reduced_cap) {
+               if (write(sock, &cmd, sizeof(int)) < 0)
+                       exit_with_error(errno);
+       }
 }
 
-#define exit_with_error(error) __exit_with_error(error, __FILE__, __func__, \
-                                                __LINE__)
 static void swap_mac_addresses(void *data)
 {
        struct ether_header *eth = (struct ether_header *)data;
@@ -880,10 +857,6 @@ static struct xsk_socket_info *xsk_configure_socket(struct xsk_umem_info *umem,
        if (ret)
                exit_with_error(-ret);
 
-       ret = bpf_get_link_xdp_id(opt_ifindex, &prog_id, opt_xdp_flags);
-       if (ret)
-               exit_with_error(-ret);
-
        xsk->app_stats.rx_empty_polls = 0;
        xsk->app_stats.fill_fail_polls = 0;
        xsk->app_stats.copy_tx_sendtos = 0;