Changeset 629 for trunk/kernel/kern

Timestamp:

May 17, 2019, 9:27:04 AM (6 years ago)

Author:

alain

Message:

Remove the "giant" rwlock protecting the GPT, and
use the GPT_LOCKED attribute in each PTE to prevent
concurrent modifications of one GPT entry.
The version number has been incremented to 2.1.

Location:

trunk/kernel/kern

Files:

• kernel_init.c (modified) (1 diff)
• process.c (modified) (4 diffs)
• rpc.c (modified) (1 diff)
• scheduler.c (modified) (5 diffs)
• thread.c (modified) (1 diff)
• thread.h (modified) (1 diff)

trunk/kernel/kern/kernel_init.c

@@ -171 +171 @@
     "VFS_FILE",              // 33
     "VMM_VSL",               // 34
-    "VMM_GPT",               // 35
-    "VFS_MAIN",              // 36
-    "FATFS_FAT",             // 37
+    "VFS_MAIN",              // 35
+    "FATFS_FAT",             // 36
 };        
 

trunk/kernel/kern/process.c

@@ -166 +166 @@
 #endif
 
-    // initialize GPT and VSL locks
-    remote_rwlock_init( XPTR( local_cxy , &vmm->gpt_lock ) , LOCK_VMM_GPT );
+    // initialize VSL locks
         remote_rwlock_init( XPTR( local_cxy , &vmm->vsl_lock ) , LOCK_VMM_VSL );
 
@@ -426 +425 @@
 
     // initialize GPT and VSL locks
-    remote_rwlock_init( XPTR( local_cxy , &vmm->gpt_lock ) , LOCK_VMM_GPT );
         remote_rwlock_init( XPTR( local_cxy , &vmm->vsl_lock ) , LOCK_VMM_VSL );
 
@@ -1482 +1480 @@
 
     // set COW flag in DATA, ANON, REMOTE vsegs for parent process VMM
-    // this includes all parnet process copies in all clusters
+    // this includes all parent process copies in all clusters
     if( parent_process_cxy == local_cxy )   // reference is local
     {
@@ -1707 +1705 @@
 
     // initialize VSL and GPT locks
-        remote_rwlock_init( XPTR( local_cxy , &vmm->vsl_lock ) , LOCK_VMM_VSL );
-    remote_rwlock_init( XPTR( local_cxy , &vmm->gpt_lock ) , LOCK_VMM_GPT );
+    remote_rwlock_init( XPTR( local_cxy , &vmm->vsl_lock ) , LOCK_VMM_VSL );
     
     // create kernel vsegs in GPT and VSL, as required by the hardware architecture

trunk/kernel/kern/rpc.c

@@ -104 +104 @@
     "VFS_FILE_CREATE",           // 14
     "VFS_FILE_DESTROY",          // 15
-    "VFS_FS_GET_DENTRY",         // 16
+    "VFS_FS_NEW_DENTRY",         // 16
     "VFS_FS_ADD_DENTRY",         // 17
     "VFS_FS_REMOVE_DENTRY",      // 18

trunk/kernel/kern/scheduler.c

@@ -63 +63 @@
 // @ returns pointer on selected thread descriptor
 ////////////////////////////////////////////////////////////////////////////////////////////
-thread_t * sched_select( scheduler_t * sched )
+static thread_t * sched_select( scheduler_t * sched )
 {
     thread_t     * thread;
@@ -248 +248 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
-printk("\n[%s] thread[%x,%x] on core[%x,%d] deleted / %d threads / cycle %d\n",
+printk("\n[%s] thread[%x,%x] on core[%x,%d] deleted (still %d threads) / cycle %d\n",
 __FUNCTION__, process->pid, thread->trdid, local_cxy, thread->core->lid, count, cycle );
+#endif
+
+#if CONFIG_INSTRUMENTATION_PGFAULTS
+uint32_t local_nr    = thread->info.local_pgfault_nr;
+uint32_t local_cost  = (local_nr == 0)  ? 0 : (thread->info.local_pgfault_cost / local_nr);
+uint32_t global_nr   = thread->info.global_pgfault_nr;
+uint32_t global_cost = (global_nr == 0) ? 0 : (thread->info.global_pgfault_cost / global_nr);
+uint32_t false_nr    = thread->info.false_pgfault_nr;
+uint32_t false_cost  = (false_nr == 0)  ? 0 : (thread->info.false_pgfault_cost / false_nr);
+printk("***** page faults for thread[%x,%x]\n" 
+       "  - %d local  : %d cycles\n"
+       "  - %d global : %d cycles\n"
+       "  - %d false  : %d cycles\n",
+       process->pid, thread->trdid,
+       local_nr,  local_cost,
+       global_nr, global_cost,
+       false_nr,  false_cost );
 #endif
             // destroy process descriptor if last thread
@@ -481 +498 @@
  
 #if (DEBUG_SCHED_YIELD & 0x1)
-// if( sched->trace )
-if( (uint32_t)hal_get_cycles() > DEBUG_SCHED_YIELD )
+if( sched->trace )
 sched_display( lid );
 #endif
@@ -535 +551 @@
 
 #if DEBUG_SCHED_YIELD
-// if( sched->trace )
-if( (uint32_t)hal_get_cycles() > DEBUG_SCHED_YIELD )
+if( sched->trace )
 printk("\n[%s] core[%x,%d] / cause = %s\n"
 "      thread %x (%s) (%x,%x) => thread %x (%s) (%x,%x) / cycle %d\n",
@@ -553 +568 @@
 
 #if (DEBUG_SCHED_YIELD & 1)
-// if( sched->trace )
-if( (uint32_t)hal_get_cycles() > DEBUG_SCHED_YIELD )
+if( sched->trace )
 printk("\n[%s] core[%x,%d] / cause = %s\n"
 "      thread %x (%s) (%x,%x) continue / cycle %d\n",

trunk/kernel/kern/thread.c

@@ -907 +907 @@
 
     // update target process instrumentation counter
-        process->vmm.pgfault_nr += thread->info.pgfault_nr;
+        // process->vmm.pgfault_nr += thread->info.pgfault_nr;
 
     // remove thread from process th_tbl[]

trunk/kernel/kern/thread.h

@@ -100 +100 @@
 typedef struct thread_info_s
 {
-        uint32_t              pgfault_nr;    /*! cumulated number of page fault           */
-        cycle_t               last_cycle;    /*! last cycle counter value (date)          */
-        cycle_t               usr_cycles;    /*! user execution duration (cycles)         */
-        cycle_t               sys_cycles;    /*! system execution duration (cycles)       */
+        uint32_t     false_pgfault_nr;       /*! number of local page fault               */
+    uint32_t     false_pgfault_cost;     /*! cumulated cost                           */
+        uint32_t     local_pgfault_nr;       /*! number of local page fault               */
+    uint32_t     local_pgfault_cost;     /*! cumulated cost                           */
+        uint32_t     global_pgfault_nr;      /*! number of global page fault              */
+    uint32_t     global_pgfault_cost;    /*! cumulated cost                           */
+
+        cycle_t      last_cycle;             /*! last cycle counter value (date)          */
+        cycle_t      usr_cycles;             /*! user execution duration (cycles)         */
+        cycle_t      sys_cycles;             /*! system execution duration (cycles)       */
 }
 thread_info_t;