From: "Björn Töpel" <bjorn.topel@gmail.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: "Björn Töpel" <bjorn.topel@intel.com>,
magnus.karlsson@intel.com, ast@kernel.org, daniel@iogearbox.net,
maciej.fijalkowski@intel.com, sridhar.samudrala@intel.com,
jesse.brandeburg@intel.com, qi.z.zhang@intel.com,
kuba@kernel.org, edumazet@google.com, jonathan.lemon@gmail.com,
maximmi@nvidia.com
Subject: [PATCH bpf-next v4 07/10] samples/bpf: use recvfrom() in xdpsock/rxdrop
Date: Mon, 30 Nov 2020 19:52:02 +0100 [thread overview]
Message-ID: <20201130185205.196029-8-bjorn.topel@gmail.com> (raw)
In-Reply-To: <20201130185205.196029-1-bjorn.topel@gmail.com>
From: Björn Töpel <bjorn.topel@intel.com>
Start using recvfrom() the rxdrop scenario.
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
---
samples/bpf/xdpsock_user.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index 2567f0db5aca..f90111b95b2e 100644
--- a/samples/bpf/xdpsock_user.c
+++ b/samples/bpf/xdpsock_user.c
@@ -1170,7 +1170,7 @@ static inline void complete_tx_only(struct xsk_socket_info *xsk,
}
}
-static void rx_drop(struct xsk_socket_info *xsk, struct pollfd *fds)
+static void rx_drop(struct xsk_socket_info *xsk)
{
unsigned int rcvd, i;
u32 idx_rx = 0, idx_fq = 0;
@@ -1180,7 +1180,7 @@ static void rx_drop(struct xsk_socket_info *xsk, struct pollfd *fds)
if (!rcvd) {
if (xsk_ring_prod__needs_wakeup(&xsk->umem->fq)) {
xsk->app_stats.rx_empty_polls++;
- ret = poll(fds, num_socks, opt_timeout);
+ recvfrom(xsk_socket__fd(xsk->xsk), NULL, 0, MSG_DONTWAIT, NULL, NULL);
}
return;
}
@@ -1191,7 +1191,7 @@ static void rx_drop(struct xsk_socket_info *xsk, struct pollfd *fds)
exit_with_error(-ret);
if (xsk_ring_prod__needs_wakeup(&xsk->umem->fq)) {
xsk->app_stats.fill_fail_polls++;
- ret = poll(fds, num_socks, opt_timeout);
+ recvfrom(xsk_socket__fd(xsk->xsk), NULL, 0, MSG_DONTWAIT, NULL, NULL);
}
ret = xsk_ring_prod__reserve(&xsk->umem->fq, rcvd, &idx_fq);
}
@@ -1233,7 +1233,7 @@ static void rx_drop_all(void)
}
for (i = 0; i < num_socks; i++)
- rx_drop(xsks[i], fds);
+ rx_drop(xsks[i]);
if (benchmark_done)
break;
--
2.27.0
next prev parent reply other threads:[~2020-11-30 18:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 18:51 [PATCH bpf-next v4 00/10] Introduce preferred busy-polling Björn Töpel
2020-11-30 18:51 ` [PATCH bpf-next v4 01/10] net: introduce " Björn Töpel
2020-11-30 18:51 ` [PATCH bpf-next v4 02/10] net: add SO_BUSY_POLL_BUDGET socket option Björn Töpel
2020-11-30 18:51 ` [PATCH bpf-next v4 03/10] xsk: add support for recvmsg() Björn Töpel
2020-11-30 18:51 ` [PATCH bpf-next v4 04/10] xsk: check need wakeup flag in sendmsg() Björn Töpel
2020-11-30 18:52 ` [PATCH bpf-next v4 05/10] xsk: add busy-poll support for {recv,send}msg() Björn Töpel
2020-11-30 18:52 ` [PATCH bpf-next v4 06/10] xsk: propagate napi_id to XDP socket Rx path Björn Töpel
2020-11-30 18:52 ` Björn Töpel [this message]
2020-11-30 18:52 ` [PATCH bpf-next v4 08/10] samples/bpf: use recvfrom() in xdpsock/l2fwd Björn Töpel
2020-11-30 18:52 ` [PATCH bpf-next v4 09/10] samples/bpf: add busy-poll support to xdpsock Björn Töpel
2020-11-30 18:52 ` [PATCH bpf-next v4 10/10] samples/bpf: add option to set the busy-poll budget Björn Töpel
2020-11-30 23:30 ` [PATCH bpf-next v4 00/10] Introduce preferred busy-polling patchwork-bot+netdevbpf
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=20201130185205.196029-8-bjorn.topel@gmail.com \
--to=bjorn.topel@gmail.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=jesse.brandeburg@intel.com \
--cc=jonathan.lemon@gmail.com \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=maximmi@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=qi.z.zhang@intel.com \
--cc=sridhar.samudrala@intel.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).