Merge branch 'couple-of-minor-improvements-to-build_skb-variants'
Gal Pressman says: ==================== Couple of minor improvements to build_skb variants First patch replaces open-coded occurrences of skb_propagate_pfmemalloc() in build_skb() and build_skb_around(). The secnod patch adds a likely() to the skb allocation in build_skb(). ==================== Link: https://lore.kernel.org/r/20230308131720.2103611-1-gal@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
c568a8de6b
@ -420,10 +420,9 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size)
|
||||
{
|
||||
struct sk_buff *skb = __build_skb(data, frag_size);
|
||||
|
||||
if (skb && frag_size) {
|
||||
if (likely(skb && frag_size)) {
|
||||
skb->head_frag = 1;
|
||||
if (page_is_pfmemalloc(virt_to_head_page(data)))
|
||||
skb->pfmemalloc = 1;
|
||||
skb_propagate_pfmemalloc(virt_to_head_page(data), skb);
|
||||
}
|
||||
return skb;
|
||||
}
|
||||
@ -445,8 +444,7 @@ struct sk_buff *build_skb_around(struct sk_buff *skb,
|
||||
|
||||
if (frag_size) {
|
||||
skb->head_frag = 1;
|
||||
if (page_is_pfmemalloc(virt_to_head_page(data)))
|
||||
skb->pfmemalloc = 1;
|
||||
skb_propagate_pfmemalloc(virt_to_head_page(data), skb);
|
||||
}
|
||||
return skb;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user