MSVSphere Packaging Team
11 months ago
parent
9aa6ecd9c7
commit
3b49081d25
@ -0,0 +1,69 @@
|
|||||||
|
From d032e43c4cebdbeb279d2da9b514fa50c6ed4da3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Huth <thuth@redhat.com>
|
||||||
|
Date: Tue, 21 Nov 2023 16:36:26 +0100
|
||||||
|
Subject: [PATCH 2/3] dump: Add arch cleanup function
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||||
|
RH-MergeRequest: 325: Fix problem that secure execution guest remains in "paused" state after dump failure
|
||||||
|
RH-Jira: RHEL-16997
|
||||||
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
RH-Commit: [2/3] d70fcc72a69f65432f2fbfb7d864452ea37ec25d
|
||||||
|
|
||||||
|
JIRA: https://issues.redhat.com/browse/RHEL-16997
|
||||||
|
|
||||||
|
commit e72629e5149aba6f44122ea6d2a803ef136a0c6b
|
||||||
|
Author: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Date: Thu Nov 9 12:04:42 2023 +0000
|
||||||
|
|
||||||
|
dump: Add arch cleanup function
|
||||||
|
|
||||||
|
Some architectures (s390x) need to cleanup after a failed dump to be
|
||||||
|
able to continue to run the vm. Add a cleanup function pointer and
|
||||||
|
call it if it's set.
|
||||||
|
|
||||||
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
Message-ID: <20231109120443.185979-3-frankja@linux.ibm.com>
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
---
|
||||||
|
dump/dump.c | 4 ++++
|
||||||
|
include/sysemu/dump-arch.h | 1 +
|
||||||
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/dump/dump.c b/dump/dump.c
|
||||||
|
index 1f1a6edcab..6a50e85f49 100644
|
||||||
|
--- a/dump/dump.c
|
||||||
|
+++ b/dump/dump.c
|
||||||
|
@@ -96,6 +96,10 @@ uint64_t cpu_to_dump64(DumpState *s, uint64_t val)
|
||||||
|
|
||||||
|
static int dump_cleanup(DumpState *s)
|
||||||
|
{
|
||||||
|
+ if (s->dump_info.arch_cleanup_fn) {
|
||||||
|
+ s->dump_info.arch_cleanup_fn(s);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
guest_phys_blocks_free(&s->guest_phys_blocks);
|
||||||
|
memory_mapping_list_free(&s->list);
|
||||||
|
close(s->fd);
|
||||||
|
diff --git a/include/sysemu/dump-arch.h b/include/sysemu/dump-arch.h
|
||||||
|
index 59bbc9be38..743916e46c 100644
|
||||||
|
--- a/include/sysemu/dump-arch.h
|
||||||
|
+++ b/include/sysemu/dump-arch.h
|
||||||
|
@@ -24,6 +24,7 @@ typedef struct ArchDumpInfo {
|
||||||
|
void (*arch_sections_add_fn)(DumpState *s);
|
||||||
|
uint64_t (*arch_sections_write_hdr_fn)(DumpState *s, uint8_t *buff);
|
||||||
|
int (*arch_sections_write_fn)(DumpState *s, uint8_t *buff);
|
||||||
|
+ void (*arch_cleanup_fn)(DumpState *s);
|
||||||
|
} ArchDumpInfo;
|
||||||
|
|
||||||
|
struct GuestPhysBlockList; /* memory_mapping.h */
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
@ -0,0 +1,84 @@
|
|||||||
|
From a84f9954b3f3607d34661b221a72677d81743a5b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Huth <thuth@redhat.com>
|
||||||
|
Date: Tue, 21 Nov 2023 16:36:26 +0100
|
||||||
|
Subject: [PATCH 3/3] target/s390x/arch_dump: Add arch cleanup function for PV
|
||||||
|
dumps
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||||
|
RH-MergeRequest: 325: Fix problem that secure execution guest remains in "paused" state after dump failure
|
||||||
|
RH-Jira: RHEL-16997
|
||||||
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
RH-Commit: [3/3] 0b3a9a6e992a615d96e7e9978a6b849b17ca69b6
|
||||||
|
|
||||||
|
JIRA: https://issues.redhat.com/browse/RHEL-16997
|
||||||
|
|
||||||
|
commit d12a91e0baafce7b1cbacff7cf9339eeb0011732
|
||||||
|
Author: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Date: Thu Nov 9 12:04:43 2023 +0000
|
||||||
|
|
||||||
|
target/s390x/arch_dump: Add arch cleanup function for PV dumps
|
||||||
|
|
||||||
|
PV dumps block vcpu runs until dump end is reached. If there's an
|
||||||
|
error between PV dump init and PV dump end the vm will never be able
|
||||||
|
to run again. One example of such an error is insufficient disk space
|
||||||
|
for the dump file.
|
||||||
|
|
||||||
|
Let's add a cleanup function that tries to do a dump end. The dump
|
||||||
|
completion data is discarded but there's no point in writing it to a
|
||||||
|
file anyway if there's a possibility that other PV dump data is
|
||||||
|
missing.
|
||||||
|
|
||||||
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
||||||
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
Message-ID: <20231109120443.185979-4-frankja@linux.ibm.com>
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
---
|
||||||
|
target/s390x/arch_dump.c | 17 +++++++++++++++++
|
||||||
|
1 file changed, 17 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/target/s390x/arch_dump.c b/target/s390x/arch_dump.c
|
||||||
|
index f6af8f780a..de0b3d7d84 100644
|
||||||
|
--- a/target/s390x/arch_dump.c
|
||||||
|
+++ b/target/s390x/arch_dump.c
|
||||||
|
@@ -433,6 +433,22 @@ static int arch_sections_write(DumpState *s, uint8_t *buff)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void arch_cleanup(DumpState *s)
|
||||||
|
+{
|
||||||
|
+ g_autofree uint8_t *buff = NULL;
|
||||||
|
+ int rc;
|
||||||
|
+
|
||||||
|
+ if (!pv_dump_initialized) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ buff = g_malloc(kvm_s390_pv_dmp_get_size_completion_data());
|
||||||
|
+ rc = kvm_s390_dump_completion_data(buff);
|
||||||
|
+ if (!rc) {
|
||||||
|
+ pv_dump_initialized = false;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int cpu_get_dump_info(ArchDumpInfo *info,
|
||||||
|
const struct GuestPhysBlockList *guest_phys_blocks)
|
||||||
|
{
|
||||||
|
@@ -448,6 +464,7 @@ int cpu_get_dump_info(ArchDumpInfo *info,
|
||||||
|
info->arch_sections_add_fn = *arch_sections_add;
|
||||||
|
info->arch_sections_write_hdr_fn = *arch_sections_write_hdr;
|
||||||
|
info->arch_sections_write_fn = *arch_sections_write;
|
||||||
|
+ info->arch_cleanup_fn = *arch_cleanup;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
From b7e726278fe5564ed7f1d9e9fb15b88a4dcd57ef Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Huth <thuth@redhat.com>
|
||||||
|
Date: Tue, 21 Nov 2023 16:36:26 +0100
|
||||||
|
Subject: [PATCH 1/3] target/s390x/dump: Remove unneeded dump info function
|
||||||
|
pointer init
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||||
|
RH-MergeRequest: 325: Fix problem that secure execution guest remains in "paused" state after dump failure
|
||||||
|
RH-Jira: RHEL-16997
|
||||||
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
RH-Commit: [1/3] d7c935ffff9722d27fb47486976719d566a71810
|
||||||
|
|
||||||
|
JIRA: https://issues.redhat.com/browse/RHEL-16997
|
||||||
|
|
||||||
|
commit 816644b1219900875f47d7adf9bfb283f1b29aa0
|
||||||
|
Author: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Date: Thu Nov 9 12:04:41 2023 +0000
|
||||||
|
|
||||||
|
target/s390x/dump: Remove unneeded dump info function pointer init
|
||||||
|
|
||||||
|
dump_state_prepare() now sets the function pointers to NULL so we only
|
||||||
|
need to touch them if we're going to use them.
|
||||||
|
|
||||||
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
Message-ID: <20231109120443.185979-2-frankja@linux.ibm.com>
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
---
|
||||||
|
target/s390x/arch_dump.c | 4 ----
|
||||||
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/target/s390x/arch_dump.c b/target/s390x/arch_dump.c
|
||||||
|
index cb98f4894d..f6af8f780a 100644
|
||||||
|
--- a/target/s390x/arch_dump.c
|
||||||
|
+++ b/target/s390x/arch_dump.c
|
||||||
|
@@ -448,10 +448,6 @@ int cpu_get_dump_info(ArchDumpInfo *info,
|
||||||
|
info->arch_sections_add_fn = *arch_sections_add;
|
||||||
|
info->arch_sections_write_hdr_fn = *arch_sections_write_hdr;
|
||||||
|
info->arch_sections_write_fn = *arch_sections_write;
|
||||||
|
- } else {
|
||||||
|
- info->arch_sections_add_fn = NULL;
|
||||||
|
- info->arch_sections_write_hdr_fn = NULL;
|
||||||
|
- info->arch_sections_write_fn = NULL;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
Loading…
Reference in new issue