Changeset d9ee2ea in mainline

Timestamp:

2010-01-10T20:48:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

52cdcbc

Parents:

0ff9e67

Message:

Change the way how RIDs are mapped onto ASIDs. Instead of 7 RIDs per ASID, now
there will be 8 RIDs per one ASID. This will slightly reduce the number of
available ASIDs, but not significantly.

The kernel will now have all 8 RIDs instead of only one. RID 0 - 7 belong to the
kernel, but only RID 7 accessible from VRN 7 is actually used by the kernel.
This allows us to use RID 0 for VRN 0 and differentiate thus between
0x0000000000000000 and 0xe000000000000000 in a more elegant way. test fault1
will now associate the kernel bad trap with RID 0 which maps to ASID_KERNEL.

User tasks will also be given 8 RIDs, but will use only the lower 7 that fit
into VRN 0 - 6, because the last VRN needs to be reserved for the kernel. The
eighth RID will be unused for now. It can be used for something completely
different one day or if the task needs to establish some special mappings.

So with this change, the kernel now has a 64-bit address space compared to
previous 61 bits, but still makes use only of the highest 1/8 (i.e. 61-bits).
Applications continue to have an address space composed of 7 61-bit blocks which
are arranged in a consecutive way. Each application now has one hidden and
currently unused 61-bit segment.

Location:

kernel/arch/ia64

Files:

• include/mm/asid.h (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)
• src/start.S (modified) (1 diff)

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

@@ -50 +50 @@
  * but those extra bits are not used by the kernel. 
  */
-#define RIDS_PER_ASID           7
+#define RIDS_PER_ASID           8
 
 #define RID_MAX                 262143          /* 2^18 - 1 */
-#define RID_KERNEL              0
-#define RID_INVALID             1
+#define RID_KERNEL7             7
 
-#define ASID2RID(asid, vrn)     (((asid)>RIDS_PER_ASID)?(((asid)*RIDS_PER_ASID)+(vrn)):(asid))
-#define RID2ASID(rid)           ((rid)/RIDS_PER_ASID)
+#define ASID2RID(asid, vrn) \
+        ((asid) * RIDS_PER_ASID + (vrn))
 
-#define ASID_MAX_ARCH           (RID_MAX/RIDS_PER_ASID)
+#define RID2ASID(rid) \
+        ((rid) / RIDS_PER_ASID)
+
+#define ASID_MAX_ARCH           (RID_MAX / RIDS_PER_ASID)
 
 #endif

kernel/arch/ia64/src/mm/as.c

@@ -70 +70 @@
                 rr.word = rr_read(i);
                 rr.map.ve = false;              /* disable VHPT walker */
-                if (as == AS_KERNEL)
-                        rr.map.rid = RID_INVALID;
-                else
-                        rr.map.rid = ASID2RID(as->asid, i);
+                rr.map.rid = ASID2RID(as->asid, i);
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);

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

@@ -71 +71 @@
 
         /*
-         * First set up kernel region register.
-         * This is redundant (see start.S) but we keep it here just for sure.
-         */
-        rr.word = rr_read(VRN_KERNEL);
-        rr.map.ve = 0;                  /* disable VHPT walker */
-        rr.map.ps = PAGE_WIDTH;
-        rr.map.rid = ASID2RID(ASID_KERNEL, VRN_KERNEL);
-        rr_write(VRN_KERNEL, rr.word);
-        srlz_i();
-        srlz_d();
-
-        /*
-         * And setup the rest of region register.
+         * Set up kernel region registers.
+         * VRN_KERNEL has already been set in start.S.
+         * For paranoia reasons, we set it again.
          */
         for(i = 0; i < REGION_REGISTERS; i++) {
-                /* skip kernel rr */
-                if (i == VRN_KERNEL)
-                        continue;
-        
                 rr.word = rr_read(i);
                 rr.map.ve = 0;          /* disable VHPT walker */
-                rr.map.rid = RID_INVALID;
+                rr.map.rid = ASID2RID(ASID_KERNEL, i);
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);

kernel/arch/ia64/src/start.S

@@ -74 +74 @@
         movl r10 = (RR_MASK)
         and r9 = r10, r9
-        movl r10 = ((RID_KERNEL << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT))
+        movl r10 = (((RID_KERNEL7) << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT))
         or r9 = r10, r9