mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Pekka J Enberg <penberg@cs.helsinki.fi>
To: John Reiser <jreiser@BitWagon.com>
Cc: Steve VanDeBogart <vandebo-lkml@nerdbox.net>,
	user-mode-linux-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org,
	"Paul E. McKenney" <paulmck@us.ibm.com>,
	Ingo Molnar <mingo@elte.hu>,
	dkegel@google.com, jiayingz@google.com
Subject: Re: [uml-devel] [PATCH 5/6] slab: Annotate slab
Date: Wed, 3 Sep 2008 12:39:58 +0300 (EEST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0809031237320.6448@melkki.cs.Helsinki.FI> (raw)
In-Reply-To: <48BDFC77.4060909@BitWagon.com>

Hi,

On Tue, 2 Sep 2008, John Reiser wrote:
> With regard to Read-Copy-Update, I anticipate that RCU will require
> special annotations because of the deliberate references after kfree
> and before the next corresponding kmalloc.  These special annotations
> will require great care, because bugs in this area have high value.

For RCU, I was thinking of adding a new RCU_WAITING state that a RCU-freed 
object is set to upon freeing that we can use to detect whatever errors 
there might be. I've included an incomplete implementation of SLAB hooks 
for that. Obviously there would need to be some additional code in 
kmemcheck for that. No idea if that kind of model works for valgrind, 
though.

		Pekka

Index: linux-2.6/mm/slab.c
===================================================================
--- linux-2.6.orig/mm/slab.c	2008-08-30 13:42:17.000000000 +0300
+++ linux-2.6/mm/slab.c	2008-08-30 13:42:22.000000000 +0300
@@ -1647,11 +1647,23 @@
 	free_pages((unsigned long)addr, cachep->gfporder);
 }
 
+static void kmemcheck_rcu_free(struct kmem_cache *cache, struct slab *slab)
+{
+	int i;
+
+	for (i = 0; i < cache->num; i++) {
+		void *obj = index_to_obj(cache, slab, i);
+
+		kmemcheck_slab_rcu_free(cache, obj, obj_size(cache));
+	}
+}
+
 static void kmem_rcu_free(struct rcu_head *head)
 {
 	struct slab_rcu *slab_rcu = (struct slab_rcu *)head;
 	struct kmem_cache *cachep = slab_rcu->cachep;
 
+	kmemcheck_rcu_free(cachep, (struct slab *)slab_rcu);
 	kmem_freepages(cachep, slab_rcu->addr);
 	if (OFF_SLAB(cachep))
 		kmem_cache_free(cachep->slabp_cache, slab_rcu);
Index: linux-2.6/include/linux/kmemcheck.h
===================================================================
--- linux-2.6.orig/include/linux/kmemcheck.h	2008-08-30 13:42:21.000000000 +0300
+++ linux-2.6/include/linux/kmemcheck.h	2008-08-30 13:42:22.000000000 +0300
@@ -9,6 +9,7 @@
 	KMEMCHECK_UNINITIALIZED,
 	KMEMCHECK_INITIALIZED,
 	KMEMCHECK_FREED,
+	KMEMCHECK_RCU_WAITING,	/* waiting for RCU to free the object */
 };
 
 #ifdef CONFIG_KMEMCHECK
@@ -22,6 +23,7 @@
 void kmemcheck_free_shadow(struct kmem_cache *s, struct page *page, int order);
 void kmemcheck_slab_alloc(struct kmem_cache *s, gfp_t gfpflags, void *object,
 			  size_t size);
+void kmemcheck_slab_rcu_free(struct kmem_cache *s, void *object, size_t size);
 void kmemcheck_slab_free(struct kmem_cache *s, void *object, size_t size);
 
 void kmemcheck_show_pages(struct page *p, unsigned int n);
@@ -29,7 +31,11 @@
 
 bool kmemcheck_page_is_tracked(struct page *p);
 
-void kmemcheck_mark_addr(void *address, unsigned int n, enum kmemcheck_addr_type type);
+void kmemcheck_mark_addr(void *address, unsigned int n,
+			 enum kmemcheck_addr_type type);
+
+void kmemcheck_verify_addr(void *address, unsigned int n,
+			   enum kmemcheck_addr_type type);
 
 void kmemcheck_mark_unallocated_pages(struct page *p, unsigned int n);
 void kmemcheck_mark_uninitialized_pages(struct page *p, unsigned int n);
@@ -74,6 +80,10 @@
 {
 }
 
+static inline void kmemcheck_verify_addr(void *address, unsigned int n, enum kmemcheck_addr_type type)
+{
+}
+
 #endif /* CONFIG_KMEMCHECK */
 
 #endif /* LINUX_KMEMCHECK_H */
Index: linux-2.6/arch/x86/mm/kmemcheck/shadow.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/kmemcheck/shadow.c	2008-08-30 13:42:21.000000000 +0300
+++ linux-2.6/arch/x86/mm/kmemcheck/shadow.c	2008-08-30 13:43:01.000000000 +0300
@@ -51,6 +51,14 @@
 }
 EXPORT_SYMBOL_GPL(kmemcheck_mark_addr);
 
+void kmemcheck_verify_addr(void *address, unsigned int n, enum kmemcheck_addr_type type)
+{
+	/*
+ 	 * Vegard, please implement me!
+ 	 */
+}
+EXPORT_SYMBOL_GPL(kmemcheck_verify_addr);
+
 void kmemcheck_mark_unallocated_pages(struct page *p, unsigned int n)
 {
 	unsigned int i;
Index: linux-2.6/mm/kmemcheck.c
===================================================================
--- linux-2.6.orig/mm/kmemcheck.c	2008-08-30 13:42:21.000000000 +0300
+++ linux-2.6/mm/kmemcheck.c	2008-08-30 13:42:22.000000000 +0300
@@ -95,9 +95,23 @@
 	}
 }
 
+void kmemcheck_slab_rcu_free(struct kmem_cache *s, void *object, size_t size)
+{
+	if (WARN_ON(!(s->flags & SLAB_DESTROY_BY_RCU)))
+		return;
+
+	kmemcheck_verify_addr(object, size, KMEMCHECK_RCU_WAITING);
+
+	kmemcheck_mark_addr(object, size, KMEMCHECK_FREED);
+}
+
 void kmemcheck_slab_free(struct kmem_cache *s, void *object, size_t size)
 {
-	/* TODO: RCU freeing is unsupported for now; hide false positives. */
-	if (!s->ctor && !(s->flags & SLAB_DESTROY_BY_RCU))
+	if (s->ctor)
+		return;
+
+	if (s->flags & SLAB_DESTROY_BY_RCU)
+		kmemcheck_mark_addr(object, size, KMEMCHECK_RCU_WAITING);
+	else
 		kmemcheck_mark_addr(object, size, KMEMCHECK_FREED);
 }

  reply	other threads:[~2008-09-03  9:41 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-29 23:12 [PATCH 0/6] support valgrinding uml Steve VanDeBogart
2008-08-29 23:14 ` [PATCH 1/6] base: Valgrind headers and Kconfig Steve VanDeBogart
2008-09-01  9:32   ` Andi Kleen
2008-09-01 14:06     ` Jeff Dike
2008-09-01 14:22       ` Andi Kleen
2008-09-01 15:47         ` Jeff Dike
2008-08-29 23:15 ` [PATCH 2/6] UML: Don't valgrind userspace Steve VanDeBogart
2008-09-05 16:37   ` [uml-devel] " Jeff Dike
2008-09-06 20:55     ` John Reiser
2008-09-06 22:12       ` Jeff Dike
2008-08-29 23:16 ` [PATCH 3/6] UML and sched: Annotate stacks Steve VanDeBogart
2008-08-29 23:16 ` [PATCH 4/6] VM: Annotate pagealloc Steve VanDeBogart
2008-08-30 10:57   ` Pekka Enberg
2008-09-03  5:25     ` [uml-devel] " Steve VanDeBogart
2008-09-03  9:35       ` Pekka Enberg
2008-08-29 23:17 ` [PATCH 5/6] slab: Annotate slab Steve VanDeBogart
2008-08-30 10:50   ` Pekka Enberg
2008-09-03  2:54     ` [uml-devel] " John Reiser
2008-09-03  9:39       ` Pekka J Enberg [this message]
2008-09-03  5:08     ` Steve VanDeBogart
2008-09-03  9:27       ` Pekka Enberg
2008-09-03  9:40         ` Pekka Enberg
2008-09-03 15:42         ` Steve VanDeBogart
2008-09-04  7:33           ` Pekka Enberg
2008-08-29 23:18 ` [PATCH 6/6] VM: Annotate vmalloc Steve VanDeBogart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0809031237320.6448@melkki.cs.Helsinki.FI \
    --to=penberg@cs.helsinki.fi \
    --cc=dkegel@google.com \
    --cc=jiayingz@google.com \
    --cc=jreiser@BitWagon.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=paulmck@us.ibm.com \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    --cc=vandebo-lkml@nerdbox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®