From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A25D0C4338F for ; Tue, 27 Jul 2021 08:23:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 838CA61057 for ; Tue, 27 Jul 2021 08:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235984AbhG0IXs (ORCPT ); Tue, 27 Jul 2021 04:23:48 -0400 Received: from jabberwock.ucw.cz ([46.255.230.98]:33638 "EHLO jabberwock.ucw.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235920AbhG0IXm (ORCPT ); Tue, 27 Jul 2021 04:23:42 -0400 Received: by jabberwock.ucw.cz (Postfix, from userid 1017) id A83B21C0B76; Tue, 27 Jul 2021 10:22:39 +0200 (CEST) Date: Tue, 27 Jul 2021 10:22:38 +0200 From: Pavel Machek To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Alexander Lobakin , Antoine Tenart , "David S. Miller" , Sasha Levin Subject: Re: [PATCH 5.10 029/167] net: do not reuse skbuff allocated from skbuff_fclone_cache in the skb cache Message-ID: <20210727082238.GA10177@amd> References: <20210726153839.371771838@linuxfoundation.org> <20210726153840.350300456@linuxfoundation.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="AhhlLboLdkugWU4S" Content-Disposition: inline In-Reply-To: <20210726153840.350300456@linuxfoundation.org> User-Agent: Mutt/1.5.23 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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_str= uct *napi, > case GRO_MERGED_FREE: > if (NAPI_GRO_CB(skb)->free =3D=3D NAPI_GRO_FREE_STOLEN_HEAD) > napi_skb_free_stolen_head(skb); > + else if (skb->fclone !=3D SKB_FCLONE_UNAVAILABLE) > + __kfree_skb(skb); > else > __kfree_skb(skb); > break; --=20 DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany --AhhlLboLdkugWU4S Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAmD/wk4ACgkQMOfwapXb+vKHeQCgn8SEVAaKKz+YvbuQGLKERu6V +4MAoKWPV/nsE2p1C0dHZ9MN8HFUhj8n =sUvV -----END PGP SIGNATURE----- --AhhlLboLdkugWU4S--