svn commit: r252544 - stable/8/sys/kern

[Lawrence Stewart]

Author: lstewart
Date: Wed Jul  3 06:23:46 2013
New Revision: 252544
URL: http://svnweb.freebsd.org/changeset/base/252544

Log:
  MFC r251787:
  
  Move hhook's per-vnet initialisation to an earlier SYSINIT SI_SUB stage to
  ensure all per-vnet related hhook initialisation is completed prior to any
  virtualised hhook points attempting registration.
  
  vnet_register_sysinit() requires that a stage later than SI_SUB_VNET be chosen.
  There are no per-vnet initialisors in the source tree at this time which run
  earlier than SI_SUB_INIT_IF. A quick audit of non-virtualised SYSINITs indicates
  there are no subsystems pre SI_SUB_MBUF that would likely be interested in
  registering a virtualised hhook point.
  
  Settle on SI_SUB_MBUF as hhook's per-vnet initialisation stage as it's the first
  overtly network-related initilisation stage to run after SI_SUB_VNET. If a
  subsystem that initialises earlier than SI_SUB_MBUF ends up wanting to register
  virtualised hhook points in future, hhook's use of SI_SUB_MBUF will need to be
  revisited and would probably warrant creating a dedicated SI_SUB_HHOOK which
  runs immediately after SI_SUB_VNET.

Modified:
  stable/8/sys/kern/kern_hhook.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/kern/   (props changed)

Modified: stable/8/sys/kern/kern_hhook.c
==============================================================================
--- stable/8/sys/kern/kern_hhook.c	Wed Jul  3 06:20:47 2013	(r252543)
+++ stable/8/sys/kern/kern_hhook.c	Wed Jul  3 06:23:46 2013	(r252544)
@@ -509,7 +509,7 @@ hhook_vnet_uninit(const void *unused __u
 /*
  * When a vnet is created and being initialised, init the V_hhook_vhead_list.
  */
-VNET_SYSINIT(hhook_vnet_init, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST,
+VNET_SYSINIT(hhook_vnet_init, SI_SUB_MBUF, SI_ORDER_FIRST,
     hhook_vnet_init, NULL);
 
 /*
@@ -517,5 +517,5 @@ VNET_SYSINIT(hhook_vnet_init, SI_SUB_PRO
  * points to clean up on vnet tear down, but in case the KPI is misused,
  * provide a function to clean up and free memory for a vnet being destroyed.
  */
-VNET_SYSUNINIT(hhook_vnet_uninit, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST,
+VNET_SYSUNINIT(hhook_vnet_uninit, SI_SUB_MBUF, SI_ORDER_ANY,
     hhook_vnet_uninit, NULL);