KVM: Prevent module exit until all VMs are freed
Subsystems (2)
cover KVM: Prevent module exit until all VMs are freed
[Resending with --cc-cover to fix CCs.]
This series fixes a long-standing theoretical bug where the KVM module can be unloaded while there are still references to a struct kvm. This can be reproduced with a simple patch [1] to run some delayed work 10 seconds after a VM file descriptor is released.
This bug was originally fixed by Ben Gardon <[email protected]> in Google's kernel due to a race with an internal kernel daemon.
KVM's async_pf code looks susceptible to this race since its inception, but clearly no one has noticed. Upcoming changes to the TDP MMU will move zapping to asynchronous workers which is much more likely to hit this issue. Fix it now to close the gap in async_pf and prepare for the TDP MMU zapping changes.
While here I noticed some further cleanups that could be done in the async_pf code. It seems unnecessary for the async_pf code to grab a reference via kvm_get_kvm() because there's code to synchronously drain its queue of work in kvm_destroy_vm() -> ... -> kvm_clear_async_pf_completion_queue() (at least on x86). This is actually dead code because kvm_destroy_vm() will never be called while there are references to kvm.users_count (which the async_pf callbacks themselves hold). It seems we could either drop the reference grabbing in async_pf.c or drop the call to kvm_clear_async_pf_completion_queue().
These patches apply on the latest kvm/queue commit b13a3befc815 ("KVM:
selftests: Add test to populate a VM with the max possible guest mem") after reverting commit c9bdd0aa6800 ("KVM: allow struct kvm to outlive the file descriptors").
[1] To repro: Apply the following patch, run a KVM selftest, and then unload the KVM module within 10 seconds of the selftest finishing. The kernel will panic. With the fix applied, module unloading will fail until the final struct kvm reference is put.
include/linux/kvm_host.h +2 -0
@@ -771,6 +771,8 @@ struct kvm {struct notifier_block pm_notifier;#endif char stats_id[KVM_STATS_NAME_SIZE ]; + +struct delayed_work run_after_vm_release_work; };#define kvm_err (fmt, ...) \
virt/kvm/kvm_main.c +13 -0
@@ -1258,12 +1258,25 @@ void kvm_put_kvm_no_destroy(struct kvm *kvm) }EXPORT_SYMBOL_GPL (kvm_put_kvm_no_destroy); +static void run_after_vm_release (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct kvm *kvm = container_of(dwork, struct kvm, run_after_vm_release_work); + +pr_info ("I'm still alive!\n" ); +kvm_put_kvm (kvm); +} +static int kvm_vm_release (struct inode *inode,struct file *filp) {struct kvm *kvm = filp->private_data;kvm_irqfd_release (kvm); +kvm_get_kvm (kvm); +INIT_DELAYED_WORK (&kvm->run_after_vm_release_work, run_after_vm_release); +schedule_delayed_work (&kvm->run_after_vm_release_work,10 *HZ ); +kvm_put_kvm (kvm);return 0 ; }
David Matlack (2):
KVM: Prevent module exit until all VMs are freed Revert "KVM: set owner of cpu and vm file operations"
virt/kvm/kvm_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
base-commit: b13a3befc815eae574d87e6249f973dfbb6ad6cd
prerequisite-patch-id: 38f66d60319bf0bc9bf49f91f0f9119e5441629b
prerequisite-patch-id: 51aa921d68ea649d436ea68e1b8f4aabc3805156
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
PATCH RESEND 1/2 KVM: Prevent module exit until all VMs are freed
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via kvm_get_kvm() cannot accidentally outlive the KVM module.
Prior to this commit, the lifetime of the KVM module was tied to the lifetime of /dev/kvm file descriptors, VM file descriptors, and vCPU file descriptors by their respective file_operations "owner" field. This approach is insufficient because references grabbed via kvm_get_kvm() do not prevent closing any of the aforementioned file descriptors.
This fixes a long standing theoretical bug in KVM that at least affects async page faults. kvm_setup_async_pf() grabs a reference via kvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.
--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
virt/kvm/kvm_main.c +8 -0
@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT
@@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm); +if (!try_module_get (kvm_chardev_ops.owner)) { + r = -ENODEV ; + goto out_err; + } +return kvm; out_err:
@@ -1220,6 +1227,7 @@ static void kvm_destroy_vm(struct kvm *kvm)preempt_notifier_dec ();hardware_disable_all ();mmdrop (mm); +module_put (kvm_chardev_ops.owner); }void kvm_get_kvm (struct kvm *kvm)
base-commit: b13a3befc815eae574d87e6249f973dfbb6ad6cd
prerequisite-patch-id: 38f66d60319bf0bc9bf49f91f0f9119e5441629b
prerequisite-patch-id: 51aa921d68ea649d436ea68e1b8f4aabc3805156
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
Sean Christopherson
reviewerQuoted 11 lines · David Matlack
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via
kvm_get_kvm()cannot accidentally outlive the KVM module.Prior to this commit, the lifetime of the KVM module was tied to the lifetime of
/dev/kvmfile descriptors, VM file descriptors, and vCPU file descriptors by their respectivefile_operations"owner" field. This approach is insufficient because references grabbed viakvm_get_kvm()do not prevent closing any of the aforementioned file descriptors.
Quoted 7 lines
This fixes a long standing theoretical bug in KVM that at least affects async page faults.
kvm_setup_async_pf()grabs a reference viakvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.Fixes af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out")
And (or)
because the above is x86-centric, at a glance PPC and maybe s390 have issues beyond async #PF.
Quoted 22 lines
Suggested-by Ben Gardon <[email protected]>[ Based on a patch from Ben implemented for Google's kernel. ]Signed-off-by David Matlack <[email protected]>--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/kvm_main.c +2
-0@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT
virt/kvm/kvm_main.c static struct kvm *kvm_create_vm(unsigned long type) · line 1136
Quoted 4 lines
virt/kvm/kvm_main.c +1
-0@@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm); +if (!try_module_get (kvm_chardev_ops.owner)) {
The "try" aspect is unnecessary. Stealing from Paolo's version,
/* KVM is pinned via open("/dev/kvm"), the fd passed to this ioctl(). */
__module_get(kvm_chardev_ops.owner);Quoted 22 lines
virt/kvm/kvm_main.c +5
-0+ r = -ENODEV ; + goto out_err; + } +return kvm; out_err:@@ -1220,6 +1227,7 @@ static void kvm_destroy_vm(struct kvm *kvm)preempt_notifier_dec ();hardware_disable_all ();mmdrop (mm); +module_put (kvm_chardev_ops.owner); }void kvm_get_kvm (struct kvm *kvm)base-commit:
b13a3befc815eae574d87e6249f973dfbb6ad6cd
prerequisite-patch-id:38f66d60319bf0bc9bf49f91f0f9119e5441629b
prerequisite-patch-id:51aa921d68ea649d436ea68e1b8f4aabc3805156Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
Quoted 53 lines · Sean Christopherson
Quoted 11 lines · David Matlack
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via
kvm_get_kvm()cannot accidentally outlive the KVM module.Prior to this commit, the lifetime of the KVM module was tied to the lifetime of
/dev/kvmfile descriptors, VM file descriptors, and vCPU file descriptors by their respectivefile_operations"owner" field. This approach is insufficient because references grabbed viakvm_get_kvm()do not prevent closing any of the aforementioned file descriptors.Quoted 7 lines
This fixes a long standing theoretical bug in KVM that at least affects async page faults.
kvm_setup_async_pf()grabs a reference viakvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.Fixes af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out")And (or)
Fixes 3d3aab1b973b ("KVM: set owner of cpu and vm file operations")because the above is x86-centric, at a glance PPC and maybe s390 have issues beyond async #PF.
Quoted 25 lines
Suggested-by Ben Gardon <[email protected]>[ Based on a patch from Ben implemented for Google's kernel. ]Signed-off-by David Matlack <[email protected]>--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/kvm_main.c +2
-0@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT @@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm);
Quoted 6 lines
virt/kvm/kvm_main.c static struct kvm *kvm_create_vm(unsigned long type) · line 1136
Quoted 1 line
virt/kvm/kvm_main.c +1
-0+if (!try_module_get (kvm_chardev_ops.owner)) {The "try" aspect is unnecessary. Stealing from Paolo's version,
/* KVM is pinned via open("/dev/kvm"), the fd passed to this ioctl(). */ __module_get(kvm_chardev_ops.owner);
Right, I did see that and agree we're guaranteed the KVM module has a reference at this point. But the KVM module might be in state MODULE_STATE_GOING (e.g. if someone ran "rmmod --wait"), which try_module_get() checks.
Quoted 23 lines
Quoted 23 lines
virt/kvm/kvm_main.c +5
-0+ r = -ENODEV ; + goto out_err; + } +return kvm; out_err:@@ -1220,6 +1227,7 @@ static void kvm_destroy_vm(struct kvm *kvm)preempt_notifier_dec ();hardware_disable_all ();mmdrop (mm); +module_put (kvm_chardev_ops.owner); }void kvm_get_kvm (struct kvm *kvm)base-commit:
b13a3befc815eae574d87e6249f973dfbb6ad6cd
prerequisite-patch-id:38f66d60319bf0bc9bf49f91f0f9119e5441629b
prerequisite-patch-id:51aa921d68ea649d436ea68e1b8f4aabc3805156--
2.35.1.616.g0bdcbb4464-goog
Quoted 58 lines · David Matlack
Quoted 57 lines · Sean Christopherson
Quoted 11 lines · David Matlack
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via
kvm_get_kvm()cannot accidentally outlive the KVM module.Prior to this commit, the lifetime of the KVM module was tied to the lifetime of
/dev/kvmfile descriptors, VM file descriptors, and vCPU file descriptors by their respectivefile_operations"owner" field. This approach is insufficient because references grabbed viakvm_get_kvm()do not prevent closing any of the aforementioned file descriptors.Quoted 7 lines
This fixes a long standing theoretical bug in KVM that at least affects async page faults.
kvm_setup_async_pf()grabs a reference viakvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.Fixes af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out")And (or)
Fixes 3d3aab1b973b ("KVM: set owner of cpu and vm file operations")because the above is x86-centric, at a glance PPC and maybe s390 have issues beyond async #PF.
Quoted 22 lines
Suggested-by Ben Gardon <[email protected]>[ Based on a patch from Ben implemented for Google's kernel. ]Signed-off-by David Matlack <[email protected]>--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/kvm_main.c +2
-0@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT virt/kvm/kvm_main.c static struct kvm *kvm_create_vm(unsigned long type) · line 1136
Quoted 4 lines
virt/kvm/kvm_main.c +1
-0@@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm); +if (!try_module_get (kvm_chardev_ops.owner)) {The "try" aspect is unnecessary. Stealing from Paolo's version,
Quoted 7 lines
Quoted 2 lines
/* KVM is pinned via open("/dev/kvm"), the fd passed to this ioctl(). */ __module_get(kvm_chardev_ops.owner);Right, I did see that and agree we're guaranteed the KVM module has a reference at this point. But the KVM module might be in state
MODULE_STATE_GOING(e.g. if someone ran "rmmod --wait"), whichtry_module_get()checks.
Ah, can you throw that in as a comment? Doesn't have to be much, just enough of a breadcrumb to connect the dots and to prevent us from "optimizing" this to __module_get() in the future.
/* Use the "try" variant to play nice with e.g. "rmmod --wait". */
With a comment,
Quoted 68 lines · Sean Christopherson
Quoted 58 lines · David Matlack
Quoted 57 lines · Sean Christopherson
Quoted 11 lines · David Matlack
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via
kvm_get_kvm()cannot accidentally outlive the KVM module.Prior to this commit, the lifetime of the KVM module was tied to the lifetime of
/dev/kvmfile descriptors, VM file descriptors, and vCPU file descriptors by their respectivefile_operations"owner" field. This approach is insufficient because references grabbed viakvm_get_kvm()do not prevent closing any of the aforementioned file descriptors.Quoted 7 lines
This fixes a long standing theoretical bug in KVM that at least affects async page faults.
kvm_setup_async_pf()grabs a reference viakvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.Fixes af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out")And (or)
Fixes 3d3aab1b973b ("KVM: set owner of cpu and vm file operations")because the above is x86-centric, at a glance PPC and maybe s390 have issues beyond async #PF.
Quoted 22 lines
Suggested-by Ben Gardon <[email protected]>[ Based on a patch from Ben implemented for Google's kernel. ]Signed-off-by David Matlack <[email protected]>--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/kvm_main.c +2
-0@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT virt/kvm/kvm_main.c static struct kvm *kvm_create_vm(unsigned long type) · line 1136
Quoted 4 lines
virt/kvm/kvm_main.c +1
-0@@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm); +if (!try_module_get (kvm_chardev_ops.owner)) {The "try" aspect is unnecessary. Stealing from Paolo's version,
Quoted 7 lines
Quoted 2 lines
/* KVM is pinned via open("/dev/kvm"), the fd passed to this ioctl(). */ __module_get(kvm_chardev_ops.owner);Right, I did see that and agree we're guaranteed the KVM module has a reference at this point. But the KVM module might be in state
MODULE_STATE_GOING(e.g. if someone ran "rmmod --wait"), whichtry_module_get()checks.
Quoted 5 lines
Ah, can you throw that in as a comment? Doesn't have to be much, just enough of a breadcrumb to connect the dots and to prevent us from "optimizing" this to
__module_get()in the future./* Use the "try" variant to play nice with e.g. "rmmod --wait". */
Yeah. I should have included this in the first place (or at least a blurb in the commit message).
Quoted 4 lines
With a comment,
Reviewed-by Sean Christopherson <[email protected]>
Quoted 19 lines · Sean Christopherson
Quoted 17 lines · David Matlack
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via
kvm_get_kvm()cannot accidentally outlive the KVM module.Prior to this commit, the lifetime of the KVM module was tied to the lifetime of
/dev/kvmfile descriptors, VM file descriptors, and vCPU file descriptors by their respectivefile_operations"owner" field. This approach is insufficient because references grabbed viakvm_get_kvm()do not prevent closing any of the aforementioned file descriptors.This fixes a long standing theoretical bug in KVM that at least affects async page faults.
kvm_setup_async_pf()grabs a reference viakvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.
Quoted 8 lines
Quoted 1 line
Fixes af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out")And (or)
Fixes 3d3aab1b973b ("KVM: set owner of cpu and vm file operations")because the above is x86-centric, at a glance PPC and maybe s390 have issues beyond async #PF.
SGTM. It's a moot point in terms of stable inclusion since af585b921e5d was first added in v2.6.38. But for anyone doing their own backporting, 3d3aab1b973b makes it a bit more obvious this is a generic problem even though it's not the commit that introduces the bug.
Quoted 55 lines
Quoted 23 lines
Suggested-by Ben Gardon <[email protected]>[ Based on a patch from Ben implemented for Google's kernel. ]Signed-off-by David Matlack <[email protected]>--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/kvm_main.c +2
-0@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT virt/kvm/kvm_main.c static struct kvm *kvm_create_vm(unsigned long type) · line 1136
Quoted 4 lines
virt/kvm/kvm_main.c +1
-0@@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm); +if (!try_module_get (kvm_chardev_ops.owner)) {The "try" aspect is unnecessary. Stealing from Paolo's version,
/* KVM is pinned via open("/dev/kvm"), the fd passed to this ioctl(). */ __module_get(kvm_chardev_ops.owner);Quoted 22 lines
virt/kvm/kvm_main.c +5
-0+ r = -ENODEV ; + goto out_err; + } +return kvm; out_err:@@ -1220,6 +1227,7 @@ static void kvm_destroy_vm(struct kvm *kvm)preempt_notifier_dec ();hardware_disable_all ();mmdrop (mm); +module_put (kvm_chardev_ops.owner); }void kvm_get_kvm (struct kvm *kvm)base-commit:
b13a3befc815eae574d87e6249f973dfbb6ad6cd
prerequisite-patch-id:38f66d60319bf0bc9bf49f91f0f9119e5441629b
prerequisite-patch-id:51aa921d68ea649d436ea68e1b8f4aabc3805156--
2.35.1.616.g0bdcbb4464-goog
Hi, David.
Some comments below.
Quoted 40 lines · David Matlack
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via
kvm_get_kvm()cannot accidentally outlive the KVM module.Prior to this commit, the lifetime of the KVM module was tied to the lifetime of
/dev/kvmfile descriptors, VM file descriptors, and vCPU file descriptors by their respectivefile_operations"owner" field. This approach is insufficient because references grabbed viakvm_get_kvm()do not prevent closing any of the aforementioned file descriptors.This fixes a long standing theoretical bug in KVM that at least affects async page faults.
kvm_setup_async_pf()grabs a reference viakvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.Fixes af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out")Suggested-by Ben Gardon <[email protected]>[ Based on a patch from Ben implemented for Google's kernel. ]Signed-off-by David Matlack <[email protected]>--- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/kvm_main.c +2
-0@@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT
virt/kvm/kvm_main.c static struct kvm *kvm_create_vm(unsigned long type) · line 1140
Quoted 8 lines
virt/kvm/kvm_main.c +5
-0@@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type)preempt_notifier_inc ();kvm_init_pm_notifier (kvm); +if (!try_module_get (kvm_chardev_ops.owner)) { + r = -ENODEV ; + goto out_err; + } +
Doesn't this problem also affects the other functions called from kvm_dev_ioctl()?
Is it possible that the module is removed while other ioctl's are still running, e.g. KVM_GET_API_VERSION and KVM_CHECK_EXTENSION, even though they don't use struct kvm?
I wonder if this try_module_get() (along with module_put() in the out path of the function) shouldn't be placed in the upper function kvm_dev_ioctl() so it would cover all the other ioctl's.
Quoted 15 lines
virt/kvm/kvm_main.c +1
-0return kvm; out_err:@@ -1220,6 +1227,7 @@ static void kvm_destroy_vm(struct kvm *kvm)preempt_notifier_dec ();hardware_disable_all ();mmdrop (mm); +module_put (kvm_chardev_ops.owner); }void kvm_get_kvm (struct kvm *kvm)base-commit:
b13a3befc815eae574d87e6249f973dfbb6ad6cd
prerequisite-patch-id:38f66d60319bf0bc9bf49f91f0f9119e5441629b
prerequisite-patch-id:51aa921d68ea649d436ea68e1b8f4aabc3805156
Signature · 1 line
Murilo
Paolo Bonzini
maintainerQuoted 7 lines · Murilo Opsfelder Araújo
Quoted 6 lines
+ if (!try_module_get(kvm_chardev_ops.owner)) { + r =
-ENODEV;
+ gotoout_err;
+ }
+
Quoted 6 lines
Doesn't this problem also affects the other functions called from
kvm_dev_ioctl()?Is it possible that the module is removed while other ioctl's are still running, e.g.
KVM_GET_API_VERSIONandKVM_CHECK_EXTENSION, even though they don't use struct kvm?
No, because opening /dev/kvm also adds a reference to the module. The problem is that create_vm creates another source of references to the module that can survive after /dev/kvm is closed.
Paolo
PATCH RESEND 2/2 Revert "KVM: set owner of cpu and vm file operations"
In reply to David MatlackThis reverts commit 3d3aab1b973b01bd2a1aa46307e94a1380b1d802.
Now that the KVM module's lifetime is tied to kvm.users_count, there is no need to also tie it's lifetime to the lifetime of the VM and vCPU file descriptors.
--- virt/kvm/kvm_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
virt/kvm/kvm_main.c +2 -4
@@ -3684,7 +3684,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)return 0 ; } -static struct file_operations kvm_vcpu_fops = { +static const struct file_operations kvm_vcpu_fops = { .release = kvm_vcpu_release, .unlocked_ioctl = kvm_vcpu_ioctl, .mmap = kvm_vcpu_mmap,
@@ -4735,7 +4735,7 @@ static long kvm_vm_compat_ioctl(struct file *filp, }#endif -static struct file_operations kvm_vm_fops = { +static const struct file_operations kvm_vm_fops = { .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, .llseek = noop_llseek,
@@ -5744,8 +5744,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, goto out_free_5; kvm_chardev_ops.owner = module; - kvm_vm_fops.owner = module; - kvm_vcpu_fops.owner = module; r =misc_register (&kvm_dev);if (r) {
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
Re: [PATCH RESEND 2/2] Revert "KVM: set owner of cpu and vm file operations"
Quoted 9 lines · David Matlack
This reverts commit
3d3aab1b973b01bd2a1aa46307e94a1380b1d802.Now that the KVM module's lifetime is tied to kvm.users_count, there is no need to also tie it's lifetime to the lifetime of the VM and vCPU file descriptors.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by David Matlack <[email protected]>---
Paolo Bonzini
maintainerQuoted 16 lines · David Matlack
[Resending with --cc-cover to fix CCs.]
This series fixes a long-standing theoretical bug where the KVM module can be unloaded while there are still references to a struct kvm. This can be reproduced with a simple patch [1] to run some delayed work 10 seconds after a VM file descriptor is released.
This bug was originally fixed by Ben Gardon <[email protected]> in Google's kernel due to a race with an internal kernel daemon.
KVM's
async_pfcode looks susceptible to this race since its inception, but clearly no one has noticed. Upcoming changes to the TDP MMU will move zapping to asynchronous workers which is much more likely to hit this issue. Fix it now to close the gap inasync_pfand prepare for the TDP MMU zapping changes.
Quoted 9 lines
While here I noticed some further cleanups that could be done in the
async_pfcode. It seems unnecessary for theasync_pfcode to grab a reference viakvm_get_kvm()because there's code to synchronously drain its queue of work inkvm_destroy_vm()-> ... ->kvm_clear_async_pf_completion_queue()(at least on x86). This is actually dead code becausekvm_destroy_vm()will never be called while there are references to kvm.users_count (which theasync_pfcallbacks themselves hold). It seems we could either drop the reference grabbing inasync_pf.cor drop the call tokvm_clear_async_pf_completion_queue().
Adding a WARN makes sense, but then you'd probably keep the call anyway just to avoid a use-after-free in case the WARN triggers.
Queued with a note on patch 1:
+ /*
+ * When the fd passed to this ioctl() is opened it pins the module,
+ * but try_module_get() also prevents getting a reference if the module
+ * is in MODULE_STATE_GOING (e.g. if someone ran "rmmod --wait").
+ */
Thanks,
Paolo
Quoted 4 lines
These patches apply on the latest kvm/queue commit
b13a3befc815("KVM:
selftests: Add test to populate a VM with the max possible guest mem") after reverting commitc9bdd0aa6800("KVM: allow struct kvm to outlive the file descriptors").