From: Juergen Gross <jgross@suse.com>
To: Marc Zyngier <maz@kernel.org>
Cc: Wanpeng Li <wanpengli@tencent.com>,
ehabkost@redhat.com, kvm@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Joerg Roedel <joro@8bytes.org>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
Will Deacon <will@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Borislav Petkov <bp@alien8.de>,
Paolo Bonzini <pbonzini@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Jim Mattson <jmattson@google.com>
Subject: Re: [PATCH v2 5/6] kvm: allocate vcpu pointer array separately
Date: Mon, 6 Sep 2021 06:33:35 +0200 [thread overview]
Message-ID: <37699e98-9a47-732d-8522-daa90f35c52f@suse.com> (raw)
In-Reply-To: <871r65wwk7.wl-maz@kernel.org>
[-- Attachment #1.1.1.1: Type: text/plain, Size: 3827 bytes --]
On 03.09.21 16:41, Marc Zyngier wrote:
> 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...
Indeed, I'd prefer that solution!
Are you fine with me swapping my patch with yours in the series?
Juergen
[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3135 bytes --]
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
[-- Attachment #2: Type: text/plain, Size: 151 bytes --]
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-09-06 4:33 UTC|newest]
Thread overview: 8+ 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 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
2021-09-06 4:33 ` Juergen Gross [this message]
2021-09-06 9:46 ` Marc Zyngier
2021-09-09 20:28 ` Sean Christopherson
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=37699e98-9a47-732d-8522-daa90f35c52f@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=ehabkost@redhat.com \
--cc=hpa@zytor.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=maz@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.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).