Changeset b4ca0a9c in mainline for kernel/generic/src/mm

Timestamp:

2012-07-10T11:53:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (4 diffs)
• slab.c (modified) (2 diffs)
• tlb.c (modified) (2 diffs)

kernel/generic/src/mm/as.c

@@ -130 +130 @@
         as_arch_init();
         
-        as_slab = slab_cache_create("as_slab", sizeof(as_t), 0,
+        as_slab = slab_cache_create("as_t", sizeof(as_t), 0,
             as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED);
         
@@ -665 +665 @@
                 
                 page_table_lock(as, false);
-                
-                /*
-                 * Start TLB shootdown sequence.
-                 */
-                ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid,
-                    area->base + P2SZ(pages), area->pages - pages);
                 
                 /*
@@ -726 +720 @@
                                 }
                                 
+                                /*
+                                 * Start TLB shootdown sequence.
+                                 *
+                                 * The sequence is rather short and can be
+                                 * repeated multiple times. The reason is that
+                                 * we don't want to have used_space_remove()
+                                 * inside the sequence as it may use a blocking
+                                 * memory allocation for its B+tree. Blocking
+                                 * while holding the tlblock spinlock is
+                                 * forbidden and would hit a kernel assertion.
+                                 */
+
+                                ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES,
+                                    as->asid, area->base + P2SZ(pages),
+                                    area->pages - pages);
+                
                                 for (; i < size; i++) {
                                         pte_t *pte = page_mapping_find(as,
@@ -743 +753 @@
                                         page_mapping_remove(as, ptr + P2SZ(i));
                                 }
+                
+                                /*
+                                 * Finish TLB shootdown sequence.
+                                 */
+                
+                                tlb_invalidate_pages(as->asid,
+                                    area->base + P2SZ(pages),
+                                    area->pages - pages);
+                
+                                /*
+                                 * Invalidate software translation caches
+                                 * (e.g. TSB on sparc64, PHT on ppc32).
+                                 */
+                                as_invalidate_translation_cache(as,
+                                    area->base + P2SZ(pages),
+                                    area->pages - pages);
+                                tlb_shootdown_finalize(ipl);
                         }
                 }
-                
-                /*
-                 * Finish TLB shootdown sequence.
-                 */
-                
-                tlb_invalidate_pages(as->asid, area->base + P2SZ(pages),
-                    area->pages - pages);
-                
-                /*
-                 * Invalidate software translation caches
-                 * (e.g. TSB on sparc64, PHT on ppc32).
-                 */
-                as_invalidate_translation_cache(as, area->base + P2SZ(pages),
-                    area->pages - pages);
-                tlb_shootdown_finalize(ipl);
-                
                 page_table_unlock(as, false);
         } else {

kernel/generic/src/mm/slab.c

@@ -891 +891 @@
 {
         /* Initialize magazine cache */
-        _slab_cache_create(&mag_cache, "slab_magazine",
+        _slab_cache_create(&mag_cache, "slab_magazine_t",
             sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void*),
             sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE |
@@ -897 +897 @@
         
         /* Initialize slab_cache cache */
-        _slab_cache_create(&slab_cache_cache, "slab_cache",
+        _slab_cache_create(&slab_cache_cache, "slab_cache_cache",
             sizeof(slab_cache_cache), sizeof(uintptr_t), NULL, NULL,
             SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE);
         
         /* Initialize external slab cache */
-        slab_extern_cache = slab_cache_create("slab_extern", sizeof(slab_t), 0,
+        slab_extern_cache = slab_cache_create("slab_t", sizeof(slab_t), 0,
             NULL, NULL, SLAB_CACHE_SLINSIDE | SLAB_CACHE_MAGDEFERRED);
         

kernel/generic/src/mm/tlb.c

@@ -162 +162 @@
         
         size_t i;
-        for (i = 0; i < CPU->tlb_messages_count; CPU->tlb_messages_count--) {
+        for (i = 0; i < CPU->tlb_messages_count; i++) {
                 tlb_invalidate_type_t type = CPU->tlb_messages[i].type;
                 asid_t asid = CPU->tlb_messages[i].asid;
@@ -188 +188 @@
         }
         
+        CPU->tlb_messages_count = 0;
         irq_spinlock_unlock(&CPU->lock, false);
         CPU->tlb_active = true;