Changeset 116

Timestamp:

Jun 30, 2017, 5:18:13 PM (7 years ago)

Author:

max@…

Message:

complete hal_ppm_init, to take into account the reserved areas

Location:

trunk/hal/x86_64/core

Files:

• hal_gpt.c (modified) (3 diffs)
• hal_init.c (modified) (3 diffs)
• hal_internal.h (modified) (1 diff)
• hal_ppm.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_gpt.c

@@ -71 +71 @@
 void hal_gpt_bootstrap_reset()
 {
-//      XXX: will be revisited later
-//      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);
-//      va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
+        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);
+        va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
+}
+
+/*
+ * Uniformize the PA and VA offsets, and return the value. After this function,
+ * we are guaranteed to have [VA = PA + constant_offset]. And therefore we can
+ * only call hal_gpt_bootstrap_valloc, without entering it in a PA.
+ */
+size_t hal_gpt_bootstrap_uniformize()
+{
+        size_t pa_offset = pa_avail - 0;
+        size_t va_offset = va_avail - CLUSTER_MIN_VA(0);
+
+        if (pa_offset < va_offset)
+                pa_avail += (va_offset - pa_offset);
+        else if (pa_offset > va_offset)
+                va_avail += (pa_offset - va_offset);
+
+        return MAX(pa_offset, va_offset);
 }
 
@@ -81 +98 @@
         XASSERT(va % PAGE_SIZE == 0);
         XASSERT(pa % PAGE_SIZE == 0);
-        XASSERT(va == tmpva || PTE_BASE[pl1_i(va)] == 0);
+        //XASSERT(va == tmpva || PTE_BASE[pl1_i(va)] == 0);
         PTE_BASE[pl1_i(va)] = (pa & PG_FRAME) | flags;
         invlpg(va);
@@ -223 +240 @@
 
         /* Manually enter cluster0's heap */
-/*
         hal_gpt_enter_range(CLUSTER_MIN_VA(0) + kimg_size, kimg_max_pa,
             (CLUSTER_VA_SIZE - kimg_size) / PAGE_SIZE);
-*/
 }
 

trunk/hal/x86_64/core/hal_init.c

@@ -80 +80 @@
 }
 
+static size_t init_bootinfo_rsvd(boot_rsvd_t *rsvd)
+{
+        size_t mmap_length = mb_info.mi_mmap_length;
+        uint8_t *mmap_addr = (uint8_t *)&mb_mmap;
+        size_t i, rsvd_nr;
+
+        memset(rsvd, 0, sizeof(boot_rsvd_t));
+
+        i = 0, rsvd_nr = 0;
+        while (i < mmap_length) {
+                struct multiboot_mmap *mm;
+
+                mm = (struct multiboot_mmap *)(mmap_addr + i);
+
+                rsvd[rsvd_nr].first_page =
+                    rounddown(mm->mm_base_addr, PAGE_SIZE) / PAGE_SIZE;
+                rsvd[rsvd_nr].npages =
+                    roundup(mm->mm_length, PAGE_SIZE) / PAGE_SIZE;
+                rsvd_nr++;
+
+                if (rsvd_nr == CONFIG_PPM_MAX_RSVD)
+                        x86_panic("too many memory holes");
+
+                i += mm->mm_size + 4;
+        }
+
+        return rsvd_nr;
+}
+
 static void init_bootinfo_core(boot_core_t *core)
 {
@@ -109 +138 @@
 static void init_bootinfo(boot_info_t *info)
 {
-        extern paddr_t pa_avail;
-        extern vaddr_t va_avail;
+        size_t offset;
 
         extern uint64_t __kernel_data_start;
         extern uint64_t __kernel_end;
-
-        size_t pa_offset = pa_avail - 0;
-        size_t va_offset = va_avail - CLUSTER_MIN_VA(0);
 
         memset(info, 0, sizeof(boot_info_t));
@@ -136 +161 @@
         init_bootinfo_core(&info->core[0]);
 
-        info->rsvd_nr = 0;
-        /* rsvd XXX */
+        info->rsvd_nr = init_bootinfo_rsvd(&info->rsvd);
 
         /* dev_ XXX */
-
-        info->pages_offset = MAX(pa_offset, va_offset);
+        offset = hal_gpt_bootstrap_uniformize();
+        info->pages_offset = offset / PAGE_SIZE;
         info->pages_nr = 0; /* XXX */
 

trunk/hal/x86_64/core/hal_internal.h

@@ -51 +51 @@
 vaddr_t hal_gpt_bootstrap_valloc(size_t npages);
 void hal_gpt_bootstrap_reset();
+size_t hal_gpt_bootstrap_uniformize();
+
 void hal_gpt_enter(vaddr_t va, paddr_t pa, pt_entry_t flags);
 void hal_gpt_enter_range(vaddr_t va, paddr_t pa, size_t n);

trunk/hal/x86_64/core/hal_ppm.c

@@ -32 +32 @@
 #include <page.h>
 
+#include <hal_boot.h>
 #include <hal_internal.h>
 
 error_t hal_ppm_init(boot_info_t *info)
 {
-        size_t i;
+        boot_rsvd_t *rsvd;
+        size_t i, j;
 
         // get relevant info from boot_info structure
@@ -59 +61 @@
         }
 
-        // TODO
+        // initialize dirty_list as empty
+        list_root_init( &ppm->dirty_root );
 
-        x86_panic((char *)__func__);
-        return 0;
+        // compute size of pages_tbl[] array rounded to an integer number of pages
+        uint32_t bytes = ARROUND_UP( pages_nr * sizeof(page_t), CONFIG_PPM_PAGE_SIZE );
+
+        // compute number of pages required to store page descriptor array
+        uint32_t pages_tbl_nr = bytes >> CONFIG_PPM_PAGE_SHIFT;
+
+        // compute total number of reserved pages (kernel code & pages_tbl[])
+        uint32_t reserved_pages = pages_tbl_offset + pages_tbl_nr;
+
+        // initialize pages_nr, pages_tbl, and vaddr_base pointers
+        ppm->pages_nr   = pages_nr;
+        ppm->vaddr_base = (void *)CLUSTER_MIN_VA(0);
+        ppm->pages_tbl  = (page_t *)hal_gpt_bootstrap_valloc(pages_tbl_nr);
+
+        // make sure we respect the rule [VA = PA + constant_offset]
+        XASSERT(ppm->pages_tbl == ppm->vaddr_base + pages_tbl_offset * PAGE_SIZE);
+
+        // initialize all page descriptors in pages_tbl[]
+        for( i = 0 ; i < pages_nr ; i++ )
+        {
+                page_init( &ppm->pages_tbl[i] );
+
+                // TODO optimisation for this enormous loop on small pages:
+                // make only a partial init with a memset, and complete the
+                // initialisation when page is allocated [AG]
+        }
+
+        /*
+         * Set the PG_RESERVED flag for reserved pages (kernel, pages_tbl[] and
+         * memory holes).
+         */
+        for (i = 0; i < reserved_pages; i++) {
+                page_set_flag(&ppm->pages_tbl[i], PG_RESERVED);
+        }
+        for (i = 0; i < rsvd_nr; i++) {
+                rsvd = &info->rsvd[i];
+                for (j = 0; j < rsvd->npages; j++) {
+                        page_set_flag(&ppm->pages_tbl[rsvd->first_page + j], PG_RESERVED);
+                }
+        }
+
+        /* Release all other pages to populate the free lists */
+        for (i = reserved_pages; i < pages_nr; i++) {
+                if (!page_is_flag(&ppm->pages_tbl[i], PG_RESERVED))
+                        ppm_free_pages_nolock(&ppm->pages_tbl[i]);
+        }
+
+        /* Check consistency */
+        return ppm_assert_order(ppm);
 }