From: Marc Zyngier <maz@kernel.org>
To: Juergen Gross <jgross@suse.com>
Cc: kvm@vger.kernel.org, x86@kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, ehabkost@redhat.com,
James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH v2 5/6] kvm: allocate vcpu pointer array separately
Date: Fri, 03 Sep 2021 15:41:44 +0100 [thread overview]
Message-ID: <871r65wwk7.wl-maz@kernel.org> (raw)
In-Reply-To: <20210903130808.30142-6-jgross@suse.com>
On Fri, 03 Sep 2021 14:08:06 +0100,
Juergen Gross <jgross@suse.com> wrote:
>
> Prepare support of very large vcpu numbers per guest by moving the
> vcpu pointer array out of struct kvm.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> V2:
> - rebase to new kvm_arch_free_vm() implementation
> ---
> arch/arm64/kvm/arm.c | 21 +++++++++++++++++++--
> arch/x86/include/asm/kvm_host.h | 5 +----
> arch/x86/kvm/x86.c | 18 ++++++++++++++++++
> include/linux/kvm_host.h | 17 +++++++++++++++--
> 4 files changed, 53 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index 38fff5963d9f..8bb5caeba007 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -293,10 +293,27 @@ long kvm_arch_dev_ioctl(struct file *filp,
>
> struct kvm *kvm_arch_alloc_vm(void)
> {
> + struct kvm *kvm;
> +
> + if (!has_vhe())
> + kvm = kzalloc(sizeof(struct kvm), GFP_KERNEL);
> + else
> + kvm = vzalloc(sizeof(struct kvm));
> +
> + if (!kvm)
> + return NULL;
> +
> if (!has_vhe())
> - return kzalloc(sizeof(struct kvm), GFP_KERNEL);
> + kvm->vcpus = kcalloc(KVM_MAX_VCPUS, sizeof(void *), GFP_KERNEL);
> + else
> + kvm->vcpus = vzalloc(KVM_MAX_VCPUS * sizeof(void *));
> +
> + if (!kvm->vcpus) {
> + kvm_arch_free_vm(kvm);
> + kvm = NULL;
> + }
>
> - return vzalloc(sizeof(struct kvm));
> + return kvm;
> }
>
> int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index f16fadfc030a..6c28d0800208 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1517,10 +1517,7 @@ static inline void kvm_ops_static_call_update(void)
> }
>
> #define __KVM_HAVE_ARCH_VM_ALLOC
> -static inline struct kvm *kvm_arch_alloc_vm(void)
> -{
> - return __vmalloc(kvm_x86_ops.vm_size, GFP_KERNEL_ACCOUNT | __GFP_ZERO);
> -}
> +struct kvm *kvm_arch_alloc_vm(void);
>
> #define __KVM_HAVE_ARCH_VM_FREE
> void kvm_arch_free_vm(struct kvm *kvm);
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index cc552763f0e4..ff142b6dd00c 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -11126,6 +11126,24 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)
> static_call(kvm_x86_sched_in)(vcpu, cpu);
> }
>
> +struct kvm *kvm_arch_alloc_vm(void)
> +{
> + struct kvm *kvm;
> +
> + kvm = __vmalloc(kvm_x86_ops.vm_size, GFP_KERNEL_ACCOUNT | __GFP_ZERO);
> + if (!kvm)
> + return NULL;
> +
> + kvm->vcpus = __vmalloc(KVM_MAX_VCPUS * sizeof(void *),
> + GFP_KERNEL_ACCOUNT | __GFP_ZERO);
> + if (!kvm->vcpus) {
> + vfree(kvm);
> + kvm = NULL;
> + }
> +
> + return kvm;
> +}
> +
> void kvm_arch_free_vm(struct kvm *kvm)
> {
> kfree(to_kvm_hv(kvm)->hv_pa_pg);
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index d75e9c2a00b1..9e2a5f1c6f54 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -536,7 +536,7 @@ struct kvm {
> struct mutex slots_arch_lock;
> struct mm_struct *mm; /* userspace tied to this vm */
> struct kvm_memslots __rcu *memslots[KVM_ADDRESS_SPACE_NUM];
> - struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
> + struct kvm_vcpu **vcpus;
At this stage, I really wonder why we are not using an xarray instead.
I wrote this [1] a while ago, and nothing caught fire. It was also a
net deletion of code...
M.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/vcpu-xarray
--
Without deviation from the norm, progress is not possible.
next prev parent reply other threads:[~2021-09-03 14:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 13:08 [PATCH v2 0/6] x86/kvm: add boot parameters for max vcpu configs Juergen Gross
2021-09-03 13:08 ` [PATCH v2 1/6] x86/kvm: remove non-x86 stuff from arch/x86/kvm/ioapic.h Juergen Gross
2021-09-03 13:08 ` [PATCH v2 2/6] x86/kvm: add boot parameter for adding vcpu-id bits Juergen Gross
2021-09-03 13:43 ` Vitaly Kuznetsov
2021-09-03 13:53 ` Juergen Gross
2021-09-03 19:48 ` Eduardo Habkost
2021-09-06 4:46 ` Juergen Gross
2021-09-28 16:41 ` Paolo Bonzini
2021-09-03 13:08 ` [PATCH v2 3/6] x86/kvm: introduce per cpu vcpu masks Juergen Gross
2021-09-03 16:05 ` Eduardo Habkost
2021-09-06 4:34 ` Juergen Gross
2021-09-07 18:34 ` Eduardo Habkost
2021-09-08 8:41 ` Vitaly Kuznetsov
2021-09-03 13:08 ` [PATCH v2 4/6] kvm: use kvfree() in kvm_arch_free_vm() Juergen Gross
2021-09-28 16:48 ` Paolo Bonzini
2021-09-03 13:08 ` [PATCH v2 5/6] kvm: allocate vcpu pointer array separately Juergen Gross
2021-09-03 14:41 ` Marc Zyngier [this message]
2021-09-06 4:33 ` Juergen Gross
2021-09-06 9:46 ` Marc Zyngier
2021-09-09 20:28 ` Sean Christopherson
2021-09-03 13:08 ` [PATCH v2 6/6] x86/kvm: add boot parameter for setting max number of vcpus per guest Juergen Gross
2021-09-06 0:45 ` Yao Yuan
2021-09-06 4:47 ` Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871r65wwk7.wl-maz@kernel.org \
--to=maz@kernel.org \
--cc=alexandru.elisei@arm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=ehabkost@redhat.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=jgross@suse.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).