From nobody Tue Dec 16 16:42:13 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 1739550893980135.16147997382723; Fri, 14 Feb 2025 08:34:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D48A01BF0; Fri, 14 Feb 2025 11:34:52 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DDACD1C4D; Fri, 14 Feb 2025 11:30:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5DF5E1B38; Fri, 14 Feb 2025 11:30:35 -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 59B201B1B for ; Fri, 14 Feb 2025 11:30:14 -0500 (EST) Received: from mx-prod-mc-08.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-231-gO4dqm-qMVSLgZkIOUs2eg-1; Fri, 14 Feb 2025 11:30:12 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D12821801A35 for ; Fri, 14 Feb 2025 16:30:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BB04E1955DCE; Fri, 14 Feb 2025 16:30:10 +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=-0.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=1739550614; 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=Yc9zHjxi3CVmhN6ZFTsikVyoIk+3bjmAJo7i6ams8f8=; b=aTy/tlBdrKYsNfjDKOVLfINByhB6I1MTwBLvW5TziBRAUXJfxzQD8/CRiuGIUB0hjzhY5a DgCjXH4VJ+Fn7GlkVTi2yBqEbUZXqt5pUVlgWeR7N993HPNHq2nDw3HjOGxnPOfN4s60mD 0TcGDVL+46+iNuq8LFVlRWN9v75hai4= X-MC-Unique: gO4dqm-qMVSLgZkIOUs2eg-1 X-Mimecast-MFC-AGG-ID: gO4dqm-qMVSLgZkIOUs2eg_1739550611 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 12/13] qemu: Implement support for iothread <-> virtqueue mapping for 'virtio-scsi' controllers Date: Fri, 14 Feb 2025 17:29:46 +0100 Message-ID: <241681dcbed8388d8bb36b0ad620f62c78f9d5be.1739550300.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NlhCHQw63LUKxeRs-PqGMhCGq_Y6uUbjOLtpDDV_YlE_1739550611 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SMPCRZJOTLQAPGDNBILTBSJZO3FKXIDU X-Message-ID-Hash: SMPCRZJOTLQAPGDNBILTBSJZO3FKXIDU 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: 1739550896767019100 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 | 6 ++++++ src/qemu/qemu_validate.c | 32 +++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b76fec27c5..ea98dee912 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2510,6 +2510,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; @@ -2521,11 +2522,16 @@ qemuBuildControllerSCSIDevProps(virDomainController= Def *def, qemuCaps))) return NULL; + if (def->iothreads && + !(iothreadsMapping =3D qemuBuildIothreadMappingProps(def->ioth= reads))) + return NULL; + if (def->iothread > 0) iothread =3D g_strdup_printf("iothread%u", def->iothread); if (virJSONValueObjectAdd(&props, "S:iothread", iothread, + "A:iothread-vq-mapping", &iothreadsMappi= ng, "s:id", def->info.alias, "p:num_queues", def->queues, "p:cmd_per_lun", def->cmd_per_lun, diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 2185e31a27..617cf69f1e 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3601,9 +3601,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 && @@ -3614,8 +3615,22 @@ 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) { + 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; + } + + /* The 'virtio-scsi' device has two extra internal queues 'ctrl' a= nd + * 'event' with indices '0' and '1' which need to be covered by ma= pping */ + if (qemuDomainValidateIothreadMapping(def, controller->iothreads, + controller->queues + 2) < 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); @@ -3628,13 +3643,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; @@ -4308,7 +4325,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