Commit f7eb4a1c authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: b53: serialize access to the ARL table

The b53 driver performs non-atomic transactions to the ARL table when
adding, deleting and reading FDB and MDB entries.

Traditionally these were all serialized by the rtnl_lock(), but now it
is possible that DSA calls ->port_fdb_add and ->port_fdb_del without
holding that lock.

So the driver must have its own serialization logic. Add a mutex and
hold it from all entry points (->port_fdb_{add,del,dump},
->port_mdb_{add,del}).
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2468346c
...@@ -1542,7 +1542,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, ...@@ -1542,7 +1542,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port,
} }
EXPORT_SYMBOL(b53_vlan_del); EXPORT_SYMBOL(b53_vlan_del);
/* Address Resolution Logic routines */ /* Address Resolution Logic routines. Caller must hold &dev->arl_mutex. */
static int b53_arl_op_wait(struct b53_device *dev) static int b53_arl_op_wait(struct b53_device *dev)
{ {
unsigned int timeout = 10; unsigned int timeout = 10;
...@@ -1707,6 +1707,7 @@ int b53_fdb_add(struct dsa_switch *ds, int port, ...@@ -1707,6 +1707,7 @@ int b53_fdb_add(struct dsa_switch *ds, int port,
const unsigned char *addr, u16 vid) const unsigned char *addr, u16 vid)
{ {
struct b53_device *priv = ds->priv; struct b53_device *priv = ds->priv;
int ret;
/* 5325 and 5365 require some more massaging, but could /* 5325 and 5365 require some more massaging, but could
* be supported eventually * be supported eventually
...@@ -1714,7 +1715,11 @@ int b53_fdb_add(struct dsa_switch *ds, int port, ...@@ -1714,7 +1715,11 @@ int b53_fdb_add(struct dsa_switch *ds, int port,
if (is5325(priv) || is5365(priv)) if (is5325(priv) || is5365(priv))
return -EOPNOTSUPP; return -EOPNOTSUPP;
return b53_arl_op(priv, 0, port, addr, vid, true); mutex_lock(&priv->arl_mutex);
ret = b53_arl_op(priv, 0, port, addr, vid, true);
mutex_unlock(&priv->arl_mutex);
return ret;
} }
EXPORT_SYMBOL(b53_fdb_add); EXPORT_SYMBOL(b53_fdb_add);
...@@ -1722,8 +1727,13 @@ int b53_fdb_del(struct dsa_switch *ds, int port, ...@@ -1722,8 +1727,13 @@ int b53_fdb_del(struct dsa_switch *ds, int port,
const unsigned char *addr, u16 vid) const unsigned char *addr, u16 vid)
{ {
struct b53_device *priv = ds->priv; struct b53_device *priv = ds->priv;
int ret;
mutex_lock(&priv->arl_mutex);
ret = b53_arl_op(priv, 0, port, addr, vid, false);
mutex_unlock(&priv->arl_mutex);
return b53_arl_op(priv, 0, port, addr, vid, false); return ret;
} }
EXPORT_SYMBOL(b53_fdb_del); EXPORT_SYMBOL(b53_fdb_del);
...@@ -1780,6 +1790,8 @@ int b53_fdb_dump(struct dsa_switch *ds, int port, ...@@ -1780,6 +1790,8 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
int ret; int ret;
u8 reg; u8 reg;
mutex_lock(&priv->arl_mutex);
/* Start search operation */ /* Start search operation */
reg = ARL_SRCH_STDN; reg = ARL_SRCH_STDN;
b53_write8(priv, B53_ARLIO_PAGE, B53_ARL_SRCH_CTL, reg); b53_write8(priv, B53_ARLIO_PAGE, B53_ARL_SRCH_CTL, reg);
...@@ -1787,18 +1799,18 @@ int b53_fdb_dump(struct dsa_switch *ds, int port, ...@@ -1787,18 +1799,18 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
do { do {
ret = b53_arl_search_wait(priv); ret = b53_arl_search_wait(priv);
if (ret) if (ret)
return ret; break;
b53_arl_search_rd(priv, 0, &results[0]); b53_arl_search_rd(priv, 0, &results[0]);
ret = b53_fdb_copy(port, &results[0], cb, data); ret = b53_fdb_copy(port, &results[0], cb, data);
if (ret) if (ret)
return ret; break;
if (priv->num_arl_bins > 2) { if (priv->num_arl_bins > 2) {
b53_arl_search_rd(priv, 1, &results[1]); b53_arl_search_rd(priv, 1, &results[1]);
ret = b53_fdb_copy(port, &results[1], cb, data); ret = b53_fdb_copy(port, &results[1], cb, data);
if (ret) if (ret)
return ret; break;
if (!results[0].is_valid && !results[1].is_valid) if (!results[0].is_valid && !results[1].is_valid)
break; break;
...@@ -1806,6 +1818,8 @@ int b53_fdb_dump(struct dsa_switch *ds, int port, ...@@ -1806,6 +1818,8 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
} while (count++ < b53_max_arl_entries(priv) / 2); } while (count++ < b53_max_arl_entries(priv) / 2);
mutex_unlock(&priv->arl_mutex);
return 0; return 0;
} }
EXPORT_SYMBOL(b53_fdb_dump); EXPORT_SYMBOL(b53_fdb_dump);
...@@ -1814,6 +1828,7 @@ int b53_mdb_add(struct dsa_switch *ds, int port, ...@@ -1814,6 +1828,7 @@ int b53_mdb_add(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_mdb *mdb) const struct switchdev_obj_port_mdb *mdb)
{ {
struct b53_device *priv = ds->priv; struct b53_device *priv = ds->priv;
int ret;
/* 5325 and 5365 require some more massaging, but could /* 5325 and 5365 require some more massaging, but could
* be supported eventually * be supported eventually
...@@ -1821,7 +1836,11 @@ int b53_mdb_add(struct dsa_switch *ds, int port, ...@@ -1821,7 +1836,11 @@ int b53_mdb_add(struct dsa_switch *ds, int port,
if (is5325(priv) || is5365(priv)) if (is5325(priv) || is5365(priv))
return -EOPNOTSUPP; return -EOPNOTSUPP;
return b53_arl_op(priv, 0, port, mdb->addr, mdb->vid, true); mutex_lock(&priv->arl_mutex);
ret = b53_arl_op(priv, 0, port, mdb->addr, mdb->vid, true);
mutex_unlock(&priv->arl_mutex);
return ret;
} }
EXPORT_SYMBOL(b53_mdb_add); EXPORT_SYMBOL(b53_mdb_add);
...@@ -1831,7 +1850,9 @@ int b53_mdb_del(struct dsa_switch *ds, int port, ...@@ -1831,7 +1850,9 @@ int b53_mdb_del(struct dsa_switch *ds, int port,
struct b53_device *priv = ds->priv; struct b53_device *priv = ds->priv;
int ret; int ret;
mutex_lock(&priv->arl_mutex);
ret = b53_arl_op(priv, 0, port, mdb->addr, mdb->vid, false); ret = b53_arl_op(priv, 0, port, mdb->addr, mdb->vid, false);
mutex_unlock(&priv->arl_mutex);
if (ret) if (ret)
dev_err(ds->dev, "failed to delete MDB entry\n"); dev_err(ds->dev, "failed to delete MDB entry\n");
...@@ -2668,6 +2689,7 @@ struct b53_device *b53_switch_alloc(struct device *base, ...@@ -2668,6 +2689,7 @@ struct b53_device *b53_switch_alloc(struct device *base,
mutex_init(&dev->reg_mutex); mutex_init(&dev->reg_mutex);
mutex_init(&dev->stats_mutex); mutex_init(&dev->stats_mutex);
mutex_init(&dev->arl_mutex);
return dev; return dev;
} }
......
...@@ -107,6 +107,7 @@ struct b53_device { ...@@ -107,6 +107,7 @@ struct b53_device {
struct mutex reg_mutex; struct mutex reg_mutex;
struct mutex stats_mutex; struct mutex stats_mutex;
struct mutex arl_mutex;
const struct b53_io_ops *ops; const struct b53_io_ops *ops;
/* chip specific data */ /* chip specific data */
......
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