target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch

   1 From 7c48cb0176c6d6d3b55029f7ff4ffa05faee6446 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Fri, 21 Jan 2022 11:09:50 +0100
   4 Subject: [PATCH] xdp: add frags support to xdp_return_{buff/frame}
   5
   6 Take into account if the received xdp_buff/xdp_frame is non-linear
   7 recycling/returning the frame memory to the allocator or into
   8 xdp_frame_bulk.
   9
  10 Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com>
  11 Acked-by: John Fastabend <john.fastabend@gmail.com>
  12 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  13 Link: https://lore.kernel.org/r/a961069febc868508ce1bdf5e53a343eb4e57cb2.1642758637.git.lorenzo@kernel.org
  14 Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  15 ---
  16  include/net/xdp.h | 18 ++++++++++++++--
  17  net/core/xdp.c    | 54 ++++++++++++++++++++++++++++++++++++++++++++++-
  18  2 files changed, 69 insertions(+), 3 deletions(-)
  19
  20 --- a/include/net/xdp.h
  21 +++ b/include/net/xdp.h
  22 @@ -275,10 +275,24 @@ void __xdp_release_frame(void *data, str
  23  static inline void xdp_release_frame(struct xdp_frame *xdpf)
  24  {
  25         struct xdp_mem_info *mem = &xdpf->mem;
  26 +       struct skb_shared_info *sinfo;
  27 +       int i;
  28
  29         /* Curr only page_pool needs this */
  30 -       if (mem->type == MEM_TYPE_PAGE_POOL)
  31 -               __xdp_release_frame(xdpf->data, mem);
  32 +       if (mem->type != MEM_TYPE_PAGE_POOL)
  33 +               return;
  34 +
  35 +       if (likely(!xdp_frame_has_frags(xdpf)))
  36 +               goto out;
  37 +
  38 +       sinfo = xdp_get_shared_info_from_frame(xdpf);
  39 +       for (i = 0; i < sinfo->nr_frags; i++) {
  40 +               struct page *page = skb_frag_page(&sinfo->frags[i]);
  41 +
  42 +               __xdp_release_frame(page_address(page), mem);
  43 +       }
  44 +out:
  45 +       __xdp_release_frame(xdpf->data, mem);
  46  }
  47
  48  int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,
  49 --- a/net/core/xdp.c
  50 +++ b/net/core/xdp.c
  51 @@ -409,12 +409,38 @@ static void __xdp_return(void *data, str
  52
  53  void xdp_return_frame(struct xdp_frame *xdpf)
  54  {
  55 +       struct skb_shared_info *sinfo;
  56 +       int i;
  57 +
  58 +       if (likely(!xdp_frame_has_frags(xdpf)))
  59 +               goto out;
  60 +
  61 +       sinfo = xdp_get_shared_info_from_frame(xdpf);
  62 +       for (i = 0; i < sinfo->nr_frags; i++) {
  63 +               struct page *page = skb_frag_page(&sinfo->frags[i]);
  64 +
  65 +               __xdp_return(page_address(page), &xdpf->mem, false, NULL);
  66 +       }
  67 +out:
  68         __xdp_return(xdpf->data, &xdpf->mem, false, NULL);
  69  }
  70  EXPORT_SYMBOL_GPL(xdp_return_frame);
  71
  72  void xdp_return_frame_rx_napi(struct xdp_frame *xdpf)
  73  {
  74 +       struct skb_shared_info *sinfo;
  75 +       int i;
  76 +
  77 +       if (likely(!xdp_frame_has_frags(xdpf)))
  78 +               goto out;
  79 +
  80 +       sinfo = xdp_get_shared_info_from_frame(xdpf);
  81 +       for (i = 0; i < sinfo->nr_frags; i++) {
  82 +               struct page *page = skb_frag_page(&sinfo->frags[i]);
  83 +
  84 +               __xdp_return(page_address(page), &xdpf->mem, true, NULL);
  85 +       }
  86 +out:
  87         __xdp_return(xdpf->data, &xdpf->mem, true, NULL);
  88  }
  89  EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);
  90 @@ -450,7 +476,7 @@ void xdp_return_frame_bulk(struct xdp_fr
  91         struct xdp_mem_allocator *xa;
  92
  93         if (mem->type != MEM_TYPE_PAGE_POOL) {
  94 -               __xdp_return(xdpf->data, &xdpf->mem, false, NULL);
  95 +               xdp_return_frame(xdpf);
  96                 return;
  97         }
  98
  99 @@ -469,12 +495,38 @@ void xdp_return_frame_bulk(struct xdp_fr
 100                 bq->xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params);
 101         }
 102
 103 +       if (unlikely(xdp_frame_has_frags(xdpf))) {
 104 +               struct skb_shared_info *sinfo;
 105 +               int i;
 106 +
 107 +               sinfo = xdp_get_shared_info_from_frame(xdpf);
 108 +               for (i = 0; i < sinfo->nr_frags; i++) {
 109 +                       skb_frag_t *frag = &sinfo->frags[i];
 110 +
 111 +                       bq->q[bq->count++] = skb_frag_address(frag);
 112 +                       if (bq->count == XDP_BULK_QUEUE_SIZE)
 113 +                               xdp_flush_frame_bulk(bq);
 114 +               }
 115 +       }
 116         bq->q[bq->count++] = xdpf->data;
 117  }
 118  EXPORT_SYMBOL_GPL(xdp_return_frame_bulk);
 119
 120  void xdp_return_buff(struct xdp_buff *xdp)
 121  {
 122 +       struct skb_shared_info *sinfo;
 123 +       int i;
 124 +
 125 +       if (likely(!xdp_buff_has_frags(xdp)))
 126 +               goto out;
 127 +
 128 +       sinfo = xdp_get_shared_info_from_buff(xdp);
 129 +       for (i = 0; i < sinfo->nr_frags; i++) {
 130 +               struct page *page = skb_frag_page(&sinfo->frags[i]);
 131 +
 132 +               __xdp_return(page_address(page), &xdp->rxq->mem, true, xdp);
 133 +       }
 134 +out:
 135         __xdp_return(xdp->data, &xdp->rxq->mem, true, xdp);
 136  }
 137