From patchwork Thu Feb 26 07:04:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 443821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2ABA014008F for ; Thu, 26 Feb 2015 18:12:39 +1100 (AEDT) Received: from localhost ([::1]:57642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQscf-00088u-AF for incoming@patchwork.ozlabs.org; Thu, 26 Feb 2015 02:12:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsVs-0000uh-3D for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQsVq-0006ET-Tm for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsVq-0006EA-B7 for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:34 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1Q75WWm019754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 26 Feb 2015 02:05:32 -0500 Received: from jason-ThinkPad-T430s.redhat.com (vpn1-4-223.pek2.redhat.com [10.72.4.223]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1Q74l2O029074; Thu, 26 Feb 2015 02:05:29 -0500 From: Jason Wang To: qemu-devel@nongnu.org Date: Thu, 26 Feb 2015 15:04:44 +0800 Message-Id: <1424934286-7099-10-git-send-email-jasowang@redhat.com> In-Reply-To: <1424934286-7099-1-git-send-email-jasowang@redhat.com> References: <1424934286-7099-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Jason Wang , Richard Henderson , Anthony Liguori , mst@redhat.com Subject: [Qemu-devel] [PATCH V2 09/11] virtio-pci: increase the maximum number of virtqueues to 513 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch increases the maximum number of virtqueues for pci from 64 to 513. This will allow booting a virtio-net-pci device with 256 queue pairs. To keep migration compatibility, 64 was kept for legacy machine types. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Anthony Liguori Cc: Michael S. Tsirkin Signed-off-by: Jason Wang --- hw/i386/pc_piix.c | 6 ++++++ hw/i386/pc_q35.c | 5 +++++ include/hw/virtio/virtio.h | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 38b42b0..821d44c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -49,6 +49,7 @@ #include "hw/acpi/acpi.h" #include "cpu.h" #include "qemu/error-report.h" +#include "include/hw/virtio/virtio-bus.h" #ifdef CONFIG_XEN # include #endif @@ -310,6 +311,11 @@ static void pc_init_pci(MachineState *machine) static void pc_compat_2_2(MachineState *machine) { + ObjectClass *klass = object_class_by_name("virtio-pci-bus"); + VirtioBusClass *k = VIRTIO_BUS_CLASS(klass); + + k->queue_max = 64; + x86_cpu_compat_set_features("kvm64", FEAT_1_EDX, 0, CPUID_VME); x86_cpu_compat_set_features("kvm32", FEAT_1_EDX, 0, CPUID_VME); x86_cpu_compat_set_features("Conroe", FEAT_1_EDX, 0, CPUID_VME); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 63027ee..dc5ada4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -45,6 +45,7 @@ #include "hw/usb.h" #include "hw/cpu/icc_bus.h" #include "qemu/error-report.h" +#include "include/hw/virtio/virtio-bus.h" /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 @@ -289,6 +290,10 @@ static void pc_q35_init(MachineState *machine) static void pc_compat_2_2(MachineState *machine) { + ObjectClass *klass = object_class_by_name("virtio-pci-bus"); + VirtioBusClass *k = VIRTIO_BUS_CLASS(klass); + + k->queue_max = 64; x86_cpu_compat_set_features("kvm64", FEAT_1_EDX, 0, CPUID_VME); x86_cpu_compat_set_features("kvm32", FEAT_1_EDX, 0, CPUID_VME); x86_cpu_compat_set_features("Conroe", FEAT_1_EDX, 0, CPUID_VME); diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index e538f5a..c653ad1 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -92,7 +92,7 @@ typedef struct VirtQueueElement struct iovec out_sg[VIRTQUEUE_MAX_SIZE]; } VirtQueueElement; -#define VIRTIO_PCI_QUEUE_MAX 64 +#define VIRTIO_PCI_QUEUE_MAX 513 #define VIRTIO_CCW_QUEUE_MAX 64 #define VIRTIO_S390_QUEUE_MAX 64 #define VIRTIO_MMIO_QUEUE_MAX 64