Changeset 454f1da in mainline for kernel/generic/src/mm

Timestamp:

2007-03-26T19:35:28Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d7daff

Parents:

4638401

Message:

Reworked handling of illegal virtual aliases caused by frame reuse.
We moved the incomplete handling from backend's frame method to
backend's page_fault method. The page_fault method is the one that
can create an illegal alias if it writes the userspace frame using
kernel address with a different page color than the page to which is
this frame mapped in userspace. When we detect this, we do D-cache
shootdown on all processors (!!!).

If we add code that accesses userspace memory from kernel address
space, we will have to check for illegal virtual aliases at all such
places.

I tested this on a 4-way simulated E6500 and a real-world Ultra 5,
which has unfortunatelly only one processor.

This solves ticket #26.

Location:

kernel/generic/src/mm

Files:

• backend_anon.c (modified) (7 diffs)
• backend_elf.c (modified) (7 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -79 +79 @@
 {
         uintptr_t frame;
+        bool dirty = false;
 
         if (!as_area_check_access(area, access))
@@ -95 +96 @@
                 mutex_lock(&area->sh_info->lock);
                 frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
-                        ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
+                    ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
                 if (!frame) {
                         bool allocate = true;
@@ -114 +115 @@
                                 frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
                                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                                dirty = true;
                                 
                                 /*
@@ -144 +146 @@
                 frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                dirty = true;
         }
         
@@ -155 +158 @@
                 panic("Could not insert used space.\n");
                 
+#ifdef CONFIG_VIRT_IDX_DCACHE
+        if (dirty && PAGE_COLOR(PA2KA(frame)) != PAGE_COLOR(addr)) {
+                /*
+                 * By writing to the frame using kernel virtual address,
+                 * we have created an illegal virtual alias. We now have to
+                 * invalidate cachelines belonging to addr on all processors
+                 * so that they will be reloaded with the new content on next
+                 * read.
+                 */
+                dcache_flush_frame(addr, frame);
+                dcache_shootdown_start(DCACHE_INVL_FRAME, PAGE_COLOR(addr), frame);
+                dcache_shootdown_finalize();
+        }
+#endif
+
         return AS_PF_OK;
 }
@@ -169 +187 @@
 {
         frame_free(frame);
-#ifdef CONFIG_VIRT_IDX_DCACHE
-        dcache_flush_frame(page, frame);
-#endif
 }
 
@@ -218 +233 @@
                                 frame_reference_add(pfn);
                         }
-                                
+
                 }
         }

kernel/generic/src/mm/backend_elf.c

@@ -82 +82 @@
         uintptr_t base, frame;
         index_t i;
+        bool dirty = false;
 
         if (!as_area_check_access(area, access))
@@ -148 +149 @@
                         memcpy((void *) PA2KA(frame),
                             (void *) (base + i * FRAME_SIZE), FRAME_SIZE);
-                        
+                        dirty = true;
+
                         if (area->sh_info) {
                                 frame_reference_add(ADDR2PFN(frame));
@@ -169 +171 @@
                 frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                dirty = true;
 
                 if (area->sh_info) {
@@ -189 +192 @@
                 memcpy((void *) PA2KA(frame), (void *) (base + i * FRAME_SIZE),
                     size);
+                dirty = true;
 
                 if (area->sh_info) {
@@ -205 +209 @@
         if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
                 panic("Could not insert used space.\n");
+
+#ifdef CONFIG_VIRT_IDX_DCACHE
+        if (dirty && PAGE_COLOR(PA2KA(frame)) != PAGE_COLOR(addr)) {
+                /*
+                 * By writing to the frame using kernel virtual address,
+                 * we have created an illegal virtual alias. We now have to
+                 * invalidate cachelines belonging to addr on all processors
+                 * so that they will be reloaded with the new content on next
+                 * read.
+                 */
+                dcache_flush_frame(addr, frame);
+                dcache_shootdown_start(DCACHE_INVL_FRAME, PAGE_COLOR(addr), frame);
+                dcache_shootdown_finalize();
+        }
+#endif
 
         return AS_PF_OK;
@@ -239 +258 @@
                          */
                         frame_free(frame);
-#ifdef CONFIG_VIRT_IDX_DCACHE
-                        dcache_flush_frame(page, frame);
-#endif
                 }
         } else {
@@ -248 +264 @@
                  * lower part is backed by the ELF image and the upper is
                  * anonymous). In any case, a frame needs to be freed.
-                 */
-                frame_free(frame); 
-#ifdef CONFIG_VIRT_IDX_DCACHE
-                dcache_flush_frame(page, frame);
-#endif
+                 */ 
+                frame_free(frame);
         }
 }