Changeset 435 for trunk/kernel/syscalls/sys_mmap.c

Timestamp:

Feb 20, 2018, 5:32:17 PM (7 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

• trunk/kernel/syscalls/sys_mmap.c (modified) (13 diffs)

trunk/kernel/syscalls/sys_mmap.c

@@ -25 +25 @@
 #include <hal_types.h>
 #include <hal_uspace.h>
+#include <hal_irqmask.h>
 #include <shared_syscalls.h>
 #include <errno.h>
@@ -44 +45 @@
     error_t       error;
     paddr_t       paddr;        // unused, but required for user space checking
-
-        uint64_t      tm_start;
-        uint64_t      tm_end;
-
-        tm_start = hal_get_cycles();
+    reg_t         save_sr;      // required to enable IRQs
 
         thread_t    * this    = CURRENT_THREAD;
         process_t   * process = this->process;
 
+#if CONFIG_DEBUG_SYS_MMAP
+uint64_t      tm_start;
+uint64_t      tm_end;
+tm_start = hal_get_cycles();
+if ( CONFIG_DEBUG_SYS_MMAP < tm_start )
+printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n",
+__FUNCTION__, this, process->pid, (uint32_t)tm_start );
+#endif
+
     // check arguments in user space
     error = vmm_v2p_translate( false , attr , &paddr );
@@ -58 +64 @@
     if ( error )
     {
-        printk("\n[ERROR] in %s : arguments not in used space = %x\n",
-        __FUNCTION__ , (intptr_t)attr );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : arguments not in used space = %x\n", __FUNCTION__ , (intptr_t)attr );
+#endif
                 this->errno = EINVAL;
                 return -1;
@@ -82 +90 @@
     if( map_fixed )
     {
-        printk("\n[ERROR] in %s : MAP_FIXED not supported\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : MAP_FIXED not supported\n", __FUNCTION__ );
+#endif
         this->errno = EINVAL;
         return -1;
@@ -89 +100 @@
     if( map_shared == map_private )
     {
-        printk("\n[ERROR] in %s : MAP_SHARED xor MAP_PRIVATE\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : MAP_SHARED xor MAP_PRIVATE\n", __FUNCTION__ );
+#endif
         this->errno = EINVAL;
         return -1;
@@ -108 +122 @@
                 if( fdid >= CONFIG_PROCESS_FILE_MAX_NR ) 
                 {
-                        printk("\n[ERROR] in %s: bad file descriptor = %d\n", __FUNCTION__ , fdid );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s: bad file descriptor = %d\n", __FUNCTION__ , fdid );
+#endif
             this->errno = EBADFD;
             return -1;
@@ -118 +135 @@
         if( file_xp == XPTR_NULL )
         {
-                        printk("\n[ERROR] in %s: file %d not found\n", __FUNCTION__ , fdid );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s: file %d not found\n", __FUNCTION__ , fdid );
+#endif
             this->errno = EBADFD;
             return -1;
@@ -138 +158 @@
                 if( (offset + length) > size)
                 {
-                        printk("\n[ERROR] in %s: offset (%d) + len (%d) >= file's size (%d)\n", 
-                        __FUNCTION__, k_attr.offset, k_attr.length, size );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s: offset (%d) + len (%d) >= file's size (%d)\n", 
+__FUNCTION__, k_attr.offset, k_attr.length, size );
+#endif
             this->errno = ERANGE;
             return -1;
@@ -148 +171 @@
                     (prot_write && !(file_attr & FD_ATTR_WRITE_ENABLE)) )
                 {
-                        printk("\n[ERROR] in %s: prot = %x / file_attr = %x)\n", 
-                        __FUNCTION__ , k_attr.prot , file_attr );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s: prot = %x / file_attr = %x)\n", 
+__FUNCTION__ , k_attr.prot , file_attr );
+#endif
                         this->errno = EACCES;
                         return -1;
@@ -178 +204 @@
             if( cluster_is_undefined( vseg_cxy ) )
             {
-                printk("\n[ERROR] in %s : illegal cxy for MAP_REMOTE\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : illegal cxy for MAP_REMOTE\n", __FUNCTION__ );
+#endif
                 this->errno = EINVAL;
                 return -1;
@@ -184 +213 @@
         }
     }
+
+    // enable IRQs
+    hal_enable_irq( &save_sr );
 
     // get reference process cluster and local pointer
@@ -216 +248 @@
     }
     
+    // restore IRQs
+    hal_restore_irq( save_sr );
+
     if( vseg == NULL )
     {
-        printk("\n[ERROR] in %s : cannot create vseg\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot create vseg\n", __FUNCTION__ );
+#endif
         this->errno = ENOMEM;
         return -1;
@@ -226 +264 @@
     hal_copy_to_uspace( &attr->addr , &vseg->min , sizeof(intptr_t) );
 
-    tm_end = hal_get_cycles();
-
-syscall_dmsg("\n[DBG] %s : core[%x,%d] created vseg %s in cluster %x / cycle %d\n"
-"      base = %x / length = %x / cost = %d\n",
-__FUNCTION__, local_cxy , this->core->lid , vseg_type_str(vseg->type) ,
-vseg->cxy , (uint32_t)tm_start , vseg->min , length , (uint32_t)(tm_end - tm_start) );
+    hal_fence();
+
+#if CONFIG_DEBUG_SYS_MMAP
+tm_end = hal_get_cycles();
+if ( CONFIG_DEBUG_SYS_MMAP < tm_start )
+printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n"
+"vseg %s / cluster %x / base %x / size %x / cost %d\n", 
+__FUNCTION__, this, process->pid, (uint32_t)tm_end,
+vseg_type_str(vseg->type), vseg->cxy, vseg->min, length, (uint32_t)(tm_end - tm_start) );
+#endif
 
         return 0;