From patchwork Tue Nov 22 23:27:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coco Li X-Patchwork-Id: 24629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2495226wrr; Tue, 22 Nov 2022 15:39:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf66QjkG7FrRZNpdZvqKLABgLQ9k8SY2Jm+oU6J1IDfGbxtZ1vbk2crj83VZcuhn2AHMUoI1 X-Received: by 2002:a17:907:9879:b0:7ac:9917:c997 with SMTP id ko25-20020a170907987900b007ac9917c997mr20565083ejc.463.1669160375170; Tue, 22 Nov 2022 15:39:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669160375; cv=none; d=google.com; s=arc-20160816; b=tAFnDel0Kw4t0LtdNhzkjx7crv/NX3Ueod7H4HnYaTAOmRKU5t0Hfvwa7aA6mlUJkg +Cm2YpEmxNy6+FV8iI8Vrb+0YC4qwAOn5h7CHZ+fPpSEkgAr8v77hr4+mH6zaSFVla46 WOqmZa1gmGfdyI8W/hYS/QAuYyAEmLuWn8tWd8M7Qk2CW+Xr24QrH1ziG17RrZFsqbA1 I3H7DoPy1MMa0IYSZwODFC4f7p+CcYlPonutTWSxh3Ry7LAorvCHHpSu63YjaP4ke2Nx ehvB3fFpCbVzddFn5HvDSnpq1tYfkZaRNTFI/xfotlUMZ5LMqqmlwxcBBV/hQ/HeyxPc gYqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=N4Pb5W255LH0BWY4yuGbMLQMKFxJAPzH0I4oKHVGlwI=; b=gDJv+lpHLm8uYVkO/3DG5ZBSPYIAZSw7vokJoo6e9wpIOBuTjljKzV7d72ItTCbB3e NOP5jbxCAoQyg9Y32VFOldJ9aaokCsd5WWag6FCL4oUgC8u4JpznDuryGGhAzIVhOYat XQPse85IEorMyZ//SEgVT4EJD/iAWpk1JQfhSbpkEoJhOVnQoF2T+NraP37e95CrLRZG TcXNgqqhh+F6fjZUiyyC3+/hxMY0RWIkvRlDayXVCfiMb3MJhXwkUxJdeN7/GHFXBZWb FM9NO3bfSMc4nG8syNBOOmtiBPL06soeTqa14YUU8ae0LNPENeYnAU11tzk5l/X1VB9E +OJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=tVENbIig; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ml21-20020a170906cc1500b0073d71124609si2152425ejb.182.2022.11.22.15.39.11; Tue, 22 Nov 2022 15:39:35 -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=@google.com header.s=20210112 header.b=tVENbIig; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235287AbiKVX1t (ORCPT + 99 others); Tue, 22 Nov 2022 18:27:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235218AbiKVX1p (ORCPT ); Tue, 22 Nov 2022 18:27:45 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B017814020 for ; Tue, 22 Nov 2022 15:27:44 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id f71-20020a25384a000000b006dd7876e98eso14797367yba.15 for ; Tue, 22 Nov 2022 15:27:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=N4Pb5W255LH0BWY4yuGbMLQMKFxJAPzH0I4oKHVGlwI=; b=tVENbIig4zypZwKmQ8inC+vVevHwdkxN3+2CDSJoyit+ZLSa3OQ4M0yZm3xuNJO/iV pvnLbIBWaitur/9N2aB6j/szXg4KaoROCYpX4flHftkXwcK66thm3kcTyd9bnlipNvSp PWPoohMT/PRh0llw7fLXgxR7OhfPTw7AJrhwAlpxgp6UAFE0IaCqZtX8mubLKclEz6wc 2O4cPZ0Cl0jpm+/fTry6Zz5GDpQNezmUf/49rA72ZIM4HFA+XHecxlsB3MMRZ0OoLlJH Vc09rEmxO4npluR0WxsxMhFasByZzrilkdWYFt8ntObt6mdFvGtnhr3GuYwcmN8npbbc Q87Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=N4Pb5W255LH0BWY4yuGbMLQMKFxJAPzH0I4oKHVGlwI=; b=2//J4ULLBrrm/y8lYFWOMpSiQBLJ/cYw4ul7rDuejKpgjD92hGYO61iNNm9vUbfmv9 F2XmpSqC78Jlgpdd/GZ7ozPTERDfbmOeey+QzpmlNIBu6tV2nE97Ak5YZ1Cjyp9gReoo HTlzQPMIYpgBuQnpl99HBkd+xgiDKGcjDOSA/Vs7gpd4YRAzO4Om80lvRgE+6QXK8F/p BhwBeJVuVSFGTHbEZCQMjIAbr6y7OVb2OoyUbSDXhdEnivmuDZ2pfqxvNhiZtNQV4u/l 98ESvjffxbcSEO304Rwdto8UTppW8aGaKdIQR7W/n9Jghb8Rscr03iwAyjIuHPpUyH0t nq1A== X-Gm-Message-State: ANoB5pnrD8gUKyX4aqFK0ikw6bv4IM5tMhZWJU1fSmiZN5Q7a8QUz0Z7 plRdZmfGPuhncil0O5T502eEleVgjLpuemk= X-Received: from lixiaoyan-desktop.svl.corp.google.com ([2620:15c:2c4:201:d85f:1168:cf63:556b]) (user=lixiaoyan job=sendgmr) by 2002:a25:738a:0:b0:6ca:18d4:db86 with SMTP id o132-20020a25738a000000b006ca18d4db86mr24881575ybc.111.1669159663938; Tue, 22 Nov 2022 15:27:43 -0800 (PST) Date: Tue, 22 Nov 2022 15:27:39 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221122232740.3180560-1-lixiaoyan@google.com> Subject: [PATCH net-next 1/2] IPv6/GRO: generic helper to remove temporary HBH/jumbo header in driver From: Coco Li To: "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Chan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Coco Li X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=no 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?1750241509327965169?= X-GMAIL-MSGID: =?utf-8?q?1750241509327965169?= IPv6/TCP and GRO stacks can build big TCP packets with an added temporary Hop By Hop header. Is GSO is not involved, then the temporary header needs to be removed in the driver. This patch provides a generic helper for drivers that need to modify their headers in place. Signed-off-by: Coco Li --- include/net/ipv6.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index d383c895592a..a11d58c85c05 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -500,6 +500,39 @@ static inline int ipv6_has_hopopt_jumbo(const struct sk_buff *skb) return jhdr->nexthdr; } +/* Return 0 if HBH header is successfully removed + * Or if HBH removal is unnecessary (packet is not big TCP) + * Return error to indicate dropping the packet + */ +static inline int ipv6_hopopt_jumbo_remove(struct sk_buff *skb) +{ + const int hophdr_len = sizeof(struct hop_jumbo_hdr); + int nexthdr = ipv6_has_hopopt_jumbo(skb); + struct ipv6hdr *h6; + + if (!nexthdr) + return 0; + + if (skb_cow_head(skb, 0)) + return -1; + + /* Remove the HBH header. + * Layout: [Ethernet header][IPv6 header][HBH][L4 Header] + */ + memmove(skb->data + hophdr_len, + skb->data, + ETH_HLEN + sizeof(struct ipv6hdr)); + + skb->data += hophdr_len; + skb->len -= hophdr_len; + skb->network_header += hophdr_len; + + h6 = ipv6_hdr(skb); + h6->nexthdr = nexthdr; + + return 0; +} + static inline bool ipv6_accept_ra(struct inet6_dev *idev) { /* If forwarding is enabled, RA are not accepted unless the special From patchwork Tue Nov 22 23:27:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coco Li X-Patchwork-Id: 24630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2495457wrr; Tue, 22 Nov 2022 15:40:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf7rsAuXcl8J+97YO7sWY3EclKOa0ITTtJQ6nCkW48M+VsOC7kJQE3ljF3BP/Er/yqFI2lbf X-Received: by 2002:a17:906:8613:b0:7a6:a48b:5e2a with SMTP id o19-20020a170906861300b007a6a48b5e2amr6151406ejx.338.1669160421189; Tue, 22 Nov 2022 15:40:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669160421; cv=none; d=google.com; s=arc-20160816; b=KxyqoR6ImxyA91jjEviEYDjbaYuZuwlDIWvmZ8ftgAWY0vfQ3yyKs77V3/4Y+MTcx/ Yvoie/04PeP+RvZCmw23E63RAx1UAYh7YctOWPr1Iv72HTn4R1TMjkU2a5lUoLlHPXD9 qa4w0f4K+a65e0EOrTtH+aSdr15ae5kC4bHGaF1/RitusfXloJN3KzphFYawEtjQ/NTW pobj3Xeq8kqA5Wp0tn61Ot+cTPEX8VF3bkFufY9fJWGQn6X+tMrBd0+adOnT7ebQeuGs eA2HwrtW9KA2ZM2hunvR25PGNRi35rp0ymc99RAm1dX+5ukuXgtmNYU6NCTBayiEd0oI VVVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=NW0Mw/qHQ9FIGEA+rYwuphRFxEn0u6CmWZPIH+7Q52E=; b=PBWCRe91EcQHpjipNs2ojcr/Mer+wUFObyAmmIMHXFoKGRf1uizSEEeOodzrAElrI+ u55IC4iUpcvNSJOxZzM6KQUnipensPMbI8IwzNps/DatgorKmVWc4vsL+NjsBvcXcD5l YIM5wkjGxl09rJ66Gt1q2uCEvMA+/EGB4AufC0G48r6+0X3nZEwa46nmtVg4z62TnCV1 memuaGSLF2GT7n7nGRpwrmuwnyfgZOrNoeKKXTCfRiH9wx9z4x3XA3QTd7I0vZKCjGoJ PGRZwIzEADQS8Dek7lI9P0cjuOqcOhCOo1nMAhN3/+LSRYp5Q9sSp9o5SKdhp2Y0XTe9 Q3Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=mWqj5WIG; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t16-20020a056402525000b00461e322ec5dsi10496170edd.294.2022.11.22.15.39.57; Tue, 22 Nov 2022 15:40:21 -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=@google.com header.s=20210112 header.b=mWqj5WIG; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235218AbiKVX1y (ORCPT + 99 others); Tue, 22 Nov 2022 18:27:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235141AbiKVX1r (ORCPT ); Tue, 22 Nov 2022 18:27:47 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E49F12D09 for ; Tue, 22 Nov 2022 15:27:47 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id u7-20020a170902e5c700b0018937578945so1644794plf.10 for ; Tue, 22 Nov 2022 15:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NW0Mw/qHQ9FIGEA+rYwuphRFxEn0u6CmWZPIH+7Q52E=; b=mWqj5WIGBem1iF+Uk/grB8x8EBaHVrCqMst6wuBLbGsWFpcwg+0fjzV9JQK2aDAN8W xTMUgEpVk41qOs3xRDyaN7pEsURTZ6OAgqiq5vc7RvB7TqK5PdZ7Dcv06XWTDzisLGAg 2NL5ofiKWD4bNvZjZ8zmLfcgapnRv8QDEY0Ov3pgqB80koLDwTAc3ndTJURU2MxqDDHL mrD5iMu6wziBSyEHRNKsL2krLSIIEbBF8MIjSQDABCHRVDlZa8lOUBfUNZhGZKEuj6Ai CWWR+astAj3Rv2vb2LxH+ECOYl0y8PP3qDGAWkSVbhBqYX/f/SaUSAR2dtEU5c3kXdTx KGEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NW0Mw/qHQ9FIGEA+rYwuphRFxEn0u6CmWZPIH+7Q52E=; b=fPhkfVvn0TVVHRllpPOFglf03zMPVOegrLzAqr10FO7Pw2G+o5FY5U/ikHWuDNv/2F IFadk9qjvsfoYIn+cuQgohxjEOoK6dNeJTjXp2JbrTfx6T/eBbC47ZIydXV+KpJEtNgf bLDXN2FMan0IvXl2fLuiRXgxeYXw5M4O0RnamY4Et+M8974b6KRggO1UgQgzYzGPm/nB 5/Ys/82h7kl2jv5/PX6Zkd9wQvMMz/qkYkL5PiJvmfjuPldqS161qQbQe0lHwEyjcrS6 W4ead86kV6o5+3L6AwKwnxbt4QayMYCDu7OuKp+UO6auyAGKzl1qZu3h8rDamvZAjQ6x o0pw== X-Gm-Message-State: ANoB5pn5c8hX/R5sQ2r9kQiUnhlTIngVKOZE5wtHop/COFxRzkrSRSiR ObzqzHFhwC7roH5Zs5JbbHpsGUFZHQ0iiMY= X-Received: from lixiaoyan-desktop.svl.corp.google.com ([2620:15c:2c4:201:d85f:1168:cf63:556b]) (user=lixiaoyan job=sendgmr) by 2002:a05:6a00:301b:b0:56e:1ce2:c919 with SMTP id ay27-20020a056a00301b00b0056e1ce2c919mr11190807pfb.78.1669159666639; Tue, 22 Nov 2022 15:27:46 -0800 (PST) Date: Tue, 22 Nov 2022 15:27:40 -0800 In-Reply-To: <20221122232740.3180560-1-lixiaoyan@google.com> Mime-Version: 1.0 References: <20221122232740.3180560-1-lixiaoyan@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221122232740.3180560-2-lixiaoyan@google.com> Subject: [PATCH net-next 2/2] bnxt: Use generic HBH removal helper in tx path From: Coco Li To: "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Chan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Coco Li X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=no 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?1750241557887256015?= X-GMAIL-MSGID: =?utf-8?q?1750241557887256015?= Eric Dumazet implemented Big TCP that allowed bigger TSO/GRO packet sizes for IPv6 traffic. See patch series: 'commit 89527be8d8d6 ("net: add IFLA_TSO_{MAX_SIZE|SEGS} attributes")' This reduces the number of packets traversing the networking stack and should usually improves performance. However, it also inserts a temporary Hop-by-hop IPv6 extension header. Using the HBH header removal method in the previous path, the extra header be removed in bnxt drivers to allow it to send big TCP packets (bigger TSO packets) as well. If bnxt folks could help with testing this patch on the driver (as I don't have access to one) that would be wonderful. Thank you! Tested: Compiled locally To further test functional correctness, update the GSO/GRO limit on the physical NIC: ip link set eth0 gso_max_size 181000 ip link set eth0 gro_max_size 181000 Note that if there are bonding or ipvan devices on top of the physical NIC, their GSO sizes need to be updated as well. Then, IPv6/TCP packets with sizes larger than 64k can be observed. Signed-off-by: Coco Li --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 0fe164b42c5d..2bfa5e9fb179 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -389,6 +389,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_BUSY; } + if (unlikely(ipv6_hopopt_jumbo_remove(skb))) + goto tx_free; + length = skb->len; len = skb_headlen(skb); last_frag = skb_shinfo(skb)->nr_frags; @@ -13657,6 +13660,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->features &= ~NETIF_F_LRO; dev->priv_flags |= IFF_UNICAST_FLT; + netif_set_tso_max_size(dev, GSO_MAX_SIZE); #ifdef CONFIG_BNXT_SRIOV init_waitqueue_head(&bp->sriov_cfg_wait); #endif