Skip to contentSkip to conversation

slab+rt: Don't free locks twice in cpuup_canceled

PATCH In review [email protected] 4 participants 4 messages Sep 20, 2013 – Oct 4, 2013 Memory management

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 slab+rt: Don't free locks twice in cpuup_canceled

From: Corey Minyard <[email protected]>

---
 mm/slab.c | 2 --
 1 file changed, 2 deletions(-)
mm/slab.c +0 -2
index 494274e..0a3d6d3 100644
@@ -1270,7 +1270,6 @@ static void __cpuinit cpuup_canceled(long cpu)
 			free_block(cachep, nc->entry, nc->avail, node);
 
 		if (!cpumask_empty(mask)) {
-			local_spin_unlock_irq(slab_lock, &n->list_lock);
 			unlock_l3_and_free_delayed(&n->list_lock);
 			goto free_array_cache;
 		}
@@ -1285,7 +1284,6 @@ static void __cpuinit cpuup_canceled(long cpu)
 		alien = n->alien;
 		n->alien = NULL;
 
-		local_spin_unlock_irq(slab_lock, &n->list_lock);
 		unlock_l3_and_free_delayed(&n->list_lock);
 
 		kfree(shared);
Signature · 1 line
1.8.3.1
#1 lore raw

I forgot to mention that this was on 3.10.10-rt7.

-corey

Quoted 27 lines · On 09/20/2013 01:02 PM, [email protected] wrote:

From: Corey Minyard <[email protected]>

---
 mm/slab.c | 2 --
 1 file changed, 2 deletions(-)
mm/slab.c +0 -2
index 494274e..0a3d6d3 100644
@@ -1270,7 +1270,6 @@ static void __cpuinit cpuup_canceled(long cpu)
 			free_block(cachep, nc->entry, nc->avail, node);
 
 		if (!cpumask_empty(mask)) {
-			local_spin_unlock_irq(slab_lock, &n->list_lock);
 			unlock_l3_and_free_delayed(&n->list_lock);
 			goto free_array_cache;
 		}
@@ -1285,7 +1284,6 @@ static void __cpuinit cpuup_canceled(long cpu)
 		alien = n->alien;
 		n->alien = NULL;
 
-		local_spin_unlock_irq(slab_lock, &n->list_lock);
 		unlock_l3_and_free_delayed(&n->list_lock);
 
 		kfree(shared);
#2 lore raw
Quoted 1 line · * Corey Minyard | 2013-09-25 11:37:06 [-0500]:

I forgot to mention that this was on 3.10.10-rt7.

This looks valid. But SLAB still isn't working on -RT, right?

Quoted 1 line

-corey

Sebastian

#3 lore raw
Quoted 5 lines · Sebastian Andrzej Siewior
Quoted 1 line · * Corey Minyard | 2013-09-25 11:37:06 [-0500]:

I forgot to mention that this was on 3.10.10-rt7.

This looks valid. But SLAB still isn't working on -RT, right?

AFAIK SLAB is still not working on RT, but this breaks things if you have RT disabled.

-corey