lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0439/1017] i40e: respect metadata on XSK Rx to skb
    Date
    From: Alexander Lobakin <alexandr.lobakin@intel.com>

    [ Upstream commit 6dba29537c0f639b482bd8f8bbd50ab4ae74b48d ]

    For now, if the XDP prog returns XDP_PASS on XSK, the metadata will
    be lost as it doesn't get copied to the skb.

    Copy it along with the frame headers. Account its size on skb
    allocation, and when copying just treat it as a part of the frame
    and do a pull after to "move" it to the "reserved" zone.

    net_prefetch() xdp->data_meta and align the copy size to speed-up
    memcpy() a little and better match i40e_construct_skb().

    Fixes: 0a714186d3c0 ("i40e: add AF_XDP zero-copy Rx support")
    Suggested-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com>
    Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
    Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/i40e/i40e_xsk.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
    index dff7c7fcc329..2553b130108d 100644
    --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
    @@ -241,19 +241,25 @@ bool i40e_alloc_rx_buffers_zc(struct i40e_ring *rx_ring, u16 count)
    static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring,
    struct xdp_buff *xdp)
    {
    + unsigned int totalsize = xdp->data_end - xdp->data_meta;
    unsigned int metasize = xdp->data - xdp->data_meta;
    - unsigned int datasize = xdp->data_end - xdp->data;
    struct sk_buff *skb;

    + net_prefetch(xdp->data_meta);
    +
    /* allocate a skb to store the frags */
    - skb = __napi_alloc_skb(&rx_ring->q_vector->napi, datasize,
    + skb = __napi_alloc_skb(&rx_ring->q_vector->napi, totalsize,
    GFP_ATOMIC | __GFP_NOWARN);
    if (unlikely(!skb))
    goto out;

    - memcpy(__skb_put(skb, datasize), xdp->data, datasize);
    - if (metasize)
    + memcpy(__skb_put(skb, totalsize), xdp->data_meta,
    + ALIGN(totalsize, sizeof(long)));
    +
    + if (metasize) {
    skb_metadata_set(skb, metasize);
    + __skb_pull(skb, metasize);
    + }

    out:
    xsk_buff_free(xdp);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 14:58    [W:2.559 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site