diff options
| author | Guenther Hutzl | 2014-12-01 17:24:42 +0100 |
|---|---|---|
| committer | Christian Borntraeger | 2015-12-15 17:08:22 +0100 |
| commit | 32e6b236d26946eb076d1450bfb8f9978f15d6b9 (patch) | |
| tree | 302cf6c0d088f3fe93fad850e159b7da97c486fb /arch/s390/kvm/kvm-s390.c | |
| parent | KVM: s390: fix mismatch between user and in-kernel guest limit (diff) | |
| download | kernel-qcow2-linux-32e6b236d26946eb076d1450bfb8f9978f15d6b9.tar.gz kernel-qcow2-linux-32e6b236d26946eb076d1450bfb8f9978f15d6b9.tar.xz kernel-qcow2-linux-32e6b236d26946eb076d1450bfb8f9978f15d6b9.zip | |
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>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 8aa5e55a8ecd..940e9ff231a3 100644 --- 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; |