Commit 771acac2 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

switchdev: assert rtnl mutex when going over lower netdevs

netdev_for_each_lower_dev has to be called with rtnl mutex held. So
better enforce it in switchdev functions.
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d33eeb64
...@@ -520,6 +520,8 @@ EXPORT_SYMBOL_GPL(switchdev_port_obj_del); ...@@ -520,6 +520,8 @@ EXPORT_SYMBOL_GPL(switchdev_port_obj_del);
* @id: object ID * @id: object ID
* @obj: object to dump * @obj: object to dump
* @cb: function to call with a filled object * @cb: function to call with a filled object
*
* rtnl_lock must be held.
*/ */
int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj, int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj,
switchdev_obj_dump_cb_t *cb) switchdev_obj_dump_cb_t *cb)
...@@ -529,6 +531,8 @@ int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj, ...@@ -529,6 +531,8 @@ int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj,
struct list_head *iter; struct list_head *iter;
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
ASSERT_RTNL();
if (ops && ops->switchdev_port_obj_dump) if (ops && ops->switchdev_port_obj_dump)
return ops->switchdev_port_obj_dump(dev, obj, cb); return ops->switchdev_port_obj_dump(dev, obj, cb);
...@@ -1097,6 +1101,8 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) ...@@ -1097,6 +1101,8 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi)
struct net_device *dev = NULL; struct net_device *dev = NULL;
int nhsel; int nhsel;
ASSERT_RTNL();
/* For this route, all nexthop devs must be on the same switch. */ /* For this route, all nexthop devs must be on the same switch. */
for (nhsel = 0; nhsel < fi->fib_nhs; nhsel++) { for (nhsel = 0; nhsel < fi->fib_nhs; nhsel++) {
...@@ -1327,10 +1333,11 @@ void switchdev_port_fwd_mark_set(struct net_device *dev, ...@@ -1327,10 +1333,11 @@ void switchdev_port_fwd_mark_set(struct net_device *dev,
u32 mark = dev->ifindex; u32 mark = dev->ifindex;
u32 reset_mark = 0; u32 reset_mark = 0;
if (group_dev && joining) { if (group_dev) {
mark = switchdev_port_fwd_mark_get(dev, group_dev); ASSERT_RTNL();
} else if (group_dev && !joining) { if (joining)
if (dev->offload_fwd_mark == mark) mark = switchdev_port_fwd_mark_get(dev, group_dev);
else if (dev->offload_fwd_mark == mark)
/* Ohoh, this port was the mark reference port, /* Ohoh, this port was the mark reference port,
* but it's leaving the group, so reset the * but it's leaving the group, so reset the
* mark for the remaining ports in the group. * mark for the remaining ports in the group.
......
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