Merge tag 'kvm-s390-next-6.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/kernel/stable.git] / arch / s390 / kvm / kvm-s390.c

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index ea63ac76988914d85bdfb7fdbe7bd209f4066741..15d589502f5152abb5eb30d2251ba8c1646e3912 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -2878,7 +2878,7 @@ static int kvm_s390_vm_mem_op_abs(struct kvm *kvm, struct kvm_s390_mem_op *mop)
 
        srcu_idx = srcu_read_lock(&kvm->srcu);
 
-       if (kvm_is_error_gpa(kvm, mop->gaddr)) {
+       if (!kvm_is_gpa_in_memslot(kvm, mop->gaddr)) {
                r = PGM_ADDRESSING;
                goto out_unlock;
        }
@@ -2940,7 +2940,7 @@ static int kvm_s390_vm_mem_op_cmpxchg(struct kvm *kvm, struct kvm_s390_mem_op *m
 
        srcu_idx = srcu_read_lock(&kvm->srcu);
 
-       if (kvm_is_error_gpa(kvm, mop->gaddr)) {
+       if (!kvm_is_gpa_in_memslot(kvm, mop->gaddr)) {
                r = PGM_ADDRESSING;
                goto out_unlock;
        }
@@ -3153,7 +3153,7 @@ static int kvm_s390_apxa_installed(void)
  */
 static void kvm_s390_set_crycb_format(struct kvm *kvm)
 {
-       kvm->arch.crypto.crycbd = (__u32)(unsigned long) kvm->arch.crypto.crycb;
+       kvm->arch.crypto.crycbd = virt_to_phys(kvm->arch.crypto.crycb);
 
        /* Clear the CRYCB format bits - i.e., set format 0 by default */
        kvm->arch.crypto.crycbd &= ~(CRYCB_FORMAT_MASK);