net: extend alloc_skb_with_frags() max size
Subsystems (4)
v2 cover 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/[email protected]/
v2: Addressed Willem feedback on 1st patch.
Eric Dumazet (4):
net: allow alloc_skb_with_frags() to allocate bigger packets
net: tun: change tun_alloc_skb() to allow bigger paged allocations net/packet: change packet_alloc_skb() to allow bigger paged
allocations
net: tap: change tap_alloc_skb() to allow bigger paged allocations
drivers/net/tap.c | 4 ++- drivers/net/tun.c | 4 ++- net/core/skbuff.c | 56 +++++++++++++++++++----------------------- net/packet/af_packet.c | 4 ++- 4 files changed, 34 insertions(+), 34 deletions(-)
Signature · 1 line
2.41.0.585.gd2178a4bd4-goog
PATCH v2 1/4 net: allow alloc_skb_with_frags() to allocate bigger packets
Refactor alloc_skb_with_frags() to allow bigger packets allocations.
Instead of assuming that only order-0 allocations will be attempted, use the caller supplied max order.
v2: try harder to use high-order pages, per Willem feedback.
--- net/core/skbuff.c | 56 +++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 31 deletions(-)
net/core/skbuff.c +25 -31
@@ -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 (order) { -if (npages >=1 << 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 ; - } +while (data_len) { +if (nr_frags ==MAX_SKB_FRAGS -1 ) + goto failure; +while (order &&PAGE_ALIGN (data_len) < (PAGE_SIZE << order)) order--; + +if (order) { + page =alloc_pages ((gfp_mask & ~__GFP_DIRECT_RECLAIM) | + __GFP_COMP | + __GFP_NOWARN, + order); +if (!page) { + order--; +continue ; + } + }else { + page =alloc_page (gfp_mask); +if (!page) + goto failure; } - 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;
Signature · 1 line
2.41.0.585.gd2178a4bd4-goog
PATCH v2 2/4 net: tun: change tun_alloc_skb() to allow bigger paged allocations
In reply to Eric Dumazettun_alloc_skb() is currently calling sock_alloc_send_pskb() forcing order-0 page allocations.
Switch to PAGE_ALLOC_COSTLY_ORDER, to increase max allocation size by 8x.
Also add logic to increase the linear part if needed.
--- drivers/net/tun.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tun.c +3 -1
@@ -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);
Signature · 1 line
2.41.0.585.gd2178a4bd4-goog
PATCH v2 3/4 net/packet: change packet_alloc_skb() to allow bigger paged allocations
In reply to Eric Dumazetpacket_alloc_skb() is currently calling sock_alloc_send_pskb() forcing order-0 page allocations.
Switch to PAGE_ALLOC_COSTLY_ORDER, to increase max size by 8x.
Also add logic to increase the linear part if needed.
--- net/packet/af_packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/packet/af_packet.c +3 -1
@@ -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 ;
Signature · 1 line
2.41.0.585.gd2178a4bd4-goog
PATCH v2 4/4 net: tap: change tap_alloc_skb() to allow bigger paged allocations
In reply to Eric Dumazettap_alloc_skb() is currently calling sock_alloc_send_pskb() forcing order-0 page allocations.
Switch to PAGE_ALLOC_COSTLY_ORDER, to increase max size by 8x.
Also add logic to increase the linear part if needed.
--- drivers/net/tap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tap.c +3 -1
@@ -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 ;
Signature · 1 line
2.41.0.585.gd2178a4bd4-goog
Quoted 17 lines · Eric Dumazet
alloc_skb_with_frags(), while being able to use high order allocations, limits the payload size toPAGE_SIZE*MAX_SKB_FRAGSReviewing Tahsin Erdogan patch [1], it was clear to me we need to remove this limitation.
[1] https://lore.kernel.org/netdev/[email protected]/
v2: Addressed Willem feedback on 1st patch.
Eric Dumazet (4):
net: allowalloc_skb_with_frags()to allocate bigger packets
net: tun: changetun_alloc_skb()to allow bigger paged allocations net/packet: changepacket_alloc_skb()to allow bigger paged
allocations
net: tap: changetap_alloc_skb()to allow bigger paged allocations
Quoted 5 lines
drivers/net/tap.c | 4 ++- drivers/net/tun.c | 4 ++- net/core/skbuff.c | 56 +++++++++++++++++++----------------------- net/packet/af_packet.c | 4 ++- 4 files changed, 34 insertions(+), 34 deletions(-)
For the series:
Thanks Eric
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 1 Aug 2023 20:52:50 +0000 you wrote:
alloc_skb_with_frags(), while being able to use high order allocations, limits the payload size toPAGE_SIZE*MAX_SKB_FRAGSReviewing Tahsin Erdogan patch [1], it was clear to me we need to remove this limitation.
[1] https://lore.kernel.org/netdev/[email protected]/
[...]
Here is the summary with links:
- [v2,net-next,1/4] net: allow alloc_skb_with_frags() to allocate bigger packets
https://git.kernel.org/netdev/net-next/c/09c2c90705bb - [v2,net-next,2/4] net: tun: change tun_alloc_skb() to allow bigger paged allocations https://git.kernel.org/netdev/net-next/c/ce7c7fef1473 - [v2,net-next,3/4] net/packet: change packet_alloc_skb() to allow bigger paged allocations https://git.kernel.org/netdev/net-next/c/ae6db08f8b56 - [v2,net-next,4/4] net: tap: change tap_alloc_skb() to allow bigger paged allocations https://git.kernel.org/netdev/net-next/c/37dfe5b8ddeb
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html