Commit 4ab0e470 authored by Anup Patel's avatar Anup Patel Committed by Anup Patel
Browse files

KVM: Add gfp_custom flag in struct kvm_mmu_memory_cache 



The kvm_mmu_topup_memory_cache() always uses GFP_KERNEL_ACCOUNT for
memory allocation which prevents it's use in atomic context. To address
this limitation of kvm_mmu_topup_memory_cache(), we add gfp_custom flag
in struct kvm_mmu_memory_cache. When the gfp_custom flag is set to some
GFP_xyz flags, the kvm_mmu_topup_memory_cache() will use that instead of
GFP_KERNEL_ACCOUNT.

Signed-off-by: default avatarAnup Patel <apatel@ventanamicro.com>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 8a061562

include/linux/kvm_types.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct gfn_to_pfn_cache { 
struct kvm_mmu_memory_cache {

	int nobjs;

	gfp_t gfp_zero;

	gfp_t gfp_custom;

	struct kmem_cache *kmem_cache;

	void *objects[KVM_ARCH_NR_OBJS_PER_MEMORY_CACHE];

};

virt/kvm/kvm_main.c

+3 −1
Original line number Diff line number Diff line
@@ -386,7 +386,9 @@ int kvm_mmu_topup_memory_cache(struct kvm_mmu_memory_cache *mc, int min) 
	if (mc->nobjs >= min)

		return 0;

	while (mc->nobjs < ARRAY_SIZE(mc->objects)) {

		obj = mmu_memory_cache_alloc_obj(mc, GFP_KERNEL_ACCOUNT);

		obj = mmu_memory_cache_alloc_obj(mc, (mc->gfp_custom) ?

						 mc->gfp_custom :

						 GFP_KERNEL_ACCOUNT);

		if (!obj)

			return mc->nobjs >= min ? 0 : -ENOMEM;

		mc->objects[mc->nobjs++] = obj;