KVM: s390: consider system MHA for guest storage

Verify that the guest maximum storage address is below the MHA (maximum
host address) value allowed on the host.

Acked-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Guenther Hutzl <hutzl@linux.vnet.ibm.com>
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
[adopt to match recent limit,size changes]

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 8aa5e55a8ecd07abb395a74fe7189f1b940b0147..940e9ff231a31dd8ef2b3ff3984f736976e70f49 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1184,7 +1184,11 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
                kvm->arch.gmap = NULL;
                kvm->arch.mem_limit = KVM_S390_NO_MEM_LIMIT;
        } else {
-               kvm->arch.mem_limit = TASK_MAX_SIZE;
+               if (sclp.hamax == U64_MAX)
+                       kvm->arch.mem_limit = TASK_MAX_SIZE;
+               else
+                       kvm->arch.mem_limit = min_t(unsigned long, TASK_MAX_SIZE,
+                                                   sclp.hamax + 1);
                kvm->arch.gmap = gmap_alloc(current->mm, kvm->arch.mem_limit - 1);
                if (!kvm->arch.gmap)
                        goto out_err;

diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index e0a1f4eec370a9db7a0b7d4c64b11a6ec3ab8ac8..6804354c42bd29214463fc62d87fe13c3f92e775 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -40,7 +40,8 @@ struct read_info_sccb {
        u8      fac85;                  /* 85 */
        u8      _pad_86[91 - 86];       /* 86-90 */
        u8      flags;                  /* 91 */
-       u8      _pad_92[100 - 92];      /* 92-99 */
+       u8      _pad_92[99 - 92];       /* 92-98 */
+       u8      hamaxpow;               /* 99 */
        u32     rnsize2;                /* 100-103 */
        u64     rnmax2;                 /* 104-111 */
        u8      _pad_112[116 - 112];    /* 112-115 */
@@ -120,6 +121,11 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
        sclp.rzm <<= 20;
        sclp.ibc = sccb->ibc;
 
+       if (sccb->hamaxpow && sccb->hamaxpow < 64)
+               sclp.hamax = (1UL << sccb->hamaxpow) - 1;
+       else
+               sclp.hamax = U64_MAX;
+
        if (!sccb->hcpua) {
                if (MACHINE_IS_VM)
                        sclp.max_cores = 64;