From: Claudio Imbrenda Date: Thu, 31 Oct 2024 12:03:16 +0000 (+0100) Subject: s390/kvm: Mask extra bits from program interrupt code X-Git-Tag: v6.13-rc1~206^2~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34fb045eddd300a2d1c0d7de7e83113215c422e3;p=thirdparty%2Fkernel%2Flinux.git s390/kvm: Mask extra bits from program interrupt code The program interrupt code has some extra bits that are sometimes set by hardware for various reasons; those bits should be ignored when the program interrupt number is needed for interrupt handling. Fixes: 05066cafa925 ("s390/mm/fault: Handle guest-related program interrupts in KVM") Reported-by: Christian Borntraeger Signed-off-by: Claudio Imbrenda Tested-by: Christian Borntraeger Link: https://lore.kernel.org/r/20241031120316.25462-1-imbrenda@linux.ibm.com Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 5d113428b4cc0..06e55f681a395 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -4737,7 +4737,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu) if (kvm_s390_cur_gmap_fault_is_write()) flags = FAULT_FLAG_WRITE; - switch (current->thread.gmap_int_code) { + switch (current->thread.gmap_int_code & PGM_INT_CODE_MASK) { case 0: vcpu->stat.exit_null++; break; diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index d03f95e528fe1..d3cdde1b18e5b 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -922,7 +922,7 @@ static int handle_fault(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) { int rc; - if (current->thread.gmap_int_code == PGM_PROTECTION) + if ((current->thread.gmap_int_code & PGM_INT_CODE_MASK) == PGM_PROTECTION) /* we can directly forward all protection exceptions */ return inject_fault(vcpu, PGM_PROTECTION, current->thread.gmap_teid.addr * PAGE_SIZE, 1);