Skip to content

Commit 185cca2

Browse files
Claudio Imbrendatorvalds
authored andcommitted
KVM: s390: prepare for hugepage vmalloc
The Create Secure Configuration Ultravisor Call does not support using large pages for the virtual memory area. This is a hardware limitation. This patch replaces the vzalloc call with an almost equivalent call to the newly introduced vmalloc_no_huge function, which guarantees that only small pages will be used for the backing. The new call will not clear the allocated memory, but that has never been an actual requirement. Link: https://lkml.kernel.org/r/20210614132357.10202-3-imbrenda@linux.ibm.com Fixes: 121e6f3 ("mm/vmalloc: hugepage vmalloc mappings") Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Reviewed-by: Janosch Frank <frankja@linux.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Nicholas Piggin <npiggin@gmail.com> Reviewed-by: David Hildenbrand <david@redhat.com> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Uladzislau Rezki (Sony) <urezki@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: David Rientjes <rientjes@google.com> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 15a64f5 commit 185cca2

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

arch/s390/kvm/pv.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,12 @@ static int kvm_s390_pv_alloc_vm(struct kvm *kvm)
140140
/* Allocate variable storage */
141141
vlen = ALIGN(virt * ((npages * PAGE_SIZE) / HPAGE_SIZE), PAGE_SIZE);
142142
vlen += uv_info.guest_virt_base_stor_len;
143-
kvm->arch.pv.stor_var = vzalloc(vlen);
143+
/*
144+
* The Create Secure Configuration Ultravisor Call does not support
145+
* using large pages for the virtual memory area.
146+
* This is a hardware limitation.
147+
*/
148+
kvm->arch.pv.stor_var = vmalloc_no_huge(vlen);
144149
if (!kvm->arch.pv.stor_var)
145150
goto out_err;
146151
return 0;

0 commit comments

Comments
 (0)