From nobody Sun Feb 8 12:34:57 2026 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 1727884169872317.9637261731102; Wed, 2 Oct 2024 08:49:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9909CD58; Wed, 2 Oct 2024 11:49:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3814B176B; Wed, 2 Oct 2024 11:42:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E7BD81668; Wed, 2 Oct 2024 11:42:32 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 0C1361668 for ; Wed, 2 Oct 2024 11:42:12 -0400 (EDT) Received: from mx-prod-mc-02.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-336-89wP5Z6ROLqkRpDeRQSWzA-1; Wed, 02 Oct 2024 11:42:10 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B1CB81955EE6 for ; Wed, 2 Oct 2024 15:42:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.81]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F05233000197 for ; Wed, 2 Oct 2024 15:42:08 +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.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1727883731; 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=B3l23ZiN6gjYjAicJa/UQvneOD6FTYWBd7vVv0rKgB4=; b=AECVW5nMBs0f0pHRvgR1B5XNpmDnmD+SVKGBOmJEFoBfMWvqP9clPmq/PFL4ihkoHZpT4s RwjCGmTdgTs3yG5hvs4jKyxVPOHaLy/0291y/DFIkL/5DQk9e1ubKz1DePwHRxM4ku50wj ASJngNympw7LcUKspXvx5sQRGfCnAIY= X-MC-Unique: 89wP5Z6ROLqkRpDeRQSWzA-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH v7 14/14] qemu: Handle locking of TPM state directory for incoming migration Date: Wed, 2 Oct 2024 17:41:47 +0200 Message-ID: <20241002154147.446044-15-abologna@redhat.com> In-Reply-To: <20241002154147.446044-1-abologna@redhat.com> References: <20241002154147.446044-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JSG2IZ7BOWQPVD3YD4JFBJDHBLVC3G3G X-Message-ID-Hash: JSG2IZ7BOWQPVD3YD4JFBJDHBLVC3G3G X-MailFrom: abologna@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: 1727884171402116600 Content-Type: text/plain; charset="utf-8"; x-default="true" By not attempting to lock the lock file, which would fail. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_security.c | 10 ++++++---- src/qemu/qemu_security.h | 6 ++++-- src/qemu/qemu_tpm.c | 21 ++++++++++++++++++--- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 5e815ba2a0..6bb0f9170d 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -551,7 +551,8 @@ qemuSecurityRestoreNetdevLabel(virQEMUDriver *driver, int qemuSecuritySetTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool setTPMStateLabel) + bool setTPMStateLabel, + bool lockMetadataException) { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -567,7 +568,7 @@ qemuSecuritySetTPMLabels(virQEMUDriver *driver, =20 if (virSecurityManagerTransactionCommit(driver->securityManager, -1, priv->rememberOwner, - false) < 0) + lockMetadataException) < 0) goto cleanup; =20 ret =3D 0; @@ -580,7 +581,8 @@ qemuSecuritySetTPMLabels(virQEMUDriver *driver, int qemuSecurityRestoreTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool restoreTPMStateLabel) + bool restoreTPMStateLabel, + bool lockMetadataException) { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -596,7 +598,7 @@ qemuSecurityRestoreTPMLabels(virQEMUDriver *driver, =20 if (virSecurityManagerTransactionCommit(driver->securityManager, -1, priv->rememberOwner, - false) < 0) + lockMetadataException) < 0) goto cleanup; =20 ret =3D 0; diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 32f29bc210..36663cffde 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -87,11 +87,13 @@ int qemuSecurityRestoreNetdevLabel(virQEMUDriver *drive= r, =20 int qemuSecuritySetTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool setTPMStateLabel); + bool setTPMStateLabel, + bool lockMetadataException); =20 int qemuSecurityRestoreTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool restoreTPMStateLabel); + bool restoreTPMStateLabel, + bool lockMetadataException); =20 int qemuSecuritySetSavedStateLabel(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 55927b4582..fcfc97dbca 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -934,6 +934,7 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, virTimeBackOffVar timebackoff; const unsigned long long timeout =3D 1000; /* ms */ pid_t pid =3D -1; + bool lockMetadataException =3D false; =20 cfg =3D virQEMUDriverGetConfig(driver); =20 @@ -959,7 +960,21 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, virCommandSetPidFile(cmd, pidfile); virCommandSetErrorFD(cmd, &errfd); =20 - if (qemuSecuritySetTPMLabels(driver, vm, true) < 0) + if (incomingMigration && qemuTPMHasSharedStorage(driver, vm->def)) { + /* If the TPM is being migrated over shared storage, we can't + * lock all files before labeling them: the source swtpm + * process is still holding on to the lock file, and it will + * only release it after negotiation with the target swtpm + * process, which we can't start until labeling has been + * performed. + * + * So we explicity request for the lock file not to be locked + * before labeling in this specific, narrow scenario in order + * to make migration possible at all */ + lockMetadataException =3D true; + } + + if (qemuSecuritySetTPMLabels(driver, vm, true, lockMetadataException) = < 0) return -1; =20 if (qemuSecurityCommandRun(driver, vm, cmd, cfg->swtpm_user, @@ -1008,7 +1023,7 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, virProcessKillPainfully(pid, true); if (pidfile) unlink(pidfile); - qemuSecurityRestoreTPMLabels(driver, vm, true); + qemuSecurityRestoreTPMLabels(driver, vm, true, lockMetadataException); return -1; } =20 @@ -1144,7 +1159,7 @@ qemuExtTPMStop(virQEMUDriver *driver, if (outgoingMigration && qemuTPMHasSharedStorage(driver, vm->def)) restoreTPMStateLabel =3D false; =20 - if (qemuSecurityRestoreTPMLabels(driver, vm, restoreTPMStateLabel) < 0) + if (qemuSecurityRestoreTPMLabels(driver, vm, restoreTPMStateLabel, tru= e) < 0) VIR_WARN("Unable to restore labels on TPM state and/or log file"); } =20 --=20 2.46.2