Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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.
This commit is contained in:
Brian Behlendorf 2009-12-23 12:46:11 -08:00
parent 3a03ce5cbf
commit 641bebe35f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/splat/splat-kmem.c
View File

@ -418,9 +418,10 @@ splat_kmem_cache_test_reclaim(void *priv)
for (i = 0; i < kcp->kcp_kct_count; i++) { for (i = 0; i < kcp->kcp_kct_count; i++) {
spin_lock(&kcp->kcp_lock); spin_lock(&kcp->kcp_lock);
kct = kcp->kcp_kct[i]; kct = kcp->kcp_kct[i];
spin_unlock(&kcp->kcp_lock); if (!kct) {
if (!kct) spin_unlock(&kcp->kcp_lock);
continue; continue;
}
spin_lock(&kct->kct_lock); spin_lock(&kct->kct_lock);
count = kct->kct_kcd_count * SPLAT_KMEM_OBJ_RECLAIM / 100; 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(&kct->kct_lock);
spin_unlock(&kcp->kcp_lock);
} }
return; return;