KVM: arm64: Add memcg accounting to KVM allocations

Inspired by commit 254272ce6505 ("kvm: x86: Add memcg accounting to KVM
allocations"), it would be better to make arm64 KVM consistent with
common kvm codes.

The memory allocations of VM scope should be charged into VM process
cgroup, hence change GFP_KERNEL to GFP_KERNEL_ACCOUNT.

There remain a few cases since these allocations are global, not in VM
scope.

Signed-off-by: Jia He <justin.he@arm.com>
Reviewed-by: Oliver Upton <oupton@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210907123112.10232-3-justin.he@arm.com

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index fe102cd2e518354d8a84aebea8f6d372a839b0cf..e3d903e1b7da3cccd835ebab838da1a33148f882 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -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)

diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 1a94a7ca48f27da2d739ad7b2e76eb403cad451b..da10996dcdf1382538d805dbeeca83e744dbc34d 100644 (file)
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -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;
 

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 2af3c37445e00899217ac82a6c9e7ddc474b7093..a5e4bbf5e68f9afc5a5d415bdb4788329b96920e 100644 (file)
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -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;

diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 5ce36b0a3343963924e28317acf6b865801dfa9f..acad22ebac12a06d2051a15221f1dbc6d49060bc 100644 (file)
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -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;