]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: VMX: Reinstate __exit attribute for vmx_exit()
authorCostas Argyris <costas.argyris@amd.com>
Thu, 2 Jan 2025 15:40:50 +0000 (15:40 +0000)
committerSean Christopherson <seanjc@google.com>
Wed, 8 Jan 2025 22:10:05 +0000 (14:10 -0800)
Tag vmx_exit() with __exit now that it's no longer used by vmx_init().

Commit a7b9020b06ec ("x86/l1tf: Handle EPT disabled state proper") dropped
the "__exit" attribute from vmx_exit() because vmx_init() was changed to
call vmx_exit().

However, commit e32b120071ea ("KVM: VMX: Do _all_ initialization before
exposing /dev/kvm to userspace") changed vmx_init() to call __vmx_exit()
instead of the "full" vmx_exit().  This made it possible to mark vmx_exit()
as "__exit" again, as it originally was, and enjoy the benefits that it
provides (the function can be discarded from memory in situations where it
cannot be called, like the module being built-in or module unloading being
disabled in the kernel).

Signed-off-by: Costas Argyris <costas.argyris@amd.com>
Link: https://lore.kernel.org/r/20250102154050.2403-1-costas.argyris@amd.com
[sean: massage changelog]
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/vmx/vmx.c

index 5f25173b7a6ca5da6c4939b2e312f00b460001b9..a5dbd8f51eedf452b28ad88e46ed2c0a4725f204 100644 (file)
@@ -8605,7 +8605,7 @@ static void __vmx_exit(void)
        vmx_cleanup_l1d_flush();
 }
 
-static void vmx_exit(void)
+static void __exit vmx_exit(void)
 {
        kvm_exit();
        __vmx_exit();