Changeset d0485c6 in mainline

Timestamp:

2006-12-01T22:10:40Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3d76996

Parents:

7bf7ef7

Message:

Introduce page colors. So far, only sparc64 uses correct page color bits. Other architectures have a dummy define
specifying zero bits for a page color.

There is a new check of page color in as_area_share(). Because of lack of support for this in the userspace, the
check has been #ifef'ed out.

Location:

kernel

Files:

• arch/amd64/include/mm/page.h (modified) (1 diff)
• arch/ia32/include/mm/page.h (modified) (1 diff)
• arch/ia32xen/include/mm/page.h (modified) (1 diff)
• arch/ia64/include/mm/page.h (modified) (2 diffs)
• arch/mips32/include/mm/page.h (modified) (1 diff)
• arch/ppc32/include/mm/page.h (modified) (1 diff)
• arch/ppc64/include/mm/page.h (modified) (1 diff)
• arch/sparc64/include/mm/page.h (modified) (1 diff)
• genarch/src/mm/asid_fifo.c (modified) (1 diff)
• generic/include/mm/page.h (modified) (1 diff)
• generic/src/mm/as.c (modified) (2 diffs)

kernel/arch/amd64/include/mm/page.h

@@ -52 +52 @@
 #define PAGE_WIDTH      FRAME_WIDTH
 #define PAGE_SIZE       FRAME_SIZE
+
+#define PAGE_COLOR_BITS 0                       /* dummy */
 
 #ifdef KERNEL

kernel/arch/ia32/include/mm/page.h

@@ -40 +40 @@
 #define PAGE_WIDTH      FRAME_WIDTH
 #define PAGE_SIZE       FRAME_SIZE
+
+#define PAGE_COLOR_BITS 0                       /* dummy */
 
 #ifdef KERNEL

kernel/arch/ia32xen/include/mm/page.h

@@ -41 +41 @@
 #define PAGE_SIZE       FRAME_SIZE
 
+#define PAGE_COLOR_BITS 0                       /* dummy */
+
 #ifdef KERNEL
 

kernel/arch/ia64/include/mm/page.h

@@ -42 +42 @@
 #define PAGE_WIDTH      FRAME_WIDTH
 
+#define PAGE_COLOR_BITS 0                       /* dummy */
 
 #ifdef KERNEL
 
 /** Bit width of the TLB-locked portion of kernel address space. */
-#define KERNEL_PAGE_WIDTH       28      /* 256M */
+#define KERNEL_PAGE_WIDTH               28      /* 256M */
 
 #define PPN_SHIFT                       12
@@ -65 +66 @@
 #define PA2KA(x)        ((uintptr_t) (x+(VRN_KERNEL<<VRN_SHIFT)))
 
-#define VHPT_WIDTH                      20              /* 1M */
+#define VHPT_WIDTH                      20      /* 1M */
 #define VHPT_SIZE                       (1 << VHPT_WIDTH)
 

kernel/arch/mips32/include/mm/page.h

@@ -40 +40 @@
 #define PAGE_WIDTH      FRAME_WIDTH
 #define PAGE_SIZE       FRAME_SIZE
+
+#define PAGE_COLOR_BITS 0                       /* dummy */
 
 #ifndef __ASM__

kernel/arch/ppc32/include/mm/page.h

@@ -40 +40 @@
 #define PAGE_WIDTH      FRAME_WIDTH
 #define PAGE_SIZE       FRAME_SIZE
+
+#define PAGE_COLOR_BITS 0                       /* dummy */
 
 #ifdef KERNEL

kernel/arch/ppc64/include/mm/page.h

@@ -40 +40 @@
 #define PAGE_WIDTH      FRAME_WIDTH
 #define PAGE_SIZE       FRAME_SIZE
+
+#define PAGE_COLOR_BITS 0                       /* dummy */
 
 #ifdef KERNEL

kernel/arch/sparc64/include/mm/page.h

@@ -41 +41 @@
 #define PAGE_SIZE       FRAME_SIZE
 
+#define PAGE_COLOR_BITS 1                       /**< 14 - 13; 2^14 == 16K == alias boundary. */
+
 #ifdef KERNEL
 

kernel/genarch/src/mm/asid_fifo.c

@@ -64 +64 @@
         int i;
 
-        #if (!FIFO_STATIC)
+#if (!FIFO_STATIC)
         fifo_create(free_asids);
-        #endif
+#endif
                 
         for (i = 0; i < ASIDS_ALLOCABLE; i++) {

kernel/generic/include/mm/page.h

@@ -67 +67 @@
 #define PAGE_GLOBAL             (1<<PAGE_GLOBAL_SHIFT)
 
+
+/**
+ * Macro for computing page color.
+ */
+#define PAGE_COLOR(va)          (((va) >> PAGE_WIDTH) & ((1 << PAGE_COLOR_BITS) - 1))
+
 /** Page fault access type. */
 enum pf_access {

kernel/generic/src/mm/as.c

@@ -551 +551 @@
  * @param dst_flags_mask Destination address space area flags mask.
  *
- * @return Zero on success or ENOENT if there is no such task or
- *         if there is no such address space area,
- *         EPERM if there was a problem in accepting the area or
- *         ENOMEM if there was a problem in allocating destination
- *         address space area. ENOTSUP is returned if an attempt
- *         to share non-anonymous address space area is detected.
+ * @return Zero on success or ENOENT if there is no such task or if there is no
+ * such address space area, EPERM if there was a problem in accepting the area
+ * or ENOMEM if there was a problem in allocating destination address space
+ * area. ENOTSUP is returned if the address space area backend does not support
+ * sharing. It can be also returned if the architecture uses virtually indexed
+ * caches and the source and destination areas start at pages with different
+ * page colors.
  */
 int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
@@ -581 +582 @@
         }
         
+#if 0   /* disable the check for now */
+#ifdef CONFIG_VIRT_IDX_CACHE
+        if (PAGE_COLOR(src_area->base) != PAGE_COLOR(dst_base)) {
+                /*
+                 * Refuse to create illegal address alias.
+                 */
+                mutex_unlock(&src_area->lock);
+                mutex_unlock(&src_as->lock);
+                interrupts_restore(ipl);
+                return ENOTSUP;
+        }
+#endif /* CONFIG_VIRT_IDX_CACHE */
+#endif
+
         if (!src_area->backend || !src_area->backend->share) {
                 /*