From patchwork Thu Jan 16 10:58:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1224148 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gyXgj8Fe; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47z1WT3Bdfz9sR0 for ; Thu, 16 Jan 2020 22:03:01 +1100 (AEDT) Received: from localhost ([::1]:39924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is2vS-00017i-Vj for incoming@patchwork.ozlabs.org; Thu, 16 Jan 2020 06:02:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50825) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is2s2-00064j-G1 for qemu-devel@nongnu.org; Thu, 16 Jan 2020 05:59:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1is2ry-00004s-Hd for qemu-devel@nongnu.org; Thu, 16 Jan 2020 05:59:26 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:32487 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1is2ry-0008W4-DD for qemu-devel@nongnu.org; Thu, 16 Jan 2020 05:59:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579172362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1EJUAyINaXAVU17lKziI/hzu+/NjWM5FzY/Y9KFvO6g=; b=gyXgj8Fe7hIu3DT31G033Q/bPlbfe21Za9qNn9mAoKlplniLdTxuG6QSDVBLepZcTo1ctH zhVxkdR8+aGJMZoo34p+mmWGJ6PHwCqSuA8nlzqDqu4/wf4lDd8QwKgvm5z3w9wSK3Ra5w y8YZYFskWyjM814B+quJlEdwp0YMS0Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-ldWcLZtmNiyCgIbDYhJ2jQ-1; Thu, 16 Jan 2020 05:59:19 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36C6C107ACC9; Thu, 16 Jan 2020 10:59:18 +0000 (UTC) Received: from localhost (ovpn-117-207.ams2.redhat.com [10.36.117.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id 112A419C5B; Thu, 16 Jan 2020 10:59:12 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 5/5] vhost-user-blk: default num_queues to -smp N Date: Thu, 16 Jan 2020 10:58:42 +0000 Message-Id: <20200116105842.271179-6-stefanha@redhat.com> In-Reply-To: <20200116105842.271179-1-stefanha@redhat.com> References: <20200116105842.271179-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: ldWcLZtmNiyCgIbDYhJ2jQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Automatically size the number of request virtqueues to match the number of vCPUs. This ensures that completion interrupts are handled on the same vCPU that submitted the request. No IPI is necessary to complete an I/O request and performance is improved. This patch duplicates the .get_num_virtqueues() function because vhost-user-blk defines its own qdev property fields and does not share VirtIOBlkConf. Signed-off-by: Stefan Hajnoczi --- hw/block/vhost-user-blk.c | 15 +++++++++++++++ hw/core/machine.c | 1 + hw/virtio/vhost-user-blk-pci.c | 3 ++- include/hw/virtio/vhost-user-blk.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 98b383f90e..ac61ce9835 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -21,6 +21,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "qom/object.h" +#include "hw/boards.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "hw/virtio/vhost.h" @@ -391,6 +392,17 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event) } } +static uint32_t vhost_user_blk_get_num_virtqueues(VirtIODevice *vdev) +{ + VHostUserBlk *s = VHOST_USER_BLK(vdev); + + if (s->num_queues == 1 && s->auto_num_queues) { + return current_machine->smp.cpus; + } + + return s->num_queues; +} + static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -403,6 +415,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) return; } + s->num_queues = vhost_user_blk_get_num_virtqueues(vdev); if (!s->num_queues || s->num_queues > VIRTIO_QUEUE_MAX) { error_setg(errp, "vhost-user-blk: invalid number of IO queues"); return; @@ -501,6 +514,7 @@ static const VMStateDescription vmstate_vhost_user_blk = { static Property vhost_user_blk_properties[] = { DEFINE_PROP_CHR("chardev", VHostUserBlk, chardev), DEFINE_PROP_UINT16("num-queues", VHostUserBlk, num_queues, 1), + DEFINE_PROP_BOOL("auto-num-queues", VHostUserBlk, auto_num_queues, true), DEFINE_PROP_UINT32("queue-size", VHostUserBlk, queue_size, 128), DEFINE_PROP_BIT("config-wce", VHostUserBlk, config_wce, 0, true), DEFINE_PROP_END_OF_LIST(), @@ -514,6 +528,7 @@ static void vhost_user_blk_class_init(ObjectClass *klass, void *data) dc->props = vhost_user_blk_properties; dc->vmsd = &vmstate_vhost_user_blk; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); + vdc->get_num_virtqueues = vhost_user_blk_get_num_virtqueues; vdc->realize = vhost_user_blk_device_realize; vdc->unrealize = vhost_user_blk_device_unrealize; vdc->get_config = vhost_user_blk_update_config; diff --git a/hw/core/machine.c b/hw/core/machine.c index a33d1e93b1..0d4142c3c8 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -35,6 +35,7 @@ GlobalProperty hw_compat_4_2[] = { { "virtio-scsi-device", "seg_max_adjust", "off"}, { "vhost-blk-device", "seg_max_adjust", "off"}, { "vhost-scsi", "auto_num_queues", "off"}, + { "vhost-user-blk", "auto-num-queues", "off"}, { "vhost-user-scsi", "auto_num_queues", "off"}, { "usb-host", "suppress-remote-wake", "off" }, { "usb-redir", "suppress-remote-wake", "off" }, diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c index 1dc834a3ff..328c6a4066 100644 --- a/hw/virtio/vhost-user-blk-pci.c +++ b/hw/virtio/vhost-user-blk-pci.c @@ -53,9 +53,10 @@ static void vhost_user_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) { VHostUserBlkPCI *dev = VHOST_USER_BLK_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev); if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) { - vpci_dev->nvectors = dev->vdev.num_queues + 1; + vpci_dev->nvectors = vdc->get_num_virtqueues(VIRTIO_DEVICE(vdev)) + 1; } qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h index 108bfadeeb..09d1fdf722 100644 --- a/include/hw/virtio/vhost-user-blk.h +++ b/include/hw/virtio/vhost-user-blk.h @@ -31,6 +31,7 @@ typedef struct VHostUserBlk { int32_t bootindex; struct virtio_blk_config blkcfg; uint16_t num_queues; + bool auto_num_queues; uint32_t queue_size; uint32_t config_wce; struct vhost_dev dev;