Changeset 619 for trunk/kernel/libk/user_dir.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (5 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

• trunk/kernel/libk/user_dir.c (modified) (5 diffs)

trunk/kernel/libk/user_dir.c

@@ -286 +286 @@
             printk("\n[ERROR] in %s : cannot map vpn %x in GPT\n",
             __FUNCTION__, (vpn + page_id) );
-            // use the non blocking RPC to delete the remote vseg 
-            rpc_desc_t     desc;
-            desc.index     = RPC_VMM_DELETE_VSEG;
-            desc.responses = 1;
-            desc.thread    = CURRENT_THREAD;
-            desc.lid       = CURRENT_THREAD->core->lid;
-            desc.blocking  = true;
-            desc.args[0]   = ref_pid;
-            desc.args[1]   = vpn << CONFIG_PPM_PAGE_SHIFT;
-            rpc_vmm_delete_vseg_client( ref_cxy , &desc );
+
+            // delete the vseg
+            if( ref_cxy == local_cxy) vmm_delete_vseg( ref_pid, vpn<<CONFIG_PPM_PAGE_SHIFT );
+            else rpc_vmm_delete_vseg_client( ref_cxy, ref_pid, vpn<<CONFIG_PPM_PAGE_SHIFT );
+
             // release the user_dir descriptor
             req.type = KMEM_DIR;
@@ -387 +382 @@
     lpid_t         lpid;       // process local index
     rpc_desc_t     rpc;        // rpc descriptor
+    uint32_t       responses;  // response counter
      
     // get pointers on calling process & thread
@@ -441 +437 @@
     thread_block( XPTR( local_cxy , this ) , THREAD_BLOCKED_RPC );
 
-    // initialize RPC descriptor shared fields
-    rpc.responses = 0;
+    // initialize responses counter
+    responses = 0;
+
+    // initialize a shared RPC descriptor
+    // can be shared, because no out arguments
+    rpc.rsp       = &responses;
     rpc.blocking  = false;
     rpc.index     = RPC_VMM_DELETE_VSEG;
@@ -461 +461 @@
 
         // atomically increment responses counter
-        hal_atomic_add( (void *)&rpc.responses , 1 );
-
-        // call RPC  
-        rpc_vmm_delete_vseg_client( process_cxy , &rpc );
-
-    }  // end list of copies
+        hal_atomic_add( &responses , 1 );
+
+        // send RPC to target cluster  
+        rpc_send( process_cxy , &rpc );
+    }
 
     // release the lock protecting process copies
@@ -472 +471 @@
 
     // client thread deschedule
-    sched_yield("blocked on rpc_vmm_unmap_vseg");
+    sched_yield("blocked on rpc_vmm_delete_vseg");
  
     // restore IRQs