All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jeff Dike <jdike@akamai.com>
Cc: netdev@vger.kernel.org, David Miller <davem@davemloft.net>,
	virtualization@lists.linux-foundation.org
Subject: Re: [PATCH] virtio_net: Fix recursive call to cpus_read_lock()
Date: Tue, 22 Dec 2020 17:32:29 -0500	[thread overview]
Message-ID: <20201222173209-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20201222033648.14752-1-jdike@akamai.com>

On Mon, Dec 21, 2020 at 10:36:48PM -0500, Jeff Dike wrote:
> 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.
> 
> Signed-off-by: Jeff Dike <jdike@akamai.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  drivers/net/virtio_net.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 052975ea0af4..e02c7e0f1cf9 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -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;
>  }
>  
> -- 
> 2.17.1

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jeff Dike <jdike@akamai.com>
Cc: Jason Wang <jasowang@redhat.com>,
	virtualization@lists.linux-foundation.org,
	netdev@vger.kernel.org, David Miller <davem@davemloft.net>
Subject: Re: [PATCH] virtio_net: Fix recursive call to cpus_read_lock()
Date: Tue, 22 Dec 2020 17:32:29 -0500	[thread overview]
Message-ID: <20201222173209-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20201222033648.14752-1-jdike@akamai.com>

On Mon, Dec 21, 2020 at 10:36:48PM -0500, Jeff Dike wrote:
> 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.
> 
> Signed-off-by: Jeff Dike <jdike@akamai.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  drivers/net/virtio_net.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 052975ea0af4..e02c7e0f1cf9 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -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;
>  }
>  
> -- 
> 2.17.1


  parent reply	other threads:[~2020-12-22 22:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20201222033648.14752-1-jdike@akamai.com>
2020-12-22  3:49 ` [PATCH] virtio_net: Fix recursive call to cpus_read_lock() Jason Wang
2020-12-22  3:49   ` Jason Wang
2020-12-23  2:30   ` Jakub Kicinski
2020-12-22 22:32 ` Michael S. Tsirkin [this message]
2020-12-22 22:32   ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201222173209-mutt-send-email-mst@kernel.org \
    --to=mst@redhat.com \
    --cc=davem@davemloft.net \
    --cc=jdike@akamai.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.