From nobody Sun Dec 7 13:35:52 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=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1739984973496622.8595110099781; Wed, 19 Feb 2025 09:09:33 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E357A1CEF; Wed, 19 Feb 2025 12:09:32 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CD7661D30; Wed, 19 Feb 2025 12:02:32 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E8BB91D24; Wed, 19 Feb 2025 12:02:26 -0500 (EST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 BF50C1996 for ; Wed, 19 Feb 2025 12:02:05 -0500 (EST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220ca204d04so97802305ad.0 for ; Wed, 19 Feb 2025 09:02:05 -0800 (PST) Received: from localhost.localdomain ([2001:4490:4ea9:8374:8512:e327:fdaf:a56e]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-220d558fe3asm106651545ad.234.2025.02.19.09.02.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Feb 2025 09:02:03 -0800 (PST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,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=gmail.com; s=20230601; t=1739984524; x=1740589324; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i7E4vSqHzp/ii0kfdr9RBHT5QZ9KdnMHLgtrd4gZT1M=; b=PEdjJZWQ84T7CYOOFyHrwwm6GhkoW+UZgcCVDOfJGSp9a2JzgbVPx/+hiK3jjPTjEQ wO2+XpMFGH++9R+cP0CpVYJseu8pP+Fh1YtGaZFFBGoYMZR/E8wZds6fIFEqykM50cam /XNw3jVeUuvU7hkq2YfMQfvudfCL/cfmVR9usG4uXasR2Oak5VgsJL841gNSLOCl+vp7 pWXUDZDZCZ0AYqy6ZGCL5y17uJbKL/ZWugHBy8e80BMp22E3cUA3qckUHkKbiyyqtJjP 4smajG+HLQRwp01436B7ouUl1Wt5pGFfWBsavkRuClcaQyVc4jWv+yVFknbNsfy++mP3 uMHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739984524; x=1740589324; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i7E4vSqHzp/ii0kfdr9RBHT5QZ9KdnMHLgtrd4gZT1M=; b=G6X0fG2ejHspMymwTazz/uvJ5caYt+A/6Y2ihdDcpHJt4kteq2LHea6UGVSiVPKPdP R0Pz6xN6dEbhfaYitR4ynO/B1wbURembJxhxUuDIoDH+i4u6np59O68wzXe9/ic+JVX0 +t+YSCQ54aQQp5pD+bZWdkCk+06K27B1N8lan1ZXXCCS7Dzxa3dsGlgwEQdQa5ENJVQM 7IcyAMnKCx5MGwN2SZSiM2/6JGrZ4OQWed/jw5DQQkP5s/fEDf1ti5wjCCPljpZIH0uY qfu66SeE4rrXPhBXG3sU/tw5VW9vxgBHer1ecSzLSUHEC4iZRVy1GFemNzt/7lpbvyKy cAFQ== X-Gm-Message-State: AOJu0YyAmdrBmbphuONWm2PHfCaSXwK01fzOGvZD8pvMhMkEUAJ1abNK K9Zxgeb/eMAr8bmSl6S/D1Yyqd/CNzfH7BSIkgxFm9iuqjQNqSSbgTjbyyUW X-Gm-Gg: ASbGncsE9dy+7l9GuopdbR8ltAc3BHIz5aaQDlwnh4mISvA2yrCfd+kbwKekJAuTSIo p6+lvvx1N7D25M+HOQKYU8YnRsd1SPfviUG3qeNpH2g6K2/R/X2ttKUkjqb+yYbk63vCGiA+AQo jovCGk60kAAjqbm/C+fk/cQN3wCf0ocu4+8ooQNXfuFZQP1jeRicM7ugUWIh0vxKaQjgPfg0fzU 5zbRNNHdoqwRae+F+DcvRwFmrMa/zqLJR5mAxJO2Yab04xy1RB/FNbcwu0cywTz3M2NZOTLweLK sOOzNOgk/9OG5a12ZuT0RgbScFv86E68H9MTtmnxlU+hMUFC4s/feDuonw== X-Google-Smtp-Source: AGHT+IHEQXhPZPdQQiipml7qDcLNUkX0uBb6GAfnsXh73Ldx091cF9ezzzdCzZ6xZJv3jGsZe90RpA== X-Received: by 2002:a17:902:d2c6:b0:220:c095:901e with SMTP id d9443c01a7336-2217119ecedmr74336985ad.35.1739984524254; Wed, 19 Feb 2025 09:02:04 -0800 (PST) From: Harikumar Rajkumar To: devel@lists.libvirt.org Subject: [PATCH v8 11/18] qemu: block: Support block disk along with throttle filters Date: Wed, 19 Feb 2025 22:27:15 +0530 Message-Id: <20250219165722.26348-12-harirajkumar230@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250219165722.26348-1-harirajkumar230@gmail.com> References: <20250219165722.26348-1-harirajkumar230@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PHNF5K4R54TD57BUBO3LFL4XTCAULFEZ X-Message-ID-Hash: PHNF5K4R54TD57BUBO3LFL4XTCAULFEZ X-MailFrom: harirajkumar230@gmail.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: sanjeev.ranjan@ibm.com, harikumar.rajkumar@ibm.com, earulana@in.ibm.com, Chun Feng Wu , Harikumar Rajkumar 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: 1739984978891019000 Content-Type: text/plain; charset="utf-8" From: Chun Feng Wu For hot attaching/detaching * Leverage qemuBlockThrottleFiltersData to prepare attaching/detaching throttle filter data for qemuMonitorBlockdevAdd and qemuMonitorBlockdevDel * For hot attaching, within qemuDomainAttachDiskGeneric,prepare throttle filters json data, and create corresponding blockdev for QMP request ("blockdev-add" with "driver":"throttle") * Each filter has a nodename, and those filters are chained up, create them in sequence, and delete them reversely * Delete filters by "qemuBlockThrottleFiltersDetach"("blockdev-del") when detaching device For throttle group commandline * Add qemuBuildThrottleGroupCommandLine in qemuBuildCommandLine to add "object" of throttle-group * Verify throttle group definition when lauching vm * Check QEMU_CAPS_OBJECT_JSON before "qemuBuildObjectCommandlineFromJSON", which is to build "-object" option For throttle filter commandline * Add qemuBuildDiskThrottleFiltersCommandLine in qemuBuildDiskCommandLine to add "blockdev" Signed-off-by: Chun Feng Wu * Apply suggested coding style changes. * Update of code documentation comments. Signed-off-by: Harikumar Rajkumar --- src/qemu/qemu_command.c | 99 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.c | 21 +++++++++ 2 files changed, 120 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 750edd4faa..6d9efbe887 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2045,6 +2045,99 @@ qemuBuildBlockStorageSourceAttachDataCommandline(vir= Command *cmd, } =20 =20 +static inline bool +qemuDiskConfigThrottleGroupEnabled(const virDomainThrottleGroupDef *group) +{ + return !!group->group_name && + virDomainBlockIoTuneInfoHasAny(group); +} + + +/** + * qemuBuildThrottleGroupCommandLine: + * @cmd: the command to modify + * @def: domain definition + * @qemuCaps: qemu capabilities object + * + * build throttle group object in json format + */ +static int +qemuBuildThrottleGroupCommandLine(virCommand *cmd, + const virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + size_t i; + + for (i =3D 0; i < def->nthrottlegroups; i++) { + g_autoptr(virJSONValue) props =3D NULL; + g_autoptr(virJSONValue) limits =3D virJSONValueNewObject(); + virDomainThrottleGroupDef *group =3D def->throttlegroups[i]; + /* prefix group name with "throttle-" in QOM */ + g_autofree char *prefixed_group_name =3D g_strdup_printf("throttle= -%s", group->group_name); + + if (!qemuDiskConfigThrottleGroupEnabled(group)) { + continue; + } + + if (qemuMonitorThrottleGroupLimits(limits, group) < 0) + return -1; + + if (qemuMonitorCreateObjectProps(&props, "throttle-group", prefixe= d_group_name, + "a:limits", &limits, + NULL) < 0) + return -1; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("This QEMU doesn't support throttle group cre= ation")); + return -1; + } + + if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + return -1; + } + + return 0; +} + + +static int +qemuBuildBlockThrottleFilterCommandline(virCommand *cmd, + qemuBlockThrottleFilterAttachData = *data) +{ + if (data->filterProps) { + g_autofree char *tmp =3D NULL; + if (!(tmp =3D virJSONValueToString(data->filterProps, false))) + return -1; + + virCommandAddArgList(cmd, "-blockdev", tmp, NULL); + } + + return 0; +} + + +static int +qemuBuildDiskThrottleFiltersCommandLine(virCommand *cmd, + virDomainDiskDef *disk) +{ + g_autoptr(qemuBlockThrottleFiltersData) data =3D NULL; + size_t i; + + data =3D qemuBuildThrottleFiltersAttachPrepareBlockdev(disk); + if (!data) + return -1; + + for (i =3D 0; i < data->nfilterdata; i++) { + if (qemuBuildBlockThrottleFilterCommandline(cmd, + data->filterdata[i]) <= 0) + return -1; + } + + return 0; +} + + static int qemuBuildDiskSourceCommandLine(virCommand *cmd, virDomainDiskDef *disk, @@ -2102,6 +2195,9 @@ qemuBuildDiskCommandLine(virCommand *cmd, if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; =20 + if (qemuBuildDiskThrottleFiltersCommandLine(cmd, disk) < 0) + return -1; + /* SD cards are currently instantiated via -drive if=3Dsd, so the -dev= ice * part must be skipped */ if (qemuDiskBusIsSD(disk->bus)) @@ -10479,6 +10575,9 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 + if (qemuBuildThrottleGroupCommandLine(cmd, def, qemuCaps) < 0) + return NULL; + if (virDomainNumaGetNodeCount(def->numa) && qemuBuildNumaCommandLine(cfg, def, cmd, priv) < 0) return NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 28ca321c5c..75437164ca 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -708,6 +708,7 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, virDomainAsyncJob asyncJob) { g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; + g_autoptr(qemuBlockThrottleFiltersData) filterData =3D NULL; qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virJSONValue) devprops =3D NULL; bool extensionDeviceAttached =3D false; @@ -746,6 +747,15 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, if (rc < 0) goto rollback; =20 + if ((filterData =3D qemuBuildThrottleFiltersAttachPrepareBlockdev(= disk))) { + if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) + return -1; + rc =3D qemuBlockThrottleFiltersAttach(priv->mon, filterData); + qemuDomainObjExitMonitor(vm); + if (rc < 0) + goto rollback; + } + if (disk->transient) { g_autoptr(qemuBlockStorageSourceAttachData) backend =3D NULL; g_autoptr(GHashTable) blockNamedNodeData =3D NULL; @@ -817,6 +827,8 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, if (extensionDeviceAttached) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &disk->inf= o)); =20 + qemuBlockThrottleFiltersDetach(priv->mon, filterData); + qemuBlockStorageSourceChainDetach(priv->mon, data); =20 qemuDomainObjExitMonitor(vm); @@ -4686,6 +4698,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, { qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_autoptr(qemuBlockStorageSourceChainData) diskBackend =3D NULL; + g_autoptr(qemuBlockThrottleFiltersData) filterData =3D NULL; size_t i; qemuDomainObjPrivate *priv =3D vm->privateData; int ret =3D -1; @@ -4726,6 +4739,14 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(vm); =20 + if ((filterData =3D qemuBuildThrottleFiltersDetachPrepareBlockdev(disk= ))) { + + qemuBlockThrottleFiltersDetach(priv->mon, filterData); + } + qemuDomainObjExitMonitor(vm); + + qemuDomainObjEnterMonitor(vm); + if (diskBackend) qemuBlockStorageSourceChainDetach(priv->mon, diskBackend); =20 --=20 2.39.5 (Apple Git-154)