Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32e6b236 authored by Guenther Hutzl's avatar Guenther Hutzl Committed by Christian Borntraeger
Browse files

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: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarGuenther Hutzl <hutzl@linux.vnet.ibm.com>
Signed-off-by: default avatarDominik Dingel <dingel@linux.vnet.ibm.com>
[adopt to match recent limit,size changes]

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent a3a92c31

arch/s390/kvm/kvm-s390.c

+5 −1
Original line number Diff line number Diff line
@@ -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 {

		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;

drivers/s390/char/sclp_early.c

+7 −1
Original line number Diff line number Diff line
@@ -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;