From: Magnus Karlsson <magnus.karlsson@gmail.com>
To: "Björn Töpel" <bjorn.topel@gmail.com>
Cc: "Network Development" <netdev@vger.kernel.org>,
bpf <bpf@vger.kernel.org>, "Björn Töpel" <bjorn.topel@intel.com>,
"Karlsson, Magnus" <magnus.karlsson@intel.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Fijalkowski, Maciej" <maciej.fijalkowski@intel.com>,
"Samudrala, Sridhar" <sridhar.samudrala@intel.com>,
"Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
"Zhang, Qi Z" <qi.z.zhang@intel.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Eric Dumazet" <edumazet@google.com>,
"Jonathan Lemon" <jonathan.lemon@gmail.com>,
"Maxim Mikityanskiy" <maximmi@nvidia.com>
Subject: Re: [PATCH bpf-next v3 08/10] samples/bpf: use recvfrom() in xdpsock/l2fwd
Date: Wed, 25 Nov 2020 09:00:43 +0100 [thread overview]
Message-ID: <CAJ8uoz2URCA=Q40dmhiiu3_ri4P4R04x+stH6f2HrarChZBQyQ@mail.gmail.com> (raw)
In-Reply-To: <20201119083024.119566-9-bjorn.topel@gmail.com>
On Thu, Nov 19, 2020 at 9:33 AM Björn Töpel <bjorn.topel@gmail.com> wrote:
>
> From: Björn Töpel <bjorn.topel@intel.com>
>
> Start using recvfrom() the l2fwd scenario, instead of poll() which is
> more expensive and need additional knobs for busy-polling.
>
> Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
> ---
> samples/bpf/xdpsock_user.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
> diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
> index f90111b95b2e..24aa7511c4c8 100644
> --- a/samples/bpf/xdpsock_user.c
> +++ b/samples/bpf/xdpsock_user.c
> @@ -1098,8 +1098,7 @@ static void kick_tx(struct xsk_socket_info *xsk)
> exit_with_error(errno);
> }
>
> -static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk,
> - struct pollfd *fds)
> +static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk)
> {
> struct xsk_umem_info *umem = xsk->umem;
> u32 idx_cq = 0, idx_fq = 0;
> @@ -1134,7 +1133,7 @@ static inline void complete_tx_l2fwd(struct xsk_socket_info *xsk,
> exit_with_error(-ret);
> if (xsk_ring_prod__needs_wakeup(&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(&umem->fq, rcvd, &idx_fq);
> }
> @@ -1331,19 +1330,19 @@ static void tx_only_all(void)
> complete_tx_only_all();
> }
>
> -static void l2fwd(struct xsk_socket_info *xsk, struct pollfd *fds)
> +static void l2fwd(struct xsk_socket_info *xsk)
> {
> unsigned int rcvd, i;
> u32 idx_rx = 0, idx_tx = 0;
> int ret;
>
> - complete_tx_l2fwd(xsk, fds);
> + complete_tx_l2fwd(xsk);
>
> rcvd = xsk_ring_cons__peek(&xsk->rx, opt_batch_size, &idx_rx);
> 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;
> }
> @@ -1353,7 +1352,7 @@ static void l2fwd(struct xsk_socket_info *xsk, struct pollfd *fds)
> while (ret != rcvd) {
> if (ret < 0)
> exit_with_error(-ret);
> - complete_tx_l2fwd(xsk, fds);
> + complete_tx_l2fwd(xsk);
> if (xsk_ring_prod__needs_wakeup(&xsk->tx)) {
> xsk->app_stats.tx_wakeup_sendtos++;
> kick_tx(xsk);
> @@ -1388,22 +1387,20 @@ static void l2fwd_all(void)
> struct pollfd fds[MAX_SOCKS] = {};
> int i, ret;
>
> - for (i = 0; i < num_socks; i++) {
> - fds[i].fd = xsk_socket__fd(xsks[i]->xsk);
> - fds[i].events = POLLOUT | POLLIN;
> - }
> -
> for (;;) {
> if (opt_poll) {
> - for (i = 0; i < num_socks; i++)
> + for (i = 0; i < num_socks; i++) {
> + fds[i].fd = xsk_socket__fd(xsks[i]->xsk);
> + fds[i].events = POLLOUT | POLLIN;
> xsks[i]->app_stats.opt_polls++;
> + }
> ret = poll(fds, num_socks, opt_timeout);
> if (ret <= 0)
> continue;
> }
>
> for (i = 0; i < num_socks; i++)
> - l2fwd(xsks[i], fds);
> + l2fwd(xsks[i]);
>
> if (benchmark_done)
> break;
> --
> 2.27.0
>
next prev parent reply other threads:[~2020-11-25 8:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 8:30 [PATCH bpf-next v3 00/10] Introduce preferred busy-polling Björn Töpel
2020-11-19 8:30 ` [PATCH bpf-next v3 01/10] net: introduce " Björn Töpel
2020-11-24 0:04 ` Jakub Kicinski
2020-11-24 7:58 ` Björn Töpel
2020-11-24 0:11 ` Jakub Kicinski
2020-11-24 8:47 ` Björn Töpel
2020-11-24 16:21 ` Jakub Kicinski
2020-11-19 8:30 ` [PATCH bpf-next v3 02/10] net: add SO_BUSY_POLL_BUDGET socket option Björn Töpel
2020-11-24 16:21 ` Jakub Kicinski
2020-11-19 8:30 ` [PATCH bpf-next v3 03/10] xsk: add support for recvmsg() Björn Töpel
2020-11-25 6:55 ` Magnus Karlsson
2020-11-19 8:30 ` [PATCH bpf-next v3 04/10] xsk: check need wakeup flag in sendmsg() Björn Töpel
2020-11-25 7:16 ` Magnus Karlsson
2020-11-19 8:30 ` [PATCH bpf-next v3 05/10] xsk: add busy-poll support for {recv,send}msg() Björn Töpel
2020-11-25 7:58 ` Magnus Karlsson
2020-11-19 8:30 ` [PATCH bpf-next v3 06/10] xsk: propagate napi_id to XDP socket Rx path Björn Töpel
2020-11-25 14:47 ` Magnus Karlsson
2020-11-25 21:14 ` Michael S. Tsirkin
2021-09-29 18:33 ` kernel test robot
2021-09-30 6:04 ` Magnus Karlsson
2021-10-02 2:07 ` [kbuild-all] " Philip Li
2021-11-05 20:17 ` kernel test robot
2020-11-19 8:30 ` [PATCH bpf-next v3 07/10] samples/bpf: use recvfrom() in xdpsock/rxdrop Björn Töpel
2020-11-25 7:59 ` Magnus Karlsson
2020-11-19 8:30 ` [PATCH bpf-next v3 08/10] samples/bpf: use recvfrom() in xdpsock/l2fwd Björn Töpel
2020-11-25 8:00 ` Magnus Karlsson [this message]
2020-11-19 8:30 ` [PATCH bpf-next v3 09/10] samples/bpf: add busy-poll support to xdpsock Björn Töpel
2020-11-25 8:19 ` Magnus Karlsson
2020-11-19 8:30 ` [PATCH bpf-next v3 10/10] samples/bpf: add option to set the busy-poll budget Björn Töpel
2020-11-25 8:23 ` Magnus Karlsson
2020-11-23 13:31 ` [PATCH bpf-next v3 00/10] Introduce preferred busy-polling Björn Töpel
2020-11-23 23:54 ` Jakub Kicinski
2020-11-24 0:14 ` Jakub Kicinski
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='CAJ8uoz2URCA=Q40dmhiiu3_ri4P4R04x+stH6f2HrarChZBQyQ@mail.gmail.com' \
--to=magnus.karlsson@gmail.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@gmail.com \
--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).