Changeset e3ce39b in mainline

Timestamp:

2010-05-31T19:08:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6e2bf29

Parents:

a820bf7

Message:

Lock the page tables before working with them on ia32.

Location:

kernel

Files:

• arch/ia32/src/mm/page.c (modified) (3 diffs)
• arch/ia32/src/smp/smp.c (modified) (1 diff)
• genarch/src/acpi/acpi.c (modified) (1 diff)

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

@@ -61 +61 @@
                  * PA2KA(identity) mapping for all frames until last_frame.
                  */
+                page_table_lock(AS_KERNEL, true);
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
                         flags = PAGE_CACHEABLE | PAGE_WRITE;
@@ -67 +68 @@
                         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
                 }
+                page_table_unlock(AS_KERNEL, true);
                 
                 exc_register(14, "page_fault", (iroutine) page_fault);
@@ -84 +86 @@
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
+        page_table_lock(AS_KERNEL, true);
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
                 uintptr_t addr = PFN2ADDR(i);
                 page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr, PAGE_NOT_CACHEABLE | PAGE_WRITE);
         }
+        page_table_unlock(AS_KERNEL, true);
         
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);

kernel/arch/ia32/src/smp/smp.c

@@ -83 +83 @@
                 panic("Cannot allocate address for io_apic.");
 
-        if (config.cpu_count > 1) {             
+        if (config.cpu_count > 1) {
+                page_table_lock(AS_KERNEL, true);
                 page_mapping_insert(AS_KERNEL, l_apic_address,
                     (uintptr_t) l_apic, PAGE_NOT_CACHEABLE | PAGE_WRITE);
                 page_mapping_insert(AS_KERNEL, io_apic_address,
                     (uintptr_t) io_apic, PAGE_NOT_CACHEABLE | PAGE_WRITE);
+                page_table_unlock(AS_KERNEL, true);
                                   
                 l_apic = (uint32_t *) l_apic_address;

kernel/genarch/src/acpi/acpi.c

@@ -99 +99 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
+        page_table_lock(AS_KERNEL, true);
         page_mapping_insert(AS_KERNEL, (uintptr_t) sdt, (uintptr_t) sdt, PAGE_NOT_CACHEABLE | PAGE_WRITE);
         map_structure((uintptr_t) sdt, sdt->length);
+        page_table_unlock(AS_KERNEL, true);
 }