Commit 72c1a284 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-extend-alloc_skb_with_frags-max-size' 

Eric Dumazet says:

====================
net: extend alloc_skb_with_frags() max size

alloc_skb_with_frags(), while being able to use high order allocations,
limits the payload size to PAGE_SIZE * MAX_SKB_FRAGS

Reviewing Tahsin Erdogan patch [1], it was clear to me we need
to remove this limitation.

[1] https://lore.kernel.org/netdev/20230731230736.109216-1-trdgn@amazon.com/

v2: Addressed Willem feedback on 1st patch.
====================

Link: https://lore.kernel.org/r/20230801205254.400094-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 49c467dc 37dfe5b8

drivers/net/tap.c

+3 −1
Original line number Diff line number Diff line
@@ -614,8 +614,10 @@ static inline struct sk_buff *tap_alloc_skb(struct sock *sk, size_t prepad, 
	if (prepad + len < PAGE_SIZE || !linear)

		linear = len;



	if (len - linear > MAX_SKB_FRAGS * (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))

		linear = len - MAX_SKB_FRAGS * (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER);

	skb = sock_alloc_send_pskb(sk, prepad + linear, len - linear, noblock,

				   err, 0);

				   err, PAGE_ALLOC_COSTLY_ORDER);

	if (!skb)

		return NULL;

drivers/net/tun.c

+3 −1
Original line number Diff line number Diff line
@@ -1526,8 +1526,10 @@ static struct sk_buff *tun_alloc_skb(struct tun_file *tfile, 
	if (prepad + len < PAGE_SIZE || !linear)

		linear = len;



	if (len - linear > MAX_SKB_FRAGS * (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))

		linear = len - MAX_SKB_FRAGS * (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER);

	skb = sock_alloc_send_pskb(sk, prepad + linear, len - linear, noblock,

				   &err, 0);

				   &err, PAGE_ALLOC_COSTLY_ORDER);

	if (!skb)

		return ERR_PTR(err);

net/core/skbuff.c

+25 −31
Original line number Diff line number Diff line
@@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(skb_mpls_dec_ttl); 
 *

 * @header_len: size of linear part

 * @data_len: needed length in frags

 * @max_page_order: max page order desired.

 * @order: max page order desired.

 * @errcode: pointer to error code if any

 * @gfp_mask: allocation mask

 *
@@ -6212,21 +6212,17 @@ EXPORT_SYMBOL_GPL(skb_mpls_dec_ttl); 
 */

struct sk_buff *alloc_skb_with_frags(unsigned long header_len,

				     unsigned long data_len,

				     int max_page_order,

				     int order,

				     int *errcode,

				     gfp_t gfp_mask)

{

	int npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;

	unsigned long chunk;

	struct sk_buff *skb;

	struct page *page;

	int i;

	int nr_frags = 0;



	*errcode = -EMSGSIZE;

	/* Note this test could be relaxed, if we succeed to allocate

	 * high order pages...

	 */

	if (npages > MAX_SKB_FRAGS)

	if (unlikely(data_len > MAX_SKB_FRAGS * (PAGE_SIZE << order)))

		return NULL;



	*errcode = -ENOBUFS;
@@ -6234,34 +6230,32 @@ struct sk_buff *alloc_skb_with_frags(unsigned long header_len, 
	if (!skb)

		return NULL;



	skb->truesize += npages << PAGE_SHIFT;



	for (i = 0; npages > 0; i++) {

		int order = max_page_order;

	while (data_len) {

		if (nr_frags == MAX_SKB_FRAGS - 1)

			goto failure;

		while (order && PAGE_ALIGN(data_len) < (PAGE_SIZE << order))

			order--;



		while (order) {

			if (npages >= 1 << order) {

		if (order) {

			page = alloc_pages((gfp_mask & ~__GFP_DIRECT_RECLAIM) |

					   __GFP_COMP |

					   __GFP_NOWARN,

					   order);

				if (page)

					goto fill_page;

				/* Do not retry other high order allocations */

				order = 1;

				max_page_order = 0;

			}

			if (!page) {

				order--;

				continue;

			}

		} else {

			page = alloc_page(gfp_mask);

			if (!page)

				goto failure;

fill_page:

		}

		chunk = min_t(unsigned long, data_len,

			      PAGE_SIZE << order);

		skb_fill_page_desc(skb, i, page, 0, chunk);

		skb_fill_page_desc(skb, nr_frags, page, 0, chunk);

		nr_frags++;

		skb->truesize += (PAGE_SIZE << order);

		data_len -= chunk;

		npages -= 1 << order;

	}

	return skb;

net/packet/af_packet.c

+3 −1
Original line number Diff line number Diff line
@@ -2927,8 +2927,10 @@ static struct sk_buff *packet_alloc_skb(struct sock *sk, size_t prepad, 
	if (prepad + len < PAGE_SIZE || !linear)

		linear = len;



	if (len - linear > MAX_SKB_FRAGS * (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))

		linear = len - MAX_SKB_FRAGS * (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER);

	skb = sock_alloc_send_pskb(sk, prepad + linear, len - linear, noblock,

				   err, 0);

				   err, PAGE_ALLOC_COSTLY_ORDER);

	if (!skb)

		return NULL;