leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samples: bpf: Do not unload prog within xdpsock

Browse Source 
With the introduction of bpf_link in xsk's libbpf part, there's no
further need for explicit unload of prog on xdpsock's termination. When
process dies, the bpf_link's refcount will be decremented and resources
will be unloaded/freed under the hood in case when there are no more
active users.

While at it, don't dump stats on error path.

Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210329224316.17793-8-maciej.fijalkowski@intel.com
This commit is contained in:
Maciej Fijalkowski 2021-03-30 00:43:06 +02:00 committed by Alexei Starovoitov
parent 10397994d3
commit c9d27c9e8d
1 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
samples/bpf/xdpsock_user.c
View File

@ -96,7 +96,6 @@ static int opt_xsk_frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;
static int opt_timeout = 1000; static int opt_timeout = 1000;
static bool opt_need_wakeup = true; static bool opt_need_wakeup = true;
static u32 opt_num_xsks = 1; static u32 opt_num_xsks = 1;
static u32 prog_id;
static bool opt_busy_poll; static bool opt_busy_poll;
static bool opt_reduced_cap; static bool opt_reduced_cap;
@ -462,59 +461,37 @@ static void *poller(void *arg)
return NULL; return NULL;
} }
static void remove_xdp_program(void)
{
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);
}
}
}
static void int_exit(int sig) static void int_exit(int sig)
{ {
benchmark_done = true; benchmark_done = true;
} }
static void xdpsock_cleanup(void)
{
struct xsk_umem *umem = xsks[0]->umem->umem;
int i;
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, static void __exit_with_error(int error, const char *file, const char *func,
int line) int line)
{ {
fprintf(stderr, "%s:%s:%i: errno: %d/\"%s\"\n", file, func, fprintf(stderr, "%s:%s:%i: errno: %d/\"%s\"\n", file, func,
line, error, strerror(error)); line, error, strerror(error));
dump_stats();
remove_xdp_program();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#define exit_with_error(error) __exit_with_error(error, __FILE__, __func__, \ #define exit_with_error(error) __exit_with_error(error, __FILE__, __func__, __LINE__)
__LINE__)
static void xdpsock_cleanup(void)
{
struct xsk_umem *umem = xsks[0]->umem->umem;
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);
if (opt_reduced_cap) {
if (write(sock, &cmd, sizeof(int)) < 0)
exit_with_error(errno);
}
}
static void swap_mac_addresses(void *data) static void swap_mac_addresses(void *data)
{ {
struct ether_header *eth = (struct ether_header *)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) if (ret)
exit_with_error(-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.rx_empty_polls = 0;
xsk->app_stats.fill_fail_polls = 0; xsk->app_stats.fill_fail_polls = 0;
xsk->app_stats.copy_tx_sendtos = 0; xsk->app_stats.copy_tx_sendtos = 0;