[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/46] s390x/kvm: factor out storing of adtl CPU stat
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 16/46] s390x/kvm: factor out storing of adtl CPU status |
Date: |
Fri, 20 Oct 2017 13:53:48 +0200 |
From: David Hildenbrand <address@hidden>
Called from SIGP code to be factored out, so let's move it. Add a
FIXME for TCG code in the future.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/helper.c | 29 +++++++++++++++++++++++++++++
target/s390x/internal.h | 1 +
target/s390x/kvm.c | 30 +-----------------------------
3 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 4c11822074..2505f3aec0 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -305,6 +305,35 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool
store_arch)
return 0;
}
+
+#define ADTL_GS_OFFSET 1024 /* offset of GS data in adtl save area */
+#define ADTL_GS_MIN_SIZE 2048 /* minimal size of adtl save area for GS */
+int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)
+{
+ hwaddr save = len;
+ void *mem;
+
+ mem = cpu_physical_memory_map(addr, &save, 1);
+ if (!mem) {
+ return -EFAULT;
+ }
+ if (save != len) {
+ cpu_physical_memory_unmap(mem, len, 1, 0);
+ return -EFAULT;
+ }
+
+ /* FIXME: as soon as TCG supports these features, convert cpu->be */
+ if (s390_has_feat(S390_FEAT_VECTOR)) {
+ memcpy(mem, &cpu->env.vregs, 512);
+ }
+ if (s390_has_feat(S390_FEAT_GUARDED_STORAGE) && len >= ADTL_GS_MIN_SIZE) {
+ memcpy(mem + ADTL_GS_OFFSET, &cpu->env.gscb, 32);
+ }
+
+ cpu_physical_memory_unmap(mem, len, 1, len);
+
+ return 0;
+}
#endif /* CONFIG_USER_ONLY */
void s390_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
diff --git a/target/s390x/internal.h b/target/s390x/internal.h
index a301237c17..fb8ff6b078 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -355,6 +355,7 @@ void do_restart_interrupt(CPUS390XState *env);
void s390_handle_wait(S390CPU *cpu);
#define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)
int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch);
+int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len);
#ifndef CONFIG_USER_ONLY
LowCore *cpu_map_lowcore(CPUS390XState *env);
void cpu_unmap_lowcore(LowCore *lowcore);
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index aeea355cf3..bf6740df56 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -1556,34 +1556,6 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg)
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
}
-#define ADTL_GS_OFFSET 1024 /* offset of GS data in adtl save area */
-#define ADTL_GS_MIN_SIZE 2048 /* minimal size of adtl save area for GS */
-static int do_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)
-{
- hwaddr save = len;
- void *mem;
-
- mem = cpu_physical_memory_map(addr, &save, 1);
- if (!mem) {
- return -EFAULT;
- }
- if (save != len) {
- cpu_physical_memory_unmap(mem, len, 1, 0);
- return -EFAULT;
- }
-
- if (s390_has_feat(S390_FEAT_VECTOR)) {
- memcpy(mem, &cpu->env.vregs, 512);
- }
- if (s390_has_feat(S390_FEAT_GUARDED_STORAGE) && len >= ADTL_GS_MIN_SIZE) {
- memcpy(mem + ADTL_GS_OFFSET, &cpu->env.gscb, 32);
- }
-
- cpu_physical_memory_unmap(mem, len, 1, len);
-
- return 0;
-}
-
static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)
{
S390CPU *cpu = S390_CPU(cs);
@@ -1676,7 +1648,7 @@ static void sigp_store_adtl_status(CPUState *cs,
run_on_cpu_data arg)
cpu_synchronize_state(cs);
- if (do_store_adtl_status(cpu, addr, len)) {
+ if (s390_store_adtl_status(cpu, addr, len)) {
set_sigp_status(si, SIGP_STAT_INVALID_PARAMETER);
return;
}
--
2.13.6
- [Qemu-devel] [PULL 07/46] s390x/tcg: take care of external interrupt subclasses, (continued)
- [Qemu-devel] [PULL 07/46] s390x/tcg: take care of external interrupt subclasses, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 08/46] s390x/tcg: STOPPED cpus can never wake up, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 09/46] s390x/tcg: a CPU cannot switch state due to an interrupt, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 11/46] s390x/tcg: handle WAIT PSWs during interrupt injection, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 10/46] target/s390x: factor out handling of WAIT PSW into s390_handle_wait(), Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 12/46] target/s390x: interpret PSW_MASK_WAIT only for TCG, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 13/46] s390x/kvm: pass ipb directly into handle_sigp(), Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 14/46] s390x/kvm: generalize SIGP stop and restart interrupt injection, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 15/46] s390x/kvm: factor out storing of CPU status, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 17/46] s390x/kvm: drop two debug prints, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 16/46] s390x/kvm: factor out storing of adtl CPU status,
Cornelia Huck <=
- [Qemu-devel] [PULL 19/46] s390x/kvm: factor out actual handling of STOP interrupts, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 20/46] s390x/tcg: implement SIGP SENSE RUNNING STATUS, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 18/46] s390x/kvm: factor out SIGP code into sigp.c, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 21/46] s390x/tcg: implement SIGP SENSE, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 23/46] s390x/tcg: implement SIGP EMERGENCY SIGNAL, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 22/46] s390x/tcg: implement SIGP EXTERNAL CALL, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 25/46] s390x/tcg: implement STOP and RESET interrupts for TCG, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 24/46] s390x/tcg: implement SIGP CONDITIONAL EMERGENCY SIGNAL, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 26/46] s390x/tcg: flush the tlb on SIGP SET PREFIX, Cornelia Huck, 2017/10/20
- [Qemu-devel] [PULL 27/46] s390x/tcg: switch to new SIGP handling code, Cornelia Huck, 2017/10/20