Received: by 2002:a05:6358:f14:b0:e5:3b68:ec04 with SMTP id b20csp4657090rwj; Tue, 20 Dec 2022 13:16:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXsgyiRgrsP+xVNRvFjRNtOWyypDtYGO9TVoCcv5bZihNsKRcycJTHQNAjHPzMxKhJ4B07+7 X-Received: by 2002:a05:6402:1f09:b0:47d:b4e6:a633 with SMTP id b9-20020a0564021f0900b0047db4e6a633mr114138edb.36.1671570976260; Tue, 20 Dec 2022 13:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671570976; cv=none; d=google.com; s=arc-20160816; b=X4xwfCbXzeC+Ad4pa+HUJGINwY0KqyCMitxpB8lwRbJkZUi7ieEeclKMSR5iQpvoPd u2QqtzvNPvyQ2l1HwlTwYhrb58TaPc3QyYzMsCbANxbRiuD1FYy/iISLChRsszcXCNux Re7GM0sZrql+YG9ql6WxrPcgDl+39oUxuPSAuS3PntBI+YuHuDFDamU5NETssOcQU7j7 Wzcdh9azsDr9kFF5roaRDb6Xrocxzb6URmAeiJknW+xLTtx++kzwdoQE6qiXu3kik0lh lRCO71ChDIGnqg0plR6uI1H3+LRkeskRtsQmCCdqxpFqN/8naeoZ7OsSuc8owy7kz1Mx QrMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=8U3eApao12GWve8oDar6sUznovKCP+eRvJkCKrFxhQk=; b=UYUfR4WgmrT0gUNyquBEC1s2/vRfXbDdQXf3/X91rGHchz66095Cj7YKbFVRxmxNbd a1Xdd2i/vjlvB252t6H1QDlxl5orQfcnltwFkY+Nkt8DIoxYZlbBgjbuIX/XvLtEzqCq Bw/7GuHNOjrUFdH2kZCXtVRbn9duAvHryZh9l2CQpesMa9Piqf1l9DxLFMi7jCHvfv8I i+H2MeTrcHly1hfgtUij2vbFMW7+kwY5tXSWQFVLlO+3uXzYJb1RqR7LtwgqvSXrBo7z 8JVafRD0wz8/FiLdlHp1XUr943F8c5ry3lBU5wW1U9vr9pZJfg3SZzpOs7YYtlsAolJS J0WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vmware.com header.s=s1024 header.b="jjd/yi5N"; 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=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c25-20020aa7d619000000b004597671e0ddsi11085615edr.338.2022.12.20.13.16.00; Tue, 20 Dec 2022 13:16:16 -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=@vmware.com header.s=s1024 header.b="jjd/yi5N"; 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=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234060AbiLTU0N (ORCPT + 68 others); Tue, 20 Dec 2022 15:26:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbiLTU0K (ORCPT ); Tue, 20 Dec 2022 15:26:10 -0500 Received: from EX-PRD-EDGE02.vmware.com (EX-PRD-EDGE02.vmware.com [208.91.3.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A8E62643; Tue, 20 Dec 2022 12:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=s1024; d=vmware.com; h=from:to:cc:subject:date:message-id:mime-version:content-type; bh=8U3eApao12GWve8oDar6sUznovKCP+eRvJkCKrFxhQk=; b=jjd/yi5NVcbT58GYrgPH93KraPA/fbV41LCvBgxmC/dqS6gDeYdXYmr8u2Sx9f jYIvYpX3HWQxcnJyARsc5cryAnvi+dWkhgXl9E71PYMroHzRdDnjmEr1Do0CZ8 wQplh+OMzczxvQJ2/htcQVkqidfni8cW54Sf27mS17GtN+w= Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX-PRD-EDGE02.vmware.com (10.188.245.7) with Microsoft SMTP Server id 15.1.2375.34; Tue, 20 Dec 2022 12:25:57 -0800 Received: from htb-1n-eng-dhcp122.eng.vmware.com (unknown [10.20.114.216]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 2666420201; Tue, 20 Dec 2022 12:25:59 -0800 (PST) Received: by htb-1n-eng-dhcp122.eng.vmware.com (Postfix, from userid 0) id 2079AAE377; Tue, 20 Dec 2022 12:25:59 -0800 (PST) From: Ronak Doshi To: CC: , Ronak Doshi , VMware PV-Drivers Reviewers , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , open list Subject: [PATCH net ] vmxnet3: correctly report csum_level for encapsulated packet Date: Tue, 20 Dec 2022 12:25:55 -0800 Message-ID: <20221220202556.24421-1-doshir@vmware.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX-PRD-EDGE02.vmware.com: doshir@vmware.com does not designate permitted sender hosts) X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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 Commit dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support") added support for encapsulation offload. However, the pathc did not report correctly the csum_level for encapsulated packet. This patch fixes this issue by reporting correct csum level for the encapsulated packet. Fixes: dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support") Signed-off-by: Ronak Doshi Acked-by: Peng Li --- drivers/net/vmxnet3/vmxnet3_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 6f1e560fb15c..56267c327f0b 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -1288,6 +1288,10 @@ vmxnet3_rx_csum(struct vmxnet3_adapter *adapter, (le32_to_cpu(gdesc->dword[3]) & VMXNET3_RCD_CSUM_OK) == VMXNET3_RCD_CSUM_OK) { skb->ip_summed = CHECKSUM_UNNECESSARY; + if ((le32_to_cpu(gdesc->dword[0]) & + (1UL << VMXNET3_RCD_HDR_INNER_SHIFT))) { + skb->csum_level = 1; + } WARN_ON_ONCE(!(gdesc->rcd.tcp || gdesc->rcd.udp) && !(le32_to_cpu(gdesc->dword[0]) & (1UL << VMXNET3_RCD_HDR_INNER_SHIFT))); @@ -1297,6 +1301,10 @@ vmxnet3_rx_csum(struct vmxnet3_adapter *adapter, } else if (gdesc->rcd.v6 && (le32_to_cpu(gdesc->dword[3]) & (1 << VMXNET3_RCD_TUC_SHIFT))) { skb->ip_summed = CHECKSUM_UNNECESSARY; + if ((le32_to_cpu(gdesc->dword[0]) & + (1UL << VMXNET3_RCD_HDR_INNER_SHIFT))) { + skb->csum_level = 1; + } WARN_ON_ONCE(!(gdesc->rcd.tcp || gdesc->rcd.udp) && !(le32_to_cpu(gdesc->dword[0]) & (1UL << VMXNET3_RCD_HDR_INNER_SHIFT))); -- 2.11.0