Changeset 623 for trunk/kernel/mm/mapper.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/mapper.c (modified) (5 diffs)

trunk/kernel/mm/mapper.c

@@ -3 +3 @@
  *
  * Authors   Mohamed Lamine Karaoui (2015)
- *           Alain Greiner (2016,2017,2018)
+ *           Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c)  UPMC Sorbonne Universites
@@ -261 +261 @@
 vfs_inode_t * inode = mapper->inode;
 vfs_inode_get_name( XPTR( local_cxy , inode ) , name );
-// if( DEBUG_MAPPER_HANDLE_MISS < cycle )
-// if( (page_id == 1) && (cycle > 10000000) )
+if( DEBUG_MAPPER_HANDLE_MISS < cycle )
 printk("\n[%s] enter for page %d in <%s> / cycle %d",
 __FUNCTION__, page_id, name, cycle );
@@ -322 +321 @@
 #if DEBUG_MAPPER_HANDLE_MISS
 cycle = (uint32_t)hal_get_cycles();
-// if( DEBUG_MAPPER_HANDLE_MISS < cycle )
-// if( (page_id == 1) && (cycle > 10000000) )
+if( DEBUG_MAPPER_HANDLE_MISS < cycle )
 printk("\n[%s] exit for page %d in <%s> / ppn %x / cycle %d",
 __FUNCTION__, page_id, name, ppm_page2ppn( *page_xp ), cycle );
@@ -442 +440 @@
             ppm_page_do_dirty( page_xp ); 
             hal_copy_from_uspace( map_ptr , buf_ptr , page_count ); 
+
+putb(" in mapper_move_user()" , map_ptr , page_count );
+
         }
 
@@ -645 +646 @@
 
 }  // end mapper_remote_set_32()
+
+/////////////////////////////////////////
+error_t mapper_sync( mapper_t *  mapper )
+{
+    page_t   * page;                // local pointer on current page descriptor
+    xptr_t     page_xp;             // extended pointer on current page descriptor
+    grdxt_t  * rt;                  // pointer on radix_tree descriptor
+    uint32_t   start_key;           // start page index in mapper
+    uint32_t   found_key;           // current page index in mapper
+    error_t    error;
+
+#if DEBUG_MAPPER_SYNC
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+char       name[CONFIG_VFS_MAX_NAME_LENGTH];
+vfs_inode_get_name( XPTR( local_cxy , mapper->inode ) , name );
+#endif
+
+    // get pointer on radix tree
+    rt        = &mapper->rt;
+
+    // initialise loop variable 
+    start_key = 0;
+
+    // scan radix-tree until last page found
+    while( 1 )
+    {
+        // get page descriptor from radix tree
+        page = (page_t *)grdxt_get_first( rt , start_key , &found_key );
+         
+        if( page == NULL ) break;
+
+assert( (page->index == found_key ), __FUNCTION__, "wrong page descriptor index" );
+assert( (page->order == 0),          __FUNCTION__, "mapper page order must be 0" );
+
+        // build extended pointer on page descriptor
+        page_xp = XPTR( local_cxy , page );
+
+        // synchronize page if dirty
+        if( (page->flags & PG_DIRTY) != 0 )
+        {
+
+#if DEBUG_MAPPER_SYNC
+if( cycle > DEBUG_MAPPER_SYNC )
+printk("\n[%s] thread[%x,%x] synchonise page %d of <%s> to device\n",
+__FUNCTION__, this->process->pid, this->trdid, page->index, name );
+#endif
+            // copy page to file system
+            error = vfs_fs_move_page( page_xp , IOC_WRITE );
+
+            if( error )
+            {
+                printk("\n[ERROR] in %s : cannot synchonize dirty page %d\n", 
+                __FUNCTION__, page->index );
+                return -1;
+            }
+
+            // remove page from PPM dirty list
+            ppm_page_undo_dirty( page_xp ); 
+        } 
+        else
+        {
+
+#if DEBUG_MAPPER_SYNC
+if( cycle > DEBUG_MAPPER_SYNC )
+printk("\n[%s] thread[%x,%x] skip page %d for <%s>\n",
+__FUNCTION__, this->process->pid, this->trdid, page->index, name );
+#endif
+        }
+
+        // update loop variable
+        start_key = page->index + 1;
+    }  // end while
+
+    return 0;
+
+}  // end mapper_sync()
 
 //////////////////////////////////////////////////