Changeset 47

Timestamp:

Jun 26, 2017, 11:48:28 AM (7 years ago)

Author:

max@…

Message:

Use mcmodel=large, in order to have a kernel image that is located at the
beginning of each cluster in virtual memory, as discussed with Alain. The
performance cost will be taken care of later.

Now, the active kernel is located at 0xfffff00000000000, and the base of
the clusters is 0xffff800000000000.

Location:

trunk

Files:

• Makefile.x86 (modified) (1 diff)
• hal/x86_64/hal_boot.h (modified) (4 diffs)
• hal/x86_64/hal_gpt.c (modified) (3 diffs)
• hal/x86_64/hal_init.c (modified) (2 diffs)
• hal/x86_64/x86_printf.c (modified) (1 diff)
• kernel/kernel_x86.ld (modified) (1 diff)

trunk/Makefile.x86

@@ -7 +7 @@
 # Compilation flags.
 CFLAGS = -Wall -ffreestanding -mno-red-zone -mno-mmx -mno-sse -mno-avx -g \
-                 -fno-delete-null-pointer-checks -mcmodel=kernel
+                 -fno-delete-null-pointer-checks -mcmodel=large
 
 # Export all variables to applications sub-Makefile.

trunk/hal/x86_64/hal_boot.h

@@ -24 +24 @@
 #define PGSHIFT         12
 
-#define KERNBASE        0xffffffff80000000
-#define KERNBASE_HI     0xffffffff
-#define KERNBASE_LO     0x80000000
+#define KERNBASE        0xfffff00000000000
+#define KERNBASE_HI     0xfffff000
+#define KERNBASE_LO     0x00000000
 
-#define KERNTEXTOFF     0xffffffff80200000
-#define KERNTEXTOFF_HI  0xffffffff
-#define KERNTEXTOFF_LO  0x80200000
+#define KERNTEXTOFF     0xfffff00000200000
+#define KERNTEXTOFF_HI  0xfffff000
+#define KERNTEXTOFF_LO  0x00200000
 
 /* -------------------------------------------------------------------------- */
@@ -109 +109 @@
 
 #define L4_SLOT_PTE             255
-#define L4_SLOT_KERN            256
-#define L4_SLOT_KERNBASE        511
+#define L4_SLOT_KERNBASE        480
 
 /*
@@ -116 +115 @@
  * L2 = (KERNBASE % NBPD_L3) / NBPD_L2
  */
-#define L3_SLOT_KERNBASE        510
+#define L3_SLOT_KERNBASE        0
 #define L2_SLOT_KERNBASE        0
 
-#define PDIR_SLOT_KERN  L4_SLOT_KERN
 #define PDIR_SLOT_PTE   L4_SLOT_PTE
 
@@ -132 +130 @@
 /* -------------------------------------------------------------------------- */
 
-/*
- * 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 CLUSTERS_HEAP_BASE_VA   0xffff800000000000
-#define CLUSTERS_KIMG_BASE_VA   0xffffc00000000000
+#define KERNEL_VA_SIZE          (NKL2_KIMG_ENTRIES * NBPD_L2)
+#define CLUSTERS_BASE_VA        0xffff800000000000
 
 /* These parameters are configurable. */
-#define CLUSTER_HEAP_VA_SIZE    0x100000000 /* 4GB */
-#define CLUSTER_HEAP_PA_SIZE    0x200000000 /* 8GB */
+#define CLUSTER_VA_SIZE 0x100000000 /* 4GB */
+#define CLUSTER_PA_SIZE 0x200000000 /* 8GB */
 
-/* These parameters are *not* configurable. */
-#define CLUSTER_KIMG_VA_SIZE    0x80000000  /* 2GB */
+/* Macros to get the VA ranges for a cluster */
+#define CLUSTER_MIN_VA(n) \
+        (CLUSTERS_BASE_VA + n * CLUSTER_VA_SIZE)
+#define CLUSTER_MAX_VA(n) \
+        (CLUSTER_MIN_VA(n) + CLUSTER_VA_SIZE)
 
-/* 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

@@ -71 +71 @@
 void hal_gpt_bootstrap_reset()
 {
-        size_t npages = (va_avail - CLUSTER_HEAP_MIN_VA(0)) / PAGE_SIZE;
-        hal_gpt_leave_range(CLUSTER_HEAP_MIN_VA(0), npages);
+        size_t npages = (va_avail - (CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE)) / PAGE_SIZE;
+        hal_gpt_leave_range(CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE, npages);
 }
 
@@ -211 +211 @@
         /* Initialize global values */
         pa_avail = firstpa;
-        va_avail = CLUSTER_HEAP_MIN_VA(0);
+        va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
         kimg_size = ((uint64_t)&__kernel_end - KERNBASE);
         XASSERT(kimg_size % PAGE_SIZE == 0);
@@ -217 +217 @@
 
         /* 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));
+        hal_gpt_maptree_area(CLUSTER_MIN_VA(0), CLUSTER_MAX_VA(0));
 
         /* Manually enter cluster0's kimg */
-        hal_gpt_enter_range(CLUSTER_KIMG_MIN_VA(0), kimg_min_pa, kimg_size);
+        hal_gpt_enter_range(CLUSTER_MIN_VA(0), kimg_min_pa, kimg_size);
 }
 

trunk/hal/x86_64/hal_init.c

@@ -88 +88 @@
         x86_printf("[+] cpu_attach called\n");
 
-        x86_printf("[+] bootloader: %s\n", mb_loader_name);
+        x86_printf("[+] bootloader: '%s'\n", mb_loader_name);
 
         dump_memmap();
@@ -109 +109 @@
 
         x86_printf("-> mytest = %z\n", mytest);
-        size_t *myptr = XPTR_KIMG(0, &mytest) + CLUSTER_KIMG_MIN_VA(0);
+        size_t *myptr = CLUSTER_MIN_VA(0) + XPTR(0, &mytest);
         *myptr = 1;
         x86_printf("-> mytest = %z\n", mytest);

trunk/hal/x86_64/x86_printf.c

@@ -214 +214 @@
                                 x86_printf("0x%s", buf);
                         } else if (c == 's') {
-                                x86_printf((char *) va_arg(ap, int));
+                                x86_printf((char *) va_arg(ap, uint64_t));
                         } 
                 } else

trunk/kernel/kernel_x86.ld

@@ -6 +6 @@
 __PAGE_SIZE = 0x1000 ;
 
-__KERNEL_BASE_VIRT = 0xffffffff80000000 ;
+__KERNEL_BASE_VIRT = 0xfffff00000000000 ;
 __KERNEL_BASE_PHYS = 0x0000000000000000 ;
 
-__KERNEL_TEXT_VIRT = 0xffffffff80200000 ;
+__KERNEL_TEXT_VIRT = 0xfffff00000200000 ;
 __KERNEL_TEXT_PHYS = 0x0000000000200000 ;