vxlan: vxlan_core: Do not skip default entry in vxlan_flush() by default

Currently, the function vxlan_flush() does not flush the default FDB entry
(an entry with all_zeros_mac and default VNI), as it is deleted at
vxlan_uninit(). When this function will be used for flushing FDB entries
from user space, it will have to flush also the default entry in case that
other parameters match (e.g., VNI, flags).

Extend 'struct vxlan_fdb_flush_desc' to include an indication whether
the default entry should be flushed or not. The default value (false)
indicates to flush it, adjust all the existing callers to set
'.ignore_default_entry' to true, so the current behavior will not be
changed.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 1c58fddb7df4748f306d8a4d0fde17fe0f31fc92..958960fdc011b5765057064a272e1d3453810094 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -3023,16 +3023,27 @@ static int vxlan_open(struct net_device *dev)
 }
 
 struct vxlan_fdb_flush_desc {
+       bool                            ignore_default_entry;
        unsigned long                   state;
        unsigned long                   state_mask;
 };
 
+static bool vxlan_fdb_is_default_entry(const struct vxlan_fdb *f,
+                                      const struct vxlan_dev *vxlan)
+{
+       return is_zero_ether_addr(f->eth_addr) && f->vni == vxlan->cfg.vni;
+}
+
 static bool vxlan_fdb_flush_matches(const struct vxlan_fdb *f,
+                                   const struct vxlan_dev *vxlan,
                                    const struct vxlan_fdb_flush_desc *desc)
 {
        if (desc->state_mask && (f->state & desc->state_mask) != desc->state)
                return false;
 
+       if (desc->ignore_default_entry && vxlan_fdb_is_default_entry(f, vxlan))
+               return false;
+
        return true;
 }
 
@@ -3050,13 +3061,9 @@ static void vxlan_flush(struct vxlan_dev *vxlan,
                        struct vxlan_fdb *f
                                = container_of(p, struct vxlan_fdb, hlist);
 
-                       if (!vxlan_fdb_flush_matches(f, desc))
+                       if (!vxlan_fdb_flush_matches(f, vxlan, desc))
                                continue;
 
-                       /* the all_zeros_mac entry is deleted at vxlan_uninit */
-                       if (is_zero_ether_addr(f->eth_addr) &&
-                           f->vni == vxlan->cfg.vni)
-                               continue;
                        vxlan_fdb_destroy(vxlan, f, true, true);
                }
                spin_unlock_bh(&vxlan->hash_lock[h]);
@@ -3068,6 +3075,8 @@ static int vxlan_stop(struct net_device *dev)
 {
        struct vxlan_dev *vxlan = netdev_priv(dev);
        struct vxlan_fdb_flush_desc desc = {
+               /* Default entry is deleted at vxlan_uninit. */
+               .ignore_default_entry = true,
                .state = 0,
                .state_mask = NUD_PERMANENT | NUD_NOARP,
        };
@@ -4315,7 +4324,10 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
 static void vxlan_dellink(struct net_device *dev, struct list_head *head)
 {
        struct vxlan_dev *vxlan = netdev_priv(dev);
-       struct vxlan_fdb_flush_desc desc = {};
+       struct vxlan_fdb_flush_desc desc = {
+               /* Default entry is deleted at vxlan_uninit. */
+               .ignore_default_entry = true,
+       };
 
        vxlan_flush(vxlan, &desc);