125 lines
4.4 KiB
Diff
125 lines
4.4 KiB
Diff
From 95c229506a6e7261fce184488e880a94f9ba0789 Mon Sep 17 00:00:00 2001
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Mon, 17 Oct 2022 08:38:21 +0000
|
|
Subject: [PATCH 40/42] s390x: Add KVM PV dump interface
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
|
RH-MergeRequest: 226: s390: Enhanced Interpretation for PCI Functions and Secure Execution guest dump
|
|
RH-Bugzilla: 1664378 2043909
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
|
RH-Commit: [40/41] 5df512a63b2ed17991489565b70f89f4efc0b639
|
|
|
|
Let's add a few bits of code which hide the new KVM PV dump API from
|
|
us via new functions.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
|
|
Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
|
|
[ Marc-André: fix up for compilation issue ]
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-Id: <20221017083822.43118-10-frankja@linux.ibm.com>
|
|
(cherry picked from commit 753ca06f4706cd6e57750a606afb08c5c5299643)
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
---
|
|
hw/s390x/pv.c | 51 +++++++++++++++++++++++++++++++++++++++++++
|
|
include/hw/s390x/pv.h | 9 ++++++++
|
|
2 files changed, 60 insertions(+)
|
|
|
|
diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c
|
|
index 4c012f2eeb..728ba24547 100644
|
|
--- a/hw/s390x/pv.c
|
|
+++ b/hw/s390x/pv.c
|
|
@@ -175,6 +175,57 @@ bool kvm_s390_pv_info_basic_valid(void)
|
|
return info_valid;
|
|
}
|
|
|
|
+static int s390_pv_dump_cmd(uint64_t subcmd, uint64_t uaddr, uint64_t gaddr,
|
|
+ uint64_t len)
|
|
+{
|
|
+ struct kvm_s390_pv_dmp dmp = {
|
|
+ .subcmd = subcmd,
|
|
+ .buff_addr = uaddr,
|
|
+ .buff_len = len,
|
|
+ .gaddr = gaddr,
|
|
+ };
|
|
+ int ret;
|
|
+
|
|
+ ret = s390_pv_cmd(KVM_PV_DUMP, (void *)&dmp);
|
|
+ if (ret) {
|
|
+ error_report("KVM DUMP command %ld failed", subcmd);
|
|
+ }
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+int kvm_s390_dump_cpu(S390CPU *cpu, void *buff)
|
|
+{
|
|
+ struct kvm_s390_pv_dmp dmp = {
|
|
+ .subcmd = KVM_PV_DUMP_CPU,
|
|
+ .buff_addr = (uint64_t)buff,
|
|
+ .gaddr = 0,
|
|
+ .buff_len = info_dump.dump_cpu_buffer_len,
|
|
+ };
|
|
+ struct kvm_pv_cmd pv = {
|
|
+ .cmd = KVM_PV_DUMP,
|
|
+ .data = (uint64_t)&dmp,
|
|
+ };
|
|
+
|
|
+ return kvm_vcpu_ioctl(CPU(cpu), KVM_S390_PV_CPU_COMMAND, &pv);
|
|
+}
|
|
+
|
|
+int kvm_s390_dump_init(void)
|
|
+{
|
|
+ return s390_pv_dump_cmd(KVM_PV_DUMP_INIT, 0, 0, 0);
|
|
+}
|
|
+
|
|
+int kvm_s390_dump_mem_state(uint64_t gaddr, size_t len, void *dest)
|
|
+{
|
|
+ return s390_pv_dump_cmd(KVM_PV_DUMP_CONFIG_STOR_STATE, (uint64_t)dest,
|
|
+ gaddr, len);
|
|
+}
|
|
+
|
|
+int kvm_s390_dump_completion_data(void *buff)
|
|
+{
|
|
+ return s390_pv_dump_cmd(KVM_PV_DUMP_COMPLETE, (uint64_t)buff, 0,
|
|
+ info_dump.dump_config_finalize_len);
|
|
+}
|
|
+
|
|
#define TYPE_S390_PV_GUEST "s390-pv-guest"
|
|
OBJECT_DECLARE_SIMPLE_TYPE(S390PVGuest, S390_PV_GUEST)
|
|
|
|
diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h
|
|
index e5ea0eca16..9360aa1091 100644
|
|
--- a/include/hw/s390x/pv.h
|
|
+++ b/include/hw/s390x/pv.h
|
|
@@ -51,6 +51,10 @@ uint64_t kvm_s390_pv_dmp_get_size_cpu(void);
|
|
uint64_t kvm_s390_pv_dmp_get_size_mem_state(void);
|
|
uint64_t kvm_s390_pv_dmp_get_size_completion_data(void);
|
|
bool kvm_s390_pv_info_basic_valid(void);
|
|
+int kvm_s390_dump_init(void);
|
|
+int kvm_s390_dump_cpu(S390CPU *cpu, void *buff);
|
|
+int kvm_s390_dump_mem_state(uint64_t addr, size_t len, void *dest);
|
|
+int kvm_s390_dump_completion_data(void *buff);
|
|
#else /* CONFIG_KVM */
|
|
static inline bool s390_is_pv(void) { return false; }
|
|
static inline int s390_pv_query_info(void) { return 0; }
|
|
@@ -66,6 +70,11 @@ static inline uint64_t kvm_s390_pv_dmp_get_size_cpu(void) { return 0; }
|
|
static inline uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) { return 0; }
|
|
static inline uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) { return 0; }
|
|
static inline bool kvm_s390_pv_info_basic_valid(void) { return false; }
|
|
+static inline int kvm_s390_dump_init(void) { return 0; }
|
|
+static inline int kvm_s390_dump_cpu(S390CPU *cpu, void *buff) { return 0; }
|
|
+static inline int kvm_s390_dump_mem_state(uint64_t addr, size_t len,
|
|
+ void *dest) { return 0; }
|
|
+static inline int kvm_s390_dump_completion_data(void *buff) { return 0; }
|
|
#endif /* CONFIG_KVM */
|
|
|
|
int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp);
|
|
--
|
|
2.37.3
|
|
|