diff mbox series

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

Message ID 20210902002801.32618-2-justin.he@arm.com (mailing list archive)
State New, archived
Headers show
Series [1/2] KVM: arm64: vgic: Add memcg accounting to vgic allocations | expand

Commit Message

Jia He Sept. 2, 2021, 12:28 a.m. UTC 
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 remained 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(-)

Comments

Marc Zyngier Sept. 2, 2021, 6:11 p.m. UTC | #1 
On Thu, 02 Sep 2021 01:28:01 +0100,
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 remained 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 e9a2b8f27792..9d6f5bcaddef 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -289,10 +289,12 @@ long kvm_arch_dev_ioctl(struct file *filp,
>  
>  struct kvm *kvm_arch_alloc_vm(void)
>  {
> +	unsigned long sz = sizeof(struct kvm);

If you are going to introduce an extra variable, please use the
correct type (size_t).

> +
>  	if (!has_vhe())
> -		return kzalloc(sizeof(struct kvm), GFP_KERNEL);
> +		return kzalloc(sz, GFP_KERNEL | GFP_KERNEL_ACCOUNT);

Why both GFP_KERNEL and GFP_KERNEL_ACCOUNT?

Thanks,

	M.
Jia He Sept. 3, 2021, 9:21 a.m. UTC | #2 
> -----Original Message-----
> From: Marc Zyngier <maz@kernel.org>
> Sent: Friday, September 3, 2021 2:12 AM
> To: Justin He <Justin.He@arm.com>
> Cc: James Morse <James.Morse@arm.com>; Alexandru Elisei
> <Alexandru.Elisei@arm.com>; Suzuki Poulose <Suzuki.Poulose@arm.com>;
> Catalin Marinas <Catalin.Marinas@arm.com>; Will Deacon <will@kernel.org>;
> Liu Shixin <liushixin2@huawei.com>; Eric Auger <eric.auger@redhat.com>;
> Kees Cook <keescook@chromium.org>; Nick Desaulniers
> <ndesaulniers@google.com>; Shenming Lu <lushenming@huawei.com>; Sami
> Tolvanen <samitolvanen@google.com>; Lorenzo Pieralisi
> <Lorenzo.Pieralisi@arm.com>; Xiaoming Ni <nixiaoming@huawei.com>; Zenghui
> Yu <yuzenghui@huawei.com>; linux-arm-kernel@lists.infradead.org;
> kvmarm@lists.cs.columbia.edu; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 2/2] KVM: arm64: Add memcg accounting to KVM
> allocations
> 
> On Thu, 02 Sep 2021 01:28:01 +0100,
> 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 remained 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 e9a2b8f27792..9d6f5bcaddef 100644
> > --- a/arch/arm64/kvm/arm.c
> > +++ b/arch/arm64/kvm/arm.c
> > @@ -289,10 +289,12 @@ long kvm_arch_dev_ioctl(struct file *filp,
> >
> >  struct kvm *kvm_arch_alloc_vm(void)
> >  {
> > +	unsigned long sz = sizeof(struct kvm);
> 
> If you are going to introduce an extra variable, please use the
> correct type (size_t).

Okay
> 
> > +
> >  	if (!has_vhe())
> > -		return kzalloc(sizeof(struct kvm), GFP_KERNEL);
> > +		return kzalloc(sz, GFP_KERNEL | GFP_KERNEL_ACCOUNT);
> 
> Why both GFP_KERNEL and GFP_KERNEL_ACCOUNT?
Urgh, sorry for the mistake.

--
Cheers,
Justin (Jia He)
diff mbox series

Patch

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index e9a2b8f27792..9d6f5bcaddef 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -289,10 +289,12 @@  long kvm_arch_dev_ioctl(struct file *filp,
 
 struct kvm *kvm_arch_alloc_vm(void)
 {
+	unsigned long sz = sizeof(struct kvm);
+
 	if (!has_vhe())
-		return kzalloc(sizeof(struct kvm), GFP_KERNEL);
+		return kzalloc(sz, GFP_KERNEL | 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 3155c9e778f0..b5cfd9ba650c 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;