diff options
| author | Brian Behlendorf <[email protected]> | 2009-12-23 12:46:11 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-12-23 12:46:11 -0800 |
| commit | 641bebe35f0675489357fd2db5d20e1bfc055648 (patch) | |
| tree | c827bda35e078b0cd338b8e2726bf6795e15b058 /module | |
| parent | 3a03ce5cbf61def830905dfab0f43d5b6074f921 (diff) | |
Fix kmem:slab_overcommit regression test locking
This regression test could crash in splat_kmem_cache_test_reclaim()
due to a race between the slab relclaim and the normal exiting of
the thread. Specifically, the kct structure could be free'd by
the thread performing the allocations while the reclaim function
was also working on that's threads kct structure. The simplest
fix is to extend the kcp->kcp_lock over the reclaim to prevent
the kct from being freed. A better fix would be to ref count
these structures, but since is just a regression this locking
change is enough. Surprisingly this was only observed commonly
under RHEL5.4 but all platform could have hit this.
Diffstat (limited to 'module')
| -rw-r--r-- | module/splat/splat-kmem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/module/splat/splat-kmem.c b/module/splat/splat-kmem.c index 6957f1f1c..c743dd163 100644 --- a/module/splat/splat-kmem.c +++ b/module/splat/splat-kmem.c @@ -418,9 +418,10 @@ splat_kmem_cache_test_reclaim(void *priv) for (i = 0; i < kcp->kcp_kct_count; i++) { spin_lock(&kcp->kcp_lock); kct = kcp->kcp_kct[i]; - spin_unlock(&kcp->kcp_lock); - if (!kct) + if (!kct) { + spin_unlock(&kcp->kcp_lock); continue; + } spin_lock(&kct->kct_lock); count = kct->kct_kcd_count * SPLAT_KMEM_OBJ_RECLAIM / 100; @@ -435,6 +436,7 @@ splat_kmem_cache_test_reclaim(void *priv) } } spin_unlock(&kct->kct_lock); + spin_unlock(&kcp->kcp_lock); } return; |