Changeset 623 for trunk/kernel/syscalls/sys_munmap.c

Timestamp:

Mar 6, 2019, 4:37:15 PM (5 years ago)

Author:

alain

Message:

Introduce three new types of vsegs (KCODE,KDATA,KDEV)
to map the kernel vsegs in the process VSL and GPT.
This now used by both the TSAR and the I86 architectures.

File:

• trunk/kernel/syscalls/sys_munmap.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_munmap.c

@@ -25 +25 @@
 #include <hal_kernel_types.h>
 #include <hal_uspace.h>
+#include <hal_irqmask.h>
 #include <shared_syscalls.h>
 #include <errno.h>
@@ -41 +42 @@
 {
     error_t       error;
+    vseg_t      * vseg;
+    reg_t         save_sr;      // required to enable IRQs
 
         thread_t    * this    = CURRENT_THREAD;
         process_t   * process = this->process;
 
+#if (DEBUG_SYS_MUNMAP || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
 #if DEBUG_SYS_MUNMAP
-uint64_t tm_start;
-uint64_t tm_end;
-tm_start = hal_get_cycles();
 if( DEBUG_SYS_MUNMAP < tm_start )
-printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n"
+printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n",
 __FUNCTION__ , this, process->pid, (uint32_t)tm_start );
 #endif
+
+    // check user buffer is mapped 
+    error = vmm_get_vseg( process , (intptr_t)vaddr, &vseg );
+
+    if( error )
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : thread[%x,%x] / user buffer unmapped %x\n",
+__FUNCTION__ , process->pid, this->trdid, (intptr_t)vaddr );
+vmm_display( process , false );
+#endif
+                this->errno = EINVAL;
+                return -1;
+    }
+
+    // enable IRQs
+    hal_enable_irq( &save_sr );
 
     // call relevant kernel function
@@ -67 +89 @@
     }
 
+    // restore IRQs
+    hal_restore_irq( save_sr );
+
+#if (DEBUG_SYS_MUNMAP || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_MUNMAP] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_MUNMAP] , 1 );
+#endif
+
 #if DEBUG_SYS_MUNMAP
-tm_end = hal_get_cycles();
 if( DEBUG_SYS_MUNMAP < tm_start )
-printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n"
+printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n",
 __FUNCTION__ , this, process->pid, (uint32_t)tm_end );
 #endif