netdev, dpif: fix the crash/assert on port delete

a crash is seen in "netdev_ports_remove" when an interface is deleted and added
back in the system and when the interface is part of a bridge configuration.
e.g. steps:
  create a tap0 interface using "ip tuntap add.."
  add the tap0 interface to br0 using "ovs-vsctl add-port.."
  delete the tap0 interface from system using "ip tuntap del.."
  add the tap0 interface back in system using "ip tuntap add.."
                       (this changes the ifindex of the interface)
  delete tap0 from br0 using "ovs-vsctl del-port.."

In the function "netdev_ports_insert", two hmap entries were created for
mapping "portnum -> netdev" and "ifindex -> portnum".
When the interface is deleted from the system, the "netdev_ports_remove"
function is not getting called and the old ifindex entry is not getting
cleaned up from the "ifindex_to_port" hmap.

As part of the fix, added function "dpif_port_remove" which will call
"netdev_ports_remove" in the path where the interface deletion from the system
is detected.
Also, in "netdev_ports_remove", added the code where the "ifindex_to_port_data"
(ifindex -> portnum map node) is getting freed when the ifindex is not
available any more. (as the interface is already deleted.)

VMware-BZ: #1975788
Signed-off-by: Ashish Varma <ashishvarma.ovs@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

4 files changed, 29 insertions, 19 deletions

diff --git a/lib/dpctl.c b/lib/dpctl.c
index 8055cdb56..6520788aa 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -472,7 +472,7 @@ dpctl_del_if(int argc, const char *argv[], struct dpctl_params *dpctl_p)
             continue;
         }
 
-        error = dpif_port_del(dpif, port);
+        error = dpif_port_del(dpif, port, false);
         if (error) {
             dpctl_error(dpctl_p, error, "deleting port %s from %s failed",
                         name, argv[1]);
diff --git a/lib/dpif.c b/lib/dpif.c
index 3233bc8d6..3f0742d38 100644
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -605,21 +605,23 @@ dpif_port_add(struct dpif *dpif, struct netdev *netdev, odp_port_t *port_nop)
 /* Attempts to remove 'dpif''s port number 'port_no'.  Returns 0 if successful,
  * otherwise a positive errno value. */
 int
-dpif_port_del(struct dpif *dpif, odp_port_t port_no)
+dpif_port_del(struct dpif *dpif, odp_port_t port_no, bool local_delete)
 {
-    int error;
+    int error = 0;
 
     COVERAGE_INC(dpif_port_del);
 
-    error = dpif->dpif_class->port_del(dpif, port_no);
-    if (!error) {
-        VLOG_DBG_RL(&dpmsg_rl, "%s: port_del(%"PRIu32")",
-                    dpif_name(dpif), port_no);
-
-        netdev_ports_remove(port_no, dpif->dpif_class);
-    } else {
-        log_operation(dpif, "port_del", error);
+    if (!local_delete) {
+        error = dpif->dpif_class->port_del(dpif, port_no);
+        if (!error) {
+            VLOG_DBG_RL(&dpmsg_rl, "%s: port_del(%"PRIu32")",
+                        dpif_name(dpif), port_no);
+        } else {
+            log_operation(dpif, "port_del", error);
+        }
     }
+
+    netdev_ports_remove(port_no, dpif->dpif_class);
     return error;
 }
 
diff --git a/lib/dpif.h b/lib/dpif.h
index d9ded8b0f..ab898f4be 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -451,7 +451,7 @@ int dpif_get_dp_stats(const struct dpif *, struct dpif_dp_stats *);
 const char *dpif_port_open_type(const char *datapath_type,
                                 const char *port_type);
 int dpif_port_add(struct dpif *, struct netdev *, odp_port_t *port_nop);
-int dpif_port_del(struct dpif *, odp_port_t port_no);
+int dpif_port_del(struct dpif *, odp_port_t port_no, bool local_delete);
 
 /* A port within a datapath.
  *
diff --git a/lib/netdev.c b/lib/netdev.c
index 3c6fbfa34..0c1545a83 100644
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -2176,6 +2176,7 @@ struct ifindex_to_port_data {
     struct hmap_node node;
     int ifindex;
     odp_port_t port;
+    const struct dpif_class *dpif_class;
 };
 
 #define NETDEV_PORTS_HASH_INT(port, dpif) \
@@ -2225,6 +2226,7 @@ netdev_ports_insert(struct netdev *netdev, const struct dpif_class *dpif_class,
     ifidx = xzalloc(sizeof *ifidx);
     ifidx->ifindex = ifindex;
     ifidx->port = dpif_port->port_no;
+    ifidx->dpif_class = dpif_class;
 
     hmap_insert(&port_to_netdev, &data->node, hash);
     hmap_insert(&ifindex_to_port, &ifidx->node, ifidx->ifindex);
@@ -2263,10 +2265,9 @@ netdev_ports_remove(odp_port_t port_no, const struct dpif_class *dpif_class)
 
     if (data) {
         int ifindex = netdev_get_ifindex(data->netdev);
+        struct ifindex_to_port_data *ifidx = NULL;
 
         if (ifindex > 0) {
-            struct ifindex_to_port_data *ifidx = NULL;
-
             HMAP_FOR_EACH_WITH_HASH (ifidx, node, ifindex, &ifindex_to_port) {
                 if (ifidx->port == port_no) {
                     hmap_remove(&ifindex_to_port, &ifidx->node);
@@ -2276,11 +2277,18 @@ netdev_ports_remove(odp_port_t port_no, const struct dpif_class *dpif_class)
             }
             ovs_assert(ifidx);
         } else {
-            static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
-
-            VLOG_WARN_RL(&rl, "netdev ports map has dpif port %"PRIu32
-                         " but netdev has no ifindex: %s", port_no,
-                         ovs_strerror(ifindex));
+            /* case where the interface is already deleted form the datapath
+             * (e.g. tunctl -d or ip tuntap del), then the ifindex is not
+             * valid anymore. Traverse the HMAP for the port number. */
+            HMAP_FOR_EACH (ifidx, node, &ifindex_to_port) {
+                if (ifidx->port == port_no &&
+                    ifidx->dpif_class == dpif_class) {
+                    hmap_remove(&ifindex_to_port, &ifidx->node);
+                    free(ifidx);
+                    break;
+                }
+            }
+            ovs_assert(ifidx);
         }
 
         dpif_port_destroy(&data->dpif_port);