Changeset f049eec in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2009-04-04T01:51:11Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7d440e3

Parents:

3f2177e

Message:

avoid deadlock while reclaiming slab memory

File:

• kernel/generic/src/mm/frame.c (modified) (2 diffs)

kernel/generic/src/mm/frame.c

@@ -993 +993 @@
            if it does not help, reclaim all */
         if ((znum == (count_t) -1) && (!(flags & FRAME_NO_RECLAIM))) {
+                spinlock_unlock(&zones.lock);
+                interrupts_restore(ipl);
+                
                 count_t freed = slab_reclaim(0);
+                
+                ipl = interrupts_disable();
+                spinlock_lock(&zones.lock);
                 
                 if (freed > 0)
@@ -1000 +1006 @@
                 
                 if (znum == (count_t) -1) {
+                        spinlock_unlock(&zones.lock);
+                        interrupts_restore(ipl);
+                        
                         freed = slab_reclaim(SLAB_RECLAIM_ALL);
+                        
+                        ipl = interrupts_disable();
+                        spinlock_lock(&zones.lock);
+                        
                         if (freed > 0)
                                 znum = find_free_zone(order,