Commit 5f8b2591 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/memory-accounting into kvmarm-master/next 



* kvm-arm64/memory-accounting:
  : .
  : Sprinkle a bunch of GFP_KERNEL_ACCOUNT all over the code base
  : to better track memory allocation made on behalf of a VM.
  : .
  KVM: arm64: Add memcg accounting to KVM allocations
  KVM: arm64: vgic: Add memcg accounting to vgic allocations

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 551a1334 115bae92

arch/arm64/kvm/arm.c

+4 −2
Original line number Diff line number Diff line
@@ -291,10 +291,12 @@ long kvm_arch_dev_ioctl(struct file *filp, 


struct kvm *kvm_arch_alloc_vm(void)

{

	size_t sz = sizeof(struct kvm);



	if (!has_vhe())

		return kzalloc(sizeof(struct kvm), GFP_KERNEL);

		return kzalloc(sz, GFP_KERNEL_ACCOUNT);



	return vzalloc(sizeof(struct kvm));

	return __vmalloc(sz, GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM | __GFP_ZERO);

}



void kvm_arch_free_vm(struct kvm *kvm)

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu) 
		return -EINVAL;

	}



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

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

	if (!pgt)

		return -ENOMEM;

arch/arm64/kvm/pmu-emul.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) 
		mutex_lock(&vcpu->kvm->lock);



		if (!vcpu->kvm->arch.pmu_filter) {

			vcpu->kvm->arch.pmu_filter = bitmap_alloc(nr_events, GFP_KERNEL);

			vcpu->kvm->arch.pmu_filter = bitmap_alloc(nr_events, GFP_KERNEL_ACCOUNT);

			if (!vcpu->kvm->arch.pmu_filter) {

				mutex_unlock(&vcpu->kvm->lock);

				return -ENOMEM;

arch/arm64/kvm/reset.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu) 
		    vl > SVE_VL_ARCH_MAX))

		return -EIO;



	buf = kzalloc(SVE_SIG_REGS_SIZE(sve_vq_from_vl(vl)), GFP_KERNEL);

	buf = kzalloc(SVE_SIG_REGS_SIZE(sve_vq_from_vl(vl)), GFP_KERNEL_ACCOUNT);

	if (!buf)

		return -ENOMEM;

arch/arm64/kvm/vgic/vgic-init.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis) 
	struct kvm_vcpu *vcpu0 = kvm_get_vcpu(kvm, 0);

	int i;



	dist->spis = kcalloc(nr_spis, sizeof(struct vgic_irq), GFP_KERNEL);

	dist->spis = kcalloc(nr_spis, sizeof(struct vgic_irq), GFP_KERNEL_ACCOUNT);

	if (!dist->spis)

		return  -ENOMEM;