From nobody Fri May 3 12:48:44 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601654982; cv=none; d=zohomail.com; s=zohoarc; b=Q3EaehGNK2680taX5frumY7N02PFUo0Ke61VzAdcngFWXpCQUZd1DEzMeSj9kPGHXpYc/HGVLUTCe2zXV5vGqhb5HtgGRaKmYEBa/SSI0E5Kfk68i5obiGbtUpiu/Vo7ys4q0W45uuBmof6VuSECOl5FdOxty9HhUJ0nWxi8hQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601654982; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=D2X5V1YzOB7p5lSYIEGGKG+oti2XNx6CpG1DU+0zFjI=; b=fzmf3gexBNdqspbsbhR6/z5ONxxERuDMJOe1auybh/YkdSoEtBvTIoN1ltkagP6B/X3A8IN3tW0Ik5zznvVSUnFIqI5oUbM4nXR2GU7R0iKC8lLDQqpr8Xv1WhCvkcCuwTcePk0MNuBxx1w4De6HIrIBWr0zImg+QfwP6M/cx4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1601654982708201.73907944393534; Fri, 2 Oct 2020 09:09:42 -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-393-o9HV46tEMLioSfJQBed-3w-1; Fri, 02 Oct 2020 12:09:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19818101FFA6; Fri, 2 Oct 2020 16:09:32 +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 EA9365C1D7; Fri, 2 Oct 2020 16:09:31 +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 B6B6A183D020; Fri, 2 Oct 2020 16:09:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 092G0Ko4007405 for ; Fri, 2 Oct 2020 12:00:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 881A45C1DA; Fri, 2 Oct 2020 16:00:20 +0000 (UTC) Received: from npache.remote.csb (ovpn-119-153.rdu2.redhat.com [10.10.119.153]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7FC85C1D7; Fri, 2 Oct 2020 16:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601654981; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D2X5V1YzOB7p5lSYIEGGKG+oti2XNx6CpG1DU+0zFjI=; b=SRPpCZMU8qnCauzFaXNgndPB9TGDyzfSuwB2NqpBwi2kj7NHtUdPq1zClyNGWhrXxBpOAB +aMYsY8cLsIPBOGQtVVDpzbtAeyU4akbp/W/IdNt4VF65kSiHn0sekk6CJPvNShvrn+LHd GdsoW8hP792yCDOtYHjPaGa4kgwImc0= X-MC-Unique: o9HV46tEMLioSfJQBed-3w-1 From: Nico Pache To: libvir-list@redhat.com, david@redhat.com, nitesh@redhat.com Subject: [PATCH 1/1] Optional free-page-reporting can be enabled/disabled for memballon device of model 'virtio'. Date: Fri, 2 Oct 2020 11:59:43 -0400 Message-Id: <26f0e7b019df9aafd584b374a72ea51c939c3cc9.1601654269.git.npache@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Fri, 02 Oct 2020 12:09:18 -0400 Cc: ddutile@redhat.com, npache@redhat.com, ehabkost@redhat.com 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.79 on 10.5.11.16 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" xml: qemu: qemu -device virtio-balloon-pci,...,free-page-reporting=3Don This kernel feature allows for more stable and resource friendly systems. Signed-off-by: Nico Pache --- docs/formatdomain.rst | 6 ++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 21 +++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_validate.c | 7 +++++++ .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + 10 files changed, 51 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f3cf9e1fb3..f4c7765f5f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6755,6 +6755,12 @@ Example: manually added device with static PCI slot = 2 requested release some memory at the last moment before a guest's process get kil= led by Out of Memory killer. :since:`Since 1.3.1, QEMU and KVM only` =20 +``free-page-reporting`` + The optional ``free-page-reporting`` attribute allows to enable/disable + ("on"/"off", respectively) the ability of the QEMU virtio memory balloo= n to + return unused pages back to the hypervisor to be used by other guests or + processes. :since:`Since 5.1, QEMU and KVM only` + ``period`` The optional ``period`` allows the QEMU virtio memory balloon driver to provide statistics through the ``virsh dommemstat [domain]`` diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4b7e460148..4c32b3555f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4539,6 +4539,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b80d7c7c6c..f4b8e8d8c3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15384,6 +15384,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPt= r xmlopt, VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int period =3D 0; g_autofree char *model =3D NULL; + g_autofree char *freepage_reporting =3D NULL; g_autofree char *deflate =3D NULL; =20 if (VIR_ALLOC(def) < 0) @@ -15409,6 +15410,13 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionP= tr xmlopt, goto error; } =20 + if ((freepage_reporting =3D virXMLPropString(node, "free-page-reporting= ")) && + (def->free_page_reporting =3D virTristateSwitchTypeFromString(freep= age_reporting)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid free-page-reporting attribute value '%s'= "), freepage_reporting); + goto error; + } + ctxt->node =3D node; if (virXPathUInt("string(./stats/@period)", ctxt, &period) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -23630,6 +23638,15 @@ virDomainMemballoonDefCheckABIStability(virDomainM= emballoonDefPtr src, return false; } =20 + if (src->free_page_reporting !=3D dst->free_page_reporting) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target balloon free-page-reporting attribute val= ue " + "'%s' does not match source '%s'"), + virTristateSwitchTypeToString(dst->free_page_report= ing), + virTristateSwitchTypeToString(src->free_page_report= ing)); + return false; + } + if (src->virtio && dst->virtio && !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) return false; @@ -27737,6 +27754,10 @@ virDomainMemballoonDefFormat(virBufferPtr buf, virBufferAsprintf(&attrBuf, " autodeflate=3D'%s'", virTristateSwitchTypeToString(def->autodeflate)); =20 + if (def->free_page_reporting !=3D VIR_TRISTATE_SWITCH_ABSENT) + virBufferAsprintf(&attrBuf, " free-page-reporting=3D'%s'", + virTristateSwitchTypeToString(def->free_page_reporting)); + if (def->period) virBufferAsprintf(&childrenBuf, "\n", def->p= eriod); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9a44315519..f5f8baf32c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1790,6 +1790,7 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; int period; /* seconds between collections */ int autodeflate; /* enum virTristateSwitch */ + int free_page_reporting; /* enum virTristateSwitch */ virDomainVirtioOptionsPtr virtio; }; =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5dcfcd574d..88a2c8aacb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -600,7 +600,8 @@ VIR_ENUM_IMPL(virQEMUCaps, =20 /* 380 */ "usb-host.hostdevice", - ); + "virtio-balloon-pci.free-page-reporting", + ); =20 =20 typedef struct _virQEMUCapsMachineType virQEMUCapsMachineType; @@ -1344,6 +1345,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBalloon[] { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL }, { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, + { "free-page-reporting", QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING,= NULL }, }; =20 =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 98d70cfa0e..6f39bf156f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -580,6 +580,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ =20 /* 380 */ QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */ + QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, /*virtio balloon free-pa= ge-reporting */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e9ba81d82f..f80efaf026 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3830,6 +3830,11 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, virTristateSwitchTypeToString(def->memballoon->a= utodeflate)); } =20 + if (def->memballoon->free_page_reporting !=3D VIR_TRISTATE_SWITCH_ABSE= NT) { + virBufferAsprintf(&buf, ",free-page-reporting=3D%s", + virTristateSwitchTypeToString(def->memballoon->free_page= _reporting)); + } + qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio); =20 if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a212605579..cfeb1e67c4 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3926,6 +3926,13 @@ qemuValidateDomainDeviceDefMemballoon(const virDomai= nMemballoonDef *memballoon, return -1; } =20 + if (memballoon->free_page_reporting !=3D VIR_TRISTATE_SWITCH_ABSENT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPO= RTING)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("free-page-reporting is not supported by this QE= MU binary")); + return -1; + } + if (qemuValidateDomainVirtioOptions(memballoon->virtio, qemuCaps) < 0) return -1; =20 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 987beb965e..1f1615b94b 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -243,6 +243,7 @@ + 5001000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 3ee678ef8f..82f9051101 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -243,6 +243,7 @@ + 5001050 0 43100243 --=20 2.18.4