From patchwork Wed Feb 22 15:07:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Gobert X-Patchwork-Id: 60571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp631098wrd; Wed, 22 Feb 2023 07:13:24 -0800 (PST) X-Google-Smtp-Source: AK7set/q0XBMNqDSc3+kBi71QBKjMfsP+Hei80x9fvxTb5j3yDOs++Gsr1VZneONItiAb6tiCuTU X-Received: by 2002:a17:906:8a49:b0:8b2:5e3c:e0f0 with SMTP id gx9-20020a1709068a4900b008b25e3ce0f0mr19272490ejc.74.1677078804669; Wed, 22 Feb 2023 07:13:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677078804; cv=none; d=google.com; s=arc-20160816; b=K2w2c68Hk3fE85viEwwE+lyWsVRCD56T9O7FgLT2YoH319x+SzcRIzK+Bw+p+tr0Z8 Q+GwphQQzkoEKE3m+Ob93BYJ7p28avn5wS+IxCHATUnL03BvE81bBXhLME9HUokUj6hb edB8U2OXjoHaWazomVe3qI/jk1Gk5gSAmv5RiheOi9WlCEiOsk02zDKmCVlUc0LM09LG PLpiZM0pok4CFA2uqq2+2AxAnDcGX7S2Yw9bh74Qgyjho3HXnIfoN9dzX8C5d+HlWPep /ewbo6oBgbRLQSePtH7vP7mXqbdivnnj8QCLxyghZEF6hxHGUCQV1jBaKhx5FMD/O1nA t8jA== 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=PcYQsUm0jjlmo43M4POJwhiWEz4azA7qERkEfeTiNBY=; b=I5KA94kR6o2o1JLOd0bU6iZyNI+Amv21Yy3Ni4A8C1BeUsENeryQm96oPZaUh220TJ bN7HGjfo6LHrn9opIoSJUM9ratDA3anfEj4HWYaq4Y5l1a+CM+Y0kENeS8Xuazct6QHU 2+nO0GLjnfueAMpzn4Z0ev1MSDsMwJskHdirzoiJNfFyYC7EnoSeOIgGnz71hm3W7enq XDVHy7h5uTq/gd1SI0Yj22rMEgPtJy4/XY4lNRpxxraS0DkoY9iRB77CxLGeXmySdAuH ofPeiHsd3U2u0S/BrgcyFWDVJV8+EYwMC9ZXfAoIso6PhQeIkurBr8mdlohLA1D75phq seaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="GFd/yPlm"; 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 up26-20020a170907cc9a00b008cfb2ae5e81si11567347ejc.625.2023.02.22.07.13.01; Wed, 22 Feb 2023 07:13:24 -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="GFd/yPlm"; 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 S232281AbjBVPIJ (ORCPT + 99 others); Wed, 22 Feb 2023 10:08:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231939AbjBVPII (ORCPT ); Wed, 22 Feb 2023 10:08:08 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CEB422000; Wed, 22 Feb 2023 07:08:06 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id p18-20020a05600c359200b003dc57ea0dfeso6616107wmq.0; Wed, 22 Feb 2023 07:08:06 -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=PcYQsUm0jjlmo43M4POJwhiWEz4azA7qERkEfeTiNBY=; b=GFd/yPlmEDKU2ReV92ojhaqy0DRjsyWU17pkSCG0+yFl9/s3DORhMU/7nKbRy0ONJQ 4w/F1oOS/6xkXXrk1KZ/+uh2ZAAn0l3Y3Q387A1ogrvxTFlEGDASc3sNcyJUae4fo/sQ gHrkV3eFE8vuVGHxMo1Ia2gbMSD+qOMr/NQJiLletOk96d3yc9xaTv0iZaQPJk1ccTiL qNpt+2/LcsKoD9lp6d28ZaSssoElxl03W7HT4mCryYHWMkOGUfGyaAPpkMH/z8Pjvh8O feoVjkC0LuFCkyR/NI6JrBGCLHiYQ15AzI+HIw7ETj+R/RiajPJFHcQfYMPLHCYUP3No Di+g== 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=PcYQsUm0jjlmo43M4POJwhiWEz4azA7qERkEfeTiNBY=; b=2nVz37mAGLDob4XiUnAtu4/JOjkc7TvK0J5Rhae/zcyFxb/G5BvwWLHEEBY8leQ6U4 RqN6lp+yGKLNgsA5uStW8GPvj7yX5F1PgXtiOwjvajNo74fyJ0IRTP2465FvKe4mBfdM XCZ1k9uPAvG2QwJOK3zPHiUEPVFzeS8HqITsce7wNuJjJy1DqK7mBkJ0gMDZyfhFhpbG F42VbD8r2tudpnZZLbv8Gd8c3s99yonsOhnadW6Y5Ew0I5jGH8Oyt1GB5fjv32gq8iaj zYE6qIc0aiYFoxy2dYn4RLgWdI0FC+jy3sfmjDs0EwTNrfANaAoZzqh+WBMFnTY0hSyF pCfA== X-Gm-Message-State: AO0yUKUVf6egOJklnQf5fQkWSPe4bWNGAOv1FUmqPANvPiTLuQ/+bBsc U+xMp6X3BVvwPZmgKwj5t4U= X-Received: by 2002:a05:600c:2b0f:b0:3df:dc29:d69 with SMTP id y15-20020a05600c2b0f00b003dfdc290d69mr1519216wme.36.1677078484850; Wed, 22 Feb 2023 07:08:04 -0800 (PST) Received: from debian ([89.238.191.199]) by smtp.gmail.com with ESMTPSA id a22-20020a05600c225600b003e2058a7109sm8439747wmm.14.2023.02.22.07.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 07:08:04 -0800 (PST) Date: Wed, 22 Feb 2023 16:07:42 +0100 From: Richard Gobert To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, alexanderduyck@fb.com, lixiaoyan@google.com, steffen.klassert@secunet.com, lucien.xin@gmail.com, ye.xingchen@zte.com.cn, iwienand@redhat.com, leon@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] gro: decrease size of CB Message-ID: <20230222150740.GA12658@debian> References: <20230222145917.GA12590@debian> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230222145917.GA12590@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?1758544584929522341?= X-GMAIL-MSGID: =?utf-8?q?1758544584929522341?= 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 a606705a0859..b1fdabd414a5 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) +{ + 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; @@ -489,7 +497,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; @@ -564,17 +571,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)) @@ -587,7 +590,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 Wed Feb 22 15:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Gobert X-Patchwork-Id: 60575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp639678wrd; Wed, 22 Feb 2023 07:28:29 -0800 (PST) X-Google-Smtp-Source: AK7set/a6xefWlV30+BX/OWNS3ITiSbymUZsDnNF2paTYrBAaZjILMpFrzT8YLv+dlfZon+P2FfF X-Received: by 2002:aa7:d40c:0:b0:4af:51dc:addb with SMTP id z12-20020aa7d40c000000b004af51dcaddbmr5357896edq.19.1677079709287; Wed, 22 Feb 2023 07:28:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677079709; cv=none; d=google.com; s=arc-20160816; b=qlnv2RD+VGXCut8kitC+PYM02Nd1/yXNiLykXNrr4Og4xMaR2HKENUxQliDO2RlZZE 3VlMr8Kk8b8yLyd18NTOVhrJZQ2Kfvbyp/LiX6gLsUM4gwQ9ZZXSxGMqrn0+Quc1F60P YcdzJEmpGpDD3spXXeHNxoGaX1dXCm44tOo226MdYAHufN9sLq0wfnQciiE9YWAB6UI0 luSUsffuRoTKWHibOGG0nPzyQ0T33BnsAaO6/2R0xiTGi5x6m0lydCa3r21HBu+ltpXs MC6jfKajuEt3MRHFTivDbev5QWmi5L1KqG6pMPuX59h+RXLNdq9OPu0Dck1qG6abHezw p46g== 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=fGph5Raoba9CAF6fBIYY6MSZIRHm6UMtwUQalrVn88o=; b=G5IogTcXCSRzL45K5JvoKAimGesS+sY5/S17UQlQi1mdXifpUuKISfXb4tnRh+Y0gi yXZ7tMN3dR+16ejnYRf6N8Xho2olTqdJPT3D+ouvPPoDSN8m+Iwf61uvKWIofuEXyxAa cTMqhAgEzDrbpkUSLLamAOsPM8Nz5wos8mjMKkaSO84olPvwx+oLfcpMsFdYUQ7TqdHE emxuTAlIvvXj0BYCGyUOtPMJWV9DC8tNAfRUZuP4hC4i/m1nvNGi8zjvd7i9kFXLV1Fi jZVm0IUkS0NcDDyp8yDY5YmJd9Ep64LJJu+fjaBRQ2J2XObJl1Q9GyeUwt9TVJ6NgXr3 4yiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="JfWmM/US"; 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 p23-20020a056402045700b004a21a662064si3474767edw.352.2023.02.22.07.28.05; Wed, 22 Feb 2023 07:28:29 -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="JfWmM/US"; 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 S232321AbjBVPNN (ORCPT + 99 others); Wed, 22 Feb 2023 10:13:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231935AbjBVPNE (ORCPT ); Wed, 22 Feb 2023 10:13:04 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E31AE34F47; Wed, 22 Feb 2023 07:13:02 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id j2so7907140wrh.9; Wed, 22 Feb 2023 07:13:02 -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=fGph5Raoba9CAF6fBIYY6MSZIRHm6UMtwUQalrVn88o=; b=JfWmM/US7NI+suWhR4epn0jG9yVCtlPNZgvEnPqmXU4moemzaZcBPE7RzEncTk1V3k NDkmGVVtu1osrGDVlGtDUuIC1cOchjH92yWOOSlCz9QIs7Lzk4Q59U3QEOfNHwsYb93m IlZD0vkuPEzgUB89olYmx9VVzfakET83oSkf0CAYyGx0cHqVxQO8ftauGzj7GKNWMTxj d/FjpglhyCpwGDSK8Fk4Ox50XWAEaW3Jqx08IpG2G4wtWqkI65RxC2az7yw9kTfFFAin JNdu57PgAC8XIJhnlz1TfWuPLUq3vr4yWMoVhGew4EJFZ1HlX7cNJ7990OH8s63wWlFL 6kGA== 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=fGph5Raoba9CAF6fBIYY6MSZIRHm6UMtwUQalrVn88o=; b=dSs5JMDDYYusSxjYu4z6YbUnDnhHRV/MzbKhtA1ZzBNWtmBaoUt+w4KN66m1pUWIOr lXHzJKSJQA7xZfzFilPYplQ9Xnwy3ZP6sl8x3xgXnyhZXzpSTyTzYLJblRuZtgMoBQvr qrHy5J97J4BgU2Loy+/WawNehjzgPkxxRtniwH96DdkU5zxnRmxGm4kf1qdCdQ7znb5f Ur8CpkoTxFxFqZR+8SNkLCr+FAzcwss++zD3KBPbAAI4xyn8Brp9sn8eJ7mIhdU45nrr 3ub9Nk7LEWIrN3uWIOgqmnOXqUdXCqAOP3fktFI2+sJaWPlRPT24dj9MyRQBCPed61a/ QxnA== X-Gm-Message-State: AO0yUKWYtztsu0j34F3nS8bUoL4424GytVkZ+pGgrPphBjVi326U80P8 NsfMKzbklHsDyDC7prr50+g= X-Received: by 2002:a5d:4e8d:0:b0:2c7:daa:1c56 with SMTP id e13-20020a5d4e8d000000b002c70daa1c56mr928571wru.4.1677078781393; Wed, 22 Feb 2023 07:13:01 -0800 (PST) Received: from debian ([89.238.191.199]) by smtp.gmail.com with ESMTPSA id o1-20020a5d58c1000000b002c53f5b13f9sm8536228wrf.0.2023.02.22.07.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 07:13:01 -0800 (PST) Date: Wed, 22 Feb 2023 16:12:38 +0100 From: Richard Gobert To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, alexanderduyck@fb.com, lixiaoyan@google.com, steffen.klassert@secunet.com, lucien.xin@gmail.com, ye.xingchen@zte.com.cn, iwienand@redhat.com, leon@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] gro: optimise redundant parsing of packets Message-ID: <20230222151236.GB12658@debian> References: <20230222145917.GA12590@debian> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230222145917.GA12590@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?1758545533619744640?= Currently the IPv6 extension headers are parsed twice: first in ipv6_gro_receive, and then again in ipv6_gro_complete. By using the new ->transport_proto field, and also storing the size of the network header, we can avoid parsing extension headers a second time in ipv6_gro_complete (which saves multiple memory dereferences and conditional checks inside ipv6_exthdrs_len for a varying amount of extension headers in IPv6 packets). The implementation had to handle both inner and outer layers in case of encapsulation (as they can't use the same field). Performance tests for TCP stream over IPv6 with a varying amount of extension headers demonstrate throughput improvement of ~0.7%. In addition, I fixed a potential existing problem: - The call to skb_set_inner_network_header at the beginning of ipv6_gro_complete calculates inner_network_header based on skb->data by calling skb_set_inner_network_header, and setting it to point to the beginning of the ip header. - If a packet is going to be handled by BIG TCP, the following code block is going to shift the packet header, and skb->data is going to be changed as well. When the two flows are combined, inner_network_header will point to the wrong place. The fix is to place the whole encapsulation branch after the BIG TCP code block. This way, inner_network_header is calculated with a correct value of skb->data. Also, by arranging the code that way, the optimisation does not add an additional branch. Signed-off-by: Richard Gobert --- include/net/gro.h | 9 +++++++++ net/ethernet/eth.c | 14 +++++++++++--- net/ipv6/ip6_offload.c | 20 +++++++++++++++----- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index 7b47dd6ce94f..35f60ea99f6c 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -86,6 +86,15 @@ struct napi_gro_cb { /* used to support CHECKSUM_COMPLETE for tunneling protocols */ __wsum csum; + + /* Used in ipv6_gro_receive() */ + u16 network_len; + + /* Used in eth_gro_receive() */ + __be16 network_proto; + + /* Used in ipv6_gro_receive() */ + 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..c2b77d9401e4 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)); @@ -455,13 +458,18 @@ 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; struct packet_offload *ptype; + struct ethhdr *eh; int err = -ENOSYS; + __be16 type; - if (skb->encapsulation) + if (skb->encapsulation) { + eh = (struct ethhdr *)(skb->data + nhoff); 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/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 00dc2e3b0184..6e3a923ad573 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -232,6 +232,11 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, 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; /* */ @@ -324,10 +329,6 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) int err = -ENOSYS; u32 payload_len; - if (skb->encapsulation) { - skb_set_inner_protocol(skb, cpu_to_be16(ETH_P_IPV6)); - skb_set_inner_network_header(skb, nhoff); - } payload_len = skb->len - nhoff - sizeof(*iph); if (unlikely(payload_len > IPV6_MAXPLEN)) { @@ -341,6 +342,7 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) skb->len += hoplen; skb->mac_header -= hoplen; skb->network_header -= hoplen; + NAPI_GRO_CB(skb)->network_len += hoplen; iph = (struct ipv6hdr *)(skb->data + nhoff); hop_jumbo = (struct hop_jumbo_hdr *)(iph + 1); @@ -358,7 +360,15 @@ 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) { + skb_set_inner_protocol(skb, cpu_to_be16(ETH_P_IPV6)); + skb_set_inner_network_header(skb, nhoff); + nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops); + } else { + ops = rcu_dereference(inet6_offloads[NAPI_GRO_CB(skb)->transport_proto]); + nhoff += NAPI_GRO_CB(skb)->network_len; + } + if (WARN_ON(!ops || !ops->callbacks.gro_complete)) goto out;