diff mbox series

[v2,04/50] KVM: Teardown VFIO ops earlier in kvm_exit()

Message ID	20221130230934.1014142-5-seanjc@google.com (mailing list archive)
State	Not Applicable
Headers	show Return-Path: <linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org> Date: Wed, 30 Nov 2022 23:08:48 +0000 In-Reply-To: <20221130230934.1014142-1-seanjc@google.com> Mime-Version: 1.0 References: <20221130230934.1014142-1-seanjc@google.com> Message-ID: <20221130230934.1014142-5-seanjc@google.com> Subject: [PATCH v2 04/50] KVM: Teardown VFIO ops earlier in kvm_exit() From: Sean Christopherson <seanjc@google.com> To: Paolo Bonzini <pbonzini@redhat.com>, Marc Zyngier <maz@kernel.org>, Huacai Chen <chenhuacai@kernel.org>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Anup Patel <anup@brainfault.org>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Christian Borntraeger <borntraeger@linux.ibm.com>, Janosch Frank <frankja@linux.ibm.com>, Claudio Imbrenda <imbrenda@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Sean Christopherson <seanjc@google.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, David Woodhouse <dwmw2@infradead.org>, Paul Durrant <paul@xen.org> Cc: James Morse <james.morse@arm.com>, Alexandru Elisei <alexandru.elisei@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Oliver Upton <oliver.upton@linux.dev>, Atish Patra <atishp@atishpatra.org>, David Hildenbrand <david@redhat.com>, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Yuan Yao <yuan.yao@intel.com>, Cornelia Huck <cohuck@redhat.com>, Isaku Yamahata <isaku.yamahata@intel.com>, " =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= " <philmd@linaro.org>, Fabiano Rosas <farosas@linux.ibm.com>, Michael Ellerman <mpe@ellerman.id.au>, Kai Huang <kai.huang@intel.com>, Chao Gao <chao.gao@intel.com>, Thomas Gleixner <tglx@linutronix.de> Precedence: list Reply-To: Sean Christopherson <seanjc@google.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org> Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
Series	KVM: Rework kvm_init() and hardware enabling \| expand [v2,00/50] KVM: Rework kvm_init() and hardware enabling [v2,01/50] KVM: Register /dev/kvm as the _very_ last thing during initialization [v2,02/50] KVM: Initialize IRQ FD after arch hardware setup [v2,03/50] KVM: Allocate cpus_hardware_enabled after arch hardware setup [v2,04/50] KVM: Teardown VFIO ops earlier in kvm_exit() [v2,05/50] KVM: s390: Unwind kvm_arch_init() piece-by-piece() if a step fails [v2,06/50] KVM: s390: Move hardware setup/unsetup to init/exit [v2,07/50] KVM: x86: Do timer initialization after XCR0 configuration [v2,08/50] KVM: x86: Move hardware setup/unsetup to init/exit [v2,09/50] KVM: Drop arch hardware (un)setup hooks [v2,10/50] KVM: VMX: Reset eVMCS controls in VP assist page during hardware disabling [v2,11/50] KVM: VMX: Don't bother disabling eVMCS static key on module exit [v2,12/50] KVM: VMX: Move Hyper-V eVMCS initialization to helper [v2,13/50] KVM: x86: Move guts of kvm_arch_init() to standalone helper [v2,14/50] KVM: VMX: Do _all_ initialization before exposing /dev/kvm to userspace [v2,15/50] KVM: x86: Serialize vendor module initialization (hardware setup) [v2,16/50] KVM: arm64: Simplify the CPUHP logic [v2,17/50] KVM: arm64: Free hypervisor allocations if vector slot init fails [v2,18/50] KVM: arm64: Unregister perf callbacks if hypervisor finalization fails [v2,19/50] KVM: arm64: Do arm/arch initialization without bouncing through kvm_init() [v2,20/50] KVM: arm64: Mark kvm_arm_init() and its unique descendants as __init [v2,21/50] KVM: MIPS: Hardcode callbacks to hardware virtualization extensions [v2,22/50] KVM: MIPS: Setup VZ emulation? directly from kvm_mips_init() [v2,23/50] KVM: MIPS: Register die notifier prior to kvm_init() [v2,24/50] KVM: RISC-V: Do arch init directly in riscv_kvm_init() [v2,25/50] KVM: RISC-V: Tag init functions and data with __init, __ro_after_init [v2,26/50] KVM: PPC: Move processor compatibility check to module init [v2,27/50] KVM: s390: Do s390 specific init without bouncing through kvm_init() [v2,28/50] KVM: s390: Mark __kvm_s390_init() and its descendants as __init [v2,29/50] KVM: Drop kvm_arch_{init,exit}() hooks [v2,30/50] KVM: VMX: Make VMCS configuration/capabilities structs read-only after init [v2,31/50] KVM: x86: Do CPU compatibility checks in x86 code [v2,32/50] KVM: Drop kvm_arch_check_processor_compat() hook [v2,33/50] KVM: x86: Use KBUILD_MODNAME to specify vendor module name [v2,34/50] KVM: x86: Unify pr_fmt to use module name for all KVM modules [v2,35/50] KVM: VMX: Use current CPU's info to perform "disabled by BIOS?" checks [v2,36/50] KVM: x86: Do VMX/SVM support checks directly in vendor code [v2,37/50] KVM: VMX: Shuffle support checks and hardware enabling code around [v2,38/50] KVM: SVM: Check for SVM support in CPU compatibility checks [v2,39/50] KVM: x86: Move CPU compat checks hook to kvm_x86_ops (from kvm_x86_init_ops) [v2,40/50] KVM: x86: Do compatibility checks when onlining CPU [v2,41/50] KVM: Rename and move CPUHP_AP_KVM_STARTING to ONLINE section [v2,42/50] KVM: Disable CPU hotplug during hardware enabling/disabling [v2,43/50] KVM: Ensure CPU is stable during low level hardware enable/disable [v2,44/50] KVM: Drop kvm_count_lock and instead protect kvm_usage_count with kvm_lock [v2,45/50] KVM: Remove on_each_cpu(hardware_disable_nolock) in kvm_exit() [v2,46/50] KVM: Use a per-CPU variable to track which CPUs have enabled virtualization [v2,47/50] KVM: Make hardware_enable_failed a local variable in the "enable all" path [v2,48/50] KVM: Register syscore (suspend/resume) ops early in kvm_init() [v2,49/50] KVM: Opt out of generic hardware enabling on s390 and PPC [v2,50/50] KVM: Clean up error labels in kvm_init()

Checks

Context	Check	Description
conchuod/tree_selection	fail	Guessing tree name failed

Commit Message

Sean Christopherson Nov. 30, 2022, 11:08 p.m. UTC

Move the call to kvm_vfio_ops_exit() further up kvm_exit() to try and
bring some amount of symmetry to the setup order in kvm_init(), and more
importantly so that the arch hooks are invoked dead last by kvm_exit().
This will allow arch code to move away from the arch hooks without any
change in ordering between arch code and common code in kvm_exit().

That kvm_vfio_ops_exit() is called last appears to be 100% arbitrary.  It
was bolted on after the fact by commit 571ee1b68598 ("kvm: vfio: fix
unregister kvm_device_ops of vfio").  The nullified kvm_device_ops_table
is also local to kvm_main.c and is used only when there are active VMs,
so unless arch code is doing something truly bizarre, nullifying the
table earlier in kvm_exit() is little more than a nop.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
---
 virt/kvm/kvm_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index ded88ad6c2d8..988f7d92db2e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -5980,6 +5980,7 @@  void kvm_exit(void)
 	for_each_possible_cpu(cpu)
 		free_cpumask_var(per_cpu(cpu_kick_mask, cpu));
 	kmem_cache_destroy(kvm_vcpu_cache);
+	kvm_vfio_ops_exit();
 	kvm_async_pf_deinit();
 	unregister_syscore_ops(&kvm_syscore_ops);
 	unregister_reboot_notifier(&kvm_reboot_notifier);
@@ -5989,7 +5990,6 @@  void kvm_exit(void)
 	free_cpumask_var(cpus_hardware_enabled);
 	kvm_arch_hardware_unsetup();
 	kvm_arch_exit();
-	kvm_vfio_ops_exit();
 }
 EXPORT_SYMBOL_GPL(kvm_exit);