diff options
author | Jeff Dike <jdike@akamai.com> | 2020-12-22 21:54:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-12 20:18:10 +0100 |
commit | 23f8bea3e9d91a2553342172ef54972c01cb7616 (patch) | |
tree | dda52efcc32023b2e04666ac3b197ae365e9a8d8 /net/ncsi | |
parent | 087cfc73598abdabb2f28be876ee6403d9190e86 (diff) | |
download | linux-stable-23f8bea3e9d91a2553342172ef54972c01cb7616.tar.gz linux-stable-23f8bea3e9d91a2553342172ef54972c01cb7616.tar.bz2 linux-stable-23f8bea3e9d91a2553342172ef54972c01cb7616.zip |
virtio_net: Fix recursive call to cpus_read_lock()
[ Upstream commit de33212f768c5d9e2fe791b008cb26f92f0aa31c ]
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.
Fixes: 47be24796c13 ("virtio-net: fix the set affinity bug when CPU IDs are not consecutive")
Signed-off-by: Jeff Dike <jdike@akamai.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/r/20201223025421.671-1-jdike@akamai.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ncsi')
0 files changed, 0 insertions, 0 deletions