Skip to content

Commit

Permalink
dev: Remove devnet_rename_sem.
Browse files Browse the repository at this point in the history
devnet_rename_sem is no longer used since commit
0840556 ("net: Protect dev->name by seqlock.").

Also, RTNL serialises dev_change_name().

Let's remove devnet_rename_sem.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: NipaLocal <nipa@local>
  • Loading branch information
q2ven authored and NipaLocal committed Jan 16, 2025
1 parent 988f0b4 commit ee49ea1
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ static DEFINE_SPINLOCK(napi_hash_lock);
static unsigned int napi_gen_id = NR_CPUS;
static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);

static DECLARE_RWSEM(devnet_rename_sem);

static inline void dev_base_seq_inc(struct net *net)
{
unsigned int val = net->dev_base_seq + 1;
Expand Down Expand Up @@ -1361,23 +1359,17 @@ int dev_change_name(struct net_device *dev, const char *newname)

net = dev_net(dev);

down_write(&devnet_rename_sem);

if (strncmp(newname, dev->name, IFNAMSIZ) == 0) {
up_write(&devnet_rename_sem);
if (!strncmp(newname, dev->name, IFNAMSIZ))
return 0;
}

memcpy(oldname, dev->name, IFNAMSIZ);

write_seqlock_bh(&netdev_rename_lock);
err = dev_get_valid_name(net, dev, newname);
write_sequnlock_bh(&netdev_rename_lock);

if (err < 0) {
up_write(&devnet_rename_sem);
if (err < 0)
return err;
}

if (oldname[0] && !strchr(oldname, '%'))
netdev_info(dev, "renamed from %s%s\n", oldname,
Expand All @@ -1393,12 +1385,9 @@ int dev_change_name(struct net_device *dev, const char *newname)
memcpy(dev->name, oldname, IFNAMSIZ);
write_sequnlock_bh(&netdev_rename_lock);
WRITE_ONCE(dev->name_assign_type, old_assign_type);
up_write(&devnet_rename_sem);
return ret;
}

up_write(&devnet_rename_sem);

netdev_adjacent_rename_links(dev, oldname);

netdev_name_node_del(dev->name_node);
Expand All @@ -1414,7 +1403,6 @@ int dev_change_name(struct net_device *dev, const char *newname)
/* err >= 0 after dev_alloc_name() or stores the first errno */
if (err >= 0) {
err = ret;
down_write(&devnet_rename_sem);
write_seqlock_bh(&netdev_rename_lock);
memcpy(dev->name, oldname, IFNAMSIZ);
write_sequnlock_bh(&netdev_rename_lock);
Expand Down

0 comments on commit ee49ea1

Please sign in to comment.