From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: netdev@vger.kernel.org,
"Jesse Brandeburg" <jesse.brandeburg@intel.com>,
"Tony Nguyen" <anthony.l.nguyen@intel.com>,
"David S. Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
"Jeff Kirsher" <jeffrey.t.kirsher@intel.com>,
"Björn Töpel" <bjorn@kernel.org>,
intel-wired-lan@lists.osuosl.org, bpf@vger.kernel.org
Subject: Re: [PATCH net] ixgbe: xsk: fix for metasize when construct skb by xdp_buff
Date: Fri, 11 Jun 2021 17:12:45 +0200 [thread overview]
Message-ID: <20210611151245.GA31289@ranger.igk.intel.com> (raw)
In-Reply-To: <20210609122244.52647-1-xuanzhuo@linux.alibaba.com>
On Wed, Jun 09, 2021 at 08:22:44PM +0800, Xuan Zhuo wrote:
> We should copy data_meta to the skb space. Then use __skb_pull to
> correct skb->data
This looks like a bug that has been sitting over here for sometime. Have
you encountered this during your virtio-net's AF_XDP ZC work? I'm all ears
how you spotted this.
Anyway, other drivers needs such fixing too. Are you willing to do that or
should we take it on our side?
Magnus is OOO today, I'd like to get his final ack on that.
From me:
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Thanks!
>
> Fixes: d0bcacd0a1309 ("ixgbe: add AF_XDP zero-copy Rx support")
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
> index f72d2978263b..ee88107fa57a 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
> @@ -204,7 +204,7 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
> struct ixgbe_rx_buffer *bi)
> {
> unsigned int metasize = bi->xdp->data - bi->xdp->data_meta;
> - unsigned int datasize = bi->xdp->data_end - bi->xdp->data;
> + unsigned int datasize = bi->xdp->data_end - bi->xdp->data_meta;
> struct sk_buff *skb;
>
> /* allocate a skb to store the frags */
> @@ -214,10 +214,12 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
> if (unlikely(!skb))
> return NULL;
>
> - skb_reserve(skb, bi->xdp->data - bi->xdp->data_hard_start);
> - memcpy(__skb_put(skb, datasize), bi->xdp->data, datasize);
> - if (metasize)
> + skb_reserve(skb, bi->xdp->data_meta - bi->xdp->data_hard_start);
> + memcpy(__skb_put(skb, datasize), bi->xdp->data_meta, datasize);
> + if (metasize) {
> + __skb_pull(skb, metasize);
> skb_metadata_set(skb, metasize);
> + }
>
> xsk_buff_free(bi->xdp);
> bi->xdp = NULL;
> --
> 2.31.0
>
prev parent reply other threads:[~2021-06-11 15:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 12:22 [PATCH net] ixgbe: xsk: fix for metasize when construct skb by xdp_buff Xuan Zhuo
2021-06-11 15:12 ` Maciej Fijalkowski [this message]
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=20210611151245.GA31289@ranger.igk.intel.com \
--to=maciej.fijalkowski@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=ast@kernel.org \
--cc=bjorn@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=xuanzhuo@linux.alibaba.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).