From 32972260b50f39d493cc42a78d9648ed668c2aec Mon Sep 17 00:00:00 2001
Message-Id: <32972260b50f39d493cc42a78d9648ed668c2aec.1590584789.git.lorenzo.bianconi@redhat.com>
From: Han Zhou <hzhou@ovn.org>
Date: Tue, 5 May 2020 23:16:09 -0700
Subject: [PATCH ovn] ovn-northd: Remove useless flow for GW_REDIRECT.

Remove the flow in lr_in_gw_redirect stage:

        A priority-150 logical flow with match
        <code>outport == <var>GW</var> &amp;&amp;
        eth.dst == 00:00:00:00:00:00</code> has actions
        <code>outport = <var>CR</var>; next;</code>, where
        <var>GW</var> is the logical router distributed gateway
        port and <var>CR</var> is the <code>chassisredirect</code>
        port representing the instance of the logical router
        distributed gateway port on the
        <code>redirect-chassis</code>.

The commit c0bf32d ("Manage ARP process locally in a DVR scenario") updated
the priority-100 flow in this stage to priority 200, which makes this
priority-150 flow useless, because whatever packets matching this flow
would also match the priority-50 flow.

Cc: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Tested-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Acked-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Han Zhou <hzhou@ovn.org>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 northd/ovn-northd.8.xml | 12 ------------
 northd/ovn-northd.c     | 11 -----------
 2 files changed, 23 deletions(-)

--- a/northd/ovn-northd.8.xml
+++ b/northd/ovn-northd.8.xml
@@ -2909,18 +2909,6 @@ icmp4 {
 
     <ul>
       <li>
-        A priority-150 logical flow with match
-        <code>outport == <var>GW</var> &amp;&amp;
-        eth.dst == 00:00:00:00:00:00</code> has actions
-        <code>outport = <var>CR</var>; next;</code>, where
-        <var>GW</var> is the logical router distributed gateway
-        port and <var>CR</var> is the <code>chassisredirect</code>
-        port representing the instance of the logical router
-        distributed gateway port on the
-        <code>redirect-chassis</code>.
-      </li>
-
-      <li>
         For each NAT rule in the OVN Northbound database that can
         be handled in a distributed manner, a priority-200 logical
         flow with match <code>ip4.src == <var>B</var> &amp;&amp;
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -10143,17 +10143,6 @@ build_lrouter_flows(struct hmap *datapat
             ovn_lflow_add_with_hint(lflows, od, S_ROUTER_IN_GW_REDIRECT, 50,
                                     ds_cstr(&match), ds_cstr(&actions),
                                     stage_hint);
-
-            /* If the Ethernet destination has not been resolved,
-             * redirect to the central instance of the l3dgw_port.
-             * Such traffic will be replaced by an ARP request or ND
-             * Neighbor Solicitation in the ARP request ingress
-             * table, before being redirected to the central instance.
-             */
-            ds_put_format(&match, " && eth.dst == 00:00:00:00:00:00");
-            ovn_lflow_add_with_hint(lflows, od, S_ROUTER_IN_GW_REDIRECT, 150,
-                                    ds_cstr(&match), ds_cstr(&actions),
-                                    stage_hint);
         }
 
         /* Packets are allowed by default. */