From nobody Thu Sep 19 16:51:28 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 1725031244105446.4409653003729; Fri, 30 Aug 2024 08:20:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0244612C2; Fri, 30 Aug 2024 11:20:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 30F901534; Fri, 30 Aug 2024 11:14:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BDFC713A6; Fri, 30 Aug 2024 11:14:30 -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 53B5014F0 for ; Fri, 30 Aug 2024 11:14:10 -0400 (EDT) Received: from mx-prod-mc-04.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-433-gkN_RYHmPuylF4v_Dk4FNg-1; Fri, 30 Aug 2024 11:14:08 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3C35C19560BF for ; Fri, 30 Aug 2024 15:14:07 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.110]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 42F3B19560AA for ; Fri, 30 Aug 2024 15:14:06 +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.6 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,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE 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=1725030849; 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=eHJhwJ7Y7od2TA+CUgirOGo0fvPd4wZYDQHUdSFhQZA=; b=LrSag+LaifdaAC8ZLktkWorRhwhcmI8wj2Yud8lrN38j2wkJDOib547FwbWljdEn5EuZOr 9xuy1Enhqj+2eT6savK1v7lAj7k0RQvOAiTYBTmfBLta8pFYZ19HXsVMor+oyFIe4U6AfT wkLz2k7jbTYfGAxcmXyoHeRBSc4Fp0E= X-MC-Unique: gkN_RYHmPuylF4v_Dk4FNg-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH v6 13/13] qemu: Don't lock TPM state directory for incoming migration Date: Fri, 30 Aug 2024 17:13:45 +0200 Message-ID: <20240830151345.717568-14-abologna@redhat.com> In-Reply-To: <20240830151345.717568-1-abologna@redhat.com> References: <20240830151345.717568-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LC4QY6XFL5HKJCDRVDVJNM52C4JWVFBQ X-Message-ID-Hash: LC4QY6XFL5HKJCDRVDVJNM52C4JWVFBQ 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: 1725031246183116600 Content-Type: text/plain; charset="utf-8"; x-default="true" We will never be able to acquire the lock on the destination host because the swtpm process that's running on the source host is still holding on to it. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_security.c | 10 ++++++---- src/qemu/qemu_security.h | 6 ++++-- src/qemu/qemu_tpm.c | 20 +++++++++++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 996c95acc0..11af9100fb 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -537,7 +537,8 @@ qemuSecurityRestoreNetdevLabel(virQEMUDriver *driver, int qemuSecuritySetTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool setTPMStateLabel) + bool setTPMStateLabel, + bool attemptLocking) { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -552,7 +553,7 @@ qemuSecuritySetTPMLabels(virQEMUDriver *driver, goto cleanup; =20 if (virSecurityManagerTransactionCommit(driver->securityManager, - -1, priv->rememberOwner) < 0) + -1, priv->rememberOwner && att= emptLocking) < 0) goto cleanup; =20 ret =3D 0; @@ -565,7 +566,8 @@ qemuSecuritySetTPMLabels(virQEMUDriver *driver, int qemuSecurityRestoreTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool restoreTPMStateLabel) + bool restoreTPMStateLabel, + bool attemptLocking) { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -580,7 +582,7 @@ qemuSecurityRestoreTPMLabels(virQEMUDriver *driver, goto cleanup; =20 if (virSecurityManagerTransactionCommit(driver->securityManager, - -1, priv->rememberOwner) < 0) + -1, priv->rememberOwner && att= emptLocking) < 0) goto cleanup; =20 ret =3D 0; diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 32f29bc210..4e3186a2af 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 attemptLocking); =20 int qemuSecurityRestoreTPMLabels(virQEMUDriver *driver, virDomainObj *vm, - bool restoreTPMStateLabel); + bool restoreTPMStateLabel, + bool attemptLocking); =20 int qemuSecuritySetSavedStateLabel(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 55927b4582..6ab4fc9d01 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 attemptLocking =3D true; =20 cfg =3D virQEMUDriverGetConfig(driver); =20 @@ -959,7 +960,20 @@ 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 the files before labeling them: the source swtpm + * process is still holding a lock on some of them, 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 run with fewer guarantees in this specific, narrow + * scenario in order to make the migration possible at all */ + attemptLocking =3D false; + } + + if (qemuSecuritySetTPMLabels(driver, vm, true, attemptLocking) < 0) return -1; =20 if (qemuSecurityCommandRun(driver, vm, cmd, cfg->swtpm_user, @@ -1008,7 +1022,7 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, virProcessKillPainfully(pid, true); if (pidfile) unlink(pidfile); - qemuSecurityRestoreTPMLabels(driver, vm, true); + qemuSecurityRestoreTPMLabels(driver, vm, true, attemptLocking); return -1; } =20 @@ -1144,7 +1158,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.0