From patchwork Fri Jul 8 11:27:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 646584 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rmSFv5pC6z9s9N for ; Sat, 9 Jul 2016 07:25:39 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B123010ACE; Fri, 8 Jul 2016 14:25:38 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 46C1A10898 for ; Fri, 8 Jul 2016 14:25:37 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id A33571E00CD for ; Fri, 8 Jul 2016 15:25:36 -0600 (MDT) X-ASG-Debug-ID: 1468013135-09eadd1b1a48be90001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar5.cudamail.com with ESMTP id GEzjWE6Uz0qUYXaC (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 08 Jul 2016 15:25:36 -0600 (MDT) X-Barracuda-Envelope-From: guru.ovn@gmail.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-pf0-f194.google.com) (209.85.192.194) by mx3-pf2.cudamail.com with ESMTPS (AES128-SHA encrypted); 8 Jul 2016 21:25:35 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at _netblocks.google.com designates 209.85.192.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.85.192.194 X-Barracuda-RBL-IP: 209.85.192.194 Received: by mail-pf0-f194.google.com with SMTP id t190so9173549pfb.2 for ; Fri, 08 Jul 2016 14:25:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=w33tRyc0QDO7U0ZkDbJTXmD5BBacF42lV6bpMvArfFM=; b=IbENdAgVe47t82EuwDyeECC9CqL4Va0+z6xTs1q71qx6B3yQmybbRBpcyU8wiPLfWT vJfWKI+wBafrXONr3FsdzrRVQqXhQyffp3yiCriHMfUEBTDpyldUuSFOhJDnGTy9L0PF V3hvApxxJoaS/By9HB5E9q2PxUNuqF5p6RIIvwn1d9BNZGzsVQINHoPPyKzfgyz+wNd0 wFb1aRekK5IQg5wPH9TvLeBLoXa7zU+7zY0aBE97nTLUNTgsLMkMuY+WDNi7ahJrFjDq 7LQ07FvUn/Tx49fCqwkQg3wR4oPobNx+Ho6RXEQK5YwXut5efdVgeU2ITt3DQOaTZREi vYlw== X-Gm-Message-State: ALyK8tKizqF2zCX+D8prFYHZkRfaKIaNutFndVmFU1fcJzxzt46NBN2uMvR7vjYgF0xDcA== X-Received: by 10.98.96.67 with SMTP id u64mr13455992pfb.70.1468013134913; Fri, 08 Jul 2016 14:25:34 -0700 (PDT) Received: from ubuntu.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id z29sm6943309pff.0.2016.07.08.14.25.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jul 2016 14:25:33 -0700 (PDT) X-CudaMail-Envelope-Sender: guru.ovn@gmail.com From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-707044240 X-CudaMail-DTE: 070816 X-CudaMail-Originating-IP: 209.85.192.194 Date: Fri, 8 Jul 2016 04:27:03 -0700 X-ASG-Orig-Subj: [##CM-V2-707044240##][PATCH v2] ovn-controller: Change strategy for gateway conntrack zone allocation. Message-Id: <1467977223-20158-1-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.9.1 X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1468013136 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH v2] ovn-controller: Change strategy for gateway conntrack zone allocation. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Commit 263064aeaa31e7 (Convert binding_run to incremental processing.) changed the way patched_datapaths were handled. Previously we would destroy the datastructure in every run and re-create it fresh. The new way causes problems with the way conntrack zones are allocated as now we can have stale port_binding entries causing segmentation faults. With this commit, we simply don't depend on port_binding records in conntrack zone allocation and instead store the UUID as a string in the patch_datapath datastructure. (The test enhanced with this commit would fail without the changes in the commit. i.e. ovn-controller would crash. ) Signed-off-by: Gurucharan Shetty Acked-by: Ryan Moats --- This applies on top of https://patchwork.ozlabs.org/patch/646268/. I will rebase this if the dependent patch changes. --- ovn/controller/ovn-controller.c | 4 ++-- ovn/controller/ovn-controller.h | 2 +- ovn/controller/patch.c | 4 +++- ovn/controller/physical.c | 8 ++++++-- ovn/lib/ovn-util.c | 8 +++----- ovn/lib/ovn-util.h | 3 +-- tests/ovn.at | 21 +++++++++++++++++++++ 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index 8471f64..28ee13e 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -251,8 +251,8 @@ update_ct_zones(struct sset *lports, struct hmap *patched_datapaths, continue; } - char *dnat = alloc_nat_zone_key(pd->port_binding, "dnat"); - char *snat = alloc_nat_zone_key(pd->port_binding, "snat"); + char *dnat = alloc_nat_zone_key(pd->key, "dnat"); + char *snat = alloc_nat_zone_key(pd->key, "snat"); sset_add(&all_users, dnat); sset_add(&all_users, snat); free(dnat); diff --git a/ovn/controller/ovn-controller.h b/ovn/controller/ovn-controller.h index f3edc43..470b1f5 100644 --- a/ovn/controller/ovn-controller.h +++ b/ovn/controller/ovn-controller.h @@ -51,7 +51,7 @@ struct local_datapath *get_local_datapath(const struct hmap *, * with at least one logical patch port binding. */ struct patched_datapath { struct hmap_node hmap_node; - const struct sbrec_port_binding *port_binding; + char *key; /* Holds the uuid of the corresponding datapath. */ bool local; /* 'True' if the datapath is for gateway router. */ bool stale; /* 'True' if the datapath is not referenced by any patch * port. */ diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c index 3825f31..9a5c96f 100644 --- a/ovn/controller/patch.c +++ b/ovn/controller/patch.c @@ -263,7 +263,8 @@ add_patched_datapath(struct hmap *patched_datapaths, pd = xzalloc(sizeof *pd); pd->local = local; - pd->port_binding = binding_rec; + pd->key = xasprintf(UUID_FMT, + UUID_ARGS(&binding_rec->datapath->header_.uuid)); /* stale is set to false. */ hmap_insert(patched_datapaths, &pd->hmap_node, binding_rec->datapath->tunnel_key); @@ -291,6 +292,7 @@ add_logical_patch_ports_postprocess(struct hmap *patched_datapaths) patched_datapaths) { if (pd_cur_node->stale == true) { hmap_remove(patched_datapaths, &pd_cur_node->hmap_node); + free(pd_cur_node->key); free(pd_cur_node); } } diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index f7389ea..d1b40c2 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -297,8 +297,12 @@ consider_port_binding(struct hmap *flow_table, } int zone_id_dnat, zone_id_snat; - char *dnat = alloc_nat_zone_key(binding, "dnat"); - char *snat = alloc_nat_zone_key(binding, "snat"); + char *key = xasprintf(UUID_FMT, + UUID_ARGS(&binding->datapath->header_.uuid)); + char *dnat = alloc_nat_zone_key(key, "dnat"); + char *snat = alloc_nat_zone_key(key, "snat"); + free(key); + zone_id_dnat = simap_get(ct_zones, dnat); if (zone_id_dnat) { put_load(zone_id_dnat, MFF_LOG_DNAT_ZONE, 0, 32, ofpacts_p); diff --git a/ovn/lib/ovn-util.c b/ovn/lib/ovn-util.c index 6113087..6e94083 100644 --- a/ovn/lib/ovn-util.c +++ b/ovn/lib/ovn-util.c @@ -105,13 +105,11 @@ extract_lsp_addresses(char *address, struct lport_addresses *laddrs, } /* Allocates a key for NAT conntrack zone allocation for a provided - * 'port_binding' record and a 'type'. + * 'key' record and a 'type'. * * It is the caller's responsibility to free the allocated memory. */ char * -alloc_nat_zone_key(const struct sbrec_port_binding *port_binding, - const char *type) +alloc_nat_zone_key(const char *key, const char *type) { - return xasprintf(UUID_FMT"_%s", - UUID_ARGS(&port_binding->datapath->header_.uuid), type); + return xasprintf("%s_%s", key, type); } diff --git a/ovn/lib/ovn-util.h b/ovn/lib/ovn-util.h index d23f4af..98b1426 100644 --- a/ovn/lib/ovn-util.h +++ b/ovn/lib/ovn-util.h @@ -43,6 +43,5 @@ extract_lsp_addresses(char *address, struct lport_addresses *laddrs, bool store_ipv6); char * -alloc_nat_zone_key(const struct sbrec_port_binding *port_binding, - const char *type); +alloc_nat_zone_key(const char *key, const char *type); #endif diff --git a/tests/ovn.at b/tests/ovn.at index 3f2e779..a1c7af0 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3085,6 +3085,27 @@ $PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | trim_zeros > rece echo $expected | trim_zeros > expout AT_CHECK([cat received1.packets], [0], [expout]) +# Delete the router and re-create it. Things should work as before. +ovn-nbctl lr-del R2 +ovn-nbctl create Logical_Router name=R2 options:chassis="hv2" +# Connect alice to R2 +ovn-nbctl lrp-add R2 alice 00:00:02:01:02:03 172.16.1.1/24 +# Connect R2 to join +ovn-nbctl lrp-add R2 R2_join 00:00:04:01:02:04 20.0.0.2/24 + +ovn-nbctl -- --id=@lrt create Logical_Router_Static_Route \ +ip_prefix=192.168.1.0/24 nexthop=20.0.0.1 -- add Logical_Router \ +R2 static_routes @lrt + +# Wait for ovn-controller to catch up. +sleep 1 + +# Send the packet again. +as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | trim_zeros > received1.packets +echo $expected | trim_zeros >> expout +AT_CHECK([cat received1.packets], [0], [expout]) + OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP