From nobody Sun Dec 14 12:22:45 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 1751265004634423.49032291194305; Sun, 29 Jun 2025 23:30:04 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9C9091410; Mon, 30 Jun 2025 02:30:03 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 629BA15A7; Mon, 30 Jun 2025 02:22:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 88A4D13B7; Mon, 30 Jun 2025 02:22:50 -0400 (EDT) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 5A1D813B7 for ; Mon, 30 Jun 2025 02:22:31 -0400 (EDT) Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2025 23:22:31 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2025 23:22:29 -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.1 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=1751264551; x=1782800551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I934L+ISzctkt2K5GT/FR4vb23Ys2Wr2plPObEQIm7Q=; b=WdpH4wt9QoJOF39dciOiniQowuE/VGmmNLkLgsdKbhmwHsEGYB5kDhLW Q0G6K8ao/sBq1tjrr0PgbUDONPMVWomsW/eo4d3goX7MPcRtXA+CH9cui cOn7RTE2JF1d2ZM49Q/5loZjysnB8SZufsGeYEjvnUrqouALXOeL5SQkg Wx1oSMEyBwPN+YoyYUvu7cVAJta7y+PK2wOCpcl+hgmNr6gSiWzU4vsjb hirTDkI1OhnGnqQrgtI9TzExPwGYNlaeJsf179F0+CncY1+CBjs0J+cC6 M7OCo3dYiHIjO+gJMoY7wmuq463tp9nqbs/6imJTi6UUJbrCkW0/LwpU0 g==; X-CSE-ConnectionGUID: wHGenH/QTPawseTHpz6tkw== X-CSE-MsgGUID: siUJadK1T6awy9lRwjeE8A== X-IronPort-AV: E=McAfee;i="6800,10657,11479"; a="70912594" X-IronPort-AV: E=Sophos;i="6.16,277,1744095600"; d="scan'208";a="70912594" X-CSE-ConnectionGUID: IpnS6OSJRrSkrGtNRr0r8A== X-CSE-MsgGUID: RnorXYXfTSOxGAwYKJHUyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,277,1744095600"; d="scan'208";a="153549457" From: Zhenzhong Duan To: devel@lists.libvirt.org Subject: [PATCH v3 19/21] qemu: Support domain reset command for TDX guest Date: Mon, 30 Jun 2025 14:17:30 +0800 Message-Id: <20250630061732.303374-20-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250630061732.303374-1-zhenzhong.duan@intel.com> References: <20250630061732.303374-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LKWFT2ZR42TTUZ5A2T24WLOCO6OTCONY X-Message-ID-Hash: LKWFT2ZR42TTUZ5A2T24WLOCO6OTCONY 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: 1751265006379116600 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 c7287eb669..e8c3d6a13b 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 a75e09b6de..4e8b0a26de 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1976,13 +1976,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 ae3b13cdb2..e784cfca65 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.34.1