net: dsa: add MDB notifier

Add two new DSA_NOTIFIER_MDB_ADD and DSA_NOTIFIER_MDB_DEL events to
notify not only a single switch, but all switches of a the fabric when
an MDB entry is added or removed.

For the moment, keep the current behavior and ignore other switches.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 6a7d0d7d0489729ddca0c43c2b36bec2bd7ab792..2b60293b325c74160e040c427100dacaf383027c 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -22,6 +22,8 @@ enum {
        DSA_NOTIFIER_BRIDGE_LEAVE,
        DSA_NOTIFIER_FDB_ADD,
        DSA_NOTIFIER_FDB_DEL,
+       DSA_NOTIFIER_MDB_ADD,
+       DSA_NOTIFIER_MDB_DEL,
 };
 
 /* DSA_NOTIFIER_AGEING_TIME */
@@ -46,6 +48,14 @@ struct dsa_notifier_fdb_info {
        int port;
 };
 
+/* DSA_NOTIFIER_MDB_* */
+struct dsa_notifier_mdb_info {
+       const struct switchdev_obj_port_mdb *mdb;
+       struct switchdev_trans *trans;
+       int sw_index;
+       int port;
+};
+
 struct dsa_device_ops {
        struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
        struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,

diff --git a/net/dsa/port.c b/net/dsa/port.c
index ed88d838164297a4c792359ba1827a001d67f984..c7c4920e7bc92a8511e8698ac9e453039acc2bda 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -188,29 +188,26 @@ int dsa_port_mdb_add(struct dsa_port *dp,
                     const struct switchdev_obj_port_mdb *mdb,
                     struct switchdev_trans *trans)
 {
-       struct dsa_switch *ds = dp->ds;
-
-       if (switchdev_trans_ph_prepare(trans)) {
-               if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)
-                       return -EOPNOTSUPP;
-
-               return ds->ops->port_mdb_prepare(ds, dp->index, mdb, trans);
-       }
-
-       ds->ops->port_mdb_add(ds, dp->index, mdb, trans);
+       struct dsa_notifier_mdb_info info = {
+               .sw_index = dp->ds->index,
+               .port = dp->index,
+               .trans = trans,
+               .mdb = mdb,
+       };
 
-       return 0;
+       return dsa_port_notify(dp, DSA_NOTIFIER_MDB_ADD, &info);
 }
 
 int dsa_port_mdb_del(struct dsa_port *dp,
                     const struct switchdev_obj_port_mdb *mdb)
 {
-       struct dsa_switch *ds = dp->ds;
-
-       if (ds->ops->port_mdb_del)
-               return ds->ops->port_mdb_del(ds, dp->index, mdb);
+       struct dsa_notifier_mdb_info info = {
+               .sw_index = dp->ds->index,
+               .port = dp->index,
+               .mdb = mdb,
+       };
 
-       return -EOPNOTSUPP;
+       return dsa_port_notify(dp, DSA_NOTIFIER_MDB_DEL, &info);
 }
 
 int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,

diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index e71cc860d32ccb6e6bed0cb5df4a7f064114b024..b7e8e45869fc503df00a411fcdea0c797076dc92 100644 (file)
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -121,6 +121,43 @@ static int dsa_switch_fdb_del(struct dsa_switch *ds,
        return ds->ops->port_fdb_del(ds, info->port, fdb);
 }
 
+static int dsa_switch_mdb_add(struct dsa_switch *ds,
+                             struct dsa_notifier_mdb_info *info)
+{
+       const struct switchdev_obj_port_mdb *mdb = info->mdb;
+       struct switchdev_trans *trans = info->trans;
+
+       /* Do not care yet about other switch chips of the fabric */
+       if (ds->index != info->sw_index)
+               return 0;
+
+       if (switchdev_trans_ph_prepare(trans)) {
+               if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)
+                       return -EOPNOTSUPP;
+
+               return ds->ops->port_mdb_prepare(ds, info->port, mdb, trans);
+       }
+
+       ds->ops->port_mdb_add(ds, info->port, mdb, trans);
+
+       return 0;
+}
+
+static int dsa_switch_mdb_del(struct dsa_switch *ds,
+                             struct dsa_notifier_mdb_info *info)
+{
+       const struct switchdev_obj_port_mdb *mdb = info->mdb;
+
+       /* Do not care yet about other switch chips of the fabric */
+       if (ds->index != info->sw_index)
+               return 0;
+
+       if (!ds->ops->port_mdb_del)
+               return -EOPNOTSUPP;
+
+       return ds->ops->port_mdb_del(ds, info->port, mdb);
+}
+
 static int dsa_switch_event(struct notifier_block *nb,
                            unsigned long event, void *info)
 {
@@ -143,6 +180,12 @@ static int dsa_switch_event(struct notifier_block *nb,
        case DSA_NOTIFIER_FDB_DEL:
                err = dsa_switch_fdb_del(ds, info);
                break;
+       case DSA_NOTIFIER_MDB_ADD:
+               err = dsa_switch_mdb_add(ds, info);
+               break;
+       case DSA_NOTIFIER_MDB_DEL:
+               err = dsa_switch_mdb_del(ds, info);
+               break;
        default:
                err = -EOPNOTSUPP;
                break;