mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-14 14:55:41 +00:00
Code Issues Releases Activity

- Explicitly acquire Giant around SYSINIT's and SYSUNINIT's since they are

Browse Source 
not all known to be MPSAFE yet.
- Actually remove Giant from the kernel linker by taking it out of the
  KLD_LOCK() and KLD_UNLOCK() macros.

Pointy hat to:	jhb (2)
This commit is contained in:
John Baldwin 2006-07-06 21:39:39 +00:00
parent d699b1ce00
commit 398c993b2a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=160142
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/kern/kern_linker.c
View File

@ -62,10 +62,13 @@ __FBSDID("$FreeBSD$");
int kld_debug = 0; int kld_debug = 0;
#endif #endif
#define KLD_LOCK() do { sx_xlock(&kld_sx); mtx_lock(&Giant); } while (0) #define KLD_LOCK() sx_xlock(&kld_sx)
#define KLD_UNLOCK() do { mtx_unlock(&Giant); sx_xunlock(&kld_sx); } while (0) #define KLD_UNLOCK() sx_xunlock(&kld_sx)
#define KLD_LOCKED() sx_xlocked(&kld_sx) #define KLD_LOCKED() sx_xlocked(&kld_sx)
#define KLD_LOCK_ASSERT() do { if (!cold) sx_assert(&kld_sx, SX_XLOCKED); } while (0) #define KLD_LOCK_ASSERT() do { \
if (!cold) \
sx_assert(&kld_sx, SX_XLOCKED); \
} while (0)
/* /*
* static char *linker_search_path(const char *name, struct mod_depend * static char *linker_search_path(const char *name, struct mod_depend
@ -212,6 +215,7 @@ linker_file_sysinit(linker_file_t lf)
* Traverse the (now) ordered list of system initialization tasks. * Traverse the (now) ordered list of system initialization tasks.
* Perform each task, and continue on to the next task. * Perform each task, and continue on to the next task.
*/ */
mtx_lock(&Giant);
for (sipp = start; sipp < stop; sipp++) { for (sipp = start; sipp < stop; sipp++) {
if ((*sipp)->subsystem == SI_SUB_DUMMY) if ((*sipp)->subsystem == SI_SUB_DUMMY)
continue; /* skip dummy task(s) */ continue; /* skip dummy task(s) */
@ -219,6 +223,7 @@ linker_file_sysinit(linker_file_t lf)
/* Call function */ /* Call function */
(*((*sipp)->func)) ((*sipp)->udata); (*((*sipp)->func)) ((*sipp)->udata);
} }
mtx_unlock(&Giant);
} }
static void static void
@ -256,6 +261,7 @@ linker_file_sysuninit(linker_file_t lf)
* Traverse the (now) ordered list of system initialization tasks. * Traverse the (now) ordered list of system initialization tasks.
* Perform each task, and continue on to the next task. * Perform each task, and continue on to the next task.
*/ */
mtx_lock(&Giant);
for (sipp = start; sipp < stop; sipp++) { for (sipp = start; sipp < stop; sipp++) {
if ((*sipp)->subsystem == SI_SUB_DUMMY) if ((*sipp)->subsystem == SI_SUB_DUMMY)
continue; /* skip dummy task(s) */ continue; /* skip dummy task(s) */
@ -263,6 +269,7 @@ linker_file_sysuninit(linker_file_t lf)
/* Call function */ /* Call function */
(*((*sipp)->func)) ((*sipp)->udata); (*((*sipp)->func)) ((*sipp)->udata);
} }
mtx_unlock(&Giant);
} }
static void static void