[GIT,PULL,2/3] KVM: s390: vsie: Fix delivery of addressing exceptions

Commit Message

Christian Borntraeger April 7, 2020, 11:42 a.m. UTC

From: David Hildenbrand <[e-mail]>

Whenever we get an -EFAULT, we failed to read in guest 2 physical
address space. Such addressing exceptions are reported via a program
intercept to the nested hypervisor.

We faked the intercept, we have to return to guest 2. Instead, right
now we would be returning -EFAULT from the intercept handler, eventually
crashing the VM.
the correct thing to do is to return 1 as rc == 1 is the internal
representation of "we have to go back into g2".

Addressing exceptions can only happen if the g2->g3 page tables
reference invalid g2 addresses (say, either a table or the final page is
not accessible - so something that basically never happens in sane
environments.

Identified by manual code inspection.

Fixes: a3508fbe9dc6 ("KVM: s390: vsie: initial support for nested virtualization")
Cc: <[e-mail]> # v4.8+
Signed-off-by: David Hildenbrand <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Reviewed-by: Claudio Imbrenda <[e-mail]>
Reviewed-by: Christian Borntraeger <[e-mail]>
[[e-mail]: fix patch description]
Signed-off-by: Christian Borntraeger <[e-mail]>
---
 arch/s390/kvm/vsie.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index 076090f9e666..4f6c22d72072 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -1202,6 +1202,7 @@  static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
 		scb_s->iprcc = PGM_ADDRESSING;
 		scb_s->pgmilc = 4;
 		scb_s->gpsw.addr = __rewind_psw(scb_s->gpsw, 4);
+		rc = 1;
 	}
 	return rc;
 }