Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 30 May 2023 13:59:20 +0200
From:   Simon Horman <simon.horman@corigine.com>
To:     Richard Gobert <richardbgobert@gmail.com>
Cc:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, lixiaoyan@google.com, alexanderduyck@fb.com,
        linyunsheng@huawei.com, lucien.xin@gmail.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] gro: decrease size of CB
Message-ID: <ZHXlGH2YqVnO6KYq@corigine.com>
References: <20230529160503.GA3884@debian>
 <20230529161240.GA3958@debian>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230529161240.GA3958@debian>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?on1S3usz/EXMw1j3Mwx8WkNxk/BJjr2ZbR1PBEix7mtfmBuCqZbG4wbKCGz8?=
 =?us-ascii?Q?HYTX9p72EHgGZaEwjCVW1b0GiwtuzF0QVKKbRtSrcqKPSxaLdO74KMvxmw+M?=
 =?us-ascii?Q?WVTxd784EwdmXWp+ZoZSZ6EIqsykjuO6zq3lEffVyamTjtA+ntnQ5QAWM60P?=
 =?us-ascii?Q?uzFTR4lPguIamm7viqRyfo6+7nrE74Q4rFUKPvb8ddhgv75mDCSwi6ffRKZY?=
 =?us-ascii?Q?z7NO6UiuoJM67UxYiVfS5tcQMNzPVdjtHZM7j4o8GeiNTMnf3k95lyO4rns9?=
 =?us-ascii?Q?KPO0NjbTQR+8oAwfvVIRn2Mr+0vnEjePWOQJuKlK5dxU/oPlfOsWWQbdLzky?=
 =?us-ascii?Q?CZU2MDUWEB84DcBkWyQQWO2960iXAUpI6Rrv+rp5O9P2jDc6OisFnBlgLCJ1?=
 =?us-ascii?Q?Y7OZTr79RHaLJ5v9Cts59CHHjJmRQ0T4TDuTd08gQmVzID3MdhhUhydKE4fG?=
 =?us-ascii?Q?NAoDZh180K1MfhqbhrOWykdLONMys8oTYmfpkQaCUC8vbk0Ukj4q8a3Rz9u3?=
 =?us-ascii?Q?IcHbvcoOynaZm6BWWTAKWKnDQTvf6Ql24c+mdMx4R93fZ9oGRGi3AM/ZjX7N?=
 =?us-ascii?Q?FQirQDudXqymywMzoKQVaOQ3oucPMpOhG+x32YKML7jFsIoYclA2IqOIipAr?=
 =?us-ascii?Q?RT8dpQOVO8Y8sBNVJ6UZBYK9nkMf015xJYIzOlfTLA5GrTSyqfJjZ1tGjz0A?=
 =?us-ascii?Q?cRtNQwiaFnphyC04XsDQQF4rGei/p4JUQpd7Px4abDaw9yiPKnPJvARU4RMQ?=
 =?us-ascii?Q?FznTLBkqhD+5qPA9fShT7SfL4URUVroe7hfurAivGEO/JOo9aDNHGoTaqirS?=
 =?us-ascii?Q?0BXANIYfb20cZ5ieqhq/uaIgS3u12mVq8pfJ1BSETjtoriMGDgkUNgaTMDKm?=
 =?us-ascii?Q?W7qIs69wwPdHYcxjMPJwsVJQtjUjeMIQncxqZTJX2sWsPj8YJA5n8sepOyih?=
 =?us-ascii?Q?s5U9DaoL15J4d3utlSZ7gIvz7I/WFJ3UXHRe94+WXWj9dKaqJ5nlhMNAY2Td?=
 =?us-ascii?Q?ULguCTSDeXqD04M5I821G9h/3J4RO+HVEfskALJ0yYb0BOgvpoq+UGxNpGmf?=
 =?us-ascii?Q?dCvJ7CRQdM8NnNw5ChN5c0Yx55mMZ3hpSzaNk+5tLu4/niccTrCiVaXUC47q?=
 =?us-ascii?Q?yC/rslCHudglBTSUo/4XYvTtgrOxX8tuXrlqnHKBSBt3q5piTx+BF176FWcI?=
 =?us-ascii?Q?TjVKRORMolhxiUdFfWiJUpqQlAjoreC7rZ7Ve1NzcC43TPYDQUtjDgyAzGdv?=
 =?us-ascii?Q?oF6gB8MCScA3PL+AceZ4lNNlqNOhBuMqYSesGfRiNv5F2zLaAzNxTnU5Kw9L?=
 =?us-ascii?Q?O1oFwyyyjhuABKWpKvsvFGVO3VIzWMJWtVxZSscQaKzo6hh4j+w5ytuVyvx9?=
 =?us-ascii?Q?KI33MyvDqe7iqGbhtkm/KQuy08oFLgbcIYG8R8ANIC8WgdCrl9futc2c7Kdm?=
 =?us-ascii?Q?QIYJBOGlt/nn3eras97Vit3JZsGN6HcoVVApSWOBzjwN6Y91nceLoxyGAMuY?=
 =?us-ascii?Q?+PN1lPhLSckrXeJZ/bHlQP0VSR1nd1eaOvqSn9Ol/oGf8dDmlTbNWzjcMMQP?=
 =?us-ascii?Q?xGAtWo4tEygExA6raz0mbehJyjr2IGZUtcet0KoazOCkDVK3nMBrMQlKJ0xx?=
 =?us-ascii?Q?IsZ8trlryIEnaOp0gjl8GRc2curXpLx6Ux9AzcSmbwpSDn30zVd8J2Ulq8wf?=
 =?us-ascii?Q?PhiTdA=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 319fbc3c-d980-4e9f-ae3b-08db6105517e
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 11:59:27.4132
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8bdMp7Id/KpjET3g2ZTNT5F+dTrqZshvKqJtDECq29/THX7Oy8NnVVftQtccdXXXai1bIacnWr3PwAI+7VB/sYNJo2RmIhW1pAhasEoPxak=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3820
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, May 29, 2023 at 06:12:42PM +0200, Richard Gobert wrote:
> The GRO control block (NAPI_GRO_CB) is currently at its maximum size.
> This commit reduces its size by putting two groups of fields that are
> used only at different times into a union.
> 
> Specifically, the fields frag0 and frag0_len are the fields that make up
> the frag0 optimisation mechanism, which is used during the initial
> parsing of the SKB.
> 
> The fields last and age are used after the initial parsing, while the
> SKB is stored in the GRO list, waiting for other packets to arrive.
> 
> There was one location in dev_gro_receive that modified the frag0 fields
> after setting last and age. I changed this accordingly without altering
> the code behaviour.
> 
> Signed-off-by: Richard Gobert <richardbgobert@gmail.com>

...

> diff --git a/net/core/gro.c b/net/core/gro.c
> index 2d84165cb4f1..91454176a6d8 100644
> --- a/net/core/gro.c
> +++ b/net/core/gro.c
> @@ -460,6 +460,14 @@ static void gro_pull_from_frag0(struct sk_buff *skb, int grow)
>  	}
>  }
>  
> +static inline void gro_try_pull_from_frag0(struct sk_buff *skb)

Hi Richard,

In general it is preferred not to use the inline keyword in C files,
but rather let the compiler do it's thing.

Unless you think the compiler isn't doing it's thing very well
in this case, please consider removing the inline keyword.

> +{
> +	int grow = skb_gro_offset(skb) - skb_headlen(skb);
> +
> +	if (grow > 0)
> +		gro_pull_from_frag0(skb, grow);
> +}
> +
>  static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head)
>  {
>  	struct sk_buff *oldest;

...