Changeset 315 for trunk/kernel/mm/vmm.c

Timestamp:

Aug 3, 2017, 10:15:18 AM (7 years ago)

Author:

alain

Message:

Redefine the fuctions ppm_base2page() / ppm_page2base() / ppm_page2ppn() / ppm_ppn2page() / ppm_base2ppn() / ppm_ppn2base(),
to use explicitely extended pointers.

File:

• trunk/kernel/mm/vmm.c (modified) (10 diffs)

trunk/kernel/mm/vmm.c

@@ -524 +524 @@
 
     // initialize vseg descriptor
-        vseg_init( vseg , base, size , vpn_base , vpn_size , type , local_cxy , 0 , 0 );
+        vseg_init( vseg , base, size , vpn_base , vpn_size , type , local_cxy );
 
     // update "heap_vseg" in VMM
@@ -633 +633 @@
 
         // set page table entry
-        ppn = ppm_page2ppn( page );
+        ppn = ppm_page2ppn( XPTR( local_cxy , page ) );
         error = hal_gpt_set_pte( gpt , vpn , ppn , attr );
                 if( error )
@@ -752 +752 @@
     uint32_t   type      = vseg->type;
     xptr_t     mapper_xp = vseg->mapper_xp;
+    uint32_t   flags     = vseg->flags;
 
     // get mapper cluster and local pointer
@@ -816 +817 @@
 
             // compute missing page offset in .elf file
-            intptr_t page_offset = vseg->file_offset + (page_index << PPM_PAGE_SHIFT);
-
-            // compute both local and extended pointer on page first byte 
-            // WARNING : the pages_offset must have the same value in all clusters !!!
-            //           to use this ppm_page2vaddr() function for a remote cluster
-            uint8_t * base_ptr = (uint8_t *)ppm_page2vaddr( page_ptr );
-            xptr_t    base_xp  = XPTR( page_cxy , base_ptr );
+            intptr_t page_offset = vseg->file_offset + 
+                                   (page_index << CONFIG_PPM_PAGE_SHIFT);
+
+            // compute extended pointer on page first byte 
+            xptr_t base_xp = ppm_page2base( XPTR( page_cxy , page_ptr ) );
 
             // file_size can be smaller than vseg_size for BSS
-            file_size = vseg->file_size;
-
-            if( file_size < page_offset )                          // page fully in  BSS 
+            intptr_t file_size = vseg->file_size;
+
+            if( file_size < page_offset )                                // fully in  BSS 
             {
                 if( page_cxy == local_cxy )
                 {
-                    memset( base_ptr , 0 , PPM_PAGE_SIZE );
+                    memset( GET_PTR( base_xp ) , 0 , CONFIG_PPM_PAGE_SIZE );
                 }
                 else
                 {
-                   hal_remote_memset( base_xp , 0 , PPM_PAGE_SIZE );       
+                   hal_remote_memset( base_xp , 0 , CONFIG_PPM_PAGE_SIZE );       
                 }
             }
-            else if( file size >= (page_offset + PPM_PAGE_SIZE) )  // page fully in  mapper
-    
+            else if( file_size >= (page_offset + CONFIG_PPM_PAGE_SIZE) )  // fully in  mapper
+            {
                 if( mapper_cxy == local_cxy ) 
                 {
@@ -846 +845 @@
                                                 page_offset,
                                                 base_xp,
-                                                PPM_PAGE_SIZE ); 
+                                                CONFIG_PPM_PAGE_SIZE ); 
                 }
                 else 
@@ -856 +855 @@
                                                    page_offset,
                                                    (uint64_t)base_xp,
-                                                   PPM_PAGE_SIZE,
+                                                   CONFIG_PPM_PAGE_SIZE,
                                                    &error );
                 }
@@ -865 +864 @@
             {
                 // initialize mapper part
-                if( mapper_cxy == local_cxy )                    // mapper is local
+                if( mapper_cxy == local_cxy )
                 {
                     error = mapper_move_kernel( mapper_ptr,
-                                                true,         // to_buffer
+                                                true,         // to buffer
                                                 page_offset,
                                                 base_xp,
                                                 file_size - page_offset ); 
                 }
-                else                                             // mapper is remote
+                else                                
                 {
                     rpc_mapper_move_buffer_client( mapper_cxy,
                                                    mapper_ptr,
-                                                   true,
+                                                   true,         // to buffer
                                                    false,        // kernel buffer
                                                    page_offset,
@@ -889 +888 @@
                 if( page_cxy == local_cxy )
                 {
-                    memset( base_ptr + file_size - page_offset , 0 , 
-                            page_offset + PPM_PAGE_SIZE - file_size );
+                    memset( GET_PTR( base_xp ) + file_size - page_offset , 0 , 
+                            page_offset + CONFIG_PPM_PAGE_SIZE - file_size );
                 }
                 else
                 {
                    hal_remote_memset( base_xp + file_size - page_offset , 0 , 
-                                      page_offset + PPM_PAGE_SIZE - file_size );
+                                      page_offset + CONFIG_PPM_PAGE_SIZE - file_size );
                 }
             }    
@@ -902 +901 @@
 
     // return ppn
-    *ppn = hal_page2ppn( XPTR( page_cxy , page_ptr ) );
+    *ppn = ppm_page2ppn( XPTR( page_cxy , page_ptr ) );
     return 0;
 
@@ -1064 +1063 @@
     return error;
 
-}
-/*
+}  // end vmm_v2p_translate()
+
+/* deprecated
 
 ///////////////////////////////////////////////////////////////////