Drivers: hv: vmbus: Skip VMBus module cleanup for non-nested root partition
Subsystems (2)
PATCH v3 1/1 Drivers: hv: vmbus: Skip VMBus module cleanup for non-nested root partition
The VMBus module initialization function, hv_acpi_init(), currently does nothing when running in the root partition and root is not nested in another VM. But the initialization function reports success, so the VMBus module is indeed loaded. VMBus functionality is not actually needed, but the VMBus module must be loaded so that hv_vmbus_exists() can answer correctly. Furthermore, the mshv_root dependency on the VMBus module is needed as described in the commit message for 840b740a35bf ("mshv: Add conditional VMBus dependency").
Loading the VMBus module without actually initializing it causes failures if the module should later be unloaded. The module unload code tries to clean up things that were never initialized, resulting in memory faults and a panic.
Fix this by having VMBus module exit function perform the same check for non-nested root partition, and do nothing in such a case, just like hv_acpi_init().
In the long run, the code that manages the Hyper-V provided SynIC should be refactored to better coordinate the requirements of root partition scenarios and normal VM scenarios, and to hopefully remove the hv_vmbus_exists() dependnecy between mshv_root and VMBus modules. Preventing the current unload failure scenario is an expediency until such a refactoring is done.
---
v2: https://lore.kernel.org/linux-hyperv/[email protected]/
v1: https://lore.kernel.org/linux-hyperv/[email protected]/
Changes in v3:
* Add code comments in hv_acpi_init() and in vmbus_exit(). No code changes. [Easwar Hariharan]
Changes in v2:
* Use a different solution: Allow the VMBus module to load but have the unload function do nothing for non-nested root
* Change the patch Subject and commit message to reflect the new approach
drivers/hv/vmbus_drv.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/hv/vmbus_drv.c +15 -0
@@ -2982,6 +2982,13 @@ static int __init hv_acpi_init(void)return -ENODEV ;if (hv_root_partition () && !hv_nested) +/* +* A non-nested root partition does not need VMBus client +* functionality. However, the mshv_root module may have +* a dependency on the VMBus module as described in +* commit 840b740a35bf. Return success so the module +* loads even though no VMBus initialization is done. +*/ return 0 ;/*
@@ -3030,6 +3037,14 @@ static void __exit vmbus_exit(void) {int cpu; +if (hv_root_partition () && !hv_nested) +/* +* If a non-nested root partition loaded the VMBus module, +* hv_acpi_init() did not do any VMBus initialization. +* There's nothing to clean up, so just return. +*/ +return ; +unregister_syscore (&hv_synic_syscore);hv_remove_kexec_handler ();
Signature · 1 line
2.25.1
Quoted 25 lines · Michael Kelley
The VMBus module initialization function,
hv_acpi_init(), currently does nothing when running in the root partition and root is not nested in another VM. But the initialization function reports success, so the VMBus module is indeed loaded. VMBus functionality is not actually needed, but the VMBus module must be loaded so thathv_vmbus_exists()can answer correctly. Furthermore, themshv_rootdependency on the VMBus module is needed as described in the commit message for840b740a35bf("mshv: Add conditional VMBus dependency").Loading the VMBus module without actually initializing it causes failures if the module should later be unloaded. The module unload code tries to clean up things that were never initialized, resulting in memory faults and a panic.
Fix this by having VMBus module exit function perform the same check for non-nested root partition, and do nothing in such a case, just like
hv_acpi_init().In the long run, the code that manages the Hyper-V provided SynIC should be refactored to better coordinate the requirements of root partition scenarios and normal VM scenarios, and to hopefully remove the
hv_vmbus_exists()dependnecy betweenmshv_rootand VMBus modules. Preventing the current unload failure scenario is an expediency until such a refactoring is done.
Quoted 5 lines
Reported-by Sashiko <[email protected]>Fixes 7e279d78664aa ("Drivers: hv: vmbus: skip VMBus initialization if Linux is root")Signed-off-by Michael Kelley <[email protected]>Reviewed-by Easwar Hariharan <[email protected]>
Applied. Thanks.