| Message ID | 20210907123112.10232-3-justin.he@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add memcg accounting to Arm KVM | expand |
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
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)
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>
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.
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;
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(-)