diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-05-17 14:41:37 +0200 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-05-21 11:55:26 +0300 |
| commit | 7c470539c95630c1f2a10f109e96f249730b75eb (patch) | |
| tree | b3d518e9d6d92eb157ace9aa864dd3515c4e216b /arch/s390/kvm/kvm-s390.c | |
| parent | 2c70fe4416d5f6d092b20ebf7d7654835e09c109 (diff) | |
| download | op-kernel-dev-7c470539c95630c1f2a10f109e96f249730b75eb.zip op-kernel-dev-7c470539c95630c1f2a10f109e96f249730b75eb.tar.gz | |
s390/kvm: avoid automatic sie reentry
Do not automatically restart the sie instruction in entry64.S after an
interrupt, return to the caller with a reason code instead. That allows
to deal with RCU and other conditions in C code.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 08227c1..93444c4 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -707,7 +707,9 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) trace_kvm_s390_sie_enter(vcpu, atomic_read(&vcpu->arch.sie_block->cpuflags)); rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs); - if (rc) { + if (rc > 0) + rc = 0; + if (rc < 0) { if (kvm_is_ucontrol(vcpu->kvm)) { rc = SIE_INTERCEPT_UCONTROL; } else { |
