KVM: arm64: vgic: Add memcg accounting to vgic allocations

Inspired by commit 254272ce6505 ("kvm: x86: Add memcg accounting to KVM
allocations"), it would be better to make arm64 vgic 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-2-justin.he@arm.com

diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index 340c51d87677caf9165773a7e59869aa5da002c7..0a06d0648970909f9e46245a4d13657ce9aa2bfa 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-init.c
+++ b/arch/arm64/kvm/vgic/vgic-init.c
@@ -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;
 

diff --git a/arch/arm64/kvm/vgic/vgic-irqfd.c b/arch/arm64/kvm/vgic/vgic-irqfd.c
index 79f8899b234cf769afd5d47b08a5c0ac1a532efe..475059bacedf892f33c1ce8287c0a1f9dcd91a1a 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-irqfd.c
+++ b/arch/arm64/kvm/vgic/vgic-irqfd.c
@@ -139,7 +139,7 @@ int kvm_vgic_setup_default_irq_routing(struct kvm *kvm)
        u32 nr = dist->nr_spis;
        int i, ret;
 
-       entries = kcalloc(nr, sizeof(*entries), GFP_KERNEL);
+       entries = kcalloc(nr, sizeof(*entries), GFP_KERNEL_ACCOUNT);
        if (!entries)
                return -ENOMEM;
 

diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c
index 61728c543eb9c1165588b975033ec0f7b91048fd..b99f47103056557e5427aa1b52bae41e0d5b6285 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-its.c
+++ b/arch/arm64/kvm/vgic/vgic-its.c
@@ -48,7 +48,7 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid,
        if (irq)
                return irq;
 
-       irq = kzalloc(sizeof(struct vgic_irq), GFP_KERNEL);
+       irq = kzalloc(sizeof(struct vgic_irq), GFP_KERNEL_ACCOUNT);
        if (!irq)
                return ERR_PTR(-ENOMEM);
 
@@ -332,7 +332,7 @@ int vgic_copy_lpi_list(struct kvm *kvm, struct kvm_vcpu *vcpu, u32 **intid_ptr)
         * we must be careful not to overrun the array.
         */
        irq_count = READ_ONCE(dist->lpi_list_count);
-       intids = kmalloc_array(irq_count, sizeof(intids[0]), GFP_KERNEL);
+       intids = kmalloc_array(irq_count, sizeof(intids[0]), GFP_KERNEL_ACCOUNT);
        if (!intids)
                return -ENOMEM;
 
@@ -985,7 +985,7 @@ static int vgic_its_alloc_collection(struct vgic_its *its,
        if (!vgic_its_check_id(its, its->baser_coll_table, coll_id, NULL))
                return E_ITS_MAPC_COLLECTION_OOR;
 
-       collection = kzalloc(sizeof(*collection), GFP_KERNEL);
+       collection = kzalloc(sizeof(*collection), GFP_KERNEL_ACCOUNT);
        if (!collection)
                return -ENOMEM;
 
@@ -1029,7 +1029,7 @@ static struct its_ite *vgic_its_alloc_ite(struct its_device *device,
 {
        struct its_ite *ite;
 
-       ite = kzalloc(sizeof(*ite), GFP_KERNEL);
+       ite = kzalloc(sizeof(*ite), GFP_KERNEL_ACCOUNT);
        if (!ite)
                return ERR_PTR(-ENOMEM);
 
@@ -1150,7 +1150,7 @@ static struct its_device *vgic_its_alloc_device(struct vgic_its *its,
 {
        struct its_device *device;
 
-       device = kzalloc(sizeof(*device), GFP_KERNEL);
+       device = kzalloc(sizeof(*device), GFP_KERNEL_ACCOUNT);
        if (!device)
                return ERR_PTR(-ENOMEM);
 
@@ -1847,7 +1847,7 @@ void vgic_lpi_translation_cache_init(struct kvm *kvm)
                struct vgic_translation_cache_entry *cte;
 
                /* An allocation failure is not fatal */
-               cte = kzalloc(sizeof(*cte), GFP_KERNEL);
+               cte = kzalloc(sizeof(*cte), GFP_KERNEL_ACCOUNT);
                if (WARN_ON(!cte))
                        break;
 
@@ -1888,7 +1888,7 @@ static int vgic_its_create(struct kvm_device *dev, u32 type)
        if (type != KVM_DEV_TYPE_ARM_VGIC_ITS)
                return -ENODEV;
 
-       its = kzalloc(sizeof(struct vgic_its), GFP_KERNEL);
+       its = kzalloc(sizeof(struct vgic_its), GFP_KERNEL_ACCOUNT);
        if (!its)
                return -ENOMEM;
 

diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index a09cdc0b953c538d73cdb1f2d41106b4986d66d9..d3fd8a6c0c9a08dde491e741fa64ffe986ac2155 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -834,7 +834,7 @@ static int vgic_v3_alloc_redist_region(struct kvm *kvm, uint32_t index,
        if (vgic_v3_rdist_overlap(kvm, base, size))
                return -EINVAL;
 
-       rdreg = kzalloc(sizeof(*rdreg), GFP_KERNEL);
+       rdreg = kzalloc(sizeof(*rdreg), GFP_KERNEL_ACCOUNT);
        if (!rdreg)
                return -ENOMEM;
 

diff --git a/arch/arm64/kvm/vgic/vgic-v4.c b/arch/arm64/kvm/vgic/vgic-v4.c
index c1845d8f5f7e712d4ea7c29f67741855a0a4d70e..772dd15a22c7ccd32f9faf1f621f7d0616dbb5d9 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-v4.c
+++ b/arch/arm64/kvm/vgic/vgic-v4.c
@@ -246,7 +246,7 @@ int vgic_v4_init(struct kvm *kvm)
        nr_vcpus = atomic_read(&kvm->online_vcpus);
 
        dist->its_vm.vpes = kcalloc(nr_vcpus, sizeof(*dist->its_vm.vpes),
-                                   GFP_KERNEL);
+                                   GFP_KERNEL_ACCOUNT);
        if (!dist->its_vm.vpes)
                return -ENOMEM;