Skip to contentSkip to conversation

kmemleak: Use GFP_ATOMIC for early_alloc().

PATCH In review Catalin Marinas 3 participants 6 messages Oct 9, 2009

Subsystems (2)
lore
Share & tools
lore

Catalin Marinas

author maintainer
#0 lore raw

PATCH 1/2 kmemleak: Use GFP_ATOMIC for early_alloc().

We can't use GFP_KERNEL inside rcu_read_lock().

---
 mm/kmemleak.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mm/kmemleak.c +1 -1
index 4ea4510..a617518 100644
@@ -833,7 +833,7 @@ static void early_alloc(struct early_log *log)
 	 */
 	rcu_read_lock();
 	object = create_object((unsigned long)log->ptr, log->size,
-			       log->min_count, GFP_KERNEL);
+			       log->min_count, GFP_ATOMIC);
 	spin_lock_irqsave(&object->lock, flags);
 	for (i = 0; i < log->trace_len; i++)
 		object->trace[i] = log->trace[i];
author maintainer
#1 lore raw

PATCH 2/2 kmemleak: Check for NULL pointer returned by create_object()

This patch adds NULL pointer checking in the early_alloc() function.

---
 mm/kmemleak.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
mm/kmemleak.c +3 -0
index a617518..8bf765c 100644
@@ -834,11 +834,14 @@ static void early_alloc(struct early_log *log)
 	rcu_read_lock();
 	object = create_object((unsigned long)log->ptr, log->size,
 			       log->min_count, GFP_ATOMIC);
+	if (!object)
+		goto out;
 	spin_lock_irqsave(&object->lock, flags);
 	for (i = 0; i < log->trace_len; i++)
 		object->trace[i] = log->trace[i];
 	object->trace_len = log->trace_len;
 	spin_unlock_irqrestore(&object->lock, flags);
+out:
 	rcu_read_unlock();
 }
 
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] kmemleak: Check for NULL pointer returned by create_object()

Quoted 4 lines · Catalin Marinas

This patch adds NULL pointer checking in the early_alloc() function.

Quoted 30 lines

---
 mm/kmemleak.c |    3 +++

 1 files changed, 3 insertions(+), 0 deletions(-)
mm/kmemleak.c +3 -1
index a617518..8bf765c 100644
@@ -834,11 +834,14 @@ static void early_alloc(struct early_log *log)
        rcu_read_lock();
        object = create_object((unsigned long)log->ptr, log->size,
                               log->min_count, GFP_ATOMIC);
+       if (!object)
+               goto out;
        spin_lock_irqsave(&object->lock, flags);
        for (i = 0; i < log->trace_len; i++)
                object->trace[i] = log->trace[i];
        object->trace_len = log->trace_len;
        spin_unlock_irqrestore(&object->lock, flags);
+out:
        rcu_read_unlock();
  }
 
 
--

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/

Acked-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] kmemleak: Check for NULL pointer returned by create_object()

In reply to Catalin Marinas
Quoted 1 line · Catalin Marinas

This patch adds NULL pointer checking in the early_alloc() function.

Quoted 26 lines
---
 mm/kmemleak.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
mm/kmemleak.c +3 -0
index a617518..8bf765c 100644
@@ -834,11 +834,14 @@ static void early_alloc(struct early_log *log)
 	rcu_read_lock();
 	object = create_object((unsigned long)log->ptr, log->size,
 			       log->min_count, GFP_ATOMIC);
+	if (!object)
+		goto out;
 	spin_lock_irqsave(&object->lock, flags);
 	for (i = 0; i < log->trace_len; i++)
 		object->trace[i] = log->trace[i];
 	object->trace_len = log->trace_len;
 	spin_unlock_irqrestore(&object->lock, flags);
+out:
 	rcu_read_unlock();
 }
 
author maintainer
#5 lore raw

PATCH 1/1 kmemleak: Use GFP_ATOMIC for early_alloc().

In reply to Catalin Marinas

From: Tetsuo Handa <[email protected]>

We can't use GFP_KERNEL inside rcu_read_lock().

---

Please ignore [PATCH 1/2] with the same subject as it didn't have the correct author information. Thanks.

 mm/kmemleak.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mm/kmemleak.c +1 -1
index 4ea4510..a617518 100644
@@ -833,7 +833,7 @@ static void early_alloc(struct early_log *log)
 	 */
 	rcu_read_lock();
 	object = create_object((unsigned long)log->ptr, log->size,
-			       log->min_count, GFP_KERNEL);
+			       log->min_count, GFP_ATOMIC);
 	spin_lock_irqsave(&object->lock, flags);
 	for (i = 0; i < log->trace_len; i++)
 		object->trace[i] = log->trace[i];