462008473e
- kvm-hw-s390x-ipl-Provide-more-memory-to-the-s390-ccw.img.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Use-the-libc-from-SLOF-and-remove-s.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Link-the-netboot-code-into-the-main.patch [RHEL-11424] - kvm-redhat-Remove-the-s390-netboot.img-from-the-spec-fil.patch [RHEL-11424] - kvm-hw-s390x-Remove-the-possibility-to-load-the-s390-net.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Merge-netboot.mak-into-the-main-Mak.patch [RHEL-11424] - kvm-docs-system-s390x-bootdevices-Update-the-documentati.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Remove-panics-from-ISO-IPL-path.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Remove-panics-from-ECKD-IPL-path.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Remove-panics-from-SCSI-IPL-path.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Remove-panics-from-DASD-IPL-path.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Remove-panics-from-Netboot-IPL-path.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Enable-failed-IPL-to-return-after-e.patch [RHEL-11424] - kvm-include-hw-s390x-Add-include-files-for-common-IPL-st.patch [RHEL-11424] - kvm-s390x-Add-individual-loadparm-assignment-to-CCW-devi.patch [RHEL-11424] - kvm-hw-s390x-Build-an-IPLB-for-each-boot-device.patch [RHEL-11424] - kvm-s390x-Rebuild-IPLB-for-SCSI-device-directly-from-DIA.patch [RHEL-11424] - kvm-pc-bios-s390x-Enable-multi-device-boot-loop.patch [RHEL-11424] - kvm-docs-system-Update-documentation-for-s390x-IPL.patch [RHEL-11424] - kvm-tests-qtest-Add-s390x-boot-order-tests-to-cdrom-test.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Clarify-alignment-is-in-bytes.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Don-t-generate-TEXTRELs.patch [RHEL-11424] - kvm-pc-bios-s390-ccw-Introduce-EXTRA_LDFLAGS.patch [RHEL-11424] - kvm-vfio-migration-Report-only-stop-copy-size-in-vfio_st.patch [RHEL-64307] - kvm-vfio-migration-Change-trace-formats-from-hex-to-deci.patch [RHEL-64307] - kvm-kvm-Allow-kvm_arch_get-put_registers-to-accept-Error.patch [RHEL-60914] - kvm-target-i386-kvm-Report-which-action-failed-in-kvm_ar.patch [RHEL-60914] - Resolves: RHEL-11424 ([IBM 9.6 FEAT] KVM: Full boot order support - qemu part) - Resolves: RHEL-64307 (High threshold value observed in vGPU live migration) - Resolves: RHEL-60914 (Fail migration properly when put cpu register fails)
288 lines
9.7 KiB
Diff
288 lines
9.7 KiB
Diff
From 07a472e19f11c6364e787e71c95c990b76aaf187 Mon Sep 17 00:00:00 2001
|
|
From: Julia Suvorova <jusual@redhat.com>
|
|
Date: Fri, 27 Sep 2024 12:47:40 +0200
|
|
Subject: [PATCH 26/27] kvm: Allow kvm_arch_get/put_registers to accept Error**
|
|
|
|
RH-Author: Julia Suvorova <None>
|
|
RH-MergeRequest: 286: kvm: Allow kvm_arch_get/put_registers to accept Error**
|
|
RH-Jira: RHEL-60914
|
|
RH-Acked-by: Juraj Marcin <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Commit: [1/2] 2ab30f24245a52c4254a5b9238b1b2e966a8c6a2
|
|
|
|
This is necessary to provide discernible error messages to the caller.
|
|
|
|
Signed-off-by: Julia Suvorova <jusual@redhat.com>
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Link: https://lore.kernel.org/r/20240927104743.218468-2-jusual@redhat.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit a1676bb3047f28b292ecbce3a378ccc0b4721d47)
|
|
---
|
|
accel/kvm/kvm-all.c | 41 +++++++++++++++++++++++++++++---------
|
|
include/sysemu/kvm.h | 4 ++--
|
|
target/arm/kvm.c | 4 ++--
|
|
target/i386/kvm/kvm.c | 4 ++--
|
|
target/loongarch/kvm/kvm.c | 4 ++--
|
|
target/mips/kvm.c | 4 ++--
|
|
target/ppc/kvm.c | 4 ++--
|
|
target/riscv/kvm/kvm-cpu.c | 4 ++--
|
|
target/s390x/kvm/kvm.c | 4 ++--
|
|
9 files changed, 48 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
|
|
index 75d11a07b2..a220178822 100644
|
|
--- a/accel/kvm/kvm-all.c
|
|
+++ b/accel/kvm/kvm-all.c
|
|
@@ -2766,9 +2766,15 @@ void kvm_flush_coalesced_mmio_buffer(void)
|
|
static void do_kvm_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg)
|
|
{
|
|
if (!cpu->vcpu_dirty && !kvm_state->guest_state_protected) {
|
|
- int ret = kvm_arch_get_registers(cpu);
|
|
+ Error *err = NULL;
|
|
+ int ret = kvm_arch_get_registers(cpu, &err);
|
|
if (ret) {
|
|
- error_report("Failed to get registers: %s", strerror(-ret));
|
|
+ if (err) {
|
|
+ error_reportf_err(err, "Failed to synchronize CPU state: ");
|
|
+ } else {
|
|
+ error_report("Failed to get registers: %s", strerror(-ret));
|
|
+ }
|
|
+
|
|
cpu_dump_state(cpu, stderr, CPU_DUMP_CODE);
|
|
vm_stop(RUN_STATE_INTERNAL_ERROR);
|
|
}
|
|
@@ -2786,9 +2792,15 @@ void kvm_cpu_synchronize_state(CPUState *cpu)
|
|
|
|
static void do_kvm_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_data arg)
|
|
{
|
|
- int ret = kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE);
|
|
+ Error *err = NULL;
|
|
+ int ret = kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE, &err);
|
|
if (ret) {
|
|
- error_report("Failed to put registers after reset: %s", strerror(-ret));
|
|
+ if (err) {
|
|
+ error_reportf_err(err, "Restoring resisters after reset: ");
|
|
+ } else {
|
|
+ error_report("Failed to put registers after reset: %s",
|
|
+ strerror(-ret));
|
|
+ }
|
|
cpu_dump_state(cpu, stderr, CPU_DUMP_CODE);
|
|
vm_stop(RUN_STATE_INTERNAL_ERROR);
|
|
}
|
|
@@ -2803,9 +2815,15 @@ void kvm_cpu_synchronize_post_reset(CPUState *cpu)
|
|
|
|
static void do_kvm_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg)
|
|
{
|
|
- int ret = kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE);
|
|
+ Error *err = NULL;
|
|
+ int ret = kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE, &err);
|
|
if (ret) {
|
|
- error_report("Failed to put registers after init: %s", strerror(-ret));
|
|
+ if (err) {
|
|
+ error_reportf_err(err, "Putting registers after init: ");
|
|
+ } else {
|
|
+ error_report("Failed to put registers after init: %s",
|
|
+ strerror(-ret));
|
|
+ }
|
|
exit(1);
|
|
}
|
|
|
|
@@ -2995,10 +3013,15 @@ int kvm_cpu_exec(CPUState *cpu)
|
|
MemTxAttrs attrs;
|
|
|
|
if (cpu->vcpu_dirty) {
|
|
- ret = kvm_arch_put_registers(cpu, KVM_PUT_RUNTIME_STATE);
|
|
+ Error *err = NULL;
|
|
+ ret = kvm_arch_put_registers(cpu, KVM_PUT_RUNTIME_STATE, &err);
|
|
if (ret) {
|
|
- error_report("Failed to put registers after init: %s",
|
|
- strerror(-ret));
|
|
+ if (err) {
|
|
+ error_reportf_err(err, "Putting registers after init: ");
|
|
+ } else {
|
|
+ error_report("Failed to put registers after init: %s",
|
|
+ strerror(-ret));
|
|
+ }
|
|
ret = -1;
|
|
break;
|
|
}
|
|
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
|
|
index 9cf14ca3d5..d9ad723f78 100644
|
|
--- a/include/sysemu/kvm.h
|
|
+++ b/include/sysemu/kvm.h
|
|
@@ -359,7 +359,7 @@ int kvm_arch_handle_exit(CPUState *cpu, struct kvm_run *run);
|
|
|
|
int kvm_arch_process_async_events(CPUState *cpu);
|
|
|
|
-int kvm_arch_get_registers(CPUState *cpu);
|
|
+int kvm_arch_get_registers(CPUState *cpu, Error **errp);
|
|
|
|
/* state subset only touched by the VCPU itself during runtime */
|
|
#define KVM_PUT_RUNTIME_STATE 1
|
|
@@ -368,7 +368,7 @@ int kvm_arch_get_registers(CPUState *cpu);
|
|
/* full state set, modified during initialization or on vmload */
|
|
#define KVM_PUT_FULL_STATE 3
|
|
|
|
-int kvm_arch_put_registers(CPUState *cpu, int level);
|
|
+int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp);
|
|
|
|
int kvm_arch_get_default_type(MachineState *ms);
|
|
|
|
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
|
|
index 849e2e21b3..f1f1b5b375 100644
|
|
--- a/target/arm/kvm.c
|
|
+++ b/target/arm/kvm.c
|
|
@@ -2042,7 +2042,7 @@ static int kvm_arch_put_sve(CPUState *cs)
|
|
return 0;
|
|
}
|
|
|
|
-int kvm_arch_put_registers(CPUState *cs, int level)
|
|
+int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
|
|
{
|
|
uint64_t val;
|
|
uint32_t fpr;
|
|
@@ -2226,7 +2226,7 @@ static int kvm_arch_get_sve(CPUState *cs)
|
|
return 0;
|
|
}
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
uint64_t val;
|
|
unsigned int el;
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index 2b28c18693..423e6922d8 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -5121,7 +5121,7 @@ static int kvm_get_nested_state(X86CPU *cpu)
|
|
return ret;
|
|
}
|
|
|
|
-int kvm_arch_put_registers(CPUState *cpu, int level)
|
|
+int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp)
|
|
{
|
|
X86CPU *x86_cpu = X86_CPU(cpu);
|
|
int ret;
|
|
@@ -5209,7 +5209,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level)
|
|
return 0;
|
|
}
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
X86CPU *cpu = X86_CPU(cs);
|
|
int ret;
|
|
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
|
|
index e1be6a6959..9204d4295d 100644
|
|
--- a/target/loongarch/kvm/kvm.c
|
|
+++ b/target/loongarch/kvm/kvm.c
|
|
@@ -585,7 +585,7 @@ static int kvm_loongarch_put_cpucfg(CPUState *cs)
|
|
return ret;
|
|
}
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
int ret;
|
|
|
|
@@ -613,7 +613,7 @@ int kvm_arch_get_registers(CPUState *cs)
|
|
return ret;
|
|
}
|
|
|
|
-int kvm_arch_put_registers(CPUState *cs, int level)
|
|
+int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
|
|
{
|
|
int ret;
|
|
|
|
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
|
|
index a631ab544f..a98798c669 100644
|
|
--- a/target/mips/kvm.c
|
|
+++ b/target/mips/kvm.c
|
|
@@ -1172,7 +1172,7 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)
|
|
return ret;
|
|
}
|
|
|
|
-int kvm_arch_put_registers(CPUState *cs, int level)
|
|
+int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
|
|
{
|
|
CPUMIPSState *env = cpu_env(cs);
|
|
struct kvm_regs regs;
|
|
@@ -1207,7 +1207,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
|
|
return ret;
|
|
}
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
CPUMIPSState *env = cpu_env(cs);
|
|
int ret = 0;
|
|
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
|
|
index c942ff55b2..7daa097164 100644
|
|
--- a/target/ppc/kvm.c
|
|
+++ b/target/ppc/kvm.c
|
|
@@ -902,7 +902,7 @@ int kvmppc_put_books_sregs(PowerPCCPU *cpu)
|
|
return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_SREGS, &sregs);
|
|
}
|
|
|
|
-int kvm_arch_put_registers(CPUState *cs, int level)
|
|
+int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
|
|
{
|
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
CPUPPCState *env = &cpu->env;
|
|
@@ -1207,7 +1207,7 @@ static int kvmppc_get_books_sregs(PowerPCCPU *cpu)
|
|
return 0;
|
|
}
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
CPUPPCState *env = &cpu->env;
|
|
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
|
|
index f6e3156b8d..2bfb112be0 100644
|
|
--- a/target/riscv/kvm/kvm-cpu.c
|
|
+++ b/target/riscv/kvm/kvm-cpu.c
|
|
@@ -1192,7 +1192,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
|
|
KVM_CAP_LAST_INFO
|
|
};
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
int ret = 0;
|
|
|
|
@@ -1237,7 +1237,7 @@ int kvm_riscv_sync_mpstate_to_kvm(RISCVCPU *cpu, int state)
|
|
return 0;
|
|
}
|
|
|
|
-int kvm_arch_put_registers(CPUState *cs, int level)
|
|
+int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
|
|
{
|
|
int ret = 0;
|
|
|
|
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
|
|
index 45c23758e7..0d51a4ea6b 100644
|
|
--- a/target/s390x/kvm/kvm.c
|
|
+++ b/target/s390x/kvm/kvm.c
|
|
@@ -472,7 +472,7 @@ static int can_sync_regs(CPUState *cs, int regs)
|
|
#define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \
|
|
KVM_SYNC_CRS | KVM_SYNC_PREFIX)
|
|
|
|
-int kvm_arch_put_registers(CPUState *cs, int level)
|
|
+int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
|
|
{
|
|
CPUS390XState *env = cpu_env(cs);
|
|
struct kvm_fpu fpu = {};
|
|
@@ -598,7 +598,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
|
|
return 0;
|
|
}
|
|
|
|
-int kvm_arch_get_registers(CPUState *cs)
|
|
+int kvm_arch_get_registers(CPUState *cs, Error **errp)
|
|
{
|
|
CPUS390XState *env = cpu_env(cs);
|
|
struct kvm_fpu fpu;
|
|
--
|
|
2.39.3
|
|
|