From patchwork Mon Jan 30 13:05:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Gobert X-Patchwork-Id: 50278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2172930wrn; Mon, 30 Jan 2023 05:17:14 -0800 (PST) X-Google-Smtp-Source: AK7set9Pr6lcentNv9RTvx1pWnY/mKSMY8ToNruZWuwJAxTF/NU0YnG4BQiPQTi2QNBFcUZWuRzV X-Received: by 2002:a05:6a20:42a7:b0:af:6d54:239a with SMTP id o39-20020a056a2042a700b000af6d54239amr10178062pzj.38.1675084634125; Mon, 30 Jan 2023 05:17:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675084634; cv=none; d=google.com; s=arc-20160816; b=qC/p/xdxICZkPe1n5Ni92PQVDiPkD+RwrRIAobqxwrrUWQAIjB50Bh8NWX4QzBVg07 R+R74+McXBYXLiwWiLci7m9weXGXSiEUmpmoQrxDL7rJu/o9Np8NlfXTMlPzFlYlbCnD q+zVa63vbq63PGgRo/BdwGDFOfwz2V3Y8TuGzDtP08GAsl5pu5FHb6yY0Z6KNyTPXLCn TyGiscEtCTiTXgHneqSWRbnPqODPCdPkrUazqmqvjPme4rLyWhGLXO4RJyysJg5Efkq/ /sSDI7bx5vjXLYA39O6Hi7JvyzcO+8BTOoZuJQ967YuemfXtVeaTaypDWwaUgqVPT6CX jxSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=7qD/pdat3Z43T3M0lNL9fDEciQ6LrvxQWEvx14VXeP8=; b=zm6E6VK9rSkS0paEj5uf/xahfC5mTfrGn1Rz0KryJZKl9IT545AzX+PRhA6u8c7anM +4fqCykSFgeBfwM1rHfaw9iMN/k62rTBqYx48iAyferqDZs3InK5G0rdWaE7ZsCepbLe tOvxySleHw88Mjr8if553O83djb3HuvISR+xnUFfZYmhddy7kVI+52uYbQq+bK01CbW9 b9zgzJQgMf4Ez46mwRNoyyqasglWktJIiKaN+/Ojqs0tODGwAwOEwyQNRs20p0BIj7QP 3CEdJ993Xv9ZLcLuAXNnvF+uBvCFvQZEbUrO1dUgzvIfA8JVfxPUYyNAkYVqRXO6qckB 2elQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gjRaS84Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q25-20020a639819000000b0042b4defce13si11466264pgd.344.2023.01.30.05.17.01; Mon, 30 Jan 2023 05:17:14 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gjRaS84Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235896AbjA3NFt (ORCPT + 99 others); Mon, 30 Jan 2023 08:05:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236738AbjA3NFn (ORCPT ); Mon, 30 Jan 2023 08:05:43 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F39713D71; Mon, 30 Jan 2023 05:05:42 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id q8so7937524wmo.5; Mon, 30 Jan 2023 05:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:to:from:date:from:to:cc:subject:date:message-id :reply-to; bh=7qD/pdat3Z43T3M0lNL9fDEciQ6LrvxQWEvx14VXeP8=; b=gjRaS84ZPKdBQsHb/ICv8kEYXFYmEjHkHmXCeve3hgG9v/Iqk8bmRpfaOFBCxKiYeo UO5tY1sgl/oO12Ix51KZjkcKCgsXaGOKH63W9/uKq/slY94spZJdiUVhn+gTwou5LitP wzSZimVl4Gn+6VT+lg4YkjW/rNdFq5pUUYXM8nRW103X/kukDppxTuvPKIPGchwbvd8p KoVUaFSmpr5LnktCFgQyipILZOiK4vODHdi/8FhsYiYczs6LTW69Ad5/Pjn5PppJa6db MmF/x0SOvnaADXNg76j41LCKwNRM8GfVNiaBfY3WFTmiI8YraP9ajB2wQs3YXsU7mX9+ EFbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7qD/pdat3Z43T3M0lNL9fDEciQ6LrvxQWEvx14VXeP8=; b=Ubo5WXw5qG4ajRFcygwMCTZCu/zpdZRIL7tMZQZPKVfCW5YJXC/nKLobqgHhJiEutj nXx7R2TcPktnJtPzNY2zHOW2IpvXY54hIlwxcXNlGyChNYPtmmdLNm7co8hIum+/utT0 L+dqVEEB6HfGcWH93QaqTO8UMA+l5xLvI56X8tBkMzE3PHvWiZAVpbApMyspU6vfymoJ 5uEBo68JNQe+odhptgtZLUVqkrP03lM45eWsQLVkMmrnn8tUPf8T/IHz9PxTlAV9eKhF HQa6+OuWde4dEUZv8nMGk7hEB1q+/Cb/GJa7uDKqhU9wDxh4M3NsDWjCaySX6+bCFZZN B4RA== X-Gm-Message-State: AO0yUKXrY12mPmetyViWqvLy5CixOTIuGfhmttIF5lgntmf7BJocVhkv v5wjgoMWQQpm2Iyf7sBl2/Y= X-Received: by 2002:a05:600c:4e89:b0:3dc:198c:dde with SMTP id f9-20020a05600c4e8900b003dc198c0ddemr20188150wmq.41.1675083940520; Mon, 30 Jan 2023 05:05:40 -0800 (PST) Received: from debian ([89.238.191.199]) by smtp.gmail.com with ESMTPSA id g8-20020adfe408000000b002bdda9856b5sm11991793wrm.50.2023.01.30.05.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 05:05:40 -0800 (PST) Date: Mon, 30 Jan 2023 14:05:11 +0100 From: Richard Gobert To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, yoshfuji@linux-ipv6.org, dsahern@kernel.org, steffen.klassert@secunet.com, lixiaoyan@google.com, alexanderduyck@fb.com, leon@kernel.org, ye.xingchen@zte.com.cn, iwienand@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] gro: decrease size of CB Message-ID: <20230130130509.GA7974@debian> References: <20230130130047.GA7913@debian> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230130130047.GA7913@debian> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756453545267629402?= X-GMAIL-MSGID: =?utf-8?q?1756453545267629402?= 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 --- include/net/gro.h | 26 ++++++++++++++++---------- net/core/gro.c | 18 +++++++++++------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index a4fab706240d..7b47dd6ce94f 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -11,11 +11,23 @@ #include struct napi_gro_cb { - /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */ - void *frag0; + union { + struct { + /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */ + void *frag0; - /* Length of frag0. */ - unsigned int frag0_len; + /* Length of frag0. */ + unsigned int frag0_len; + }; + + struct { + /* used in skb_gro_receive() slow path */ + struct sk_buff *last; + + /* jiffies when first packet was created/queued */ + unsigned long age; + }; + }; /* This indicates where we are processing relative to skb->data. */ int data_offset; @@ -32,9 +44,6 @@ struct napi_gro_cb { /* Used in ipv6_gro_receive() and foo-over-udp */ u16 proto; - /* jiffies when first packet was created/queued */ - unsigned long age; - /* Used in napi_gro_cb::free */ #define NAPI_GRO_FREE 1 #define NAPI_GRO_FREE_STOLEN_HEAD 2 @@ -77,9 +86,6 @@ struct napi_gro_cb { /* used to support CHECKSUM_COMPLETE for tunneling protocols */ __wsum csum; - - /* used in skb_gro_receive() slow path */ - struct sk_buff *last; }; #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb) diff --git a/net/core/gro.c b/net/core/gro.c index 506f83d715f8..869823d9e8bc 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -449,6 +449,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) +{ + 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; @@ -478,7 +486,6 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff struct sk_buff *pp = NULL; enum gro_result ret; int same_flow; - int grow; if (netif_elide_gro(skb->dev)) goto normal; @@ -553,17 +560,13 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff else gro_list->count++; + gro_try_pull_from_frag0(skb); NAPI_GRO_CB(skb)->age = jiffies; NAPI_GRO_CB(skb)->last = skb; if (!skb_is_gso(skb)) skb_shinfo(skb)->gso_size = skb_gro_len(skb); list_add(&skb->list, &gro_list->list); ret = GRO_HELD; - -pull: - grow = skb_gro_offset(skb) - skb_headlen(skb); - if (grow > 0) - gro_pull_from_frag0(skb, grow); ok: if (gro_list->count) { if (!test_bit(bucket, &napi->gro_bitmask)) @@ -576,7 +579,8 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff normal: ret = GRO_NORMAL; - goto pull; + gro_try_pull_from_frag0(skb); + goto ok; } struct packet_offload *gro_find_receive_by_type(__be16 type) From patchwork Mon Jan 30 13:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Gobert X-Patchwork-Id: 50282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2176870wrn; Mon, 30 Jan 2023 05:26:33 -0800 (PST) X-Google-Smtp-Source: AK7set/ujKHfg2vb7be32Q8K7n+5QNV5PRJ3nMYqba5jnWP4fIVVHP1015QjWLUVxObYOoy6Zd9/ X-Received: by 2002:a05:6a20:8f1f:b0:bd:17a4:c33c with SMTP id b31-20020a056a208f1f00b000bd17a4c33cmr3872310pzk.32.1675085193254; Mon, 30 Jan 2023 05:26:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675085193; cv=none; d=google.com; s=arc-20160816; b=nczC+rAYyq5bRPMB4Ya+qj9DbhCMmJf5QyT5feXN4hsITJ+MDVkxQ8FrBx9ZPlIN/f QvfANg2EMpTPXYkPD+5ywRATqSVLIMcEFT03cmMyCIQ28ytr7TcfHdMNczr8URNDGkIZ 7mC4uc5PEiqakSX4Cmgz16jaQW9G0Rf2cGWiC2uq/ltFyNb1a2kpZoFEmydgMnLO44jC Kd62u5vB79X58denKNoWdN8fm1I1Y7Jl7Tv0otu7nuN9R4QDX54RDxY1bhYx9uk4ros2 ttmG2TDHu42CMrJc/WY69ft3u1MwOthVC+9RI2KmCPGlqRGCejpCcE7WbA+eiybaF2eA 0Bgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=NMug5rn4eBbCzTuP14/117PPtm8gZaNRz7jfLdaZaSE=; b=TCbVPDuvssiCwTmaB+kKCpp8eYL3GVNEmYWBuC/NrPHApJxVda7M0vXXEvcAsQ4dct QOyigf9CWW3puRUno70Ssr0+wTy+BxRXK2bk9xkPJIZVm8aMYux5R0LgoY4hNYJL9i2v jh6DWpLJV4I9yiLywpeb6CsuxvcsTggXSEc9MHOgslo7xyOw5/Pldn4MT+sTr/pUDjrN wq+RE7m21oFeGbehwI1JC5JShyTe4gDsBbo1f/zev9+saYVlQz3i1CyzmkCOObZLeK1Q C66b+jLUpiHUvdU8CEdsj9y3dfz0UWkOhrk3aMHsTppF6tSHrBRPT3dzXZSJRdQuu3Lc KaIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="H/UESY5g"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q24-20020a637518000000b004e364321cc7si7917191pgc.225.2023.01.30.05.26.20; Mon, 30 Jan 2023 05:26:33 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="H/UESY5g"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235932AbjA3NIo (ORCPT + 99 others); Mon, 30 Jan 2023 08:08:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235425AbjA3NIm (ORCPT ); Mon, 30 Jan 2023 08:08:42 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19EA238E82; Mon, 30 Jan 2023 05:08:26 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id k8-20020a05600c1c8800b003dc57ea0dfeso1994941wms.0; Mon, 30 Jan 2023 05:08:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:to:from:date:from:to:cc:subject:date:message-id :reply-to; bh=NMug5rn4eBbCzTuP14/117PPtm8gZaNRz7jfLdaZaSE=; b=H/UESY5g+1hFVoQBanMALjhu4XqvZnKRhCA9betXDXWKEmsQe+rh0YPJcuO+F08OwU rvIgrbVGO/7L/4Fs68W+E3nJF5bJGUZTyHLUyf3VnfYxHi3NwSAzentarHJdbrcsY8dw 7u+kAkccotcF7Cc07M0btvTPT0jhM0KN5IFMkW5zlnsqus4itC8DaUE63TnZpJS97kLp yfRF8ulFo1CHRIfIAM0yNshreTGwkvVr1fJX0Urm7rD0X/wE8PbRYVvBZuNEzIjICq9a VQXP0wkUwdPTVWgseR/xYSOraeHl1op4jX7l7aCN/dsWg3S0YaRayP3jajP2t0BcPRwT n0sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NMug5rn4eBbCzTuP14/117PPtm8gZaNRz7jfLdaZaSE=; b=f7+nhexEzyd2tl8Eg5My7rEna+joSTCLnvLktsx22rksS5Mk4OyGhRtR8zzbjDu8g0 KWDLLDMCSxCFfWjJ3P4Zls9eyYxc+zVDPVy5dat3oLi00FYGPdJMqhEPDg8FyGLN7YNh 2yG8YIZzsJ3ydSAa8+88XYXNPhfqcZw1B7bsHcnr6i9G77Szs7OWQyf18chUH/CdMx0C PVcY68fccb6/4L1+hkDqi/In/n+Aam+DtmOZW1t+3zaJQ2BRDnVgI8/5zOxD9kBHoSOX JLAy2QKahLCUhGp8Qfshp1jc+pQc2idFlFpGCWOZTP0YpCyhtcnWMQJR2IMJx0ntCwxM BbkA== X-Gm-Message-State: AO0yUKXICNrzEP8J6Xg7cSRcXJphqokXykPGo2iIVKkU3PeyEwtGCFbR c2B0v4AlhZCxFeILqkDy+Dw32q9+S/Y= X-Received: by 2002:a05:600c:12c6:b0:3dc:59a5:afc7 with SMTP id v6-20020a05600c12c600b003dc59a5afc7mr3411304wmd.20.1675084104638; Mon, 30 Jan 2023 05:08:24 -0800 (PST) Received: from debian ([89.238.191.199]) by smtp.gmail.com with ESMTPSA id 2-20020a05600c028200b003dc4baaedd3sm7282532wmk.37.2023.01.30.05.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 05:08:24 -0800 (PST) Date: Mon, 30 Jan 2023 14:07:55 +0100 From: Richard Gobert To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, yoshfuji@linux-ipv6.org, dsahern@kernel.org, steffen.klassert@secunet.com, lixiaoyan@google.com, alexanderduyck@fb.com, leon@kernel.org, ye.xingchen@zte.com.cn, iwienand@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] gro: optimise redundant parsing of packets Message-ID: <20230130130752.GA8015@debian> References: <20230130130047.GA7913@debian> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230130130047.GA7913@debian> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756453214308186278?= X-GMAIL-MSGID: =?utf-8?q?1756454131340492764?= Currently, the IPv6 extension headers are parsed twice: first in ipv6_gro_receive, and then again in ipv6_gro_complete. The field NAPI_GRO_CB(skb)->proto is used by GRO to hold the layer 4 protocol type that comes after the IPv6 layer. I noticed that it is set in ipv6_gro_receive, but isn't used anywhere. By using this field, and also storing the size of the network header, we can avoid parsing extension headers a second time in ipv6_gro_complete. The implementation had to handle both inner and outer layers in case of encapsulation (as they can't use the same field). I've applied this optimisation to all base protocols (IPv6, IPv4, Ethernet). Then, I benchmarked this patch on my machine, using ftrace to measure ipv6_gro_complete's performance, and there was an improvement. Signed-off-by: Richard Gobert --- include/net/gro.h | 8 ++++++-- net/ethernet/eth.c | 11 +++++++++-- net/ipv4/af_inet.c | 8 +++++++- net/ipv6/ip6_offload.c | 15 ++++++++++++--- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index 7b47dd6ce94f..d364616cb930 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -41,8 +41,8 @@ struct napi_gro_cb { /* Number of segments aggregated. */ u16 count; - /* Used in ipv6_gro_receive() and foo-over-udp */ - u16 proto; + /* Used in eth_gro_receive() */ + __be16 network_proto; /* Used in napi_gro_cb::free */ #define NAPI_GRO_FREE 1 @@ -86,6 +86,10 @@ struct napi_gro_cb { /* used to support CHECKSUM_COMPLETE for tunneling protocols */ __wsum csum; + + /* Used in inet and ipv6 _gro_receive() */ + u16 network_len; + u8 transport_proto; }; #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb) diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 2edc8b796a4e..d68ad90f0a9e 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -439,6 +439,9 @@ struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb) goto out; } + if (!NAPI_GRO_CB(skb)->encap_mark) + NAPI_GRO_CB(skb)->network_proto = type; + skb_gro_pull(skb, sizeof(*eh)); skb_gro_postpull_rcsum(skb, eh, sizeof(*eh)); @@ -456,12 +459,16 @@ EXPORT_SYMBOL(eth_gro_receive); int eth_gro_complete(struct sk_buff *skb, int nhoff) { struct ethhdr *eh = (struct ethhdr *)(skb->data + nhoff); - __be16 type = eh->h_proto; + __be16 type; struct packet_offload *ptype; int err = -ENOSYS; - if (skb->encapsulation) + if (skb->encapsulation) { skb_set_inner_mac_header(skb, nhoff); + type = eh->h_proto; + } else { + type = NAPI_GRO_CB(skb)->network_proto; + } ptype = gro_find_complete_by_type(type); if (ptype != NULL) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 6c0ec2789943..4401af7b3a15 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1551,6 +1551,9 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) * immediately following this IP hdr. */ + if (!NAPI_GRO_CB(skb)->encap_mark) + NAPI_GRO_CB(skb)->transport_proto = proto; + /* Note : No need to call skb_gro_postpull_rcsum() here, * as we already checked checksum over ipv4 header was 0 */ @@ -1621,12 +1624,15 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) __be16 newlen = htons(skb->len - nhoff); struct iphdr *iph = (struct iphdr *)(skb->data + nhoff); const struct net_offload *ops; - int proto = iph->protocol; + int proto; int err = -ENOSYS; if (skb->encapsulation) { skb_set_inner_protocol(skb, cpu_to_be16(ETH_P_IP)); skb_set_inner_network_header(skb, nhoff); + proto = iph->protocol; + } else { + proto = NAPI_GRO_CB(skb)->transport_proto; } csum_replace2(&iph->check, iph->tot_len, newlen); diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 00dc2e3b0184..79ba5882f576 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -227,11 +227,14 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, iph = ipv6_hdr(skb); } - NAPI_GRO_CB(skb)->proto = proto; - flush--; nlen = skb_network_header_len(skb); + if (!NAPI_GRO_CB(skb)->encap_mark) { + NAPI_GRO_CB(skb)->transport_proto = proto; + NAPI_GRO_CB(skb)->network_len = nlen; + } + list_for_each_entry(p, head, list) { const struct ipv6hdr *iph2; __be32 first_word; /* */ @@ -358,7 +361,13 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) iph->payload_len = htons(payload_len); } - nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops); + if (!skb->encapsulation) { + ops = rcu_dereference(inet6_offloads[NAPI_GRO_CB(skb)->transport_proto]); + nhoff += NAPI_GRO_CB(skb)->network_len; + } else { + nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops); + } + if (WARN_ON(!ops || !ops->callbacks.gro_complete)) goto out;