Changeset 418 for trunk/kernel

Timestamp:

Jan 8, 2018, 2:25:39 PM (7 years ago)

Author:

alain

Message:

Fix a bug in hal_kentry.S : the "uzone" pointer in the thread descriptor
must not be modified in case of interrupt.

Location:

trunk/kernel

Files:

• kern/chdev.c (modified) (3 diffs)
• kern/thread.c (modified) (1 diff)
• kern/thread.h (modified) (1 diff)
• syscalls/sys_panic.c (modified) (4 diffs)
• syscalls/sys_read.c (modified) (4 diffs)
• syscalls/sys_write.c (modified) (3 diffs)

trunk/kernel/kern/chdev.c

@@ -123 +123 @@
     uint32_t   save_sr;       // for critical section
 
+#if CONFIG_READ_DEBUG
+enter_chdev_cmd = hal_time_stamp();
+#endif
+
     thread_t * this = CURRENT_THREAD;
 
@@ -187 +191 @@
     hal_restore_irq( save_sr );
 
+#if CONFIG_READ_DEBUG
+exit_chdev_cmd = hal_time_stamp();
+#endif
+
 }  // end chdev_register_command()
 
@@ -253 +261 @@
             xlist_unlink( XPTR( client_cxy , &client_ptr->wait_list ) );
             remote_spinlock_unlock( lock_xp );
+
+            // unblock client thread
+            thread_unblock( client_xp , THREAD_BLOCKED_IO );
 
 chdev_dmsg("\n[DBG] %s : thread %x complete operation for client %x / cycle %d\n",

trunk/kernel/kern/thread.c

@@ -868 +868 @@
 
         }
-        else                                // yield each ~ 100000 cycles
-
+        else                                // search a runable thread
         {
-             hal_fixed_delay( 500000 );
+            sched_yield( "IDLE" );
         }
-
-        // force scheduling at each iteration
-        sched_yield( "idle" );
-   }
+    }
 }  // end thread_idle()
 

trunk/kernel/kern/thread.h

@@ -133 +133 @@
         void              * cpu_context;     /*! pointer on CPU context switch            */
         void              * fpu_context;     /*! pointer on FPU context switch            */
-    void              * uzone;           /*! pointer on uzone for hal_kentry          */
+    void              * uzone;           /*! used by hal_do_syscakl & hal_do_except   */
 
         intptr_t            k_stack_base;    /*! kernel stack base address                */

trunk/kernel/syscalls/sys_panic.c

@@ -47 +47 @@
         if( error )
         {
-        printk("\n[USER DBG] thread %x / process %x/ core[%x,%d] / cycle %d\n"
+        printk("\n[USER PANIC] thread %x / process %x/ core[%x,%d] / cycle %d\n"
         "cause unknown, because string not in user space\n",
         this->trdid , process->pid , local_cxy , core->lid ,
@@ -56 +56 @@
     if( hal_strlen_from_uspace( string ) >= 256 )
         {
-        printk("\n[USER DBG] thread %x / process %x/ core[%x,%d] / cycle %d\n"
+        printk("\n[USER PANIC] thread %x / process %x/ core[%x,%d] / cycle %d\n"
         "cause unknown, because string larger than 256 characters\n",
         this->trdid , process->pid , local_cxy , core->lid ,
@@ -66 +66 @@
 
     // print user debug message on kernel terminal
-    printk("\n[USER DBG] thread %x / process %x / core[%x,%d] / cycle %d\n %s\n",
+    printk("\n[USER PANIC] thread %x / process %x / core[%x,%d] / cycle %d\n %s\n",
     this->trdid , process->pid , local_cxy, core->lid ,
     (uint32_t)hal_get_cycles() , kbuf );
@@ -72 +72 @@
         return 0; 
 
-}  // end sys_get_cycle()
+}  // end sys_panic()

trunk/kernel/syscalls/sys_read.c

@@ -64 +64 @@
     reg_t        save_sr;     // required to enable IRQs during syscall
 
-#if CONFIG_SYSCALL_DEBUG
-uint32_t     tm_start;
-uint32_t     tm_end;
+#if CONFIG_READ_DEBUG
+uint64_t     tm_start;
+uint64_t     tm_end;
 tm_start = hal_get_cycles();
 #endif
 
 #if CONFIG_READ_DEBUG
-enter_sys_read = tm_start;
+enter_sys_read = (uint32_t)tm_start;
 #endif
 
@@ -98 +98 @@
 
     // enable IRQs
-    hal_enable_irq( &save_sr );
+    // hal_enable_irq( &save_sr );
 
     // get extended pointer on remote file descriptor
@@ -158 +158 @@
 
     // restore IRQs
-    hal_restore_irq( save_sr );
+    // hal_restore_irq( save_sr );
 
     hal_fence();
 
-#if CONFIG_SYSCALL_DEBUG
+#if CONFIG_READ_DEBUG
 tm_end = hal_get_cycles();
 printk("\n[DBG] %s : core[%x,%d] / thread %x in process %x / cycle %d\n"
@@ -171 +171 @@
 #endif
 
-#if CONFIG_READ_DEBUG
-exit_sys_read = tm_end;
+#if CONFIG_READ_DEBUG 
+exit_sys_read = (uint32_t)tm_end;
 
 printk("\n@@@@@@@@@@@@ timing to read character %c\n"

trunk/kernel/syscalls/sys_write.c

@@ -46 +46 @@
     reg_t        save_sr;         // required to enable IRQs during syscall
 
-#if CONFIG_SYSCALL_DEBUG
+#if CONFIG_WRITE_DEBUG
 uint32_t     tm_start;
 uint32_t     tm_end;
@@ -139 +139 @@
     hal_fence();
 
-#if CONFIG_SYSCALL_DEBUG
+#if CONFIG_WRITE_DEBUG
 tm_end = hal_get_cycles();
 printk("\n[DBG] %s : core[%x,%d] / thread %x in process %x / cycle %d\n"
@@ -148 +148 @@
 #endif
  
+#if CONFIG_WRITE_DEBUG
+printk("\n@@@@@@@@@@@@ timing to write character %c\n"
+" - enter_sys_write    = %d\n"
+" - exit_sys_write     = %d\n",
+*((char *)(intptr_t)paddr) , (uint32_t)tm_start , (uint32_t)tm_end );
+#endif
+
         return nbytes;