From 73c00ed8e66878302f6a47d4a116f27f68cf9660 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Fri, 25 Nov 2016 12:37:26 +0800 Subject: [PATCH] virtio-net: enable multiqueue by default We use single queue even if multiqueue is enabled and let admin to enable it through ethtool later. This is used to avoid possible regression (small packet TCP stream transmission). But looks like an overkill since: - single queue user can disable multiqueue when launching qemu - brings extra troubles for the management since it needs extra admin tool in guest to enable multiqueue - multiqueue performs much better than single queue in most of the cases So this patch enables multiqueue by default: if #queues is less than or equal to #vcpu, enable as much as queue pairs; if #queues is greater than #vcpu, enable #vcpu queue pairs. Cc: Hannes Frederic Sowa Cc: Michael S. Tsirkin Cc: Neil Horman Cc: Jeremy Eder Cc: Marko Myllynen Cc: Maxime Coquelin Signed-off-by: Jason Wang Acked-by: Neil Horman Acked-by: Michael S. Tsirkin Signed-off-by: David S. Miller (cherry picked from commit 4490001029012539937ff02778fe6180613fa949) Orabug: 26584452 Signed-off-by: Si-Wei Liu Reviewed-by: Joao Martins --- drivers/net/virtio_net.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 546b669fbfdd..0773cf5ef89d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1838,8 +1838,11 @@ static int virtnet_probe(struct virtio_device *vdev) if (vi->any_header_sg) dev->needed_headroom = vi->hdr_len; - /* Use single tx/rx queue pair as default */ - vi->curr_queue_pairs = 1; + /* Enable multiqueue by default */ + if (num_online_cpus() >= max_queue_pairs) + vi->curr_queue_pairs = max_queue_pairs; + else + vi->curr_queue_pairs = num_online_cpus(); vi->max_queue_pairs = max_queue_pairs; /* Allocate/initialize the rx/tx queues, and invoke find_vqs */ @@ -1882,6 +1885,8 @@ static int virtnet_probe(struct virtio_device *vdev) goto free_recv_bufs; } + virtnet_set_affinity(vi); + /* Assume link up if device can't report link status, otherwise get link status from config. */ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { -- 2.50.1