From d9ed450713eda62af1bec5009694b2d206c9f435 Mon Sep 17 00:00:00 2001

Message-Id: <d9ed450713eda62af1bec5009694b2d206c9f435.1590585469.git.lorenzo.bianconi@redhat.com>

From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

Date: Mon, 25 May 2020 23:55:06 +0200

Subject: [PATCH ovn 1/3] Revert "Manage ARP process locally in a DVR scenario"

This reverts commit c0bf32d72f8b893bbe3cb64912b0fd259d71555f.

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

Signed-off-by: Han Zhou <hzhou@ovn.org>

---

 northd/ovn-northd.8.xml | 37 ++--------------------------

 northd/ovn-northd.c     | 53 +----------------------------------------

 tests/ovn.at            | 14 -----------

 3 files changed, 3 insertions(+), 101 deletions(-)

--- a/ovn/northd/ovn-northd.8.xml

+++ b/ovn/northd/ovn-northd.8.xml

@@ -2311,44 +2311,11 @@ output;

-          For distributed logical routers where one of the logical router ports

-          specifies a redirect-chassis, a priority-400 logical

-          flow for each dnat_and_snat NAT rules configured.

-          These flows will allow to properly forward traffic to the external

-          connections if available and avoid sending it through the tunnel.

-          Assuming the following NAT rule has been configured:

-        

-

-        

-external_ip = A;

-external_mac = B;

-logical_ip = C;

-        

-

-        

-          the following action will be applied:

-        

-

-        

-ip.ttl--;

-reg0 = ip.dst;

-reg1 = A;

-eth.src = B;

-outport = router-port;

-next;

-        

-

-      

-

-      

-        

           IPv4 routing table.  For each route to IPv4 network N with

           netmask M, on router port P with IP address

           A and Ethernet

           address E, a logical flow with match ip4.dst ==

-          N/M, whose priority is 400

-          + the number of 1-bits in M if the router port is not a

-          distributed gateway port, else the priority is the number of

+          N/M, whose priority is the number of

           1-bits in M, has the following actions:

@@ -2663,7 +2630,7 @@ icmp4 {

         For each NAT rule in the OVN Northbound database that can

-        be handled in a distributed manner, a priority-200 logical

+        be handled in a distributed manner, a priority-100 logical

         flow with match ip4.src == B &&

         outport == GW, where GW is

         the logical router distributed gateway port, with actions

--- a/ovn/northd/ovn-northd.c

+++ b/ovn/northd/ovn-northd.c

@@ -6655,43 +6655,6 @@ build_routing_policy_flow(struct hmap *l

     ds_destroy(&actions);

 }

-/* default logical flow prioriry for distributed routes */

-#define DROUTE_PRIO 400

-

-static void

-add_distributed_routes(struct hmap *lflows, struct ovn_datapath *od)

-{

-    struct ds actions = DS_EMPTY_INITIALIZER;

-    struct ds match = DS_EMPTY_INITIALIZER;

-

-    for (size_t i = 0; i < od->nbr->n_nat; i++) {

-        const struct nbrec_nat *nat = od->nbr->nat[i];

-

-        if (strcmp(nat->type, "dnat_and_snat") ||

-            !nat->external_mac) {

-            continue;

-        }

-

-        bool is_ipv4 = strchr(nat->logical_ip, '.') ? true : false;

-        ds_put_format(&match, "ip%s.src == %s && is_chassis_resident(\"%s\")",

-                      is_ipv4 ? "4" : "6", nat->logical_ip,

-                      nat->logical_port);

-        char *prefix = is_ipv4 ? "" : "xx";

-        ds_put_format(&actions, "outport = %s; eth.src = %s; "

-                      "%sreg0 = ip%s.dst; %sreg1 = %s; next;",

-                      od->l3dgw_port->json_key, nat->external_mac,

-                      prefix, is_ipv4 ? "4" : "6",

-                      prefix, nat->external_ip);

-        ovn_lflow_add(lflows, od, S_ROUTER_IN_IP_ROUTING, DROUTE_PRIO,

-                      ds_cstr(&match), ds_cstr(&actions));

-        ds_clear(&match);

-        ds_clear(&actions);

-    }

-

-    ds_destroy(&actions);

-    ds_destroy(&match);

-}

-

 static void

 add_route(struct hmap *lflows, const struct ovn_port *op,

           const char *lrp_addr_s, const char *network_s, int plen,

@@ -6710,13 +6673,6 @@ add_route(struct hmap *lflows, const str

         priority = (plen * 2) + 1;

     }

-    /* traffic for internal IPs of logical switch ports must be sent to

-     * the gw controller through the overlay tunnels

-     */

-    if (op->nbrp && !op->nbrp->n_gateway_chassis) {

-        priority += DROUTE_PRIO;

-    }

-

     /* IPv6 link-local addresses must be scoped to the local router port. */

     if (!is_ipv4) {

         struct in6_addr network;

@@ -8357,7 +8313,7 @@ build_lrouter_flows(struct hmap *datapat

                               is_v6 ? "6" : "4",

                               nat->logical_ip,

                               od->l3dgw_port->json_key);

-                ovn_lflow_add(lflows, od, S_ROUTER_IN_GW_REDIRECT, 200,

+                ovn_lflow_add(lflows, od, S_ROUTER_IN_GW_REDIRECT, 100,

                               ds_cstr(&match), "next;");

             }

@@ -8633,15 +8589,6 @@ build_lrouter_flows(struct hmap *datapat

         ovn_lflow_add(lflows, od, S_ROUTER_IN_ND_RA_RESPONSE, 0, "1", "next;");

     }

-    /* Logical router ingress table IP_ROUTING - IP routing for distributed

-     * logical router

-     */

-    HMAP_FOR_EACH (od, key_node, datapaths) {

-        if (od->nbr && od->l3dgw_port) {

-            add_distributed_routes(lflows, od);

-        }

-    }

-

     /* Logical router ingress table 7: IP Routing.

      *

      * A packet that arrives at this table is an IP packet that should be

--- a/tests/ovn.at

+++ b/tests/ovn.at

@@ -9482,20 +9482,6 @@ AT_CHECK([as hv3 ovs-vsctl set Open_vSwi

 OVS_WAIT_UNTIL([test 1 = `as hv3 ovs-vsctl show | \

 grep "Port patch-br-int-to-ln_port" | wc -l`])

-AT_CHECK([test 1 = `ovn-sbctl dump-flows lr0 | grep lr_in_ip_routing | \

-grep "ip4.src == 10.0.0.3 && is_chassis_resident(\"foo1\")" -c`])

-AT_CHECK([test 1 = `ovn-sbctl dump-flows lr0 | grep lr_in_ip_routing | \

-grep "ip4.src == 10.0.0.4 && is_chassis_resident(\"foo2\")" -c`])

-

-key=`ovn-sbctl --bare --columns tunnel_key list datapath_Binding lr0`

-# Check that the OVS flows appear for the dnat_and_snat entries in

-# lr_in_ip_routing table.

-OVS_WAIT_UNTIL([test 1 = `as hv3 ovs-ofctl dump-flows br-int table=17 | \

-grep "priority=400,ip,metadata=0x$key,nw_src=10.0.0.3" -c`])

-

-OVS_WAIT_UNTIL([test 1 = `as hv3 ovs-ofctl dump-flows br-int table=17 | \

-grep "priority=400,ip,metadata=0x$key,nw_src=10.0.0.4" -c`])

-

 # Re-add nat-addresses option

 ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="router"