{"id":814412,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814412/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170915220449.2648-1-kumaranand@vmware.com/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/1.2/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170915220449.2648-1-kumaranand@vmware.com>","list_archive_url":null,"date":"2017-09-15T22:04:49","name":"[ovs-dev] datapath-windows: Remove the workaround in NAT for TCP checksum","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c0c0f93a5648f8769c083cb28959ee590cb6a691","submitter":{"id":69801,"url":"http://patchwork.ozlabs.org/api/1.2/people/69801/?format=json","name":"Anand Kumar","email":"kumaranand@vmware.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170915220449.2648-1-kumaranand@vmware.com/mbox/","series":[{"id":3392,"url":"http://patchwork.ozlabs.org/api/1.2/series/3392/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3392","date":"2017-09-15T22:04:49","name":"[ovs-dev] datapath-windows: Remove the workaround in NAT for TCP checksum","version":1,"mbox":"http://patchwork.ozlabs.org/series/3392/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814412/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814412/checks/","tags":{},"related":[],"headers":{"Return-Path":"<ovs-dev-bounces@openvswitch.org>","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=<UNKNOWN>)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xv8b50Dvzz9ryT\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 16 Sep 2017 08:05:04 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 42706B6E;\n\tFri, 15 Sep 2017 22:05:01 +0000 (UTC)","from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 8DB9FB66\n\tfor <dev@openvswitch.org>; Fri, 15 Sep 2017 22:04:59 +0000 (UTC)","from EX13-EDG-OU-002.vmware.com (ex13-edg-ou-002.vmware.com\n\t[208.91.0.190])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id E652C442\n\tfor <dev@openvswitch.org>; Fri, 15 Sep 2017 22:04:58 +0000 (UTC)","from sc9-mailhost3.vmware.com (10.113.161.73) by\n\tEX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP\n\tServer id 15.0.1156.6; Fri, 15 Sep 2017 15:04:46 -0700","from localhost.localdomain (htb-1s-eng-dhcp106.eng.vmware.com\n\t[10.33.78.106])\n\tby sc9-mailhost3.vmware.com (Postfix) with ESMTP id 0CA9840517;\n\tFri, 15 Sep 2017 15:04:58 -0700 (PDT)"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","From":"Anand Kumar <kumaranand@vmware.com>","To":"<dev@openvswitch.org>","Date":"Fri, 15 Sep 2017 15:04:49 -0700","Message-ID":"<20170915220449.2648-1-kumaranand@vmware.com>","X-Mailer":"git-send-email 2.9.3.windows.1","MIME-Version":"1.0","Received-SPF":"None (EX13-EDG-OU-002.vmware.com: kumaranand@vmware.com does\n\tnot designate permitted sender hosts)","X-Spam-Status":"No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,\n\tRP_MATCHES_RCVD autolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Subject":"[ovs-dev] [PATCH] datapath-windows: Remove the workaround in NAT\n\tfor TCP checksum","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"<ovs-dev.openvswitch.org>","List-Unsubscribe":"<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n\t<mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>","List-Archive":"<http://mail.openvswitch.org/pipermail/ovs-dev/>","List-Post":"<mailto:ovs-dev@openvswitch.org>","List-Help":"<mailto:ovs-dev-request@openvswitch.org?subject=help>","List-Subscribe":"<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n\t<mailto:ovs-dev-request@openvswitch.org?subject=subscribe>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"When checksum offload is enabled, compute checksum using the\nTCP pseudo header.\n\nSigned-off-by: Anand Kumar <kumaranand@vmware.com>\n---\n datapath-windows/ovsext/Actions.c | 60 +++++++--------------------------------\n 1 file changed, 11 insertions(+), 49 deletions(-)","diff":"diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c\nindex 41d1c7b..0af4a66 100644\n--- a/datapath-windows/ovsext/Actions.c\n+++ b/datapath-windows/ovsext/Actions.c\n@@ -1528,6 +1528,11 @@ OvsUpdateAddressAndPort(OvsForwardingContext *ovsFwdCtx,\n                         ((BOOLEAN)csumInfo.Receive.UdpChecksumSucceeded ||\n                          (BOOLEAN)csumInfo.Receive.UdpChecksumFailed);\n         }\n+        if (l4Offload) {\n+            *checkField = IPPseudoChecksum(&newAddr, &ipHdr->daddr,\n+                tcpHdr ? IPPROTO_TCP : IPPROTO_UDP,\n+                ntohs(ipHdr->tot_len) - ipHdr->ihl * 4);\n+        }\n     } else {\n         addrField = &ipHdr->daddr;\n         if (tcpHdr) {\n@@ -1538,19 +1543,13 @@ OvsUpdateAddressAndPort(OvsForwardingContext *ovsFwdCtx,\n             checkField = &udpHdr->check;\n         }\n     }\n+\n     if (*addrField != newAddr) {\n         UINT32 oldAddr = *addrField;\n-        if (checkField && *checkField != 0) {\n-            if (l4Offload) {\n-                /* Recompute IP pseudo checksum */\n-                *checkField = ~(*checkField);\n-                *checkField = ChecksumUpdate32(*checkField, oldAddr,\n-                                               newAddr);\n-                *checkField = ~(*checkField);\n-            } else {\n-                *checkField = ChecksumUpdate32(*checkField, oldAddr,\n-                                               newAddr);\n-            }\n+        if (checkField && *checkField != 0 && !l4Offload) {\n+            /* Recompute total checksum. */\n+            *checkField = ChecksumUpdate32(*checkField, oldAddr,\n+                                            newAddr);\n         }\n         if (ipHdr->check != 0) {\n             ipHdr->check = ChecksumUpdate32(ipHdr->check, oldAddr,\n@@ -1561,49 +1560,12 @@ OvsUpdateAddressAndPort(OvsForwardingContext *ovsFwdCtx,\n \n     if (portField && *portField != newPort) {\n         if (checkField && !l4Offload) {\n+            /* Recompute total checksum. */\n             *checkField = ChecksumUpdate16(*checkField, *portField,\n                                            newPort);\n         }\n         *portField = newPort;\n     }\n-    PNET_BUFFER_LIST curNbl = ovsFwdCtx->curNbl;\n-    PNET_BUFFER_LIST newNbl = NULL;\n-    if (layers->isTcp) {\n-        UINT32 mss = OVSGetTcpMSS(curNbl);\n-        if (mss) {\n-            OVS_LOG_TRACE(\"l4Offset %d\", layers->l4Offset);\n-            newNbl = OvsTcpSegmentNBL(ovsFwdCtx->switchContext, curNbl, layers,\n-                                      mss, 0, FALSE);\n-            if (newNbl == NULL) {\n-                OVS_LOG_ERROR(\"Unable to segment NBL\");\n-                return NDIS_STATUS_FAILURE;\n-            }\n-            /* Clear out LSO flags after this point */\n-            NET_BUFFER_LIST_INFO(newNbl, TcpLargeSendNetBufferListInfo) = 0;\n-        }\n-    }\n-    /* If we didn't split the packet above, make a copy now */\n-    if (newNbl == NULL) {\n-        csumInfo.Value = NET_BUFFER_LIST_INFO(curNbl,\n-                                              TcpIpChecksumNetBufferListInfo);\n-        OvsApplySWChecksumOnNB(layers, curNbl, &csumInfo);\n-    }\n-\n-    if (newNbl) {\n-        curNbl = newNbl;\n-        OvsCompleteNBLForwardingCtx(ovsFwdCtx,\n-                                    L\"Complete after cloning NBL for encapsulation\");\n-        OvsInitForwardingCtx(ovsFwdCtx, ovsFwdCtx->switchContext,\n-                             newNbl, ovsFwdCtx->srcVportNo, 0,\n-                             NET_BUFFER_LIST_SWITCH_FORWARDING_DETAIL(newNbl),\n-                             ovsFwdCtx->completionList,\n-                             &ovsFwdCtx->layers, FALSE);\n-        ovsFwdCtx->curNbl = newNbl;\n-    }\n-\n-    NET_BUFFER_LIST_INFO(curNbl,\n-                         TcpIpChecksumNetBufferListInfo) = 0;\n-\n     return NDIS_STATUS_SUCCESS;\n }\n \n","prefixes":["ovs-dev"]}