From: Juergen Gross <jgross@suse.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
linux-kernel@vger.kernel.org, x86@kernel.org,
linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org
Cc: Marc Zyngier <maz@kernel.org>, 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>,
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 5/6] kvm: allocate vcpu pointer array separately
Date: Mon, 26 Jul 2021 15:46:50 +0200 [thread overview]
Message-ID: <2aed0475-3df0-5ac6-f393-042b5e798ebc@suse.com> (raw)
In-Reply-To: <001b7eab-ed7b-da27-a623-057781cf1211@redhat.com>
[-- Attachment #1.1.1: Type: text/plain, Size: 2252 bytes --]
On 26.07.21 15:40, Paolo Bonzini wrote:
> On 01/07/21 17:41, Juergen Gross wrote:
>> {
>> - if (!has_vhe())
>> + if (!has_vhe()) {
>> + kfree(kvm->vcpus);
>> kfree(kvm);
>> - else
>> + } else {
>> + vfree(kvm->vcpus);
>> vfree(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 79138c91f83d..39cbc4b6bffb 100644
>> --- a/arch/x86/include/asm/kvm_host.h
>> +++ b/arch/x86/include/asm/kvm_host.h
>> @@ -1440,10 +1440,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);
>> void kvm_arch_free_vm(struct kvm *kvm);
>> #define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB
>> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>> index 3af398ef1fc9..a9b0bb2221ea 100644
>> --- a/arch/x86/kvm/x86.c
>> +++ b/arch/x86/kvm/x86.c
>> @@ -10741,9 +10741,28 @@ 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;
>> + }
>> +
>
> Let's keep this cleaner:
>
> 1) use kvfree in the common version of kvm_arch_free_vm
>
> 2) split __KVM_HAVE_ARCH_VM_ALLOC and __KVM_HAVE_ARCH_VM_FREE (ARM does
> not need it once kvfree is used)
>
> 3) define a __kvm_arch_free_vm version that is defined even if
> !__KVM_HAVE_ARCH_VM_FREE, and which can be used on x86.
Okay, will do so.
Juergen
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3135 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
next prev parent reply other threads:[~2021-07-26 13:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 15:40 [PATCH 0/6] x86/kvm: add boot parameters for max vcpu configs Juergen Gross
2021-07-01 15:41 ` [PATCH 1/6] x86/kvm: fix vcpu-id indexed array sizes Juergen Gross
2021-09-03 15:28 ` Eduardo Habkost
2021-07-01 15:41 ` [PATCH 2/6] x86/kvm: remove non-x86 stuff from arch/x86/kvm/ioapic.h Juergen Gross
2021-07-01 15:41 ` [PATCH 3/6] x86/kvm: add boot parameter for maximum vcpu-id Juergen Gross
2021-07-01 15:41 ` [PATCH 4/6] x86/kvm: introduce per cpu vcpu masks Juergen Gross
2021-07-26 13:32 ` Paolo Bonzini
2021-07-26 13:38 ` Juergen Gross
2021-07-01 15:41 ` [PATCH 5/6] kvm: allocate vcpu pointer array separately Juergen Gross
2021-07-26 13:40 ` Paolo Bonzini
2021-07-26 13:46 ` Juergen Gross [this message]
2021-07-26 13:57 ` Marc Zyngier
2021-07-01 15:41 ` [PATCH 6/6] x86/kvm: add boot parameter for setting max number of vcpus per guest Juergen Gross
2021-07-14 11:15 ` Vitaly Kuznetsov
2021-07-14 11:24 ` Juergen Gross
2021-07-14 11:45 ` Vitaly Kuznetsov
2021-07-14 13:04 ` Juergen Gross
2021-07-14 13:21 ` Vitaly Kuznetsov
2021-09-03 7:01 ` Juergen Gross
2021-09-03 7:40 ` Vitaly Kuznetsov
2021-07-26 13:41 ` [PATCH 0/6] x86/kvm: add boot parameters for max vcpu configs Paolo Bonzini
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=2aed0475-3df0-5ac6-f393-042b5e798ebc@suse.com \
--to=jgross@suse.com \
--cc=alexandru.elisei@arm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.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=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).