bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Vladimir Oltean <olteanv@gmail.com>
Cc: bpf@vger.kernel.org, netdev@vger.kernel.org,
	lorenzo.bianconi@redhat.com, davem@davemloft.net,
	kuba@kernel.org, ast@kernel.org, daniel@iogearbox.net,
	shayagr@amazon.com, sameehj@amazon.com, john.fastabend@gmail.com,
	dsahern@kernel.org, brouer@redhat.com, echaudro@redhat.com,
	jasowang@redhat.com, alexander.duyck@gmail.com, saeed@kernel.org,
	maciej.fijalkowski@intel.com
Subject: Re: [PATCH v8 bpf-next 04/14] xdp: add multi-buff support to xdp_return_{buff/frame}
Date: Fri, 9 Apr 2021 18:28:26 +0200	[thread overview]
Message-ID: <YHCAqo3w/J+ngb9P@lore-desk> (raw)
In-Reply-To: <20210408183038.yacxn575nl7omcol@skbuf>

[-- Attachment #1: Type: text/plain, Size: 6362 bytes --]

> On Thu, Apr 08, 2021 at 02:50:56PM +0200, Lorenzo Bianconi wrote:
> > Take into account if the received xdp_buff/xdp_frame is non-linear
> > recycling/returning the frame memory to the allocator or into
> > xdp_frame_bulk.
> > Introduce xdp_return_num_frags_from_buff to return a given number of
> > fragments from a xdp multi-buff starting from the tail.
> > 
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> >  include/net/xdp.h | 19 ++++++++++--
> >  net/core/xdp.c    | 76 ++++++++++++++++++++++++++++++++++++++++++++++-
> >  2 files changed, 92 insertions(+), 3 deletions(-)
> > 
> > diff --git a/include/net/xdp.h b/include/net/xdp.h
> > index 02aea7696d15..c8eb7cf4ebed 100644
> > --- a/include/net/xdp.h
> > +++ b/include/net/xdp.h
> > @@ -289,6 +289,7 @@ void xdp_return_buff(struct xdp_buff *xdp);
> >  void xdp_flush_frame_bulk(struct xdp_frame_bulk *bq);
> >  void xdp_return_frame_bulk(struct xdp_frame *xdpf,
> >  			   struct xdp_frame_bulk *bq);
> > +void xdp_return_num_frags_from_buff(struct xdp_buff *xdp, u16 num_frags);
> >  
> >  /* When sending xdp_frame into the network stack, then there is no
> >   * return point callback, which is needed to release e.g. DMA-mapping
> > @@ -299,10 +300,24 @@ void __xdp_release_frame(void *data, struct xdp_mem_info *mem);
> >  static inline void xdp_release_frame(struct xdp_frame *xdpf)
> >  {
> >  	struct xdp_mem_info *mem = &xdpf->mem;
> > +	struct xdp_shared_info *xdp_sinfo;
> > +	int i;
> >  
> >  	/* Curr only page_pool needs this */
> > -	if (mem->type == MEM_TYPE_PAGE_POOL)
> > -		__xdp_release_frame(xdpf->data, mem);
> > +	if (mem->type != MEM_TYPE_PAGE_POOL)
> > +		return;
> > +
> > +	if (likely(!xdpf->mb))
> > +		goto out;
> > +
> > +	xdp_sinfo = xdp_get_shared_info_from_frame(xdpf);
> > +	for (i = 0; i < xdp_sinfo->nr_frags; i++) {
> > +		struct page *page = xdp_get_frag_page(&xdp_sinfo->frags[i]);
> > +
> > +		__xdp_release_frame(page_address(page), mem);
> > +	}
> > +out:
> > +	__xdp_release_frame(xdpf->data, mem);
> >  }
> >  
> >  int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,
> > diff --git a/net/core/xdp.c b/net/core/xdp.c
> > index 05354976c1fc..430f516259d9 100644
> > --- a/net/core/xdp.c
> > +++ b/net/core/xdp.c
> > @@ -374,12 +374,38 @@ static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct,
> >  
> >  void xdp_return_frame(struct xdp_frame *xdpf)
> >  {
> > +	struct xdp_shared_info *xdp_sinfo;
> > +	int i;
> > +
> > +	if (likely(!xdpf->mb))
> > +		goto out;
> > +
> > +	xdp_sinfo = xdp_get_shared_info_from_frame(xdpf);
> > +	for (i = 0; i < xdp_sinfo->nr_frags; i++) {
> > +		struct page *page = xdp_get_frag_page(&xdp_sinfo->frags[i]);
> > +
> > +		__xdp_return(page_address(page), &xdpf->mem, false, NULL);
> > +	}
> > +out:
> >  	__xdp_return(xdpf->data, &xdpf->mem, false, NULL);
> >  }
> >  EXPORT_SYMBOL_GPL(xdp_return_frame);
> >  
> >  void xdp_return_frame_rx_napi(struct xdp_frame *xdpf)
> >  {
> > +	struct xdp_shared_info *xdp_sinfo;
> > +	int i;
> > +
> > +	if (likely(!xdpf->mb))
> > +		goto out;
> > +
> > +	xdp_sinfo = xdp_get_shared_info_from_frame(xdpf);
> > +	for (i = 0; i < xdp_sinfo->nr_frags; i++) {
> > +		struct page *page = xdp_get_frag_page(&xdp_sinfo->frags[i]);
> > +
> > +		__xdp_return(page_address(page), &xdpf->mem, true, NULL);
> > +	}
> > +out:
> >  	__xdp_return(xdpf->data, &xdpf->mem, true, NULL);
> >  }
> >  EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);
> > @@ -415,7 +441,7 @@ void xdp_return_frame_bulk(struct xdp_frame *xdpf,
> >  	struct xdp_mem_allocator *xa;
> >  
> >  	if (mem->type != MEM_TYPE_PAGE_POOL) {
> > -		__xdp_return(xdpf->data, &xdpf->mem, false, NULL);
> > +		xdp_return_frame(xdpf);
> >  		return;
> >  	}
> >  
> > @@ -434,15 +460,63 @@ void xdp_return_frame_bulk(struct xdp_frame *xdpf,
> >  		bq->xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params);
> >  	}
> >  
> > +	if (unlikely(xdpf->mb)) {
> > +		struct xdp_shared_info *xdp_sinfo;
> > +		int i;
> > +
> > +		xdp_sinfo = xdp_get_shared_info_from_frame(xdpf);
> > +		for (i = 0; i < xdp_sinfo->nr_frags; i++) {
> > +			skb_frag_t *frag = &xdp_sinfo->frags[i];
> > +
> > +			bq->q[bq->count++] = xdp_get_frag_address(frag);
> > +			if (bq->count == XDP_BULK_QUEUE_SIZE)
> > +				xdp_flush_frame_bulk(bq);
> > +		}
> > +	}
> >  	bq->q[bq->count++] = xdpf->data;
> >  }
> >  EXPORT_SYMBOL_GPL(xdp_return_frame_bulk);
> >  
> >  void xdp_return_buff(struct xdp_buff *xdp)
> >  {
> > +	struct xdp_shared_info *xdp_sinfo;
> > +	int i;
> > +
> > +	if (likely(!xdp->mb))
> > +		goto out;
> > +
> > +	xdp_sinfo = xdp_get_shared_info_from_buff(xdp);
> > +	for (i = 0; i < xdp_sinfo->nr_frags; i++) {
> > +		struct page *page = xdp_get_frag_page(&xdp_sinfo->frags[i]);
> > +
> > +		__xdp_return(page_address(page), &xdp->rxq->mem, true, xdp);
> > +	}
> > +out:
> >  	__xdp_return(xdp->data, &xdp->rxq->mem, true, xdp);
> >  }
> >  
> > +void xdp_return_num_frags_from_buff(struct xdp_buff *xdp, u16 num_frags)
> > +{
> > +	struct xdp_shared_info *xdp_sinfo;
> > +	int i;
> > +
> > +	if (unlikely(!xdp->mb))
> > +		return;
> > +
> > +	xdp_sinfo = xdp_get_shared_info_from_buff(xdp);
> > +	num_frags = min_t(u16, num_frags, xdp_sinfo->nr_frags);
> > +	for (i = 1; i <= num_frags; i++) {
> > +		skb_frag_t *frag = &xdp_sinfo->frags[xdp_sinfo->nr_frags - i];
> > +		struct page *page = xdp_get_frag_page(frag);
> > +
> > +		xdp_sinfo->data_length -= xdp_get_frag_size(frag);
> > +		__xdp_return(page_address(page), &xdp->rxq->mem, false, NULL);
> > +	}
> > +	xdp_sinfo->nr_frags -= num_frags;
> > +	xdp->mb = !!xdp_sinfo->nr_frags;
> > +}
> > +EXPORT_SYMBOL_GPL(xdp_return_num_frags_from_buff);
> > +
> >  /* Only called for MEM_TYPE_PAGE_POOL see xdp.h */
> >  void __xdp_release_frame(void *data, struct xdp_mem_info *mem)
> >  {
> 
> None of this really benefits in any way from having the extra "mb" bit,
> does it? I get the impression it would work just the same way without it.

paged xdp_buff part is initialized only if xdp->mb is set. The reason is not hit
performances in the most common single buffer use case. We always need to check
xdp->mb or xdf->mb before accessing paged area.

Regards,
Lorenzo

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

  reply	other threads:[~2021-04-09 16:28 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-08 12:50 [PATCH v8 bpf-next 00/14] mvneta: introduce XDP multi-buffer support Lorenzo Bianconi
2021-04-08 12:50 ` [PATCH v8 bpf-next 01/14] xdp: introduce mb in xdp_buff/xdp_frame Lorenzo Bianconi
2021-04-08 18:17   ` Vladimir Oltean
2021-04-09 16:03     ` Lorenzo Bianconi
2021-04-29 13:36   ` Jesper Dangaard Brouer
2021-04-29 13:54     ` Lorenzo Bianconi
2021-04-08 12:50 ` [PATCH v8 bpf-next 02/14] xdp: add xdp_shared_info data structure Lorenzo Bianconi
2021-04-08 13:39   ` Vladimir Oltean
2021-04-08 14:26     ` Lorenzo Bianconi
2021-04-08 18:06   ` kernel test robot
2021-04-08 12:50 ` [PATCH v8 bpf-next 03/14] net: mvneta: update mb bit before passing the xdp buffer to eBPF layer Lorenzo Bianconi
2021-04-08 18:19   ` Vladimir Oltean
2021-04-09 16:24     ` Lorenzo Bianconi
2021-04-08 12:50 ` [PATCH v8 bpf-next 04/14] xdp: add multi-buff support to xdp_return_{buff/frame} Lorenzo Bianconi
2021-04-08 18:30   ` Vladimir Oltean
2021-04-09 16:28     ` Lorenzo Bianconi [this message]
2021-04-08 12:50 ` [PATCH v8 bpf-next 05/14] net: mvneta: add multi buffer support to XDP_TX Lorenzo Bianconi
2021-04-08 18:40   ` Vladimir Oltean
2021-04-09 16:36     ` Lorenzo Bianconi
2021-04-08 12:50 ` [PATCH v8 bpf-next 06/14] net: mvneta: enable jumbo frames for XDP Lorenzo Bianconi
2021-04-08 12:50 ` [PATCH v8 bpf-next 07/14] net: xdp: add multi-buff support to xdp_build_skb_from_fram Lorenzo Bianconi
2021-04-08 12:51 ` [PATCH v8 bpf-next 08/14] bpf: add multi-buff support to the bpf_xdp_adjust_tail() API Lorenzo Bianconi
2021-04-08 19:15   ` Vladimir Oltean
2021-04-08 20:54     ` Vladimir Oltean
2021-04-09 18:13       ` Lorenzo Bianconi
2021-04-08 12:51 ` [PATCH v8 bpf-next 09/14] bpd: add multi-buffer support to xdp copy helpers Lorenzo Bianconi
2021-04-08 20:57   ` Vladimir Oltean
2021-04-09 18:19     ` Lorenzo Bianconi
2021-04-08 21:04   ` Vladimir Oltean
2021-04-14  8:08     ` Eelco Chaudron
2021-04-08 12:51 ` [PATCH v8 bpf-next 10/14] bpf: add new frame_length field to the XDP ctx Lorenzo Bianconi
2021-04-08 12:51 ` [PATCH v8 bpf-next 11/14] bpf: move user_size out of bpf_test_init Lorenzo Bianconi
2021-04-08 12:51 ` [PATCH v8 bpf-next 12/14] bpf: introduce multibuff support to bpf_prog_test_run_xdp() Lorenzo Bianconi
2021-04-08 12:51 ` [PATCH v8 bpf-next 13/14] bpf: test_run: add xdp_shared_info pointer in bpf_test_finish signature Lorenzo Bianconi
2021-04-08 12:51 ` [PATCH v8 bpf-next 14/14] bpf: update xdp_adjust_tail selftest to include multi-buffer Lorenzo Bianconi
2021-04-09  0:56 ` [PATCH v8 bpf-next 00/14] mvneta: introduce XDP multi-buffer support John Fastabend
2021-04-09 20:16   ` Lorenzo Bianconi
2021-04-13 15:16   ` Eelco Chaudron
2021-04-16 14:27 ` Magnus Karlsson
2021-04-16 21:29   ` Lorenzo Bianconi
2021-04-16 23:00     ` Daniel Borkmann
2021-04-18 16:18   ` Jesper Dangaard Brouer
2021-04-19  6:20     ` Magnus Karlsson
2021-04-19  6:55       ` Lorenzo Bianconi
2021-04-20 13:49         ` Magnus Karlsson
2021-04-21 12:47           ` Jesper Dangaard Brouer
2021-04-21 14:12             ` Magnus Karlsson
2021-04-21 15:39               ` Jesper Dangaard Brouer
2021-04-22 10:24                 ` Magnus Karlsson
2021-04-22 14:42                   ` Jesper Dangaard Brouer
2021-04-22 15:05                     ` Crash for i40e on net-next (was: [PATCH v8 bpf-next 00/14] mvneta: introduce XDP multi-buffer support) Jesper Dangaard Brouer
2021-04-23  5:28                       ` Magnus Karlsson
2021-04-23 16:43                         ` Alexander Duyck
2021-04-25  9:45                           ` Magnus Karlsson
2021-04-27 18:28   ` [PATCH v8 bpf-next 00/14] mvneta: introduce XDP multi-buffer support Lorenzo Bianconi
2021-04-28  7:41     ` Magnus Karlsson
2021-04-29 12:49       ` Jesper Dangaard Brouer

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=YHCAqo3w/J+ngb9P@lore-desk \
    --to=lorenzo@kernel.org \
    --cc=alexander.duyck@gmail.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=brouer@redhat.com \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=echaudro@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=lorenzo.bianconi@redhat.com \
    --cc=maciej.fijalkowski@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=saeed@kernel.org \
    --cc=sameehj@amazon.com \
    --cc=shayagr@amazon.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).