[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 01/20] virtio-net: calculating proper msix vectors on init
From: |
Jason Wang |
Subject: |
[PULL V2 01/20] virtio-net: calculating proper msix vectors on init |
Date: |
Mon, 15 Mar 2021 17:14:14 +0800 |
Currently, the default msix vectors for virtio-net-pci is 3 which is
obvious not suitable for multiqueue guest, so we depends on the user
or management tools to pass a correct vectors parameter. In fact, we
can simplifying this by calculating the number of vectors on realize.
Consider we have N queues, the number of vectors needed is 2*N + 2
(#queue pairs + plus one config interrupt and control vq). We didn't
check whether or not host support control vq because it was added
unconditionally by qemu to avoid breaking legacy guests such as Minix.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/core/machine.c | 1 +
hw/virtio/virtio-net-pci.c | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 4386f57..979133f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -39,6 +39,7 @@
GlobalProperty hw_compat_5_2[] = {
{ "ICH9-LPC", "smm-compat", "on"},
{ "PIIX4_PM", "smm-compat", "on"},
+ { "virtio-net-pci", "vectors", "3"},
};
const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2);
diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c
index 292d13d..aa0b3ca 100644
--- a/hw/virtio/virtio-net-pci.c
+++ b/hw/virtio/virtio-net-pci.c
@@ -41,7 +41,8 @@ struct VirtIONetPCI {
static Property virtio_net_properties[] = {
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
- DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3),
+ DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
+ DEV_NVECTORS_UNSPECIFIED),
DEFINE_PROP_END_OF_LIST(),
};
@@ -50,6 +51,13 @@ static void virtio_net_pci_realize(VirtIOPCIProxy *vpci_dev,
Error **errp)
DeviceState *qdev = DEVICE(vpci_dev);
VirtIONetPCI *dev = VIRTIO_NET_PCI(vpci_dev);
DeviceState *vdev = DEVICE(&dev->vdev);
+ VirtIONet *net = VIRTIO_NET(vdev);
+
+ if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
+ vpci_dev->nvectors = 2 * MAX(net->nic_conf.peers.queues, 1)
+ + 1 /* Config interrupt */
+ + 1 /* Control vq */;
+ }
virtio_net_set_netclient_name(&dev->vdev, qdev->id,
object_get_typename(OBJECT(qdev)));
--
2.7.4
- [PULL V2 00/20] Net patches, Jason Wang, 2021/03/15
- [PULL V2 01/20] virtio-net: calculating proper msix vectors on init,
Jason Wang <=
- [PULL V2 02/20] net: Fix build error when DEBUG_NET is on, Jason Wang, 2021/03/15
- [PULL V2 03/20] net: validate that ids are well formed, Jason Wang, 2021/03/15
- [PULL V2 04/20] e1000: fail early for evil descriptor, Jason Wang, 2021/03/15
- [PULL V2 05/20] net: introduce qemu_receive_packet(), Jason Wang, 2021/03/15
- [PULL V2 06/20] e1000: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 07/20] dp8393x: switch to use qemu_receive_packet() for loopback packet, Jason Wang, 2021/03/15
- [PULL V2 08/20] msf2-mac: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 09/20] sungem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 10/20] tx_pkt: switch to use qemu_receive_packet_iov() for loopback, Jason Wang, 2021/03/15
- [PULL V2 11/20] rtl8139: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15