From nobody Thu Sep 19 01:08:26 2024 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1720102379803780.4530567996854; Thu, 4 Jul 2024 07:12:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B5F18155C; Thu, 4 Jul 2024 10:12:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7024615BA; Thu, 4 Jul 2024 10:11:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6F7CD1581; Thu, 4 Jul 2024 10:11:39 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 61F7D1554 for ; Thu, 4 Jul 2024 10:11:33 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-alOKhSCfPeOtn5zJg4xC2w-1; Thu, 04 Jul 2024 10:11:31 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0C73A1955BC6 for ; Thu, 4 Jul 2024 14:11:31 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.226.21]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 367EC195605F for ; Thu, 4 Jul 2024 14:11:29 +0000 (UTC) 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_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720102293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OVJ9CCAZBCaiC2XpAm8+sR2hojPcyvmROl3SdC6wEGY=; b=Qg9t8eurp4HpuCDjkAmJQ+BQy0JZ+eZzEEZZquTsa3gDmEO1SBef5PQnIOw3BoCnu1LZga sa9uepCLvgRk84XLC+RIxMEPdDvdIfwxawB5iR0/zWTX1cph/M71nPfombfzJ0H+wSWH78 ltEv1590hDLi7k5QlNiH1BjFuwHV79s= X-MC-Unique: alOKhSCfPeOtn5zJg4xC2w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCHv2 3/5] qemu: fill capabilities for virtiofsd Date: Thu, 4 Jul 2024 15:54:28 +0200 Message-ID: <769739528ccff01ccba81ed21d4f580b1fc9d9ea.1720101270.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NZVPJG2TI6FLPLSQ4ROQBHCWIWMTB3EE X-Message-ID-Hash: NZVPJG2TI6FLPLSQ4ROQBHCWIWMTB3EE X-MailFrom: jtomko@redhat.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 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: 1720102380647100001 Content-Type: text/plain; charset="utf-8" Run the daemon with --print-capabilities first, to see what it supports. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.h | 1 + src/qemu/qemu_vhost_user.c | 60 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_vhost_user.h | 12 ++++++++ src/qemu/qemu_virtiofs.c | 9 ++++-- 4 files changed, 80 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2818a9f1f5..b3a0d26cde 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -899,6 +899,7 @@ struct _virDomainFSDef { virDomainIdMapDef idmap; virDomainVirtioOptions *virtio; virObject *privateData; + virBitmap *caps; }; =20 =20 diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 0294daab80..30a60db528 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -22,6 +22,7 @@ =20 #include "qemu_vhost_user.h" #include "qemu_interop_config.h" +#include "virbitmap.h" #include "virjson.h" #include "virlog.h" #include "viralloc.h" @@ -90,6 +91,12 @@ VIR_ENUM_IMPL(qemuVhostUserGPUFeature, "render-node", ); =20 +VIR_ENUM_IMPL(qemuVhostUserFSFeature, + QEMU_VHOST_USER_FS_FEATURE_LAST, + "migrate-precopy", + "separate-options", +); + typedef struct _qemuVhostUserGPU qemuVhostUserGPU; struct _qemuVhostUserGPU { size_t nfeatures; @@ -414,6 +421,53 @@ qemuVhostUserFillDomainGPU(virQEMUDriver *driver, return ret; } =20 +int +qemuVhostUserFillFSCapabilities(virBitmap **caps, + const char *binary, + bool reportError G_GNUC_UNUSED) +{ + g_autoptr(virJSONValue) doc =3D NULL; + g_autofree char *output =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; + virJSONValue *featuresJSON; + size_t nfeatures; + size_t i; + g_autoptr(virBitmap) features =3D NULL; + + cmd =3D virCommandNewArgList(binary, "--print-capabilities", NULL); + virCommandSetOutputBuffer(cmd, &output); + if (virCommandRun(cmd, NULL) < 0) + return -2; + + if (!(doc =3D virJSONValueFromString(output))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to parse json capabilities '%1$s'"), + binary); + return -1; + } + + /* Older virtiofsd did not print any features */ + if (!(featuresJSON =3D virJSONValueObjectGetArray(doc, "features"))) + return 0; + + features =3D virBitmapNew(0); + nfeatures =3D virJSONValueArraySize(featuresJSON); + + for (i =3D 0; i < nfeatures; i++) { + virJSONValue *item =3D virJSONValueArrayGet(featuresJSON, i); + const char *tmpStr =3D virJSONValueGetString(item); + int tmp; + + if ((tmp =3D qemuVhostUserFSFeatureTypeFromString(tmpStr)) < 0) { + VIR_DEBUG("ignoring unknown virtiofs feature '%s'", tmpStr); + continue; + } + virBitmapSetBitExpand(features, tmp); + } + + *caps =3D g_steal_pointer(&features); + return 0; +} =20 int qemuVhostUserFillDomainFS(virQEMUDriver *driver, @@ -435,6 +489,12 @@ qemuVhostUserFillDomainFS(virQEMUDriver *driver, continue; =20 fs->binary =3D g_strdup(vu->binary); + + /* skip binaries that can't report their capabilities */ + if (qemuVhostUserFillFSCapabilities(&fs->caps, + vu->binary, + false) =3D=3D -1) + continue; break; } =20 diff --git a/src/qemu/qemu_vhost_user.h b/src/qemu/qemu_vhost_user.h index d1aa6ca189..f9cd549d5d 100644 --- a/src/qemu/qemu_vhost_user.h +++ b/src/qemu/qemu_vhost_user.h @@ -46,3 +46,15 @@ qemuVhostUserFillDomainGPU(virQEMUDriver *driver, int qemuVhostUserFillDomainFS(virQEMUDriver *driver, virDomainFSDef *fs); + +int +qemuVhostUserFillFSCapabilities(virBitmap **caps, + const char *binary, + bool reportError); +typedef enum { + QEMU_VHOST_USER_FS_FEATURE_MIGRATE_PRECOPY =3D 0, + QEMU_VHOST_USER_FS_FEATURE_SEPARATE_OPTIONS, + QEMU_VHOST_USER_FS_FEATURE_LAST +} qemuVhostUserFSFeature; + +VIR_ENUM_DECL(qemuVhostUserFSFeature); diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 78897d8177..aba6a19562 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -446,8 +446,13 @@ qemuVirtioFSPrepareDomain(virQEMUDriver *driver, if (fs->sock) return 0; =20 - if (!fs->binary && qemuVhostUserFillDomainFS(driver, fs) < 0) - return -1; + if (fs->binary) { + if (qemuVhostUserFillFSCapabilities(&fs->caps, fs->binary, true) <= 0) + return -1; + } else { + if (qemuVhostUserFillDomainFS(driver, fs) < 0) + return -1; + } =20 if (!driver->privileged && !fs->idmap.uidmap) { if (qemuVirtioFSPrepareIdMap(fs) < 0) --=20 2.45.2