From nobody Wed Dec 17 08:52:27 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 1739357030693872.7191219823729; Wed, 12 Feb 2025 02:43:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A6662E1E; Wed, 12 Feb 2025 05:43:49 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 387A61A9A; Wed, 12 Feb 2025 05:36:50 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4823D1D43; Wed, 12 Feb 2025 05:36:46 -0500 (EST) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 CA8811D43 for ; Wed, 12 Feb 2025 05:36:18 -0500 (EST) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2ee9a780de4so10058750a91.3 for ; Wed, 12 Feb 2025 02:36:18 -0800 (PST) Received: from localhost.localdomain ([117.251.37.46]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2fbf98b3277sm1147688a91.7.2025.02.12.02.36.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 02:36:16 -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=1739356577; x=1739961377; 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=UW5I7ju3DoBHMK1WzIWJwmj+S/bctE2g4kdF8+iQelI=; b=ckMGBEe7ynbbO4XtRRqIwy1DWwVGQS903X9MjksZdTFLCJX9qkFAsXn6Mfb2PFW04F 7nON8qTBrR6uDavg04mSyKZN7oUdTu4MMgF/oi1y8QXaiM4u7aCueOinor3pv/BIZQ0o h1UdLSf3Zd65HZtSPXc/oQOauSmVoRDLXhT/THUyJo4yOKVCc+8YmCmbi7yA8rQ4oo92 Nwnzfh//JNWXbir3uBbkWyfWOeWuygHfagYRHsOqPjLoEZUPUvva5lFHbqs5fCn005i4 vI79Gfy8Sew3K9k61JA6RhefaNvMIzSi09vKTdJblDbKe2tPupmG3V3hMkQdoJZ5qn5N tVLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739356577; x=1739961377; 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=UW5I7ju3DoBHMK1WzIWJwmj+S/bctE2g4kdF8+iQelI=; b=XJzMnXK6p5xB3SGKeGYFeiLFBWdBfSkesDy8V++8V3bGlu48gkIEjGleO0GkOuUeXm a+Gam4XFX5h7opiOQ38n7espZiXTIeexYIt3zUNrYpD/MwCsGc9P8jA0O7ZLN8eWRfiP /BA6VgbKdRN6K2PzExT19L4k3ZXpmBF4WyqeoxsHnpq02BTtbHZZb1kDUMA/68eqlF8n 6UFDNQ960P1YOyBlGJv4++FC1oMxgEnw0JNKpGEV0ta3OTRcEe0Yj8utL5Xn+eZ0IJiD gYyOUqPML93Hd6zo0kRBcwkwtlQodxbaxVjM6HqTGLIPDZn8+Ryrbz6BDBVFKqZyAXDJ 1a2A== X-Gm-Message-State: AOJu0YzC0A3ra8iuEug5fd+97iIkA/APd5QdK+2CQiZiNEiGfhBnwQY4 4S8gKfjJPJyiMJlEh2cgrYg1eaNMbQeUUuurhFXr+4vMYXzW7qxwL4BQgw== X-Gm-Gg: ASbGncvvOpXKhHtohU05F6mgBM6Szsxrqp5mNoZ7p9mw1Gzd0a0qXh3RA30k1QggpXd uHAD625iJ6HOMGMw33guLI9SPvgkUz9zTlJqRk7ASyoBe9Zf9tgNfotjsD0acK3VtBB2CdvBv9b 67KrCUyjuHDJBWlNBKWEOciItaYRN01ck5WCTlySi0ytfRVNxMYCmNTxUrDftaRpDRNyLkuPOYg xv2TbEWpa1keGLDfogVK28z0ob3yfsN+yQUQPLxbwjzdpcgZiJSCDC1IB4VS1cyVDcS2oO8EBjG jyE9THaIuW7vkxf/JNpWAxKgoLlMJMe1iga+LQjTg9Byug== X-Google-Smtp-Source: AGHT+IFZt96EE4Ee9bLBywMeJC9qySGz54Ly7Euo92hVMh783XPq873TPk4V46JWVcMpaccNHi5I+Q== X-Received: by 2002:a17:90b:23cf:b0:2ee:94d1:7a89 with SMTP id 98e67ed59e1d1-2fbf5baed44mr3759512a91.1.1739356577443; Wed, 12 Feb 2025 02:36:17 -0800 (PST) From: Harikumar Rajkumar To: devel@lists.libvirt.org Subject: [PATCH v7 11/18] qemu: block: Support block disk along with throttle filters Date: Wed, 12 Feb 2025 16:05:30 +0530 Message-Id: <20250212103537.26352-12-harirajkumar230@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250212103537.26352-1-harirajkumar230@gmail.com> References: <20250212103537.26352-1-harirajkumar230@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AQDRDPZ5F5LTY3FFLTNYXTX5SH5QR26S X-Message-ID-Hash: AQDRDPZ5F5LTY3FFLTNYXTX5SH5QR26S 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: harikumar.rajkumar@ibm.com, sanjeev.ranjan@ibm.com, earulana@in.ibm.com, 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: 1739357036308019100 Content-Type: text/plain; charset="utf-8" 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: Harikumar Rajkumar --- src/qemu/qemu_command.c | 99 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_hotplug.c | 21 +++++++++ 3 files changed, 121 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd9c925c63..5d45a3b20c 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)) @@ -10478,6 +10574,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_driver.c b/src/qemu/qemu_driver.c index 6f5d7ad218..7786e757a0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20226,8 +20226,7 @@ qemuDomainSetThrottleGroup(virDomainPtr dom, =20 priv =3D vm->privateData; qemuCaps =3D priv->qemuCaps; - /* this throttle group feature requires "QEMU_CAPS_OBJECT_JSON" - * when starting domain later, so check such flag here as well */ + if (virDomainObjIsActive(vm)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6c224c9793..b4f5208e3e 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); @@ -4673,6 +4685,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; @@ -4713,6 +4726,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)