Changeset 624 for trunk/kernel/kern/process.c

Timestamp:

Mar 12, 2019, 1:37:38 PM (5 years ago)

Author:

alain

Message:

Fix several bugs to use the instruction MMU in kernel mode
in replacement of the instruction address extension register,
and remove the "kentry" segment.

This version is running on the tsar_generic_iob" platform.

One interesting bug: the cp0_ebase defining the kernel entry point
(for interrupts, exceptions and syscalls) must be initialized
early in kernel_init(), because the VFS initialisation done by
kernel_ini() uses RPCs, and RPCs uses Inter-Processor-Interrup.

File:

• trunk/kernel/kern/process.c (modified) (14 diffs)

trunk/kernel/kern/process.c

@@ -1209 +1209 @@
 
 // check th_nr value
-assert( (count > 0) , "process th_nr cannot be 0\n" );
+assert( (count > 0) , "process th_nr cannot be 0" );
 
     // remove thread from th_tbl[]
@@ -1249 +1249 @@
 // check parent process is the reference process
 assert( (parent_process_xp == ref_xp ) ,
-"parent process must be the reference process\n" );
+"parent process must be the reference process" );
 
 #if DEBUG_PROCESS_MAKE_FORK
@@ -1352 +1352 @@
 // check main thread LTID
 assert( (LTID_FROM_TRDID(thread->trdid) == 0) ,
-"main thread must have LTID == 0\n" );
+"main thread must have LTID == 0" );
 
 #if( DEBUG_PROCESS_MAKE_FORK & 1 )
@@ -1552 +1552 @@
 #endif
 
+    // get pointer on VMM
+    vmm_t * vmm = &process->vmm;
+
     // get PID from local cluster manager for this kernel process
     error = cluster_pid_alloc( process , &pid );
@@ -1571 +1574 @@
     process->term_state = 0;
 
-    // initialise kernel GPT and VSL, depending on architecture
-    hal_vmm_kernel_init( info );
+    // initilise VSL as empty
+    vmm->vsegs_nr = 0;
+        xlist_root_init( XPTR( local_cxy , &vmm->vsegs_root ) );
+        remote_rwlock_init( XPTR( local_cxy , &vmm->vsegs_lock ) , LOCK_VMM_VSL );
+
+    // initialise GPT as empty
+    error = hal_gpt_create( &vmm->gpt );
+
+    if( error ) 
+    {
+        printk("\n[PANIC] in %s : cannot create empty GPT\n", __FUNCTION__ );
+        hal_core_sleep();
+    }
+
+    // initialize GPT lock
+    remote_rwlock_init( XPTR( local_cxy , &vmm->gpt_lock ) , LOCK_VMM_GPT );
+    
+    // create kernel vsegs in GPT and VSL, as required by the hardware architecture
+    error = hal_vmm_kernel_init( info );
+
+    if( error ) 
+    {
+        printk("\n[PANIC] in %s : cannot create kernel vsegs in VMM\n", __FUNCTION__ );
+        hal_core_sleep();
+    }
 
     // reset th_tbl[] array and associated fields
@@ -1629 +1655 @@
 // check memory allocator
 assert( (process != NULL),
-"no memory for process descriptor in cluster %x\n", local_cxy  );
+"no memory for process descriptor in cluster %x", local_cxy  );
 
     // set the CWD and VFS_ROOT fields in process descriptor
@@ -1640 +1666 @@
 // check PID allocator 
 assert( (error == 0),
-"cannot allocate PID in cluster %x\n", local_cxy );
+"cannot allocate PID in cluster %x", local_cxy );
 
 // check PID value
 assert( (pid == 1) ,
-"process INIT must be first process in cluster 0\n" );
+"process INIT must be first process in cluster 0" );
 
     // initialize process descriptor / parent is local process_zero
@@ -1669 +1695 @@
 
 assert( (error == 0),
-"failed to open file <%s>\n", CONFIG_PROCESS_INIT_PATH );
+"failed to open file <%s>", CONFIG_PROCESS_INIT_PATH );
 
 #if(DEBUG_PROCESS_INIT_CREATE & 1)
@@ -1682 +1708 @@
 
 assert( (error == 0),
-"cannot access .elf file <%s>\n", CONFIG_PROCESS_INIT_PATH );
+"cannot access .elf file <%s>", CONFIG_PROCESS_INIT_PATH );
 
 #if(DEBUG_PROCESS_INIT_CREATE & 1)
@@ -1726 +1752 @@
 
 assert( (error == 0),
-"cannot create main thread for <%s>\n", CONFIG_PROCESS_INIT_PATH );
+"cannot create main thread for <%s>", CONFIG_PROCESS_INIT_PATH );
 
 assert( (thread->trdid == 0),
-"main thread must have index 0 for <%s>\n", CONFIG_PROCESS_INIT_PATH );
+"main thread must have index 0 for <%s>", CONFIG_PROCESS_INIT_PATH );
 
 #if(DEBUG_PROCESS_INIT_CREATE & 1)
@@ -1816 +1842 @@
 
         assert( (txt_file_xp != XPTR_NULL) ,
-        "process must be attached to one TXT terminal\n" ); 
+        "process must be attached to one TXT terminal" ); 
 
         // get TXT_RX chdev pointers
@@ -2012 +2038 @@
     // check owner cluster
     assert( (process_cxy == CXY_FROM_PID( process_pid )) ,
-    "process descriptor not in owner cluster\n" );
+    "process descriptor not in owner cluster" );
 
     // get extended pointer on stdin pseudo file
@@ -2067 +2093 @@
     // check owner cluster
     assert( (process_cxy == CXY_FROM_PID( process_pid )) ,
-    "process descriptor not in owner cluster\n" );
+    "process descriptor not in owner cluster" );
 
     // get extended pointer on stdin pseudo file
@@ -2198 +2224 @@
 pid_t process_pid = hal_remote_l32( XPTR( process_cxy , &process_ptr->pid ) );
 assert( (process_cxy == CXY_FROM_PID( process_pid )) ,
-"process descriptor not in owner cluster\n" );
+"process descriptor not in owner cluster" );
 
     // get extended pointer on stdin pseudo file