Changeset 415 for trunk/kernel/mm/vmm.c

Timestamp:

Dec 22, 2017, 1:16:59 PM (7 years ago)

Author:

alain

Message:

Few bugs.

File:

• trunk/kernel/mm/vmm.c (modified) (10 diffs)

trunk/kernel/mm/vmm.c

@@ -53 +53 @@
 
 
-////////////////////////////////////
-void vmm_init( process_t * process )
+///////////////////////////////////////
+error_t vmm_init( process_t * process )
 {
     error_t   error;
@@ -97 +97 @@
                                    local_cxy );
 
-    assert( (vseg_kentry != NULL) , __FUNCTION__ , "cannot register kentry vseg\n" );
+    if( vseg_kentry == NULL )
+    {
+        printk("\n[ERROR] in %s : cannot register kentry vseg\n", __FUNCTION__ );
+        return -1;
+    }
 
     vmm->kent_vpn_base = base;
@@ -115 +119 @@
                                  local_cxy );
 
-    assert( (vseg_args != NULL) , __FUNCTION__ , "cannot create args vseg\n" );
+    if( vseg_args == NULL )
+    {
+        printk("\n[ERROR] in %s : cannot register args vseg\n", __FUNCTION__ );
+        return -1;
+    }
 
     vmm->args_vpn_base = base;
@@ -134 +142 @@
                                  local_cxy );
 
-    assert( (vseg_envs != NULL) , __FUNCTION__ , "cannot create envs vseg\n" );
+    if( vseg_envs == NULL )
+    {
+        printk("\n[ERROR] in %s : cannot register envs vseg\n", __FUNCTION__ );
+        return -1;
+    }
 
     vmm->envs_vpn_base = base;
@@ -141 +153 @@
     error = hal_gpt_create( &vmm->gpt );
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create GPT\n");
-
-    // architecture specific GPT initialization
+    if( error ) 
+    printk("\n[ERROR] in %s : cannot create GPT\n", __FUNCTION__ );
+
+    // initialize GPT (architecture specic)
     // (For TSAR, identity map the kentry_vseg)
     error = hal_vmm_init( vmm );
 
-    assert( (error == 0) , __FUNCTION__ , "cannot initialize GPT\n");
+    if( error ) 
+    printk("\n[ERROR] in %s : cannot initialize GPT\n", __FUNCTION__ );
 
     // initialize STACK allocator
@@ -168 +182 @@
 __FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , 
 process->pid , process->vmm.entry_point );
+
+    return 0;
 
 }  // end vmm_init()
@@ -399 +415 @@
     parent_lock_xp = XPTR( parent_cxy , &parent_vmm->vsegs_lock );
 
-    // take the lock protecting the parent VSL
-    remote_rwlock_rd_lock( parent_lock_xp );
-
     // initialize the lock protecting the child VSL
     remote_rwlock_init( XPTR( local_cxy , &child_vmm->vsegs_lock ) );
@@ -409 +422 @@
     child_vmm->vsegs_nr = 0;
 
-    // create & initialize the child GPT as empty
+    // create child GPT
     error = hal_gpt_create( &child_vmm->gpt );
+
     if( error )
     {
@@ -419 +433 @@
     // build extended pointer on parent VSL
     parent_root_xp = XPTR( parent_cxy , &parent_vmm->vsegs_root );
+
+    // take the lock protecting the parent VSL
+    remote_rwlock_rd_lock( parent_lock_xp );
 
     // loop on parent VSL xlist
@@ -501 +518 @@
     // release the parent vsegs lock
     remote_rwlock_rd_unlock( parent_lock_xp );
+
+    // initialize child GPT (architecture specic)
+    // => For TSAR, identity map the kentry_vseg
+    error = hal_vmm_init( child_vmm );
+
+    if( error )
+    {
+        printk("\n[ERROR] in %s : cannot create GPT\n", __FUNCTION__ );
+        return -1;
+    }
 
     // initialize the child VMM STACK allocator