From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: daniel@iogearbox.net, ast@kernel.org, bpf@vger.kernel.org,
netdev@vger.kernel.org
Cc: andrii@kernel.org, toke@redhat.com, bjorn.topel@intel.com,
magnus.karlsson@intel.com, ciara.loftus@intel.com,
Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Subject: [PATCH bpf-next 3/3] samples: bpf: do not unload prog within xdpsock
Date: Mon, 15 Feb 2021 16:46:38 +0100 [thread overview]
Message-ID: <20210215154638.4627-4-maciej.fijalkowski@intel.com> (raw)
In-Reply-To: <20210215154638.4627-1-maciej.fijalkowski@intel.com>
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>
---
samples/bpf/xdpsock_user.c | 55 ++++++++++----------------------------
1 file changed, 14 insertions(+), 41 deletions(-)
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index db0cb73513a5..96246313e342 100644
--- 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;
--
2.20.1
next prev parent reply other threads:[~2021-02-15 16:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 15:46 [PATCH bpf-next 0/3] Introduce bpf_link in libbpf's xsk Maciej Fijalkowski
2021-02-15 15:46 ` [PATCH bpf-next 1/3] libbpf: xsk: use bpf_link Maciej Fijalkowski
2021-02-15 17:07 ` Toke Høiland-Jørgensen
2021-02-15 17:38 ` Björn Töpel
2021-02-15 19:35 ` Toke Høiland-Jørgensen
2021-02-16 2:01 ` Maciej Fijalkowski
2021-02-16 9:15 ` Björn Töpel
2021-02-16 10:27 ` Toke Høiland-Jørgensen
2021-02-16 20:15 ` Maciej Fijalkowski
2021-02-15 20:22 ` John Fastabend
2021-02-15 21:38 ` Toke Høiland-Jørgensen
2021-02-16 0:18 ` John Fastabend
2021-02-16 2:23 ` Maciej Fijalkowski
2021-02-16 9:23 ` Björn Töpel
2021-02-16 10:36 ` Toke Høiland-Jørgensen
2021-02-23 1:15 ` Andrii Nakryiko
2021-02-17 2:23 ` Dan Siemon
2021-02-17 7:16 ` Magnus Karlsson
2021-02-17 7:36 ` Magnus Karlsson
2021-02-16 2:10 ` Maciej Fijalkowski
2021-02-15 20:49 ` John Fastabend
2021-02-16 2:38 ` Maciej Fijalkowski
2021-02-16 18:19 ` John Fastabend
2021-02-16 20:10 ` Maciej Fijalkowski
2021-02-16 9:20 ` Björn Töpel
2021-02-16 10:39 ` Toke Høiland-Jørgensen
2021-02-16 19:15 ` John Fastabend
2021-02-16 20:50 ` Maciej Fijalkowski
2021-02-16 21:17 ` John Fastabend
2021-02-15 15:46 ` [PATCH bpf-next 2/3] libbpf: clear map_info before each bpf_obj_get_info_by_fd Maciej Fijalkowski
2021-02-15 20:33 ` John Fastabend
2021-02-16 2:42 ` Maciej Fijalkowski
2021-02-15 15:46 ` Maciej Fijalkowski [this message]
2021-02-15 20:24 ` [PATCH bpf-next 3/3] samples: bpf: do not unload prog within xdpsock John Fastabend
2021-02-16 9:22 ` Björn Töpel
2021-02-16 14:15 ` Maciej Fijalkowski
2021-02-15 16:07 ` [PATCH bpf-next 0/3] Introduce bpf_link in libbpf's xsk Björn Töpel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210215154638.4627-4-maciej.fijalkowski@intel.com \
--to=maciej.fijalkowski@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=ciara.loftus@intel.com \
--cc=daniel@iogearbox.net \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=toke@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).