Changeset 623 for trunk/kernel/mm/vseg.c

Timestamp:

Mar 6, 2019, 4:37:15 PM (5 years ago)

Author:

alain

Message:

Introduce three new types of vsegs (KCODE,KDATA,KDEV)
to map the kernel vsegs in the process VSL and GPT.
This now used by both the TSAR and the I86 architectures.

File:

• trunk/kernel/mm/vseg.c (modified) (4 diffs)

trunk/kernel/mm/vseg.c

@@ -4 +4 @@
  * Authors   Ghassan Almaless (2008,2009,2010,2011, 2012)
  *           Mohamed Lamine Karaoui (2015)
- *           Alain Greiner (2016,2018,2019)
+ *           Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -55 +55 @@
         else if( vseg_type == VSEG_TYPE_FILE   ) return "FILE";
         else if( vseg_type == VSEG_TYPE_REMOTE ) return "REMO";
+        else if( vseg_type == VSEG_TYPE_KCODE  ) return "KCOD";
+        else if( vseg_type == VSEG_TYPE_KDATA  ) return "KDAT";
+        else if( vseg_type == VSEG_TYPE_KDEV   ) return "KDEV";
     else                                     return "undefined";
 }
@@ -142 +145 @@
                       VSEG_CACHE   ;
     }
+    else if( type == VSEG_TYPE_KCODE )
+    {
+        vseg->flags = VSEG_EXEC    |
+                      VSEG_CACHE   |
+                      VSEG_PRIVATE ;
+    }
+    else if( type == VSEG_TYPE_KDATA )
+    {
+        vseg->flags = VSEG_CACHE   |
+                      VSEG_WRITE   ;
+    }
+    else if( type == VSEG_TYPE_KDEV )
+    {
+        vseg->flags = VSEG_WRITE   ;
+    }
     else
     {
@@ -158 +176 @@
 
     // initialize vseg with remote_read access
-    vseg->type        =           hal_remote_l32 ( XPTR( cxy , &ptr->type        ) );
+    vseg->type        =           hal_remote_l32( XPTR( cxy , &ptr->type        ) );
     vseg->min         = (intptr_t)hal_remote_lpt( XPTR( cxy , &ptr->min         ) );
     vseg->max         = (intptr_t)hal_remote_lpt( XPTR( cxy , &ptr->max         ) );
-    vseg->vpn_base    =           hal_remote_l32 ( XPTR( cxy , &ptr->vpn_base    ) );
-    vseg->vpn_size    =           hal_remote_l32 ( XPTR( cxy , &ptr->vpn_size    ) );
-    vseg->flags       =           hal_remote_l32 ( XPTR( cxy , &ptr->flags       ) );
-    vseg->file_offset =           hal_remote_l32 ( XPTR( cxy , &ptr->file_offset ) );
-    vseg->file_size   =           hal_remote_l32 ( XPTR( cxy , &ptr->file_size   ) );
+    vseg->vpn_base    =           hal_remote_l32( XPTR( cxy , &ptr->vpn_base    ) );
+    vseg->vpn_size    =           hal_remote_l32( XPTR( cxy , &ptr->vpn_size    ) );
+    vseg->flags       =           hal_remote_l32( XPTR( cxy , &ptr->flags       ) );
+    vseg->file_offset =           hal_remote_l32( XPTR( cxy , &ptr->file_offset ) );
+    vseg->file_size   =           hal_remote_l32( XPTR( cxy , &ptr->file_size   ) );
         vseg->mapper_xp   = (xptr_t)  hal_remote_l64( XPTR( cxy , &ptr->mapper_xp   ) );
 
     switch (vseg->type)
     {
-        case VSEG_TYPE_DATA: 
+        case VSEG_TYPE_DATA:      // unused 
         {
             vseg->cxy = 0xffff;
             break;
         }
-        case VSEG_TYPE_CODE:
+        case VSEG_TYPE_CODE:      // always local
         case VSEG_TYPE_STACK: 
+        case VSEG_TYPE_KCODE:
         {
             vseg->cxy = local_cxy;
             break;
         }
-        case VSEG_TYPE_ANON:
+        case VSEG_TYPE_ANON:      // intrinsic
         case VSEG_TYPE_FILE:
         case VSEG_TYPE_REMOTE: 
+        case VSEG_TYPE_KDEV:
+        case VSEG_TYPE_KDATA:
         {
             vseg->cxy = (cxy_t) hal_remote_l32( XPTR(cxy, &ptr->cxy) );