Changeset 35 for trunk

Timestamp:

Jun 22, 2017, 8:10:37 AM (8 years ago)

Author:

max@…

Message:

Update:

• Introduce a basic VM manager in hal_gpt.c, to create the initial page tree for cluster0.
• Locate the ACPI RSDP table, which involves entering the PA into cluster0's VA space.

The definitions are still a bit messy, but they will be reorganized later.

Location:

trunk/hal/x86_64

Files:

• hal_acpi.c (added)
• hal_acpi.h (added)
• hal_boot.h (modified) (1 diff)
• hal_cpu.S (modified) (1 diff)
• hal_gpt.c (modified) (3 diffs)
• hal_init.c (modified) (4 diffs)
• hal_internal.h (added)
• hal_types.h (modified) (1 diff)

trunk/hal/x86_64/hal_boot.h

@@ -122 +122 @@
 #define PDIR_SLOT_PTE   L4_SLOT_PTE
 
+#define PTE_BASE        ((pt_entry_t *)(L4_SLOT_PTE * NBPD_L4))
+#define L1_BASE PTE_BASE
+#define L2_BASE ((pt_entry_t *)((char *)L1_BASE + L4_SLOT_PTE * NBPD_L3))
+#define L3_BASE ((pt_entry_t *)((char *)L2_BASE + L4_SLOT_PTE * NBPD_L2))
+#define L4_BASE ((pt_entry_t *)((char *)L3_BASE + L4_SLOT_PTE * NBPD_L1))
+
+#define NPDPG   (PAGE_SIZE / sizeof (pt_entry_t))
+
+#define CLUSTER0_MIN_VA 0xffff800000000000
+#define CLUSTER0_MAX_VA 0xffff800100000000 /* MIN + 4GB */
+

trunk/hal/x86_64/hal_cpu.S

@@ -35 +35 @@
         ret
 
+ASM_ENTRY(invlpg)
+        invlpg  (%rdi)
+        ret
+

trunk/hal/x86_64/hal_gpt.c

@@ -1 +1 @@
 /*
- * hal_gpt.c - implementation of the Generic Page Table API for TSAR-MIPS32
- *
- * Author   Alain Greiner (2016)
- *
- * Copyright (c) UPMC Sorbonne Universites
+ * hal_gpt.c - implementation of the Generic Page Table API for x86_64
+ *
+ * Copyright (c) 2017 Maxime Villard
  *
  * This file is part of ALMOS-MKH.
  *
- * ALMOS-MKH.is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-MKH.is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -23 +21 @@
 
 #include <hal_types.h>
+#include <hal_boot.h> /* XXX */
 #include <hal_gpt.h>
 #include <hal_special.h>
+#include <hal_internal.h>
+
 #include <printk.h>
 #include <bits.h>
+#include <string.h>
 #include <process.h>
 #include <kmem.h>
@@ -33 +35 @@
 #include <ppm.h>
 #include <page.h>
+
+#define VA_SIGN_MASK            0xffff000000000000
+#define VA_SIGN_POS(va)         ((va) & ~VA_SIGN_MASK)
+
+#define pl1_i(VA)       (((VA_SIGN_POS(VA)) & L1_FRAME) >> L1_SHIFT)
+#define pl2_i(VA)       (((VA_SIGN_POS(VA)) & L2_FRAME) >> L2_SHIFT)
+#define pl3_i(VA)       (((VA_SIGN_POS(VA)) & L3_FRAME) >> L3_SHIFT)
+#define pl4_i(VA)       (((VA_SIGN_POS(VA)) & L4_FRAME) >> L4_SHIFT)
+
+paddr_t pa_avail __in_kdata = 0;
+vaddr_t va_avail __in_kdata = 0;
+vaddr_t tmpva __in_kdata = (KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2);
+
+paddr_t hal_gpt_bootstrap_palloc(size_t npages)
+{
+        paddr_t pa = pa_avail;
+        pa_avail += npages * PAGE_SIZE;
+        return pa;
+}
+
+vaddr_t hal_gpt_bootstrap_valloc(size_t npages)
+{
+        vaddr_t va = va_avail;
+        va_avail += npages * PAGE_SIZE;
+        return va;
+}
+
+void hal_gpt_enter(vaddr_t va, paddr_t pa)
+{
+        PTE_BASE[pl1_i(va)] = (pa & PG_FRAME) | PG_V | PG_KW | PG_NX;
+}
+
+/*
+ * Create a page tree that can map va_start->va_end. The caller can then
+ * enter these addresses to physical locations.
+ *
+ * This functions is a bit complicated, and may need to be revisited.
+ */
+void hal_gpt_maptree_area(vaddr_t va_start, vaddr_t va_end)
+{
+        size_t L4start, L4end, nL4e;
+        size_t L3start, L3end, nL3e;
+        size_t L2start, L2end, nL2e;
+        paddr_t L3page, L2page, L1page;
+        paddr_t pa;
+        size_t i, npa;
+        pt_entry_t *pde;
+
+        /* Allocate L3 */
+        L4start = pl4_i(va_start);
+        L4end = pl4_i(va_end);
+        nL4e = (L4end - L4start + 1);
+        L3page = hal_gpt_bootstrap_palloc(nL4e);
+
+        /* Allocate L2 */
+        L3start = pl3_i(va_start);
+        L3end = pl3_i(va_end);
+        nL3e = (L3end - L3start + 1);
+        L2page = hal_gpt_bootstrap_palloc(nL3e);
+
+        /* Allocate L1 */
+        L2start = pl2_i(va_start);
+        L2end = pl2_i(va_end);
+        nL2e = (L2end - L2start + 1);
+        L1page = hal_gpt_bootstrap_palloc(nL2e);
+
+        /* Zero out L1 */
+        for (i = 0; i < nL2e; i++) {
+                pa = L1page + i * PAGE_SIZE;
+                hal_gpt_enter(tmpva, pa);
+                invlpg(tmpva);
+
+                memset((void *)tmpva, 0, PAGE_SIZE);
+        }
+
+        /* Zero out L2 */
+        for (i = 0; i < nL3e; i++) {
+                pa = L2page + i * PAGE_SIZE;
+                hal_gpt_enter(tmpva, pa);
+                invlpg(tmpva);
+
+                memset((void *)tmpva, 0, PAGE_SIZE);
+        }
+
+        /* Zero out L3 */
+        for (i = 0; i < nL4e; i++) {
+                pa = L3page + i * PAGE_SIZE;
+                hal_gpt_enter(tmpva, pa);
+                invlpg(tmpva);
+
+                memset((void *)tmpva, 0, PAGE_SIZE);
+        }
+
+        /* Create L2, linked to L1 */
+        npa = (L2start / NPDPG) * PAGE_SIZE;
+        for (i = L2start; i <= L2end; i++) {
+                pa = (paddr_t)&(((pt_entry_t *)L2page)[i]);
+                pa -= npa;      /* shift on the left */
+                pa &= PG_FRAME; /* rounddown to a page boundary */
+                hal_gpt_enter(tmpva, pa);
+                invlpg(tmpva);
+
+                pde = (pt_entry_t *)tmpva;
+                pa = L1page + (i - L2start) * PAGE_SIZE;
+                pde[i % NPDPG] = (pa & PG_FRAME) | PG_V | PG_KW;
+        }
+
+        /* Create L3, linked to L2 */
+        npa = (L3start / NPDPG) * PAGE_SIZE;
+        for (i = L3start; i <= L3end; i++) {
+                pa = (paddr_t)&(((pt_entry_t *)L3page)[i]);
+                pa -= npa;      /* shift on the left */
+                pa &= PG_FRAME; /* rounddown to a page boundary */
+                hal_gpt_enter(tmpva, pa);
+                invlpg(tmpva);
+
+                pde = (pt_entry_t *)tmpva;
+                pa = L2page + (i - L3start) * PAGE_SIZE;
+                pde[i % NPDPG] = (pa & PG_FRAME) | PG_V | PG_KW;
+        }
+
+        /* Link L3 into L4 */
+        for (i = 0; i < nL4e; i++) {
+                pa = L3page + i * PAGE_SIZE;
+                L4_BASE[L4start + i] = (pa & PG_FRAME) | PG_V | PG_KW;
+        }
+}
+
+void hal_gpt_init(paddr_t firstpa)
+{
+        pa_avail = firstpa;
+        va_avail = CLUSTER0_MIN_VA;
+        hal_gpt_maptree_area(CLUSTER0_MIN_VA, CLUSTER0_MAX_VA);
+}
+
+/* -------------------------------------------------------------------------- */
 
 /****************************************************************************************

trunk/hal/x86_64/hal_init.c

@@ -24 +24 @@
 #include <hal_multiboot.h>
 #include <hal_segmentation.h>
+#include <hal_internal.h>
 
 #include <memcpy.h>
@@ -34 +35 @@
 #include <cluster.h>
 
-void x86_printf(char *s, ...);
-
 static void gdt_create();
 static void idt_create();
@@ -47 +46 @@
 #define offsetof(type, member) __builtin_offsetof(type, member)
 
-
 /* -------------------------------------------------------------------------- */
 
@@ -95 +93 @@
 
         dump_memmap();
-
         x86_printf("[+] dump finished\n");
+
+        hal_gpt_init(firstpa);
+        x86_printf("[+] hal_gpt_init called\n");
+
+        hal_acpi_init();
+        x86_printf("[+] hal_acpi_init called\n");
+
+
+        int m = 0;
+        int v = 1 / m;
 
         char *buf = NULL;
         *buf = (char)0x01;
-
-        int m = 0;
-        int v = 1 / m;
 
         x86_printf("ALIVE!\n");

trunk/hal/x86_64/hal_types.h

@@ -1 +1 @@
 /*
- * hal_types.h - common kernel types for MIPS 32 bits
+ * hal_types.h - common kernel types for x86_64
  *
  * Author  Alain Greiner (2016)