59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
|
From 5cafaebb7f31713b826a678e79eef976beb8caf6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Tue, 3 Sep 2024 01:56:25 +0000
|
||
|
|
Subject: [PATCH] tpm_crb: Avoid backend startup just before shutdown under Xen
|
||
|
|
mainline inclusion commit f0ccce6a95f6ff947040692ef941230918181562 category:
|
||
|
|
bugfix
|
||
|
|
|
||
|
|
---------------------------------------------------------------
|
||
|
|
|
||
|
|
When running under Xen and the guest reboots, it boots into a new domain
|
||
|
|
with a new QEMU process (and a new swtpm process if using the emulator
|
||
|
|
backend). The existing reset function is triggered just before the old
|
||
|
|
QEMU process exists which causes QEMU to startup the TPM backend and
|
||
|
|
then immediately shut it down. This is probably harmless but when using
|
||
|
|
the emulated backend, it wastes CPU and IO time reloading state, etc.
|
||
|
|
|
||
|
|
Fix this by calling the reset function directly from realize() when
|
||
|
|
running under Xen. During a reboot, this will be called by the QEMU
|
||
|
|
process for the new domain.
|
||
|
|
|
||
|
|
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||
|
|
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
|
||
|
|
Message-id: 20220826143841.1515326-1-ross.lagerwall@citrix.com
|
||
|
|
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
|
||
|
|
|
||
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/tpm/tpm_crb.c | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
|
||
|
|
index c05972736a..ed89ab4afe 100644
|
||
|
|
--- a/hw/tpm/tpm_crb.c
|
||
|
|
+++ b/hw/tpm/tpm_crb.c
|
||
|
|
@@ -25,6 +25,7 @@
|
||
|
|
#include "sysemu/tpm_backend.h"
|
||
|
|
#include "sysemu/tpm_util.h"
|
||
|
|
#include "sysemu/reset.h"
|
||
|
|
+#include "sysemu/xen.h"
|
||
|
|
#include "tpm_prop.h"
|
||
|
|
#include "tpm_ppi.h"
|
||
|
|
#include "trace.h"
|
||
|
|
@@ -307,7 +308,11 @@ static void tpm_crb_realize(DeviceState *dev, Error **errp)
|
||
|
|
TPM_PPI_ADDR_BASE, OBJECT(s));
|
||
|
|
}
|
||
|
|
|
||
|
|
- qemu_register_reset(tpm_crb_reset, dev);
|
||
|
|
+ if (xen_enabled()) {
|
||
|
|
+ tpm_crb_reset(dev);
|
||
|
|
+ } else {
|
||
|
|
+ qemu_register_reset(tpm_crb_reset, dev);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
static void tpm_crb_class_init(ObjectClass *klass, void *data)
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|