Commit 685fb6a4 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller

net: dsa: add FDB notifier

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

For the moment, keep the current behavior and ignore other switches.
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1faabf74
...@@ -20,6 +20,8 @@ enum { ...@@ -20,6 +20,8 @@ enum {
DSA_NOTIFIER_AGEING_TIME, DSA_NOTIFIER_AGEING_TIME,
DSA_NOTIFIER_BRIDGE_JOIN, DSA_NOTIFIER_BRIDGE_JOIN,
DSA_NOTIFIER_BRIDGE_LEAVE, DSA_NOTIFIER_BRIDGE_LEAVE,
DSA_NOTIFIER_FDB_ADD,
DSA_NOTIFIER_FDB_DEL,
}; };
/* DSA_NOTIFIER_AGEING_TIME */ /* DSA_NOTIFIER_AGEING_TIME */
...@@ -36,6 +38,14 @@ struct dsa_notifier_bridge_info { ...@@ -36,6 +38,14 @@ struct dsa_notifier_bridge_info {
int port; int port;
}; };
/* DSA_NOTIFIER_FDB_* */
struct dsa_notifier_fdb_info {
const struct switchdev_obj_port_fdb *fdb;
struct switchdev_trans *trans;
int sw_index;
int port;
};
struct dsa_device_ops { struct dsa_device_ops {
struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev); struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev, struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
......
...@@ -151,29 +151,26 @@ int dsa_port_fdb_add(struct dsa_port *dp, ...@@ -151,29 +151,26 @@ int dsa_port_fdb_add(struct dsa_port *dp,
const struct switchdev_obj_port_fdb *fdb, const struct switchdev_obj_port_fdb *fdb,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
struct dsa_switch *ds = dp->ds; struct dsa_notifier_fdb_info info = {
.sw_index = dp->ds->index,
if (switchdev_trans_ph_prepare(trans)) { .port = dp->index,
if (!ds->ops->port_fdb_prepare || !ds->ops->port_fdb_add) .trans = trans,
return -EOPNOTSUPP; .fdb = fdb,
};
return ds->ops->port_fdb_prepare(ds, dp->index, fdb, trans);
}
ds->ops->port_fdb_add(ds, dp->index, fdb, trans);
return 0; return dsa_port_notify(dp, DSA_NOTIFIER_FDB_ADD, &info);
} }
int dsa_port_fdb_del(struct dsa_port *dp, int dsa_port_fdb_del(struct dsa_port *dp,
const struct switchdev_obj_port_fdb *fdb) const struct switchdev_obj_port_fdb *fdb)
{ {
struct dsa_switch *ds = dp->ds; struct dsa_notifier_fdb_info info = {
.sw_index = dp->ds->index,
if (ds->ops->port_fdb_del) .port = dp->index,
return -EOPNOTSUPP; .fdb = fdb,
};
return ds->ops->port_fdb_del(ds, dp->index, fdb); return dsa_port_notify(dp, DSA_NOTIFIER_FDB_DEL, &info);
} }
int dsa_port_fdb_dump(struct dsa_port *dp, struct switchdev_obj_port_fdb *fdb, int dsa_port_fdb_dump(struct dsa_port *dp, struct switchdev_obj_port_fdb *fdb,
......
...@@ -84,6 +84,43 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds, ...@@ -84,6 +84,43 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
return 0; return 0;
} }
static int dsa_switch_fdb_add(struct dsa_switch *ds,
struct dsa_notifier_fdb_info *info)
{
const struct switchdev_obj_port_fdb *fdb = info->fdb;
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_fdb_prepare || !ds->ops->port_fdb_add)
return -EOPNOTSUPP;
return ds->ops->port_fdb_prepare(ds, info->port, fdb, trans);
}
ds->ops->port_fdb_add(ds, info->port, fdb, trans);
return 0;
}
static int dsa_switch_fdb_del(struct dsa_switch *ds,
struct dsa_notifier_fdb_info *info)
{
const struct switchdev_obj_port_fdb *fdb = info->fdb;
/* Do not care yet about other switch chips of the fabric */
if (ds->index != info->sw_index)
return 0;
if (!ds->ops->port_fdb_del)
return -EOPNOTSUPP;
return ds->ops->port_fdb_del(ds, info->port, fdb);
}
static int dsa_switch_event(struct notifier_block *nb, static int dsa_switch_event(struct notifier_block *nb,
unsigned long event, void *info) unsigned long event, void *info)
{ {
...@@ -100,6 +137,12 @@ static int dsa_switch_event(struct notifier_block *nb, ...@@ -100,6 +137,12 @@ static int dsa_switch_event(struct notifier_block *nb,
case DSA_NOTIFIER_BRIDGE_LEAVE: case DSA_NOTIFIER_BRIDGE_LEAVE:
err = dsa_switch_bridge_leave(ds, info); err = dsa_switch_bridge_leave(ds, info);
break; break;
case DSA_NOTIFIER_FDB_ADD:
err = dsa_switch_fdb_add(ds, info);
break;
case DSA_NOTIFIER_FDB_DEL:
err = dsa_switch_fdb_del(ds, info);
break;
default: default:
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment