From nobody Mon Feb 9 12:09:03 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; 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=1633772311; cv=none; d=zohomail.com; s=zohoarc; b=PH0gTAKfjAj1YpHdYWMFLzaWClXZHXbW4ieTqOWSWHnzcLftSSML/xFRXeT6SxsdDHrBFRpeRF8EPGLIJv/iz9IgJI+0FXigAloSkncTewsPKFIO6y82F11kthtr3XZSua57VSDqmw3DKAaNB9Ctyq1Vz9Lnlu/WTXcKtMJUrUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633772311; 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=dMslFVhTQywQnbAqepRsitnD/3ri+RO/qLx0Zeb1cvk=; b=cA1RYlIsh58sKyBUHGbZJsWx2NnpwCmpeYz8L90jnkpq15TmGfAnQqRT28W3V2n394vTQZnAvc3S4a/pfzffdrHu82AJwfEe3F7RluttvtmtdQvvy82pGRYvKl3WeR5LeBbq4T0xREHToCtFsJ3UsV8FUi00Tu085Iwofy7MgcU= 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) 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 163377231191682.64634579987194; Sat, 9 Oct 2021 02:38:31 -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-593-IQg-nVg7M7Cc_K8kXqKr5g-1; Sat, 09 Oct 2021 05:38:29 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95C0C10A8E01; Sat, 9 Oct 2021 09:38:24 +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 718B360C05; Sat, 9 Oct 2021 09:38:24 +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 3FB551806D02; Sat, 9 Oct 2021 09:38:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1999c4tZ018531 for ; Sat, 9 Oct 2021 05:38:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8516E60BD8; Sat, 9 Oct 2021 09:38:04 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-36.pek2.redhat.com [10.72.13.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0216257CA0; Sat, 9 Oct 2021 09:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633772310; 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:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dMslFVhTQywQnbAqepRsitnD/3ri+RO/qLx0Zeb1cvk=; b=IoqHUs9X+f6TxAQdBG+C9zIoaFI9eFrm7M578SkjvIGD9y8aYp0ldcWjN+X9CrblO7mn7Y q9b32Qn8GX5Jgd5zjltXt92yR9bwmymBJVADpjPy8nES1+ojJW7gYye3UUz5zS+ktUrCjp EQm820dbCbTYM8PG01m+B4mXZUjZpWc= X-MC-Unique: IQg-nVg7M7Cc_K8kXqKr5g-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 3/3] qemu: Add support for virtio device option page-per-vq Date: Sat, 9 Oct 2021 17:37:44 +0800 Message-Id: <20211009093744.1939247-4-hhan@redhat.com> In-Reply-To: <20211009093744.1939247-1-hhan@redhat.com> References: <20211009093744.1939247-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Han Han , gavi@nvidia.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.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633772313770100001 Content-Type: text/plain; charset="utf-8" Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1925363 Signed-off-by: Han Han --- src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_validate.c | 7 ++++ .../virtio-options-controller-page_per_vq.err | 1 + .../virtio-options-controller-page_per_vq.xml | 38 +++++++++++++++++++ .../virtio-options-disk-page_per_vq.err | 1 + .../virtio-options-disk-page_per_vq.xml | 34 +++++++++++++++++ .../virtio-options-fs-page_per_vq.err | 1 + .../virtio-options-fs-page_per_vq.xml | 34 +++++++++++++++++ .../virtio-options-input-page_per_vq.err | 1 + .../virtio-options-input-page_per_vq.xml | 30 +++++++++++++++ .../virtio-options-memballoon-page_per_vq.err | 1 + .../virtio-options-memballoon-page_per_vq.xml | 23 +++++++++++ .../virtio-options-net-page_per_vq.err | 1 + .../virtio-options-net-page_per_vq.xml | 34 +++++++++++++++++ .../virtio-options-rng-page_per_vq.err | 1 + .../virtio-options-rng-page_per_vq.xml | 32 ++++++++++++++++ .../virtio-options-video-page_per_vq.err | 1 + .../virtio-options-video-page_per_vq.xml | 36 ++++++++++++++++++ .../virtio-options.x86_64-latest.args | 26 ++++++------- tests/qemuxml2argvdata/virtio-options.xml | 26 ++++++------- tests/qemuxml2argvtest.c | 14 +++++++ 22 files changed, 322 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_p= er_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_p= er_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.= err create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.= xml create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq= .err create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq= .xml create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_p= er_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_p= er_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.e= rr create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.x= ml create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.e= rr create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.x= ml create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq= .err create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq= .xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 28bca1519c..36159971fa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -636,6 +636,10 @@ qemuBuildVirtioOptionsStr(virBuffer *buf, virBufferAsprintf(buf, ",packed=3D%s", virTristateSwitchTypeToString(virtio->packed)); } + if (virtio->page_per_vq !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(buf, ",page-per-vq=3D%s", + virTristateSwitchTypeToString(virtio->page_per_v= q)); + } } =20 static int diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 22239b2689..9bbbab47e3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3675,7 +3675,8 @@ qemuDomainChangeNet(virQEMUDriver *driver, (olddev->virtio && newdev->virtio && (olddev->virtio->iommu !=3D newdev->virtio->iommu || olddev->virtio->ats !=3D newdev->virtio->ats || - olddev->virtio->packed !=3D newdev->virtio->packed))) { + olddev->virtio->packed !=3D newdev->virtio->packed || + olddev->virtio->page_per_vq !=3D newdev->virtio->page_per_vq))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver optio= ns")); goto cleanup; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c84508cb64..233544e944 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1430,6 +1430,13 @@ qemuValidateDomainVirtioOptions(const virDomainVirti= oOptions *virtio, "QEMU binary")); return -1; } + + if (virtio->page_per_vq !=3D VIR_TRISTATE_SWITCH_ABSENT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PAGE_PER_VQ)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("the page_per_vq setting is not supported wit= h this QEMU binary")); + return -1; + } return 0; } =20 diff --git a/tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.e= rr b/tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.x= ml b/tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.xml new file mode 100644 index 0000000000..395142ba8a --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.xml @@ -0,0 +1,38 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+ + + +
+ + + +
+ + +
+ + + diff --git a/tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.err b/t= ests/qemuxml2argvdata/virtio-options-disk-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.xml b/t= ests/qemuxml2argvdata/virtio-options-disk-page_per_vq.xml new file mode 100644 index 0000000000..8040685f7a --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.xml @@ -0,0 +1,34 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + +
+ + + + + +
+ + +
+ + + diff --git a/tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.err b/tes= ts/qemuxml2argvdata/virtio-options-fs-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.xml b/tes= ts/qemuxml2argvdata/virtio-options-fs-page_per_vq.xml new file mode 100644 index 0000000000..abf89ab53b --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.xml @@ -0,0 +1,34 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + +
+ + + + + +
+ + +
+ + + diff --git a/tests/qemuxml2argvdata/virtio-options-input-page_per_vq.err b/= tests/qemuxml2argvdata/virtio-options-input-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-input-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-input-page_per_vq.xml b/= tests/qemuxml2argvdata/virtio-options-input-page_per_vq.xml new file mode 100644 index 0000000000..e08234786b --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-input-page_per_vq.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+ + +
+ + + diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.e= rr b/tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.x= ml b/tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.xml new file mode 100644 index 0000000000..cf7c3da971 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.xml @@ -0,0 +1,23 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + +
+ + + + diff --git a/tests/qemuxml2argvdata/virtio-options-net-page_per_vq.err b/te= sts/qemuxml2argvdata/virtio-options-net-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-net-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-net-page_per_vq.xml b/te= sts/qemuxml2argvdata/virtio-options-net-page_per_vq.xml new file mode 100644 index 0000000000..2c38daa0d5 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-net-page_per_vq.xml @@ -0,0 +1,34 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + +
+ + + + + +
+ + +
+ + + diff --git a/tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.err b/te= sts/qemuxml2argvdata/virtio-options-rng-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.xml b/te= sts/qemuxml2argvdata/virtio-options-rng-page_per_vq.xml new file mode 100644 index 0000000000..c93d70156c --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.xml @@ -0,0 +1,32 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + /dev/random + +
+ + + /dev/random + +
+ + +
+ + + diff --git a/tests/qemuxml2argvdata/virtio-options-video-page_per_vq.err b/= tests/qemuxml2argvdata/virtio-options-video-page_per_vq.err new file mode 100644 index 0000000000..475aa8be43 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-video-page_per_vq.err @@ -0,0 +1 @@ +unsupported configuration: the page_per_vq setting is not supported with t= his QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-video-page_per_vq.xml b/= tests/qemuxml2argvdata/virtio-options-video-page_per_vq.xml new file mode 100644 index 0000000000..2d79932135 --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options-video-page_per_vq.xml @@ -0,0 +1,36 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +