virtio_net: Fix recursive call to cpus_read_lock()
Subsystems (4)
PATCH 1/1 virtio_net: Fix recursive call to cpus_read_lock()
virtnet_set_channels can recursively call cpus_read_lock if CONFIG_XPS and CONFIG_HOTPLUG are enabled.
The path is:
virtnet_set_channels - calls get_online_cpus(), which is a trivial
wrapper around cpus_read_lock()
netif_set_real_num_tx_queues
netif_reset_xps_queues_gt
netif_reset_xps_queues - calls cpus_read_lock()
This call chain and potential deadlock happens when the number of TX queues is reduced.
This commit the removes netif_set_real_num_[tr]x_queues calls from inside the get/put_online_cpus section, as they don't require that it be held.
--- drivers/net/virtio_net.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/virtio_net.c +7 -5
@@ -2093,14 +2093,16 @@ static int virtnet_set_channels(struct net_device *dev,get_online_cpus (); err =_virtnet_set_queues (vi, queue_pairs); -if (!err) { -netif_set_real_num_tx_queues (dev, queue_pairs); -netif_set_real_num_rx_queues (dev, queue_pairs); - -virtnet_set_affinity (vi); +if (err){ +put_online_cpus (); + goto err; } +virtnet_set_affinity (vi);put_online_cpus (); +netif_set_real_num_tx_queues (dev, queue_pairs); +netif_set_real_num_rx_queues (dev, queue_pairs); + err:return err; }
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerQuoted 10 lines · On Tue, 22 Dec 2020 21:54:21 -0500 Jeff Dike wrote:
virtnet_set_channelscan recursively callcpus_read_lockifCONFIG_XPSandCONFIG_HOTPLUGare enabled.The path is:
virtnet_set_channels- callsget_online_cpus(), which is a trivial
wrapper aroundcpus_read_lock()
netif_set_real_num_tx_queues
netif_reset_xps_queues_gt
netif_reset_xps_queues- callscpus_read_lock()
Quoted 6 lines
This call chain and potential deadlock happens when the number of TX queues is reduced.
This commit the removes netif_set_real_num_[tr]x_queues calls from inside the get/put_online_cpus section, as they don't require that it be held.
Quoted 4 lines
Signed-off-by Jeff Dike <[email protected]>Acked-by Jason Wang <[email protected]>
Queued for stable.
Quoted 5 lines
drivers/net/virtio_net.c +0
-0
drivers/net/virtio_net.c static int virtnet_set_channels(struct net_device *dev, · line 2096
Quoted 9 lines
drivers/net/virtio_net.c +1
-5@@ -2093,14 +2093,16 @@ static int virtnet_set_channels(struct net_device *dev,get_online_cpus (); err =_virtnet_set_queues (vi, queue_pairs); -if (!err) { -netif_set_real_num_tx_queues (dev, queue_pairs); -netif_set_real_num_rx_queues (dev, queue_pairs); - -virtnet_set_affinity (vi); +if (err){
Added missing space here.
drivers/net/virtio_net.c static int virtnet_set_channels(struct net_device *dev, · line 2099
Quoted 3 lines
drivers/net/virtio_net.c +2
-0+put_online_cpus (); + goto err; }
And applied, thanks!