Changeset 614 for trunk/kernel/kern

Timestamp:

Jan 15, 2019, 1:59:32 PM (6 years ago)

Author:

alain

Message:

1) introduce a dev_ioc_sync_write() function in IOC API,

to improve the DEVFS synchronous update.

2) fix a big bug in both the user_dir_create() and user_dir_destroy()

functions: add an extended pointer on the reference client process
in the function's arguments.

Location:

trunk/kernel/kern

Files:

• kernel_init.c (modified) (3 diffs)
• rpc.c (modified) (11 diffs)
• rpc.h (modified) (2 diffs)
• scheduler.c (modified) (1 diff)

trunk/kernel/kern/kernel_init.c

@@ -1113 +1113 @@
         vfs_root_inode_xp = XPTR_NULL;
 
-        // File System must be FATFS in this implementation,
-        // but other File System can be introduced here
+        // Only FATFS is supported yet,
+        // other File System can be introduced here
         if( CONFIG_VFS_ROOT_IS_FATFS )
         {
@@ -1172 +1172 @@
         }
 
+        // create the <.> and <..> dentries in VFS root directory
+        // the VFS root parent inode is the VFS root inode itself 
+        vfs_add_special_dentries( vfs_root_inode_xp,
+                                  vfs_root_inode_xp );
+
         // register VFS root inode in process_zero descriptor of cluster 0
         process_zero.vfs_root_xp = vfs_root_inode_xp;
@@ -1255 +1260 @@
 #if DEBUG_KERNEL_INIT
 if( (core_lid ==  0) & (local_cxy == 1) ) 
-printk("\n[%s] : exit barrier 4 : VFS root (%x,%x) in cluster 1 / cycle %d\n",
+printk("\n[%s] : exit barrier 5 : VFS root (%x,%x) in cluster 1 / cycle %d\n",
 __FUNCTION__, GET_CXY(process_zero.vfs_root_xp),
 GET_PTR(process_zero.vfs_root_xp), (uint32_t)hal_get_cycles() );

trunk/kernel/kern/rpc.c

@@ -54 +54 @@
     &rpc_undefined,                        // 2    unused slot
     &rpc_process_make_fork_server,         // 3
-    &rpc_undefined,                        // 4    unused slot
-    &rpc_undefined,                        // 5    unused slot
+    &rpc_user_dir_create_server,           // 4
+    &rpc_user_dir_destroy_server,          // 5
     &rpc_thread_user_create_server,        // 6
     &rpc_thread_kernel_create_server,      // 7
@@ -90 +90 @@
     "undefined",                 // 2
     "PROCESS_MAKE_FORK",         // 3
-    "undefined",                 // 4
-    "undefined",                 // 5
+    "USER_DIR_CREATE",           // 4
+    "USER_DIR_DESTROY",          // 5
     "THREAD_USER_CREATE",        // 6
     "THREAD_KERNEL_CREATE",      // 7
@@ -657 +657 @@
 void rpc_user_dir_create_client( cxy_t          cxy,
                                  vfs_inode_t *  inode,
+                                 xptr_t         ref_xp,
                                  user_dir_t  ** dir )
 {
@@ -677 +678 @@
     // set input arguments in RPC descriptor 
     rpc.args[0] = (uint64_t)(intptr_t)inode;
+    rpc.args[1] = (uint64_t)ref_xp;
 
     // register RPC request in remote RPC fifo
@@ -682 +684 @@
 
     // get output argument from RPC descriptor
-    *dir = (user_dir_t *)(intptr_t)rpc.args[1];
+    *dir = (user_dir_t *)(intptr_t)rpc.args[2];
 
 #if DEBUG_RPC_USER_DIR_CREATE
@@ -704 +706 @@
 
     vfs_inode_t * inode;          // pointer on inode in server cluster
+    xptr_t        ref_xp;         // extended pointer on reference user process
     user_dir_t  * dir;            // pointer on user_dir structure in server cluster 
 
@@ -711 +714 @@
 
     // get input argument from RPC descriptor
-    inode = (vfs_inode_t *)(intptr_t)hal_remote_l64(XPTR(client_cxy , &desc->args[0]));
+    inode  = (vfs_inode_t *)(intptr_t)hal_remote_l64(XPTR(client_cxy , &desc->args[0]));
+    ref_xp = (xptr_t)                 hal_remote_l64(XPTR(client_cxy , &desc->args[1]));
 
     // call kernel function
-    dir = user_dir_create( inode );
+    dir = user_dir_create( inode , ref_xp );
 
     // set output argument into RPC descriptor
-    hal_remote_s64( XPTR( client_cxy , &desc->args[1] ) , (intptr_t)dir );
+    hal_remote_s64( XPTR( client_cxy , &desc->args[2] ) , (intptr_t)dir );
 
 #if DEBUG_RPC_USER_DIR_CREATE
@@ -733 +737 @@
 ////////////////////////////////////////////////////
 void rpc_user_dir_destroy_client( cxy_t         cxy,
-                                  user_dir_t  * dir )
+                                  user_dir_t  * dir,
+                                  xptr_t        ref_xp )
 {
 #if DEBUG_RPC_USER_DIR_DESTROY
@@ -753 +758 @@
     // set input arguments in RPC descriptor 
     rpc.args[0] = (uint64_t)(intptr_t)dir;
+    rpc.args[1] = (uint64_t)ref_xp;
 
     // register RPC request in remote RPC fifo
@@ -777 +783 @@
 
     user_dir_t * dir;            // pointer on user_dir structure in server cluster 
+    xptr_t       ref_xp;         // extended pointer on reference process
 
     // get client cluster identifier and pointer on RPC descriptor
@@ -783 +790 @@
 
     // get input argument from RPC descriptor
-    dir = (user_dir_t *)(intptr_t)hal_remote_l64(XPTR(client_cxy , &desc->args[0]));
+    dir    = (user_dir_t *)(intptr_t)hal_remote_l64(XPTR(client_cxy , &desc->args[0]));
+    ref_xp = (xptr_t)                hal_remote_l64(XPTR(client_cxy , &desc->args[1]));
 
     // call kernel function
-    user_dir_destroy( dir );
+    user_dir_destroy( dir , ref_xp );
 
 #if DEBUG_RPC_USER_DIR_DESTROY

trunk/kernel/kern/rpc.h

@@ -229 +229 @@
  * [4] The RPC_USER_DIR_CREATE allows a client thread to create an user_dir_t
  * structure and the associated array of dirents in a remote cluster containing
- * the target directory inode. It is called by the sys_opendir() function.
+ * the target directory <inode>. It creates an ANON vseg in the user reference 
+ * process VMM identified by the <ref_xp>. This reference cluster cluster can be
+ * different from both the client and server clusters.
+ * It is called by the sys_opendir() function.
  ***********************************************************************************
  * @ cxy        : server cluster identifier.
  * @ inode      : [in]   local pointer on inode in server cluster.
+ * @ ref_xp     : [in]   extended pointer on user reference process descriptor.
  * @ dir        : [out]  local pointer on created user_dir structure.
  **********************************************************************************/
 void rpc_user_dir_create_client( cxy_t                 cxy,
                                  struct vfs_inode_s  * inode,
+                                 xptr_t                ref_xp,
                                  struct user_dir_s  ** dir );
 
@@ -248 +253 @@
  * @ cxy        : server cluster identifier.
  * @ dir        : [in]  local pointer on created user_dir structure.
+ * @ ref_xp     : [in]   extended pointer on user reference process descriptor.
  **********************************************************************************/
 void rpc_user_dir_destroy_client( cxy_t               cxy,
-                                  struct user_dir_s * dir );
+                                  struct user_dir_s * dir,
+                                  xptr_t              ref_xp );
 
 void rpc_user_dir_destroy_server( xptr_t xp );

trunk/kernel/kern/scheduler.c

@@ -487 +487 @@
  
 #if (DEBUG_SCHED_YIELD & 0x1)
-if( sched->trace ) sched_display( lid );
+if( sched->trace )
+sched_display( lid );
 #endif
 
-// This assert should never be false, as this check must be
-// done before by any function that can possibly deschedule...
+// This assert should never be false, as this check has been
+// done before, by any function that can possibly deschedule...
 assert( (current->busylocks == 0),
 "unexpected descheduling of thread holding %d busylocks = %d\n", current->busylocks );