diff options
| author | Tim Chase <[email protected]> | 2013-05-30 21:52:36 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-06-18 11:40:33 -0700 |
| commit | 5c7a0369e225d306e53bd8011c58fa0f5e827865 (patch) | |
| tree | 42693eaddc7a844ecdc5af951338779c8cfcb195 /module | |
| parent | 99c452bbbaeaa8fae498da1774d81e146bdd45ed (diff) | |
Fix --enable-debug-kmem-tracking option
Re-order initialization in spl_kmem_init to allow for kmem tracing
to work. The spl_kmem_init function calls taskq_create prior to
initializing the tracking (calling spl_kmem_init_tracking). Since
taskq_create uses kmem_alloc, NULL dereferences occur because the
global kmem_list hasn't had its next & prev pointers initialized yet.
This commit moves the calls to spl_kmem_init_tracking earlier in the
spl_kmem_init function in order that the subsequent kmem_alloc calls
(by taskq_create) work properly.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #243
Diffstat (limited to 'module')
| -rw-r--r-- | module/spl/spl-kmem.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index a0ca2d2be..f64c0441d 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -2418,13 +2418,6 @@ spl_kmem_init(void) int rc = 0; SENTRY; - init_rwsem(&spl_kmem_cache_sem); - INIT_LIST_HEAD(&spl_kmem_cache_list); - spl_kmem_cache_taskq = taskq_create("spl_kmem_cache", - 1, maxclsyspri, 1, 32, TASKQ_PREPOPULATE); - - spl_register_shrinker(&spl_kmem_cache_shrinker); - #ifdef DEBUG_KMEM kmem_alloc_used_set(0); vmem_alloc_used_set(0); @@ -2432,6 +2425,14 @@ spl_kmem_init(void) spl_kmem_init_tracking(&kmem_list, &kmem_lock, KMEM_TABLE_SIZE); spl_kmem_init_tracking(&vmem_list, &vmem_lock, VMEM_TABLE_SIZE); #endif + + init_rwsem(&spl_kmem_cache_sem); + INIT_LIST_HEAD(&spl_kmem_cache_list); + spl_kmem_cache_taskq = taskq_create("spl_kmem_cache", + 1, maxclsyspri, 1, 32, TASKQ_PREPOPULATE); + + spl_register_shrinker(&spl_kmem_cache_shrinker); + SRETURN(rc); } |