[PATCH v2 0/2] Add memcg accounting to Arm KVM

[PATCH v2 0/2] Add memcg accounting to Arm KVM

[Jia He]

Inspired by what had been done by X86 kvm and kvm common codes, it would
be better to make arm64 kvm consistent with them.

The memory allocations of VM scope should be charged into VM process.
Hence change the allocation flag from GFP_KERNEL to GFP_KERNEL_ACCOUNT.

There remain some GFP_KERNEL unchanged since they are global allocations,
instead of VM scope.

Changes:
v2: address a few comments from Marc Zyngier, including redundant
    GFP_KERNEL, incorrect memcg accounting and variable type   
v1: https://lkml.org/lkml/2021/9/2/649

Jia He (2):
  KVM: arm64: vgic: Add memcg accounting to vgic allocations
  KVM: arm64: Add memcg accounting to KVM allocations

 arch/arm64/kvm/arm.c               |  6 ++++--
 arch/arm64/kvm/mmu.c               |  2 +-
 arch/arm64/kvm/pmu-emul.c          |  2 +-
 arch/arm64/kvm/reset.c             |  2 +-
 arch/arm64/kvm/vgic/vgic-init.c    |  2 +-
 arch/arm64/kvm/vgic/vgic-irqfd.c   |  2 +-
 arch/arm64/kvm/vgic/vgic-its.c     | 14 +++++++-------
 arch/arm64/kvm/vgic/vgic-mmio-v3.c |  2 +-
 arch/arm64/kvm/vgic/vgic-v4.c      |  2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)

-- 
2.17.1

[PATCH v2 1/2] KVM: arm64: vgic: Add memcg accounting to vgic allocations

[Jia He]

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>
---
 arch/arm64/kvm/vgic/vgic-init.c    |  2 +-
 arch/arm64/kvm/vgic/vgic-irqfd.c   |  2 +-
 arch/arm64/kvm/vgic/vgic-its.c     | 14 +++++++-------
 arch/arm64/kvm/vgic/vgic-mmio-v3.c |  2 +-
 arch/arm64/kvm/vgic/vgic-v4.c      |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index 340c51d87677..0a06d0648970 100644
--- 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 79f8899b234c..475059bacedf 100644
--- 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 61728c543eb9..b99f47103056 100644
--- 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 a09cdc0b953c..d3fd8a6c0c9a 100644
--- 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 c1845d8f5f7e..772dd15a22c7 100644
--- 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;
 
-- 
2.17.1

[PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM allocations

[Jia He]

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>
---
 arch/arm64/kvm/arm.c      | 6 ++++--
 arch/arm64/kvm/mmu.c      | 2 +-
 arch/arm64/kvm/pmu-emul.c | 2 +-
 arch/arm64/kvm/reset.c    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 0ca72f5cda41..7a7c478b8e6b 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -293,10 +293,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 0625bf2353c2..801845ebd9d5 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -465,7 +465,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 f33825c995cb..05d42f6b89e4 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -971,7 +971,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 cba7872d69a8..608c1baaaa63 100644
--- 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;
 
-- 
2.17.1

Re: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM allocations

[Oliver Upton]

Hi Jia,

On Tue, Sep 7, 2021 at 7:33 AM Jia He <justin.he@arm.com> wrote:
>
> 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.

I believe there are more memory allocations that could be switched to
GFP_KERNEL_ACCOUNT. For non-pKVM kernels, we probably should charge
all stage-2 paging structure allocations to the VM process. Your patch
appears to only change the allocation of the kvm_pgtable structure,
but not descendent paging structures.

--
Thanks,
Oliver

Re: [PATCH v2 1/2] KVM: arm64: vgic: Add memcg accounting to vgic allocations

[Oliver Upton]

On Tue, Sep 7, 2021 at 7:33 AM Jia He <justin.he@arm.com> wrote:
>
> 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>
> ---
>  arch/arm64/kvm/vgic/vgic-init.c    |  2 +-
>  arch/arm64/kvm/vgic/vgic-irqfd.c   |  2 +-
>  arch/arm64/kvm/vgic/vgic-its.c     | 14 +++++++-------
>  arch/arm64/kvm/vgic/vgic-mmio-v3.c |  2 +-
>  arch/arm64/kvm/vgic/vgic-v4.c      |  2 +-
>  5 files changed, 11 insertions(+), 11 deletions(-)
>

Reviewed-by: Oliver Upton <oupton@google.com>

RE: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM allocations

[Justin He]

Hi Oliver, thanks for the review, please my comments below:

> -----Original Message-----
> From: Oliver Upton <oupton@google.com>
> Sent: Wednesday, September 8, 2021 6:29 AM
> To: Justin He <Justin.He@arm.com>
> Cc: Marc Zyngier <maz@kernel.org>; James Morse <James.Morse@arm.com>;
> Alexandru Elisei <Alexandru.Elisei@arm.com>; Suzuki Poulose
> <Suzuki.Poulose@arm.com>; Xiaoming Ni <nixiaoming@huawei.com>; Lorenzo
> Pieralisi <Lorenzo.Pieralisi@arm.com>; Kees Cook <keescook@chromium.org>;
> Catalin Marinas <Catalin.Marinas@arm.com>; Nick Desaulniers
> <ndesaulniers@google.com>; linux-kernel@vger.kernel.org; Liu Shixin
> <liushixin2@huawei.com>; Sami Tolvanen <samitolvanen@google.com>; Will
> Deacon <will@kernel.org>; kvmarm@lists.cs.columbia.edu; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM
> allocations
> 
> Hi Jia,
> 
> On Tue, Sep 7, 2021 at 7:33 AM Jia He <justin.he@arm.com> wrote:
> >
> > 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.
> 
> I believe there are more memory allocations that could be switched to
> GFP_KERNEL_ACCOUNT. For non-pKVM kernels, we probably should charge
> all stage-2 paging structure allocations to the VM process. Your patch
> appears to only change the allocation of the kvm_pgtable structure,
> but not descendent paging structures.
> 
Do you mean kvm_hyp_zalloc_page() here?
Seems kvm_hyp_zalloc_page() is in both global and VM scopes.

I will replace GFP_KERNEL with XXX_ACCOUNT in next version if no one 
objects that.

--
Cheers,
Justin (Jia He)

Re: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM allocations

[Oliver Upton]

Justin,

On Thu, Sep 9, 2021 at 8:57 AM Justin He <Justin.He@arm.com> wrote:
>
> Hi Oliver, thanks for the review, please my comments below:
>
> > -----Original Message-----
> > From: Oliver Upton <oupton@google.com>
> > Sent: Wednesday, September 8, 2021 6:29 AM
> > To: Justin He <Justin.He@arm.com>
> > Cc: Marc Zyngier <maz@kernel.org>; James Morse <James.Morse@arm.com>;
> > Alexandru Elisei <Alexandru.Elisei@arm.com>; Suzuki Poulose
> > <Suzuki.Poulose@arm.com>; Xiaoming Ni <nixiaoming@huawei.com>; Lorenzo
> > Pieralisi <Lorenzo.Pieralisi@arm.com>; Kees Cook <keescook@chromium.org>;
> > Catalin Marinas <Catalin.Marinas@arm.com>; Nick Desaulniers
> > <ndesaulniers@google.com>; linux-kernel@vger.kernel.org; Liu Shixin
> > <liushixin2@huawei.com>; Sami Tolvanen <samitolvanen@google.com>; Will
> > Deacon <will@kernel.org>; kvmarm@lists.cs.columbia.edu; linux-arm-
> > kernel@lists.infradead.org
> > Subject: Re: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM
> > allocations
> >
> > Hi Jia,
> >
> > On Tue, Sep 7, 2021 at 7:33 AM Jia He <justin.he@arm.com> wrote:
> > >
> > > 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.
> >
> > I believe there are more memory allocations that could be switched to
> > GFP_KERNEL_ACCOUNT. For non-pKVM kernels, we probably should charge
> > all stage-2 paging structure allocations to the VM process. Your patch
> > appears to only change the allocation of the kvm_pgtable structure,
> > but not descendent paging structures.
> >
> Do you mean kvm_hyp_zalloc_page() here?
> Seems kvm_hyp_zalloc_page() is in both global and VM scopes.

Doh! kvm_hyp_zalloc_page() is only for the hyp's page tables, hence I
believe your patch is correct as it stands. As such:

Reviewed-by: Oliver Upton <oupton@google.com>

RE: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM allocations

[Justin He]

Hi Marc

> -----Original Message-----
> From: Oliver Upton <oupton@google.com>
> Sent: Monday, September 13, 2021 8:21 PM
> To: Justin He <Justin.He@arm.com>
> Cc: Marc Zyngier <maz@kernel.org>; James Morse <James.Morse@arm.com>;
> Alexandru Elisei <Alexandru.Elisei@arm.com>; Suzuki Poulose
> <Suzuki.Poulose@arm.com>; Xiaoming Ni <nixiaoming@huawei.com>; Lorenzo
> Pieralisi <Lorenzo.Pieralisi@arm.com>; Kees Cook <keescook@chromium.org>;
> Catalin Marinas <Catalin.Marinas@arm.com>; Nick Desaulniers
> <ndesaulniers@google.com>; linux-kernel@vger.kernel.org; Liu Shixin
> <liushixin2@huawei.com>; Sami Tolvanen <samitolvanen@google.com>; Will
> Deacon <will@kernel.org>; kvmarm@lists.cs.columbia.edu; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH v2 2/2] KVM: arm64: Add memcg accounting to KVM
> allocations
> 
[...]
> > Do you mean kvm_hyp_zalloc_page() here?
> > Seems kvm_hyp_zalloc_page() is in both global and VM scopes.
> 
> Doh! kvm_hyp_zalloc_page() is only for the hyp's page tables, hence I
> believe your patch is correct as it stands. As such:
> 
> Reviewed-by: Oliver Upton <oupton@google.com>
Kindly ping for the whole series. 😉

--
Cheers,
Justin (Jia He)

 

Re: [PATCH v2 0/2] Add memcg accounting to Arm KVM

[Marc Zyngier]

On Tue, 7 Sep 2021 20:31:10 +0800, Jia He wrote:
> Inspired by what had been done by X86 kvm and kvm common codes, it would
> be better to make arm64 kvm consistent with them.
> 
> The memory allocations of VM scope should be charged into VM process.
> Hence change the allocation flag from GFP_KERNEL to GFP_KERNEL_ACCOUNT.
> 
> There remain some GFP_KERNEL unchanged since they are global allocations,
> instead of VM scope.
> 
> [...]

Applied to next, thanks!

[1/2] KVM: arm64: vgic: Add memcg accounting to vgic allocations
      commit: 3ef231670b9e9001316a426e794b2c74b8f6b4f6
[2/2] KVM: arm64: Add memcg accounting to KVM allocations
      commit: 115bae923ac8bb29ee635e0ed6b4d5a3eec9371e

Cheers,

	M.
-- 
Without deviation from the norm, progress is not possible.