Re: [PATCH bpf-next v3 1/3] net: add priv_flags for allow tx skb without linear

Re: [PATCH bpf-next v3 1/3] net: add priv_flags for allow tx skb without linear

[Alexander Lobakin]

From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: Thu, 21 Jan 2021 21:47:07 +0800

> In some cases, we hope to construct skb directly based on the existing
> memory without copying data. In this case, the page will be placed
> directly in the skb, and the linear space of skb is empty. But
> unfortunately, many the network card does not support this operation.
> For example Mellanox Technologies MT27710 Family [ConnectX-4 Lx] will
> get the following error message:
> 
>     mlx5_core 0000:3b:00.1 eth1: Error cqe on cqn 0x817, ci 0x8, qn 0x1dbb, opcode 0xd, syndrome 0x1, vendor syndrome 0x68
>     00000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>     00000010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>     00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>     00000030: 00 00 00 00 60 10 68 01 0a 00 1d bb 00 0f 9f d2
>     WQE DUMP: WQ size 1024 WQ cur size 0, WQE index 0xf, len: 64
>     00000000: 00 00 0f 0a 00 1d bb 03 00 00 00 08 00 00 00 00
>     00000010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>     00000020: 00 00 00 2b 00 08 00 00 00 00 00 05 9e e3 08 00
>     00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>     mlx5_core 0000:3b:00.1 eth1: ERR CQE on SQ: 0x1dbb
> 
> So a priv_flag is added here to indicate whether the network card
> supports this feature.
> 
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> Suggested-by: Alexander Lobakin <alobakin@pm.me>

Acked-by: Alexander Lobakin <alobakin@pm.me>

> ---
>  include/linux/netdevice.h | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index ef51725..135db8f 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -1525,6 +1525,7 @@ struct net_device_ops {
>   * @IFF_FAILOVER_SLAVE: device is lower dev of a failover master device
>   * @IFF_L3MDEV_RX_HANDLER: only invoke the rx handler of L3 master device
>   * @IFF_LIVE_RENAME_OK: rename is allowed while device is up and running
> + * @IFF_TX_SKB_NO_LINEAR: allow tx skb linear is empty
>   */
>  enum netdev_priv_flags {
>  	IFF_802_1Q_VLAN			= 1<<0,
> @@ -1558,6 +1559,7 @@ enum netdev_priv_flags {
>  	IFF_FAILOVER_SLAVE		= 1<<28,
>  	IFF_L3MDEV_RX_HANDLER		= 1<<29,
>  	IFF_LIVE_RENAME_OK		= 1<<30,
> +	IFF_TX_SKB_NO_LINEAR		= 1<<31,
>  };
>  
>  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN
> @@ -1590,6 +1592,7 @@ enum netdev_priv_flags {
>  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE
>  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER
>  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK
> +#define IFF_TX_SKB_NO_LINEAR		IFF_TX_SKB_NO_LINEAR
>  
>  /**
>   *	struct net_device - The DEVICE structure.
> -- 
> 1.8.3.1

Thanks,
Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 21 Jan 2021 16:41:33 +0100

> On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > This patch is used to construct skb based on page to save memory copy
> > overhead.
> > 
> > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > directly construct skb. If this feature is not supported, it is still
> > necessary to copy data to construct skb.
> > 
> > ---------------- Performance Testing ------------
> > 
> > The test environment is Aliyun ECS server.
> > Test cmd:
> > ```
> > xdpsock -i eth0 -t  -S -s <msg size>
> > ```
> > 
> > Test result data:
> > 
> > size    64      512     1024    1500
> > copy    1916747 1775988 1600203 1440054
> > page    1974058 1953655 1945463 1904478
> > percent 3.0%    10.0%   21.58%  32.3%
> > 
> > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > ---
> >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> >  1 file changed, 86 insertions(+), 18 deletions(-)
> > 
> > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > index 4a83117..38af7f1 100644
> > --- a/net/xdp/xsk.c
> > +++ b/net/xdp/xsk.c
> > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> >  	sock_wfree(skb);
> >  }
> >  
> > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > +					      struct xdp_desc *desc)
> > +{
> > +	u32 len, offset, copy, copied;
> > +	struct sk_buff *skb;
> > +	struct page *page;
> > +	void *buffer;
> > +	int err, i;
> > +	u64 addr;
> > +
> > +	skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > +	if (unlikely(!skb))
> > +		return ERR_PTR(err);
> > +
> > +	addr = desc->addr;
> > +	len = desc->len;
> > +
> > +	buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > +	offset = offset_in_page(buffer);
> > +	addr = buffer - xs->pool->addrs;
> > +
> > +	for (copied = 0, i = 0; copied < len; i++) {
> > +		page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > +
> > +		get_page(page);
> > +
> > +		copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > +
> > +		skb_fill_page_desc(skb, i, page, offset, copy);
> > +
> > +		copied += copy;
> > +		addr += copy;
> > +		offset = 0;
> > +	}
> > +
> > +	skb->len += len;
> > +	skb->data_len += len;
> 
> > +	skb->truesize += len;
> 
> This is not the truesize, unfortunately.
> 
> We need to account for the number of pages, not number of bytes.

The easiest solution is:

	skb->truesize += PAGE_SIZE * i;

i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.

> > +
> > +	refcount_add(len, &xs->sk.sk_wmem_alloc);
> > +
> > +	return skb;
> > +}
> > +

Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Alexander Lobakin <alobakin@pm.me>
Date: Fri, 22 Jan 2021 11:47:45 +0000

> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Thu, 21 Jan 2021 16:41:33 +0100
> 
> > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > This patch is used to construct skb based on page to save memory copy
> > > overhead.
> > > 
> > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > directly construct skb. If this feature is not supported, it is still
> > > necessary to copy data to construct skb.
> > > 
> > > ---------------- Performance Testing ------------
> > > 
> > > The test environment is Aliyun ECS server.
> > > Test cmd:
> > > ```
> > > xdpsock -i eth0 -t  -S -s <msg size>
> > > ```
> > > 
> > > Test result data:
> > > 
> > > size    64      512     1024    1500
> > > copy    1916747 1775988 1600203 1440054
> > > page    1974058 1953655 1945463 1904478
> > > percent 3.0%    10.0%   21.58%  32.3%
> > > 
> > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > ---
> > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > 
> > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > index 4a83117..38af7f1 100644
> > > --- a/net/xdp/xsk.c
> > > +++ b/net/xdp/xsk.c
> > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > >  	sock_wfree(skb);
> > >  }
> > >  
> > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > +					      struct xdp_desc *desc)
> > > +{
> > > +	u32 len, offset, copy, copied;
> > > +	struct sk_buff *skb;
> > > +	struct page *page;
> > > +	void *buffer;
> > > +	int err, i;
> > > +	u64 addr;
> > > +
> > > +	skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > +	if (unlikely(!skb))
> > > +		return ERR_PTR(err);
> > > +
> > > +	addr = desc->addr;
> > > +	len = desc->len;
> > > +
> > > +	buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > +	offset = offset_in_page(buffer);
> > > +	addr = buffer - xs->pool->addrs;
> > > +
> > > +	for (copied = 0, i = 0; copied < len; i++) {
> > > +		page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > +
> > > +		get_page(page);
> > > +
> > > +		copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > +
> > > +		skb_fill_page_desc(skb, i, page, offset, copy);
> > > +
> > > +		copied += copy;
> > > +		addr += copy;
> > > +		offset = 0;
> > > +	}
> > > +
> > > +	skb->len += len;
> > > +	skb->data_len += len;
> > 
> > > +	skb->truesize += len;
> > 
> > This is not the truesize, unfortunately.
> > 
> > We need to account for the number of pages, not number of bytes.
> 
> The easiest solution is:
> 
> 	skb->truesize += PAGE_SIZE * i;
> 
> i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.

Oops, pls ignore this. I forgot that XSK buffers are not
"one per page".
We need to count the number of pages manually and then do

	skb->truesize += PAGE_SIZE * npages;

Right.

> > > +
> > > +	refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > +
> > > +	return skb;
> > > +}
> > > +
> 
> Al

Thanks,
Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Alexander Lobakin <alobakin@pm.me>
Date: Fri, 22 Jan 2021 11:55:35 +0000

> From: Alexander Lobakin <alobakin@pm.me>
> Date: Fri, 22 Jan 2021 11:47:45 +0000
> 
> > From: Eric Dumazet <eric.dumazet@gmail.com>
> > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > 
> > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > This patch is used to construct skb based on page to save memory copy
> > > > overhead.
> > > > 
> > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > directly construct skb. If this feature is not supported, it is still
> > > > necessary to copy data to construct skb.
> > > > 
> > > > ---------------- Performance Testing ------------
> > > > 
> > > > The test environment is Aliyun ECS server.
> > > > Test cmd:
> > > > ```
> > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > ```
> > > > 
> > > > Test result data:
> > > > 
> > > > size    64      512     1024    1500
> > > > copy    1916747 1775988 1600203 1440054
> > > > page    1974058 1953655 1945463 1904478
> > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > 
> > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > ---
> > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > 
> > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > index 4a83117..38af7f1 100644
> > > > --- a/net/xdp/xsk.c
> > > > +++ b/net/xdp/xsk.c
> > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > >  	sock_wfree(skb);
> > > >  }
> > > >  
> > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > +					      struct xdp_desc *desc)
> > > > +{
> > > > +	u32 len, offset, copy, copied;
> > > > +	struct sk_buff *skb;
> > > > +	struct page *page;
> > > > +	void *buffer;
> > > > +	int err, i;
> > > > +	u64 addr;
> > > > +
> > > > +	skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);

Also,
maybe we should allocate it with NET_SKB_PAD so NIC drivers could
use some reserved space?

		skb = sock_alloc_send_skb(&xs->sk, NET_SKB_PAD, 1, &err);
		...
		skb_reserve(skb, NET_SKB_PAD);

Eric, what do you think?

> > > > +	if (unlikely(!skb))
> > > > +		return ERR_PTR(err);
> > > > +
> > > > +	addr = desc->addr;
> > > > +	len = desc->len;
> > > > +
> > > > +	buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > +	offset = offset_in_page(buffer);
> > > > +	addr = buffer - xs->pool->addrs;
> > > > +
> > > > +	for (copied = 0, i = 0; copied < len; i++) {
> > > > +		page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > +
> > > > +		get_page(page);
> > > > +
> > > > +		copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > +
> > > > +		skb_fill_page_desc(skb, i, page, offset, copy);
> > > > +
> > > > +		copied += copy;
> > > > +		addr += copy;
> > > > +		offset = 0;
> > > > +	}
> > > > +
> > > > +	skb->len += len;
> > > > +	skb->data_len += len;
> > > 
> > > > +	skb->truesize += len;
> > > 
> > > This is not the truesize, unfortunately.
> > > 
> > > We need to account for the number of pages, not number of bytes.
> > 
> > The easiest solution is:
> > 
> > 	skb->truesize += PAGE_SIZE * i;
> > 
> > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> 
> Oops, pls ignore this. I forgot that XSK buffers are not
> "one per page".
> We need to count the number of pages manually and then do
> 
> 	skb->truesize += PAGE_SIZE * npages;
> 
> Right.
> 
> > > > +
> > > > +	refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > +
> > > > +	return skb;
> > > > +}
> > > > +
> > 
> > Al
> 
> Thanks,
> Al

Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Magnus Karlsson]

On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
>
> From: Alexander Lobakin <alobakin@pm.me>
> Date: Fri, 22 Jan 2021 11:47:45 +0000
>
> > From: Eric Dumazet <eric.dumazet@gmail.com>
> > Date: Thu, 21 Jan 2021 16:41:33 +0100
> >
> > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > This patch is used to construct skb based on page to save memory copy
> > > > overhead.
> > > >
> > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > directly construct skb. If this feature is not supported, it is still
> > > > necessary to copy data to construct skb.
> > > >
> > > > ---------------- Performance Testing ------------
> > > >
> > > > The test environment is Aliyun ECS server.
> > > > Test cmd:
> > > > ```
> > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > ```
> > > >
> > > > Test result data:
> > > >
> > > > size    64      512     1024    1500
> > > > copy    1916747 1775988 1600203 1440054
> > > > page    1974058 1953655 1945463 1904478
> > > > percent 3.0%    10.0%   21.58%  32.3%
> > > >
> > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > ---
> > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > >
> > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > index 4a83117..38af7f1 100644
> > > > --- a/net/xdp/xsk.c
> > > > +++ b/net/xdp/xsk.c
> > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > >   sock_wfree(skb);
> > > >  }
> > > >
> > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > +                                       struct xdp_desc *desc)
> > > > +{
> > > > + u32 len, offset, copy, copied;
> > > > + struct sk_buff *skb;
> > > > + struct page *page;
> > > > + void *buffer;
> > > > + int err, i;
> > > > + u64 addr;
> > > > +
> > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > + if (unlikely(!skb))
> > > > +         return ERR_PTR(err);
> > > > +
> > > > + addr = desc->addr;
> > > > + len = desc->len;
> > > > +
> > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > + offset = offset_in_page(buffer);
> > > > + addr = buffer - xs->pool->addrs;
> > > > +
> > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > +
> > > > +         get_page(page);
> > > > +
> > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > +
> > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > +
> > > > +         copied += copy;
> > > > +         addr += copy;
> > > > +         offset = 0;
> > > > + }
> > > > +
> > > > + skb->len += len;
> > > > + skb->data_len += len;
> > >
> > > > + skb->truesize += len;
> > >
> > > This is not the truesize, unfortunately.
> > >
> > > We need to account for the number of pages, not number of bytes.
> >
> > The easiest solution is:
> >
> >       skb->truesize += PAGE_SIZE * i;
> >
> > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
>
> Oops, pls ignore this. I forgot that XSK buffers are not
> "one per page".
> We need to count the number of pages manually and then do
>
>         skb->truesize += PAGE_SIZE * npages;
>
> Right.

There are two possible packet buffer (chunks) sizes in a umem, 2K and
4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
please correct me if wrong, truesize is used for memory accounting.
But in this code, no kernel memory has been allocated (apart from the
skb). The page is just a part of the umem that has been already
allocated beforehand and by user-space in this case. So what should
truesize be in this case? Do we add 0, chunk_size * i, or the
complicated case of counting exactly how many 4K pages that are used
when the chunk_size is 2K, as two chunks could occupy the same page,
or just the upper bound of PAGE_SIZE * i that is likely a good
approximation in most cases? Just note that there might be other uses
of truesize that I am unaware of that could impact this choice.

> > > > +
> > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > +
> > > > + return skb;
> > > > +}
> > > > +
> >
> > Al
>
> Thanks,
> Al
>

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Magnus Karlsson <magnus.karlsson@gmail.com>
Date: Fri, 22 Jan 2021 13:18:47 +0100

> On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> >
> > From: Alexander Lobakin <alobakin@pm.me>
> > Date: Fri, 22 Jan 2021 11:47:45 +0000
> >
> > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > >
> > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > This patch is used to construct skb based on page to save memory copy
> > > > > overhead.
> > > > >
> > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > directly construct skb. If this feature is not supported, it is still
> > > > > necessary to copy data to construct skb.
> > > > >
> > > > > ---------------- Performance Testing ------------
> > > > >
> > > > > The test environment is Aliyun ECS server.
> > > > > Test cmd:
> > > > > ```
> > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > ```
> > > > >
> > > > > Test result data:
> > > > >
> > > > > size    64      512     1024    1500
> > > > > copy    1916747 1775988 1600203 1440054
> > > > > page    1974058 1953655 1945463 1904478
> > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > >
> > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > ---
> > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > >
> > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > index 4a83117..38af7f1 100644
> > > > > --- a/net/xdp/xsk.c
> > > > > +++ b/net/xdp/xsk.c
> > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > >   sock_wfree(skb);
> > > > >  }
> > > > >
> > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > +                                       struct xdp_desc *desc)
> > > > > +{
> > > > > + u32 len, offset, copy, copied;
> > > > > + struct sk_buff *skb;
> > > > > + struct page *page;
> > > > > + void *buffer;
> > > > > + int err, i;
> > > > > + u64 addr;
> > > > > +
> > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > + if (unlikely(!skb))
> > > > > +         return ERR_PTR(err);
> > > > > +
> > > > > + addr = desc->addr;
> > > > > + len = desc->len;
> > > > > +
> > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > + offset = offset_in_page(buffer);
> > > > > + addr = buffer - xs->pool->addrs;
> > > > > +
> > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > +
> > > > > +         get_page(page);
> > > > > +
> > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > +
> > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > +
> > > > > +         copied += copy;
> > > > > +         addr += copy;
> > > > > +         offset = 0;
> > > > > + }
> > > > > +
> > > > > + skb->len += len;
> > > > > + skb->data_len += len;
> > > >
> > > > > + skb->truesize += len;
> > > >
> > > > This is not the truesize, unfortunately.
> > > >
> > > > We need to account for the number of pages, not number of bytes.
> > >
> > > The easiest solution is:
> > >
> > >       skb->truesize += PAGE_SIZE * i;
> > >
> > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> >
> > Oops, pls ignore this. I forgot that XSK buffers are not
> > "one per page".
> > We need to count the number of pages manually and then do
> >
> >         skb->truesize += PAGE_SIZE * npages;
> >
> > Right.
> 
> There are two possible packet buffer (chunks) sizes in a umem, 2K and
> 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> please correct me if wrong, truesize is used for memory accounting.
> But in this code, no kernel memory has been allocated (apart from the
> skb). The page is just a part of the umem that has been already
> allocated beforehand and by user-space in this case. So what should
> truesize be in this case? Do we add 0, chunk_size * i, or the
> complicated case of counting exactly how many 4K pages that are used
> when the chunk_size is 2K, as two chunks could occupy the same page,
> or just the upper bound of PAGE_SIZE * i that is likely a good
> approximation in most cases? Just note that there might be other uses
> of truesize that I am unaware of that could impact this choice.

Truesize is "what amount of memory does this skb occupy with all its
fragments, linear space and struct sk_buff itself". The closest it
will be to the actual value, the better.
In this case, I think adding of chunk_size * i would be enough.

(PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
for setups with PAGE_SIZE > SZ_4K)

> > > > > +
> > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > +
> > > > > + return skb;
> > > > > +}
> > > > > +
> > >
> > > Al
> >
> > Thanks,
> > Al

Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Magnus Karlsson]

On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
>
> From: Magnus Karlsson <magnus.karlsson@gmail.com>
> Date: Fri, 22 Jan 2021 13:18:47 +0100
>
> > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > >
> > > From: Alexander Lobakin <alobakin@pm.me>
> > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > >
> > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > >
> > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > overhead.
> > > > > >
> > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > necessary to copy data to construct skb.
> > > > > >
> > > > > > ---------------- Performance Testing ------------
> > > > > >
> > > > > > The test environment is Aliyun ECS server.
> > > > > > Test cmd:
> > > > > > ```
> > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > ```
> > > > > >
> > > > > > Test result data:
> > > > > >
> > > > > > size    64      512     1024    1500
> > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > page    1974058 1953655 1945463 1904478
> > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > >
> > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > ---
> > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > >
> > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > index 4a83117..38af7f1 100644
> > > > > > --- a/net/xdp/xsk.c
> > > > > > +++ b/net/xdp/xsk.c
> > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > >   sock_wfree(skb);
> > > > > >  }
> > > > > >
> > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > +                                       struct xdp_desc *desc)
> > > > > > +{
> > > > > > + u32 len, offset, copy, copied;
> > > > > > + struct sk_buff *skb;
> > > > > > + struct page *page;
> > > > > > + void *buffer;
> > > > > > + int err, i;
> > > > > > + u64 addr;
> > > > > > +
> > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > + if (unlikely(!skb))
> > > > > > +         return ERR_PTR(err);
> > > > > > +
> > > > > > + addr = desc->addr;
> > > > > > + len = desc->len;
> > > > > > +
> > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > + offset = offset_in_page(buffer);
> > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > +
> > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > +
> > > > > > +         get_page(page);
> > > > > > +
> > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > +
> > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > +
> > > > > > +         copied += copy;
> > > > > > +         addr += copy;
> > > > > > +         offset = 0;
> > > > > > + }
> > > > > > +
> > > > > > + skb->len += len;
> > > > > > + skb->data_len += len;
> > > > >
> > > > > > + skb->truesize += len;
> > > > >
> > > > > This is not the truesize, unfortunately.
> > > > >
> > > > > We need to account for the number of pages, not number of bytes.
> > > >
> > > > The easiest solution is:
> > > >
> > > >       skb->truesize += PAGE_SIZE * i;
> > > >
> > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > >
> > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > "one per page".
> > > We need to count the number of pages manually and then do
> > >
> > >         skb->truesize += PAGE_SIZE * npages;
> > >
> > > Right.
> >
> > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > please correct me if wrong, truesize is used for memory accounting.
> > But in this code, no kernel memory has been allocated (apart from the
> > skb). The page is just a part of the umem that has been already
> > allocated beforehand and by user-space in this case. So what should
> > truesize be in this case? Do we add 0, chunk_size * i, or the
> > complicated case of counting exactly how many 4K pages that are used
> > when the chunk_size is 2K, as two chunks could occupy the same page,
> > or just the upper bound of PAGE_SIZE * i that is likely a good
> > approximation in most cases? Just note that there might be other uses
> > of truesize that I am unaware of that could impact this choice.
>
> Truesize is "what amount of memory does this skb occupy with all its
> fragments, linear space and struct sk_buff itself". The closest it
> will be to the actual value, the better.
> In this case, I think adding of chunk_size * i would be enough.

Sounds like a good approximation to me.

> (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> for setups with PAGE_SIZE > SZ_4K)

You are right. That would be quite horrible on a system with a page size of 64K.

> > > > > > +
> > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > +
> > > > > > + return skb;
> > > > > > +}
> > > > > > +
> > > >
> > > > Al
> > >
> > > Thanks,
> > > Al
>
> Al
>

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: Fri, 22 Jan 2021 23:36:29 +0800

> On Fri, 22 Jan 2021 12:08:00 +0000, Alexander Lobakin <alobakin@pm.me> wrote:
> > From: Alexander Lobakin <alobakin@pm.me>
> > Date: Fri, 22 Jan 2021 11:55:35 +0000
> >
> > > From: Alexander Lobakin <alobakin@pm.me>
> > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > >
> > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > >
> > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > overhead.
> > > > > >
> > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > necessary to copy data to construct skb.
> > > > > >
> > > > > > ---------------- Performance Testing ------------
> > > > > >
> > > > > > The test environment is Aliyun ECS server.
> > > > > > Test cmd:
> > > > > > ```
> > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > ```
> > > > > >
> > > > > > Test result data:
> > > > > >
> > > > > > size    64      512     1024    1500
> > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > page    1974058 1953655 1945463 1904478
> > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > >
> > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > ---
> > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > >
> > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > index 4a83117..38af7f1 100644
> > > > > > --- a/net/xdp/xsk.c
> > > > > > +++ b/net/xdp/xsk.c
> > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > >  	sock_wfree(skb);
> > > > > >  }
> > > > > >
> > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > +					      struct xdp_desc *desc)
> > > > > > +{
> > > > > > +	u32 len, offset, copy, copied;
> > > > > > +	struct sk_buff *skb;
> > > > > > +	struct page *page;
> > > > > > +	void *buffer;
> > > > > > +	int err, i;
> > > > > > +	u64 addr;
> > > > > > +
> > > > > > +	skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> >
> > Also,
> > maybe we should allocate it with NET_SKB_PAD so NIC drivers could
> > use some reserved space?
> >
> > 		skb = sock_alloc_send_skb(&xs->sk, NET_SKB_PAD, 1, &err);
> > 		...
> > 		skb_reserve(skb, NET_SKB_PAD);
> >
> > Eric, what do you think?
> 
> I think you are right. Some space should be added to continuous equipment. This
> space should also be added in the copy mode below. Is LL_RESERVED_SPACE more
> appropriate?

No. If you look at __netdev_alloc_skb() and __napi_alloc_skb(), they
reserve NET_SKB_PAD at the beginning of linear area. Documentation of
__build_skb() also says that driver should reserve NET_SKB_PAD before
the actual frame, so it is a standartized hardware-independent
headroom.
Leaving that space in skb->head will allow developers to implement
IFF_TX_SKB_NO_LINEAR in a wider variety of drivers, especially when
a driver has to prepend some sort of data before the actual frame.
Since it's usually of a size of one cacheline, shouldn't be a big
deal.


[ I also had an idea of allocating an skb with a headroom of
NET_SKB_PAD + 256 bytes, so nearly all drivers could just call
pskb_pull_tail() to support such type of skbuffs without much
effort, but I think that it's better to teach drivers to support
xmitting of really headless ones. If virtio_net can do it, why
shouldn't the others ]

> > > > > > +	if (unlikely(!skb))
> > > > > > +		return ERR_PTR(err);
> > > > > > +
> > > > > > +	addr = desc->addr;
> > > > > > +	len = desc->len;
> > > > > > +
> > > > > > +	buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > +	offset = offset_in_page(buffer);
> > > > > > +	addr = buffer - xs->pool->addrs;
> > > > > > +
> > > > > > +	for (copied = 0, i = 0; copied < len; i++) {
> > > > > > +		page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > +
> > > > > > +		get_page(page);
> > > > > > +
> > > > > > +		copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > +
> > > > > > +		skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > +
> > > > > > +		copied += copy;
> > > > > > +		addr += copy;
> > > > > > +		offset = 0;
> > > > > > +	}
> > > > > > +
> > > > > > +	skb->len += len;
> > > > > > +	skb->data_len += len;
> > > > >
> > > > > > +	skb->truesize += len;
> > > > >
> > > > > This is not the truesize, unfortunately.
> > > > >
> > > > > We need to account for the number of pages, not number of bytes.
> > > >
> > > > The easiest solution is:
> > > >
> > > > 	skb->truesize += PAGE_SIZE * i;
> > > >
> > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > >
> > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > "one per page".
> > > We need to count the number of pages manually and then do
> > >
> > > 	skb->truesize += PAGE_SIZE * npages;
> > >
> > > Right.
> > >
> > > > > > +
> > > > > > +	refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > +
> > > > > > +	return skb;
> > > > > > +}
> > > > > > +
> > > >
> > > > Al
> > >
> > > Thanks,
> > > Al
> >
> > Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: Fri, 22 Jan 2021 23:39:15 +0800

> On Fri, 22 Jan 2021 13:55:14 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > >
> > > From: Magnus Karlsson <magnus.karlsson@gmail.com>
> > > Date: Fri, 22 Jan 2021 13:18:47 +0100
> > >
> > > > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > >
> > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > >
> > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > >
> > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > overhead.
> > > > > > > >
> > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > necessary to copy data to construct skb.
> > > > > > > >
> > > > > > > > ---------------- Performance Testing ------------
> > > > > > > >
> > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > Test cmd:
> > > > > > > > ```
> > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > ```
> > > > > > > >
> > > > > > > > Test result data:
> > > > > > > >
> > > > > > > > size    64      512     1024    1500
> > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > >
> > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > ---
> > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > >
> > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > >   sock_wfree(skb);
> > > > > > > >  }
> > > > > > > >
> > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > +                                       struct xdp_desc *desc)
> > > > > > > > +{
> > > > > > > > + u32 len, offset, copy, copied;
> > > > > > > > + struct sk_buff *skb;
> > > > > > > > + struct page *page;
> > > > > > > > + void *buffer;
> > > > > > > > + int err, i;
> > > > > > > > + u64 addr;
> > > > > > > > +
> > > > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > > > + if (unlikely(!skb))
> > > > > > > > +         return ERR_PTR(err);
> > > > > > > > +
> > > > > > > > + addr = desc->addr;
> > > > > > > > + len = desc->len;
> > > > > > > > +
> > > > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > + offset = offset_in_page(buffer);
> > > > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > > > +
> > > > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > +
> > > > > > > > +         get_page(page);
> > > > > > > > +
> > > > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > +
> > > > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > +
> > > > > > > > +         copied += copy;
> > > > > > > > +         addr += copy;
> > > > > > > > +         offset = 0;
> > > > > > > > + }
> > > > > > > > +
> > > > > > > > + skb->len += len;
> > > > > > > > + skb->data_len += len;
> > > > > > >
> > > > > > > > + skb->truesize += len;
> > > > > > >
> > > > > > > This is not the truesize, unfortunately.
> > > > > > >
> > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > >
> > > > > > The easiest solution is:
> > > > > >
> > > > > >       skb->truesize += PAGE_SIZE * i;
> > > > > >
> > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > >
> > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > "one per page".
> > > > > We need to count the number of pages manually and then do
> > > > >
> > > > >         skb->truesize += PAGE_SIZE * npages;
> > > > >
> > > > > Right.
> > > >
> > > > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > > > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > > > please correct me if wrong, truesize is used for memory accounting.
> > > > But in this code, no kernel memory has been allocated (apart from the
> > > > skb). The page is just a part of the umem that has been already
> > > > allocated beforehand and by user-space in this case. So what should
> > > > truesize be in this case? Do we add 0, chunk_size * i, or the
> > > > complicated case of counting exactly how many 4K pages that are used
> > > > when the chunk_size is 2K, as two chunks could occupy the same page,
> > > > or just the upper bound of PAGE_SIZE * i that is likely a good
> > > > approximation in most cases? Just note that there might be other uses
> > > > of truesize that I am unaware of that could impact this choice.
> > >
> > > Truesize is "what amount of memory does this skb occupy with all its
> > > fragments, linear space and struct sk_buff itself". The closest it
> > > will be to the actual value, the better.
> > > In this case, I think adding of chunk_size * i would be enough.
> >
> > Sounds like a good approximation to me.
> >
> > > (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> > > for setups with PAGE_SIZE > SZ_4K)
> >
> > You are right. That would be quite horrible on a system with a page size of 64K.
> 
> Thank you everyone, I learned it.
> 
> I also think it is appropriate to add a chunk size here, and there is actually
> only one chunk here, so it's very simple
> 
> 	skb->truesize += xs->pool->chunk_size;

umem chunks can't cross page boundaries. So if you're sure that
there could be only one chunk, you don't need the loop at all,
if I'm not missing anything.

> In addition, I actually borrowed from the tcp code:
> 
>    tcp_build_frag:
>    --------------
> 
> 	if (can_coalesce) {
> 		skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
> 	} else {
> 		get_page(page);
> 		skb_fill_page_desc(skb, i, page, offset, copy);
> 	}
> 
> 	if (!(flags & MSG_NO_SHARED_FRAGS))
> 		skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
> 
> 	skb->len += copy;
> 	skb->data_len += copy;
> 	skb->truesize += copy;
> 
> So, here is one bug?

skb_frag_t is an alias to struct bvec. It doesn't contain info about
real memory consumption, so there's no other option buf just to add
"copy" to truesize.
XSK is different in this term, as it operates with chunks of a known
size.

> Thanks.
> 
> >
> > > > > > > > +
> > > > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > +
> > > > > > > > + return skb;
> > > > > > > > +}
> > > > > > > > +
> > > > > >
> > > > > > Al
> > > > >
> > > > > Thanks,
> > > > > Al
> > >
> > > Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Magnus Karlsson]

On Fri, Jan 22, 2021 at 6:26 PM Alexander Lobakin <alobakin@pm.me> wrote:
>
> From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> Date: Fri, 22 Jan 2021 23:39:15 +0800
>
> > On Fri, 22 Jan 2021 13:55:14 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > >
> > > > From: Magnus Karlsson <magnus.karlsson@gmail.com>
> > > > Date: Fri, 22 Jan 2021 13:18:47 +0100
> > > >
> > > > > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > >
> > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > > >
> > > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > > >
> > > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > > overhead.
> > > > > > > > >
> > > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > > necessary to copy data to construct skb.
> > > > > > > > >
> > > > > > > > > ---------------- Performance Testing ------------
> > > > > > > > >
> > > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > > Test cmd:
> > > > > > > > > ```
> > > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > > ```
> > > > > > > > >
> > > > > > > > > Test result data:
> > > > > > > > >
> > > > > > > > > size    64      512     1024    1500
> > > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > > >
> > > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > > ---
> > > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > > >
> > > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > > >   sock_wfree(skb);
> > > > > > > > >  }
> > > > > > > > >
> > > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > > +                                       struct xdp_desc *desc)
> > > > > > > > > +{
> > > > > > > > > + u32 len, offset, copy, copied;
> > > > > > > > > + struct sk_buff *skb;
> > > > > > > > > + struct page *page;
> > > > > > > > > + void *buffer;
> > > > > > > > > + int err, i;
> > > > > > > > > + u64 addr;
> > > > > > > > > +
> > > > > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > > > > + if (unlikely(!skb))
> > > > > > > > > +         return ERR_PTR(err);
> > > > > > > > > +
> > > > > > > > > + addr = desc->addr;
> > > > > > > > > + len = desc->len;
> > > > > > > > > +
> > > > > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > > + offset = offset_in_page(buffer);
> > > > > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > > > > +
> > > > > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > > +
> > > > > > > > > +         get_page(page);
> > > > > > > > > +
> > > > > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > > +
> > > > > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > > +
> > > > > > > > > +         copied += copy;
> > > > > > > > > +         addr += copy;
> > > > > > > > > +         offset = 0;
> > > > > > > > > + }
> > > > > > > > > +
> > > > > > > > > + skb->len += len;
> > > > > > > > > + skb->data_len += len;
> > > > > > > >
> > > > > > > > > + skb->truesize += len;
> > > > > > > >
> > > > > > > > This is not the truesize, unfortunately.
> > > > > > > >
> > > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > > >
> > > > > > > The easiest solution is:
> > > > > > >
> > > > > > >       skb->truesize += PAGE_SIZE * i;
> > > > > > >
> > > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > > >
> > > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > > "one per page".
> > > > > > We need to count the number of pages manually and then do
> > > > > >
> > > > > >         skb->truesize += PAGE_SIZE * npages;
> > > > > >
> > > > > > Right.
> > > > >
> > > > > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > > > > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > > > > please correct me if wrong, truesize is used for memory accounting.
> > > > > But in this code, no kernel memory has been allocated (apart from the
> > > > > skb). The page is just a part of the umem that has been already
> > > > > allocated beforehand and by user-space in this case. So what should
> > > > > truesize be in this case? Do we add 0, chunk_size * i, or the
> > > > > complicated case of counting exactly how many 4K pages that are used
> > > > > when the chunk_size is 2K, as two chunks could occupy the same page,
> > > > > or just the upper bound of PAGE_SIZE * i that is likely a good
> > > > > approximation in most cases? Just note that there might be other uses
> > > > > of truesize that I am unaware of that could impact this choice.
> > > >
> > > > Truesize is "what amount of memory does this skb occupy with all its
> > > > fragments, linear space and struct sk_buff itself". The closest it
> > > > will be to the actual value, the better.
> > > > In this case, I think adding of chunk_size * i would be enough.
> > >
> > > Sounds like a good approximation to me.
> > >
> > > > (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> > > > for setups with PAGE_SIZE > SZ_4K)
> > >
> > > You are right. That would be quite horrible on a system with a page size of 64K.
> >
> > Thank you everyone, I learned it.
> >
> > I also think it is appropriate to add a chunk size here, and there is actually
> > only one chunk here, so it's very simple
> >
> >       skb->truesize += xs->pool->chunk_size;
>
> umem chunks can't cross page boundaries. So if you're sure that
> there could be only one chunk, you don't need the loop at all,
> if I'm not missing anything.

In the default mode, this is true. But in the unaligned_chunk mode
that can be set on the umem, the chunk may cross one page boundary, so
we need the loop and the chunk_size * i in the assignment of truesize.
So "i" can be 1 or 2, but nothing else.

> > In addition, I actually borrowed from the tcp code:
> >
> >    tcp_build_frag:
> >    --------------
> >
> >       if (can_coalesce) {
> >               skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
> >       } else {
> >               get_page(page);
> >               skb_fill_page_desc(skb, i, page, offset, copy);
> >       }
> >
> >       if (!(flags & MSG_NO_SHARED_FRAGS))
> >               skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
> >
> >       skb->len += copy;
> >       skb->data_len += copy;
> >       skb->truesize += copy;
> >
> > So, here is one bug?
>
> skb_frag_t is an alias to struct bvec. It doesn't contain info about
> real memory consumption, so there's no other option buf just to add
> "copy" to truesize.
> XSK is different in this term, as it operates with chunks of a known
> size.
>
> > Thanks.
> >
> > >
> > > > > > > > > +
> > > > > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > > +
> > > > > > > > > + return skb;
> > > > > > > > > +}
> > > > > > > > > +
> > > > > > >
> > > > > > > Al
> > > > > >
> > > > > > Thanks,
> > > > > > Al
> > > >
> > > > Al
>

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Magnus Karlsson <magnus.karlsson@gmail.com>
Date: Fri, 22 Jan 2021 19:37:06 +0100

> On Fri, Jan 22, 2021 at 6:26 PM Alexander Lobakin <alobakin@pm.me> wrote:
> >
> > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > Date: Fri, 22 Jan 2021 23:39:15 +0800
> >
> > > On Fri, 22 Jan 2021 13:55:14 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > >
> > > > > From: Magnus Karlsson <magnus.karlsson@gmail.com>
> > > > > Date: Fri, 22 Jan 2021 13:18:47 +0100
> > > > >
> > > > > > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > >
> > > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > > > >
> > > > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > > > >
> > > > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > > > overhead.
> > > > > > > > > >
> > > > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > > > necessary to copy data to construct skb.
> > > > > > > > > >
> > > > > > > > > > ---------------- Performance Testing ------------
> > > > > > > > > >
> > > > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > > > Test cmd:
> > > > > > > > > > ```
> > > > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > > > ```
> > > > > > > > > >
> > > > > > > > > > Test result data:
> > > > > > > > > >
> > > > > > > > > > size    64      512     1024    1500
> > > > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > > > >
> > > > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > > > ---
> > > > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > > > >
> > > > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > > > >   sock_wfree(skb);
> > > > > > > > > >  }
> > > > > > > > > >
> > > > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > > > +                                       struct xdp_desc *desc)
> > > > > > > > > > +{
> > > > > > > > > > + u32 len, offset, copy, copied;
> > > > > > > > > > + struct sk_buff *skb;
> > > > > > > > > > + struct page *page;
> > > > > > > > > > + void *buffer;
> > > > > > > > > > + int err, i;
> > > > > > > > > > + u64 addr;
> > > > > > > > > > +
> > > > > > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > > > > > + if (unlikely(!skb))
> > > > > > > > > > +         return ERR_PTR(err);
> > > > > > > > > > +
> > > > > > > > > > + addr = desc->addr;
> > > > > > > > > > + len = desc->len;
> > > > > > > > > > +
> > > > > > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > > > + offset = offset_in_page(buffer);
> > > > > > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > > > > > +
> > > > > > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > > > +
> > > > > > > > > > +         get_page(page);
> > > > > > > > > > +
> > > > > > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > > > +
> > > > > > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > > > +
> > > > > > > > > > +         copied += copy;
> > > > > > > > > > +         addr += copy;
> > > > > > > > > > +         offset = 0;
> > > > > > > > > > + }
> > > > > > > > > > +
> > > > > > > > > > + skb->len += len;
> > > > > > > > > > + skb->data_len += len;
> > > > > > > > >
> > > > > > > > > > + skb->truesize += len;
> > > > > > > > >
> > > > > > > > > This is not the truesize, unfortunately.
> > > > > > > > >
> > > > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > > > >
> > > > > > > > The easiest solution is:
> > > > > > > >
> > > > > > > >       skb->truesize += PAGE_SIZE * i;
> > > > > > > >
> > > > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > > > >
> > > > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > > > "one per page".
> > > > > > > We need to count the number of pages manually and then do
> > > > > > >
> > > > > > >         skb->truesize += PAGE_SIZE * npages;
> > > > > > >
> > > > > > > Right.
> > > > > >
> > > > > > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > > > > > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > > > > > please correct me if wrong, truesize is used for memory accounting.
> > > > > > But in this code, no kernel memory has been allocated (apart from the
> > > > > > skb). The page is just a part of the umem that has been already
> > > > > > allocated beforehand and by user-space in this case. So what should
> > > > > > truesize be in this case? Do we add 0, chunk_size * i, or the
> > > > > > complicated case of counting exactly how many 4K pages that are used
> > > > > > when the chunk_size is 2K, as two chunks could occupy the same page,
> > > > > > or just the upper bound of PAGE_SIZE * i that is likely a good
> > > > > > approximation in most cases? Just note that there might be other uses
> > > > > > of truesize that I am unaware of that could impact this choice.
> > > > >
> > > > > Truesize is "what amount of memory does this skb occupy with all its
> > > > > fragments, linear space and struct sk_buff itself". The closest it
> > > > > will be to the actual value, the better.
> > > > > In this case, I think adding of chunk_size * i would be enough.
> > > >
> > > > Sounds like a good approximation to me.
> > > >
> > > > > (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> > > > > for setups with PAGE_SIZE > SZ_4K)
> > > >
> > > > You are right. That would be quite horrible on a system with a page size of 64K.
> > >
> > > Thank you everyone, I learned it.
> > >
> > > I also think it is appropriate to add a chunk size here, and there is actually
> > > only one chunk here, so it's very simple
> > >
> > >       skb->truesize += xs->pool->chunk_size;
> >
> > umem chunks can't cross page boundaries. So if you're sure that
> > there could be only one chunk, you don't need the loop at all,
> > if I'm not missing anything.
> 
> In the default mode, this is true. But in the unaligned_chunk mode
> that can be set on the umem, the chunk may cross one page boundary, so
> we need the loop and the chunk_size * i in the assignment of truesize.
> So "i" can be 1 or 2, but nothing else.

Ah, unaligned mode, sure. Thanks for explanation!
Right, we need the loop and skb->truesize += xs->pool->chunk_size * i
then.

> > > In addition, I actually borrowed from the tcp code:
> > >
> > >    tcp_build_frag:
> > >    --------------
> > >
> > >       if (can_coalesce) {
> > >               skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
> > >       } else {
> > >               get_page(page);
> > >               skb_fill_page_desc(skb, i, page, offset, copy);
> > >       }
> > >
> > >       if (!(flags & MSG_NO_SHARED_FRAGS))
> > >               skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
> > >
> > >       skb->len += copy;
> > >       skb->data_len += copy;
> > >       skb->truesize += copy;
> > >
> > > So, here is one bug?
> >
> > skb_frag_t is an alias to struct bvec. It doesn't contain info about
> > real memory consumption, so there's no other option buf just to add
> > "copy" to truesize.
> > XSK is different in this term, as it operates with chunks of a known
> > size.
> >
> > > Thanks.
> > >
> > > >
> > > > > > > > > > +
> > > > > > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > > > +
> > > > > > > > > > + return skb;
> > > > > > > > > > +}
> > > > > > > > > > +
> > > > > > > >
> > > > > > > > Al
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Al
> > > > >
> > > > > Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Magnus Karlsson]

On Mon, Jan 25, 2021 at 3:27 AM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
>
> On Fri, 22 Jan 2021 19:37:06 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > On Fri, Jan 22, 2021 at 6:26 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > >
> > > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > Date: Fri, 22 Jan 2021 23:39:15 +0800
> > >
> > > > On Fri, 22 Jan 2021 13:55:14 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > > On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > >
> > > > > > From: Magnus Karlsson <magnus.karlsson@gmail.com>
> > > > > > Date: Fri, 22 Jan 2021 13:18:47 +0100
> > > > > >
> > > > > > > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > > >
> > > > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > > > > >
> > > > > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > > > > >
> > > > > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > > > > overhead.
> > > > > > > > > > >
> > > > > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > > > > necessary to copy data to construct skb.
> > > > > > > > > > >
> > > > > > > > > > > ---------------- Performance Testing ------------
> > > > > > > > > > >
> > > > > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > > > > Test cmd:
> > > > > > > > > > > ```
> > > > > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > > > > ```
> > > > > > > > > > >
> > > > > > > > > > > Test result data:
> > > > > > > > > > >
> > > > > > > > > > > size    64      512     1024    1500
> > > > > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > > > > >
> > > > > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > > > > ---
> > > > > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > > > > >
> > > > > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > > > > >   sock_wfree(skb);
> > > > > > > > > > >  }
> > > > > > > > > > >
> > > > > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > > > > +                                       struct xdp_desc *desc)
> > > > > > > > > > > +{
> > > > > > > > > > > + u32 len, offset, copy, copied;
> > > > > > > > > > > + struct sk_buff *skb;
> > > > > > > > > > > + struct page *page;
> > > > > > > > > > > + void *buffer;
> > > > > > > > > > > + int err, i;
> > > > > > > > > > > + u64 addr;
> > > > > > > > > > > +
> > > > > > > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > > > > > > + if (unlikely(!skb))
> > > > > > > > > > > +         return ERR_PTR(err);
> > > > > > > > > > > +
> > > > > > > > > > > + addr = desc->addr;
> > > > > > > > > > > + len = desc->len;
> > > > > > > > > > > +
> > > > > > > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > > > > + offset = offset_in_page(buffer);
> > > > > > > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > > > > > > +
> > > > > > > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > > > > +
> > > > > > > > > > > +         get_page(page);
> > > > > > > > > > > +
> > > > > > > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > > > > +
> > > > > > > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > > > > +
> > > > > > > > > > > +         copied += copy;
> > > > > > > > > > > +         addr += copy;
> > > > > > > > > > > +         offset = 0;
> > > > > > > > > > > + }
> > > > > > > > > > > +
> > > > > > > > > > > + skb->len += len;
> > > > > > > > > > > + skb->data_len += len;
> > > > > > > > > >
> > > > > > > > > > > + skb->truesize += len;
> > > > > > > > > >
> > > > > > > > > > This is not the truesize, unfortunately.
> > > > > > > > > >
> > > > > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > > > > >
> > > > > > > > > The easiest solution is:
> > > > > > > > >
> > > > > > > > >       skb->truesize += PAGE_SIZE * i;
> > > > > > > > >
> > > > > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > > > > >
> > > > > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > > > > "one per page".
> > > > > > > > We need to count the number of pages manually and then do
> > > > > > > >
> > > > > > > >         skb->truesize += PAGE_SIZE * npages;
> > > > > > > >
> > > > > > > > Right.
> > > > > > >
> > > > > > > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > > > > > > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > > > > > > please correct me if wrong, truesize is used for memory accounting.
> > > > > > > But in this code, no kernel memory has been allocated (apart from the
> > > > > > > skb). The page is just a part of the umem that has been already
> > > > > > > allocated beforehand and by user-space in this case. So what should
> > > > > > > truesize be in this case? Do we add 0, chunk_size * i, or the
> > > > > > > complicated case of counting exactly how many 4K pages that are used
> > > > > > > when the chunk_size is 2K, as two chunks could occupy the same page,
> > > > > > > or just the upper bound of PAGE_SIZE * i that is likely a good
> > > > > > > approximation in most cases? Just note that there might be other uses
> > > > > > > of truesize that I am unaware of that could impact this choice.
> > > > > >
> > > > > > Truesize is "what amount of memory does this skb occupy with all its
> > > > > > fragments, linear space and struct sk_buff itself". The closest it
> > > > > > will be to the actual value, the better.
> > > > > > In this case, I think adding of chunk_size * i would be enough.
> > > > >
> > > > > Sounds like a good approximation to me.
> > > > >
> > > > > > (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> > > > > > for setups with PAGE_SIZE > SZ_4K)
> > > > >
> > > > > You are right. That would be quite horrible on a system with a page size of 64K.
> > > >
> > > > Thank you everyone, I learned it.
> > > >
> > > > I also think it is appropriate to add a chunk size here, and there is actually
> > > > only one chunk here, so it's very simple
> > > >
> > > >       skb->truesize += xs->pool->chunk_size;
> > >
> > > umem chunks can't cross page boundaries. So if you're sure that
> > > there could be only one chunk, you don't need the loop at all,
> > > if I'm not missing anything.
> >
> > In the default mode, this is true. But in the unaligned_chunk mode
> > that can be set on the umem, the chunk may cross one page boundary, so
> > we need the loop and the chunk_size * i in the assignment of truesize.
> > So "i" can be 1 or 2, but nothing else.
>
> According to my understanding, in the unaligned mode, a desc will also refer to
> a chunk, although the chunk here may occupy multiple pages. And here is just a
> desc constructed into a skb, skb takes the largest amount from umem is a
> chunk, so what is the situation of i = 2 here? Did I miss something?

A desc refers to a single packet, not a single chunk. One packet can
occupy either one or two chunks in the unaligned mode and when this
happens to be two, these two chunks might be on different pages. In
this case, you will go through the loop twice and produce two
fragments.

In the aligned mode, every packet starts at the beginning of each
chunk (if there is no headroom) and can only occupy a single chunk
since no packet can be larger than the chunk size. In the unaligned
mode, the packet can start anywhere within the chunk and might even
continue into the next chunk, but never more than that since the max
packet size is still the chunk size. Why unaligned mode? This provides
the user-space with complete freedom on how to optimize the placement
of the packets in the umem and this might lead to better overall
performance. Note that if we just look at the kernel part, unaligned
mode is slower than aligned, but that might not be true on the overall
level.

> Thanks.
>
> >
> > > > In addition, I actually borrowed from the tcp code:
> > > >
> > > >    tcp_build_frag:
> > > >    --------------
> > > >
> > > >       if (can_coalesce) {
> > > >               skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
> > > >       } else {
> > > >               get_page(page);
> > > >               skb_fill_page_desc(skb, i, page, offset, copy);
> > > >       }
> > > >
> > > >       if (!(flags & MSG_NO_SHARED_FRAGS))
> > > >               skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
> > > >
> > > >       skb->len += copy;
> > > >       skb->data_len += copy;
> > > >       skb->truesize += copy;
> > > >
> > > > So, here is one bug?
> > >
> > > skb_frag_t is an alias to struct bvec. It doesn't contain info about
> > > real memory consumption, so there's no other option buf just to add
> > > "copy" to truesize.
> > > XSK is different in this term, as it operates with chunks of a known
> > > size.
> > >
> > > > Thanks.
> > > >
> > > > >
> > > > > > > > > > > +
> > > > > > > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > > > > +
> > > > > > > > > > > + return skb;
> > > > > > > > > > > +}
> > > > > > > > > > > +
> > > > > > > > >
> > > > > > > > > Al
> > > > > > > >
> > > > > > > > Thanks,
> > > > > > > > Al
> > > > > >
> > > > > > Al
> > >

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Magnus Karlsson]

On Mon, Jan 25, 2021 at 1:43 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
>
> On Mon, 25 Jan 2021 08:44:38 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > On Mon, Jan 25, 2021 at 3:27 AM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
> > >
> > > On Fri, 22 Jan 2021 19:37:06 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > On Fri, Jan 22, 2021 at 6:26 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > >
> > > > > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > Date: Fri, 22 Jan 2021 23:39:15 +0800
> > > > >
> > > > > > On Fri, 22 Jan 2021 13:55:14 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > > > > On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > > >
> > > > > > > > From: Magnus Karlsson <magnus.karlsson@gmail.com>
> > > > > > > > Date: Fri, 22 Jan 2021 13:18:47 +0100
> > > > > > > >
> > > > > > > > > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > > > > >
> > > > > > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > > > > > > >
> > > > > > > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > > > > > > >
> > > > > > > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > > > > > > overhead.
> > > > > > > > > > > > >
> > > > > > > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > > > > > > necessary to copy data to construct skb.
> > > > > > > > > > > > >
> > > > > > > > > > > > > ---------------- Performance Testing ------------
> > > > > > > > > > > > >
> > > > > > > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > > > > > > Test cmd:
> > > > > > > > > > > > > ```
> > > > > > > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > > > > > > ```
> > > > > > > > > > > > >
> > > > > > > > > > > > > Test result data:
> > > > > > > > > > > > >
> > > > > > > > > > > > > size    64      512     1024    1500
> > > > > > > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > > > > > > >
> > > > > > > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > > > > > > ---
> > > > > > > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > > > > > > >
> > > > > > > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > > > > > > >   sock_wfree(skb);
> > > > > > > > > > > > >  }
> > > > > > > > > > > > >
> > > > > > > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > > > > > > +                                       struct xdp_desc *desc)
> > > > > > > > > > > > > +{
> > > > > > > > > > > > > + u32 len, offset, copy, copied;
> > > > > > > > > > > > > + struct sk_buff *skb;
> > > > > > > > > > > > > + struct page *page;
> > > > > > > > > > > > > + void *buffer;
> > > > > > > > > > > > > + int err, i;
> > > > > > > > > > > > > + u64 addr;
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > > > > > > > > + if (unlikely(!skb))
> > > > > > > > > > > > > +         return ERR_PTR(err);
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + addr = desc->addr;
> > > > > > > > > > > > > + len = desc->len;
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > > > > > > + offset = offset_in_page(buffer);
> > > > > > > > > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > > > > > > +
> > > > > > > > > > > > > +         get_page(page);
> > > > > > > > > > > > > +
> > > > > > > > > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > > > > > > +
> > > > > > > > > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > > > > > > +
> > > > > > > > > > > > > +         copied += copy;
> > > > > > > > > > > > > +         addr += copy;
> > > > > > > > > > > > > +         offset = 0;
> > > > > > > > > > > > > + }
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + skb->len += len;
> > > > > > > > > > > > > + skb->data_len += len;
> > > > > > > > > > > >
> > > > > > > > > > > > > + skb->truesize += len;
> > > > > > > > > > > >
> > > > > > > > > > > > This is not the truesize, unfortunately.
> > > > > > > > > > > >
> > > > > > > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > > > > > > >
> > > > > > > > > > > The easiest solution is:
> > > > > > > > > > >
> > > > > > > > > > >       skb->truesize += PAGE_SIZE * i;
> > > > > > > > > > >
> > > > > > > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > > > > > > >
> > > > > > > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > > > > > > "one per page".
> > > > > > > > > > We need to count the number of pages manually and then do
> > > > > > > > > >
> > > > > > > > > >         skb->truesize += PAGE_SIZE * npages;
> > > > > > > > > >
> > > > > > > > > > Right.
> > > > > > > > >
> > > > > > > > > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > > > > > > > > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > > > > > > > > please correct me if wrong, truesize is used for memory accounting.
> > > > > > > > > But in this code, no kernel memory has been allocated (apart from the
> > > > > > > > > skb). The page is just a part of the umem that has been already
> > > > > > > > > allocated beforehand and by user-space in this case. So what should
> > > > > > > > > truesize be in this case? Do we add 0, chunk_size * i, or the
> > > > > > > > > complicated case of counting exactly how many 4K pages that are used
> > > > > > > > > when the chunk_size is 2K, as two chunks could occupy the same page,
> > > > > > > > > or just the upper bound of PAGE_SIZE * i that is likely a good
> > > > > > > > > approximation in most cases? Just note that there might be other uses
> > > > > > > > > of truesize that I am unaware of that could impact this choice.
> > > > > > > >
> > > > > > > > Truesize is "what amount of memory does this skb occupy with all its
> > > > > > > > fragments, linear space and struct sk_buff itself". The closest it
> > > > > > > > will be to the actual value, the better.
> > > > > > > > In this case, I think adding of chunk_size * i would be enough.
> > > > > > >
> > > > > > > Sounds like a good approximation to me.
> > > > > > >
> > > > > > > > (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> > > > > > > > for setups with PAGE_SIZE > SZ_4K)
> > > > > > >
> > > > > > > You are right. That would be quite horrible on a system with a page size of 64K.
> > > > > >
> > > > > > Thank you everyone, I learned it.
> > > > > >
> > > > > > I also think it is appropriate to add a chunk size here, and there is actually
> > > > > > only one chunk here, so it's very simple
> > > > > >
> > > > > >       skb->truesize += xs->pool->chunk_size;
> > > > >
> > > > > umem chunks can't cross page boundaries. So if you're sure that
> > > > > there could be only one chunk, you don't need the loop at all,
> > > > > if I'm not missing anything.
> > > >
> > > > In the default mode, this is true. But in the unaligned_chunk mode
> > > > that can be set on the umem, the chunk may cross one page boundary, so
> > > > we need the loop and the chunk_size * i in the assignment of truesize.
> > > > So "i" can be 1 or 2, but nothing else.
> > >
> > > According to my understanding, in the unaligned mode, a desc will also refer to
> > > a chunk, although the chunk here may occupy multiple pages. And here is just a
> > > desc constructed into a skb, skb takes the largest amount from umem is a
> > > chunk, so what is the situation of i = 2 here? Did I miss something?
> >
> > A desc refers to a single packet, not a single chunk. One packet can
> > occupy either one or two chunks in the unaligned mode and when this
> > happens to be two, these two chunks might be on different pages. In
> > this case, you will go through the loop twice and produce two
> > fragments.
> >
> > In the aligned mode, every packet starts at the beginning of each
> > chunk (if there is no headroom) and can only occupy a single chunk
> > since no packet can be larger than the chunk size. In the unaligned
> > mode, the packet can start anywhere within the chunk and might even
> > continue into the next chunk, but never more than that since the max
> > packet size is still the chunk size. Why unaligned mode? This provides
> > the user-space with complete freedom on how to optimize the placement
> > of the packets in the umem and this might lead to better overall
> > performance. Note that if we just look at the kernel part, unaligned
> > mode is slower than aligned, but that might not be true on the overall
> > level.
>
> Thank you very much, very detailed explanation.
>
> I have a question: You said that in the case of unaligned mode, the packet
> pointed by desc may use two consecutive chunks at the same time. How do we
> ensure that we can apply for two consecutive chunks?

I am not sure I understand "apply for", sorry. But in unaligned mode,
we reject any desc that spans two chunks that are not physically
consecutive in memory. So users of unaligned mode usually use huge
pages to make sure that this happens rarely and that these "breaks"
are well known to the entity in user-space that places the packets in
the umem (i.e., do not create packets that cross huge page boundaries
would suffice).

> Back to this patch, is it okay to deal with it this way?
>
>         buffer = xsk_buff_raw_get_data(xs->pool, addr);
>
>         .....
>
>         if (pool->unaligned) {
>                 u64 l;
>
>                 l = (buffer - xs->pool->addrs) % xs->pool->chunk_size;
>                 if (xs->pool->chunk_size - l < desc->len)
>                         skb->truesize += xs->pool->chunk_size * 2;
>                 else
>                         skb->truesize += xs->pool->chunk_size;
>         } else {
>                 skb->truesize += xs->pool->chunk_size;
>         }

Why would not skb->truesize += xs->pool->chunk_size * i; work in both
cases? The copy = min_t(u32, PAGE_SIZE - offset, len - copied);
statement together with the loop itself should take care of the case
when the packet spans two pages as PAGE_SIZE - offset < len it will
loop again and copy the rest. In that case, i == 2 when you exit the
loop.

But it would be great if you could test that your code can deal with
this. How about extending the xsk selftests with a case for unaligned
mode? Should be quite straightforward. Just make sure you put the
packets next to each other so that some of them will cross page
boundaries.

> Thanks.
>
> >
> > > Thanks.
> > >
> > > >
> > > > > > In addition, I actually borrowed from the tcp code:
> > > > > >
> > > > > >    tcp_build_frag:
> > > > > >    --------------
> > > > > >
> > > > > >       if (can_coalesce) {
> > > > > >               skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
> > > > > >       } else {
> > > > > >               get_page(page);
> > > > > >               skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > >       }
> > > > > >
> > > > > >       if (!(flags & MSG_NO_SHARED_FRAGS))
> > > > > >               skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
> > > > > >
> > > > > >       skb->len += copy;
> > > > > >       skb->data_len += copy;
> > > > > >       skb->truesize += copy;
> > > > > >
> > > > > > So, here is one bug?
> > > > >
> > > > > skb_frag_t is an alias to struct bvec. It doesn't contain info about
> > > > > real memory consumption, so there's no other option buf just to add
> > > > > "copy" to truesize.
> > > > > XSK is different in this term, as it operates with chunks of a known
> > > > > size.
> > > > >
> > > > > > Thanks.
> > > > > >
> > > > > > >
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > > > > > > +
> > > > > > > > > > > > > + return skb;
> > > > > > > > > > > > > +}
> > > > > > > > > > > > > +
> > > > > > > > > > >
> > > > > > > > > > > Al
> > > > > > > > > >
> > > > > > > > > > Thanks,
> > > > > > > > > > Al
> > > > > > > >
> > > > > > > > Al
> > > > >

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Magnus Karlsson]

On Mon, Jan 25, 2021 at 4:22 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
>
> On Mon, 25 Jan 2021 14:16:16 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > On Mon, Jan 25, 2021 at 1:43 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
> > >
> > > On Mon, 25 Jan 2021 08:44:38 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > On Mon, Jan 25, 2021 at 3:27 AM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
> > > > >
> > > > > On Fri, 22 Jan 2021 19:37:06 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > > > On Fri, Jan 22, 2021 at 6:26 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > >
> > > > > > > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > Date: Fri, 22 Jan 2021 23:39:15 +0800
> > > > > > >
> > > > > > > > On Fri, 22 Jan 2021 13:55:14 +0100, Magnus Karlsson <magnus.karlsson@gmail.com> wrote:
> > > > > > > > > On Fri, Jan 22, 2021 at 1:39 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > > > > >
> > > > > > > > > > From: Magnus Karlsson <magnus.karlsson@gmail.com>
> > > > > > > > > > Date: Fri, 22 Jan 2021 13:18:47 +0100
> > > > > > > > > >
> > > > > > > > > > > On Fri, Jan 22, 2021 at 12:57 PM Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > > > > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > > > > > > > > >
> > > > > > > > > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > > > > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > > > > > > > > >
> > > > > > > > > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > > > > > > > > overhead.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > > > > > > > > necessary to copy data to construct skb.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > ---------------- Performance Testing ------------
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > > > > > > > > Test cmd:
> > > > > > > > > > > > > > > ```
> > > > > > > > > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > > > > > > > > ```
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Test result data:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > size    64      512     1024    1500
> > > > > > > > > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > > > > > > > > ---
> > > > > > > > > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > > > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > > > > > > > > >   sock_wfree(skb);
> > > > > > > > > > > > > > >  }
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > > > > > > > > +                                       struct xdp_desc *desc)
> > > > > > > > > > > > > > > +{
> > > > > > > > > > > > > > > + u32 len, offset, copy, copied;
> > > > > > > > > > > > > > > + struct sk_buff *skb;
> > > > > > > > > > > > > > > + struct page *page;
> > > > > > > > > > > > > > > + void *buffer;
> > > > > > > > > > > > > > > + int err, i;
> > > > > > > > > > > > > > > + u64 addr;
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > > > > > > > > > > > + if (unlikely(!skb))
> > > > > > > > > > > > > > > +         return ERR_PTR(err);
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + addr = desc->addr;
> > > > > > > > > > > > > > > + len = desc->len;
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > > > > > > > > + offset = offset_in_page(buffer);
> > > > > > > > > > > > > > > + addr = buffer - xs->pool->addrs;
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > > > > > > > > +         page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > +         get_page(page);
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > +         copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > +         skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > +         copied += copy;
> > > > > > > > > > > > > > > +         addr += copy;
> > > > > > > > > > > > > > > +         offset = 0;
> > > > > > > > > > > > > > > + }
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + skb->len += len;
> > > > > > > > > > > > > > > + skb->data_len += len;
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > > + skb->truesize += len;
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > This is not the truesize, unfortunately.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > > > > > > > > >
> > > > > > > > > > > > > The easiest solution is:
> > > > > > > > > > > > >
> > > > > > > > > > > > >       skb->truesize += PAGE_SIZE * i;
> > > > > > > > > > > > >
> > > > > > > > > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > > > > > > > > >
> > > > > > > > > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > > > > > > > > "one per page".
> > > > > > > > > > > > We need to count the number of pages manually and then do
> > > > > > > > > > > >
> > > > > > > > > > > >         skb->truesize += PAGE_SIZE * npages;
> > > > > > > > > > > >
> > > > > > > > > > > > Right.
> > > > > > > > > > >
> > > > > > > > > > > There are two possible packet buffer (chunks) sizes in a umem, 2K and
> > > > > > > > > > > 4K on a system with a PAGE_SIZE of 4K. If I remember correctly, and
> > > > > > > > > > > please correct me if wrong, truesize is used for memory accounting.
> > > > > > > > > > > But in this code, no kernel memory has been allocated (apart from the
> > > > > > > > > > > skb). The page is just a part of the umem that has been already
> > > > > > > > > > > allocated beforehand and by user-space in this case. So what should
> > > > > > > > > > > truesize be in this case? Do we add 0, chunk_size * i, or the
> > > > > > > > > > > complicated case of counting exactly how many 4K pages that are used
> > > > > > > > > > > when the chunk_size is 2K, as two chunks could occupy the same page,
> > > > > > > > > > > or just the upper bound of PAGE_SIZE * i that is likely a good
> > > > > > > > > > > approximation in most cases? Just note that there might be other uses
> > > > > > > > > > > of truesize that I am unaware of that could impact this choice.
> > > > > > > > > >
> > > > > > > > > > Truesize is "what amount of memory does this skb occupy with all its
> > > > > > > > > > fragments, linear space and struct sk_buff itself". The closest it
> > > > > > > > > > will be to the actual value, the better.
> > > > > > > > > > In this case, I think adding of chunk_size * i would be enough.
> > > > > > > > >
> > > > > > > > > Sounds like a good approximation to me.
> > > > > > > > >
> > > > > > > > > > (PAGE_SIZE * i can be overwhelming when chunk_size is 2K, especially
> > > > > > > > > > for setups with PAGE_SIZE > SZ_4K)
> > > > > > > > >
> > > > > > > > > You are right. That would be quite horrible on a system with a page size of 64K.
> > > > > > > >
> > > > > > > > Thank you everyone, I learned it.
> > > > > > > >
> > > > > > > > I also think it is appropriate to add a chunk size here, and there is actually
> > > > > > > > only one chunk here, so it's very simple
> > > > > > > >
> > > > > > > >       skb->truesize += xs->pool->chunk_size;
> > > > > > >
> > > > > > > umem chunks can't cross page boundaries. So if you're sure that
> > > > > > > there could be only one chunk, you don't need the loop at all,
> > > > > > > if I'm not missing anything.
> > > > > >
> > > > > > In the default mode, this is true. But in the unaligned_chunk mode
> > > > > > that can be set on the umem, the chunk may cross one page boundary, so
> > > > > > we need the loop and the chunk_size * i in the assignment of truesize.
> > > > > > So "i" can be 1 or 2, but nothing else.
> > > > >
> > > > > According to my understanding, in the unaligned mode, a desc will also refer to
> > > > > a chunk, although the chunk here may occupy multiple pages. And here is just a
> > > > > desc constructed into a skb, skb takes the largest amount from umem is a
> > > > > chunk, so what is the situation of i = 2 here? Did I miss something?
> > > >
> > > > A desc refers to a single packet, not a single chunk. One packet can
> > > > occupy either one or two chunks in the unaligned mode and when this
> > > > happens to be two, these two chunks might be on different pages. In
> > > > this case, you will go through the loop twice and produce two
> > > > fragments.
> > > >
> > > > In the aligned mode, every packet starts at the beginning of each
> > > > chunk (if there is no headroom) and can only occupy a single chunk
> > > > since no packet can be larger than the chunk size. In the unaligned
> > > > mode, the packet can start anywhere within the chunk and might even
> > > > continue into the next chunk, but never more than that since the max
> > > > packet size is still the chunk size. Why unaligned mode? This provides
> > > > the user-space with complete freedom on how to optimize the placement
> > > > of the packets in the umem and this might lead to better overall
> > > > performance. Note that if we just look at the kernel part, unaligned
> > > > mode is slower than aligned, but that might not be true on the overall
> > > > level.
> > >
> > > Thank you very much, very detailed explanation.
> > >
> > > I have a question: You said that in the case of unaligned mode, the packet
> > > pointed by desc may use two consecutive chunks at the same time. How do we
> > > ensure that we can apply for two consecutive chunks?
> >
> > I am not sure I understand "apply for", sorry. But in unaligned mode,
> > we reject any desc that spans two chunks that are not physically
> > consecutive in memory. So users of unaligned mode usually use huge
> > pages to make sure that this happens rarely and that these "breaks"
> > are well known to the entity in user-space that places the packets in
> > the umem (i.e., do not create packets that cross huge page boundaries
> > would suffice).
> >
> > > Back to this patch, is it okay to deal with it this way?
> > >
> > >         buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > >
> > >         .....
> > >
> > >         if (pool->unaligned) {
> > >                 u64 l;
> > >
> > >                 l = (buffer - xs->pool->addrs) % xs->pool->chunk_size;
> > >                 if (xs->pool->chunk_size - l < desc->len)
> > >                         skb->truesize += xs->pool->chunk_size * 2;
> > >                 else
> > >                         skb->truesize += xs->pool->chunk_size;
> > >         } else {
> > >                 skb->truesize += xs->pool->chunk_size;
> > >         }
> >
> > Why would not skb->truesize += xs->pool->chunk_size * i; work in both
> > cases? The copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > statement together with the loop itself should take care of the case
> > when the packet spans two pages as PAGE_SIZE - offset < len it will
> > loop again and copy the rest. In that case, i == 2 when you exit the
> > loop.
>
> Sorry, I feel that my understanding of the unaligned mode has not been very
> deep. So there may be some problems in understanding.
>
> Assuming that the page is 4k, the chunk size is 2k, and a packet is placed at
> the 1k position, it may occupy two chunk, as long as it is larger than 1k, but
> it only uses one page. like this:
>
>      0         2k        4k
>      |        page       |
>      |   chunk |  chunk  |
>            | packet |
>
> In my code, I want to find several pages occupied by desc and insert these pages
> into skb, so i = 1.

Got it, thanks! I actually think this approximation for truesize would
be the best one and we do not have to care about packets striding
chunk or page borders for the truesize calculation:

skb->truesize += pool->unaligned ? desc->len : pool->chunk_size;

For the aligned case, truesize is always one chunk as there can only
be one packet per chunk. For the unaligned case, truesize is just the
length of the packet since you can put many of these into the same
chunk or page. If you have a 2K chunk and a packet length of 256
bytes, you can put 8 packets into one single chunk. So adding
chunk_size for every single packet in the unaligned case would yield a
very bad approximation. We argued in the same way when we chose to use
chunk_size instead of PAGE_SIZE for the aligned case. The strength of
the unaligned case is that you can put many packets in a single chunk
(when packet size is low enough), so users tend to do this. If you do
not do this, then the aligned mode should be used as it will provide
better performance.

> Thanks.
>
> >
> > But it would be great if you could test that your code can deal with
> > this. How about extending the xsk selftests with a case for unaligned
> > mode? Should be quite straightforward. Just make sure you put the
> > packets next to each other so that some of them will cross page
> > boundaries.
> >
> > > Thanks.
> > >
> > > >
> > > > > Thanks.
> > > > >
> > > > > >
> > > > > > > > In addition, I actually borrowed from the tcp code:
> > > > > > > >
> > > > > > > >    tcp_build_frag:
> > > > > > > >    --------------
> > > > > > > >
> > > > > > > >       if (can_coalesce) {
> > > > > > > >               skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
> > > > > > > >       } else {
> > > > > > > >               get_page(page);
> > > > > > > >               skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > >       }
> > > > > > > >
> > > > > > > >       if (!(flags & MSG_NO_SHARED_FRAGS))
> > > > > > > >               skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
> > > > > > > >
> > > > > > > >       skb->len += copy;
> > > > > > > >       skb->data_len += copy;
> > > > > > > >       skb->truesize += copy;
> > > > > > > >
> > > > > > > > So, here is one bug?
> > > > > > >
> > > > > > > skb_frag_t is an alias to struct bvec. It doesn't contain info about
> > > > > > > real memory consumption, so there's no other option buf just to add
> > > > > > > "copy" to truesize.
> > > > > > > XSK is different in this term, as it operates with chunks of a known
> > > > > > > size.
> > > > > > >
> > > > > > > > Thanks.
> > > > > > > >
> > > > > > > > >
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > > > > + return skb;
> > > > > > > > > > > > > > > +}
> > > > > > > > > > > > > > > +
> > > > > > > > > > > > >
> > > > > > > > > > > > > Al
> > > > > > > > > > > >
> > > > > > > > > > > > Thanks,
> > > > > > > > > > > > Al
> > > > > > > > > >
> > > > > > > > > > Al
> > > > > > >

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: Mon, 25 Jan 2021 11:10:43 +0800

> On Fri, 22 Jan 2021 16:24:17 +0000, Alexander Lobakin <alobakin@pm.me> wrote:
> > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > Date: Fri, 22 Jan 2021 23:36:29 +0800
> >
> > > On Fri, 22 Jan 2021 12:08:00 +0000, Alexander Lobakin <alobakin@pm.me> wrote:
> > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > Date: Fri, 22 Jan 2021 11:55:35 +0000
> > > >
> > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > >
> > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > >
> > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > overhead.
> > > > > > > >
> > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > necessary to copy data to construct skb.
> > > > > > > >
> > > > > > > > ---------------- Performance Testing ------------
> > > > > > > >
> > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > Test cmd:
> > > > > > > > ```
> > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > ```
> > > > > > > >
> > > > > > > > Test result data:
> > > > > > > >
> > > > > > > > size    64      512     1024    1500
> > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > >
> > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > ---
> > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > >
> > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > >  	sock_wfree(skb);
> > > > > > > >  }
> > > > > > > >
> > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > +					      struct xdp_desc *desc)
> > > > > > > > +{
> > > > > > > > +	u32 len, offset, copy, copied;
> > > > > > > > +	struct sk_buff *skb;
> > > > > > > > +	struct page *page;
> > > > > > > > +	void *buffer;
> > > > > > > > +	int err, i;
> > > > > > > > +	u64 addr;
> > > > > > > > +
> > > > > > > > +	skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > >
> > > > Also,
> > > > maybe we should allocate it with NET_SKB_PAD so NIC drivers could
> > > > use some reserved space?
> > > >
> > > > 		skb = sock_alloc_send_skb(&xs->sk, NET_SKB_PAD, 1, &err);
> > > > 		...
> > > > 		skb_reserve(skb, NET_SKB_PAD);
> > > >
> > > > Eric, what do you think?
> > >
> > > I think you are right. Some space should be added to continuous equipment. This
> > > space should also be added in the copy mode below. Is LL_RESERVED_SPACE more
> > > appropriate?
> >
> > No. If you look at __netdev_alloc_skb() and __napi_alloc_skb(), they
> > reserve NET_SKB_PAD at the beginning of linear area. Documentation of
> > __build_skb() also says that driver should reserve NET_SKB_PAD before
> > the actual frame, so it is a standartized hardware-independent
> > headroom.
> 
> I understand that these scenarios are in the case of receiving packets, and the
> increased space is used by the protocol stack, especially RPS. I don't know if
> this also applies to the sending scenario?
> 
> > Leaving that space in skb->head will allow developers to implement
> > IFF_TX_SKB_NO_LINEAR in a wider variety of drivers, especially when
> > a driver has to prepend some sort of data before the actual frame.
> > Since it's usually of a size of one cacheline, shouldn't be a big
> > deal.
> >
> 
> I agree with this. Some network cards require some space. For example,
> virtio-net needs to add a virtio_net_hdr_mrg_rxbuf before skb->data, so my
> original understanding is used here. When we send the skb to the
> driver, the driver may need a memory space. So I refer to the
> implementation of __ip_append_data, I feel that adding
> LL_RESERVED_SPACE is a suitable solution.
> 
> I feel that I may still not understand the use scene you mentioned. Can you
> elaborate on what you understand this space will be used for?

LL_RESERVED_SPACE() consists of L2 header size (Ethernet for the most
cases) and dev->needed_headroom. That is not a value to count on, as:
 - L2 header is already here in XSK buffer;
 - not all drivers set dev->needed_headroom;
 - it's aligned by 16, not L1_CACHE_SIZE.

As this path is XSK generic path, i.e. when driver-side XSK is not
present or not requested, it can be applied to every driver. Many
of them call skb_cow_head() + skb_push() on their xmit path:
 - nearly all virtual drivers (to insert their specific headers);
 - nearly all switch drivers (to insert switch CPU port tags);
 - some enterprise NIC drivers (ChelsIO for LSO, Netronome
   for TLS etc.).

skb_cow_head() + skb_push() relies on a required NET_SKB_PAD headroom.
In case where there is no enough space (and you allocate an skb with
no headroom at all), skb will be COWed, which is a huge overhead and
will cause slowdowns.
So, adding NET_SKB_PAD would save from almost all, if not all, such
reallocations.

> Thanks.
> 
> >
> > [ I also had an idea of allocating an skb with a headroom of
> > NET_SKB_PAD + 256 bytes, so nearly all drivers could just call
> > pskb_pull_tail() to support such type of skbuffs without much
> > effort, but I think that it's better to teach drivers to support
> > xmitting of really headless ones. If virtio_net can do it, why
> > shouldn't the others ]
> >
> > > > > > > > +	if (unlikely(!skb))
> > > > > > > > +		return ERR_PTR(err);
> > > > > > > > +
> > > > > > > > +	addr = desc->addr;
> > > > > > > > +	len = desc->len;
> > > > > > > > +
> > > > > > > > +	buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > +	offset = offset_in_page(buffer);
> > > > > > > > +	addr = buffer - xs->pool->addrs;
> > > > > > > > +
> > > > > > > > +	for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > +		page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > +
> > > > > > > > +		get_page(page);
> > > > > > > > +
> > > > > > > > +		copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > +
> > > > > > > > +		skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > +
> > > > > > > > +		copied += copy;
> > > > > > > > +		addr += copy;
> > > > > > > > +		offset = 0;
> > > > > > > > +	}
> > > > > > > > +
> > > > > > > > +	skb->len += len;
> > > > > > > > +	skb->data_len += len;
> > > > > > >
> > > > > > > > +	skb->truesize += len;
> > > > > > >
> > > > > > > This is not the truesize, unfortunately.
> > > > > > >
> > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > >
> > > > > > The easiest solution is:
> > > > > >
> > > > > > 	skb->truesize += PAGE_SIZE * i;
> > > > > >
> > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > >
> > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > "one per page".
> > > > > We need to count the number of pages manually and then do
> > > > >
> > > > > 	skb->truesize += PAGE_SIZE * npages;
> > > > >
> > > > > Right.
> > > > >
> > > > > > > > +
> > > > > > > > +	refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > +
> > > > > > > > +	return skb;
> > > > > > > > +}
> > > > > > > > +
> > > > > >
> > > > > > Al
> > > > >
> > > > > Thanks,
> > > > > Al
> > > >
> > > > Al

Thanks,
Al

Re: [PATCH bpf-next v3 3/3] xsk: build skb by page

[Alexander Lobakin]

From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: Mon, 25 Jan 2021 22:57:07 +0800

> On Mon, 25 Jan 2021 13:25:45 +0000, Alexander Lobakin <alobakin@pm.me> wrote:
> > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > Date: Mon, 25 Jan 2021 11:10:43 +0800
> >
> > > On Fri, 22 Jan 2021 16:24:17 +0000, Alexander Lobakin <alobakin@pm.me> wrote:
> > > > From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > Date: Fri, 22 Jan 2021 23:36:29 +0800
> > > >
> > > > > On Fri, 22 Jan 2021 12:08:00 +0000, Alexander Lobakin <alobakin@pm.me> wrote:
> > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > Date: Fri, 22 Jan 2021 11:55:35 +0000
> > > > > >
> > > > > > > From: Alexander Lobakin <alobakin@pm.me>
> > > > > > > Date: Fri, 22 Jan 2021 11:47:45 +0000
> > > > > > >
> > > > > > > > From: Eric Dumazet <eric.dumazet@gmail.com>
> > > > > > > > Date: Thu, 21 Jan 2021 16:41:33 +0100
> > > > > > > >
> > > > > > > > > On 1/21/21 2:47 PM, Xuan Zhuo wrote:
> > > > > > > > > > This patch is used to construct skb based on page to save memory copy
> > > > > > > > > > overhead.
> > > > > > > > > >
> > > > > > > > > > This function is implemented based on IFF_TX_SKB_NO_LINEAR. Only the
> > > > > > > > > > network card priv_flags supports IFF_TX_SKB_NO_LINEAR will use page to
> > > > > > > > > > directly construct skb. If this feature is not supported, it is still
> > > > > > > > > > necessary to copy data to construct skb.
> > > > > > > > > >
> > > > > > > > > > ---------------- Performance Testing ------------
> > > > > > > > > >
> > > > > > > > > > The test environment is Aliyun ECS server.
> > > > > > > > > > Test cmd:
> > > > > > > > > > ```
> > > > > > > > > > xdpsock -i eth0 -t  -S -s <msg size>
> > > > > > > > > > ```
> > > > > > > > > >
> > > > > > > > > > Test result data:
> > > > > > > > > >
> > > > > > > > > > size    64      512     1024    1500
> > > > > > > > > > copy    1916747 1775988 1600203 1440054
> > > > > > > > > > page    1974058 1953655 1945463 1904478
> > > > > > > > > > percent 3.0%    10.0%   21.58%  32.3%
> > > > > > > > > >
> > > > > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> > > > > > > > > > Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
> > > > > > > > > > ---
> > > > > > > > > >  net/xdp/xsk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----------
> > > > > > > > > >  1 file changed, 86 insertions(+), 18 deletions(-)
> > > > > > > > > >
> > > > > > > > > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> > > > > > > > > > index 4a83117..38af7f1 100644
> > > > > > > > > > --- a/net/xdp/xsk.c
> > > > > > > > > > +++ b/net/xdp/xsk.c
> > > > > > > > > > @@ -430,6 +430,87 @@ static void xsk_destruct_skb(struct sk_buff *skb)
> > > > > > > > > >  	sock_wfree(skb);
> > > > > > > > > >  }
> > > > > > > > > >
> > > > > > > > > > +static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
> > > > > > > > > > +					      struct xdp_desc *desc)
> > > > > > > > > > +{
> > > > > > > > > > +	u32 len, offset, copy, copied;
> > > > > > > > > > +	struct sk_buff *skb;
> > > > > > > > > > +	struct page *page;
> > > > > > > > > > +	void *buffer;
> > > > > > > > > > +	int err, i;
> > > > > > > > > > +	u64 addr;
> > > > > > > > > > +
> > > > > > > > > > +	skb = sock_alloc_send_skb(&xs->sk, 0, 1, &err);
> > > > > >
> > > > > > Also,
> > > > > > maybe we should allocate it with NET_SKB_PAD so NIC drivers could
> > > > > > use some reserved space?
> > > > > >
> > > > > > 		skb = sock_alloc_send_skb(&xs->sk, NET_SKB_PAD, 1, &err);
> > > > > > 		...
> > > > > > 		skb_reserve(skb, NET_SKB_PAD);
> > > > > >
> > > > > > Eric, what do you think?
> > > > >
> > > > > I think you are right. Some space should be added to continuous equipment. This
> > > > > space should also be added in the copy mode below. Is LL_RESERVED_SPACE more
> > > > > appropriate?
> > > >
> > > > No. If you look at __netdev_alloc_skb() and __napi_alloc_skb(), they
> > > > reserve NET_SKB_PAD at the beginning of linear area. Documentation of
> > > > __build_skb() also says that driver should reserve NET_SKB_PAD before
> > > > the actual frame, so it is a standartized hardware-independent
> > > > headroom.
> > >
> > > I understand that these scenarios are in the case of receiving packets, and the
> > > increased space is used by the protocol stack, especially RPS. I don't know if
> > > this also applies to the sending scenario?
> > >
> > > > Leaving that space in skb->head will allow developers to implement
> > > > IFF_TX_SKB_NO_LINEAR in a wider variety of drivers, especially when
> > > > a driver has to prepend some sort of data before the actual frame.
> > > > Since it's usually of a size of one cacheline, shouldn't be a big
> > > > deal.
> > > >
> > >
> > > I agree with this. Some network cards require some space. For example,
> > > virtio-net needs to add a virtio_net_hdr_mrg_rxbuf before skb->data, so my
> > > original understanding is used here. When we send the skb to the
> > > driver, the driver may need a memory space. So I refer to the
> > > implementation of __ip_append_data, I feel that adding
> > > LL_RESERVED_SPACE is a suitable solution.
> > >
> > > I feel that I may still not understand the use scene you mentioned. Can you
> > > elaborate on what you understand this space will be used for?
> >
> > LL_RESERVED_SPACE() consists of L2 header size (Ethernet for the most
> > cases) and dev->needed_headroom. That is not a value to count on, as:
> >  - L2 header is already here in XSK buffer;
> >  - not all drivers set dev->needed_headroom;
> >  - it's aligned by 16, not L1_CACHE_SIZE.
> >
> > As this path is XSK generic path, i.e. when driver-side XSK is not
> > present or not requested, it can be applied to every driver. Many
> > of them call skb_cow_head() + skb_push() on their xmit path:
> >  - nearly all virtual drivers (to insert their specific headers);
> >  - nearly all switch drivers (to insert switch CPU port tags);
> >  - some enterprise NIC drivers (ChelsIO for LSO, Netronome
> >    for TLS etc.).
> >
> > skb_cow_head() + skb_push() relies on a required NET_SKB_PAD headroom.
> > In case where there is no enough space (and you allocate an skb with
> > no headroom at all), skb will be COWed, which is a huge overhead and
> > will cause slowdowns.
> > So, adding NET_SKB_PAD would save from almost all, if not all, such
> > reallocations.
>
> I have learnt so much, thanks to you.

Glad to hear!

> > > Thanks.
> > >
> > > >
> > > > [ I also had an idea of allocating an skb with a headroom of
> > > > NET_SKB_PAD + 256 bytes, so nearly all drivers could just call
> > > > pskb_pull_tail() to support such type of skbuffs without much
> > > > effort, but I think that it's better to teach drivers to support
> > > > xmitting of really headless ones. If virtio_net can do it, why
> > > > shouldn't the others ]
> > > >
> > > > > > > > > > +	if (unlikely(!skb))
> > > > > > > > > > +		return ERR_PTR(err);
> > > > > > > > > > +
> > > > > > > > > > +	addr = desc->addr;
> > > > > > > > > > +	len = desc->len;
> > > > > > > > > > +
> > > > > > > > > > +	buffer = xsk_buff_raw_get_data(xs->pool, addr);
> > > > > > > > > > +	offset = offset_in_page(buffer);
> > > > > > > > > > +	addr = buffer - xs->pool->addrs;
> > > > > > > > > > +
> > > > > > > > > > +	for (copied = 0, i = 0; copied < len; i++) {
> > > > > > > > > > +		page = xs->pool->umem->pgs[addr >> PAGE_SHIFT];
> > > > > > > > > > +
> > > > > > > > > > +		get_page(page);
> > > > > > > > > > +
> > > > > > > > > > +		copy = min_t(u32, PAGE_SIZE - offset, len - copied);
> > > > > > > > > > +
> > > > > > > > > > +		skb_fill_page_desc(skb, i, page, offset, copy);
> > > > > > > > > > +
> > > > > > > > > > +		copied += copy;
> > > > > > > > > > +		addr += copy;
> > > > > > > > > > +		offset = 0;
> > > > > > > > > > +	}
> > > > > > > > > > +
> > > > > > > > > > +	skb->len += len;
> > > > > > > > > > +	skb->data_len += len;
> > > > > > > > >
> > > > > > > > > > +	skb->truesize += len;
> > > > > > > > >
> > > > > > > > > This is not the truesize, unfortunately.
> > > > > > > > >
> > > > > > > > > We need to account for the number of pages, not number of bytes.
> > > > > > > >
> > > > > > > > The easiest solution is:
> > > > > > > >
> > > > > > > > 	skb->truesize += PAGE_SIZE * i;
> > > > > > > >
> > > > > > > > i would be equal to skb_shinfo(skb)->nr_frags after exiting the loop.
> > > > > > >
> > > > > > > Oops, pls ignore this. I forgot that XSK buffers are not
> > > > > > > "one per page".
> > > > > > > We need to count the number of pages manually and then do
> > > > > > >
> > > > > > > 	skb->truesize += PAGE_SIZE * npages;
> > > > > > >
> > > > > > > Right.
> > > > > > >
> > > > > > > > > > +
> > > > > > > > > > +	refcount_add(len, &xs->sk.sk_wmem_alloc);
> > > > > > > > > > +
> > > > > > > > > > +	return skb;
> > > > > > > > > > +}
> > > > > > > > > > +
> > > > > > > >
> > > > > > > > Al
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Al
> > > > > >
> > > > > > Al
> >
> > Thanks,
> > Al

Al