From nobody Tue Sep 9 19:03:24 2025 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 header.i=@intel.com; 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=intel.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1752132707045778.924462078579; Thu, 10 Jul 2025 00:31:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1FC8B120D; Thu, 10 Jul 2025 03:31:43 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 85E281462; Thu, 10 Jul 2025 03:23:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6547D1560; Thu, 10 Jul 2025 03:23:35 -0400 (EDT) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 A9009147D for ; Thu, 10 Jul 2025 03:23:03 -0400 (EDT) Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2025 00:22:57 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2025 00:22:54 -0700 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1752132184; x=1783668184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SmU9sNHyRqoYnza4t2J8mYdSeDl5aQxiR2KlZeIN7Qw=; b=NKajohmtwbLsPg2WFG7SYqHVjzkz+Ku2OAVsDhpsBnEjM1fTfDfIcgeM d8dzVnwDKMUrIKTPTLot1e/SXmwC4JFxC19AtABToT6hnv74+tPZc1oe4 kTdx6/TP1l7CZFu6WF+qPdjO8lq6g1LxM6dh+19xOYnQ0xQ2X+XGLlr25 D1MGBBLcI100fc5RTEP2Lph4DjNvZwnMYv3zlh7Pxq+cDt7z0ArHiq9gA 53pvqUp3DmGpADGA2VXxRjUS3A+YkKGZc/VZMjplZukAn2iwCVwIOHl/r gH7KEa4YC4yAHMw6qlGg8G6LICeXPLtwQEJpQgFWabZF1Pwtkx99Qlday Q==; X-CSE-ConnectionGUID: Tr4fn7+uS2K9IXhFlfxGcw== X-CSE-MsgGUID: HTvcNUNXToG2JJ3ndZQHow== X-IronPort-AV: E=McAfee;i="6800,10657,11489"; a="54257221" X-IronPort-AV: E=Sophos;i="6.16,300,1744095600"; d="scan'208";a="54257221" X-CSE-ConnectionGUID: N9XPXYvoTki3+MmCO49mpw== X-CSE-MsgGUID: ozKXFIYxTgefkol2aZ0HTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,300,1744095600"; d="scan'208";a="186997235" From: Zhenzhong Duan To: devel@lists.libvirt.org Subject: [PATCH v4 21/23] qemu: Support domain reset command for TDX guest Date: Thu, 10 Jul 2025 03:21:23 -0400 Message-ID: <20250710072127.695558-22-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250710072127.695558-1-zhenzhong.duan@intel.com> References: <20250710072127.695558-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GICO35YU7HIZO7PUB2AFFDLKMWDHV2TA X-Message-ID-Hash: GICO35YU7HIZO7PUB2AFFDLKMWDHV2TA X-MailFrom: zhenzhong.duan@intel.com X-Mailman-Rule-Hits: nonmember-moderation 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 CC: phrdina@redhat.com, pkrempa@redhat.com, jjongsma@redhat.com, jsuchane@redhat.com, chenyi.qiang@intel.com, isaku.yamahata@intel.com, xiaoyao.li@intel.com, chao.p.peng@intel.com, Zhenzhong Duan 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: 1752132709115116600 Content-Type: text/plain; charset="utf-8" TDX guest doesn't support system_reset, so have to kill the old QEMU and start a new one to simulate the reset. This can be achieved by calling qemuProcessFakeRebootViaRecreate(). Simiar as FakeReboot, QEMU sends SHUTDOWN event with "host-signal" reason which can trigger another FakeReset. Check if a FakeReset is ongoing and bypass "host-signal" processing which originally comes from FakeReset. Domain lock is already hold in qemuDomainReset() before calling qemuProcessFakeRebootViaRecreate(), so bypass locking in it. Signed-off-by: Zhenzhong Duan Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 10 +++++++++- src/qemu/qemu_monitor.c | 6 ++++++ src/qemu/qemu_process.c | 14 +++++++++----- src/qemu/qemu_process.h | 2 ++ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 49f83613e3..c704cb2114 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -130,6 +130,7 @@ struct _qemuDomainObjPrivate { char *lockState; =20 bool fakeReboot; + bool fakeReset; bool pausedShutdown; /* allowReboot: * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 206f6504df..37b16f56b0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1970,13 +1970,21 @@ qemuDomainReset(virDomainPtr dom, unsigned int flag= s) if (virDomainResetEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 + priv =3D vm->privateData; + + if (vm->def->sec && + vm->def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_TDX) { + priv->fakeReset =3D true; + ret =3D qemuProcessFakeRebootViaRecreate(vm, true); + goto cleanup; + } + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) goto endjob; =20 - priv =3D vm->privateData; qemuDomainObjEnterMonitor(vm); ret =3D qemuMonitorSystemReset(priv->mon); qemuDomainObjExitMonitor(vm); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d726175d42..c1fef8d5de 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1083,6 +1083,12 @@ qemuMonitorEmitShutdown(qemuMonitor *mon, virTristat= eBool guest, if (priv->fakeReboot && STREQ_NULLABLE(reason, "host-signal")) return; =20 + /* Similar as FakeReboot for FakeReset. */ + if (priv->fakeReset && STREQ_NULLABLE(reason, "host-signal")) { + priv->fakeReset =3D false; + return; + } + if ((STREQ_NULLABLE(reason, "guest-shutdown") && vm->def->onPoweroff =3D=3D VIR_DOMAIN_LIFECYCLE_ACTION_RESTAR= T) || (STREQ_NULLABLE(reason, "guest-reset") && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 68c0a5b64d..e7fcace9e2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -450,8 +450,8 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, * Secure guest doesn't support fake reboot via machine CPU reset. * We thus fake reboot via QEMU re-creation. */ -static void -qemuProcessFakeRebootViaRecreate(virDomainObj *vm) +int +qemuProcessFakeRebootViaRecreate(virDomainObj *vm, bool locked) { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; @@ -460,7 +460,9 @@ qemuProcessFakeRebootViaRecreate(virDomainObj *vm) =20 VIR_DEBUG("Handle secure guest reboot: destroy phase"); =20 - virObjectLock(vm); + if (!locked) + virObjectLock(vm); + if (qemuProcessBeginStopJob(vm, VIR_JOB_DESTROY, 0) < 0) goto cleanup; =20 @@ -513,7 +515,9 @@ qemuProcessFakeRebootViaRecreate(virDomainObj *vm) qemuDomainSetFakeReboot(vm, false); if (ret =3D=3D -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); - virDomainObjEndAPI(&vm); + if (!locked) + virDomainObjEndAPI(&vm); + return ret; } =20 =20 @@ -587,7 +591,7 @@ qemuProcessFakeReboot(void *opaque) =20 if (vm->def->sec && vm->def->sec->sectype =3D=3D VIR_DOMAIN_LAUNCH_SECURITY_TDX) - qemuProcessFakeRebootViaRecreate(vm); + ignore_value(qemuProcessFakeRebootViaRecreate(vm, false)); else qemuProcessFakeRebootViaReset(vm); } diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index b8c4af4aaf..9f783790ac 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -190,6 +190,8 @@ typedef enum { =20 int qemuProcessKill(virDomainObj *vm, unsigned int flags); =20 +int qemuProcessFakeRebootViaRecreate(virDomainObj *vm, bool locked); + void qemuProcessShutdownOrReboot(virDomainObj *vm); =20 void qemuProcessAutoDestroy(virDomainObj *dom, --=20 2.47.1