Commit eba04b20 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Account a variety of miscellaneous allocations 



Switch to GFP_KERNEL_ACCOUNT for a handful of allocations that are
clearly associated with a single task/VM.

Note, there are a several SEV allocations that aren't accounted, but
those can (hopefully) be fixed by using the local stack for memory.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210331023025.2485960-3-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8727906f

arch/x86/kvm/svm/nested.c

+2 −2
Original line number Diff line number Diff line
@@ -1252,8 +1252,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, 
		return -EINVAL;



	ret  = -ENOMEM;

	ctl  = kzalloc(sizeof(*ctl),  GFP_KERNEL);

	save = kzalloc(sizeof(*save), GFP_KERNEL);

	ctl  = kzalloc(sizeof(*ctl),  GFP_KERNEL_ACCOUNT);

	save = kzalloc(sizeof(*save), GFP_KERNEL_ACCOUNT);

	if (!ctl || !save)

		goto out_free;

arch/x86/kvm/svm/sev.c

+3 −3
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static int sev_launch_measure(struct kvm *kvm, struct kvm_sev_cmd *argp) 
		}



		ret = -ENOMEM;

		blob = kmalloc(params.len, GFP_KERNEL);

		blob = kmalloc(params.len, GFP_KERNEL_ACCOUNT);

		if (!blob)

			goto e_free;
@@ -1070,7 +1070,7 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp) 
		}



		ret = -ENOMEM;

		blob = kmalloc(params.len, GFP_KERNEL);

		blob = kmalloc(params.len, GFP_KERNEL_ACCOUNT);

		if (!blob)

			goto e_free;
@@ -1774,7 +1774,7 @@ static bool setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len) 
			       len, GHCB_SCRATCH_AREA_LIMIT);

			return false;

		}

		scratch_va = kzalloc(len, GFP_KERNEL);

		scratch_va = kzalloc(len, GFP_KERNEL_ACCOUNT);

		if (!scratch_va)

			return false;

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static int hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu) 
	 * evmcs in singe VM shares same assist page.

	 */

	if (!*p_hv_pa_pg)

		*p_hv_pa_pg = kzalloc(PAGE_SIZE, GFP_KERNEL);

		*p_hv_pa_pg = kzalloc(PAGE_SIZE, GFP_KERNEL_ACCOUNT);



	if (!*p_hv_pa_pg)

		return -ENOMEM;