Changes in / [0bbd13e:e6a78b9] in mainline

Files:

• boot/grub.pc/stage2_eltorito (added)
• kernel/arch/amd64/src/mm/page.c (modified) (1 diff)
• kernel/arch/ia32/src/mm/page.c (modified) (1 diff)
• kernel/genarch/src/mm/page_pt.c (modified) (1 diff)
• kernel/generic/src/mm/as.c (modified) (3 diffs)
• uspace/srv/hid/input/include/sun.h (added)
• uspace/srv/hid/input/port/dummy.c (added)
• uspace/srv/hid/input/port/sgcn.c (added)
• uspace/srv/hid/input/port/sun.c (added)
• uspace/srv/hid/input/port/z8530.c (added)

kernel/arch/amd64/src/mm/page.c

@@ -57 +57 @@
         uintptr_t cur;
         unsigned int identity_flags =
-            PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL | PAGE_WRITE;
+            PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ;
                 
         page_mapping_operations = &pt_mapping_operations;

kernel/arch/ia32/src/mm/page.c

@@ -71 +71 @@
         for (cur = 0; cur < min(config.identity_size, config.physmem_end);
             cur += FRAME_SIZE) {
-                flags = PAGE_CACHEABLE | PAGE_WRITE;
-                if ((PA2KA(cur) >= config.base) &&
-                    (PA2KA(cur) < config.base + config.kernel_size))
-                        flags |= PAGE_GLOBAL;
+                flags = PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_WRITE | PAGE_READ;
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         }

kernel/genarch/src/mm/page_pt.c

@@ -346 +346 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
-                    PAGE_WRITE);
+                    PAGE_PRESENT | PAGE_USER | PAGE_CACHEABLE |
+                    PAGE_EXEC | PAGE_WRITE | PAGE_READ);
         }
 }

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);
                 
                 /*
@@ -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 {