lkml.org 
[lkml]   [2021]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5.10 029/167] net: do not reuse skbuff allocated from skbuff_fclone_cache in the skb cache
On Tue, Jul 27, 2021 at 10:22:38AM +0200, Pavel Machek wrote:
> Hi!
>
> > [ Upstream commit 28b34f01a73435a754956ebae826e728c03ffa38 ]
>
> Mainline is significantly different here. Patch makes no sense in
> 5.10, as both branches of if are same.
>
> Best regards,
> Pavel
>
> > --- a/net/core/dev.c
> > +++ b/net/core/dev.c
> > @@ -6100,6 +6100,8 @@ static gro_result_t napi_skb_finish(struct napi_struct *napi,
> > case GRO_MERGED_FREE:
> > if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
> > napi_skb_free_stolen_head(skb);
> > + else if (skb->fclone != SKB_FCLONE_UNAVAILABLE)
> > + __kfree_skb(skb);
> > else
> > __kfree_skb(skb);
> > break;
>

You are right, I'll go drop this patch from the queue now, thanks.

greg k-h

\
 
 \ /
  Last update: 2021-07-27 11:50    [W:0.150 / U:0.412 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site