david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390x/kvm: cleanup calls to cpu_synchronize_state()

Browse Source 
We have a call to cpu_synchronize_state() on every kvm_arch_handle_exit().

Let's remove the ones that are no longer needed.

Remaining places (for s390x) are in
- target/s390x/sigp.c, on the target CPU
- target/s390x/cpu.c:s390_cpu_get_crash_info()

While at it, use kvm_cpu_synchronize_state() instead of
cpu_synchronize_state() in KVM code. (suggested by Thomas Huth)

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180412093521.2469-1-david@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2018-04-12 11:35:21 +02:00 committed by Cornelia Huck
parent c96f2c2a16
commit e7c3246162
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/s390x/s390-pci-inst.c
View File

@ -155,8 +155,6 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
S390pciState *s = s390_get_phb(); S390pciState *s = s390_get_phb();
int i; int i;
cpu_synchronize_state(CPU(cpu));
if (env->psw.mask & PSW_MASK_PSTATE) { if (env->psw.mask & PSW_MASK_PSTATE) {
s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra); s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra);
return 0; return 0;
@ -389,8 +387,6 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
uint32_t fh; uint32_t fh;
uint8_t pcias; uint8_t pcias;
cpu_synchronize_state(CPU(cpu));
if (env->psw.mask & PSW_MASK_PSTATE) { if (env->psw.mask & PSW_MASK_PSTATE) {
s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra); s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra);
return 0; return 0;
@ -487,8 +483,6 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
uint32_t fh; uint32_t fh;
uint8_t pcias; uint8_t pcias;
cpu_synchronize_state(CPU(cpu));
if (env->psw.mask & PSW_MASK_PSTATE) { if (env->psw.mask & PSW_MASK_PSTATE) {
s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra); s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra);
return 0; return 0;
@ -620,8 +614,6 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
S390IOTLBEntry entry; S390IOTLBEntry entry;
hwaddr start, end; hwaddr start, end;
cpu_synchronize_state(CPU(cpu));
if (env->psw.mask & PSW_MASK_PSTATE) { if (env->psw.mask & PSW_MASK_PSTATE) {
s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra); s390_program_interrupt(env, PGM_PRIVILEGED, 4, ra);
return 0; return 0;

20
target/s390x/kvm.c
View File

@ -1081,7 +1081,6 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run,
uint32_t code; uint32_t code;
int r = 0; int r = 0;
cpu_synchronize_state(CPU(cpu));
sccb = env->regs[ipbh0 & 0xf]; sccb = env->regs[ipbh0 & 0xf];
code = env->regs[(ipbh0 & 0xf0) >> 4]; code = env->regs[(ipbh0 & 0xf0) >> 4];
@ -1101,8 +1100,6 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
int rc = 0; int rc = 0;
uint16_t ipbh0 = (run->s390_sieic.ipb & 0xffff0000) >> 16; uint16_t ipbh0 = (run->s390_sieic.ipb & 0xffff0000) >> 16;
cpu_synchronize_state(CPU(cpu));
switch (ipa1) { switch (ipa1) {
case PRIV_B2_XSCH: case PRIV_B2_XSCH:
ioinst_handle_xsch(cpu, env->regs[1], RA_IGNORED); ioinst_handle_xsch(cpu, env->regs[1], RA_IGNORED);
@ -1248,7 +1245,6 @@ static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run)
uint8_t ar; uint8_t ar;
if (s390_has_feat(S390_FEAT_ZPCI)) { if (s390_has_feat(S390_FEAT_ZPCI)) {
cpu_synchronize_state(CPU(cpu));
fiba = get_base_disp_rxy(cpu, run, &ar); fiba = get_base_disp_rxy(cpu, run, &ar);
return stpcifc_service_call(cpu, r1, fiba, ar, RA_IGNORED); return stpcifc_service_call(cpu, r1, fiba, ar, RA_IGNORED);
@ -1266,7 +1262,6 @@ static int kvm_sic_service_call(S390CPU *cpu, struct kvm_run *run)
uint16_t mode; uint16_t mode;
int r; int r;
cpu_synchronize_state(CPU(cpu));
mode = env->regs[r1] & 0xffff; mode = env->regs[r1] & 0xffff;
isc = (env->regs[r3] >> 27) & 0x7; isc = (env->regs[r3] >> 27) & 0x7;
r = css_do_sic(env, isc, mode); r = css_do_sic(env, isc, mode);
@ -1297,7 +1292,6 @@ static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run)
uint8_t ar; uint8_t ar;
if (s390_has_feat(S390_FEAT_ZPCI)) { if (s390_has_feat(S390_FEAT_ZPCI)) {
cpu_synchronize_state(CPU(cpu));
gaddr = get_base_disp_rsy(cpu, run, &ar); gaddr = get_base_disp_rsy(cpu, run, &ar);
return pcistb_service_call(cpu, r1, r3, gaddr, ar, RA_IGNORED); return pcistb_service_call(cpu, r1, r3, gaddr, ar, RA_IGNORED);
@ -1313,7 +1307,6 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run)
uint8_t ar; uint8_t ar;
if (s390_has_feat(S390_FEAT_ZPCI)) { if (s390_has_feat(S390_FEAT_ZPCI)) {
cpu_synchronize_state(CPU(cpu));
fiba = get_base_disp_rxy(cpu, run, &ar); fiba = get_base_disp_rxy(cpu, run, &ar);
return mpcifc_service_call(cpu, r1, fiba, ar, RA_IGNORED); return mpcifc_service_call(cpu, r1, fiba, ar, RA_IGNORED);
@ -1401,7 +1394,6 @@ static int handle_hypercall(S390CPU *cpu, struct kvm_run *run)
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
int ret; int ret;
cpu_synchronize_state(CPU(cpu));
ret = s390_virtio_hypercall(env); ret = s390_virtio_hypercall(env);
if (ret == -EINVAL) { if (ret == -EINVAL) {
kvm_s390_program_interrupt(cpu, PGM_SPECIFICATION); kvm_s390_program_interrupt(cpu, PGM_SPECIFICATION);
@ -1416,7 +1408,6 @@ static void kvm_handle_diag_288(S390CPU *cpu, struct kvm_run *run)
uint64_t r1, r3; uint64_t r1, r3;
int rc; int rc;
cpu_synchronize_state(CPU(cpu));
r1 = (run->s390_sieic.ipa & 0x00f0) >> 4; r1 = (run->s390_sieic.ipa & 0x00f0) >> 4;
r3 = run->s390_sieic.ipa & 0x000f; r3 = run->s390_sieic.ipa & 0x000f;
rc = handle_diag_288(&cpu->env, r1, r3); rc = handle_diag_288(&cpu->env, r1, r3);
@ -1429,7 +1420,6 @@ static void kvm_handle_diag_308(S390CPU *cpu, struct kvm_run *run)
{ {
uint64_t r1, r3; uint64_t r1, r3;
cpu_synchronize_state(CPU(cpu));
r1 = (run->s390_sieic.ipa & 0x00f0) >> 4; r1 = (run->s390_sieic.ipa & 0x00f0) >> 4;
r3 = run->s390_sieic.ipa & 0x000f; r3 = run->s390_sieic.ipa & 0x000f;
handle_diag_308(&cpu->env, r1, r3, RA_IGNORED); handle_diag_308(&cpu->env, r1, r3, RA_IGNORED);
@ -1440,8 +1430,6 @@ static int handle_sw_breakpoint(S390CPU *cpu, struct kvm_run *run)
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
unsigned long pc; unsigned long pc;
cpu_synchronize_state(CPU(cpu));
pc = env->psw.addr - sw_bp_ilen; pc = env->psw.addr - sw_bp_ilen;
if (kvm_find_sw_breakpoint(CPU(cpu), pc)) { if (kvm_find_sw_breakpoint(CPU(cpu), pc)) {
env->psw.addr = pc; env->psw.addr = pc;
@ -1493,8 +1481,6 @@ static int kvm_s390_handle_sigp(S390CPU *cpu, uint8_t ipa1, uint32_t ipb)
int ret; int ret;
uint8_t order; uint8_t order;
cpu_synchronize_state(CPU(cpu));
/* get order code */ /* get order code */
order = decode_basedisp_rs(env, ipb, NULL) & SIGP_ORDER_MASK; order = decode_basedisp_rs(env, ipb, NULL) & SIGP_ORDER_MASK;
@ -1556,7 +1542,6 @@ static int handle_oper_loop(S390CPU *cpu, struct kvm_run *run)
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
PSW oldpsw, newpsw; PSW oldpsw, newpsw;
cpu_synchronize_state(cs);
newpsw.mask = ldq_phys(cs->as, cpu->env.psa + newpsw.mask = ldq_phys(cs->as, cpu->env.psa +
offsetof(LowCore, program_new_psw)); offsetof(LowCore, program_new_psw));
newpsw.addr = ldq_phys(cs->as, cpu->env.psa + newpsw.addr = ldq_phys(cs->as, cpu->env.psa +
@ -1609,7 +1594,6 @@ static int handle_intercept(S390CPU *cpu)
break; break;
case ICPT_WAITPSW: case ICPT_WAITPSW:
/* disabled wait, since enabled wait is handled in kernel */ /* disabled wait, since enabled wait is handled in kernel */
cpu_synchronize_state(cs);
s390_handle_wait(cpu); s390_handle_wait(cpu);
r = EXCP_HALTED; r = EXCP_HALTED;
break; break;
@ -1651,8 +1635,6 @@ static int handle_tsch(S390CPU *cpu)
struct kvm_run *run = cs->kvm_run; struct kvm_run *run = cs->kvm_run;
int ret; int ret;
cpu_synchronize_state(cs);
ret = ioinst_handle_tsch(cpu, cpu->env.regs[1], run->s390_tsch.ipb, ret = ioinst_handle_tsch(cpu, cpu->env.regs[1], run->s390_tsch.ipb,
RA_IGNORED); RA_IGNORED);
if (ret < 0) { if (ret < 0) {
@ -1778,7 +1760,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
cpu_synchronize_state(cs); kvm_cpu_synchronize_state(cs);
switch (run->exit_reason) { switch (run->exit_reason) {
case KVM_EXIT_S390_SIEIC: case KVM_EXIT_S390_SIEIC: