Changeset 68 for trunk/kernel/mm

Timestamp:

Jun 27, 2017, 10:24:13 AM (7 years ago)

Author:

alain

Message:

Fix bug in kernel_init, and reduce size of remote_fifo.

Location:

trunk/kernel/mm

Files:

• page.h (modified) (1 diff)
• vmm.c (modified) (5 diffs)
• vmm.h (modified) (3 diffs)

trunk/kernel/mm/page.h

@@ -61 +61 @@
 {
     uint32_t          flags;          /*! flags defined above                  (4)  */
-    uint32_t          order;          /*! log2( number of 4Kbytes pages)       (4)  */
+    uint32_t          order;          /*! log2( number of small pages)         (4)  */
     struct mapper_s * mapper;         /*! local pointer on associated mapper   (4)  */
     uint32_t          index;          /*! page index in mapper                 (4)  */

trunk/kernel/mm/vmm.c

@@ -616 +616 @@
 
 
-//////////////////////////////////////////
-error_t vmm_map_vseg( vseg_t    * vseg,
-                      uint32_t    attr )
+//////////////////////////////////////////////
+error_t vmm_map_kernel_vseg( vseg_t    * vseg,
+                             uint32_t    attr )
 {
     vpn_t       vpn;        // VPN of PTE to be set
@@ -628 +628 @@
     error_t     error;
 
-    // check vseg type
+    // check vseg type : must be a kernel vseg
     uint32_t type = vseg->type;
-    if( (type != VSEG_TYPE_KCODE) && (type != VSEG_TYPE_KDATA) && (type != VSEG_TYPE_KDEV) )
-    {
-        printk("\n[PANIC] in %s : not a kernel vseg\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    assert( ((type==VSEG_TYPE_KCODE) || (type==VSEG_TYPE_KDATA) || (type==VSEG_TYPE_KDEV)),
+            __FUNCTION__ , "not a kernel vseg\n" );
 
     // get pointer on page table
@@ -648 +645 @@
         for( vpn = vpn_min ; vpn < vpn_max ; vpn++ )
         {
+        // allocate a physical page from local PPM
             kmem_req_t req;
             req.type  = KMEM_PAGE;
@@ -782 +780 @@
 
     // this function must be called by a thread running in the reference cluster 
-    if( GET_CXY( process->ref_xp ) != local_cxy );
-    {
-        printk("\n[PANIC] in %s : not called in the reference cluster\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    assert( (GET_CXY( process->ref_xp ) == local_cxy ) , __FUNCTION__ ,
+             " not called in the reference cluster\n" );
 
     // get VMM pointer
@@ -954 +949 @@
 }  // end vmm_v2p_translate()
 
-//////////////////////////////////////////////
 
 

trunk/kernel/mm/vmm.h

@@ -223 +223 @@
  * This function allocates physical memory from the local cluster to map all PTEs
  * of a "kernel" vseg (type KCODE , KDATA, or KDEV) in the page table of process_zero.
- * It should not be used for other vseg types, because "user" vsegs use the
+ * WARNING : It should not be used for "user" vsegs, that must be mapped using the
  * "on-demand-paging" policy.
  *********************************************************************************************
@@ -230 +230 @@
  * @ returns 0 if success / returns ENOMEM if no memory
  ********************************************************************************************/
-error_t vmm_map_vseg( vseg_t           * vseg,
-                      uint32_t           attr );
+error_t vmm_map_kernel_vseg( vseg_t           * vseg,
+                             uint32_t           attr );
 
 /*********************************************************************************************
@@ -312 +312 @@
 /*********************************************************************************************
  * This function makes the virtual to physical address translation, using the calling
- * process page table. It uses identity mapping if required by the ident flag.
+ * process page table. It uses identity mapping if required by the <ident> argument.
  * This address translation is required to configure the peripherals having a DMA
  * capability, or to implement the software L2/L3 cache cohérence, using the MMC device