From nobody Mon Feb 9 16:53:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1624460343738596.6308532668864; Wed, 23 Jun 2021 07:59:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-469-9MemUj6_NYq0POwk1PzAsw-1; Wed, 23 Jun 2021 10:59:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C64B4100C664; Wed, 23 Jun 2021 14:58:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F83310016F8; Wed, 23 Jun 2021 14:58:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6869E1809CB3; Wed, 23 Jun 2021 14:58:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15NEwjxS023175 for ; Wed, 23 Jun 2021 10:58:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 254F3207AC5A; Wed, 23 Jun 2021 14:58:45 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F2CD2039D99 for ; Wed, 23 Jun 2021 14:58:45 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 037F718A01AF for ; Wed, 23 Jun 2021 14:58:45 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.223]) by relay.mimecast.com with ESMTP id us-mta-355-dWuYIIuTOOCJdoXLZIBmjQ-1; Wed, 23 Jun 2021 10:58:39 -0400 Received: from clientip-171.223.99.176?logid-ce8d40bd209a417a9c0477d64b186814 (unknown [172.18.0.48]) by chinatelecom.cn (HERMES) with SMTP id 0AFC82800AA; Wed, 23 Jun 2021 22:58:37 +0800 (CST) Received: from ([172.18.0.48]) by app0024 with ESMTP id ef1ccc87259a427b8f9afe572508e9c8 for libvir-list@redhat.com; Wed Jun 23 22:58:35 2021 X-MC-Unique: 9MemUj6_NYq0POwk1PzAsw-1 X-MC-Unique: dWuYIIuTOOCJdoXLZIBmjQ-1 HMM_SOURCE_IP: 172.18.0.48:49946.1150308706 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: ef1ccc87259a427b8f9afe572508e9c8 X-filter-score: X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.48 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: libvir-list@redhat.com Subject: [PATCH v2 3/4] conf: introduce dirty_ring_size in struct "_virDomainDef" Date: Wed, 23 Jun 2021 22:58:17 +0800 Message-Id: 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.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15NEwjxS023175 X-loop: libvir-list@redhat.com Cc: Hyman , peterx X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Hyman Huang(=E9=BB=84=E5=8B=87) introduce dirty_ring_size to hold the ring size configured by user, and pass dirty_ring_size when building qemu commandline if dirty ring feature enabled. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- src/conf/domain_conf.c | 78 +++++++++++++++++++++++++++++++++++++++++++++= ++++ src/conf/domain_conf.h | 4 +++ src/qemu/qemu_command.c | 3 ++ 3 files changed, 85 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f65509d..09d2f95 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -204,6 +204,7 @@ VIR_ENUM_IMPL(virDomainKVM, "hidden", "hint-dedicated", "poll-control", + "dirty-ring", ); =20 VIR_ENUM_IMPL(virDomainXen, @@ -4752,6 +4753,16 @@ virDomainDefPostParseMemtune(virDomainDef *def) } } =20 +static void +virDomainDefPostParseFeatures(virDomainDef *def) +{ + if (def->features[VIR_DOMAIN_FEATURE_KVM] =3D=3D VIR_TRISTATE_SWITCH_O= N && + def->kvm_features[VIR_DOMAIN_KVM_DIRTY_RING] =3D=3D VIR_TRISTATE_S= WITCH_ON && + def->dirty_ring_size =3D=3D 0) { + /* set 4096 as default size if dirty ring size not congfigured */ + def->dirty_ring_size =3D 4096; + } +} =20 static int virDomainDefAddConsoleCompat(virDomainDef *def) @@ -6003,6 +6014,8 @@ virDomainDefPostParseCommon(virDomainDef *def, =20 virDomainDefPostParseMemtune(def); =20 + virDomainDefPostParseFeatures(def); + if (virDomainDefRejectDuplicateControllers(def) < 0) return -1; =20 @@ -17574,6 +17587,9 @@ virDomainFeaturesDefParse(virDomainDef *def, if (def->features[VIR_DOMAIN_FEATURE_KVM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { int feature; virTristateSwitch value; + xmlNodePtr node =3D NULL; + + node =3D ctxt->node; if ((n =3D virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) return -1; =20 @@ -17598,11 +17614,44 @@ virDomainFeaturesDefParse(virDomainDef *def, def->kvm_features[feature] =3D value; break; =20 + case VIR_DOMAIN_KVM_DIRTY_RING: + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, + &value) < 0) + return -1; + + def->kvm_features[feature] =3D value; + + if (((virDomainKVM) feature) =3D=3D VIR_DOMAIN_KVM_DIR= TY_RING && + value =3D=3D VIR_TRISTATE_SWITCH_ON) { + ctxt->node =3D nodes[i]; + + if (virXMLPropString(ctxt->node, "size")) { + if (virXPathUInt("string(./@size)", ctxt, + &def->dirty_ring_size) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid number of dirty r= ing size")); + return -1; + } + + if ((def->dirty_ring_size & (def->dirty_ring_s= ize - 1)) !=3D 0 || + def->dirty_ring_size < 1024 || + def->dirty_ring_size > 65536) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("dirty ring must be power= of 2 " + "and ranges [1024, 65536]= ")); + return -1; + } + } + } + break; + case VIR_DOMAIN_KVM_LAST: break; } } VIR_FREE(nodes); + ctxt->node =3D node; } =20 if (def->features[VIR_DOMAIN_FEATURE_XEN] =3D=3D VIR_TRISTATE_SWITCH_O= N) { @@ -21636,7 +21685,27 @@ virDomainDefFeaturesCheckABIStability(virDomainDef= *src, virTristateSwitchTypeToString(dst->kvm_= features[i])); return false; } + break; + + case VIR_DOMAIN_KVM_DIRTY_RING: + if (src->kvm_features[i] !=3D dst->kvm_features[i]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of KVM feature '%s' differs: " + "source: '%s', destination: '%s'"), + virDomainKVMTypeToString(i), + virTristateSwitchTypeToString(src->kvm_= features[i]), + virTristateSwitchTypeToString(dst->kvm_= features[i])); + return false; + } =20 + if (src->dirty_ring_size !=3D dst->dirty_ring_size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("dirty ring size of KVM feature '%s' = differs: " + "source: '%d', destination: '%d'"), + virDomainKVMTypeToString(i), + src->dirty_ring_size, dst->dirty_ring_s= ize); + return false; + } break; =20 case VIR_DOMAIN_KVM_LAST: @@ -27614,6 +27683,15 @@ virDomainDefFormatFeatures(virBuffer *buf, def->kvm_features[j])); break; =20 + case VIR_DOMAIN_KVM_DIRTY_RING: + if (def->kvm_features[j] !=3D VIR_TRISTATE_SWITCH_ABSE= NT) { + virBufferAsprintf(&childBuf, "<%s state=3D'%s' siz= e=3D'%d'/>\n", + virDomainKVMTypeToString(j), + virTristateSwitchTypeToString(de= f->kvm_features[j]), + def->dirty_ring_size); + } + break; + case VIR_DOMAIN_KVM_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f706c49..a479b68 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2058,6 +2058,7 @@ typedef enum { VIR_DOMAIN_KVM_HIDDEN =3D 0, VIR_DOMAIN_KVM_DEDICATED, VIR_DOMAIN_KVM_POLLCONTROL, + VIR_DOMAIN_KVM_DIRTY_RING, =20 VIR_DOMAIN_KVM_LAST } virDomainKVM; @@ -2882,6 +2883,9 @@ struct _virDomainDef { callbacks failed for a non-critical reason (was not able to fill in some data) and thus should be re-run before starting */ + + /* size of dirty ring for each vcpu */ + unsigned int dirty_ring_size; }; =20 =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 81fe67e..d1e9bee 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6587,6 +6587,9 @@ qemuBuildCpuCommandLine(virCommand *cmd, virBufferAddLit(&buf, ",kvm-poll-control=3Don"); break; =20 + case VIR_DOMAIN_KVM_DIRTY_RING: + break; + case VIR_DOMAIN_KVM_LAST: break; } --=20 1.8.3.1