Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Björn Töpel" <bjorn.topel@gmail.com>
To: Weqaar Janjua <weqaar.a.janjua@intel.com>
Cc: "Karlsson, Magnus" <magnus.karlsson@intel.com>,
	"Björn Töpel" <bjorn.topel@intel.com>,
	"Alexei Starovoitov" <ast@kernel.org>,
	"Daniel Borkmann" <daniel@iogearbox.net>,
	Netdev <netdev@vger.kernel.org>,
	"Jonathan Lemon" <jonathan.lemon@gmail.com>,
	bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next] samples/bpf: fix to xdpsock to avoid recycling frames
Date: Mon, 31 Aug 2020 13:11:55 +0200	[thread overview]
Message-ID: <CAJ+HfNhwu+r4fFpsDVOEaGyub-yD-R4uh5kQa-_dPHF_prWXPA@mail.gmail.com> (raw)
In-Reply-To: <20200828161717.42705-1-weqaar.a.janjua@intel.com>

On Fri, 28 Aug 2020 at 18:18, Weqaar Janjua <weqaar.a.janjua@intel.com> wrote:
>
> The txpush program in the xdpsock sample application is supposed
> to send out all packets in the umem in a round-robin fashion.
> The problem is that it only cycled through the first BATCH_SIZE
> worth of packets. Fixed this so that it cycles through all buffers
> in the umem as intended.
>
> Fixes: 248c7f9c0e21 ("samples/bpf: convert xdpsock to use libbpf for AF_XDP access")
> Signed-off-by: Weqaar Janjua <weqaar.a.janjua@intel.com>

Thanks Weqaar!

Acked-by: Björn Töpel <bjorn.topel@intel.com>

> ---
>  samples/bpf/xdpsock_user.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
> index 19c679456a0e..c821e9867139 100644
> --- a/samples/bpf/xdpsock_user.c
> +++ b/samples/bpf/xdpsock_user.c
> @@ -1004,7 +1004,7 @@ static void rx_drop_all(void)
>         }
>  }
>
> -static void tx_only(struct xsk_socket_info *xsk, u32 frame_nb, int batch_size)
> +static void tx_only(struct xsk_socket_info *xsk, u32 *frame_nb, int batch_size)
>  {
>         u32 idx;
>         unsigned int i;
> @@ -1017,14 +1017,14 @@ static void tx_only(struct xsk_socket_info *xsk, u32 frame_nb, int batch_size)
>         for (i = 0; i < batch_size; i++) {
>                 struct xdp_desc *tx_desc = xsk_ring_prod__tx_desc(&xsk->tx,
>                                                                   idx + i);
> -               tx_desc->addr = (frame_nb + i) << XSK_UMEM__DEFAULT_FRAME_SHIFT;
> +               tx_desc->addr = (*frame_nb + i) << XSK_UMEM__DEFAULT_FRAME_SHIFT;
>                 tx_desc->len = PKT_SIZE;
>         }
>
>         xsk_ring_prod__submit(&xsk->tx, batch_size);
>         xsk->outstanding_tx += batch_size;
> -       frame_nb += batch_size;
> -       frame_nb %= NUM_FRAMES;
> +       *frame_nb += batch_size;
> +       *frame_nb %= NUM_FRAMES;
>         complete_tx_only(xsk, batch_size);
>  }
>
> @@ -1080,7 +1080,7 @@ static void tx_only_all(void)
>                 }
>
>                 for (i = 0; i < num_socks; i++)
> -                       tx_only(xsks[i], frame_nb[i], batch_size);
> +                       tx_only(xsks[i], &frame_nb[i], batch_size);
>
>                 pkt_cnt += batch_size;
>
> --
> 2.20.1
>
> --------------------------------------------------------------
> Intel Research and Development Ireland Limited
> Registered in Ireland
> Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
> Registered Number: 308263
>
>
> This e-mail and any attachments may contain confidential material for the sole
> use of the intended recipient(s). Any review or distribution by others is
> strictly prohibited. If you are not the intended recipient, please contact the
> sender and delete all copies.
>

  reply	other threads:[~2020-08-31 11:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-28 16:17 Weqaar Janjua
2020-08-31 11:11 ` Björn Töpel [this message]
2020-08-31 11:13 ` Björn Töpel
2020-08-31 21:03 ` Daniel Borkmann

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=CAJ+HfNhwu+r4fFpsDVOEaGyub-yD-R4uh5kQa-_dPHF_prWXPA@mail.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=jonathan.lemon@gmail.com \
    --cc=magnus.karlsson@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=weqaar.a.janjua@intel.com \
    --subject='Re: [PATCH bpf-next] samples/bpf: fix to xdpsock to avoid recycling frames' \
    /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

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).