Changeset 317 for trunk/kernel

Timestamp:

Aug 4, 2017, 2:03:44 PM (7 years ago)

Author:

alain

Message:

1) Introduce the TSAR hal_cpu_context_switch() function.
2) Introduce the generic vfs_kernel_move() function.

Location:

trunk/kernel

Files:

• kern/chdev.c (modified) (2 diffs)
• kern/chdev.h (modified) (1 diff)
• kern/kernel_init.c (modified) (1 diff)
• kern/scheduler.c (modified) (1 diff)
• vfs/vfs.c (modified) (2 diffs)
• vfs/vfs.h (modified) (3 diffs)

trunk/kernel/kern/chdev.c

@@ -33 +33 @@
 #include <chdev.h>
 #include <devfs.h>
+
+
+extern chdev_directory_t    chdev_dir;   // allocated in kernel_init.c
+
 
 ////////////////////////////////////////////
@@ -188 +192 @@
 }  // end chdev_sequencial_server()
 
+////////////////////////
+void chdev_dir_display()
+{
+    cxy_t     iob_cxy  = GET_CXY( chdev_dir.iob );
+    chdev_t * iob_ptr  = (chdev_t *)GET_PTR( chdev_dir.iob );
+    xptr_t    iob_base = hal_remote_lwd( XPTR( iob_cxy , &iob_ptr->base ) );
+
+    cxy_t     pic_cxy  = GET_CXY( chdev_dir.pic );
+    chdev_t * pic_ptr  = (chdev_t *)GET_PTR( chdev_dir.pic );
+    xptr_t    pic_base = hal_remote_lwd( XPTR( pic_cxy , &pic_ptr->base ) );
+
+    cxy_t     txt0_cxy  = GET_CXY( chdev_dir.txt[0] );
+    chdev_t * txt0_ptr  = (chdev_t *)GET_PTR( chdev_dir.txt[0] );
+    xptr_t    txt0_base = hal_remote_lwd( XPTR( txt0_cxy , &txt0_ptr->base ) );
+
+    cxy_t     txt1_cxy  = GET_CXY( chdev_dir.txt[1] );
+    chdev_t * txt1_ptr  = (chdev_t *)GET_PTR( chdev_dir.txt[1] );
+    xptr_t    txt1_base = hal_remote_lwd( XPTR( txt1_cxy , &txt1_ptr->base ) );
+
+    cxy_t     txt2_cxy  = GET_CXY( chdev_dir.txt[2] );
+    chdev_t * txt2_ptr  = (chdev_t *)GET_PTR( chdev_dir.txt[2] );
+    xptr_t    txt2_base = hal_remote_lwd( XPTR( txt2_cxy , &txt2_ptr->base ) );
+
+    cxy_t     ioc_cxy  = GET_CXY( chdev_dir.ioc[0] );
+    chdev_t * ioc_ptr  = (chdev_t *)GET_PTR( chdev_dir.ioc[0] );
+    xptr_t    ioc_base = hal_remote_lwd( XPTR( ioc_cxy , &ioc_ptr->base ) );
+
+    cxy_t     fbf_cxy  = GET_CXY( chdev_dir.fbf[0] );
+    chdev_t * fbf_ptr  = (chdev_t *)GET_PTR( chdev_dir.fbf[0] );
+    xptr_t    fbf_base = hal_remote_lwd( XPTR( fbf_cxy , &fbf_ptr->base ) );
+
+    cxy_t     nic_rx_cxy  = GET_CXY( chdev_dir.nic_rx[0] );
+    chdev_t * nic_rx_ptr  = (chdev_t *)GET_PTR( chdev_dir.nic_rx[0] );
+    xptr_t    nic_rx_base = hal_remote_lwd( XPTR( nic_rx_cxy , &nic_rx_ptr->base ) );
+
+    cxy_t     nic_tx_cxy  = GET_CXY( chdev_dir.nic_tx[0] );
+    chdev_t * nic_tx_ptr  = (chdev_t *)GET_PTR( chdev_dir.nic_tx[0] );
+    xptr_t    nic_tx_base = hal_remote_lwd( XPTR( nic_tx_cxy , &nic_tx_ptr->base ) );
+
+    printk("\n***** external chdev directory in cluster %x\n"
+           "  - iob       = %l / base = %l\n"
+           "  - pic       = %l / base = %l\n"
+           "  - txt[0]    = %l / base = %l\n"
+           "  - txt[1]    = %l / base = %l\n"
+           "  - txt[2]    = %l / base = %l\n"
+           "  - ioc[0]    = %l / base = %l\n"
+           "  - fbf[0]    = %l / base = %l\n"
+           "  - nic_rx[0] = %l / base = %l\n"
+           "  - nic_tx[0] = %l / base = %l\n",
+           local_cxy,
+           chdev_dir.iob, iob_base,
+           chdev_dir.pic, pic_base,
+           chdev_dir.txt[0], txt0_base,
+           chdev_dir.txt[1], txt1_base,
+           chdev_dir.txt[2], txt2_base,
+           chdev_dir.ioc[0], ioc_base,
+           chdev_dir.fbf[0], fbf_base,
+           chdev_dir.nic_rx[0], nic_rx_base,
+           chdev_dir.nic_tx[0], nic_tx_base );
+
+}  // end chdev_dir_display()
+

trunk/kernel/kern/chdev.h

@@ -233 +233 @@
 void chdev_sequencial_server( chdev_t * chdev );
 
+/******************************************************************************************
+ * This function displays the local copy of the external chdevs directory.
+ * (global variable replicated in all clusters)
+ *****************************************************************************************/
+void chdev_dir_display();
+
+
 
 #endif  /* _CHDEV_H_ */

trunk/kernel/kern/kernel_init.c

@@ -656 +656 @@
     }
     return EINVAL;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// This function display on TXT0 the content of the external chdev directory,
-// in the local cluster.
-////////////////////////////////////////////////////////////////////////////////////////////
-static void chdev_dir_display( )
-{
-    cxy_t     iob_cxy  = GET_CXY( chdev_dir.iob );
-    chdev_t * iob_ptr  = (chdev_t *)GET_PTR( chdev_dir.iob );
-    xptr_t    iob_base = hal_remote_lwd( XPTR( iob_cxy , &iob_ptr->base ) );
-
-    cxy_t     pic_cxy  = GET_CXY( chdev_dir.pic );
-    chdev_t * pic_ptr  = (chdev_t *)GET_PTR( chdev_dir.pic );
-    xptr_t    pic_base = hal_remote_lwd( XPTR( pic_cxy , &pic_ptr->base ) );
-
-    cxy_t     txt0_cxy  = GET_CXY( chdev_dir.txt[0] );
-    chdev_t * txt0_ptr  = (chdev_t *)GET_PTR( chdev_dir.txt[0] );
-    xptr_t    txt0_base = hal_remote_lwd( XPTR( txt0_cxy , &txt0_ptr->base ) );
-
-    cxy_t     txt1_cxy  = GET_CXY( chdev_dir.txt[1] );
-    chdev_t * txt1_ptr  = (chdev_t *)GET_PTR( chdev_dir.txt[1] );
-    xptr_t    txt1_base = hal_remote_lwd( XPTR( txt1_cxy , &txt1_ptr->base ) );
-
-    cxy_t     txt2_cxy  = GET_CXY( chdev_dir.txt[2] );
-    chdev_t * txt2_ptr  = (chdev_t *)GET_PTR( chdev_dir.txt[2] );
-    xptr_t    txt2_base = hal_remote_lwd( XPTR( txt2_cxy , &txt2_ptr->base ) );
-
-    cxy_t     ioc_cxy  = GET_CXY( chdev_dir.ioc[0] );
-    chdev_t * ioc_ptr  = (chdev_t *)GET_PTR( chdev_dir.ioc[0] );
-    xptr_t    ioc_base = hal_remote_lwd( XPTR( ioc_cxy , &ioc_ptr->base ) );
-
-    cxy_t     fbf_cxy  = GET_CXY( chdev_dir.fbf[0] );
-    chdev_t * fbf_ptr  = (chdev_t *)GET_PTR( chdev_dir.fbf[0] );
-    xptr_t    fbf_base = hal_remote_lwd( XPTR( fbf_cxy , &fbf_ptr->base ) );
-
-    cxy_t     nic_rx_cxy  = GET_CXY( chdev_dir.nic_rx[0] );
-    chdev_t * nic_rx_ptr  = (chdev_t *)GET_PTR( chdev_dir.nic_rx[0] );
-    xptr_t    nic_rx_base = hal_remote_lwd( XPTR( nic_rx_cxy , &nic_rx_ptr->base ) );
-
-    cxy_t     nic_tx_cxy  = GET_CXY( chdev_dir.nic_tx[0] );
-    chdev_t * nic_tx_ptr  = (chdev_t *)GET_PTR( chdev_dir.nic_tx[0] );
-    xptr_t    nic_tx_base = hal_remote_lwd( XPTR( nic_tx_cxy , &nic_tx_ptr->base ) );
-
-    printk("\n*** external chdev directory in cluster %x\n"
-           "  - iob       = %l / base = %l\n"
-           "  - pic       = %l / base = %l\n"
-           "  - txt[0]    = %l / base = %l\n"
-           "  - txt[1]    = %l / base = %l\n"
-           "  - txt[2]    = %l / base = %l\n"
-           "  - ioc[0]    = %l / base = %l\n"
-           "  - fbf[0]    = %l / base = %l\n"
-           "  - nic_rx[0] = %l / base = %l\n"
-           "  - nic_tx[0] = %l / base = %l\n",
-           local_cxy,
-           chdev_dir.iob, iob_base,
-           chdev_dir.pic, pic_base,
-           chdev_dir.txt[0], txt0_base,
-           chdev_dir.txt[1], txt1_base,
-           chdev_dir.txt[2], txt2_base,
-           chdev_dir.ioc[0], ioc_base,
-           chdev_dir.fbf[0], fbf_base,
-           chdev_dir.nic_rx[0], nic_rx_base,
-           chdev_dir.nic_tx[0], nic_tx_base );
 }
 

trunk/kernel/kern/scheduler.c

@@ -358 +358 @@
     remote_spinlock_lock_busy( lock_xp , &save_sr );
 
-    nolock_printk("\n********** scheduler state for core[%x,%d] **********************\n"
+    nolock_printk("\n***** scheduler state for core[%x,%d]\n"
            "kernel_threads = %d / user_threads = %d / current = %x\n",
             local_cxy , core->lid, 

trunk/kernel/vfs/vfs.c

@@ -662 +662 @@
 }  // end vfs_open()
 
-//////////////////////////////////////////
+////////////////////////////////////////////
 error_t vfs_user_move( bool_t   to_buffer,
                        xptr_t   file_xp,
@@ -722 +722 @@
 }  // end vfs_user_move()
 
+////////////////////////////////////////////
+error_t vfs_kernel_move( bool_t   to_buffer,
+                         xptr_t   file_xp,
+                         xptr_t   buffer_xp,
+                         uint32_t size )
+{
+    assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
+
+    cxy_t              file_cxy;     // remote file descriptor cluster 
+    vfs_file_t       * file_ptr;     // remote file descriptor local pointer
+    vfs_inode_type_t   inode_type;
+    uint32_t           file_offset;  // current offset in file
+    mapper_t         * mapper;
+    error_t            error;
+
+    // get cluster and local pointer on remote file descriptor
+    file_cxy  = GET_CXY( file_xp );
+    file_ptr  = (vfs_file_t *)GET_PTR( file_xp );
+
+    // get inode type from remote file descriptor
+    inode_type = hal_remote_lw( XPTR( file_cxy , &file_ptr->type   ) );
+   
+    // action depends on inode type
+    if( inode_type == INODE_TYPE_FILE )
+    {
+        // get mapper pointer and file offset from file descriptor
+        file_offset = hal_remote_lw( XPTR( file_cxy , &file_ptr->offset ) );
+        mapper = (mapper_t *)hal_remote_lpt( XPTR( file_cxy , &file_ptr->mapper ) );
+
+        // move data between mapper and buffer
+        if( file_cxy == local_cxy )
+        {
+            error = mapper_move_kernel( mapper,
+                                        to_buffer,
+                                        file_offset,
+                                        buffer_xp,
+                                        size );
+        }
+        else
+        {
+            rpc_mapper_move_buffer_client( file_cxy,
+                                           mapper,
+                                           to_buffer,
+                                           false,          // kernel buffer
+                                           file_offset,
+                                           buffer_xp,
+                                           size,
+                                           &error );
+        } 
+
+        if( error ) return -1;
+        else        return 0;
+    }
+    else 
+    {
+        printk("\n[ERROR] in %s : inode is not a file", __FUNCTION__ );
+        return -1;
+    }
+}  // end vfs_kernel_move()
+
 //////////////////////////////////////
 error_t vfs_lseek( xptr_t     file_xp,

trunk/kernel/vfs/vfs.h

@@ -735 +735 @@
  * <file_xp> argument, and a - possibly distributed - user space <buffer>, taken into 
  * account the offset in <file_xp>. The transfer direction is defined by <to_buffer>.
- * This function is called by the sys_read() and sys_write() system calls.
+ * This function is called by the elf_load_process() function.
  ******************************************************************************************
  * @ to_buffer : mapper -> buffer if true / buffer -> mapper if false. 
@@ -741 +741 @@
  * @ buffer    : user space pointer on buffer (can be physically distributed).
  * @ size      : requested number of bytes from offset.
- * @ returns number of bytes actually transfered / -1 if error.
+ * @ returns 0 f success / -1 if error.
  *****************************************************************************************/
 error_t vfs_user_move( bool_t   to_buffer,
@@ -747 +747 @@
                        void   * buffer,
                        uint32_t size );
+
+/****************************************************************************************** 
+ * This function moves <size> bytes between a remote file mapper, identified by the 
+ * <file_xp> argument, and a - possibly remote - kernel <buffer_xp>, taken into 
+ * account the offset in <file_xp>. The transfer direction is defined by <to_buffer>.
+ * This function is called by the  system calls.
+ ******************************************************************************************
+ * @ to_buffer : mapper -> buffer if true / buffer -> mapper if false. 
+ * @ file_xp   : extended pointer on the remote file descriptor.
+ * @ buffer_xp : user space pointer on buffer (can be physically distributed).
+ * @ size      : requested number of bytes from offset.
+ * @ returns number of bytes actually transfered / -1 if error.
+ *****************************************************************************************/
+error_t vfs_kernel_move( bool_t   to_buffer,
+                         xptr_t   file_xp, 
+                         xptr_t   buffer_xp,
+                         uint32_t size );
 
 /******************************************************************************************