Changeset 313 for trunk/kernel/mm/mapper.c

Timestamp:

Aug 2, 2017, 3:24:57 PM (7 years ago)

Author:

alain

Message:

RSeveral modifs in the page-fault handling.

File:

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

trunk/kernel/mm/mapper.c

@@ -299 +299 @@
 }  // end mapper_release_page()
 
-////////////////////////////////////////////////
-error_t mapper_move_buffer( mapper_t  *  mapper,
-                            bool_t       to_buffer,
-                            bool_t       is_user,
-                            uint32_t     file_offset,
-                            void      *  buffer,
-                            uint32_t     size )
+///////////////////////////////////////////////////
+error_t mapper_move_user( mapper_t * mapper,
+                          bool_t     to_buffer,
+                          uint32_t   file_offset,
+                          void     * buffer,
+                          uint32_t   size )
 {
     uint32_t   page_offset;    // first byte to move to/from a mapper page
@@ -335 +334 @@
         else                 page_offset = 0;
 
-        // compute page_count
+        // compute number of bytes in page
         if      ( first == last  ) page_count = size;
         else if ( index == first ) page_count = CONFIG_PPM_PAGE_SIZE - page_offset;
@@ -359 +358 @@
 
         // move fragment
-        if( to_buffer )
-        {
-            if( is_user ) hal_copy_to_uspace( buf_ptr , map_ptr , page_count );
-            else          memcpy( buf_ptr , map_ptr , page_count );
+        if( to_buffer ) 
+        {
+            hal_copy_to_uspace( buf_ptr , map_ptr , page_count );
         }
         else                 
         {
             page_do_dirty( page );
-            if( is_user ) hal_copy_from_uspace( map_ptr , buf_ptr , page_count );
-            else          memcpy( map_ptr , buf_ptr , page_count );
+            hal_copy_from_uspace( map_ptr , buf_ptr , page_count );
         }
 
@@ -379 +376 @@
     return 0;
 
-}  // end mapper_move_buffer()
-
+}  // end mapper_move_user()
+
+////////////////////////////////////////////////
+error_t mapper_move_kernel( mapper_t  *  mapper,
+                            bool_t       to_buffer,
+                            uint32_t     file_offset,
+                            xptr_t       buffer_xp,
+                            uint32_t     size )
+{
+    uint32_t   page_offset;    // first byte to move to/from a mapper page
+    uint32_t   page_count;     // number of bytes to move to/from a mapper page
+    uint32_t   index;          // current mapper page index
+    uint32_t   done;           // number of moved bytes
+    page_t   * page;           // current mapper page descriptor
+
+    uint8_t  * src_ptr;        // source buffer local pointer
+    cxy_t      src_cxy;        // source cluster
+    uint8_t  * dst_ptr;        // destination buffer local pointer
+    cxy_t      dst_cxy;        // destination cluster
+ 
+    mapper_dmsg("\n[INFO] %s : enters / to_buf = %d / buffer = %l / size = %x / cycle %d\n",
+                __FUNCTION__ , to_buffer , buffer_xp , size , hal_time_stamp() );
+
+    // compute offsets of first and last bytes in file
+    uint32_t min_byte = file_offset;
+    uint32_t max_byte = file_offset + size -1;
+
+    // compute indexes for first and last pages in mapper
+    uint32_t first = min_byte >> CONFIG_PPM_PAGE_SHIFT;
+    uint32_t last  = max_byte >> CONFIG_PPM_PAGE_SHIFT;
+
+    // get buffer cluster and local pointer
+    cxy_t     buffer_cxy = GET_CXY( buffer_xp );
+    uint8_t * buffer_ptr = (uint8_t *)GET_PTR( buffer_xp );
+
+    // compute source and destination clusters
+    if( to_buffer )
+    {
+        dst_cxy = buffer_cxy;
+        src_cxy = local_cxy;
+    }
+    else
+    {
+        src_cxy = buffer_cxy;
+        dst_cxy = local_cxy;
+    }
+
+    done = 0;
+
+    // loop on pages in mapper
+    for( index = first ; index <= last ; index++ )
+    {
+        // compute page_offset
+        if( index == first ) page_offset = min_byte & CONFIG_PPM_PAGE_MASK;
+        else                 page_offset = 0;
+
+        // compute number of bytes to move in page
+        if      ( first == last  ) page_count = size;
+        else if ( index == first ) page_count = CONFIG_PPM_PAGE_SIZE - page_offset;
+        else if ( index == last  ) page_count = (max_byte & CONFIG_PPM_PAGE_MASK) + 1;
+        else                       page_count = CONFIG_PPM_PAGE_SIZE;
+
+        mapper_dmsg("\n[INFO] %s : page_index = %d / offset = %d / count = %d\n",
+                    __FUNCTION__ , index , page_offset , page_count );
+
+        // get page descriptor
+        page = mapper_get_page( mapper , index );
+
+        if ( page == NULL ) return EINVAL;
+
+        // compute source and destination pointers
+        if( to_buffer )
+        {
+            dst_ptr = buf_ptr + done;
+            src_ptr = (uint8_t *)ppm_page2vaddr( page ) + page_offset;
+        }
+        else
+        {
+            src_ptr = buf_ptr + done;
+            dst_ptr = (uint8_t *)ppm_page2vaddr( page ) + page_offset;
+
+            page_do_dirty( page );
+        }
+
+        mapper_dmsg("\n[INFO] %s : index = %d / buf_ptr = %x / map_ptr = %x\n",
+                    __FUNCTION__ , index , buf_ptr , map_ptr );
+
+        // move fragment
+        hal_remote_memcpy( XPTR( dst_cxy , dst_ptr ), XPTR( src_cxy , src_ptr ), page_count );
+                           
+        done += page_count;
+    }
+
+    mapper_dmsg("\n[INFO] %s : exit for buffer %l / size = %x / cycle %d\n",
+                __FUNCTION__ , buffer_xp , size , hal_time_stamp() );
+
+    return 0;
+
+}  // end mapper_move_kernel_buffer()
+