From nobody Wed Mar 12 16:51:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741016104750652.7546499332402; Mon, 3 Mar 2025 07:35:04 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 28067149F; Mon, 3 Mar 2025 10:35:04 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 53FBF14B2; Mon, 3 Mar 2025 10:31:39 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id ECE57A60; Mon, 3 Mar 2025 10:31:33 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C3F1C134F for ; Mon, 3 Mar 2025 10:31:14 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-153-IMb3S_yIMWWneDpxWVVBLA-1; Mon, 03 Mar 2025 10:31:08 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 585631800998 for ; Mon, 3 Mar 2025 15:31:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.15]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4A2691956094; Mon, 3 Mar 2025 15:31:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741015874; 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=gFVS/MR/CNlY4/lccSieiv7e8bQiLaW1pcyP7+VXKWQ=; b=W6bONRcXFvSF6xCmQnGuyuQazsnTg9UkV+PfOXdPFf955kQi/ZkLMkwz3D1TbTGivaT/mm ztoTSKSDFVUDRnyn7w/Hda0ynye/x0RdPGVUVIpTOqBeJnAl1YKq9WA086V8q66eI8mDhZ +ttsjK0h2YpLOHLs7mEkvjUYhfd739U= X-MC-Unique: IMb3S_yIMWWneDpxWVVBLA-1 X-Mimecast-MFC-AGG-ID: IMb3S_yIMWWneDpxWVVBLA_1741015867 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH v2 09/11] qemu: Implement support for iothread <-> virtqueue mapping for 'virtio-scsi' controllers Date: Mon, 3 Mar 2025 16:30:47 +0100 Message-ID: <3f884f1fbe167eab665d611cb42d384fa8dbd081.1741015346.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yvA33dar7-ZPXjEV4bn9Utc8VzH_9qwJ1oeBtSOKPpM_1741015867 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 24BOANRDSGBIOFD4CKZJ267TQSHBWBQU X-Message-ID-Hash: 24BOANRDSGBIOFD4CKZJ267TQSHBWBQU X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Stefan Hajnoczi X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741016106509019000 Content-Type: text/plain; charset="utf-8" Similarly to 'virtio-blk' users can map multiple iothreads and pin them appropriately for 'virtio-scsi' controllers to ensure the best performance. Implement the validation and command line generation based on the helpers we have for 'virtio-blk'. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 22 ++++++++++++++++++++++ src/qemu/qemu_command.h | 2 ++ src/qemu/qemu_validate.c | 34 +++++++++++++++++++++++++++------- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 14d62b98e4..fc0712f836 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1657,6 +1657,15 @@ qemuCommandGetVirtioIothreadMapVirtioBlk(const virDo= mainDiskDef *disk) } +GHashTable * +qemuCommandGetVirtioIothreadMapVirtioSCSI(const virDomainControllerDef *de= f) +{ + const char *internal_queues[] =3D { "ctrl", "event", NULL }; + + return qemuCommandGetVirtioIothreadMap(def->queues, internal_queues); +} + + virJSONValue * qemuBuildDiskDeviceProps(const virDomainDef *def, virDomainDiskDef *disk, @@ -2558,6 +2567,7 @@ qemuBuildControllerSCSIDevProps(virDomainControllerDe= f *def, virQEMUCaps *qemuCaps) { g_autoptr(virJSONValue) props =3D NULL; + g_autoptr(virJSONValue) iothreadsMapping =3D NULL; g_autofree char *iothread =3D NULL; const char *driver =3D NULL; @@ -2569,6 +2579,17 @@ qemuBuildControllerSCSIDevProps(virDomainControllerD= ef *def, qemuCaps))) return NULL; + if (def->iothreads) { + g_autoptr(GHashTable) queueMap =3D NULL; + + if (def->queues > 0) + queueMap =3D qemuCommandGetVirtioIothreadMapVirtioSCSI(def= ); + + if (!(iothreadsMapping =3D qemuBuildIothreadMappingProps(def->= iothreads, + queueMa= p))) + return NULL; + } + if (def->iothread > 0) iothread =3D g_strdup_printf("iothread%u", def->iothread); @@ -2576,6 +2597,7 @@ qemuBuildControllerSCSIDevProps(virDomainControllerDe= f *def, "S:iothread", iothread, "s:id", def->info.alias, "p:num_queues", def->queues, + "A:iothread-vq-mapping", &iothreadsMappi= ng, "p:cmd_per_lun", def->cmd_per_lun, "p:max_sectors", def->max_sectors, "T:ioeventfd", def->ioeventfd, diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 636c2571d4..d69fd793c4 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -280,3 +280,5 @@ struct qemuVirtioIothreadMap { GHashTable * qemuCommandGetVirtioIothreadMapVirtioBlk(const virDomainDiskDef *disk); +GHashTable * +qemuCommandGetVirtioIothreadMapVirtioSCSI(const virDomainControllerDef *de= f); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index f8586a7dff..364bc59cba 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3641,9 +3641,10 @@ qemuValidateDomainDeviceDefControllerIDE(const virDo= mainControllerDef *controlle */ static int qemuValidateCheckSCSIControllerIOThreads(const virDomainControllerDef *con= troller, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCaps *qemuCaps) { - if (!controller->iothread) + if (controller->iothread =3D=3D 0 && !controller->iothreads) return 0; if (controller->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && @@ -3654,8 +3655,24 @@ qemuValidateCheckSCSIControllerIOThreads(const virDo= mainControllerDef *controlle return -1; } - /* Can we find the controller iothread in the iothreadid list? */ - if (!virDomainIOThreadIDFind(def, controller->iothread)) { + if (controller->iothreads) { + g_autoptr(GHashTable) queueMap =3D NULL; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD_MAPPI= NG)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOThread mapping for virtio-scsi controllers= is not available with this QEMU binary")); + return -1; + } + + if (controller->queues > 0) + queueMap =3D qemuCommandGetVirtioIothreadMapVirtioSCSI(control= ler); + + if (qemuDomainValidateIothreadMapping(def, controller->iothreads, = queueMap) < 0) + return -1; + } + + if (controller->iothread > 0 && + !virDomainIOThreadIDFind(def, controller->iothread)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("controller iothread '%1$u' not defined in iothre= adid"), controller->iothread); @@ -3668,13 +3685,15 @@ qemuValidateCheckSCSIControllerIOThreads(const virD= omainControllerDef *controlle static int qemuValidateDomainDeviceDefControllerSCSI(const virDomainControllerDef *co= ntroller, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCaps *qemuCaps) { switch ((virDomainControllerModelSCSI) controller->model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL: - if (qemuValidateCheckSCSIControllerIOThreads(controller, def) = < 0) + if (qemuValidateCheckSCSIControllerIOThreads(controller, def, + qemuCaps) < 0) return -1; break; @@ -4348,7 +4367,8 @@ qemuValidateDomainDeviceDefController(const virDomain= ControllerDef *controller, break; case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: - ret =3D qemuValidateDomainDeviceDefControllerSCSI(controller, def); + ret =3D qemuValidateDomainDeviceDefControllerSCSI(controller, def, + qemuCaps); break; case VIR_DOMAIN_CONTROLLER_TYPE_PCI: --=20 2.48.1