KVM: Refactor vCPU creation
Subsystems (12)
v2 cover KVM: Refactor vCPU creation
The end goal of this series is to strip down the interface between common KVM code and arch specific code so that there is precisely one arch hook for creating a vCPU and one hook for destroying a vCPU. In addition to cleaning up the code base, simplifying the interface gives architectures more freedom to organize their vCPU creation code. Details below.
v2:
- Rebase to commit e41a90be9659 ("KVM: x86/mmu: WARN if root_hpa is invalid when handling a page fault"). A few minor x86 (VMX) conflicts, and one straightforward arm conflict with commit 8564d6372a7d ("KVM:
arm64: Support stolen time reporting via shared structure") in patch "KVM: ARM: Move all vcpu init code into kvm_arch_vcpu_create()".
- Collect Reviews and Acks [Christoffer, Greg].
- Fix a warning in "KVM: arm64: Free sve_state via arm specific hook" by using a "void" return type [Christoffer].
- Fix a bug in "KVM: PPC: Move kvm_vcpu_init() invocation to common code" where the call in kvmppc_core_vcpu_create_e500mc() was inadvertantly left behind.
KVM's vCPU creation code is comically messy. kvm_vm_ioctl_create_vcpu() calls three separate arch hooks: init(), create() and setup(). The init() call is especially nasty as it's hidden away in a common KVM function, kvm_init_vcpu(), that for all intents and purposes must be immediately invoked after the vcpu object is allocated.
Not to be outdone, vCPU destruction also has three arch hooks: uninit(), destroy() and free(), the latter of which isn't actually invoked by common KVM code, but the hook declaration still exists because architectures are relying on its forward declaration.
Eliminating the extra arch hooks is relatively straightforward, just tedious. For the most part, there is no fundamental constraint that necessitated the proliferation of arch hooks, rather they crept in over time, usually when x86-centric code was moved out of generic KVM and into x86 code.
E.g. kvm_arch_vcpu_setup() was added to allow x86 to do vcpu_load(), which can only be done after preempt_notifier initialization, but adding setup() overlooked the fact that the preempt_notifier was only initialized after kvm_arch_vcpu_create() because preemption support was added when x86's MMU setup (the vcpu_load() user) was called from common KVM code.
For all intents and purposes, there is no true functional change in this series. The order of some allocations will change, and a few memory leaks are fixed, but the actual functionality of a guest should be unaffected.
Patches 01-03 are bug fixes in error handling paths that were found by inspection when refactoring the associated code.
Patches 04-43 refactor each arch implementation so that the unwanted arch hooks can be dropped without a functional change, e.g. move code out of kvm_arch_vcpu_setup() so that all implementations are empty, then drop the functions and caller.
Patches 44-45 are minor clean up to eliminate kvm_vcpu_uninit().
The net result is to go from this:
vcpu = kvm_arch_vcpu_create(kvm, id);
|
|-> kvm_vcpu_init()
|
|-> kvm_arch_vcpu_init()
if (IS_ERR(vcpu)) {
r = PTR_ERR(vcpu);
goto vcpu_decrement;
}
preempt_notifier_init(&vcpu->preempt_notifier, &kvm_preempt_ops);
r = kvm_arch_vcpu_setup(vcpu);
if (r)
goto vcpu_destroy;Sean Christopherson (45):
KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails
KVM: PPC: Book3S PR: Free shared page if mmu initialization fails
KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails
KVM: VMX: Allocate VPID after initializing VCPU
KVM: VMX: Use direct vcpu pointer during vCPU create/free
KVM: SVM: Use direct vcpu pointer during vCPU create/free
KVM: x86: Allocate vcpu struct in common x86 code
KVM: x86: Move FPU allocation to common x86 code
KVM: x86: Move allocation of pio_data page down a few lines
KVM: x86: Move kvm_vcpu_init() invocation to common code
KVM: PPC: e500mc: Add build-time assert that vcpu is at offset 0
KVM: PPC: Allocate vcpu struct in common PPC code
KVM: PPC: Book3S PR: Allocate book3s and shadow vcpu after common init
KVM: PPC: e500mc: Move reset of oldpir below call to kvm_vcpu_init()
KVM: PPC: Move kvm_vcpu_init() invocation to common code
KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs
KVM: MIPS: Drop kvm_arch_vcpu_free()
KVM: PPC: Drop kvm_arch_vcpu_free()
KVM: arm: Drop kvm_arch_vcpu_free()
KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path
KVM: x86: Remove spurious clearing of async #PF MSR
KVM: x86: Drop kvm_arch_vcpu_free()
KVM: Remove kvm_arch_vcpu_free() declaration
KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues
KVM: s390: Move guts of kvm_arch_vcpu_init() into
kvm_arch_vcpu_create()
KVM: s390: Invoke kvm_vcpu_init() before allocating sie_page
KVM: MIPS: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu
KVM: x86: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu
KVM: Introduce kvm_vcpu_destroy()
KVM: Move vcpu alloc and init invocation to common code
KVM: Unexport kvm_vcpu_cache and kvm_vcpu_{un}init()
KVM: Move initialization of preempt notifier to kvm_vcpu_init()
KVM: x86: Move guts of kvm_arch_vcpu_setup() into
kvm_arch_vcpu_create()
KVM: MIPS: Move .vcpu_setup() call to kvm_arch_vcpu_create()
KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()
KVM: PPC: BookE: Setup vcpu during kvmppc_core_vcpu_create()
KVM: Drop kvm_arch_vcpu_setup()
KVM: x86: Move all vcpu init code into kvm_arch_vcpu_create()
KVM: MIPS: Move all vcpu init code into kvm_arch_vcpu_create()
KVM: ARM: Move all vcpu init code into kvm_arch_vcpu_create()
KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create()
KVM: arm64: Free sve_state via arm specific hook
KVM: Drop kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit()
KVM: Move putting of vcpu->pid to kvm_vcpu_destroy()
KVM: Move vcpu->run page allocation out of kvm_vcpu_init()
arch/arm/include/asm/kvm_host.h | 2 +- arch/arm/kvm/guest.c | 5 - arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/kvm/guest.c | 5 - arch/arm64/kvm/reset.c | 2 +- arch/mips/kvm/mips.c | 84 ++++------- arch/powerpc/include/asm/kvm_ppc.h | 6 +- arch/powerpc/kvm/book3s.c | 9 +- arch/powerpc/kvm/book3s_hv.c | 27 +--- arch/powerpc/kvm/book3s_pr.c | 33 ++--- arch/powerpc/kvm/booke.c | 65 ++++---- arch/powerpc/kvm/e500.c | 34 +---- arch/powerpc/kvm/e500mc.c | 28 +--- arch/powerpc/kvm/powerpc.c | 70 ++++----- arch/s390/include/asm/kvm_host.h | 1 - arch/s390/kvm/kvm-s390.c | 110 +++++++------- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 52 +------ arch/x86/kvm/vmx/vmx.c | 72 +++------ arch/x86/kvm/x86.c | 230 ++++++++++++++--------------- include/linux/kvm_host.h | 13 +- virt/kvm/arm/arm.c | 80 ++++------ virt/kvm/kvm_main.c | 71 +++++---- 23 files changed, 385 insertions(+), 618 deletions(-)
Signature · 1 line
2.24.1
PATCH v2 1/45 KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails
Call kvm_vcpu_uninit() if vcore creation fails to avoid leaking any resources allocated by kvm_vcpu_init(), i.e. the vcpu->run page.
--- arch/powerpc/kvm/book3s_hv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv.c +3 -1
@@ -2368,7 +2368,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,mutex_unlock (&kvm->lock);if (!vcore) - goto free_vcpu; + goto uninit_vcpu;spin_lock (&vcore->lock); ++vcore->num_threads;
@@ -2385,6 +2385,8 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,return vcpu; +uninit_vcpu: +kvm_vcpu_uninit (vcpu); free_vcpu:kmem_cache_free (kvm_vcpu_cache, vcpu); out:
Signature · 1 line
2.24.1
Re: [PATCH v2 01/45] KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails
Quoted 35 lines · Sean Christopherson
Call
kvm_vcpu_uninit()if vcore creation fails to avoid leaking any resources allocated bykvm_vcpu_init(), i.e. thevcpu->runpage.Fixes 371fefd6f2dc4 ("KVM: PPC: Allow book3s_hv guests to use SMT processor modes")Reviewed-by Greg Kurz <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/powerpc/kvm/book3s_hv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/powerpc/kvm/book3s_hv.c +3
-1@@ -2368,7 +2368,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,mutex_unlock (&kvm->lock);if (!vcore) - goto free_vcpu; + goto uninit_vcpu;spin_lock (&vcore->lock); ++vcore->num_threads;@@ -2385,6 +2385,8 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,return vcpu; +uninit_vcpu: +kvm_vcpu_uninit (vcpu); free_vcpu:kmem_cache_free (kvm_vcpu_cache, vcpu); out:Signature · 1 line
2.24.1
Looks correct.
PATCH v2 2/45 KVM: PPC: Book3S PR: Free shared page if mmu initialization fails
In reply to Sean ChristophersonExplicitly free the shared page if kvmppc_mmu_init() fails during kvmppc_core_vcpu_create(), as the page is freed only in kvmppc_core_vcpu_free(), which is not reached via kvm_vcpu_uninit().
--- arch/powerpc/kvm/book3s_pr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/kvm/book3s_pr.c +3 -1
@@ -1806,10 +1806,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, err =kvmppc_mmu_init (vcpu);if (err <0 ) - goto uninit_vcpu; + goto free_shared_page;return vcpu; +free_shared_page: +free_page ((unsigned long )vcpu->arch.shared); uninit_vcpu:kvm_vcpu_uninit (vcpu); free_shadow_vcpu:
Signature · 1 line
2.24.1
Re: [PATCH v2 02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails
Quoted 32 lines · Sean Christopherson
Explicitly free the shared page if
kvmppc_mmu_init()fails duringkvmppc_core_vcpu_create(), as the page is freed only inkvmppc_core_vcpu_free(), which is not reached viakvm_vcpu_uninit().Fixes 96bc451a15329 ("KVM: PPC: Introduce shared page")Reviewed-by Greg Kurz <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/powerpc/kvm/book3s_pr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/powerpc/kvm/book3s_pr.c +3
-1@@ -1806,10 +1806,12 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, err =kvmppc_mmu_init (vcpu);if (err <0 ) - goto uninit_vcpu; + goto free_shared_page;return vcpu; +free_shared_page: +free_page ((unsigned long )vcpu->arch.shared); uninit_vcpu:kvm_vcpu_uninit (vcpu); free_shadow_vcpu:Signature · 1 line
2.24.1
Looks correct.
PATCH v2 3/45 KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails
In reply to Sean ChristophersonFree the vCPU's wbinvd_dirty_mask if vCPU creation fails after kvm_arch_vcpu_init(), e.g. when installing the vCPU's file descriptor. Do the freeing by calling kvm_arch_vcpu_free() instead of open coding the freeing. This adds a likely superfluous, but ultimately harmless, call to kvmclock_reset(), which only clears vcpu->arch.pv_time_enabled. Using kvm_arch_vcpu_free() allows for additional cleanup in the future.
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -9162,7 +9162,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)kvm_mmu_unload (vcpu);vcpu_put (vcpu); - kvm_x86_ops->vcpu_free (vcpu); +kvm_arch_vcpu_free (vcpu); }void kvm_vcpu_reset (struct kvm_vcpu *vcpu,bool init_event)
Signature · 1 line
2.24.1
PATCH v2 4/45 KVM: VMX: Allocate VPID after initializing VCPU
In reply to Sean ChristophersonDo VPID allocation after calling the common kvm_vcpu_init() as a step towards doing vCPU allocation (via kmem_cache_zalloc()) and calling kvm_vcpu_init() back-to-back. Squishing allocation and initialization together will eventually allow the sequence to be moved to arch-agnostic creation code.
Note, the VPID is not consumed until KVM_RUN, slightly delaying its allocation should have no real function impact. VPID allocation was arbitrarily placed in the original patch, commit 2384d2b326408 ("KVM:
VMX: Enable Virtual Processor Identification (VPID)").
--- arch/x86/kvm/vmx/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/vmx.c +3 -3
@@ -6708,14 +6708,14 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) goto free_user_fpu; } - vmx->vpid =allocate_vpid (); - err =kvm_vcpu_init (&vmx->vcpu, kvm, id);if (err) goto free_vcpu; err = -ENOMEM ; + vmx->vpid =allocate_vpid (); +/* * If PML is turned on, failure on enabling PML just results in failure * of creating the vcpu, therefore we can simplify PML logic (by
@@ -6826,8 +6826,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)vmx_destroy_pml_buffer (vmx); uninit_vcpu:kvm_vcpu_uninit (&vmx->vcpu); +free_vpid (vmx->vpid); free_vcpu: -free_vpid (vmx->vpid);kmem_cache_free (x86_fpu_cache, vmx->vcpu.arch.guest_fpu); free_user_fpu:kmem_cache_free (x86_fpu_cache, vmx->vcpu.arch.user_fpu);
Signature · 1 line
2.24.1
PATCH v2 5/45 KVM: VMX: Use direct vcpu pointer during vCPU create/free
In reply to Sean ChristophersonCapture the vcpu pointer in a local varaible and replace '&vmx->vcpu' references with a direct reference to the pointer in anticipation of moving bits of the code to common x86 and passing the vcpu pointer into vmx_create_vcpu(), i.e. eliminate unnecessary noise from future patches.
--- arch/x86/kvm/vmx/vmx.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-)
arch/x86/kvm/vmx/vmx.c +22 -20
@@ -6673,17 +6673,17 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)nested_vmx_free_vcpu (vcpu);free_loaded_vmcs (vmx->loaded_vmcs);kvm_vcpu_uninit (vcpu); -kmem_cache_free (x86_fpu_cache, vmx->vcpu.arch.user_fpu); -kmem_cache_free (x86_fpu_cache, vmx->vcpu.arch.guest_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu);kmem_cache_free (kvm_vcpu_cache, vmx); }static struct kvm_vcpu *vmx_create_vcpu (struct kvm *kvm,unsigned int id) { -int err; +struct kvm_vcpu *vcpu;struct vcpu_vmx *vmx;unsigned long *msr_bitmap; -int i, cpu; +int i, cpu, err;BUILD_BUG_ON_MSG (offsetof(struct vcpu_vmx , vcpu) !=0 ,"struct kvm_vcpu must be at offset 0 for arch usercopy region" );
@@ -6692,23 +6692,25 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)if (!vmx)return ERR_PTR (-ENOMEM ); - vmx->vcpu.arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vmx->vcpu.arch.user_fpu) { + vcpu = &vmx->vcpu; + + vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.user_fpu) {printk (KERN_ERR "kvm: failed to allocate kvm userspace's fpu\n" ); err = -ENOMEM ; goto free_partial_vcpu; } - vmx->vcpu.arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vmx->vcpu.arch.guest_fpu) { + vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.guest_fpu) {printk (KERN_ERR "kvm: failed to allocate vcpu's fpu\n" ); err = -ENOMEM ; goto free_user_fpu; } - err =kvm_vcpu_init (&vmx->vcpu, kvm, id); + err =kvm_vcpu_init (vcpu, kvm, id);if (err) goto free_vcpu;
@@ -6780,12 +6782,12 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) vmx->loaded_vmcs = &vmx->vmcs01; cpu =get_cpu (); -vmx_vcpu_load (&vmx->vcpu, cpu); - vmx->vcpu.cpu = cpu; +vmx_vcpu_load (vcpu, cpu); + vcpu->cpu = cpu;init_vmcs (vmx); -vmx_vcpu_put (&vmx->vcpu); +vmx_vcpu_put (vcpu);put_cpu (); -if (cpu_need_virtualize_apic_accesses (&vmx->vcpu)) { +if (cpu_need_virtualize_apic_accesses (vcpu)) { err =alloc_apic_access_page (kvm);if (err) goto free_vmcs;
@@ -6800,7 +6802,7 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)if (nested)nested_vmx_setup_ctls_msrs (&vmx->nested.msrs, vmx_capability.ept, -kvm_vcpu_apicv_active (&vmx->vcpu)); +kvm_vcpu_apicv_active (vcpu));else memset (&vmx->nested.msrs,0 ,sizeof (vmx->nested.msrs));
@@ -6818,19 +6820,19 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) vmx->ept_pointer =INVALID_PAGE ; -return &vmx->vcpu; +return vcpu; free_vmcs:free_loaded_vmcs (vmx->loaded_vmcs); free_pml:vmx_destroy_pml_buffer (vmx); uninit_vcpu: -kvm_vcpu_uninit (&vmx->vcpu); +kvm_vcpu_uninit (vcpu);free_vpid (vmx->vpid); free_vcpu: -kmem_cache_free (x86_fpu_cache, vmx->vcpu.arch.guest_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); free_user_fpu: -kmem_cache_free (x86_fpu_cache, vmx->vcpu.arch.user_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); free_partial_vcpu:kmem_cache_free (kvm_vcpu_cache, vmx);return ERR_PTR (err);
Signature · 1 line
2.24.1
PATCH v2 6/45 KVM: SVM: Use direct vcpu pointer during vCPU create/free
In reply to Sean ChristophersonCapture the vcpu pointer in a local varaible and replace '&svm->vcpu' references with a direct reference to the pointer in anticipation of moving bits of the code to common x86 and passing the vcpu pointer into svm_create_vcpu(), i.e. eliminate unnecessary noise from future patches.
--- arch/x86/kvm/svm.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
arch/x86/kvm/svm.c +16 -14
@@ -2146,6 +2146,7 @@ static int avic_init_vcpu(struct vcpu_svm *svm)static struct kvm_vcpu *svm_create_vcpu (struct kvm *kvm,unsigned int id) { +struct kvm_vcpu *vcpu;struct vcpu_svm *svm;struct page *page;struct page *msrpm_pages;
@@ -2161,24 +2162,25 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) err = -ENOMEM ; goto out; } + vcpu = &svm->vcpu; - svm->vcpu.arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!svm->vcpu.arch.user_fpu) { + vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.user_fpu) {printk (KERN_ERR "kvm: failed to allocate kvm userspace's fpu\n" ); err = -ENOMEM ; goto free_partial_svm; } - svm->vcpu.arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!svm->vcpu.arch.guest_fpu) { + vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.guest_fpu) {printk (KERN_ERR "kvm: failed to allocate vcpu's fpu\n" ); err = -ENOMEM ; goto free_user_fpu; } - err =kvm_vcpu_init (&svm->vcpu, kvm, id); + err =kvm_vcpu_init (vcpu, kvm, id);if (err) goto free_svm;
@@ -2222,9 +2224,9 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) svm->asid_generation =0 ;init_vmcb (svm); -svm_init_osvw (&svm->vcpu); +svm_init_osvw (vcpu); -return &svm->vcpu; +return vcpu; free_page4:__free_page (hsave_page);
@@ -2235,11 +2237,11 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) free_page1:__free_page (page); uninit: -kvm_vcpu_uninit (&svm->vcpu); +kvm_vcpu_uninit (vcpu); free_svm: -kmem_cache_free (x86_fpu_cache, svm->vcpu.arch.guest_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); free_user_fpu: -kmem_cache_free (x86_fpu_cache, svm->vcpu.arch.user_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); free_partial_svm:kmem_cache_free (kvm_vcpu_cache, svm); out:
@@ -2270,8 +2272,8 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu)__free_page (virt_to_page (svm->nested.hsave));__free_pages (virt_to_page (svm->nested.msrpm),MSRPM_ALLOC_ORDER );kvm_vcpu_uninit (vcpu); -kmem_cache_free (x86_fpu_cache, svm->vcpu.arch.user_fpu); -kmem_cache_free (x86_fpu_cache, svm->vcpu.arch.guest_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu);kmem_cache_free (kvm_vcpu_cache, svm); }
Signature · 1 line
2.24.1
PATCH v2 7/45 KVM: x86: Allocate vcpu struct in common x86 code
In reply to Sean ChristophersonMove allocation of VMX and SVM vcpus to common x86. Although the struct being allocated is technically a VMX/SVM struct, it can be interpreted directly as a 'struct kvm_vcpu' because of the pre-existing requirement that 'struct kvm_vcpu' be located at offset zero of the arch/vendor vcpu struct.
Remove the message from the build-time assertions regarding placement of the struct, as compatibility with the arch usercopy region is no longer the sole dependent on 'struct kvm_vcpu' being at offset zero.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 28 +++++++++------------------- arch/x86/kvm/vmx/vmx.c | 24 ++++++++---------------- arch/x86/kvm/x86.c | 16 ++++++++++++---- 4 files changed, 30 insertions(+), 40 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1045,7 +1045,7 @@ struct kvm_x86_ops {void (*vm_destroy)(struct kvm *kvm);/* Create, but do not attach this VCPU */ -struct kvm_vcpu *(*vcpu_create)(struct kvm *kvm,unsigned id); +int (*vcpu_create)(struct kvm *kvm,struct kvm_vcpu *vcpu,unsigned id);void (*vcpu_free)(struct kvm_vcpu *vcpu);void (*vcpu_reset)(struct kvm_vcpu *vcpu,bool init_event);
arch/x86/kvm/svm.c +9 -19
@@ -2144,9 +2144,9 @@ static int avic_init_vcpu(struct vcpu_svm *svm)return ret; } -static struct kvm_vcpu *svm_create_vcpu (struct kvm *kvm,unsigned int id) +static int svm_create_vcpu (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) { -struct kvm_vcpu *vcpu;struct vcpu_svm *svm;struct page *page;struct page *msrpm_pages;
@@ -2154,22 +2154,15 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)struct page *nested_msrpm_pages;int err; -BUILD_BUG_ON_MSG (offsetof(struct vcpu_svm , vcpu) !=0 , -"struct kvm_vcpu must be at offset 0 for arch usercopy region" ); - - svm =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL_ACCOUNT ); -if (!svm) { - err = -ENOMEM ; - goto out; - } - vcpu = &svm->vcpu; +BUILD_BUG_ON (offsetof(struct vcpu_svm , vcpu) !=0 ); + svm =to_svm (vcpu); vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache,GFP_KERNEL_ACCOUNT );if (!vcpu->arch.user_fpu) {printk (KERN_ERR "kvm: failed to allocate kvm userspace's fpu\n" ); err = -ENOMEM ; - goto free_partial_svm; + goto out; } vcpu->arch.guest_fpu = kmem_cache_zalloc(x86_fpu_cache,
@@ -2182,7 +2175,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) err =kvm_vcpu_init (vcpu, kvm, id);if (err) - goto free_svm; + goto free_guest_fpu; err = -ENOMEM ; page =alloc_page (GFP_KERNEL_ACCOUNT );
@@ -2226,7 +2219,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)svm_init_osvw (vcpu); -return vcpu; +return 0 ; free_page4:__free_page (hsave_page);
@@ -2238,14 +2231,12 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)__free_page (page); uninit:kvm_vcpu_uninit (vcpu); -free_svm: +free_guest_fpu:kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); free_user_fpu:kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -free_partial_svm: -kmem_cache_free (kvm_vcpu_cache, svm); out: -return ERR_PTR (err); +return err; }static void svm_clear_current_vmcb (struct vmcb *vmcb)
@@ -2274,7 +2265,6 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu)kvm_vcpu_uninit (vcpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); -kmem_cache_free (kvm_vcpu_cache, svm); }static void svm_vcpu_load (struct kvm_vcpu *vcpu,int cpu)
arch/x86/kvm/vmx/vmx.c +8 -16
@@ -6675,31 +6675,24 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)kvm_vcpu_uninit (vcpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); -kmem_cache_free (kvm_vcpu_cache, vmx); } -static struct kvm_vcpu *vmx_create_vcpu (struct kvm *kvm,unsigned int id) +static int vmx_create_vcpu (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) { -struct kvm_vcpu *vcpu;struct vcpu_vmx *vmx;unsigned long *msr_bitmap;int i, cpu, err; -BUILD_BUG_ON_MSG (offsetof(struct vcpu_vmx , vcpu) !=0 , -"struct kvm_vcpu must be at offset 0 for arch usercopy region" ); - - vmx =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL_ACCOUNT ); -if (!vmx) -return ERR_PTR (-ENOMEM ); - - vcpu = &vmx->vcpu; +BUILD_BUG_ON (offsetof(struct vcpu_vmx , vcpu) !=0 ); + vmx =to_vmx (vcpu); vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache,GFP_KERNEL_ACCOUNT );if (!vcpu->arch.user_fpu) {printk (KERN_ERR "kvm: failed to allocate kvm userspace's fpu\n" ); err = -ENOMEM ; - goto free_partial_vcpu; + goto out; } vcpu->arch.guest_fpu = kmem_cache_zalloc(x86_fpu_cache,
@@ -6820,7 +6813,7 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) vmx->ept_pointer =INVALID_PAGE ; -return vcpu; +return 0 ; free_vmcs:free_loaded_vmcs (vmx->loaded_vmcs);
@@ -6833,9 +6826,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); free_user_fpu:kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -free_partial_vcpu: -kmem_cache_free (kvm_vcpu_cache, vmx); -return ERR_PTR (err); +out: +return err; }#define L1TF_MSG_SMT "L1TF CPU bug present and SMT on, data leak possible. See CVE-2018-3646 and https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/l1tf.html for details.\n"
arch/x86/kvm/x86.c +12 -4
@@ -9091,26 +9091,34 @@ static void fx_init(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) { -void *wbinvd_dirty_mask = vcpu->arch.wbinvd_dirty_mask; -kvmclock_reset (vcpu); kvm_x86_ops->vcpu_free (vcpu); -free_cpumask_var (wbinvd_dirty_mask); + +free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); +kmem_cache_free (kvm_vcpu_cache, vcpu); }struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {struct kvm_vcpu *vcpu; +int r;if (kvm_check_tsc_unstable () &&atomic_read (&kvm->online_vcpus) !=0 )printk_once (KERN_WARNING "kvm: SMP vm created on host with unstable TSC; " "guest TSC will not be reliable\n" ); - vcpu = kvm_x86_ops->vcpu_create (kvm, id); + vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL_ACCOUNT ); +if (!vcpu) +return ERR_PTR (-ENOMEM ); + r = kvm_x86_ops->vcpu_create (kvm, vcpu, id); +if (r) { +kmem_cache_free (kvm_vcpu_cache, vcpu); +return ERR_PTR (r); + }return vcpu; }
Signature · 1 line
2.24.1
PATCH v2 8/45 KVM: x86: Move FPU allocation to common x86 code
In reply to Sean ChristophersonThe allocation of FPU structs is identical across VMX and SVM, move it to common x86 code. Somewhat arbitrarily place the allocation so that it resides directly above the associated initialization via fx_init(), e.g. instead of retaining its position with respect to the overall vcpu creation flow. Although the names names kvm_arch_vcpu_create() and kvm_arch_vcpu_init() might suggest otherwise, x86 does not have a clean split between 'create' and 'init'. Allocating the struct immediately prior to the first use arguably improves readability *now*, and will yield even bigger improvements when kvm_arch_vcpu_init() is removed in a future patch.
--- arch/x86/kvm/svm.c | 25 +------------------------ arch/x86/kvm/vmx/vmx.c | 25 +------------------------ arch/x86/kvm/x86.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 48 deletions(-)
arch/x86/kvm/svm.c +1 -24
@@ -2157,25 +2157,9 @@ static int svm_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,BUILD_BUG_ON (offsetof(struct vcpu_svm , vcpu) !=0 ); svm =to_svm (vcpu); - vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.user_fpu) { -printk (KERN_ERR "kvm: failed to allocate kvm userspace's fpu\n" ); - err = -ENOMEM ; - goto out; - } - - vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.guest_fpu) { -printk (KERN_ERR "kvm: failed to allocate vcpu's fpu\n" ); - err = -ENOMEM ; - goto free_user_fpu; - } - err =kvm_vcpu_init (vcpu, kvm, id);if (err) - goto free_guest_fpu; +return err; err = -ENOMEM ; page =alloc_page (GFP_KERNEL_ACCOUNT );
@@ -2231,11 +2215,6 @@ static int svm_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,__free_page (page); uninit:kvm_vcpu_uninit (vcpu); -free_guest_fpu: -kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); -free_user_fpu: -kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -out:return err; }
@@ -2263,8 +2242,6 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu)__free_page (virt_to_page (svm->nested.hsave));__free_pages (virt_to_page (svm->nested.msrpm),MSRPM_ALLOC_ORDER );kvm_vcpu_uninit (vcpu); -kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); }static void svm_vcpu_load (struct kvm_vcpu *vcpu,int cpu)
arch/x86/kvm/vmx/vmx.c +1 -24
@@ -6673,8 +6673,6 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)nested_vmx_free_vcpu (vcpu);free_loaded_vmcs (vmx->loaded_vmcs);kvm_vcpu_uninit (vcpu); -kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); } static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,
@@ -6687,25 +6685,9 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,BUILD_BUG_ON (offsetof(struct vcpu_vmx , vcpu) !=0 ); vmx =to_vmx (vcpu); - vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.user_fpu) { -printk (KERN_ERR "kvm: failed to allocate kvm userspace's fpu\n" ); - err = -ENOMEM ; - goto out; - } - - vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.guest_fpu) { -printk (KERN_ERR "kvm: failed to allocate vcpu's fpu\n" ); - err = -ENOMEM ; - goto free_user_fpu; - } - err =kvm_vcpu_init (vcpu, kvm, id);if (err) - goto free_vcpu; +return err; err = -ENOMEM ;
@@ -6822,11 +6804,6 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu, uninit_vcpu:kvm_vcpu_uninit (vcpu);free_vpid (vmx->vpid); -free_vcpu: -kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); -free_user_fpu: -kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -out:return err; }
arch/x86/kvm/x86.c +21 -0
@@ -9096,6 +9096,8 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) kvm_x86_ops->vcpu_free (vcpu);free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu);kmem_cache_free (kvm_vcpu_cache, vcpu); }
@@ -9453,6 +9455,21 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) goto fail_free_mce_banks; } + vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.user_fpu) { +pr_err ("kvm: failed to allocate userspace's fpu\n" ); + r = -ENOMEM ; + goto free_wbinvd_dirty_mask; + } + + vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.guest_fpu) { +pr_err ("kvm: failed to allocate vcpu's fpu\n" ); + r = -ENOMEM ; + goto free_user_fpu; + }fx_init (vcpu); vcpu->arch.guest_xstate_size =XSAVE_HDR_SIZE +XSAVE_HDR_OFFSET ;
@@ -9471,6 +9488,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)return 0 ; +free_user_fpu: +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); +free_wbinvd_dirty_mask: +free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); fail_free_mce_banks:kfree (vcpu->arch.mce_banks); fail_free_lapic:
Signature · 1 line
2.24.1
PATCH v2 9/45 KVM: x86: Move allocation of pio_data page down a few lines
In reply to Sean ChristophersonAllocate the pio_data page after creating the MMU and local APIC so that all direct memory allocations are grouped together. This allows setting the return value to -ENOMEM prior to starting the allocations instead of setting it in the fail path for every allocation.
The pio_data page is only consumed when KVM_RUN is invoked, i.e. moving its allocation has no real functional impact.
--- arch/x86/kvm/x86.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
arch/x86/kvm/x86.c +13 -20
@@ -9420,18 +9420,11 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)else vcpu->arch.mp_state =KVM_MP_STATE_UNINITIALIZED ; - page =alloc_page (GFP_KERNEL | __GFP_ZERO); -if (!page) { - r = -ENOMEM ; - goto fail; - } - vcpu->arch.pio_data =page_address (page); -kvm_set_tsc_khz (vcpu, max_tsc_khz); r =kvm_mmu_create (vcpu);if (r <0 ) - goto fail_free_pio_data; +return r;if (irqchip_in_kernel (vcpu->kvm)) { vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv (vcpu->kvm);
@@ -9441,25 +9434,27 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) }else static_key_slow_inc (&kvm_no_apic_vcpu); + r = -ENOMEM ; + + page =alloc_page (GFP_KERNEL | __GFP_ZERO); +if (!page) + goto fail_free_lapic; + vcpu->arch.pio_data =page_address (page); + vcpu->arch.mce_banks =kzalloc (KVM_MAX_MCE_BANKS *sizeof (u64) *4 ,GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.mce_banks) { - r = -ENOMEM ; - goto fail_free_lapic; - } +if (!vcpu->arch.mce_banks) + goto fail_free_pio_data; vcpu->arch.mcg_cap =KVM_MAX_MCE_BANKS ;if (!zalloc_cpumask_var (&vcpu->arch.wbinvd_dirty_mask, -GFP_KERNEL_ACCOUNT )) { - r = -ENOMEM ; +GFP_KERNEL_ACCOUNT )) goto fail_free_mce_banks; - } vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache,GFP_KERNEL_ACCOUNT );if (!vcpu->arch.user_fpu) {pr_err ("kvm: failed to allocate userspace's fpu\n" ); - r = -ENOMEM ; goto free_wbinvd_dirty_mask; }
@@ -9467,7 +9462,6 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) GFP_KERNEL_ACCOUNT);if (!vcpu->arch.guest_fpu) {pr_err ("kvm: failed to allocate vcpu's fpu\n" ); - r = -ENOMEM ; goto free_user_fpu; }fx_init (vcpu);
@@ -9494,13 +9488,12 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); fail_free_mce_banks:kfree (vcpu->arch.mce_banks); +fail_free_pio_data: +free_page ((unsigned long )vcpu->arch.pio_data); fail_free_lapic:kvm_free_lapic (vcpu); fail_mmu_destroy:kvm_mmu_destroy (vcpu); -fail_free_pio_data: -free_page ((unsigned long )vcpu->arch.pio_data); -fail:return r; }
Signature · 1 line
2.24.1
PATCH v2 10/45 KVM: x86: Move kvm_vcpu_init() invocation to common code
In reply to Sean ChristophersonMove the kvm_cpu_{un}init() calls to common x86 code as an intermediate step to removing kvm_cpu_{un}init() altogether.
Note, VMX'x alloc_apic_access_page() and init_rmode_identity_map() are per-VM allocations and are intentionally kept if vCPU creation fails. They are freed by kvm_arch_destroy_vm().
No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 13 +++---------- arch/x86/kvm/vmx/vmx.c | 19 ++++++------------- arch/x86/kvm/x86.c | 20 +++++++++++++++----- 4 files changed, 25 insertions(+), 29 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1045,7 +1045,7 @@ struct kvm_x86_ops {void (*vm_destroy)(struct kvm *kvm);/* Create, but do not attach this VCPU */ -int (*vcpu_create)(struct kvm *kvm,struct kvm_vcpu *vcpu,unsigned id); +int (*vcpu_create)(struct kvm_vcpu *vcpu);void (*vcpu_free)(struct kvm_vcpu *vcpu);void (*vcpu_reset)(struct kvm_vcpu *vcpu,bool init_event);
arch/x86/kvm/svm.c +3 -10
@@ -2144,8 +2144,7 @@ static int avic_init_vcpu(struct vcpu_svm *svm)return ret; } -static int svm_create_vcpu (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +static int svm_create_vcpu (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm;struct page *page;
@@ -2157,14 +2156,10 @@ static int svm_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,BUILD_BUG_ON (offsetof(struct vcpu_svm , vcpu) !=0 ); svm =to_svm (vcpu); - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) -return err; - err = -ENOMEM ; page =alloc_page (GFP_KERNEL_ACCOUNT );if (!page) - goto uninit; + goto out; msrpm_pages =alloc_pages (GFP_KERNEL_ACCOUNT ,MSRPM_ALLOC_ORDER );if (!msrpm_pages)
@@ -2213,8 +2208,7 @@ static int svm_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,__free_pages (msrpm_pages,MSRPM_ALLOC_ORDER ); free_page1:__free_page (page); -uninit: -kvm_vcpu_uninit (vcpu); +out:return err; }
@@ -2241,7 +2235,6 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu)__free_pages (virt_to_page (svm->msrpm),MSRPM_ALLOC_ORDER );__free_page (virt_to_page (svm->nested.hsave));__free_pages (virt_to_page (svm->nested.msrpm),MSRPM_ALLOC_ORDER ); -kvm_vcpu_uninit (vcpu); }static void svm_vcpu_load (struct kvm_vcpu *vcpu,int cpu)
arch/x86/kvm/vmx/vmx.c +6 -13
@@ -6672,11 +6672,9 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)free_vpid (vmx->vpid);nested_vmx_free_vcpu (vcpu);free_loaded_vmcs (vmx->loaded_vmcs); -kvm_vcpu_uninit (vcpu); } -static int vmx_create_vcpu (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +static int vmx_create_vcpu (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx;unsigned long *msr_bitmap;
@@ -6685,10 +6683,6 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,BUILD_BUG_ON (offsetof(struct vcpu_vmx , vcpu) !=0 ); vmx =to_vmx (vcpu); - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) -return err; - err = -ENOMEM ; vmx->vpid =allocate_vpid ();
@@ -6702,7 +6696,7 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,if (enable_pml) { vmx->pml_pg =alloc_page (GFP_KERNEL_ACCOUNT | __GFP_ZERO);if (!vmx->pml_pg) - goto uninit_vcpu; + goto free_vpid; }BUILD_BUG_ON (ARRAY_SIZE (vmx_msr_index) !=NR_SHARED_MSRS );
@@ -6747,7 +6741,7 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,vmx_disable_intercept_for_msr (msr_bitmap,MSR_IA32_SYSENTER_CS ,MSR_TYPE_RW );vmx_disable_intercept_for_msr (msr_bitmap,MSR_IA32_SYSENTER_ESP ,MSR_TYPE_RW );vmx_disable_intercept_for_msr (msr_bitmap,MSR_IA32_SYSENTER_EIP ,MSR_TYPE_RW ); -if (kvm_cstate_in_guest (kvm)) { +if (kvm_cstate_in_guest (vcpu->kvm)) {vmx_disable_intercept_for_msr (msr_bitmap,MSR_CORE_C1_RES ,MSR_TYPE_R );vmx_disable_intercept_for_msr (msr_bitmap,MSR_CORE_C3_RESIDENCY ,MSR_TYPE_R );vmx_disable_intercept_for_msr (msr_bitmap,MSR_CORE_C6_RESIDENCY ,MSR_TYPE_R );
@@ -6763,13 +6757,13 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,vmx_vcpu_put (vcpu);put_cpu ();if (cpu_need_virtualize_apic_accesses (vcpu)) { - err =alloc_apic_access_page (kvm); + err =alloc_apic_access_page (vcpu->kvm);if (err) goto free_vmcs; }if (enable_ept && !enable_unrestricted_guest) { - err =init_rmode_identity_map (kvm); + err =init_rmode_identity_map (vcpu->kvm);if (err) goto free_vmcs; }
@@ -6801,8 +6795,7 @@ static int vmx_create_vcpu(struct kvm *kvm, struct kvm_vcpu *vcpu,free_loaded_vmcs (vmx->loaded_vmcs); free_pml:vmx_destroy_pml_buffer (vmx); -uninit_vcpu: -kvm_vcpu_uninit (vcpu); +free_vpid:free_vpid (vmx->vpid);return err; }
arch/x86/kvm/x86.c +15 -5
@@ -9095,6 +9095,8 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) kvm_x86_ops->vcpu_free (vcpu); +kvm_vcpu_uninit (vcpu); +free_cpumask_var (vcpu->arch.wbinvd_dirty_mask);kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu);
@@ -9116,12 +9118,20 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,if (!vcpu)return ERR_PTR (-ENOMEM ); - r = kvm_x86_ops->vcpu_create (kvm, vcpu, id); -if (r) { -kmem_cache_free (kvm_vcpu_cache, vcpu); -return ERR_PTR (r); - } + r =kvm_vcpu_init (vcpu, kvm, id); +if (r) + goto free_vcpu; + + r = kvm_x86_ops->vcpu_create (vcpu); +if (r) + goto uninit_vcpu;return vcpu; + +uninit_vcpu: +kvm_vcpu_uninit (vcpu); +free_vcpu: +kmem_cache_free (kvm_vcpu_cache, vcpu); +return ERR_PTR (r); }int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu)
Signature · 1 line
2.24.1
PATCH v2 11/45 KVM: PPC: e500mc: Add build-time assert that vcpu is at offset 0
In reply to Sean ChristophersonIn preparation for moving vcpu allocation to common PPC code, add an explicit, albeit redundant, build-time assert to ensure the vcpu member is located at offset 0. The assert is redundant in the sense that kvmppc_core_vcpu_create_e500() contains a functionally identical assert. The motiviation for adding the extra assert is to provide visual confirmation of the correctness of moving vcpu allocation to common code.
--- arch/powerpc/kvm/e500mc.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/kvm/e500mc.c +2 -0
@@ -308,6 +308,8 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_e500mc(struct kvm *kvm,struct kvm_vcpu *vcpu;int err; +BUILD_BUG_ON (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 ); + vcpu_e500 =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL );if (!vcpu_e500) { err = -ENOMEM ;
Signature · 1 line
2.24.1
PATCH v2 12/45 KVM: PPC: Allocate vcpu struct in common PPC code
In reply to Sean ChristophersonMove allocation of all flavors of PPC vCPUs to common PPC code. All variants either allocate 'struct kvm_vcpu' directly, or require that the embedded 'struct kvm_vcpu' member be located at offset 0, i.e. guarantee that the allocation can be directly interpreted as a 'struct kvm_vcpu' object.
Remove the message from the build-time assertion regarding placement of the struct, as compatibility with the arch usercopy region is no longer the sole dependent on 'struct kvm_vcpu' being at offset zero.
--- arch/powerpc/include/asm/kvm_ppc.h | 7 ++++--- arch/powerpc/kvm/book3s.c | 5 +++-- arch/powerpc/kvm/book3s_hv.c | 20 +++++--------------- arch/powerpc/kvm/book3s_pr.c | 18 +++++------------- arch/powerpc/kvm/booke.c | 5 +++-- arch/powerpc/kvm/e500.c | 24 ++++++------------------ arch/powerpc/kvm/e500mc.c | 22 +++++----------------- arch/powerpc/kvm/powerpc.c | 23 ++++++++++++++++++----- 8 files changed, 49 insertions(+), 75 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +4 -3
@@ -119,8 +119,8 @@ extern int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, enum xlate_instdata xlid, enum xlate_readwrite xlrw, struct kvmppc_pte *pte); -extern struct kvm_vcpu *kvmppc_core_vcpu_create (struct kvm *kvm, -unsigned int id); +extern int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id);extern void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu);extern int kvmppc_core_vcpu_setup (struct kvm_vcpu *vcpu);extern int kvmppc_core_check_processor_compat (void );
@@ -274,7 +274,8 @@ struct kvmppc_ops {void (*inject_interrupt)(struct kvm_vcpu *vcpu,int vec,u64 srr1_flags);void (*set_msr)(struct kvm_vcpu *vcpu,u64 msr);int (*vcpu_run)(struct kvm_run *run,struct kvm_vcpu *vcpu); -struct kvm_vcpu *(*vcpu_create)(struct kvm *kvm,unsigned int id); +int (*vcpu_create)(struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id);void (*vcpu_free)(struct kvm_vcpu *vcpu);int (*check_requests)(struct kvm_vcpu *vcpu);int (*get_dirty_log)(struct kvm *kvm,struct kvm_dirty_log *log);
arch/powerpc/kvm/book3s.c +3 -2
@@ -789,9 +789,10 @@ void kvmppc_decrementer_func(struct kvm_vcpu *vcpu)kvm_vcpu_kick (vcpu); } -struct kvm_vcpu *kvmppc_core_vcpu_create (struct kvm *kvm,unsigned int id) +int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) { -return kvm->arch.kvm_ops->vcpu_create (kvm, id); +return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/book3s_hv.c +5 -15
@@ -2271,22 +2271,16 @@ static void debugfs_vcpu_init(struct kvm_vcpu *vcpu, unsigned int id) }#endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */ -static struct kvm_vcpu *kvmppc_core_vcpu_create_hv (struct kvm *kvm, -unsigned int id) +static int kvmppc_core_vcpu_create_hv (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) { -struct kvm_vcpu *vcpu;int err;int core;struct kvmppc_vcore *vcore; - err = -ENOMEM ; - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - err =kvm_vcpu_init (vcpu, kvm, id);if (err) - goto free_vcpu; +return err; vcpu->arch.shared = &vcpu->arch.shregs;#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -2383,14 +2377,11 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,debugfs_vcpu_init (vcpu, id); -return vcpu; +return 0 ; uninit_vcpu:kvm_vcpu_uninit (vcpu); -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); -out: -return ERR_PTR (err); +return err; } static int kvmhv_set_smt_mode(struct kvm *kvm, unsigned long smt_mode,
@@ -2445,7 +2436,6 @@ static void kvmppc_core_vcpu_free_hv(struct kvm_vcpu *vcpu)unpin_vpa (vcpu->kvm, &vcpu->arch.vpa);spin_unlock (&vcpu->arch.vpa_update_lock);kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); }static int kvmppc_core_check_requests_hv (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/book3s_pr.c +5 -13
@@ -1744,21 +1744,16 @@ static int kvmppc_set_one_reg_pr(struct kvm_vcpu *vcpu, u64 id,return r; } -static struct kvm_vcpu *kvmppc_core_vcpu_create_pr (struct kvm *kvm, -unsigned int id) +static int kvmppc_core_vcpu_create_pr (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) {struct kvmppc_vcpu_book3s *vcpu_book3s; -struct kvm_vcpu *vcpu;int err = -ENOMEM ;unsigned long p; - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - vcpu_book3s =vzalloc (sizeof (struct kvmppc_vcpu_book3s ));if (!vcpu_book3s) - goto free_vcpu; + goto out; vcpu->arch.book3s = vcpu_book3s;#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
@@ -1808,7 +1803,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm,if (err <0 ) goto free_shared_page; -return vcpu; +return 0 ; free_shared_page:free_page ((unsigned long )vcpu->arch.shared);
@@ -1820,10 +1815,8 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, free_vcpu3s:#endif vfree (vcpu_book3s); -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); out: -return ERR_PTR (err); +return err; }static void kvmppc_core_vcpu_free_pr (struct kvm_vcpu *vcpu)
@@ -1836,7 +1829,6 @@ static void kvmppc_core_vcpu_free_pr(struct kvm_vcpu *vcpu)kfree (vcpu->arch.shadow_vcpu);#endif vfree (vcpu_book3s); -kmem_cache_free (kvm_vcpu_cache, vcpu); }static int kvmppc_vcpu_run_pr (struct kvm_run *kvm_run,struct kvm_vcpu *vcpu)
arch/powerpc/kvm/booke.c +3 -2
@@ -2114,9 +2114,10 @@ int kvmppc_core_init_vm(struct kvm *kvm)return kvm->arch.kvm_ops->init_vm (kvm); } -struct kvm_vcpu *kvmppc_core_vcpu_create (struct kvm *kvm,unsigned int id) +int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) { -return kvm->arch.kvm_ops->vcpu_create (kvm, id); +return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/e500.c +6 -18
@@ -433,26 +433,18 @@ static int kvmppc_set_one_reg_e500(struct kvm_vcpu *vcpu, u64 id,return r; } -static struct kvm_vcpu *kvmppc_core_vcpu_create_e500 (struct kvm *kvm, -unsigned int id) +static int kvmppc_core_vcpu_create_e500 (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) {struct kvmppc_vcpu_e500 *vcpu_e500; -struct kvm_vcpu *vcpu;int err; -BUILD_BUG_ON_MSG (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 , -"struct kvm_vcpu must be at offset 0 for arch usercopy region" ); +BUILD_BUG_ON (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 ); + vcpu_e500 =to_e500 (vcpu); - vcpu_e500 =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu_e500) { - err = -ENOMEM ; - goto out; - } - - vcpu = &vcpu_e500->vcpu; err =kvm_vcpu_init (vcpu, kvm, id);if (err) - goto free_vcpu; +return err;if (kvmppc_e500_id_table_alloc (vcpu_e500) =NULL ) { err = -ENOMEM ;
@@ -477,10 +469,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_e500(struct kvm *kvm,kvmppc_e500_id_table_free (vcpu_e500); uninit_vcpu:kvm_vcpu_uninit (vcpu); -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu_e500); -out: -return ERR_PTR (err); +return err; }static void kvmppc_core_vcpu_free_e500 (struct kvm_vcpu *vcpu)
@@ -491,7 +480,6 @@ static void kvmppc_core_vcpu_free_e500(struct kvm_vcpu *vcpu)kvmppc_e500_tlb_uninit (vcpu_e500);kvmppc_e500_id_table_free (vcpu_e500);kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu_e500); }static int kvmppc_core_init_vm_e500 (struct kvm *kvm)
arch/powerpc/kvm/e500mc.c +5 -17
@@ -301,28 +301,21 @@ static int kvmppc_set_one_reg_e500mc(struct kvm_vcpu *vcpu, u64 id,return r; } -static struct kvm_vcpu *kvmppc_core_vcpu_create_e500mc (struct kvm *kvm, -unsigned int id) +static int kvmppc_core_vcpu_create_e500mc (struct kvm *kvm,struct kvm_vcpu *vcpu, +unsigned int id) {struct kvmppc_vcpu_e500 *vcpu_e500; -struct kvm_vcpu *vcpu;int err;BUILD_BUG_ON (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 ); - - vcpu_e500 =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu_e500) { - err = -ENOMEM ; - goto out; - } - vcpu = &vcpu_e500->vcpu; + vcpu_e500 =to_e500 (vcpu);/* Invalid PIR value -- this LPID dosn't have valid state on any cpu */ vcpu->arch.oldpir =0xffffffff ; err =kvm_vcpu_init (vcpu, kvm, id);if (err) - goto free_vcpu; +return err; err =kvmppc_e500_tlb_init (vcpu_e500);if (err)
@@ -340,11 +333,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_e500mc(struct kvm *kvm,kvmppc_e500_tlb_uninit (vcpu_e500); uninit_vcpu:kvm_vcpu_uninit (vcpu); - -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu_e500); -out: -return ERR_PTR (err); +return err; }static void kvmppc_core_vcpu_free_e500mc (struct kvm_vcpu *vcpu)
@@ -354,7 +343,6 @@ static void kvmppc_core_vcpu_free_e500mc(struct kvm_vcpu *vcpu)free_page ((unsigned long )vcpu->arch.shared);kvmppc_e500_tlb_uninit (vcpu_e500);kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu_e500); }static int kvmppc_core_init_vm_e500mc (struct kvm *kvm)
arch/powerpc/kvm/powerpc.c +18 -5
@@ -723,12 +723,23 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm,struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {struct kvm_vcpu *vcpu; - vcpu =kvmppc_core_vcpu_create (kvm, id); -if (!IS_ERR (vcpu)) { - vcpu->arch.wqp = &vcpu->wq; -kvmppc_create_vcpu_debugfs (vcpu, id); - } +int err; + + vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); +if (!vcpu) +return ERR_PTR (-ENOMEM ); + + err =kvmppc_core_vcpu_create (kvm, vcpu, id); +if (err) + goto free_vcpu; + + vcpu->arch.wqp = &vcpu->wq; +kvmppc_create_vcpu_debugfs (vcpu, id);return vcpu; + +free_vcpu: +kmem_cache_free (kvm_vcpu_cache, vcpu); +return ERR_PTR (err); }void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu)
@@ -758,6 +769,8 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) }kvmppc_core_vcpu_free (vcpu); + +kmem_cache_free (kvm_vcpu_cache, vcpu); }void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu)
Signature · 1 line
2.24.1
Re: [PATCH v2 12/45] KVM: PPC: Allocate vcpu struct in common PPC code
Quoted 11 lines · Sean Christopherson
Move allocation of all flavors of PPC vCPUs to common PPC code. All variants either allocate 'struct
kvm_vcpu' directly, or require that the embedded 'structkvm_vcpu' member be located at offset 0, i.e. guarantee that the allocation can be directly interpreted as a 'structkvm_vcpu' object.Remove the message from the build-time assertion regarding placement of the struct, as compatibility with the arch usercopy region is no longer the sole dependent on 'struct
kvm_vcpu' being at offset zero.Signed-off-by Sean Christopherson <[email protected]>
This fails to compile for Book E configs:
CC arch/powerpc/kvm/e500.o/home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c: In function ‘kvmppc_core_vcpu_create_e500’:/home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c:464:9: error: return makes integer from pointer without a cast [-Werror=int-conversion]
return vcpu;
^cc1: all warnings being treated as errors
make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266: arch/powerpc/kvm/e500.o] Error 1
There is a "return vcpu" statement in kvmppc_core_vcpu_create_e500(), and another in kvmppc_core_vcpu_create_e500mc(), which both need to be changed to "return 0".
(By the way, I do appreciate you fixing the PPC code, even if there are some errors.)
Paul.
Paolo Bonzini
maintainerRe: [PATCH v2 12/45] KVM: PPC: Allocate vcpu struct in common PPC code
Quoted 23 lines · Paul Mackerras
Quoted 11 lines · Sean Christopherson
Move allocation of all flavors of PPC vCPUs to common PPC code. All variants either allocate 'struct
kvm_vcpu' directly, or require that the embedded 'structkvm_vcpu' member be located at offset 0, i.e. guarantee that the allocation can be directly interpreted as a 'structkvm_vcpu' object.Remove the message from the build-time assertion regarding placement of the struct, as compatibility with the arch usercopy region is no longer the sole dependent on 'struct
kvm_vcpu' being at offset zero.Signed-off-by Sean Christopherson <[email protected]>This fails to compile for Book E configs:
CC
arch/powerpc/kvm/e500.o/home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c: In function ‘kvmppc_core_vcpu_create_e500’:/home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c:464:9: error: return makes integer from pointer without a cast [-Werror=int-conversion]return vcpu; ^cc1: all warnings being treated as errors
make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266:arch/powerpc/kvm/e500.o] Error 1
Quoted 6 lines
There is a "return vcpu" statement in
kvmppc_core_vcpu_create_e500(), and another inkvmppc_core_vcpu_create_e500mc(), which both need to be changed to "return 0".(By the way, I do appreciate you fixing the PPC code, even if there are some errors.)
Squashed:
arch/powerpc/kvm/e500.c +1 -1
@@ -461,7 +461,7 @@ static int kvmppc_core_vcpu_create_e500(struct kvm *kvm, struct kvm_vcpu *vcpu, goto uninit_tlb; } -return vcpu; +return 0 ; uninit_tlb:kvmppc_e500_tlb_uninit (vcpu_e500);
arch/powerpc/kvm/e500mc.c +1 -1
@@ -327,7 +327,7 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpu goto uninit_tlb; } -return vcpu; +return 0 ; uninit_tlb:kvmppc_e500_tlb_uninit (vcpu_e500);
Re: [PATCH v2 12/45] KVM: PPC: Allocate vcpu struct in common PPC code
Quoted 24 lines · Paolo Bonzini
Quoted 23 lines · Paul Mackerras
Quoted 11 lines · Sean Christopherson
Move allocation of all flavors of PPC vCPUs to common PPC code. All variants either allocate 'struct
kvm_vcpu' directly, or require that the embedded 'structkvm_vcpu' member be located at offset 0, i.e. guarantee that the allocation can be directly interpreted as a 'structkvm_vcpu' object.Remove the message from the build-time assertion regarding placement of the struct, as compatibility with the arch usercopy region is no longer the sole dependent on 'struct
kvm_vcpu' being at offset zero.Signed-off-by Sean Christopherson <[email protected]>This fails to compile for Book E configs:
CC
arch/powerpc/kvm/e500.o/home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c: In function ‘kvmppc_core_vcpu_create_e500’:/home/paulus/kernel/kvm/arch/powerpc/kvm/e500.c:464:9: error: return makes integer from pointer without a cast [-Werror=int-conversion]return vcpu; ^cc1: all warnings being treated as errors
make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266:arch/powerpc/kvm/e500.o] Error 1
Quoted 8 lines
Quoted 6 lines
There is a "return vcpu" statement in
kvmppc_core_vcpu_create_e500(), and another inkvmppc_core_vcpu_create_e500mc(), which both need to be changed to "return 0".(By the way, I do appreciate you fixing the PPC code, even if there are some errors.)
Squashed:
Thanks for cleaning up after me, not having to rebase and resend this series made my day :-)
Quoted 28 lines
arch/powerpc/kvm/e500.c +1
-1@@ -461,7 +461,7 @@ static int kvmppc_core_vcpu_create_e500(struct kvm *kvm, struct kvm_vcpu *vcpu, goto uninit_tlb; } -return vcpu; +return 0 ; uninit_tlb:kvmppc_e500_tlb_uninit (vcpu_e500);arch/powerpc/kvm/e500mc.c +1
-1@@ -327,7 +327,7 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpu goto uninit_tlb; } -return vcpu; +return 0 ; uninit_tlb:kvmppc_e500_tlb_uninit (vcpu_e500);
PATCH v2 13/45 KVM: PPC: Book3S PR: Allocate book3s and shadow vcpu after common init
In reply to Sean ChristophersonCall kvm_vcpu_init() in kvmppc_core_vcpu_create_pr() prior to allocating the book3s and shadow_vcpu objects in preparation of moving said call to common PPC code. Although kvm_vcpu_init() has an arch callback, the callback is empty for Book3S PR, i.e. barring unseen black magic, moving the allocation has no real functional impact.
--- arch/powerpc/kvm/book3s_pr.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/powerpc/kvm/book3s_pr.c +11 -11
@@ -1748,12 +1748,18 @@ static int kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvm_vcpu *vcpu, unsigned int id) {struct kvmppc_vcpu_book3s *vcpu_book3s; -int err = -ENOMEM ;unsigned long p; +int err; + + err =kvm_vcpu_init (vcpu, kvm, id); +if (err) +return err; + + err = -ENOMEM ; vcpu_book3s =vzalloc (sizeof (struct kvmppc_vcpu_book3s ));if (!vcpu_book3s) - goto out; + goto uninit_vcpu; vcpu->arch.book3s = vcpu_book3s;#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
@@ -1763,14 +1769,9 @@ static int kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvm_vcpu *vcpu, goto free_vcpu3s;#endif - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) - goto free_shadow_vcpu; - - err = -ENOMEM ; p =__get_free_page (GFP_KERNEL |__GFP_ZERO);if (!p) - goto uninit_vcpu; + goto free_shadow_vcpu; vcpu->arch.shared = (void *)p;#ifdef CONFIG_PPC_BOOK3S_64 /* Always start the shared struct in native endian mode */
@@ -1807,15 +1808,14 @@ static int kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvm_vcpu *vcpu, free_shared_page:free_page ((unsigned long )vcpu->arch.shared); -uninit_vcpu: -kvm_vcpu_uninit (vcpu); free_shadow_vcpu:#ifdef CONFIG_KVM_BOOK3S_32_HANDLER kfree (vcpu->arch.shadow_vcpu); free_vcpu3s:#endif vfree (vcpu_book3s); -out: +uninit_vcpu: +kvm_vcpu_uninit (vcpu);return err; }
Signature · 1 line
2.24.1
PATCH v2 14/45 KVM: PPC: e500mc: Move reset of oldpir below call to kvm_vcpu_init()
In reply to Sean ChristophersonMove the initialization of oldpir so that the call to kvm_vcpu_init() is at the top of kvmppc_core_vcpu_create_e500mc(). oldpir is only use when loading/putting a vCPU, which currently cannot be done until after kvm_arch_vcpu_create() completes. Reording the call to kvm_vcpu_init() paves the way for moving the invocation to common PPC code.
No functional change intended.
--- arch/powerpc/kvm/e500mc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kvm/e500mc.c +3 -3
@@ -310,13 +310,13 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpuBUILD_BUG_ON (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 ); vcpu_e500 =to_e500 (vcpu); -/* Invalid PIR value -- this LPID dosn't have valid state on any cpu */ - vcpu->arch.oldpir =0xffffffff ; - err =kvm_vcpu_init (vcpu, kvm, id);if (err)return err; +/* Invalid PIR value -- this LPID dosn't have valid state on any cpu */ + vcpu->arch.oldpir =0xffffffff ; + err =kvmppc_e500_tlb_init (vcpu_e500);if (err) goto uninit_vcpu;
Signature · 1 line
2.24.1
PATCH v2 15/45 KVM: PPC: Move kvm_vcpu_init() invocation to common code
In reply to Sean ChristophersonMove the kvm_cpu_{un}init() calls to common PPC code as an intermediate step towards removing kvm_cpu_{un}init() altogether.
No functional change intended.
--- arch/powerpc/include/asm/kvm_ppc.h | 3 +-- arch/powerpc/kvm/book3s.c | 5 ++--- arch/powerpc/kvm/book3s_hv.c | 17 ++++++----------- arch/powerpc/kvm/book3s_pr.c | 13 +++---------- arch/powerpc/kvm/booke.c | 5 ++--- arch/powerpc/kvm/e500.c | 16 +++------------- arch/powerpc/kvm/e500mc.c | 12 ++---------- arch/powerpc/kvm/powerpc.c | 10 +++++++++- 8 files changed, 28 insertions(+), 53 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +1 -2
@@ -119,8 +119,7 @@ extern int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, enum xlate_instdata xlid, enum xlate_readwrite xlrw, struct kvmppc_pte *pte); -extern int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id); +extern int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu);extern void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu);extern int kvmppc_core_vcpu_setup (struct kvm_vcpu *vcpu);extern int kvmppc_core_check_processor_compat (void );
arch/powerpc/kvm/book3s.c +2 -3
@@ -789,10 +789,9 @@ void kvmppc_decrementer_func(struct kvm_vcpu *vcpu)kvm_vcpu_kick (vcpu); } -int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); +return kvm->arch.kvm_ops->vcpu_create (vcpu); }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/book3s_hv.c +6 -11
@@ -2271,16 +2271,16 @@ static void debugfs_vcpu_init(struct kvm_vcpu *vcpu, unsigned int id) }#endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */ -static int kvmppc_core_vcpu_create_hv (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +static int kvmppc_core_vcpu_create_hv (struct kvm_vcpu *vcpu) {int err;int core;struct kvmppc_vcore *vcore; +struct kvm *kvm; +unsigned int id; - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) -return err; + kvm = vcpu->kvm; + id = vcpu->vcpu_id; vcpu->arch.shared = &vcpu->arch.shregs;#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -2362,7 +2362,7 @@ static int kvmppc_core_vcpu_create_hv(struct kvm *kvm, struct kvm_vcpu *vcpu,mutex_unlock (&kvm->lock);if (!vcore) - goto uninit_vcpu; +return err;spin_lock (&vcore->lock); ++vcore->num_threads;
@@ -2378,10 +2378,6 @@ static int kvmppc_core_vcpu_create_hv(struct kvm *kvm, struct kvm_vcpu *vcpu,debugfs_vcpu_init (vcpu, id);return 0 ; - -uninit_vcpu: -kvm_vcpu_uninit (vcpu); -return err; } static int kvmhv_set_smt_mode(struct kvm *kvm, unsigned long smt_mode,
@@ -2435,7 +2431,6 @@ static void kvmppc_core_vcpu_free_hv(struct kvm_vcpu *vcpu)unpin_vpa (vcpu->kvm, &vcpu->arch.slb_shadow);unpin_vpa (vcpu->kvm, &vcpu->arch.vpa);spin_unlock (&vcpu->arch.vpa_update_lock); -kvm_vcpu_uninit (vcpu); }static int kvmppc_core_check_requests_hv (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/book3s_pr.c +3 -10
@@ -1744,22 +1744,17 @@ static int kvmppc_set_one_reg_pr(struct kvm_vcpu *vcpu, u64 id,return r; } -static int kvmppc_core_vcpu_create_pr (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +static int kvmppc_core_vcpu_create_pr (struct kvm_vcpu *vcpu) {struct kvmppc_vcpu_book3s *vcpu_book3s;unsigned long p;int err; - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) -return err; - err = -ENOMEM ; vcpu_book3s =vzalloc (sizeof (struct kvmppc_vcpu_book3s ));if (!vcpu_book3s) - goto uninit_vcpu; + goto out; vcpu->arch.book3s = vcpu_book3s;#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
@@ -1814,8 +1809,7 @@ static int kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvm_vcpu *vcpu, free_vcpu3s:#endif vfree (vcpu_book3s); -uninit_vcpu: -kvm_vcpu_uninit (vcpu); +out:return err; }
@@ -1824,7 +1818,6 @@ static void kvmppc_core_vcpu_free_pr(struct kvm_vcpu *vcpu)struct kvmppc_vcpu_book3s *vcpu_book3s =to_book3s (vcpu);free_page ((unsigned long )vcpu->arch.shared &PAGE_MASK ); -kvm_vcpu_uninit (vcpu);#ifdef CONFIG_KVM_BOOK3S_32_HANDLER kfree (vcpu->arch.shadow_vcpu);#endif
arch/powerpc/kvm/booke.c +2 -3
@@ -2114,10 +2114,9 @@ int kvmppc_core_init_vm(struct kvm *kvm)return kvm->arch.kvm_ops->init_vm (kvm); } -int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); +return kvm->arch.kvm_ops->vcpu_create (vcpu); }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/e500.c +3 -13
@@ -433,8 +433,7 @@ static int kvmppc_set_one_reg_e500(struct kvm_vcpu *vcpu, u64 id,return r; } -static int kvmppc_core_vcpu_create_e500 (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +static int kvmppc_core_vcpu_create_e500 (struct kvm_vcpu *vcpu) {struct kvmppc_vcpu_e500 *vcpu_e500;int err;
@@ -442,14 +441,8 @@ static int kvmppc_core_vcpu_create_e500(struct kvm *kvm, struct kvm_vcpu *vcpu,BUILD_BUG_ON (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 ); vcpu_e500 =to_e500 (vcpu); - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) -return err; - -if (kvmppc_e500_id_table_alloc (vcpu_e500) =NULL ) { - err = -ENOMEM ; - goto uninit_vcpu; - } +if (kvmppc_e500_id_table_alloc (vcpu_e500) =NULL ) +return -ENOMEM ; err =kvmppc_e500_tlb_init (vcpu_e500);if (err)
@@ -467,8 +460,6 @@ static int kvmppc_core_vcpu_create_e500(struct kvm *kvm, struct kvm_vcpu *vcpu,kvmppc_e500_tlb_uninit (vcpu_e500); uninit_id:kvmppc_e500_id_table_free (vcpu_e500); -uninit_vcpu: -kvm_vcpu_uninit (vcpu);return err; }
@@ -479,7 +470,6 @@ static void kvmppc_core_vcpu_free_e500(struct kvm_vcpu *vcpu)free_page ((unsigned long )vcpu->arch.shared);kvmppc_e500_tlb_uninit (vcpu_e500);kvmppc_e500_id_table_free (vcpu_e500); -kvm_vcpu_uninit (vcpu); }static int kvmppc_core_init_vm_e500 (struct kvm *kvm)
arch/powerpc/kvm/e500mc.c +2 -10
@@ -301,8 +301,7 @@ static int kvmppc_set_one_reg_e500mc(struct kvm_vcpu *vcpu, u64 id,return r; } -static int kvmppc_core_vcpu_create_e500mc (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +static int kvmppc_core_vcpu_create_e500mc (struct kvm_vcpu *vcpu) {struct kvmppc_vcpu_e500 *vcpu_e500;int err;
@@ -310,16 +309,12 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpuBUILD_BUG_ON (offsetof(struct kvmppc_vcpu_e500 , vcpu) !=0 ); vcpu_e500 =to_e500 (vcpu); - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) -return err; -/* Invalid PIR value -- this LPID dosn't have valid state on any cpu */ vcpu->arch.oldpir =0xffffffff ; err =kvmppc_e500_tlb_init (vcpu_e500);if (err) - goto uninit_vcpu; +return err; vcpu->arch.shared = (void *)__get_free_page (GFP_KERNEL | __GFP_ZERO);if (!vcpu->arch.shared) {
@@ -331,8 +326,6 @@ static int kvmppc_core_vcpu_create_e500mc(struct kvm *kvm, struct kvm_vcpu *vcpu uninit_tlb:kvmppc_e500_tlb_uninit (vcpu_e500); -uninit_vcpu: -kvm_vcpu_uninit (vcpu);return err; }
@@ -342,7 +335,6 @@ static void kvmppc_core_vcpu_free_e500mc(struct kvm_vcpu *vcpu)free_page ((unsigned long )vcpu->arch.shared);kvmppc_e500_tlb_uninit (vcpu_e500); -kvm_vcpu_uninit (vcpu); }static int kvmppc_core_init_vm_e500mc (struct kvm *kvm)
arch/powerpc/kvm/powerpc.c +9 -1
@@ -729,14 +729,20 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)if (!vcpu)return ERR_PTR (-ENOMEM ); - err =kvmppc_core_vcpu_create (kvm, vcpu, id); + err =kvm_vcpu_init (vcpu, kvm, id);if (err) goto free_vcpu; + err =kvmppc_core_vcpu_create (vcpu); +if (err) + goto uninit_vcpu; + vcpu->arch.wqp = &vcpu->wq;kvmppc_create_vcpu_debugfs (vcpu, id);return vcpu; +uninit_vcpu: +kvm_vcpu_uninit (vcpu); free_vcpu:kmem_cache_free (kvm_vcpu_cache, vcpu);return ERR_PTR (err);
@@ -770,6 +776,8 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)kvmppc_core_vcpu_free (vcpu); +kvm_vcpu_uninit (vcpu); +kmem_cache_free (kvm_vcpu_cache, vcpu); }
Signature · 1 line
2.24.1
Re: [PATCH v2 15/45] KVM: PPC: Move kvm_vcpu_init() invocation to common code
Quoted 6 lines · Sean Christopherson
Move the kvm_cpu_{un}init() calls to common PPC code as an intermediate step towards removing kvm_cpu_{un}init() altogether.
No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
This doesn't compile:
CC [M] arch/powerpc/kvm/book3s.o/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c: In function ‘kvmppc_core_vcpu_create’:/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c:794:9: error: ‘kvm’ undeclared (first use in this function)
return kvm->arch.kvm_ops->vcpu_create(vcpu);
^/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c:794:9: note: each undeclared identifier is reported only once for each function it appears in /home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c:795:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266: arch/powerpc/kvm/book3s.o] Error 1
Quoted 5 lines
arch/powerpc/kvm/book3s.c +0
-0
arch/powerpc/kvm/book3s.c void kvmppc_decrementer_func(struct kvm_vcpu *vcpu) · line 794
Quoted 9 lines
arch/powerpc/kvm/book3s.c +2
-3@@ -789,10 +789,9 @@ void kvmppc_decrementer_func(struct kvm_vcpu *vcpu)kvm_vcpu_kick (vcpu); } -int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); +return kvm->arch.kvm_ops->vcpu_create (vcpu);
Needs s/kvm/vcpu->kvm/ here.
You also need to change the declaration of the vcpu_create function pointer in the kvmppc_ops struct in kvm_ppc.h to have just the vcpu parameter instead of 3 parameters.
Paul.
Paolo Bonzini
maintainerRe: [PATCH v2 15/45] KVM: PPC: Move kvm_vcpu_init() invocation to common code
Quoted 38 lines · Paul Mackerras
Quoted 6 lines · Sean Christopherson
Move the kvm_cpu_{un}init() calls to common PPC code as an intermediate step towards removing kvm_cpu_{un}init() altogether.
No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>This doesn't compile:
CC [M]
arch/powerpc/kvm/book3s.o/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c: In function ‘kvmppc_core_vcpu_create’:/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c:794:9: error: ‘kvm’ undeclared (first use in this function)return kvm->arch.kvm_ops->vcpu_create(vcpu); ^
/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c:794:9: note: each undeclared identifier is reported only once for each function it appears in/home/paulus/kernel/kvm/arch/powerpc/kvm/book3s.c:795:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266:arch/powerpc/kvm/book3s.o] Error 1Quoted 5 lines
arch/powerpc/kvm/book3s.c +0
-0arch/powerpc/kvm/book3s.c void kvmppc_decrementer_func(struct kvm_vcpu *vcpu) · line 794
Quoted 9 lines
arch/powerpc/kvm/book3s.c +2
-3@@ -789,10 +789,9 @@ void kvmppc_decrementer_func(struct kvm_vcpu *vcpu)kvm_vcpu_kick (vcpu); } -int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); +return kvm->arch.kvm_ops->vcpu_create (vcpu);Needs s/kvm/vcpu->kvm/ here.
Quoted 3 lines
You also need to change the declaration of the
vcpu_createfunction pointer in thekvmppc_opsstruct inkvm_ppc.hto have just the vcpu parameter instead of 3 parameters.
Squashed:
arch/powerpc/include/asm/kvm_ppc.h +1 -2
@@ -273,8 +273,7 @@ struct kvmppc_ops {void (*inject_interrupt)(struct kvm_vcpu *vcpu,int vec,u64 srr1_flags);void (*set_msr)(struct kvm_vcpu *vcpu,u64 msr);int (*vcpu_run)(struct kvm_run *run,struct kvm_vcpu *vcpu); -int (*vcpu_create)(struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id); +int (*vcpu_create)(struct kvm_vcpu *vcpu);void (*vcpu_free)(struct kvm_vcpu *vcpu);int (*check_requests)(struct kvm_vcpu *vcpu);int (*get_dirty_log)(struct kvm *kvm,struct kvm_dirty_log *log);
arch/powerpc/kvm/book3s.c +1 -1
@@ -791,7 +791,7 @@ void kvmppc_decrementer_func(struct kvm_vcpu *vcpu)int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (vcpu); +return vcpu->kvm->arch.kvm_ops->vcpu_create (vcpu); }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
arch/powerpc/kvm/booke.c +1 -1
@@ -2116,7 +2116,7 @@ int kvmppc_core_init_vm(struct kvm *kvm)int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (vcpu); +return vcpu->kvm->arch.kvm_ops->vcpu_create (vcpu); }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
Re: [PATCH v2 15/45] KVM: PPC: Move kvm_vcpu_init() invocation to common code
In reply to Sean ChristophersonQuoted 4 lines · Sean Christopherson
Move the kvm_cpu_{un}init() calls to common PPC code as an intermediate step towards removing kvm_cpu_{un}init() altogether.
No functional change intended.
Another error to fix:
Quoted 5 lines
arch/powerpc/kvm/booke.c +0
-0
arch/powerpc/kvm/booke.c int kvmppc_core_init_vm(struct kvm *kvm) · line 2119
Quoted 9 lines
arch/powerpc/kvm/booke.c +2
-3@@ -2114,10 +2114,9 @@ int kvmppc_core_init_vm(struct kvm *kvm)return kvm->arch.kvm_ops->init_vm (kvm); } -int kvmppc_core_vcpu_create (struct kvm *kvm,struct kvm_vcpu *vcpu, -unsigned int id) +int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (kvm, vcpu, id); +return kvm->arch.kvm_ops->vcpu_create (vcpu);
This also needs s/kvm/vcpu->kvm/.
Paul.
PATCH v2 16/45 KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs
In reply to Sean ChristophersonFor reasons unknown, MIPS configures the vCPU allocation cache but allocates vCPUs via kzalloc(). Allocate from the vCPU cache in preparation for moving vCPU allocation to common KVM code.
--- arch/mips/kvm/mips.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mips/kvm/mips.c +3 -3
@@ -286,7 +286,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)void *gebase, *p, *handler, *refill_start, *refill_end;int i; -struct kvm_vcpu *vcpu =kzalloc (sizeof (struct kvm_vcpu ),GFP_KERNEL ); +struct kvm_vcpu *vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL );if (!vcpu) { err = -ENOMEM ;
@@ -401,7 +401,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)kvm_vcpu_uninit (vcpu); out_free_cpu: -kfree (vcpu); +kmem_cache_free (kvm_vcpu_cache, vcpu); out:return ERR_PTR (err);
@@ -418,7 +418,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)kvm_mmu_free_memory_caches (vcpu);kfree (vcpu->arch.guest_ebase);kfree (vcpu->arch.kseg0_commpage); -kfree (vcpu); +kmem_cache_free (kvm_vcpu_cache, vcpu); }void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu)
Signature · 1 line
2.24.1
PATCH v2 17/45 KVM: MIPS: Drop kvm_arch_vcpu_free()
In reply to Sean ChristophersonRemove the superfluous kvm_arch_vcpu_free() as it is no longer called from commmon KVM code. Note, kvm_arch_vcpu_destroy() *is* called from common code, i.e. choosing which function to whack is not completely arbitrary.
--- arch/mips/kvm/mips.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
arch/mips/kvm/mips.c +2 -7
@@ -156,7 +156,7 @@ void kvm_mips_free_vcpus(struct kvm *kvm)struct kvm_vcpu *vcpu;kvm_for_each_vcpu (i, vcpu, kvm) { -kvm_arch_vcpu_free (vcpu); +kvm_arch_vcpu_destroy (vcpu); }mutex_lock (&kvm->lock);
@@ -407,7 +407,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)return ERR_PTR (err); } -void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) +void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) {hrtimer_cancel (&vcpu->arch.comparecount_timer);
@@ -421,11 +421,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)kmem_cache_free (kvm_vcpu_cache, vcpu); } -void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) -{ -kvm_arch_vcpu_free (vcpu); -} -int kvm_arch_vcpu_ioctl_set_guest_debug (struct kvm_vcpu *vcpu,struct kvm_guest_debug *dbg) {
Signature · 1 line
2.24.1
PATCH v2 18/45 KVM: PPC: Drop kvm_arch_vcpu_free()
In reply to Sean ChristophersonRemove the superfluous kvm_arch_vcpu_free() as it is no longer called from commmon KVM code. Note, kvm_arch_vcpu_destroy() *is* called from common code, i.e. choosing which function to whack is not completely arbitrary.
--- arch/powerpc/kvm/powerpc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
arch/powerpc/kvm/powerpc.c +2 -7
@@ -475,7 +475,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)#endif kvm_for_each_vcpu (i, vcpu, kvm) -kvm_arch_vcpu_free (vcpu); +kvm_arch_vcpu_destroy (vcpu);mutex_lock (&kvm->lock);for (i =0 ; i <atomic_read (&kvm->online_vcpus); i++)
@@ -752,7 +752,7 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) { } -void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) +void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) {/* Make sure we're not using the vcpu anymore */ hrtimer_cancel (&vcpu->arch.dec_timer);
@@ -781,11 +781,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)kmem_cache_free (kvm_vcpu_cache, vcpu); } -void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) -{ -kvm_arch_vcpu_free (vcpu); -} -int kvm_cpu_has_pending_timer (struct kvm_vcpu *vcpu) {return kvmppc_core_pending_dec (vcpu);
Signature · 1 line
2.24.1
PATCH v2 19/45 KVM: arm: Drop kvm_arch_vcpu_free()
In reply to Sean ChristophersonRemove the superfluous kvm_arch_vcpu_free() as it is no longer called from commmon KVM code. Note, kvm_arch_vcpu_destroy() *is* called from common code, i.e. choosing which function to whack is not completely arbitrary.
--- virt/kvm/arm/arm.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
virt/kvm/arm/arm.c +2 -7
@@ -194,7 +194,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)for (i =0 ; i <KVM_MAX_VCPUS ; ++i) {if (kvm->vcpus[i]) { -kvm_arch_vcpu_free (kvm->vcpus[i]); +kvm_arch_vcpu_destroy (kvm->vcpus[i]); kvm->vcpus[i] =NULL ; } }
@@ -321,7 +321,7 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) { } -void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) +void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) {if (vcpu->arch.has_run_once &&unlikely (!irqchip_in_kernel (vcpu->kvm)))static_branch_dec (&userspace_irqchip_in_use);
@@ -333,11 +333,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)kmem_cache_free (kvm_vcpu_cache, vcpu); } -void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) -{ -kvm_arch_vcpu_free (vcpu); -} -int kvm_cpu_has_pending_timer (struct kvm_vcpu *vcpu) {return kvm_timer_is_pending (vcpu);
Signature · 1 line
2.24.1
PATCH v2 20/45 KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path
In reply to Sean Christophersonx86 does not load its MMU until KVM_RUN, which cannot be invoked until after vCPU creation succeeds. Given that kvm_arch_vcpu_destroy() is called if and only if vCPU creation fails, it is impossible for the MMU to be loaded.
Note, the bogus kvm_mmu_unload() call was added during an unrelated refactoring of vCPU allocation, i.e. was presumably added as an opportunstic "fix" for a perceived leak.
--- arch/x86/kvm/x86.c | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/kvm/x86.c +0 -4
@@ -9178,10 +9178,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { vcpu->arch.apf.msr_val =0 ; -vcpu_load (vcpu); -kvm_mmu_unload (vcpu); -vcpu_put (vcpu); -kvm_arch_vcpu_free (vcpu); }
Signature · 1 line
2.24.1
PATCH v2 21/45 KVM: x86: Remove spurious clearing of async #PF MSR
In reply to Sean ChristophersonRemove a bogus clearing of apf.msr_val from kvm_arch_vcpu_destroy().
apf.msr_val is only set to a non-zero value by kvm_pv_enable_async_pf(), which is only reachable by kvm_set_msr_common(), i.e. by writing MSR_KVM_ASYNC_PF_EN. KVM does not autonomously write said MSR, i.e. can only be written via KVM_SET_MSRS or KVM_RUN. Since KVM_SET_MSRS and KVM_RUN are vcpu ioctls, they require a valid vcpu file descriptor. kvm_arch_vcpu_destroy() is only called if KVM_CREATE_VCPU fails, and KVM declares KVM_CREATE_VCPU successful once the vcpu fd is installed and thus visible to userspace. Ergo, apf.msr_val cannot be non-zero when kvm_arch_vcpu_destroy() is called.
--- arch/x86/kvm/x86.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/kvm/x86.c +0 -2
@@ -9176,8 +9176,6 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) { - vcpu->arch.apf.msr_val =0 ; -kvm_arch_vcpu_free (vcpu); }
Signature · 1 line
2.24.1
PATCH v2 22/45 KVM: x86: Drop kvm_arch_vcpu_free()
In reply to Sean ChristophersonRemove the superfluous kvm_arch_vcpu_free() as it is no longer called from commmon KVM code. Note, kvm_arch_vcpu_destroy() *is* called from common code, i.e. choosing which function to whack is not completely arbitrary.
--- arch/x86/kvm/x86.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
arch/x86/kvm/x86.c +11 -16
@@ -9089,20 +9089,6 @@ static void fx_init(struct kvm_vcpu *vcpu) vcpu->arch.cr0 |=X86_CR0_ET ; } -void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu) -{ -kvmclock_reset (vcpu); - - kvm_x86_ops->vcpu_free (vcpu); - -kvm_vcpu_uninit (vcpu); - -free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); -kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); -} -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {
@@ -9176,7 +9162,16 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) { -kvm_arch_vcpu_free (vcpu); +kvmclock_reset (vcpu); + + kvm_x86_ops->vcpu_free (vcpu); + +kvm_vcpu_uninit (vcpu); + +free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); +kmem_cache_free (kvm_vcpu_cache, vcpu); }void kvm_vcpu_reset (struct kvm_vcpu *vcpu,bool init_event)
@@ -9591,7 +9586,7 @@ static void kvm_free_vcpus(struct kvm *kvm)kvm_unload_vcpu_mmu (vcpu); }kvm_for_each_vcpu (i, vcpu, kvm) -kvm_arch_vcpu_free (vcpu); +kvm_arch_vcpu_destroy (vcpu);mutex_lock (&kvm->lock);for (i =0 ; i <atomic_read (&kvm->online_vcpus); i++)
Signature · 1 line
2.24.1
PATCH v2 23/45 KVM: Remove kvm_arch_vcpu_free() declaration
In reply to Sean ChristophersonRemove KVM's declaration of kvm_arch_vcpu_free() now that the function is gone from all architectures (several architectures were relying on the forward declaration).
--- include/linux/kvm_host.h | 1 - 1 file changed, 1 deletion(-)
include/linux/kvm_host.h +0 -1
@@ -872,7 +872,6 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu);void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu); -void kvm_arch_vcpu_free (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu);void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu);struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id);
Signature · 1 line
2.24.1
PATCH v2 24/45 KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues
In reply to Sean ChristophersonAdd a pre-allocation arch hook to handle checks that are currently done by arch specific code prior to allocating the vCPU object. This paves the way for moving the allocation to common KVM code.
--- arch/mips/kvm/mips.c | 5 +++++ arch/powerpc/kvm/powerpc.c | 5 +++++ arch/s390/kvm/kvm-s390.c | 12 ++++++++---- arch/x86/kvm/x86.c | 14 +++++++++----- include/linux/kvm_host.h | 1 + virt/kvm/arm/arm.c | 21 +++++++++++---------- virt/kvm/kvm_main.c | 4 ++++ 7 files changed, 43 insertions(+), 19 deletions(-)
arch/mips/kvm/mips.c +5 -0
@@ -280,6 +280,11 @@ static inline void dump_handler(const char *symbol, void *start, void *end)pr_debug ("\tEND(%s)\n" , symbol); } +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id) +{ +return 0 ; +} +struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {int err, size;
arch/powerpc/kvm/powerpc.c +5 -0
@@ -720,6 +720,11 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm,kvmppc_core_flush_memslot (kvm, slot); } +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id) +{ +return 0 ; +} +struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {struct kvm_vcpu *vcpu;
arch/s390/kvm/kvm-s390.c +8 -4
@@ -3035,15 +3035,19 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)return rc; } +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id) +{ +if (!kvm_is_ucontrol (kvm) && !sca_can_add_vcpu (kvm, id)) +return -EINVAL ; +return 0 ; +} +struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {struct kvm_vcpu *vcpu;struct sie_page *sie_page; -int rc = -EINVAL ; - -if (!kvm_is_ucontrol (kvm) && !sca_can_add_vcpu (kvm, id)) - goto out; +int rc; rc = -ENOMEM ;
arch/x86/kvm/x86.c +9 -5
@@ -9089,17 +9089,21 @@ static void fx_init(struct kvm_vcpu *vcpu) vcpu->arch.cr0 |=X86_CR0_ET ; } +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id) +{ +if (kvm_check_tsc_unstable () &&atomic_read (&kvm->online_vcpus) !=0 ) +pr_warn_once ("kvm: SMP vm created on host with unstable TSC; " +"guest TSC will not be reliable\n" ); + +return 0 ; +} +struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {struct kvm_vcpu *vcpu;int r; -if (kvm_check_tsc_unstable () &&atomic_read (&kvm->online_vcpus) !=0 ) -printk_once (KERN_WARNING -"kvm: SMP vm created on host with unstable TSC; " -"guest TSC will not be reliable\n" ); - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL_ACCOUNT );if (!vcpu)return ERR_PTR (-ENOMEM );
include/linux/kvm_host.h +1 -0
@@ -874,6 +874,7 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu);void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu);void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu); +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id);struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id);int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu);
virt/kvm/arm/arm.c +11 -10
@@ -279,21 +279,22 @@ void kvm_arch_free_vm(struct kvm *kvm)vfree (kvm); } +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id) +{ +if (irqchip_in_kernel (kvm) &&vgic_initialized (kvm)) +return -EBUSY ; + +if (id >= kvm->arch.max_vcpus) +return -EINVAL ; + +return 0 ; +} +struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {int err;struct kvm_vcpu *vcpu; -if (irqchip_in_kernel (kvm) &&vgic_initialized (kvm)) { - err = -EBUSY ; - goto out; - } - -if (id >= kvm->arch.max_vcpus) { - err = -EINVAL ; - goto out; - } - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL );if (!vcpu) { err = -ENOMEM ;
virt/kvm/kvm_main.c +4 -0
@@ -2728,6 +2728,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) kvm->created_vcpus++;mutex_unlock (&kvm->lock); + r =kvm_arch_vcpu_precreate (kvm, id); +if (r) + goto vcpu_decrement; + vcpu =kvm_arch_vcpu_create (kvm, id);if (IS_ERR (vcpu)) { r =PTR_ERR (vcpu);
Signature · 1 line
2.24.1
Re: [PATCH v2 24/45] KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues
Quoted 16 lines · On Wed, 18 Dec 2019 13:55:09 -0800 Sean Christopherson…
Add a pre-allocation arch hook to handle checks that are currently done by arch specific code prior to allocating the vCPU object. This paves the way for moving the allocation to common KVM code.
Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/mips/kvm/mips.c | 5 +++++ arch/powerpc/kvm/powerpc.c | 5 +++++ arch/s390/kvm/kvm-s390.c | 12 ++++++++---- arch/x86/kvm/x86.c | 14 +++++++++----- include/linux/kvm_host.h | 1 + virt/kvm/arm/arm.c | 21 +++++++++++---------- virt/kvm/kvm_main.c | 4 ++++ 7 files changed, 43 insertions(+), 19 deletions(-)
(...)
Quoted 15 lines
arch/s390/kvm/kvm-s390.c +7
-0@@ -3035,15 +3035,19 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)return rc; } +int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id) +{ +if (!kvm_is_ucontrol (kvm) && !sca_can_add_vcpu (kvm, id)) +return -EINVAL ; +return 0 ; +} +
arch/s390/kvm/kvm-s390.c int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) · line 3050
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +1
-4struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) {struct kvm_vcpu *vcpu;struct sie_page *sie_page; -int rc = -EINVAL ; - -if (!kvm_is_ucontrol (kvm) && !sca_can_add_vcpu (kvm, id)) - goto out; +int rc;
You might want to make this
int rc = -ENOMEM;
instead.
arch/s390/kvm/kvm-s390.c int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) · line 3053
Quoted 3 lines
arch/s390/kvm/kvm-s390.c +0
-0rc = -ENOMEM ;
(...)
Regardless,
PATCH v2 25/45 KVM: s390: Move guts of kvm_arch_vcpu_init() into kvm_arch_vcpu_create()
In reply to Sean ChristophersonMove all of kvm_arch_vcpu_init(), which is invoked at the very end of kvm_vcpu_init(), into kvm_arch_vcpu_create() in preparation of moving the call to kvm_vcpu_init(). Moving kvm_vcpu_init() is itself a preparatory step for moving allocation and initialization to common KVM code.
No functional change inteded.
--- arch/s390/kvm/kvm-s390.c | 62 ++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 28 deletions(-)
arch/s390/kvm/kvm-s390.c +34 -28
@@ -2705,34 +2705,6 @@ static int sca_can_add_vcpu(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) { - vcpu->arch.pfault_token =KVM_S390_PFAULT_TOKEN_INVALID ; -kvm_clear_async_pf_completion_queue (vcpu); - vcpu->run->kvm_valid_regs =KVM_SYNC_PREFIX | -KVM_SYNC_GPRS | -KVM_SYNC_ACRS | -KVM_SYNC_CRS | -KVM_SYNC_ARCH0 | -KVM_SYNC_PFAULT ; -kvm_s390_set_prefix (vcpu,0 ); -if (test_kvm_facility (vcpu->kvm,64 )) - vcpu->run->kvm_valid_regs |=KVM_SYNC_RICCB ; -if (test_kvm_facility (vcpu->kvm,82 )) - vcpu->run->kvm_valid_regs |=KVM_SYNC_BPBC ; -if (test_kvm_facility (vcpu->kvm,133 )) - vcpu->run->kvm_valid_regs |=KVM_SYNC_GSCB ; -if (test_kvm_facility (vcpu->kvm,156 )) - vcpu->run->kvm_valid_regs |=KVM_SYNC_ETOKEN ; -/* fprs can be synchronized via vrs, even if the guest has no vx. With -* MACHINE_HAS_VX, (load|store)_fpu_regs() will work with vrs format. -*/ -if (MACHINE_HAS_VX ) - vcpu->run->kvm_valid_regs |=KVM_SYNC_VRS ; -else - vcpu->run->kvm_valid_regs |=KVM_SYNC_FPRS ; - -if (kvm_is_ucontrol (vcpu->kvm)) -return __kvm_ucontrol_vcpu_init (vcpu); -return 0 ; }
@@ -3077,11 +3049,45 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, rc =kvm_vcpu_init (vcpu, kvm, id);if (rc) goto out_free_sie_block; + + vcpu->arch.pfault_token =KVM_S390_PFAULT_TOKEN_INVALID ; +kvm_clear_async_pf_completion_queue (vcpu); + vcpu->run->kvm_valid_regs =KVM_SYNC_PREFIX | +KVM_SYNC_GPRS | +KVM_SYNC_ACRS | +KVM_SYNC_CRS | +KVM_SYNC_ARCH0 | +KVM_SYNC_PFAULT ; +kvm_s390_set_prefix (vcpu,0 ); +if (test_kvm_facility (vcpu->kvm,64 )) + vcpu->run->kvm_valid_regs |=KVM_SYNC_RICCB ; +if (test_kvm_facility (vcpu->kvm,82 )) + vcpu->run->kvm_valid_regs |=KVM_SYNC_BPBC ; +if (test_kvm_facility (vcpu->kvm,133 )) + vcpu->run->kvm_valid_regs |=KVM_SYNC_GSCB ; +if (test_kvm_facility (vcpu->kvm,156 )) + vcpu->run->kvm_valid_regs |=KVM_SYNC_ETOKEN ; +/* fprs can be synchronized via vrs, even if the guest has no vx. With +* MACHINE_HAS_VX, (load|store)_fpu_regs() will work with vrs format. +*/ +if (MACHINE_HAS_VX ) + vcpu->run->kvm_valid_regs |=KVM_SYNC_VRS ; +else + vcpu->run->kvm_valid_regs |=KVM_SYNC_FPRS ; + +if (kvm_is_ucontrol (vcpu->kvm)) { + rc =__kvm_ucontrol_vcpu_init (vcpu); +if (rc) + goto out_uninit_vcpu; + } +VM_EVENT (kvm,3 ,"create cpu %d at 0x%pK, sie block at 0x%pK" , id, vcpu, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block);return vcpu; +out_uninit_vcpu: +kvm_vcpu_uninit (vcpu); out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); out_free_cpu:
Signature · 1 line
2.24.1
Re: [PATCH v2 25/45] KVM: s390: Move guts of kvm_arch_vcpu_init() into kvm_arch_vcpu_create()
Quoted 6 lines · On Wed, 18 Dec 2019 13:55:10 -0800 Sean Christopherson…
Move all of
kvm_arch_vcpu_init(), which is invoked at the very end ofkvm_vcpu_init(), intokvm_arch_vcpu_create()in preparation of moving the call tokvm_vcpu_init(). Movingkvm_vcpu_init()is itself a preparatory step for moving allocation and initialization to common KVM code.
Quoted 6 lines
No functional change inteded.
Signed-off-by Sean Christopherson <[email protected]>--- arch/s390/kvm/kvm-s390.c | 62 ++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 28 deletions(-)
PATCH v2 26/45 KVM: s390: Invoke kvm_vcpu_init() before allocating sie_page
In reply to Sean ChristophersonNow that s390's implementation of kvm_arch_vcpu_init() is empty, move the call to kvm_vcpu_init() above the allocation of the sie_page. This paves the way for moving vcpu allocation and initialization into common KVM code without any associated functional change.
--- arch/s390/kvm/kvm-s390.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
arch/s390/kvm/kvm-s390.c +10 -8
@@ -3027,10 +3027,16 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,if (!vcpu) goto out; + rc =kvm_vcpu_init (vcpu, kvm, id); +if (rc) + goto out_free_cpu; + + rc = -ENOMEM ; +BUILD_BUG_ON (sizeof (struct sie_page ) !=4096 ); sie_page = (struct sie_page *)get_zeroed_page (GFP_KERNEL );if (!sie_page) - goto out_free_cpu; + goto out_uninit_vcpu; vcpu->arch.sie_block = &sie_page->sie_block; vcpu->arch.sie_block->itdba = (unsigned long ) &sie_page->itdb;
@@ -3046,10 +3052,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, vcpu->arch.sie_block->gd |=GISA_FORMAT1 ;seqcount_init (&vcpu->arch.cputm_seqcount); - rc =kvm_vcpu_init (vcpu, kvm, id); -if (rc) - goto out_free_sie_block; - vcpu->arch.pfault_token =KVM_S390_PFAULT_TOKEN_INVALID ;kvm_clear_async_pf_completion_queue (vcpu); vcpu->run->kvm_valid_regs = KVM_SYNC_PREFIX |
@@ -3078,7 +3080,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,if (kvm_is_ucontrol (vcpu->kvm)) { rc =__kvm_ucontrol_vcpu_init (vcpu);if (rc) - goto out_uninit_vcpu; + goto out_free_sie_block; } VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", id, vcpu,
@@ -3086,10 +3088,10 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block);return vcpu; -out_uninit_vcpu: -kvm_vcpu_uninit (vcpu); out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); +out_uninit_vcpu: +kvm_vcpu_uninit (vcpu); out_free_cpu:kmem_cache_free (kvm_vcpu_cache, vcpu); out:
Signature · 1 line
2.24.1
Re: [PATCH v2 26/45] KVM: s390: Invoke kvm_vcpu_init() before allocating sie_page
Quoted 9 lines · On Wed, 18 Dec 2019 13:55:11 -0800 Sean Christopherson…
Now that s390's implementation of
kvm_arch_vcpu_init()is empty, move the call tokvm_vcpu_init()above the allocation of thesie_page. This paves the way for moving vcpu allocation and initialization into common KVM code without any associated functional change.Signed-off-by Sean Christopherson <[email protected]>--- arch/s390/kvm/kvm-s390.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
Seems to be fine.
PATCH v2 27/45 KVM: MIPS: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu
In reply to Sean ChristophersonMove the call to kvm_vcpu_uninit() in kvm_arch_vcpu_destroy() down a few lines so that it is invoked immediately prior to freeing the vCPU. This paves the way for moving the uninit and free sequence to common KVM code without an associated functional change.
--- arch/mips/kvm/mips.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/kvm/mips.c +2 -2
@@ -416,13 +416,13 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) {hrtimer_cancel (&vcpu->arch.comparecount_timer); -kvm_vcpu_uninit (vcpu); -kvm_mips_dump_stats (vcpu);kvm_mmu_free_memory_caches (vcpu);kfree (vcpu->arch.guest_ebase);kfree (vcpu->arch.kseg0_commpage); + +kvm_vcpu_uninit (vcpu);kmem_cache_free (kvm_vcpu_cache, vcpu); }
Signature · 1 line
2.24.1
PATCH v2 28/45 KVM: x86: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu
In reply to Sean ChristophersonMove the call to kvm_vcpu_uninit() in kvm_arch_vcpu_destroy() down a few lines so that it is invoked immediately prior to freeing the vCPU. This paves the way for moving the uninit and free sequence to common KVM code without an associated functional change.
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -9170,11 +9170,11 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) kvm_x86_ops->vcpu_free (vcpu); -kvm_vcpu_uninit (vcpu); -free_cpumask_var (vcpu->arch.wbinvd_dirty_mask);kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); + +kvm_vcpu_uninit (vcpu);kmem_cache_free (kvm_vcpu_cache, vcpu); }
Signature · 1 line
2.24.1
PATCH v2 29/45 KVM: Introduce kvm_vcpu_destroy()
In reply to Sean ChristophersonAdd kvm_vcpu_destroy() and wire up all architectures to call the common function instead of their arch specific implementation. The common destruction function will be used by future patches to move allocation and initialization of vCPUs to common KVM code, i.e. to free resources that are allocated by arch agnostic code.
No functional change intended.
--- arch/mips/kvm/mips.c | 2 +- arch/powerpc/kvm/powerpc.c | 2 +- arch/s390/kvm/kvm-s390.c | 2 +- arch/x86/kvm/x86.c | 2 +- include/linux/kvm_host.h | 1 + virt/kvm/arm/arm.c | 2 +- virt/kvm/kvm_main.c | 6 ++++++ 7 files changed, 12 insertions(+), 5 deletions(-)
arch/mips/kvm/mips.c +1 -1
@@ -156,7 +156,7 @@ void kvm_mips_free_vcpus(struct kvm *kvm)struct kvm_vcpu *vcpu;kvm_for_each_vcpu (i, vcpu, kvm) { -kvm_arch_vcpu_destroy (vcpu); +kvm_vcpu_destroy (vcpu); }mutex_lock (&kvm->lock);
arch/powerpc/kvm/powerpc.c +1 -1
@@ -475,7 +475,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)#endif kvm_for_each_vcpu (i, vcpu, kvm) -kvm_arch_vcpu_destroy (vcpu); +kvm_vcpu_destroy (vcpu);mutex_lock (&kvm->lock);for (i =0 ; i <atomic_read (&kvm->online_vcpus); i++)
arch/s390/kvm/kvm-s390.c +1 -1
@@ -2541,7 +2541,7 @@ static void kvm_free_vcpus(struct kvm *kvm)struct kvm_vcpu *vcpu;kvm_for_each_vcpu (i, vcpu, kvm) -kvm_arch_vcpu_destroy (vcpu); +kvm_vcpu_destroy (vcpu);mutex_lock (&kvm->lock);for (i =0 ; i <atomic_read (&kvm->online_vcpus); i++)
arch/x86/kvm/x86.c +1 -1
@@ -9590,7 +9590,7 @@ static void kvm_free_vcpus(struct kvm *kvm)kvm_unload_vcpu_mmu (vcpu); }kvm_for_each_vcpu (i, vcpu, kvm) -kvm_arch_vcpu_destroy (vcpu); +kvm_vcpu_destroy (vcpu);mutex_lock (&kvm->lock);for (i =0 ; i <atomic_read (&kvm->online_vcpus); i++)
include/linux/kvm_host.h +1 -0
@@ -581,6 +581,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu)int kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id);void kvm_vcpu_uninit (struct kvm_vcpu *vcpu); +void kvm_vcpu_destroy (struct kvm_vcpu *vcpu);void vcpu_load (struct kvm_vcpu *vcpu);void vcpu_put (struct kvm_vcpu *vcpu);
virt/kvm/arm/arm.c +1 -1
@@ -194,7 +194,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)for (i =0 ; i <KVM_MAX_VCPUS ; ++i) {if (kvm->vcpus[i]) { -kvm_arch_vcpu_destroy (kvm->vcpus[i]); +kvm_vcpu_destroy (kvm->vcpus[i]); kvm->vcpus[i] =NULL ; } }
virt/kvm/kvm_main.c +6 -0
@@ -375,6 +375,12 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu) }EXPORT_SYMBOL_GPL (kvm_vcpu_uninit); +void kvm_vcpu_destroy (struct kvm_vcpu *vcpu) +{ +kvm_arch_vcpu_destroy (vcpu); +} +EXPORT_SYMBOL_GPL (kvm_vcpu_destroy); +#if defined(CONFIG_MMU_NOTIFIER ) && defined(KVM_ARCH_WANT_MMU_NOTIFIER )static inline struct kvm *mmu_notifier_to_kvm (struct mmu_notifier *mn) {
Signature · 1 line
2.24.1
Re: [PATCH v2 29/45] KVM: Introduce kvm_vcpu_destroy()
Quoted 10 lines · On Wed, 18 Dec 2019 13:55:14 -0800 Sean Christopherson…
Add
kvm_vcpu_destroy()and wire up all architectures to call the common function instead of their arch specific implementation. The common destruction function will be used by future patches to move allocation and initialization of vCPUs to common KVM code, i.e. to free resources that are allocated by arch agnostic code.No functional change intended.
Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Quoted 9 lines
--- arch/mips/kvm/mips.c | 2 +- arch/powerpc/kvm/powerpc.c | 2 +- arch/s390/kvm/kvm-s390.c | 2 +- arch/x86/kvm/x86.c | 2 +- include/linux/kvm_host.h | 1 + virt/kvm/arm/arm.c | 2 +- virt/kvm/kvm_main.c | 6 ++++++ 7 files changed, 12 insertions(+), 5 deletions(-)
PATCH v2 30/45 KVM: Move vcpu alloc and init invocation to common code
In reply to Sean ChristophersonNow that all architectures tightly couple vcpu allocation/free with the mandatory calls to kvm_{un}init_vcpu(), move the sequences verbatim to common KVM code.
Move both allocation and initialization in a single patch to eliminate thrash in arch specific code. The bisection benefits of moving the two pieces in separate patches is marginal at best, whereas the odds of introducing a transient arch specific bug are non-zero.
--- arch/mips/kvm/mips.c | 33 ++++++--------------------------- arch/powerpc/kvm/powerpc.c | 27 ++++----------------------- arch/s390/kvm/kvm-s390.c | 31 +++++-------------------------- arch/x86/kvm/x86.c | 28 ++-------------------------- include/linux/kvm_host.h | 2 +- virt/kvm/arm/arm.c | 29 ++--------------------------- virt/kvm/kvm_main.c | 21 ++++++++++++++++++--- 7 files changed, 38 insertions(+), 133 deletions(-)
arch/mips/kvm/mips.c +6 -27
@@ -285,25 +285,14 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) {int err, size;void *gebase, *p, *handler, *refill_start, *refill_end;int i; -struct kvm_vcpu *vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); - -if (!vcpu) { - err = -ENOMEM ; - goto out; - } - - err =kvm_vcpu_init (vcpu, kvm, id); - -if (err) - goto out_free_cpu; - -kvm_debug ("kvm @ %p: create cpu %d at %p\n" , kvm, id, vcpu); +kvm_debug ("kvm @ %p: create cpu %d at %p\n" , + vcpu->kvm, vcpu->vcpu_id, vcpu);/* * Allocate space for host mode exception handlers that handle
@@ -318,7 +307,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)if (!gebase) { err = -ENOMEM ; - goto out_uninit_cpu; + goto out; }kvm_debug ("Allocated %d bytes for KVM Exception Handlers @ %p\n" ,ALIGN (size,PAGE_SIZE ), gebase);
@@ -397,19 +386,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) vcpu->arch.last_sched_cpu =-1 ; vcpu->arch.last_exec_cpu =-1 ; -return vcpu; +return 0 ; out_free_gebase:kfree (gebase); - -out_uninit_cpu: -kvm_vcpu_uninit (vcpu); - -out_free_cpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); - out: -return ERR_PTR (err); +return err; }void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu)
@@ -421,9 +403,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)kvm_mmu_free_memory_caches (vcpu);kfree (vcpu->arch.guest_ebase);kfree (vcpu->arch.kseg0_commpage); - -kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); } int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
arch/powerpc/kvm/powerpc.c +4 -23
@@ -725,32 +725,17 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu;int err; - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) -return ERR_PTR (-ENOMEM ); - - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) - goto free_vcpu; - err =kvmppc_core_vcpu_create (vcpu);if (err) - goto uninit_vcpu; +return err; vcpu->arch.wqp = &vcpu->wq; -kvmppc_create_vcpu_debugfs (vcpu, id); -return vcpu; - -uninit_vcpu: -kvm_vcpu_uninit (vcpu); -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); -return ERR_PTR (err); +kvmppc_create_vcpu_debugfs (vcpu, vcpu->vcpu_id); +return 0 ; }void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu)
@@ -780,10 +765,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) }kvmppc_core_vcpu_free (vcpu); - -kvm_vcpu_uninit (vcpu); - -kmem_cache_free (kvm_vcpu_cache, vcpu); }int kvm_cpu_has_pending_timer (struct kvm_vcpu *vcpu)
arch/s390/kvm/kvm-s390.c +5 -26
@@ -2530,9 +2530,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)if (vcpu->kvm->arch.use_cmma)kvm_s390_vcpu_unsetup_cmma (vcpu);free_page ((unsigned long )(vcpu->arch.sie_block)); - -kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); }static void kvm_free_vcpus (struct kvm *kvm)
@@ -3014,29 +3011,15 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm, -unsigned int id) +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu;struct sie_page *sie_page;int rc; - rc = -ENOMEM ; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - - rc =kvm_vcpu_init (vcpu, kvm, id); -if (rc) - goto out_free_cpu; - - rc = -ENOMEM ; -BUILD_BUG_ON (sizeof (struct sie_page ) !=4096 ); sie_page = (struct sie_page *)get_zeroed_page (GFP_KERNEL );if (!sie_page) - goto out_uninit_vcpu; +return -ENOMEM ; vcpu->arch.sie_block = &sie_page->sie_block; vcpu->arch.sie_block->itdba = (unsigned long ) &sie_page->itdb;
@@ -3087,15 +3070,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block); -return vcpu; +return 0 ; + out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); -out_uninit_vcpu: -kvm_vcpu_uninit (vcpu); -out_free_cpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); -out: -return ERR_PTR (rc); +return rc; }int kvm_arch_vcpu_runnable (struct kvm_vcpu *vcpu)
arch/x86/kvm/x86.c +2 -26
@@ -9098,30 +9098,9 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm, -unsigned int id) +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu; -int r; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL_ACCOUNT ); -if (!vcpu) -return ERR_PTR (-ENOMEM ); - - r =kvm_vcpu_init (vcpu, kvm, id); -if (r) - goto free_vcpu; - - r = kvm_x86_ops->vcpu_create (vcpu); -if (r) - goto uninit_vcpu; -return vcpu; - -uninit_vcpu: -kvm_vcpu_uninit (vcpu); -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); -return ERR_PTR (r); +return kvm_x86_ops->vcpu_create (vcpu); }int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu)
@@ -9173,9 +9152,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)free_cpumask_var (vcpu->arch.wbinvd_dirty_mask);kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); - -kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); }void kvm_vcpu_reset (struct kvm_vcpu *vcpu,bool init_event)
include/linux/kvm_host.h +1 -1
@@ -876,7 +876,7 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu);void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu);void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu);int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id); -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id); +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu);int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu);
virt/kvm/arm/arm.c +2 -27
@@ -290,32 +290,9 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -int err; -struct kvm_vcpu *vcpu; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) { - err = -ENOMEM ; - goto out; - } - - err =kvm_vcpu_init (vcpu, kvm, id); -if (err) - goto free_vcpu; - - err =create_hyp_mappings (vcpu, vcpu +1 ,PAGE_HYP ); -if (err) - goto vcpu_uninit; - -return vcpu; -vcpu_uninit: -kvm_vcpu_uninit (vcpu); -free_vcpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); -out: -return ERR_PTR (err); +return create_hyp_mappings (vcpu, vcpu +1 ,PAGE_HYP ); }void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu)
@@ -330,8 +307,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)kvm_mmu_free_memory_caches (vcpu);kvm_timer_vcpu_terminate (vcpu);kvm_pmu_vcpu_destroy (vcpu); -kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); }int kvm_cpu_has_pending_timer (struct kvm_vcpu *vcpu)
virt/kvm/kvm_main.c +18 -3
@@ -378,6 +378,9 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_uninit);void kvm_vcpu_destroy (struct kvm_vcpu *vcpu) {kvm_arch_vcpu_destroy (vcpu); + +kvm_vcpu_uninit (vcpu); +kmem_cache_free (kvm_vcpu_cache, vcpu); }EXPORT_SYMBOL_GPL (kvm_vcpu_destroy);
@@ -2738,12 +2741,20 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)if (r) goto vcpu_decrement; - vcpu =kvm_arch_vcpu_create (kvm, id); -if (IS_ERR (vcpu)) { - r =PTR_ERR (vcpu); + vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); +if (!vcpu) { + r = -ENOMEM ; goto vcpu_decrement; } + r =kvm_vcpu_init (vcpu, kvm, id); +if (r) + goto vcpu_free; + + r =kvm_arch_vcpu_create (vcpu); +if (r) + goto vcpu_uninit; +preempt_notifier_init (&vcpu->preempt_notifier, &kvm_preempt_ops); r =kvm_arch_vcpu_setup (vcpu);
@@ -2787,6 +2798,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)debugfs_remove_recursive (vcpu->debugfs_dentry); vcpu_destroy:kvm_arch_vcpu_destroy (vcpu); +vcpu_uninit: +kvm_vcpu_uninit (vcpu); +vcpu_free: +kmem_cache_free (kvm_vcpu_cache, vcpu); vcpu_decrement:mutex_lock (&kvm->lock); kvm->created_vcpus--;
Signature · 1 line
2.24.1
Re: [PATCH v2 30/45] KVM: Move vcpu alloc and init invocation to common code
Quoted 20 lines · On Wed, 18 Dec 2019 13:55:15 -0800 Sean Christopherson…
Now that all architectures tightly couple vcpu allocation/free with the mandatory calls to kvm_{un}init_vcpu(), move the sequences verbatim to common KVM code.
Move both allocation and initialization in a single patch to eliminate thrash in arch specific code. The bisection benefits of moving the two pieces in separate patches is marginal at best, whereas the odds of introducing a transient arch specific bug are non-zero.
Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/mips/kvm/mips.c | 33 ++++++--------------------------- arch/powerpc/kvm/powerpc.c | 27 ++++----------------------- arch/s390/kvm/kvm-s390.c | 31 +++++-------------------------- arch/x86/kvm/x86.c | 28 ++-------------------------- include/linux/kvm_host.h | 2 +- virt/kvm/arm/arm.c | 29 ++--------------------------- virt/kvm/kvm_main.c | 21 ++++++++++++++++++--- 7 files changed, 38 insertions(+), 133 deletions(-)
(...)
Quoted 52 lines
arch/s390/kvm/kvm-s390.c +3
-20@@ -2530,9 +2530,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)if (vcpu->kvm->arch.use_cmma)kvm_s390_vcpu_unsetup_cmma (vcpu);free_page ((unsigned long )(vcpu->arch.sie_block)); - -kvm_vcpu_uninit (vcpu); -kmem_cache_free (kvm_vcpu_cache, vcpu); }static void kvm_free_vcpus (struct kvm *kvm)@@ -3014,29 +3011,15 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } -struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm, -unsigned int id) +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu;struct sie_page *sie_page;int rc; - rc = -ENOMEM ; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - - rc =kvm_vcpu_init (vcpu, kvm, id); -if (rc) - goto out_free_cpu; - - rc = -ENOMEM ; -BUILD_BUG_ON (sizeof (struct sie_page ) !=4096 ); sie_page = (struct sie_page *)get_zeroed_page (GFP_KERNEL );if (!sie_page) - goto out_uninit_vcpu; +return -ENOMEM ; vcpu->arch.sie_block = &sie_page->sie_block; vcpu->arch.sie_block->itdba = (unsigned long ) &sie_page->itdb;@@ -3087,15 +3070,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block); -return vcpu; +return 0 ;
arch/s390/kvm/kvm-s390.c struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, · line 3077
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +2
-6+ out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); -out_uninit_vcpu: -kvm_vcpu_uninit (vcpu); -out_free_cpu: -kmem_cache_free (kvm_vcpu_cache, vcpu); -out: -return ERR_PTR (rc); +return rc;
This is getting a bit hard to follow across the patches, but I think rc is now only set for ucontrol guests. So this looks correct right now, but feels a bit brittle... should we maybe init rc to 0 and always return rc instead?
arch/s390/kvm/kvm-s390.c struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, · line 3080
Quoted 3 lines
arch/s390/kvm/kvm-s390.c +0
-0}int kvm_arch_vcpu_runnable (struct kvm_vcpu *vcpu)
Otherwise, looks good.
Re: [PATCH v2 30/45] KVM: Move vcpu alloc and init invocation to common code
Quoted 41 lines · Cornelia Huck
Quoted 39 lines · On Wed, 18 Dec 2019 13:55:15 -0800 Sean Christopherson…
arch/s390/kvm/kvm-s390.c +4
-19+int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu;struct sie_page *sie_page;int rc; - rc = -ENOMEM ; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - - rc =kvm_vcpu_init (vcpu, kvm, id); -if (rc) - goto out_free_cpu; - - rc = -ENOMEM ; -BUILD_BUG_ON (sizeof (struct sie_page ) !=4096 ); sie_page = (struct sie_page *)get_zeroed_page (GFP_KERNEL );if (!sie_page) - goto out_uninit_vcpu; +return -ENOMEM ; vcpu->arch.sie_block = &sie_page->sie_block; vcpu->arch.sie_block->itdba = (unsigned long ) &sie_page->itdb;@@ -3087,15 +3070,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block); -return vcpu; +return 0 ; + out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); -out_uninit_vcpu: -kvm_vcpu_uninit (vcpu); -out_free_cpu: -kmem_cache_free (kvm_vcpu_cache, vcpu);
Quoted 8 lines
arch/s390/kvm/kvm-s390.c struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, · line 3077
Quoted 3 lines
arch/s390/kvm/kvm-s390.c +1
-2-out: -return ERR_PTR (rc); +return rc;This is getting a bit hard to follow across the patches, but I think rc is now only set for ucontrol guests. So this looks correct right now, but feels a bit brittle... should we maybe init rc to 0 and always return rc instead?
Yes, but only for a few patches until kvm_s390_vcpu_setup() is introduced, at which point @rc is unconditionally set at the end.
rc = kvm_s390_vcpu_setup(vcpu);
if (rc)
goto out_free_ucontrol_gmap;
return 0;My personal preference is to use "return 0;" when the return is known to be zero as it makes the success path obvious at a glance. I also didn't want to intialize @rc at he beginning because then the sie_page allocation would look a bit funky:
int rc = 0;
BUILD_BUG_ON(sizeof(struct sie_page) != 4096);
sie_page = (struct sie_page *) get_zeroed_page(GFP_KERNEL);
if (!sie_page)
return -ENOMEM;An alternative would be to init @rc to -ENOMEM:
int rc = -ENOMEM;
BUILD_BUG_ON(sizeof(struct sie_page) != 4096);
sie_page = (struct sie_page *) get_zeroed_page(GFP_KERNEL);
if (!sie_page)
return rc;This would be my preference if you'd prefer to init @rc right away, especially if __kvm_ucontrol_vcpu_init() is open coded here (discussion in patch 35, "KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()", e.g.:
int rc = -ENOMEM;
BUILD_BUG_ON(sizeof(struct sie_page) != 4096);
sie_page = (struct sie_page *) get_zeroed_page(GFP_KERNEL);
if (!sie_page)
return rc;
...
if (kvm_is_ucontrol(vcpu->kvm)) {
vcpu->arch.gmap = gmap_create(current->mm, -1UL);
if (!vcpu->arch.gmap)
goto out_free_sie_block;
vcpu->arch.gmap->private = vcpu->kvm;
}
VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", id, vcpu,
vcpu->arch.sie_block);
trace_kvm_s390_create_vcpu(id, vcpu, vcpu->arch.sie_block);
rc = kvm_s390_vcpu_setup(vcpu);
if (rc)
goto out_free_ucontrol_gmap;
return 0;out_free_ucontrol_gmap:
if (kvm_is_ucontrol(vcpu->kvm))
gmap_remove(vcpu->arch.gmap);
out_free_sie_block:
free_page((unsigned long)(vcpu->arch.sie_block));
return rc;Cornelia Huck
Reviewed-byRe: [PATCH v2 30/45] KVM: Move vcpu alloc and init invocation to common code
Quoted 51 lines · On Fri, 20 Dec 2019 07:53:30 -0800 Sean Christopherson…
Quoted 41 lines · Cornelia Huck
Quoted 39 lines · On Wed, 18 Dec 2019 13:55:15 -0800 Sean Christopherson…
arch/s390/kvm/kvm-s390.c +4
-19+int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu;struct sie_page *sie_page;int rc; - rc = -ENOMEM ; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - - rc =kvm_vcpu_init (vcpu, kvm, id); -if (rc) - goto out_free_cpu; - - rc = -ENOMEM ; -BUILD_BUG_ON (sizeof (struct sie_page ) !=4096 ); sie_page = (struct sie_page *)get_zeroed_page (GFP_KERNEL );if (!sie_page) - goto out_uninit_vcpu; +return -ENOMEM ; vcpu->arch.sie_block = &sie_page->sie_block; vcpu->arch.sie_block->itdba = (unsigned long ) &sie_page->itdb;@@ -3087,15 +3070,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block); -return vcpu; +return 0 ; + out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); -out_uninit_vcpu: -kvm_vcpu_uninit (vcpu); -out_free_cpu: -kmem_cache_free (kvm_vcpu_cache, vcpu);Quoted 8 lines
arch/s390/kvm/kvm-s390.c struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, · line 3077
Quoted 3 lines
arch/s390/kvm/kvm-s390.c +1
-2-out: -return ERR_PTR (rc); +return rc;This is getting a bit hard to follow across the patches, but I think rc is now only set for ucontrol guests. So this looks correct right now, but feels a bit brittle... should we maybe init rc to 0 and always return rc instead?
Quoted 2 lines
Yes, but only for a few patches until
kvm_s390_vcpu_setup()is introduced, at which point @rc is unconditionally set at the end.
Indeed; so feel free to leave this as-is.
Re: [PATCH v2 30/45] KVM: Move vcpu alloc and init invocation to common code
In reply to Sean ChristophersonQuoted 12 lines · Sean Christopherson
Now that all architectures tightly couple vcpu allocation/free with the mandatory calls to kvm_{un}init_vcpu(), move the sequences verbatim to common KVM code.
Move both allocation and initialization in a single patch to eliminate thrash in arch specific code. The bisection benefits of moving the two pieces in separate patches is marginal at best, whereas the odds of introducing a transient arch specific bug are non-zero.
Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>Reviewed-by Cornelia Huck <[email protected]>
[ ... ]
Quoted 5 lines
arch/s390/kvm/kvm-s390.c +0
-0
[ ... ]
arch/s390/kvm/kvm-s390.c
Quoted 2 lines
arch/s390/kvm/kvm-s390.c +0
-2-struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm, -unsigned int id)
^^^^^^^^^^^^^^^
Quoted 27 lines
arch/s390/kvm/kvm-s390.c +2
-14+int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -struct kvm_vcpu *vcpu;struct sie_page *sie_page;int rc; - rc = -ENOMEM ; - - vcpu =kmem_cache_zalloc (kvm_vcpu_cache,GFP_KERNEL ); -if (!vcpu) - goto out; - - rc =kvm_vcpu_init (vcpu, kvm, id); -if (rc) - goto out_free_cpu; - - rc = -ENOMEM ; -BUILD_BUG_ON (sizeof (struct sie_page ) !=4096 ); sie_page = (struct sie_page *)get_zeroed_page (GFP_KERNEL );if (!sie_page) - goto out_uninit_vcpu; +return -ENOMEM ; vcpu->arch.sie_block = &sie_page->sie_block; vcpu->arch.sie_block->itdba = (unsigned long ) &sie_page->itdb;
arch/s390/kvm/kvm-s390.c struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, · line 3071
Quoted 2 lines
arch/s390/kvm/kvm-s390.c +0
-0@@ -3087,15 +3070,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block);
^^^
For extensive changes like this, wouldn't it be desirable to at least compile test it ?
Guenter
PATCH v2 31/45 KVM: Unexport kvm_vcpu_cache and kvm_vcpu_{un}init()
In reply to Sean ChristophersonUnexport kvm_vcpu_cache and kvm_vcpu_{un}init() and make them static now that they are referenced only in kvm_main.c.
--- include/linux/kvm_host.h | 4 ---- virt/kvm/kvm_main.c | 9 +++------ 2 files changed, 3 insertions(+), 10 deletions(-)
include/linux/kvm_host.h +0 -4
@@ -157,8 +157,6 @@ static inline bool is_error_page(struct page *page)#define KVM_USERSPACE_IRQ_SOURCE_ID 0#define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID 1 -extern struct kmem_cache *kvm_vcpu_cache; -extern struct mutex kvm_lock;extern struct list_head vm_list;
@@ -579,8 +577,6 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu) memslot < slots->memslots +KVM_MEM_SLOTS_NUM && memslot->npages;\ memslot++) -int kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id); -void kvm_vcpu_uninit (struct kvm_vcpu *vcpu);void kvm_vcpu_destroy (struct kvm_vcpu *vcpu);void vcpu_load (struct kvm_vcpu *vcpu);
virt/kvm/kvm_main.c +3 -6
@@ -104,8 +104,7 @@ static cpumask_var_t cpus_hardware_enabled;static int kvm_usage_count;static atomic_t hardware_enable_failed; -struct kmem_cache *kvm_vcpu_cache; -EXPORT_SYMBOL_GPL (kvm_vcpu_cache); +static struct kmem_cache *kvm_vcpu_cache;static __read_mostly struct preempt_ops kvm_preempt_ops;
@@ -322,7 +321,7 @@ void kvm_reload_remote_mmus(struct kvm *kvm)kvm_make_all_cpus_request (kvm,KVM_REQ_MMU_RELOAD ); } -int kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id) +static int kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id) {struct page *page;int r;
@@ -360,9 +359,8 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) fail:return r; } -EXPORT_SYMBOL_GPL (kvm_vcpu_init); -void kvm_vcpu_uninit (struct kvm_vcpu *vcpu) +static void kvm_vcpu_uninit (struct kvm_vcpu *vcpu) {/* * no need for rcu_read_lock as VCPU_RUN is the only place that
@@ -373,7 +371,6 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu)kvm_arch_vcpu_uninit (vcpu);free_page ((unsigned long )vcpu->run); } -EXPORT_SYMBOL_GPL (kvm_vcpu_uninit);void kvm_vcpu_destroy (struct kvm_vcpu *vcpu) {
Signature · 1 line
2.24.1
Re: [PATCH v2 31/45] KVM: Unexport kvm_vcpu_cache and kvm_vcpu_{un}init()
Quoted 9 lines · On Wed, 18 Dec 2019 13:55:16 -0800 Sean Christopherson…
Unexport
kvm_vcpu_cacheand kvm_vcpu_{un}init() and make them static now that they are referenced only inkvm_main.c.Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- include/linux/kvm_host.h | 4 ---- virt/kvm/kvm_main.c | 9 +++------ 2 files changed, 3 insertions(+), 10 deletions(-)
PATCH v2 32/45 KVM: Move initialization of preempt notifier to kvm_vcpu_init()
In reply to Sean ChristophersonInitialize the preempt notifier immediately in kvm_vcpu_init() to pave the way for removing kvm_arch_vcpu_setup(), i.e. to allow arch specific code to call vcpu_load() during kvm_arch_vcpu_create().
Back when preemption support was added, the location of the call to init the preempt notifier was perfectly sane. The overall vCPU creation flow featured a single arch specific hook and the preempt notifer was used immediately after its initialization (by vcpu_load()). E.g.:
vcpu = kvm_arch_ops->vcpu_create(kvm, n);
if (IS_ERR(vcpu))
return PTR_ERR(vcpu);
preempt_notifier_init(&vcpu->preempt_notifier, &kvm_preempt_ops);
vcpu_load(vcpu);
r = kvm_mmu_setup(vcpu);
vcpu_put(vcpu);
if (r < 0)
goto free_vcpu;Today, the call to preempt_notifier_init() is sandwiched between two arch specific calls, kvm_arch_vcpu_create() and kvm_arch_vcpu_setup(), which needlessly forces x86 (and possibly others?) to split its vCPU creation flow. Init the preempt notifier prior to any arch specific call so that each arch can independently decide how best to organize its creation flow.
--- virt/kvm/kvm_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
virt/kvm/kvm_main.c +1 -2
@@ -348,6 +348,7 @@ static int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)kvm_vcpu_set_dy_eligible (vcpu, false); vcpu->preempted = false; vcpu->ready = false; +preempt_notifier_init (&vcpu->preempt_notifier, &kvm_preempt_ops); r =kvm_arch_vcpu_init (vcpu);if (r <0 )
@@ -2752,8 +2753,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)if (r) goto vcpu_uninit; -preempt_notifier_init (&vcpu->preempt_notifier, &kvm_preempt_ops); - r =kvm_arch_vcpu_setup (vcpu);if (r) goto vcpu_destroy;
Signature · 1 line
2.24.1
Re: [PATCH v2 32/45] KVM: Move initialization of preempt notifier to kvm_vcpu_init()
Quoted 28 lines · On Wed, 18 Dec 2019 13:55:17 -0800 Sean Christopherson…
Initialize the preempt notifier immediately in
kvm_vcpu_init()to pave the way for removingkvm_arch_vcpu_setup(), i.e. to allow arch specific code to callvcpu_load()duringkvm_arch_vcpu_create().Back when preemption support was added, the location of the call to init the preempt notifier was perfectly sane. The overall vCPU creation flow featured a single arch specific hook and the preempt notifer was used immediately after its initialization (by
vcpu_load()). E.g.:vcpu = kvm_arch_ops->vcpu_create(kvm, n); if (IS_ERR(vcpu)) return PTR_ERR(vcpu); preempt_notifier_init(&vcpu->preempt_notifier, &kvm_preempt_ops); vcpu_load(vcpu); r = kvm_mmu_setup(vcpu); vcpu_put(vcpu); if (r < 0) goto free_vcpu;Today, the call to
preempt_notifier_init()is sandwiched between two arch specific calls,kvm_arch_vcpu_create()andkvm_arch_vcpu_setup(), which needlessly forces x86 (and possibly others?) to split its vCPU creation flow. Init the preempt notifier prior to any arch specific call so that each arch can independently decide how best to organize its creation flow.
Quoted 5 lines
Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- virt/kvm/kvm_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
PATCH v2 33/45 KVM: x86: Move guts of kvm_arch_vcpu_setup() into kvm_arch_vcpu_create()
In reply to Sean ChristophersonFold setup() into create() now that the two are called back-to-back by common KVM code. This paves the way for removing kvm_arch_vcpu_setup().
--- arch/x86/kvm/x86.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +10 -4
@@ -9100,11 +9100,12 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm_x86_ops->vcpu_create (vcpu); -} +int ret; + + ret = kvm_x86_ops->vcpu_create (vcpu); +if (ret) +return ret; -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ vcpu->arch.arch_capabilities =kvm_get_arch_capabilities (); vcpu->arch.msr_platform_info =MSR_PLATFORM_INFO_CPUID_FAULT ;kvm_vcpu_mtrr_init (vcpu);
@@ -9115,6 +9116,11 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)return 0 ; } +int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) +{ +return 0 ; +} +void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu) {struct msr_data msr;
Signature · 1 line
2.24.1
PATCH v2 34/45 KVM: MIPS: Move .vcpu_setup() call to kvm_arch_vcpu_create()
In reply to Sean ChristophersonFold setup() into create() now that the two are called back-to-back by common KVM code. This paves the way for removing kvm_arch_vcpu_setup(). Note, there is no unwind function associated with kvm_arch_vcpu_setup(), i.e. no teardown path that also needs to be moved.
No functional change intended.
--- arch/mips/kvm/mips.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/mips/kvm/mips.c +8 -2
@@ -386,8 +386,15 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) vcpu->arch.last_sched_cpu =-1 ; vcpu->arch.last_exec_cpu =-1 ; +/* Initial guest state */ + err = kvm_mips_callbacks->vcpu_setup (vcpu); +if (err) + goto out_free_commpage; +return 0 ; +out_free_commpage: +kfree (vcpu->arch.kseg0_commpage); out_free_gebase:kfree (gebase); out:
@@ -1237,10 +1244,9 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,return 0 ; } -/* Initial guest state */ int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) { -return kvm_mips_callbacks->vcpu_setup (vcpu); +return 0 ; }static void kvm_mips_set_c0_status (void )
Signature · 1 line
2.24.1
PATCH v2 35/45 KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()
In reply to Sean ChristophersonRename kvm_arch_vcpu_setup() to kvm_s390_vcpu_setup() and manually call the new function during kvm_arch_vcpu_create(). Define an empty kvm_arch_vcpu_setup() as it's still required for compilation. This is effectively a nop as kvm_arch_vcpu_create() and kvm_arch_vcpu_setup() are called back-to-back by common KVM code. Obsoleting kvm_arch_vcpu_setup() paves the way for its removal.
Note, gmap_remove() is now called if setup fails, as s390 was previously freeing it via kvm_arch_vcpu_destroy(), which is called by common KVM code if kvm_arch_vcpu_setup() fails.
No functional change intended.
--- arch/s390/kvm/kvm-s390.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/s390/kvm/kvm-s390.c +11 -0
@@ -2932,6 +2932,11 @@ static void kvm_s390_vcpu_setup_model(struct kvm_vcpu *vcpu) }int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) +{ +return 0 ; +} + +static int kvm_s390_vcpu_setup (struct kvm_vcpu *vcpu) {int rc =0 ;
@@ -3070,8 +3075,14 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (id, vcpu, vcpu->arch.sie_block); + rc =kvm_s390_vcpu_setup (vcpu); +if (rc) + goto out_ucontrol_uninit;return 0 ; +out_ucontrol_uninit: +if (kvm_is_ucontrol (vcpu->kvm)) +gmap_remove (vcpu->arch.gmap); out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block));return rc;
Signature · 1 line
2.24.1
Re: [PATCH v2 35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()
Quoted 10 lines · On Wed, 18 Dec 2019 13:55:20 -0800 Sean Christopherson…
Rename
kvm_arch_vcpu_setup()tokvm_s390_vcpu_setup()and manually call the new function duringkvm_arch_vcpu_create(). Define an emptykvm_arch_vcpu_setup()as it's still required for compilation. This is effectively a nop askvm_arch_vcpu_create()andkvm_arch_vcpu_setup()are called back-to-back by common KVM code. Obsoletingkvm_arch_vcpu_setup()paves the way for its removal.Note,
gmap_remove()is now called if setup fails, as s390 was previously freeing it viakvm_arch_vcpu_destroy(), which is called by common KVM code ifkvm_arch_vcpu_setup()fails.
Yes, this looks like the only thing that needs to be undone (sca_add_vcpu() is done later in the process.)
Maybe mention that gmap_remove() is for ucontrol only? I was confused for a moment :)
Quoted 7 lines
No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>--- arch/s390/kvm/kvm-s390.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
Re: [PATCH v2 35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()
Quoted 14 lines · Cornelia Huck
Quoted 10 lines · On Wed, 18 Dec 2019 13:55:20 -0800 Sean Christopherson…
Rename
kvm_arch_vcpu_setup()tokvm_s390_vcpu_setup()and manually call the new function duringkvm_arch_vcpu_create(). Define an emptykvm_arch_vcpu_setup()as it's still required for compilation. This is effectively a nop askvm_arch_vcpu_create()andkvm_arch_vcpu_setup()are called back-to-back by common KVM code. Obsoletingkvm_arch_vcpu_setup()paves the way for its removal.Note,
gmap_remove()is now called if setup fails, as s390 was previously freeing it viakvm_arch_vcpu_destroy(), which is called by common KVM code ifkvm_arch_vcpu_setup()fails.
Quoted 5 lines
Yes, this looks like the only thing that needs to be undone (
sca_add_vcpu()is done later in the process.)Maybe mention that
gmap_remove()is for ucontrol only? I was confused for a moment :)
Will do.
Would it also make sense to open code __kvm_ucontrol_vcpu_init() in a separate patch immediately preceding this change? That'd make it a little more obvious why gmap_remove() is called, and it would eliminate the "uninit" verbiage in the label, e.g.:
if (kvm_is_ucontrol(vcpu->kvm)) {
vcpu->arch.gmap = gmap_create(current->mm, -1UL);
if (!vcpu->arch.gmap) {
rc = -ENOMEM;
goto out_free_sie_block;
}
vcpu->arch.gmap->private = vcpu->kvm;
}
VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", id, vcpu,
vcpu->arch.sie_block);
trace_kvm_s390_create_vcpu(id, vcpu, vcpu->arch.sie_block);
rc = kvm_s390_vcpu_setup(vcpu);
if (rc)
goto out_free_ucontrol_gmap;
return 0;out_free_ucontrol_gmap:
if (kvm_is_ucontrol(vcpu->kvm))
gmap_remove(vcpu->arch.gmap);
out_free_sie_block:
free_page((unsigned long)(vcpu->arch.sie_block));
return rc;
}Re: [PATCH v2 35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()
Quoted 21 lines · On Fri, 20 Dec 2019 07:56:07 -0800 Sean Christopherson…
Quoted 14 lines · Cornelia Huck
Quoted 10 lines · On Wed, 18 Dec 2019 13:55:20 -0800 Sean Christopherson…
Rename
kvm_arch_vcpu_setup()tokvm_s390_vcpu_setup()and manually call the new function duringkvm_arch_vcpu_create(). Define an emptykvm_arch_vcpu_setup()as it's still required for compilation. This is effectively a nop askvm_arch_vcpu_create()andkvm_arch_vcpu_setup()are called back-to-back by common KVM code. Obsoletingkvm_arch_vcpu_setup()paves the way for its removal.Note,
gmap_remove()is now called if setup fails, as s390 was previously freeing it viakvm_arch_vcpu_destroy(), which is called by common KVM code ifkvm_arch_vcpu_setup()fails.Quoted 5 lines
Yes, this looks like the only thing that needs to be undone (
sca_add_vcpu()is done later in the process.)Maybe mention that
gmap_remove()is for ucontrol only? I was confused for a moment :)
Quoted 6 lines
Will do.
Would it also make sense to open code
__kvm_ucontrol_vcpu_init()in a separate patch immediately preceding this change? That'd make it a little more obvious whygmap_remove()is called, and it would eliminate the "uninit" verbiage in the label, e.g.:
I'm a bit undecided here; especially as I'm not sure if there are any future plans with ucontrol. I'll leave that for Christian and Janosch to decide.
Re: [PATCH v2 35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create()
Quoted 26 lines · Cornelia Huck
Quoted 23 lines · On Fri, 20 Dec 2019 07:56:07 -0800 Sean Christopherson…
Quoted 14 lines · Cornelia Huck
Quoted 10 lines · On Wed, 18 Dec 2019 13:55:20 -0800 Sean Christopherson…
Rename
kvm_arch_vcpu_setup()tokvm_s390_vcpu_setup()and manually call the new function duringkvm_arch_vcpu_create(). Define an emptykvm_arch_vcpu_setup()as it's still required for compilation. This is effectively a nop askvm_arch_vcpu_create()andkvm_arch_vcpu_setup()are called back-to-back by common KVM code. Obsoletingkvm_arch_vcpu_setup()paves the way for its removal.Note,
gmap_remove()is now called if setup fails, as s390 was previously freeing it viakvm_arch_vcpu_destroy(), which is called by common KVM code ifkvm_arch_vcpu_setup()fails.Quoted 5 lines
Yes, this looks like the only thing that needs to be undone (
sca_add_vcpu()is done later in the process.)Maybe mention that
gmap_remove()is for ucontrol only? I was confused for a moment :)Will do.
Quoted 8 lines
Quoted 4 lines
Would it also make sense to open code
__kvm_ucontrol_vcpu_init()in a separate patch immediately preceding this change? That'd make it a little more obvious whygmap_remove()is called, and it would eliminate the "uninit" verbiage in the label, e.g.:I'm a bit undecided here; especially as I'm not sure if there are any future plans with ucontrol. I'll leave that for Christian and Janosch to decide.
Sounds good. Thanks for the reviews!
PATCH v2 36/45 KVM: PPC: BookE: Setup vcpu during kvmppc_core_vcpu_create()
In reply to Sean ChristophersonFold setup() into create() now that the two are called back-to-back by common KVM code. This paves the way for removing kvm_arch_vcpu_setup(). Note, BookE directly implements kvm_arch_vcpu_setup() and PPC's common kvm_arch_vcpu_create() is responsible for its own cleanup, thus the only cleanup required when directly invoking kvmppc_core_vcpu_setup() is to call .vcpu_free(), which is the BookE specific portion of PPC's kvm_arch_vcpu_destroy() by way of kvmppc_core_vcpu_free().
No functional change intended.
--- arch/powerpc/kvm/booke.c | 60 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 27 deletions(-)
arch/powerpc/kvm/booke.c +33 -27
@@ -1377,34 +1377,9 @@ static void kvmppc_set_tsr(struct kvm_vcpu *vcpu, u32 new_tsr)update_timer_ints (vcpu); } -/* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */ int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) { -int i; -int r; - - vcpu->arch.regs.nip =0 ; - vcpu->arch.shared->pir = vcpu->vcpu_id; -kvmppc_set_gpr (vcpu,1 , (16 <<20 ) -8 );/* -8 for the callee-save LR slot */ -kvmppc_set_msr (vcpu,0 ); - -#ifndef CONFIG_KVM_BOOKE_HV - vcpu->arch.shadow_msr =MSR_USER |MSR_IS |MSR_DS ; - vcpu->arch.shadow_pid =1 ; - vcpu->arch.shared->msr =0 ; -#endif - -/* Eye-catching numbers so we know if the guest takes an interrupt -* before it's programmed its own IVPR/IVORs. */ - vcpu->arch.ivpr =0x55550000 ; -for (i =0 ; i <BOOKE_IRQPRIO_MAX ; i++) - vcpu->arch.ivor[i] =0x7700 | i *4 ; - -kvmppc_init_timing_stats (vcpu); - - r =kvmppc_core_vcpu_setup (vcpu); -kvmppc_sanity_check (vcpu); -return r; +return 0 ; }int kvmppc_subarch_vcpu_init (struct kvm_vcpu *vcpu)
@@ -2116,7 +2091,38 @@ int kvmppc_core_init_vm(struct kvm *kvm)int kvmppc_core_vcpu_create (struct kvm_vcpu *vcpu) { -return kvm->arch.kvm_ops->vcpu_create (vcpu); +int i; +int r; + + r = kvm->arch.kvm_ops->vcpu_create (vcpu); +if (r) +return r; + +/* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */ + vcpu->arch.regs.nip =0 ; + vcpu->arch.shared->pir = vcpu->vcpu_id; +kvmppc_set_gpr (vcpu,1 , (16 <<20 ) -8 );/* -8 for the callee-save LR slot */ +kvmppc_set_msr (vcpu,0 ); + +#ifndef CONFIG_KVM_BOOKE_HV + vcpu->arch.shadow_msr =MSR_USER |MSR_IS |MSR_DS ; + vcpu->arch.shadow_pid =1 ; + vcpu->arch.shared->msr =0 ; +#endif + +/* Eye-catching numbers so we know if the guest takes an interrupt +* before it's programmed its own IVPR/IVORs. */ + vcpu->arch.ivpr =0x55550000 ; +for (i =0 ; i <BOOKE_IRQPRIO_MAX ; i++) + vcpu->arch.ivor[i] =0x7700 | i *4 ; + +kvmppc_init_timing_stats (vcpu); + + r =kvmppc_core_vcpu_setup (vcpu); +if (r) + vcpu->kvm->arch.kvm_ops->vcpu_free (vcpu); +kvmppc_sanity_check (vcpu); +return r; }void kvmppc_core_vcpu_free (struct kvm_vcpu *vcpu)
Signature · 1 line
2.24.1
PATCH v2 37/45 KVM: Drop kvm_arch_vcpu_setup()
In reply to Sean ChristophersonRemove kvm_arch_vcpu_setup() now that all arch specific implementations are nops.
--- arch/arm/kvm/guest.c | 5 ----- arch/arm64/kvm/guest.c | 5 ----- arch/mips/kvm/mips.c | 5 ----- arch/powerpc/kvm/book3s.c | 5 ----- arch/powerpc/kvm/booke.c | 5 ----- arch/s390/kvm/kvm-s390.c | 5 ----- arch/x86/kvm/x86.c | 5 ----- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 5 ----- 9 files changed, 41 deletions(-)
arch/arm/kvm/guest.c +0 -5
@@ -34,11 +34,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { { NULL } }; -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -static u64 core_reg_offset_from_id (u64 id) {return id & ~(KVM_REG_ARCH_MASK |KVM_REG_SIZE_MASK |KVM_REG_ARM_CORE );
arch/arm64/kvm/guest.c +0 -5
@@ -47,11 +47,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { { NULL } }; -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -static bool core_reg_offset_is_vreg (u64 off) { return off >= KVM_REG_ARM_CORE_REG(fp_regs.vregs) &&
arch/mips/kvm/mips.c +0 -5
@@ -1244,11 +1244,6 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,return 0 ; } -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -static void kvm_mips_set_c0_status (void ) {u32 status =read_c0_status ();
arch/powerpc/kvm/book3s.c +0 -5
@@ -471,11 +471,6 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, }EXPORT_SYMBOL_GPL (kvmppc_load_last_inst); -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -int kvmppc_subarch_vcpu_init (struct kvm_vcpu *vcpu) {return 0 ;
arch/powerpc/kvm/booke.c +0 -5
@@ -1377,11 +1377,6 @@ static void kvmppc_set_tsr(struct kvm_vcpu *vcpu, u32 new_tsr)update_timer_ints (vcpu); } -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -int kvmppc_subarch_vcpu_init (struct kvm_vcpu *vcpu) {/* setup watchdog timer once */
arch/s390/kvm/kvm-s390.c +0 -5
@@ -2931,11 +2931,6 @@ static void kvm_s390_vcpu_setup_model(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->fac = (u32 )(u64 ) model->fac_list; } -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -static int kvm_s390_vcpu_setup (struct kvm_vcpu *vcpu) {int rc =0 ;
arch/x86/kvm/x86.c +0 -5
@@ -9116,11 +9116,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)return 0 ; } -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu) {struct msr_data msr;
include/linux/kvm_host.h +0 -1
@@ -873,7 +873,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu);void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu);int kvm_arch_vcpu_precreate (struct kvm *kvm,unsigned int id);int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu); -int kvm_arch_vcpu_setup (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu);
virt/kvm/kvm_main.c +0 -5
@@ -2753,10 +2753,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)if (r) goto vcpu_uninit; - r =kvm_arch_vcpu_setup (vcpu); -if (r) - goto vcpu_destroy; -kvm_create_vcpu_debugfs (vcpu);mutex_lock (&kvm->lock);
@@ -2792,7 +2788,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) unlock_vcpu_destroy:mutex_unlock (&kvm->lock);debugfs_remove_recursive (vcpu->debugfs_dentry); -vcpu_destroy:kvm_arch_vcpu_destroy (vcpu); vcpu_uninit:kvm_vcpu_uninit (vcpu);
Signature · 1 line
2.24.1
Re: [PATCH v2 37/45] KVM: Drop kvm_arch_vcpu_setup()
Quoted 5 lines · On Wed, 18 Dec 2019 13:55:22 -0800 Sean Christopherson…
Remove
kvm_arch_vcpu_setup()now that all arch specific implementations are nops.Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Quoted 11 lines
--- arch/arm/kvm/guest.c | 5 ----- arch/arm64/kvm/guest.c | 5 ----- arch/mips/kvm/mips.c | 5 ----- arch/powerpc/kvm/book3s.c | 5 ----- arch/powerpc/kvm/booke.c | 5 ----- arch/s390/kvm/kvm-s390.c | 5 ----- arch/x86/kvm/x86.c | 5 ----- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 5 ----- 9 files changed, 41 deletions(-)
PATCH v2 38/45 KVM: x86: Move all vcpu init code into kvm_arch_vcpu_create()
In reply to Sean ChristophersonFold init() into create() now that the two are called back-to-back by common KVM code (kvm_vcpu_init() calls kvm_arch_vcpu_init() as its last action, and kvm_vm_ioctl_create_vcpu() calls kvm_arch_vcpu_create() immediately thereafter). This paves the way for removing kvm_arch_vcpu_init() entirely.
No functional change intended.
--- arch/x86/kvm/x86.c | 198 +++++++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 98 deletions(-)
arch/x86/kvm/x86.c +100 -98
@@ -9100,11 +9100,78 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { -int ret; +struct page *page; +int r; - ret = kvm_x86_ops->vcpu_create (vcpu); -if (ret) -return ret; + vcpu->arch.emulate_ctxt.ops = &emulate_ops; +if (!irqchip_in_kernel (vcpu->kvm) ||kvm_vcpu_is_reset_bsp (vcpu)) + vcpu->arch.mp_state =KVM_MP_STATE_RUNNABLE ; +else + vcpu->arch.mp_state =KVM_MP_STATE_UNINITIALIZED ; + +kvm_set_tsc_khz (vcpu, max_tsc_khz); + + r =kvm_mmu_create (vcpu); +if (r <0 ) +return r; + +if (irqchip_in_kernel (vcpu->kvm)) { + vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv (vcpu->kvm); + r =kvm_create_lapic (vcpu, lapic_timer_advance_ns); +if (r <0 ) + goto fail_mmu_destroy; + }else +static_key_slow_inc (&kvm_no_apic_vcpu); + + r = -ENOMEM ; + + page =alloc_page (GFP_KERNEL | __GFP_ZERO); +if (!page) + goto fail_free_lapic; + vcpu->arch.pio_data =page_address (page); + + vcpu->arch.mce_banks =kzalloc (KVM_MAX_MCE_BANKS *sizeof (u64) *4 , +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.mce_banks) + goto fail_free_pio_data; + vcpu->arch.mcg_cap =KVM_MAX_MCE_BANKS ; + +if (!zalloc_cpumask_var (&vcpu->arch.wbinvd_dirty_mask, +GFP_KERNEL_ACCOUNT )) + goto fail_free_mce_banks; + + vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.user_fpu) { +pr_err ("kvm: failed to allocate userspace's fpu\n" ); + goto free_wbinvd_dirty_mask; + } + + vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, +GFP_KERNEL_ACCOUNT ); +if (!vcpu->arch.guest_fpu) { +pr_err ("kvm: failed to allocate vcpu's fpu\n" ); + goto free_user_fpu; + } +fx_init (vcpu); + + vcpu->arch.guest_xstate_size =XSAVE_HDR_SIZE +XSAVE_HDR_OFFSET ; + + vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu); + + vcpu->arch.pat =MSR_IA32_CR_PAT_DEFAULT ; + +kvm_async_pf_hash_reset (vcpu); +kvm_pmu_init (vcpu); + + vcpu->arch.pending_external_vector =-1 ; + vcpu->arch.preempted_in_kernel = false; + +kvm_hv_vcpu_init (vcpu); + + r = kvm_x86_ops->vcpu_create (vcpu); +if (r) + goto free_guest_fpu; vcpu->arch.arch_capabilities =kvm_get_arch_capabilities (); vcpu->arch.msr_platform_info =MSR_PLATFORM_INFO_CPUID_FAULT ;
@@ -9114,6 +9181,22 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)kvm_init_mmu (vcpu, false);vcpu_put (vcpu);return 0 ; + +free_guest_fpu: +kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); +free_user_fpu: +kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); +free_wbinvd_dirty_mask: +free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); +fail_free_mce_banks: +kfree (vcpu->arch.mce_banks); +fail_free_pio_data: +free_page ((unsigned long )vcpu->arch.pio_data); +fail_free_lapic: +kvm_free_lapic (vcpu); +fail_mmu_destroy: +kvm_mmu_destroy (vcpu); +return r; }void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu)
@@ -9146,6 +9229,8 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) { +int idx; +kvmclock_reset (vcpu); kvm_x86_ops->vcpu_free (vcpu);
@@ -9153,6 +9238,17 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)free_cpumask_var (vcpu->arch.wbinvd_dirty_mask);kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu);kmem_cache_free (x86_fpu_cache, vcpu->arch.guest_fpu); + +kvm_hv_vcpu_uninit (vcpu); +kvm_pmu_destroy (vcpu); +kfree (vcpu->arch.mce_banks); +kvm_free_lapic (vcpu); + idx =srcu_read_lock (&vcpu->kvm->srcu); +kvm_mmu_destroy (vcpu); +srcu_read_unlock (&vcpu->kvm->srcu, idx); +free_page ((unsigned long )vcpu->arch.pio_data); +if (!lapic_in_kernel (vcpu)) +static_key_slow_dec (&kvm_no_apic_vcpu); }void kvm_vcpu_reset (struct kvm_vcpu *vcpu,bool init_event)
@@ -9391,106 +9487,12 @@ EXPORT_SYMBOL_GPL(kvm_no_apic_vcpu);int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) { -struct page *page; -int r; - - vcpu->arch.emulate_ctxt.ops = &emulate_ops; -if (!irqchip_in_kernel (vcpu->kvm) ||kvm_vcpu_is_reset_bsp (vcpu)) - vcpu->arch.mp_state =KVM_MP_STATE_RUNNABLE ; -else - vcpu->arch.mp_state =KVM_MP_STATE_UNINITIALIZED ; - -kvm_set_tsc_khz (vcpu, max_tsc_khz); - - r =kvm_mmu_create (vcpu); -if (r <0 ) -return r; - -if (irqchip_in_kernel (vcpu->kvm)) { - vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv (vcpu->kvm); - r =kvm_create_lapic (vcpu, lapic_timer_advance_ns); -if (r <0 ) - goto fail_mmu_destroy; - }else -static_key_slow_inc (&kvm_no_apic_vcpu); - - r = -ENOMEM ; - - page =alloc_page (GFP_KERNEL | __GFP_ZERO); -if (!page) - goto fail_free_lapic; - vcpu->arch.pio_data =page_address (page); - - vcpu->arch.mce_banks =kzalloc (KVM_MAX_MCE_BANKS *sizeof (u64) *4 , -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.mce_banks) - goto fail_free_pio_data; - vcpu->arch.mcg_cap =KVM_MAX_MCE_BANKS ; - -if (!zalloc_cpumask_var (&vcpu->arch.wbinvd_dirty_mask, -GFP_KERNEL_ACCOUNT )) - goto fail_free_mce_banks; - - vcpu->arch.user_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.user_fpu) { -pr_err ("kvm: failed to allocate userspace's fpu\n" ); - goto free_wbinvd_dirty_mask; - } - - vcpu->arch.guest_fpu =kmem_cache_zalloc (x86_fpu_cache, -GFP_KERNEL_ACCOUNT ); -if (!vcpu->arch.guest_fpu) { -pr_err ("kvm: failed to allocate vcpu's fpu\n" ); - goto free_user_fpu; - } -fx_init (vcpu); - - vcpu->arch.guest_xstate_size =XSAVE_HDR_SIZE +XSAVE_HDR_OFFSET ; - - vcpu->arch.maxphyaddr =cpuid_query_maxphyaddr (vcpu); - - vcpu->arch.pat =MSR_IA32_CR_PAT_DEFAULT ; - -kvm_async_pf_hash_reset (vcpu); -kvm_pmu_init (vcpu); - - vcpu->arch.pending_external_vector =-1 ; - vcpu->arch.preempted_in_kernel = false; - -kvm_hv_vcpu_init (vcpu); -return 0 ; - -free_user_fpu: -kmem_cache_free (x86_fpu_cache, vcpu->arch.user_fpu); -free_wbinvd_dirty_mask: -free_cpumask_var (vcpu->arch.wbinvd_dirty_mask); -fail_free_mce_banks: -kfree (vcpu->arch.mce_banks); -fail_free_pio_data: -free_page ((unsigned long )vcpu->arch.pio_data); -fail_free_lapic: -kvm_free_lapic (vcpu); -fail_mmu_destroy: -kvm_mmu_destroy (vcpu); -return r; }void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) { -int idx; -kvm_hv_vcpu_uninit (vcpu); -kvm_pmu_destroy (vcpu); -kfree (vcpu->arch.mce_banks); -kvm_free_lapic (vcpu); - idx =srcu_read_lock (&vcpu->kvm->srcu); -kvm_mmu_destroy (vcpu); -srcu_read_unlock (&vcpu->kvm->srcu, idx); -free_page ((unsigned long )vcpu->arch.pio_data); -if (!lapic_in_kernel (vcpu)) -static_key_slow_dec (&kvm_no_apic_vcpu); }void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu)
Signature · 1 line
2.24.1
PATCH v2 39/45 KVM: MIPS: Move all vcpu init code into kvm_arch_vcpu_create()
In reply to Sean ChristophersonFold init() into create() now that the two are called back-to-back by common KVM code (kvm_vcpu_init() calls kvm_arch_vcpu_init() as its last action, and kvm_vm_ioctl_create_vcpu() calls kvm_arch_vcpu_create() immediately thereafter). Rinse and repeat for kvm_arch_vcpu_uninit() and kvm_arch_vcpu_destroy(). This paves the way for removing kvm_arch_vcpu_{un}init() entirely.
No functional change intended.
--- arch/mips/kvm/mips.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
arch/mips/kvm/mips.c +14 -12
@@ -294,6 +294,14 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)kvm_debug ("kvm @ %p: create cpu %d at %p\n" , vcpu->kvm, vcpu->vcpu_id, vcpu); + err = kvm_mips_callbacks->vcpu_init (vcpu); +if (err) +return err; + +hrtimer_init (&vcpu->arch.comparecount_timer,CLOCK_MONOTONIC , +HRTIMER_MODE_REL ); + vcpu->arch.comparecount_timer.function = kvm_mips_comparecount_wakeup; +/* * Allocate space for host mode exception handlers that handle * guest mode exits
@@ -307,7 +315,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)if (!gebase) { err = -ENOMEM ; - goto out; + goto out_uninit_vcpu; }kvm_debug ("Allocated %d bytes for KVM Exception Handlers @ %p\n" ,ALIGN (size,PAGE_SIZE ), gebase);
@@ -397,7 +405,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)kfree (vcpu->arch.kseg0_commpage); out_free_gebase:kfree (gebase); -out: +out_uninit_vcpu: + kvm_mips_callbacks->vcpu_uninit (vcpu);return err; }
@@ -410,6 +419,8 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)kvm_mmu_free_memory_caches (vcpu);kfree (vcpu->arch.guest_ebase);kfree (vcpu->arch.kseg0_commpage); + + kvm_mips_callbacks->vcpu_uninit (vcpu); } int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
@@ -1221,21 +1232,12 @@ static enum hrtimer_restart kvm_mips_comparecount_wakeup(struct hrtimer *timer)int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) { -int err; - - err = kvm_mips_callbacks->vcpu_init (vcpu); -if (err) -return err; - -hrtimer_init (&vcpu->arch.comparecount_timer,CLOCK_MONOTONIC , -HRTIMER_MODE_REL ); - vcpu->arch.comparecount_timer.function = kvm_mips_comparecount_wakeup;return 0 ; }void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) { - kvm_mips_callbacks->vcpu_uninit (vcpu); + } int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
Signature · 1 line
2.24.1
PATCH v2 40/45 KVM: ARM: Move all vcpu init code into kvm_arch_vcpu_create()
In reply to Sean ChristophersonFold init() into create() now that the two are called back-to-back by common KVM code (kvm_vcpu_init() calls kvm_arch_vcpu_init() as its last action, and kvm_vm_ioctl_create_vcpu() calls kvm_arch_vcpu_create() immediately thereafter). This paves the way for removing kvm_arch_vcpu_{un}init() entirely.
Note, there is no associated unwinding in kvm_arch_vcpu_uninit() that needs to be relocated (to kvm_arch_vcpu_destroy()).
No functional change intended.
--- virt/kvm/arm/arm.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-)
virt/kvm/arm/arm.c +20 -14
@@ -292,6 +292,25 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { +int err; + +/* Force users to call KVM_ARM_VCPU_INIT */ + vcpu->arch.target =-1 ; +bitmap_zero (vcpu->arch.features,KVM_VCPU_MAX_FEATURES ); + +/* Set up the timer */ +kvm_timer_vcpu_init (vcpu); + +kvm_pmu_vcpu_init (vcpu); + +kvm_arm_reset_debug_ptr (vcpu); + +kvm_arm_pvtime_vcpu_init (&vcpu->arch); + + err =kvm_vgic_vcpu_init (vcpu); +if (err) +return err; +return create_hyp_mappings (vcpu, vcpu +1 ,PAGE_HYP ); }
@@ -341,20 +360,7 @@ void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) { -/* Force users to call KVM_ARM_VCPU_INIT */ - vcpu->arch.target =-1 ; -bitmap_zero (vcpu->arch.features,KVM_VCPU_MAX_FEATURES ); - -/* Set up the timer */ -kvm_timer_vcpu_init (vcpu); - -kvm_pmu_vcpu_init (vcpu); - -kvm_arm_reset_debug_ptr (vcpu); - -kvm_arm_pvtime_vcpu_init (&vcpu->arch); - -return kvm_vgic_vcpu_init (vcpu); +return 0 ; }void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu)
Signature · 1 line
2.24.1
PATCH v2 41/45 KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create()
In reply to Sean ChristophersonFold init() into create() now that the two are called back-to-back by common KVM code (kvm_vcpu_init() calls kvm_arch_vcpu_init() as its last action, and kvm_vm_ioctl_create_vcpu() calls kvm_arch_vcpu_create() immediately thereafter). Rinse and repeat for kvm_arch_vcpu_uninit() and kvm_arch_vcpu_destroy(). This paves the way for removing kvm_arch_vcpu_{un}init() entirely.
Note, calling kvmppc_mmu_destroy() if kvmppc_core_vcpu_create() fails may or may not be necessary. Move it along with the more obvious call to kvmppc_subarch_vcpu_uninit() so as not to inadvertantly introduce a functional change and/or bug.
No functional change intended.
--- arch/powerpc/kvm/powerpc.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
arch/powerpc/kvm/powerpc.c +22 -14
@@ -729,13 +729,29 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) {int err; - err =kvmppc_core_vcpu_create (vcpu); +hrtimer_init (&vcpu->arch.dec_timer,CLOCK_REALTIME ,HRTIMER_MODE_ABS ); + vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup; + vcpu->arch.dec_expires =get_tb (); + +#ifdef CONFIG_KVM_EXIT_TIMING +mutex_init (&vcpu->arch.exit_timing_lock); +#endif + err =kvmppc_subarch_vcpu_init (vcpu);if (err)return err; + err =kvmppc_core_vcpu_create (vcpu); +if (err) + goto out_vcpu_uninit; + vcpu->arch.wqp = &vcpu->wq;kvmppc_create_vcpu_debugfs (vcpu, vcpu->vcpu_id);return 0 ; + +out_vcpu_uninit: +kvmppc_mmu_destroy (vcpu); +kvmppc_subarch_vcpu_uninit (vcpu); +return err; }void kvm_arch_vcpu_postcreate (struct kvm_vcpu *vcpu)
@@ -765,6 +781,9 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) }kvmppc_core_vcpu_free (vcpu); + +kvmppc_mmu_destroy (vcpu); +kvmppc_subarch_vcpu_uninit (vcpu); }int kvm_cpu_has_pending_timer (struct kvm_vcpu *vcpu)
@@ -784,23 +803,12 @@ static enum hrtimer_restart kvmppc_decrementer_wakeup(struct hrtimer *timer)int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) { -int ret; - -hrtimer_init (&vcpu->arch.dec_timer,CLOCK_REALTIME ,HRTIMER_MODE_ABS ); - vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup; - vcpu->arch.dec_expires =get_tb (); - -#ifdef CONFIG_KVM_EXIT_TIMING -mutex_init (&vcpu->arch.exit_timing_lock); -#endif - ret =kvmppc_subarch_vcpu_init (vcpu); -return ret; +return 0 ; }void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) { -kvmppc_mmu_destroy (vcpu); -kvmppc_subarch_vcpu_uninit (vcpu); + }void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu)
Signature · 1 line
2.24.1
Re: [PATCH v2 41/45] KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create()
Quoted 7 lines · Sean Christopherson
Fold
init()intocreate()now that the two are called back-to-back by common KVM code (kvm_vcpu_init()callskvm_arch_vcpu_init()as its last action, andkvm_vm_ioctl_create_vcpu()callskvm_arch_vcpu_create()immediately thereafter). Rinse and repeat forkvm_arch_vcpu_uninit()andkvm_arch_vcpu_destroy(). This paves the way for removing kvm_arch_vcpu_{un}init() entirely.
Quoted 8 lines
Note, calling
kvmppc_mmu_destroy()ifkvmppc_core_vcpu_create()fails may or may not be necessary. Move it along with the more obvious call tokvmppc_subarch_vcpu_uninit()so as not to inadvertantly introduce a functional change and/or bug.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
This doesn't compile. I get:
CC [M] arch/powerpc/kvm/powerpc.o/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c: In function ‘kvm_arch_vcpu_create’:/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c:733:34: error: ‘kvmppc_decrementer_wakeup’ undeclared (first use in this function)
vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;
^/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c:733:34: note: each undeclared identifier is reported only once for each function it appears in /home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c: At top level:/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c:794:29: warning: ‘kvmppc_decrementer_wakeup’ defined but not used [-Wunused-function]
static enum hrtimer_restart kvmppc_decrementer_wakeup(struct hrtimer *timer)
^
make[3]: *** [/home/paulus/kernel/kvm/scripts/Makefile.build:266: arch/powerpc/kvm/powerpc.o] Error 1
The problem is that kvmppc_decrementer_wakeup() is a static function defined in this file (arch/powerpc/kvm/powerpc.c) after kvm_arch_vcpu_create() but before kvm_arch_vcpu_init(). You need a forward static declaration of kvmppc_decrementer_wakeup() before kvm_arch_vcpu_create(), or else move one or other function.
Paul.
Paolo Bonzini
maintainerRe: [PATCH v2 41/45] KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create()
Quoted 31 lines · Paul Mackerras
Quoted 7 lines · Sean Christopherson
Fold
init()intocreate()now that the two are called back-to-back by common KVM code (kvm_vcpu_init()callskvm_arch_vcpu_init()as its last action, andkvm_vm_ioctl_create_vcpu()callskvm_arch_vcpu_create()immediately thereafter). Rinse and repeat forkvm_arch_vcpu_uninit()andkvm_arch_vcpu_destroy(). This paves the way for removing kvm_arch_vcpu_{un}init() entirely.Quoted 8 lines
Note, calling
kvmppc_mmu_destroy()ifkvmppc_core_vcpu_create()fails may or may not be necessary. Move it along with the more obvious call tokvmppc_subarch_vcpu_uninit()so as not to inadvertantly introduce a functional change and/or bug.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>This doesn't compile. I get:
CC [M]
arch/powerpc/kvm/powerpc.o/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c: In function ‘kvm_arch_vcpu_create’:/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c:733:34: error: ‘kvmppc_decrementer_wakeup’ undeclared (first use in this function)vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup; ^
/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c:733:34: note: each undeclared identifier is reported only once for each function it appears in/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c: At top level:/home/paulus/kernel/kvm/arch/powerpc/kvm/powerpc.c:794:29: warning: ‘kvmppc_decrementer_wakeup’ defined but not used [-Wunused-function]
static enumhrtimer_restartkvmppc_decrementer_wakeup(struct hrtimer *timer)^make[3]: *** [
/home/paulus/kernel/kvm/scripts/Makefile.build:266:arch/powerpc/kvm/powerpc.o] Error 1
Quoted 8 lines
The problem is that
kvmppc_decrementer_wakeup()is a static function defined in this file (arch/powerpc/kvm/powerpc.c) afterkvm_arch_vcpu_create()but beforekvm_arch_vcpu_init(). You need a forward static declaration ofkvmppc_decrementer_wakeup()beforekvm_arch_vcpu_create(), or else move one or other function.Paul.
Squashed:
arch/powerpc/kvm/powerpc.c +10 -10
@@ -725,6 +725,16 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)return 0 ; } +static enum hrtimer_restart kvmppc_decrementer_wakeup (struct hrtimer *timer) +{ +struct kvm_vcpu *vcpu; + + vcpu = container_of(timer, struct kvm_vcpu, arch.dec_timer); +kvmppc_decrementer_func (vcpu); + +return HRTIMER_NORESTART ; +} +int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) {int err;
@@ -791,16 +801,6 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)return kvmppc_core_pending_dec (vcpu); } -static enum hrtimer_restart kvmppc_decrementer_wakeup (struct hrtimer *timer) -{ -struct kvm_vcpu *vcpu; - - vcpu = container_of(timer, struct kvm_vcpu, arch.dec_timer); -kvmppc_decrementer_func (vcpu); - -return HRTIMER_NORESTART ; -} -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) {return 0 ;
Paolo
PATCH v2 42/45 KVM: arm64: Free sve_state via arm specific hook
In reply to Sean ChristophersonAdd an arm specific hook to free the arm64-only sve_state. Doing so eliminates the last functional code from kvm_arch_vcpu_uninit() across all architectures and paves the way for removing kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit() entirely.
--- arch/arm/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/reset.c | 5 +++++ virt/kvm/arm/arm.c | 2 ++ 4 files changed, 9 insertions(+)
arch/arm/include/asm/kvm_host.h +1 -0
@@ -366,6 +366,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {}static inline void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) {}static inline void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {}static inline void kvm_arch_vcpu_block_finish (struct kvm_vcpu *vcpu) {} +static inline void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu) {}static inline void kvm_arm_init_debug (void ) {}static inline void kvm_arm_setup_debug (struct kvm_vcpu *vcpu) {}
arch/arm64/include/asm/kvm_host.h +1 -0
@@ -53,6 +53,7 @@ int kvm_arm_init_sve(void); int __attribute_const__ kvm_target_cpu(void);int kvm_reset_vcpu (struct kvm_vcpu *vcpu); +void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu);void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu);int kvm_arch_vm_ioctl_check_extension (struct kvm *kvm,long ext);void __extended_idmap_trampoline (phys_addr_t boot_pgd,phys_addr_t idmap_start);
arch/arm64/kvm/reset.c +5 -0
@@ -205,6 +205,11 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu) }void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) +{ + +} + +void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu) {kfree (vcpu->arch.sve_state); }
virt/kvm/arm/arm.c +2 -0
@@ -326,6 +326,8 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)kvm_mmu_free_memory_caches (vcpu);kvm_timer_vcpu_terminate (vcpu);kvm_pmu_vcpu_destroy (vcpu); + +kvm_arm_vcpu_destroy (vcpu); }int kvm_cpu_has_pending_timer (struct kvm_vcpu *vcpu)
Signature · 1 line
2.24.1
PATCH v2 43/45 KVM: Drop kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit()
In reply to Sean ChristophersonRemove kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit() now that all arch specific implementations are nops.
--- arch/arm/include/asm/kvm_host.h | 1 - arch/arm64/include/asm/kvm_host.h | 1 - arch/arm64/kvm/reset.c | 5 ----- arch/mips/kvm/mips.c | 10 ---------- arch/powerpc/kvm/powerpc.c | 10 ---------- arch/s390/include/asm/kvm_host.h | 1 - arch/s390/kvm/kvm-s390.c | 5 ----- arch/x86/kvm/x86.c | 10 ---------- include/linux/kvm_host.h | 3 --- virt/kvm/arm/arm.c | 5 ----- virt/kvm/kvm_main.c | 16 ++-------------- 11 files changed, 2 insertions(+), 65 deletions(-)
arch/arm/include/asm/kvm_host.h +0 -1
@@ -363,7 +363,6 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);static inline bool kvm_arch_requires_vhe (void ) {return false; }static inline void kvm_arch_hardware_unsetup (void ) {}static inline void kvm_arch_sync_events (struct kvm *kvm) {} -static inline void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) {}static inline void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {}static inline void kvm_arch_vcpu_block_finish (struct kvm_vcpu *vcpu) {}static inline void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu) {}
arch/arm64/include/asm/kvm_host.h +0 -1
@@ -54,7 +54,6 @@ int kvm_arm_init_sve(void); int __attribute_const__ kvm_target_cpu(void);int kvm_reset_vcpu (struct kvm_vcpu *vcpu);void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu); -void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu);int kvm_arch_vm_ioctl_check_extension (struct kvm *kvm,long ext);void __extended_idmap_trampoline (phys_addr_t boot_pgd,phys_addr_t idmap_start);
arch/arm64/kvm/reset.c +0 -5
@@ -204,11 +204,6 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu)return true; } -void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) -{ - -} -void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu) {kfree (vcpu->arch.sve_state);
arch/mips/kvm/mips.c +0 -10
@@ -1230,16 +1230,6 @@ static enum hrtimer_restart kvm_mips_comparecount_wakeup(struct hrtimer *timer)return kvm_mips_count_timeout (vcpu); } -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) -{ -return 0 ; -} - -void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) -{ - -} -int kvm_arch_vcpu_ioctl_translate (struct kvm_vcpu *vcpu,struct kvm_translation *tr) {
arch/powerpc/kvm/powerpc.c +0 -10
@@ -801,16 +801,6 @@ static enum hrtimer_restart kvmppc_decrementer_wakeup(struct hrtimer *timer)return HRTIMER_NORESTART ; } -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) -{ -return 0 ; -} - -void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) -{ - -} -void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu) {#ifdef CONFIG_BOOKE
arch/s390/include/asm/kvm_host.h +0 -1
@@ -914,7 +914,6 @@ extern int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc);static inline void kvm_arch_hardware_disable (void ) {}static inline void kvm_arch_sync_events (struct kvm *kvm) {} -static inline void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) {}static inline void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {}static inline void kvm_arch_free_memslot (struct kvm *kvm,struct kvm_memory_slot *free,struct kvm_memory_slot *dont) {}
arch/s390/kvm/kvm-s390.c +0 -5
@@ -2700,11 +2700,6 @@ static int sca_can_add_vcpu(struct kvm *kvm, unsigned int id)return rc =0 && id <KVM_S390_ESCA_CPU_SLOTS ; } -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -/* needs disabled preemption to protect from TOD sync and vcpu_load/put */ static void __start_cpu_timer_accounting (struct kvm_vcpu *vcpu) {
arch/x86/kvm/x86.c +0 -10
@@ -9485,16 +9485,6 @@ bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)struct static_key kvm_no_apic_vcpu__read_mostly ;EXPORT_SYMBOL_GPL (kvm_no_apic_vcpu); -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) -{ -return 0 ; -} - -void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu) -{ - -} -void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);
include/linux/kvm_host.h +0 -3
@@ -864,9 +864,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);int kvm_arch_init (void *opaque);void kvm_arch_exit (void ); -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu); -void kvm_arch_vcpu_uninit (struct kvm_vcpu *vcpu); -void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu);void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu);
virt/kvm/arm/arm.c +0 -5
@@ -360,11 +360,6 @@ void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)preempt_enable (); } -int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) -{ -return 0 ; -} -void kvm_arch_vcpu_load (struct kvm_vcpu *vcpu,int cpu) {int *last_ran;
virt/kvm/kvm_main.c +2 -14
@@ -324,7 +324,6 @@ void kvm_reload_remote_mmus(struct kvm *kvm)static int kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id) {struct page *page; -int r;mutex_init (&vcpu->mutex); vcpu->cpu =-1 ;
@@ -338,10 +337,8 @@ static int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)INIT_LIST_HEAD (&vcpu->blocked_vcpu_list); page =alloc_page (GFP_KERNEL | __GFP_ZERO); -if (!page) { - r = -ENOMEM ; - goto fail; - } +if (!page) +return -ENOMEM ; vcpu->run =page_address (page);kvm_vcpu_set_in_spin_loop (vcpu, false);
@@ -350,15 +347,7 @@ static int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->ready = false;preempt_notifier_init (&vcpu->preempt_notifier, &kvm_preempt_ops); - r =kvm_arch_vcpu_init (vcpu); -if (r <0 ) - goto fail_free_run;return 0 ; - -fail_free_run: -free_page ((unsigned long )vcpu->run); -fail: -return r; }static void kvm_vcpu_uninit (struct kvm_vcpu *vcpu)
@@ -369,7 +358,6 @@ static void kvm_vcpu_uninit(struct kvm_vcpu *vcpu)* descriptors are already gone. */ put_pid (rcu_dereference_protected (vcpu->pid,1 )); -kvm_arch_vcpu_uninit (vcpu);free_page ((unsigned long )vcpu->run); }
Signature · 1 line
2.24.1
Re: [PATCH v2 43/45] KVM: Drop kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit()
Quoted 5 lines · On Wed, 18 Dec 2019 13:55:28 -0800 Sean Christopherson…
Remove
kvm_arch_vcpu_init()andkvm_arch_vcpu_uninit()now that all arch specific implementations are nops.Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Quoted 13 lines
--- arch/arm/include/asm/kvm_host.h | 1 - arch/arm64/include/asm/kvm_host.h | 1 - arch/arm64/kvm/reset.c | 5 ----- arch/mips/kvm/mips.c | 10 ---------- arch/powerpc/kvm/powerpc.c | 10 ---------- arch/s390/include/asm/kvm_host.h | 1 - arch/s390/kvm/kvm-s390.c | 5 ----- arch/x86/kvm/x86.c | 10 ---------- include/linux/kvm_host.h | 3 --- virt/kvm/arm/arm.c | 5 ----- virt/kvm/kvm_main.c | 16 ++-------------- 11 files changed, 2 insertions(+), 65 deletions(-)
PATCH v2 44/45 KVM: Move putting of vcpu->pid to kvm_vcpu_destroy()
In reply to Sean ChristophersonMove the putting of vcpu->pid to kvm_vcpu_destroy(). vcpu->pid is guaranteed to be NULL when kvm_vcpu_uninit() is called in the error path of kvm_vm_ioctl_create_vcpu(), e.g. it is explicitly nullified by kvm_vcpu_init() and is only changed by KVM_RUN.
No functional change intended.
--- virt/kvm/kvm_main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
virt/kvm/kvm_main.c +7 -6
@@ -352,12 +352,6 @@ static int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)static void kvm_vcpu_uninit (struct kvm_vcpu *vcpu) { -/* -* no need for rcu_read_lock as VCPU_RUN is the only place that -* will change the vcpu->pid pointer and on uninit all file -* descriptors are already gone. -*/ -put_pid (rcu_dereference_protected (vcpu->pid,1 ));free_page ((unsigned long )vcpu->run); }
@@ -365,6 +359,13 @@ void kvm_vcpu_destroy(struct kvm_vcpu *vcpu) {kvm_arch_vcpu_destroy (vcpu); +/* +* No need for rcu_read_lock as VCPU_RUN is the only place that changes +* the vcpu->pid pointer, and at destruction time all file descriptors +* are already gone. +*/ +put_pid (rcu_dereference_protected (vcpu->pid,1 )); +kvm_vcpu_uninit (vcpu);kmem_cache_free (kvm_vcpu_cache, vcpu); }
Signature · 1 line
2.24.1
Re: [PATCH v2 44/45] KVM: Move putting of vcpu->pid to kvm_vcpu_destroy()
Quoted 5 lines · On Wed, 18 Dec 2019 13:55:29 -0800 Sean Christopherson…
Move the putting of
vcpu->pidtokvm_vcpu_destroy().vcpu->pidis guaranteed to be NULL whenkvm_vcpu_uninit()is called in the error path ofkvm_vm_ioctl_create_vcpu(), e.g. it is explicitly nullified bykvm_vcpu_init()and is only changed byKVM_RUN.
Quoted 7 lines
No functional change intended.
Acked-by Christoffer Dall <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- virt/kvm/kvm_main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
PATCH v2 45/45 KVM: Move vcpu->run page allocation out of kvm_vcpu_init()
In reply to Sean ChristophersonOpen code the allocation and freeing of the vcpu->run page in kvm_vm_ioctl_create_vcpu() and kvm_vcpu_destroy() respectively. Doing so allows kvm_vcpu_init() to be a pure init function and eliminates kvm_vcpu_uninit() entirely.
--- virt/kvm/kvm_main.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)
virt/kvm/kvm_main.c +13 -21
@@ -321,10 +321,8 @@ void kvm_reload_remote_mmus(struct kvm *kvm)kvm_make_all_cpus_request (kvm,KVM_REQ_MMU_RELOAD ); } -static int kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id) +static void kvm_vcpu_init (struct kvm_vcpu *vcpu,struct kvm *kvm,unsigned id) { -struct page *page; -mutex_init (&vcpu->mutex); vcpu->cpu =-1 ; vcpu->kvm = kvm;
@@ -336,23 +334,11 @@ static int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->pre_pcpu =-1 ;INIT_LIST_HEAD (&vcpu->blocked_vcpu_list); - page =alloc_page (GFP_KERNEL | __GFP_ZERO); -if (!page) -return -ENOMEM ; - vcpu->run =page_address (page); -kvm_vcpu_set_in_spin_loop (vcpu, false);kvm_vcpu_set_dy_eligible (vcpu, false); vcpu->preempted = false; vcpu->ready = false;preempt_notifier_init (&vcpu->preempt_notifier, &kvm_preempt_ops); - -return 0 ; -} - -static void kvm_vcpu_uninit (struct kvm_vcpu *vcpu) -{ -free_page ((unsigned long )vcpu->run); }void kvm_vcpu_destroy (struct kvm_vcpu *vcpu)
@@ -366,7 +352,7 @@ void kvm_vcpu_destroy(struct kvm_vcpu *vcpu)*/ put_pid (rcu_dereference_protected (vcpu->pid,1 )); -kvm_vcpu_uninit (vcpu); +free_page ((unsigned long )vcpu->run);kmem_cache_free (kvm_vcpu_cache, vcpu); }EXPORT_SYMBOL_GPL (kvm_vcpu_destroy);
@@ -2711,6 +2697,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) {int r;struct kvm_vcpu *vcpu; +struct page *page;if (id >=KVM_MAX_VCPU_ID )return -EINVAL ;
@@ -2734,13 +2721,18 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) goto vcpu_decrement; } - r =kvm_vcpu_init (vcpu, kvm, id); -if (r) + page =alloc_page (GFP_KERNEL | __GFP_ZERO); +if (!page) { + r = -ENOMEM ; goto vcpu_free; + } + vcpu->run =page_address (page); + +kvm_vcpu_init (vcpu, kvm, id); r =kvm_arch_vcpu_create (vcpu);if (r) - goto vcpu_uninit; + goto vcpu_free_run_page;kvm_create_vcpu_debugfs (vcpu);
@@ -2778,8 +2770,8 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)mutex_unlock (&kvm->lock);debugfs_remove_recursive (vcpu->debugfs_dentry);kvm_arch_vcpu_destroy (vcpu); -vcpu_uninit: -kvm_vcpu_uninit (vcpu); +vcpu_free_run_page: +free_page ((unsigned long )vcpu->run); vcpu_free:kmem_cache_free (kvm_vcpu_cache, vcpu); vcpu_decrement:
Signature · 1 line
2.24.1
Re: [PATCH v2 45/45] KVM: Move vcpu->run page allocation out of kvm_vcpu_init()
Quoted 9 lines · On Wed, 18 Dec 2019 13:55:30 -0800 Sean Christopherson…
Open code the allocation and freeing of the
vcpu->runpage inkvm_vm_ioctl_create_vcpu()andkvm_vcpu_destroy()respectively. Doing so allowskvm_vcpu_init()to be a pure init function and eliminateskvm_vcpu_uninit()entirely.Signed-off-by Sean Christopherson <[email protected]>--- virt/kvm/kvm_main.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)
Paolo Bonzini
maintainerQueued. Paul, David, please test kvm/next in a couple days.
Paolo
Quoted 151 lines · Sean Christopherson
The end goal of this series is to strip down the interface between common KVM code and arch specific code so that there is precisely one arch hook for creating a vCPU and one hook for destroying a vCPU. In addition to cleaning up the code base, simplifying the interface gives architectures more freedom to organize their vCPU creation code. Details below.
v2:
- Rebase to commite41a90be9659("KVM: x86/mmu: WARN ifroot_hpais invalid when handling a page fault"). A few minor x86 (VMX) conflicts, and one straightforward arm conflict with commit8564d6372a7d("KVM:
arm64: Support stolen time reporting via shared structure") in patch "KVM: ARM: Move all vcpu init code intokvm_arch_vcpu_create()".
- Collect Reviews and Acks [Christoffer, Greg].
- Fix a warning in "KVM: arm64: Freesve_statevia arm specific hook" by using a "void" return type [Christoffer].
- Fix a bug in "KVM: PPC: Movekvm_vcpu_init()invocation to common code" where the call inkvmppc_core_vcpu_create_e500mc()was inadvertantly left behind.KVM's vCPU creation code is comically messy.
kvm_vm_ioctl_create_vcpu()calls three separate arch hooks:init(),create()andsetup(). Theinit()call is especially nasty as it's hidden away in a common KVM function,kvm_init_vcpu(), that for all intents and purposes must be immediately invoked after the vcpu object is allocated.Not to be outdone, vCPU destruction also has three arch hooks:
uninit(),destroy()andfree(), the latter of which isn't actually invoked by common KVM code, but the hook declaration still exists because architectures are relying on its forward declaration.Eliminating the extra arch hooks is relatively straightforward, just tedious. For the most part, there is no fundamental constraint that necessitated the proliferation of arch hooks, rather they crept in over time, usually when x86-centric code was moved out of generic KVM and into x86 code.
E.g.
kvm_arch_vcpu_setup()was added to allow x86 to dovcpu_load(), which can only be done afterpreempt_notifierinitialization, but addingsetup()overlooked the fact that thepreempt_notifierwas only initialized afterkvm_arch_vcpu_create()because preemption support was added when x86's MMU setup (thevcpu_load()user) was called from common KVM code.For all intents and purposes, there is no true functional change in this series. The order of some allocations will change, and a few memory leaks are fixed, but the actual functionality of a guest should be unaffected.
Patches 01-03 are bug fixes in error handling paths that were found by inspection when refactoring the associated code.
Patches 04-43 refactor each arch implementation so that the unwanted arch hooks can be dropped without a functional change, e.g. move code out of
kvm_arch_vcpu_setup()so that all implementations are empty, then drop the functions and caller.Patches 44-45 are minor clean up to eliminate
kvm_vcpu_uninit().The net result is to go from this:
vcpu = kvm_arch_vcpu_create(kvm, id); | |-> kvm_vcpu_init() | |-> kvm_arch_vcpu_init() if (IS_ERR(vcpu)) { r = PTR_ERR(vcpu); goto vcpu_decrement; } preempt_notifier_init(&vcpu->preempt_notifier, &kvm_preempt_ops); r = kvm_arch_vcpu_setup(vcpu); if (r) goto vcpu_destroy;Sean Christopherson (45):
KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails
KVM: PPC: Book3S PR: Free shared page if mmu initialization fails
KVM: x86: Freewbinvd_dirty_maskif vCPU creation fails
KVM: VMX: Allocate VPID after initializing VCPU
KVM: VMX: Use direct vcpu pointer during vCPU create/free
KVM: SVM: Use direct vcpu pointer during vCPU create/free
KVM: x86: Allocate vcpu struct in common x86 code
KVM: x86: Move FPU allocation to common x86 code
KVM: x86: Move allocation ofpio_datapage down a few lines
KVM: x86: Movekvm_vcpu_init()invocation to common code
KVM: PPC: e500mc: Add build-time assert that vcpu is at offset 0
KVM: PPC: Allocate vcpu struct in common PPC code
KVM: PPC: Book3S PR: Allocate book3s and shadow vcpu after common init
KVM: PPC: e500mc: Move reset of oldpir below call tokvm_vcpu_init()
KVM: PPC: Movekvm_vcpu_init()invocation to common code
KVM: MIPS: Usekvm_vcpu_cacheto allocate vCPUs
KVM: MIPS: Dropkvm_arch_vcpu_free()
KVM: PPC: Dropkvm_arch_vcpu_free()
KVM: arm: Dropkvm_arch_vcpu_free()
KVM: x86: Remove spuriouskvm_mmu_unload()from vcpu destruction path
KVM: x86: Remove spurious clearing of async #PF MSR
KVM: x86: Dropkvm_arch_vcpu_free()
KVM: Removekvm_arch_vcpu_free()declaration
KVM: Addkvm_arch_vcpu_precreate()to handle pre-allocation issues
KVM: s390: Move guts ofkvm_arch_vcpu_init()into
kvm_arch_vcpu_create()
KVM: s390: Invokekvm_vcpu_init()before allocatingsie_page
KVM: MIPS: Invokekvm_vcpu_uninit()immediately prior to freeing vcpu
KVM: x86: Invokekvm_vcpu_uninit()immediately prior to freeing vcpu
KVM: Introducekvm_vcpu_destroy()
KVM: Move vcpu alloc and init invocation to common code
KVM: Unexportkvm_vcpu_cacheand kvm_vcpu_{un}init()
KVM: Move initialization of preempt notifier tokvm_vcpu_init()
KVM: x86: Move guts ofkvm_arch_vcpu_setup()into
kvm_arch_vcpu_create()
KVM: MIPS: Move .vcpu_setup() call tokvm_arch_vcpu_create()
KVM: s390: Manually invoke vcpu setup duringkvm_arch_vcpu_create()
KVM: PPC: BookE: Setup vcpu duringkvmppc_core_vcpu_create()
KVM: Dropkvm_arch_vcpu_setup()
KVM: x86: Move all vcpu init code intokvm_arch_vcpu_create()
KVM: MIPS: Move all vcpu init code intokvm_arch_vcpu_create()
KVM: ARM: Move all vcpu init code intokvm_arch_vcpu_create()
KVM: PPC: Move all vcpu init code intokvm_arch_vcpu_create()
KVM: arm64: Freesve_statevia arm specific hook
KVM: Dropkvm_arch_vcpu_init()andkvm_arch_vcpu_uninit()
KVM: Move putting ofvcpu->pidtokvm_vcpu_destroy()
KVM: Movevcpu->runpage allocation out ofkvm_vcpu_init()arch/arm/include/asm/kvm_host.h | 2 +- arch/arm/kvm/guest.c | 5 - arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/kvm/guest.c | 5 - arch/arm64/kvm/reset.c | 2 +- arch/mips/kvm/mips.c | 84 ++++------- arch/powerpc/include/asm/kvm_ppc.h | 6 +- arch/powerpc/kvm/book3s.c | 9 +- arch/powerpc/kvm/book3s_hv.c | 27 +--- arch/powerpc/kvm/book3s_pr.c | 33 ++--- arch/powerpc/kvm/booke.c | 65 ++++---- arch/powerpc/kvm/e500.c | 34 +---- arch/powerpc/kvm/e500mc.c | 28 +--- arch/powerpc/kvm/powerpc.c | 70 ++++----- arch/s390/include/asm/kvm_host.h | 1 - arch/s390/kvm/kvm-s390.c | 110 +++++++------- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 52 +------ arch/x86/kvm/vmx/vmx.c | 72 +++------ arch/x86/kvm/x86.c | 230 ++++++++++++++--------------- include/linux/kvm_host.h | 13 +- virt/kvm/arm/arm.c | 80 ++++------ virt/kvm/kvm_main.c | 71 +++++---- 23 files changed, 385 insertions(+), 618 deletions(-)