Changeset 44

Timestamp:

Jun 23, 2017, 9:57:35 AM (7 years ago)

Author:

max@…

Message:

Update. We need to use two separate arrays: one for the heap and one for
the kimg. The size of a heap entry is configurable, but that of the kimg
is not (fixed by mcmodel).

As a result, we also need to use two XPTRs: XPTR_HEAP and XPTR_KIMG. For
now we only declare XPTR_KIMG, and are not using it yet.

Location:

trunk/hal/x86_64

Files:

• hal_boot.h (modified) (1 diff)
• hal_gpt.c (modified) (2 diffs)
• hal_init.c (modified) (2 diffs)
• hal_types.h (modified) (2 diffs)

trunk/hal/x86_64/hal_boot.h

@@ -130 +130 @@
 #define NPDPG   (PAGE_SIZE / sizeof (pt_entry_t))
 
-#define CLUSTERS_BASE_VA        0xffff800000000000
+/* -------------------------------------------------------------------------- */
 
 /*
- * These parameters are configurable.
+ * There are two arrays: one for the heap, one for the kernel image. They are
+ * separated by 64TB of VA, which is more than enough to avoid collision.
  */
-#define CLUSTER_VA_SIZE 0x100000000 /* 4GB */
-#define CLUSTER_PA_SIZE 0x200000000 /* 8GB */
+#define CLUSTERS_HEAP_BASE_VA   0xffff800000000000
+#define CLUSTERS_KIMG_BASE_VA   0xffffc00000000000
 
-#define CLUSTER_MIN_VA(n)       (CLUSTERS_BASE_VA + n * CLUSTER_VA_SIZE)
-#define CLUSTER_MAX_VA(n)       (CLUSTER_MIN_VA(n) + CLUSTER_VA_SIZE)
+/* These parameters are configurable. */
+#define CLUSTER_HEAP_VA_SIZE    0x100000000 /* 4GB */
+#define CLUSTER_HEAP_PA_SIZE    0x200000000 /* 8GB */
 
+/* These parameters are *not* configurable. */
+#define CLUSTER_KIMG_VA_SIZE    0x80000000  /* 2GB */
+
+/* Macros to get the heap/kimg ranges for a cluster */
+#define CLUSTER_HEAP_MIN_VA(n) \
+        (CLUSTERS_HEAP_BASE_VA + n * CLUSTER_HEAP_VA_SIZE)
+#define CLUSTER_HEAP_MAX_VA(n) \
+        (CLUSTER_HEAP_MIN_VA(n) + CLUSTER_HEAP_VA_SIZE)
+#define CLUSTER_KIMG_MIN_VA(n) \
+        (CLUSTERS_KIMG_BASE_VA + n * CLUSTER_KIMG_VA_SIZE)
+#define CLUSTER_KIMG_MAX_VA(n) \
+        (CLUSTER_KIMG_MIN_VA(n) + CLUSTER_KIMG_VA_SIZE)
+

trunk/hal/x86_64/hal_gpt.c

@@ -44 +44 @@
 #define pl4_i(VA)       (((VA_SIGN_POS(VA)) & L4_FRAME) >> L4_SHIFT)
 
+extern vaddr_t __kernel_end;
+size_t kimg_size __in_kdata = 0;
+
 paddr_t pa_avail __in_kdata = 0;
 vaddr_t va_avail __in_kdata = 0;
@@ -176 +179 @@
 void hal_gpt_init(paddr_t firstpa)
 {
+        paddr_t kimg_min_pa = 0;
+
+        /* Initialize global values */
         pa_avail = firstpa;
-        va_avail = CLUSTER_MIN_VA(0);
-        hal_gpt_maptree_area(CLUSTER_MIN_VA(0), CLUSTER_MAX_VA(0));
+        va_avail = CLUSTER_HEAP_MIN_VA(0);
+        kimg_size = ((uint64_t)&__kernel_end - KERNBASE);
+        XASSERT(kimg_size % PAGE_SIZE == 0);
+        kimg_size = kimg_size / PAGE_SIZE;
+
+        /* Create cluster0's heap entry. */
+        hal_gpt_maptree_area(CLUSTER_HEAP_MIN_VA(0), CLUSTER_HEAP_MAX_VA(0));
+
+        /* Create cluster0's kimg entry. */
+        hal_gpt_maptree_area(CLUSTER_KIMG_MIN_VA(0), CLUSTER_KIMG_MAX_VA(0));
+
+        /* Manually enter cluster0's kimg */
+        hal_gpt_enter_range(CLUSTER_KIMG_MIN_VA(0), kimg_min_pa, kimg_size);
 }
 

trunk/hal/x86_64/hal_init.c

@@ -39 +39 @@
 void cpu_attach();
 
+size_t mytest __in_kdata = 0;
 
 struct multiboot_info mb_info __in_kdata;
@@ -98 +99 @@
         x86_printf("[+] hal_acpi_init called\n");
 
+        x86_printf("-> mytest = %z\n", mytest);
+        size_t *myptr = XPTR_KIMG(0, &mytest) + CLUSTER_KIMG_MIN_VA(0);
+        *myptr = 1;
+        x86_printf("-> mytest = %z\n", mytest);
 
         int m = 0;

trunk/hal/x86_64/hal_types.h

@@ -163 +163 @@
  *
  * In Intel 64 bits, the kernel virtual space has 4 Gbytes per cluster
- * - the cxy field occupies bits[63:32]
+ * - the cxy field occupies bits[34:32]
  * - the ptr field occupies bits[31:0]
  ***************************************************************************
@@ -193 +193 @@
 #define XPTR_NULL              0
 
+/* virtual (heap) */
 #define PTR_MASK               0x00000000FFFFFFFFULL
-
+#define CXY_MASK               0x0000000700000000ULL
 #define PTR_SHIFT              32
-
-#define GET_CXY(xp)            ((cxy_t)((xp) >> PTR_SHIFT))
-
+#define GET_CXY(xp)            ((cxy_t)(((xp) & CXY_MASK) >> PTR_SHIFT))
 #define GET_PTR(xp)            ((void*)((xp) & PTR_MASK))
-
 #define XPTR(cxy,ptr)          (((uint64_t)(cxy) << PTR_SHIFT) | (((uint64_t)(ptr)) & PTR_MASK))
 
-
-
+/* virtual (kimg). A KIMG entry has 2GB of VA. */
+#define PTR_KIMG_MASK          0x000000007FFFFFFFULL
+#define CXY_KIMG_MASK          0x0000000380000000ULL
+#define PTR_KIMG_SHIFT         31
+#define GET_KIMG_CXY(xp)       ((cxy_t)(((xp) & CXY_KIMG_MASK) >> PTR_KIMG_SHIFT))
+#define GET_KIMG_PTR(xp)       ((void*)((xp) & PTR_KIMG_MASK))
+#define XPTR_KIMG(cxy,ptr)     (((uint64_t)(cxy) << PTR_KIMG_SHIFT) | (((uint64_t)(ptr)) & PTR_KIMG_MASK))
+
+/* physical */
 #define LPA_MASK               0x00000001FFFFFFFFULL
-
 #define LPA_SHIFT              33
-
 #define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> LPA_SHIFT))
-
 #define LPA_FROM_PADDR(paddr)  (lpa_t)((paddr & LPA_MASK)
-
 #define PADDR(cxy,lad)         (((uint64_t)(cxy) << LPA_SHIFT) | (((uint64_t)(ptr)) & LPA_MASK))