bridge: switchdev: Allow clearing FDB entry offload indication

Currently, an FDB entry only ceases being offloaded when it is deleted.
This changes with VxLAN encapsulation.

Devices capable of performing VxLAN encapsulation usually have only one
FDB table, unlike the software data path which has two - one in the
bridge driver and another in the VxLAN driver.

Therefore, bridge FDB entries pointing to a VxLAN device are only
offloaded if there is a corresponding entry in the VxLAN FDB.

Allow clearing the offload indication in case the corresponding entry
was deleted from the VxLAN FDB.

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

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index fa16ad2c6a50b530b86d437bd464187ea8ab8979..a89075beef94ba0f26b6df88f02e2c9e8c4bacbf 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2090,12 +2090,13 @@ void mlxsw_sp_port_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_port,
 static void
 mlxsw_sp_fdb_call_notifiers(enum switchdev_notifier_type type,
                            const char *mac, u16 vid,
-                           struct net_device *dev)
+                           struct net_device *dev, bool offloaded)
 {
        struct switchdev_notifier_fdb_info info;
 
        info.addr = mac;
        info.vid = vid;
+       info.offloaded = offloaded;
        call_switchdev_notifiers(type, dev, &info.info);
 }
 
@@ -2147,7 +2148,7 @@ do_fdb_op:
        if (!do_notification)
                return;
        type = adding ? SWITCHDEV_FDB_ADD_TO_BRIDGE : SWITCHDEV_FDB_DEL_TO_BRIDGE;
-       mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev);
+       mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev, adding);
 
        return;
 
@@ -2207,7 +2208,7 @@ do_fdb_op:
        if (!do_notification)
                return;
        type = adding ? SWITCHDEV_FDB_ADD_TO_BRIDGE : SWITCHDEV_FDB_DEL_TO_BRIDGE;
-       mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev);
+       mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev, adding);
 
        return;
 
@@ -2312,7 +2313,7 @@ static void mlxsw_sp_switchdev_bridge_fdb_event_work(struct work_struct *work)
                        break;
                mlxsw_sp_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED,
                                            fdb_info->addr,
-                                           fdb_info->vid, dev);
+                                           fdb_info->vid, dev, true);
                break;
        case SWITCHDEV_FDB_DEL_TO_DEVICE:
                fdb_info = &switchdev_work->fdb_info;

diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index aeafdb9ac015f9e44f63684bdee7f2f5fab3af76..8721c0506af30b232f78ca7e508dbe60910a7798 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -2728,6 +2728,7 @@ rocker_fdb_offload_notify(struct rocker_port *rocker_port,
 
        info.addr = recv_info->addr;
        info.vid = recv_info->vid;
+       info.offloaded = true;
        call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,
                                 rocker_port->dev, &info.info);
 }

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index b040f82351baa9aafeb1def7c44c83a02ac7fc27..881ecb1555bf1a40cd873ba21f16065112afade5 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -159,7 +159,8 @@ struct switchdev_notifier_fdb_info {
        struct switchdev_notifier_info info; /* must be first */
        const unsigned char *addr;
        u16 vid;
-       bool added_by_user;
+       u8 added_by_user:1,
+          offloaded:1;
 };
 
 static inline struct net_device *

diff --git a/net/bridge/br.c b/net/bridge/br.c
index e411e40333e2e9816142536b4e6f639961f425cd..360ad66c21e95794f1eaa59d2aee599f56f3f39a 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -151,7 +151,7 @@ static int br_switchdev_event(struct notifier_block *unused,
                        break;
                }
                br_fdb_offloaded_set(br, p, fdb_info->addr,
-                                    fdb_info->vid);
+                                    fdb_info->vid, true);
                break;
        case SWITCHDEV_FDB_DEL_TO_BRIDGE:
                fdb_info = ptr;
@@ -163,7 +163,7 @@ static int br_switchdev_event(struct notifier_block *unused,
        case SWITCHDEV_FDB_OFFLOADED:
                fdb_info = ptr;
                br_fdb_offloaded_set(br, p, fdb_info->addr,
-                                    fdb_info->vid);
+                                    fdb_info->vid, fdb_info->offloaded);
                break;
        }
 

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 74331690a390a52ee090f45133b9b1bb24070400..e56ba3912a905b3617db0f470c32d45652d7359c 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -1152,7 +1152,7 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
 }
 
 void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
-                         const unsigned char *addr, u16 vid)
+                         const unsigned char *addr, u16 vid, bool offloaded)
 {
        struct net_bridge_fdb_entry *fdb;
 
@@ -1160,7 +1160,7 @@ void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
 
        fdb = br_fdb_find(br, addr, vid);
        if (fdb)
-               fdb->offloaded = 1;
+               fdb->offloaded = offloaded;
 
        spin_unlock_bh(&br->hash_lock);
 }

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 10ee39fdca5cd010c8d7638a7d95de407b0b3480..2920e06a540329ffb8f1286c65bc5acc6f53afad 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -574,7 +574,7 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
                              const unsigned char *addr, u16 vid,
                              bool swdev_notify);
 void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
-                         const unsigned char *addr, u16 vid);
+                         const unsigned char *addr, u16 vid, bool offloaded);
 
 /* br_forward.c */
 enum br_pkt_type {

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index d77f807420c486c4d0cfecd946c51b6bac64264a..b993df7706759676d47d56855d53c23a243b0527 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -103,7 +103,7 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
 static void
 br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
                                u16 vid, struct net_device *dev,
-                               bool added_by_user)
+                               bool added_by_user, bool offloaded)
 {
        struct switchdev_notifier_fdb_info info;
        unsigned long notifier_type;
@@ -111,6 +111,7 @@ br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
        info.addr = mac;
        info.vid = vid;
        info.added_by_user = added_by_user;
+       info.offloaded = offloaded;
        notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE : SWITCHDEV_FDB_DEL_TO_DEVICE;
        call_switchdev_notifiers(notifier_type, dev, &info.info);
 }
@@ -126,13 +127,15 @@ br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
                br_switchdev_fdb_call_notifiers(false, fdb->key.addr.addr,
                                                fdb->key.vlan_id,
                                                fdb->dst->dev,
-                                               fdb->added_by_user);
+                                               fdb->added_by_user,
+                                               fdb->offloaded);
                break;
        case RTM_NEWNEIGH:
                br_switchdev_fdb_call_notifiers(true, fdb->key.addr.addr,
                                                fdb->key.vlan_id,
                                                fdb->dst->dev,
-                                               fdb->added_by_user);
+                                               fdb->added_by_user,
+                                               fdb->offloaded);
                break;
        }
 }

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 3f840b6eea692097895449f6a50bfc2b59724d67..5428ef5290190971e168a70148672cc267b37692 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1478,6 +1478,7 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)
                        netdev_dbg(dev, "fdb add failed err=%d\n", err);
                        break;
                }
+               fdb_info->offloaded = true;
                call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED, dev,
                                         &fdb_info->info);
                break;