Commit 1c07dbb0 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: annotate data-races around dev->name_assign_type

name_assign_type_show() runs locklessly, we should annotate
accesses to dev->name_assign_type.

Alternative would be to grab devnet_rename_sem semaphore
from name_assign_type_show(), but this would not bring
more accuracy.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b7f9ef72
...@@ -1228,13 +1228,13 @@ int dev_change_name(struct net_device *dev, const char *newname) ...@@ -1228,13 +1228,13 @@ int dev_change_name(struct net_device *dev, const char *newname)
dev->flags & IFF_UP ? " (while UP)" : ""); dev->flags & IFF_UP ? " (while UP)" : "");
old_assign_type = dev->name_assign_type; old_assign_type = dev->name_assign_type;
dev->name_assign_type = NET_NAME_RENAMED; WRITE_ONCE(dev->name_assign_type, NET_NAME_RENAMED);
rollback: rollback:
ret = device_rename(&dev->dev, dev->name); ret = device_rename(&dev->dev, dev->name);
if (ret) { if (ret) {
memcpy(dev->name, oldname, IFNAMSIZ); memcpy(dev->name, oldname, IFNAMSIZ);
dev->name_assign_type = old_assign_type; WRITE_ONCE(dev->name_assign_type, old_assign_type);
up_write(&devnet_rename_sem); up_write(&devnet_rename_sem);
return ret; return ret;
} }
...@@ -1263,7 +1263,7 @@ int dev_change_name(struct net_device *dev, const char *newname) ...@@ -1263,7 +1263,7 @@ int dev_change_name(struct net_device *dev, const char *newname)
down_write(&devnet_rename_sem); down_write(&devnet_rename_sem);
memcpy(dev->name, oldname, IFNAMSIZ); memcpy(dev->name, oldname, IFNAMSIZ);
memcpy(oldname, newname, IFNAMSIZ); memcpy(oldname, newname, IFNAMSIZ);
dev->name_assign_type = old_assign_type; WRITE_ONCE(dev->name_assign_type, old_assign_type);
old_assign_type = NET_NAME_RENAMED; old_assign_type = NET_NAME_RENAMED;
goto rollback; goto rollback;
} else { } else {
......
...@@ -125,7 +125,7 @@ static DEVICE_ATTR_RO(iflink); ...@@ -125,7 +125,7 @@ static DEVICE_ATTR_RO(iflink);
static ssize_t format_name_assign_type(const struct net_device *dev, char *buf) static ssize_t format_name_assign_type(const struct net_device *dev, char *buf)
{ {
return sysfs_emit(buf, fmt_dec, dev->name_assign_type); return sysfs_emit(buf, fmt_dec, READ_ONCE(dev->name_assign_type));
} }
static ssize_t name_assign_type_show(struct device *dev, static ssize_t name_assign_type_show(struct device *dev,
...@@ -135,7 +135,7 @@ static ssize_t name_assign_type_show(struct device *dev, ...@@ -135,7 +135,7 @@ static ssize_t name_assign_type_show(struct device *dev,
struct net_device *ndev = to_net_dev(dev); struct net_device *ndev = to_net_dev(dev);
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
if (ndev->name_assign_type != NET_NAME_UNKNOWN) if (READ_ONCE(ndev->name_assign_type) != NET_NAME_UNKNOWN)
ret = netdev_show(dev, attr, buf, format_name_assign_type); ret = netdev_show(dev, attr, buf, format_name_assign_type);
return ret; return ret;
......
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