Changeset 664 for trunk/kernel/syscalls/sys_get_config.c

Timestamp:

Oct 10, 2020, 5:11:27 PM (4 years ago)

Author:

alain

Message:

• Introduce the sys_socket.c file implementing all socket related syscalls.
• Improve the non-standard sys_get_config() function.

File:

• trunk/kernel/syscalls/sys_get_config.c (modified) (4 diffs)

trunk/kernel/syscalls/sys_get_config.c

@@ -2 +2 @@
  * sys_get_config.c - get hardware platform parameters.
  * 
- * Author    Alain Greiner (2016,2017,2018,2019)
+ * Author    Alain Greiner (2016,2017,2018,2019,2020)
  *  
  * Copyright (c) UPMC Sorbonne Universites
@@ -34 +34 @@
 
 #include <syscalls.h>
+#include <shared_syscalls.h>
 
-//////////////////////////////////////
-int sys_get_config( uint32_t * x_size,
-                    uint32_t * y_size,
-                    uint32_t * ncores )
+//////////////////////////////////////////////
+int sys_get_config( hard_config_t * u_config )
 {
-        error_t    error;
-    vseg_t   * vseg;
-    uint32_t   k_x_size;
-    uint32_t   k_y_size;
-    uint32_t   k_ncores;
+    vseg_t        * vseg;        
+    hard_config_t   k_config;    // hard_config structure in kernel space
 
     thread_t  * this    = CURRENT_THREAD;
@@ -60 +56 @@
 #endif
 
-    // check x_size buffer in user space
-    error = vmm_get_vseg( process , (intptr_t)x_size  , &vseg );
-
-        if( error )
+    // check u_config mapped in user space
+    if( vmm_get_vseg( process , (intptr_t)u_config  , &vseg ) )
         {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : x_size buffer unmapped / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)x_size , this->trdid , process->pid );
+printk("\n[ERROR] in %s : config pointer %x unmapped / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)u_config , this->trdid , process->pid );
 #endif
         this->errno = EINVAL;
@@ -74 +68 @@
         }
 
-    // check y_size buffer in user space
-    error = vmm_get_vseg( process , (intptr_t)y_size  , &vseg );
+    // copy config parameters from cluster descriptor to kernel structure
+        k_config.x_size       = LOCAL_CLUSTER->x_size;
+        k_config.y_size       = LOCAL_CLUSTER->y_size;
+        k_config.ncores       = LOCAL_CLUSTER->cores_nr;
+    k_config.txt_channels = LOCAL_CLUSTER->nb_txt_channels;
+    k_config.nic_channels = LOCAL_CLUSTER->nb_nic_channels;
+    k_config.ioc_channels = LOCAL_CLUSTER->nb_ioc_channels;
+    k_config.fbf_channels = LOCAL_CLUSTER->nb_fbf_channels;
 
-        if( error )
-        {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : y_size buffer unmapped / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)y_size , this->trdid , process->pid );
-#endif
-        this->errno = EINVAL;
-                return -1;
-        }
-
-    // check ncores buffer in user space
-    error = vmm_get_vseg( process , (intptr_t)ncores  , &vseg );
-
-        if( error )
-        {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : ncores buffer unmapped / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)ncores , this->trdid , process->pid );
-#endif
-        this->errno = EINVAL;
-                return -1;
-        }
-
-    // get parameters
-        k_x_size  = LOCAL_CLUSTER->x_size;
-        k_y_size  = LOCAL_CLUSTER->y_size;
-        k_ncores  = LOCAL_CLUSTER->cores_nr;
-
-    // copy to user space
-        hal_copy_to_uspace( x_size, XPTR( local_cxy , &k_x_size ), sizeof(uint32_t) );
-        hal_copy_to_uspace( y_size, XPTR( local_cxy , &k_y_size ), sizeof(uint32_t) );
-        hal_copy_to_uspace( ncores, XPTR( local_cxy , &k_ncores ), sizeof(uint32_t) );
+    // copy k_config structure to user space
+        hal_copy_to_uspace( u_config , XPTR(local_cxy, &k_config ), sizeof(hard_config_t) );
 
     hal_fence();