From patchwork Fri Aug 11 20:41:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Kumar X-Patchwork-Id: 800735 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xTcPd12Jjz9s82 for ; Sat, 12 Aug 2017 06:42:12 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9BB80B01; Fri, 11 Aug 2017 20:42:08 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1C70FAD2 for ; Fri, 11 Aug 2017 20:42:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EX13-EDG-OU-002.vmware.com (ex13-edg-ou-002.vmware.com [208.91.0.190]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0195E49B for ; Fri, 11 Aug 2017 20:42:06 +0000 (UTC) Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Fri, 11 Aug 2017 13:41:22 -0700 Received: from localhost.localdomain (htb-1s-eng-dhcp106.eng.vmware.com [10.33.78.106]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 2580BB04A0; Fri, 11 Aug 2017 13:42:05 -0700 (PDT) From: Anand Kumar To: Date: Fri, 11 Aug 2017 13:41:54 -0700 Message-ID: <20170811204154.4372-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 not designate permitted sender hosts) Subject: [ovs-dev] [PATCH] datapath-windows: Update ICMP-Type and Code comparison in CT lookup X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org - Update the CT comparison function to compare individual fields instead of NdisEqualMemory. - Add in some padding for the ct_endpoint's union. - Update the Orig Tuple to use ICMP Type and Code instead of Port for ICMP Co-authored-by: Sairam Venugopal Signed-off-by: Anand Kumar Acked-by: Sairam Venugopal --- datapath-windows/ovsext/Conntrack.c | 27 +++++++++++++++++++++------ datapath-windows/ovsext/Conntrack.h | 5 ++++- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c index 917ebee..81c2167 100644 --- a/datapath-windows/ovsext/Conntrack.c +++ b/datapath-windows/ovsext/Conntrack.c @@ -373,10 +373,18 @@ OvsDetectCtPacket(OvsForwardingContext *fwdCtx, BOOLEAN OvsCtKeyAreSame(OVS_CT_KEY ctxKey, OVS_CT_KEY entryKey) { - return ((NdisEqualMemory(&ctxKey.src, &entryKey.src, - sizeof(struct ct_endpoint))) && - (NdisEqualMemory(&ctxKey.dst, &entryKey.dst, - sizeof(struct ct_endpoint))) && + return ((ctxKey.src.addr.ipv4 == entryKey.src.addr.ipv4) && + (ctxKey.src.addr.ipv4_aligned == entryKey.src.addr.ipv4_aligned) && + (ctxKey.src.port == entryKey.src.port) && + (ctxKey.src.icmp_id == entryKey.src.icmp_id) && + (ctxKey.src.icmp_type == entryKey.src.icmp_type) && + (ctxKey.src.icmp_code == entryKey.src.icmp_code) && + (ctxKey.dst.addr.ipv4 == entryKey.dst.addr.ipv4) && + (ctxKey.dst.addr.ipv4_aligned == entryKey.dst.addr.ipv4_aligned) && + (ctxKey.dst.port == entryKey.dst.port) && + (ctxKey.dst.icmp_id == entryKey.dst.icmp_id) && + (ctxKey.dst.icmp_type == entryKey.dst.icmp_type) && + (ctxKey.dst.icmp_code == entryKey.dst.icmp_code) && (ctxKey.dl_type == entryKey.dl_type) && (ctxKey.nw_proto == entryKey.nw_proto) && (ctxKey.zone == entryKey.zone)); @@ -782,9 +790,16 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx, key->ct.tuple_ipv4.ipv4_src = ctKey->src.addr.ipv4_aligned; key->ct.tuple_ipv4.ipv4_dst = ctKey->dst.addr.ipv4_aligned; - key->ct.tuple_ipv4.src_port = ctKey->src.port; - key->ct.tuple_ipv4.dst_port = ctKey->dst.port; key->ct.tuple_ipv4.ipv4_proto = ctKey->nw_proto; + + /* Orig tuple Port is overloaded to take in ICMP-Type & Code */ + /* This mimics the behavior in lib/conntrack.c*/ + key->ct.tuple_ipv4.src_port = ctKey->nw_proto != IPPROTO_ICMP ? + ctKey->src.port : + htons(ctKey->src.icmp_type); + key->ct.tuple_ipv4.dst_port = ctKey->nw_proto != IPPROTO_ICMP ? + ctKey->dst.port : + htons(ctKey->src.icmp_code); } if (entryCreated && entry) { diff --git a/datapath-windows/ovsext/Conntrack.h b/datapath-windows/ovsext/Conntrack.h index 04ca299..4904c7e 100644 --- a/datapath-windows/ovsext/Conntrack.h +++ b/datapath-windows/ovsext/Conntrack.h @@ -41,7 +41,10 @@ struct ct_addr { struct ct_endpoint { struct ct_addr addr; union { - ovs_be16 port; + struct { + ovs_be16 port; + uint16 pad_port; + }; struct { ovs_be16 icmp_id; uint8_t icmp_type;