Changeset f114d40 in mainline

Timestamp:

2023-01-30T18:24:15Z (2 years ago)

Author:

Jakub Jermář <jakub@…>

Branches:

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

Children:

64e9cf4, 95658c9

Parents:

0161d16

git-author:

Colin V. Parker <cvparker@…> (2023-01-29 16:30:57)

git-committer:

Jakub Jermář <jakub@…> (2023-01-30 18:24:15)

Message:

Change amd64 pte_t bitfields to have a 40-bit address field and 11-bit reserved field.

File:

• kernel/arch/amd64/include/arch/mm/page.h (modified) (4 diffs)

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

@@ -93 +93 @@
 /* Get PTE address accessors for each level. */
 #define GET_PTL1_ADDRESS_ARCH(ptl0, i) \
-        ((pte_t *) ((((uint64_t) ((pte_t *) (ptl0))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl0))[(i)].addr_32_62) << 32)))
+        ((pte_t *) (((uint64_t) ((pte_t *) (ptl0))[(i)].addr_12_51) << 12))
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i) \
-        ((pte_t *) ((((uint64_t) ((pte_t *) (ptl1))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl1))[(i)].addr_32_62) << 32)))
+        ((pte_t *) (((uint64_t) ((pte_t *) (ptl1))[(i)].addr_12_51) << 12))
 #define GET_PTL3_ADDRESS_ARCH(ptl2, i) \
-        ((pte_t *) ((((uint64_t) ((pte_t *) (ptl2))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl2))[(i)].addr_32_62) << 32)))
+        ((pte_t *) (((uint64_t) ((pte_t *) (ptl2))[(i)].addr_12_51) << 12))
 #define GET_FRAME_ADDRESS_ARCH(ptl3, i) \
-        ((uintptr_t *) \
-            ((((uint64_t) ((pte_t *) (ptl3))[(i)].addr_12_31) << 12) | \
-            (((uint64_t) ((pte_t *) (ptl3))[(i)].addr_32_62) << 32)))
+        ((uintptr_t *) (((uint64_t) ((pte_t *) (ptl3))[(i)].addr_12_51) << 12))
 
 /* Set PTE address accessors for each level. */
@@ -154 +149 @@
         ((p)->present != 0)
 #define PTE_GET_FRAME_ARCH(p) \
-        ((((uintptr_t) (p)->addr_12_31) << 12) | \
-            ((uintptr_t) (p)->addr_32_62 << 32))
+        (((uintptr_t) (p)->addr_12_51) << 12)
 #define PTE_WRITABLE_ARCH(p) \
         ((p)->writeable != 0)
@@ -202 +196 @@
         unsigned int soft_valid : 1;  /**< Valid content even if present bit is cleared. */
         unsigned int avl : 2;
-        unsigned int addr_12_31 : 20;
-        unsigned int addr_32_62 : 31;
+        unsigned long addr_12_51 : 40;
+        unsigned int reserved : 11;
         unsigned int no_execute : 1;
 } __attribute__((packed)) pte_t;
@@ -224 +218 @@
         pte_t *p = &pt[i];
 
-        p->addr_12_31 = (a >> 12) & UINT32_C(0xfffff);
-        p->addr_32_62 = a >> 32;
+        p->addr_12_51 = (a >> 12) & UINT64_C(0xffffffffff);
 }