On Thu, 2006-07-13 at 11:18 +0200, Ingo Molnar wrote:
> * Andrew Morton <[email protected]> wrote:
>
> > > ---
> > > mm/slab.c | 45 +++++++++++++++++++++++++--------------------
> >
> > geeze, what fuss. Can't we just tell lockdep "the locking here is
> > correct, so buzz off"?
>
> well, lockdep already found a locking bug in slab.c, so by telling
> lockdep to buzz off we lose the proof of correctness :-)
>
> but i agree that this is getting a bit too intrusive. This patch is
> really just another expression of: 'slab locking is too complex', but i
> digress. Not all hope is lost though: Arjan thinks he can do a much
> simpler annotation.
I am hoping I can get away with just this patch; the idea is to give the
cache_cache slab a special lock type since it'll be nested all the time
(and has a natural ordering due to it's special position in the slab
code). I'm not yet sure I found all places where this stuff is
initialized (the slab code has gotten terribly complex with all the numa
stuff added to it); I've started to test this now at least and so far it
seems to work on my test box.
Index: linux-2.6.18-rc1/mm/slab.c
===================================================================
--- linux-2.6.18-rc1.orig/mm/slab.c
+++ linux-2.6.18-rc1/mm/slab.c
@@ -317,6 +317,16 @@ static void enable_cpucache(struct kmem_
static void cache_reap(void *unused);
/*
+ * Slab sometimes uses the kmalloc slabs to store the slab headers
+ * for other slabs "off slab".
+ * The locking for this is tricky in that it
+ * nests within the locks of all other slabs in a few
+ * places; to deal with this special locking we give
+ * this one slab a special class.
+ */
+static struct lock_class_key slab_name_lock_key;
+
+/*
* This function must be completely optimized away if a constant is passed to
* it. Mostly the same as what is in linux/slab.h except it returns an index.
*/
@@ -1443,6 +1453,7 @@ void __init kmem_cache_init(void)
/* Replace the static kmem_list3 structures for the boot cpu */
init_list(&cache_cache, &initkmem_list3[CACHE_CACHE],
numa_node_id());
+ lockdep_set_class(&(cache_cache.nodelists[numa_node_id()]->list_lock), &slab_name_lock_key);
for_each_online_node(node) {
init_list(malloc_sizes[INDEX_AC].cs_cachep,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
