Changes in kernel/generic/src/mm/as.c [c4c2406:f97f1e51] in mainline

File:

• kernel/generic/src/mm/as.c (modified) (4 diffs)

kernel/generic/src/mm/as.c

@@ -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);
                 
                 /*
@@ -720 +726 @@
                                 }
                                 
-                                /*
-                                 * 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,
@@ -753 +743 @@
                                         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 {
@@ -2054 +2043 @@
 {
         uintptr_t virt = base;
-        as_area_t *area = as_area_create(AS, flags, size,
+        as_area_t *area = as_area_create(AS, flags | AS_AREA_CACHEABLE, size,
             AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, bound);
         if (area == NULL)