virtio-net: correctly enable multiqueue

jasowang · davem330 · commit a220871be66f · 2016-12-13T10:37:38.000-05:00
Commit 4490001 ("virtio-net: enable multiqueue by default") blindly set the affinity instead of queues during probe which can cause a mismatch of #queues between guest and host. This patch fixes it by setting queues. Reported-by: Theodore Ts'o <tytso@mit.edu> Tested-by: Theodore Ts'o <tytso@mit.edu> Cc: Neil Horman <nhorman@tuxdriver.com> Cc: Michael S. Tsirkin <mst@redhat.com> Fixes: 49000102901 ("virtio-net: enable multiqueue by default") Signed-off-by: Jason Wang <jasowang@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
@@ -1930,7 +1930,9 @@ static int virtnet_probe(struct virtio_device *vdev)
 		goto free_unregister_netdev;
 	}
 
-	virtnet_set_affinity(vi);
+	rtnl_lock();
+	virtnet_set_queues(vi, vi->curr_queue_pairs);
+	rtnl_unlock();
 
 	/* Assume link up if device can't report link status,
 	   otherwise get link status from config. */

Original file line number	Diff line number	Diff line change
`@@ -1930,7 +1930,9 @@ static int virtnet_probe(struct virtio_device *vdev)`
`1930`	`1930`	`goto free_unregister_netdev;`
`1931`	`1931`	`}`
`1932`	`1932`
`1933`		`- virtnet_set_affinity(vi);`
	`1933`	`+ rtnl_lock();`
	`1934`	`+ virtnet_set_queues(vi, vi->curr_queue_pairs);`
	`1935`	`+ rtnl_unlock();`
`1934`	`1936`
`1935`	`1937`	`/* Assume link up if device can't report link status,`
`1936`	`1938`	`otherwise get link status from config. */`