From nobody Sat Feb 7 06:55:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660409011; cv=none; d=zohomail.com; s=zohoarc; b=ihaF7X9vf0iZ3C0RtGYh+EwInvKO96oi6nXQIyDOcYuIP/LEkr+rAasajEfT6dtWD9QZcivRX3cAmL1BNVIdwhjnMneP0w0gokGvPSwXvZ4L5d8yrZz5qp6kqOTX4QN9peX4sheDrnb2v/UqoTAe/gbRkhPW867S7a2aOgSlgT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660409011; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2uDUuv8+Jl7csgSN9/C0l42ntiVLPiGvHHs+GyQPRiQ=; b=NepKEHOv8vdKLmXhPkLR3bPjDuuxzZnmRGAjcjB0h3CNUHIRxK19xDQtcmxEopQbtVOj5/uSMTxQc5JGlUltG2l9PAcwbflKrP6+u66g6cxHrPYg+rt8/o2Ho02bRwqAjBZ96XjmVNiWuZzMbUpAzZp5jaD8GIQ3n50uHtegV80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1660409011621316.73500949792344; Sat, 13 Aug 2022 09:43:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-1Mm7zYxBMB6W8UqSJ_bq3Q-1; Sat, 13 Aug 2022 12:43:26 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4DB4805F63; Sat, 13 Aug 2022 16:43:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 930DA2026609; Sat, 13 Aug 2022 16:43:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EBB2E1946A5E; Sat, 13 Aug 2022 16:43:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6FCAC1946A47 for ; Sat, 13 Aug 2022 16:43:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 035B240CF8ED; Sat, 13 Aug 2022 16:43:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2B19400DFD7 for ; Sat, 13 Aug 2022 16:43:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B3A771C05136 for ; Sat, 13 Aug 2022 16:43:18 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.226]) by relay.mimecast.com with ESMTP id us-mta-310--Rw3puInOja_1EY_IJUPDA-1; Sat, 13 Aug 2022 12:43:15 -0400 Received: from clientip-118.116.19.21 (unknown [172.18.0.218]) by chinatelecom.cn (HERMES) with SMTP id 6AE6E2800C0; Sun, 14 Aug 2022 00:31:52 +0800 (CST) Received: from ([172.18.0.218]) by app0025 with ESMTP id 2979f7011ceb4d48a3645ebbd012e1d3 for libvir-list@redhat.com; Sun, 14 Aug 2022 00:31:54 CST DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660409010; h=from:from:sender:sender: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:in-reply-to:references:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=2uDUuv8+Jl7csgSN9/C0l42ntiVLPiGvHHs+GyQPRiQ=; b=fTqEjv9qFxxsWpGc42zWubKe4V1fWncyT9WzDe5fZunAhChv5QX+rL0wBEr228RX7J5sQt MAKWKhaIS9ApuOo/z71YX1XO/gKOaD+Cz662EEHiaNBMPh2/fV2lWAuQr7w/FzVfgBam+y V0hnCQ3AJmAOEwaqzMxB4rZguKCj3V4= X-MC-Unique: 1Mm7zYxBMB6W8UqSJ_bq3Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: -Rw3puInOja_1EY_IJUPDA-1 HMM_SOURCE_IP: 172.18.0.218:42044.1596025118 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 2979f7011ceb4d48a3645ebbd012e1d3 X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.218 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: Subject: [PATCH 10/11] virsh: Add cancel option to vcpudirtylimit api Date: Sun, 14 Aug 2022 00:31:22 +0800 Message-Id: <208b64c5e2ab9b86d3aacefdcb58ef0247de1d7b.1660406068.git.huangy81@chinatelecom.cn> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660409012266100005 Content-Type: text/plain; charset="utf-8" From: Hyman Huang(=E9=BB=84=E5=8B=87) Add cancel option to vcpudirtylimit api to cancel dirty page rate limit for virtual CPUs. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- tools/virsh-domain.c | 64 ++++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index dbdd46e..199913d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13785,7 +13785,6 @@ static const vshCmdOptDef opts_vcpu_dirty_limit[] = =3D { VIRSH_COMMON_OPT_DOMAIN_FULL(0), {.name =3D "rate", .type =3D VSH_OT_INT, - .flags =3D VSH_OFLAG_REQ, .help =3D N_("Upper limit of dirty page rate (MB/s) for " "virtual CPUs.") }, @@ -13793,6 +13792,10 @@ static const vshCmdOptDef opts_vcpu_dirty_limit[] = =3D { .type =3D VSH_OT_INT, .help =3D N_("Index of a virtual CPU.") }, + {.name =3D "cancel", + .type =3D VSH_OT_BOOL, + .help =3D N_("Cancel dirty page rate limit.") + }, {.name =3D NULL} }; =20 @@ -13803,8 +13806,11 @@ cmdVcpuDirtyLimit(vshControl *ctl, const vshCmd *c= md) int vcpu_idx =3D -1; unsigned long long rate =3D 0; bool vcpu =3D vshCommandOptBool(cmd, "vcpu"); + bool cancel =3D vshCommandOptBool(cmd, "cancel"); unsigned int flags =3D 0; =20 + VSH_EXCLUSIVE_OPTIONS("cancel", "rate"); + if (!(dom =3D virshCommandOptDomain(ctl, cmd, NULL))) return false; =20 @@ -13819,28 +13825,46 @@ cmdVcpuDirtyLimit(vshControl *ctl, const vshCmd *= cmd) } } =20 - if (vshCommandOptULongLong(ctl, cmd, "rate", &rate) < 0) - return false; - - if (!rate) { - vshError(ctl, "%s", _("Invalid dirty page rate limit")); - return false; - } + if (!cancel) { + if (vshCommandOptULongLong(ctl, cmd, "rate", &rate) < 0) + return false; =20 - if (vcpu) { - /* set specified vcpu dirty page rate limit of vm */ - if (virDomainSetVcpuDirtyLimit(dom, vcpu_idx, - rate, flags | VIR_DOMAIN_DIRTYLIMIT_VCPU) < 0) + if (!rate) { + vshError(ctl, "%s", _("Invalid dirty page rate limit")); return false; - vshPrintExtra(ctl, _("Set vcpu[%d] dirty page rate limit " - "%lld successfully.\n"), vcpu_idx, rate); + } + + if (vcpu) { + /* set specified vcpu dirty page rate limit of vm */ + if (virDomainSetVcpuDirtyLimit(dom, vcpu_idx, + rate, flags | VIR_DOMAIN_DIRTYLIMIT_VCPU) < 0) + return false; + vshPrintExtra(ctl, _("Set vcpu[%d] dirty page rate limit " + "%lld successfully.\n"), vcpu_idx, rate); + } else { + /* set all vcpu dirty page rate limit of vm */ + if (virDomainSetVcpuDirtyLimit(dom, -1, + rate, flags | VIR_DOMAIN_DIRTYLIMIT_ALL) < 0) + return false; + vshPrintExtra(ctl, _("Set dirty page rate limit %lld on all " + "virtual CPUs successfully.\n"), rate); + } } else { - /* set all vcpu dirty page rate limit of vm */ - if (virDomainSetVcpuDirtyLimit(dom, -1, - rate, flags | VIR_DOMAIN_DIRTYLIMIT_ALL) < 0) - return false; - vshPrintExtra(ctl, _("Set dirty page rate limit %lld on all " - "virtual CPUs successfully.\n"), rate); + if (vcpu) { + /* cancel specified vcpu dirty page rate limit of vm */ + if (virDomainCancelVcpuDirtyLimit(dom, vcpu_idx, + flags | VIR_DOMAIN_DIRTYLIMIT_VCPU) < 0) + return false; + vshPrintExtra(ctl, _("Cancel vcpu[%d] dirty page rate limit " + "successfully.\n"), vcpu); + } else { + /* cancel all vcpu dirty page rate limit of vm */ + if (virDomainCancelVcpuDirtyLimit(dom, -1, + flags | VIR_DOMAIN_DIRTYLIMIT_ALL) < 0) + return false; + vshPrintExtra(ctl, _("Cancel dirty page rate limit on all " + "virtual CPUs successfully.\n")); + } } =20 return true; --=20 1.8.3.1