diff options
| author | Leon Romanovsky <leonro@nvidia.com> | 2021-08-05 17:34:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-06 10:36:36 +0100 |
| commit | 5c0418ed16109759c7aec86b72f9bf56a0358526 (patch) | |
| tree | 4408cd811d6cb35d050a7c3ccdf84e0747586c2c /drivers/net/netdevsim/bus.c | |
| parent | a5516053cd442f58929590349809ca0b6f154fdb (diff) | |
netdevsim: Protect both reload_down and reload_up paths
Don't progress with adding and deleting ports as long as devlink
reload is running.
Fixes: 23809a726c0d ("netdevsim: Forbid devlink reload when adding or deleting ports")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netdevsim/bus.c')
| -rw-r--r-- | drivers/net/netdevsim/bus.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index a29ec264119d..62d033a1a557 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -196,6 +196,11 @@ new_port_store(struct device *dev, struct device_attribute *attr, if (!mutex_trylock(&nsim_bus_dev->nsim_bus_reload_lock)) return -EBUSY; + if (nsim_bus_dev->in_reload) { + mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock); + return -EBUSY; + } + ret = nsim_dev_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index); mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock); return ret ? ret : count; @@ -221,6 +226,11 @@ del_port_store(struct device *dev, struct device_attribute *attr, if (!mutex_trylock(&nsim_bus_dev->nsim_bus_reload_lock)) return -EBUSY; + if (nsim_bus_dev->in_reload) { + mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock); + return -EBUSY; + } + ret = nsim_dev_port_del(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index); mutex_unlock(&nsim_bus_dev->nsim_bus_reload_lock); return ret ? ret : count; |