p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: ipconfig: Release the rtnl_lock while waiting for carrier 

While waiting for a carrier to come on one of the netdevices, some
devices will require to take the rtnl lock at some point to fully
initialize all parts of the link.

That's the case for SFP, where the rtnl is taken when a module gets
detected. This prevents mounting an NFS rootfs over an SFP link.

This means that while ipconfig waits for carriers to be detected, no SFP
modules can be detected in the meantime, it's only detected after
ipconfig times out.

This commit releases the rtnl_lock while waiting for the carrier to come
up, and re-takes it to check the for the init device and carrier status.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Maxime Chevallier 2021-10-28 15:18:04 +02:00 committed by David S. Miller
parent 442e796f0a
commit ee046d9a22
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/ipconfig.c
View File

@ -262,6 +262,11 @@ static int __init ic_open_devs(void)
dev->name, able, d->xid);
}
}
/* Devices with a complex topology like SFP ethernet interfaces needs
* the rtnl_lock at init. The carrier wait-loop must therefore run
* without holding it.
*/
rtnl_unlock();
/* no point in waiting if we could not bring up at least one device */
if (!ic_first_dev)
@ -274,9 +279,13 @@ static int __init ic_open_devs(void)
msecs_to_jiffies(carrier_timeout * 1000))) {
int wait, elapsed;
rtnl_lock();
for_each_netdev(&init_net, dev)
if (ic_is_init_dev(dev) && netif_carrier_ok(dev))
if (ic_is_init_dev(dev) && netif_carrier_ok(dev)) {
rtnl_unlock();
goto have_carrier;
}
rtnl_unlock();
msleep(1);
@ -289,7 +298,6 @@ static int __init ic_open_devs(void)
next_msg = jiffies + msecs_to_jiffies(20000);
}
have_carrier:
rtnl_unlock();
*last = NULL;