Changeset 313 for trunk/kernel/kern/rpc.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/kern/rpc.c (modified) (10 diffs)

trunk/kernel/kern/rpc.c

@@ -75 +75 @@
     &rpc_kcm_free_server,               // 23
     &rpc_mapper_move_buffer_server,     // 24
-    &rpc_undefined,                     // 25
+    &rpc_mapper_get_page_server,        // 25
     &rpc_undefined,                     // 26
     &rpc_undefined,                     // 27
@@ -96 +96 @@
 void rpc_pmem_get_pages_client( cxy_t      cxy,
                                 uint32_t   order,      // in 
-                                error_t  * error,      // out 
-                                uint32_t * ppn )       // out 
+                                page_t  ** page )      // out 
 {
     rpc_dmsg("\n[INFO] %s : enter at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
@@ -114 +113 @@
     rpc_send_sync( cxy , &rpc );
 
-    // get output arguments RPC descriptor
-    *error  = (error_t)rpc.args[0];     
-    *ppn    = (uint32_t)rpc.args[1];
+    // get output arguments from RPC descriptor
+    *page    = (page_t *)(intptr_t)rpc.args[1];
 
     rpc_dmsg("\n[INFO] %s : completed at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
@@ -124 +122 @@
 void rpc_pmem_get_pages_server( xptr_t xp )
 {
-    uint32_t order;  // input
-    error_t  error;  // output
-    uint32_t ppn;    // output
-
     rpc_dmsg("\n[INFO] %s : enter at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
 
@@ -135 +129 @@
 
     // get input arguments from client RPC descriptor
-    order = hal_remote_lw( XPTR( cxy , &desc->args[0] ) );
+    uint32_t order = hal_remote_lw( XPTR( cxy , &desc->args[0] ) );
     
     // call local pmem allocator
     page_t * page = ppm_alloc_pages( order ); 
-    error = ( page == NULL ) ? ENOMEM : 0;
-    ppn   = ppm_page2ppn( page );
 
     // set output arguments into client RPC descriptor
-    hal_remote_sw( XPTR( cxy , &desc->args[0] ) , error );
-    hal_remote_sw( XPTR( cxy , &desc->args[1] ) , ppn );
+    hal_remote_swd( XPTR( cxy , &desc->args[1] ) , (uint64_t)(intptr_t)page );
 
     rpc_dmsg("\n[INFO] %s : completed at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
@@ -1353 +1344 @@
                                     bool_t     is_user,       // in
                                     uint32_t   file_offset,   // in
-                                    void     * buffer,        // in
+                                    uint64_t   buffer,        // in
                                     uint32_t   size,          // in
                                     error_t  * error )        // out
@@ -1371 +1362 @@
     rpc.args[2] = (uint64_t)is_user;
     rpc.args[3] = (uint64_t)file_offset;
-    rpc.args[4] = (uint64_t)(intptr_t)buffer;
+    rpc.args[4] = (uint64_t)buffer;
     rpc.args[5] = (uint64_t)size;
 
@@ -1390 +1381 @@
     bool_t     is_user;
     uint32_t   file_offset;
-    void     * buffer;
+    void     * user_buffer;
+    xptr_t     kern_buffer;
     uint32_t   size;
     error_t    error;
@@ -1405 +1397 @@
     is_user     =                       hal_remote_lwd( XPTR( client_cxy , &desc->args[2] ) );
     file_offset =                       hal_remote_lwd( XPTR( client_cxy , &desc->args[3] ) );
-    buffer      = (void     *)(intptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
     size        =                       hal_remote_lwd( XPTR( client_cxy , &desc->args[5] ) );
 
     // call local kernel function
-    error = mapper_move_buffer( mapper,
-                                to_buffer,
-                                is_user,
-                                file_offset,
-                                buffer,
-                                size );
+    if( is_user )
+    {
+        user_buffer = (void *)(intptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
+
+        error = mapper_move_user_buffer( mapper,
+                                         to_buffer,
+                                         file_offset,
+                                         user_buffer,
+                                         size );
+    }
+    else
+    {
+        kern_buffer = (xptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
+
+        error = mapper_move_user_buffer( mapper,
+                                         to_buffer,
+                                         file_offset,
+                                         kern_buffer,
+                                         size );
+    }
 
     // set output argument to client RPC descriptor
@@ -1421 +1426 @@
     rpc_dmsg("\n[INFO] %s : completed at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
 }
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// [25]          Marshaling functions attached to RPC_MAPPER_GET_PAGE
+/////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////
+void rpc_mapper_get_page_client( cxy_t             cxy,
+                                 struct mapper_s * mapper,     // in
+                                 uint32_t          index,      // in
+                                 page_t         ** page )      // out
+{
+    rpc_dmsg("\n[INFO] %s : enter at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
+
+    assert( (cxy != local_cxy) , __FUNCTION__ , "target cluster is not remote\n");
+
+    // initialise RPC descriptor header 
+    rpc_desc_t  rpc;
+    rpc.index    = RPC_MAPPER_GET_PAGE;
+    rpc.response = 1;
+
+    // set input arguments in RPC descriptor 
+    rpc.args[0] = (uint64_t)(intptr_t)mapper;
+    rpc.args[1] = (uint64_t)index;
+
+    // register RPC request in remote RPC fifo (blocking function)
+    rpc_send_sync( cxy , &rpc );
+
+    // get output values from RPC descriptor
+    *page = (page_t *)(intptr_t)rpc.args[2];
+
+    rpc_dmsg("\n[INFO] %s : completed at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
+}
+
+////////////////////////////////////////////
+void rpc_mapper_get_page_server( xptr_t xp )
+{
+    rpc_dmsg("\n[INFO] %s : enter at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
+
+    // get client cluster identifier and pointer on RPC descriptor
+    cxy_t        cxy  = (cxy_t)GET_CXY( xp );
+    rpc_desc_t * desc = (rpc_desc_t *)GET_PTR( xp );
+
+    // get input arguments from client RPC descriptor
+    mapper_t * mapper = (mapper_t *)(intptr_t)hal_remote_lwd( XPTR( cxy , &desc->args[0] ) );
+    uint32_t   index  = (uint32_t)            hal_remote_lwd( XPTR( cxy , &desc->args[1] ) );
+    
+    // call local pmem allocator
+    page_t * page = mapper_get_page( mapper , index ); 
+
+    // set output arguments into client RPC descriptor
+    hal_remote_swd( XPTR( cxy , &desc->args[1] ) , (uint64_t)(intptr_t)page );
+
+    rpc_dmsg("\n[INFO] %s : completed at cycle %d\n", __FUNCTION__ , hal_time_stamp() );
+}
+
 
 /***************************************************************************************/