svn commit: r245704 - head/sys/amd64/vmm

[Neel Natu]

Author: neel
Date: Mon Jan 21 01:33:10 2013
New Revision: 245704
URL: http://svnweb.freebsd.org/changeset/base/245704

Log:
  Postpone vmm module initialization until after SMP is initialized - particularly
  that 'smp_started != 0'.
  
  This is required because the VT-x initialization calls smp_rendezvous()
  to set the CR4_VMXE bit on all the cpus.
  
  With this change we can preload vmm.ko from the loader.
  
  Reported by:	alfred@, sbruno@
  Obtained from:	NetApp

Modified:
  head/sys/amd64/vmm/vmm.c

Modified: head/sys/amd64/vmm/vmm.c
==============================================================================
--- head/sys/amd64/vmm/vmm.c	Mon Jan 21 01:02:49 2013	(r245703)
+++ head/sys/amd64/vmm/vmm.c	Mon Jan 21 01:33:10 2013	(r245704)
@@ -249,11 +249,15 @@ static moduledata_t vmm_kmod = {
 };
 
 /*
- * Execute the module load handler after the pci passthru driver has had
- * a chance to claim devices. We need this information at the time we do
- * iommu initialization.
+ * vmm initialization has the following dependencies:
+ *
+ * - iommu initialization must happen after the pci passthru driver has had
+ *   a chance to attach to any passthru devices (after SI_SUB_CONFIGURE).
+ *
+ * - VT-x initialization requires smp_rendezvous() and therefore must happen
+ *   after SMP is fully functional (after SI_SUB_SMP).
  */
-DECLARE_MODULE(vmm, vmm_kmod, SI_SUB_CONFIGURE + 1, SI_ORDER_ANY);
+DECLARE_MODULE(vmm, vmm_kmod, SI_SUB_SMP + 1, SI_ORDER_ANY);
 MODULE_VERSION(vmm, 1);
 
 SYSCTL_NODE(_hw, OID_AUTO, vmm, CTLFLAG_RW, NULL, NULL);