Changeset 625 for trunk/hal/tsar_mips32/core/hal_vmm.c

Timestamp:

Apr 10, 2019, 10:09:39 AM (5 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

• trunk/hal/tsar_mips32/core/hal_vmm.c (modified) (5 diffs)

trunk/hal/tsar_mips32/core/hal_vmm.c

@@ -48 +48 @@
 // This function is called by the process_zero_init() function during kernel_init.
 // It initializes the VMM of the kernel proces_zero (containing all kernel threads)
-// in the local cluster: it registers one "kcode" vseg in kernel VSL, and registers 
-// one big page in slot[0] of kernel GPT.
+// in the local cluster: For TSAR, it registers one "kcode" vseg in kernel VSL, 
+// and registers one big page in slot[0] of kernel GPT.
 //////////////////////////////////////////////////////////////////////////////////////////
 error_t  hal_vmm_kernel_init( boot_info_t * info )
@@ -119 +119 @@
     return 0;
 
-}  // end hal_kernel_vmm_init()
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// This function is called by the vmm_init() function to update the VMM of an user
-// process identified by the <process> argument.
-// It registers in the user VSL the "kcode" vseg, registered in the local kernel VSL,
-// and register in the user GPT the big page[0] mapped in the local kernel GPT. 
+}  // end hal_vmm_kernel_init()
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// This function registers in the VMM of an user process identified by the <process> 
+// argument all required kernel vsegs.
+// For TSAR, it registers in the user VSL the "kcode" vseg, from the local kernel VSL,
+// and register in the user GPT the big page[0] from the local kernel GPT. 
 //////////////////////////////////////////////////////////////////////////////////////////
 error_t hal_vmm_kernel_update( process_t * process )
 {
-    error_t error;
+    error_t  error;
     uint32_t attr;
     uint32_t ppn;
 
+    // get cluster identifier
+    cxy_t cxy = local_cxy;
+
 #if DEBUG_HAL_VMM
 thread_t * this = CURRENT_THREAD;
 printk("\n[%s] thread[%x,%x] enter in cluster %x \n", 
-__FUNCTION__, this->process->pid, this->trdid, local_cxy );
+__FUNCTION__, this->process->pid, this->trdid, cxy );
+hal_vmm_display( &process_zero , true );
 hal_vmm_display( process , true );
-hal_vmm_display( &process_zero , true );
-#endif
-
-    // get cluster identifier
-    cxy_t cxy = local_cxy;
-
-    // get extended pointer on kernel GPT
+#endif
+
+    // get extended pointer on local kernel GPT
     xptr_t k_gpt_xp = XPTR( cxy , &process_zero.vmm.gpt );
 
@@ -212 +212 @@
                       bool_t      mapping )
 {
+    // get pointer on process VMM
     vmm_t * vmm = &process->vmm;
-    gpt_t * gpt = &vmm->gpt;
 
     // get pointers on TXT0 chdev
@@ -220 +220 @@
     chdev_t * txt0_ptr = GET_PTR( txt0_xp );
 
-    // get extended pointer on remote TXT0 lock
-    xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
-
-    // get locks protecting the VSL and the GPT
-    remote_rwlock_rd_acquire( XPTR( local_cxy , &vmm->vsegs_lock ) );
-    remote_rwlock_rd_acquire( XPTR( local_cxy , &vmm->gpt_lock ) );
-
-    // get TXT0 lock
-    remote_busylock_acquire( lock_xp );
-
-    nolock_printk("\n***** VSL and GPT for process %x in cluster %x\n",
-    process->pid , local_cxy );
-
-    // scan the list of vsegs
-    xptr_t         root_xp = XPTR( local_cxy , &vmm->vsegs_root );
-    xptr_t         iter_xp;
-    xptr_t         vseg_xp;
-    vseg_t       * vseg;
-    XLIST_FOREACH( root_xp , iter_xp )
-    {
-        vseg_xp = XLIST_ELEMENT( iter_xp , vseg_t , xlist );
-        vseg    = GET_PTR( vseg_xp );
-
-        nolock_printk(" - %s : base = %X / size = %X / npages = %d\n",
-        vseg_type_str( vseg->type ) , vseg->min , vseg->max - vseg->min , vseg->vpn_size );
-
-        if( mapping )
+    // build extended pointers on TXT0 lock, GPT lock and VSL lock
+    xptr_t  txt_lock_xp = XPTR( txt0_cxy  , &txt0_ptr->wait_lock );
+    xptr_t  vsl_lock_xp = XPTR( local_cxy , &vmm->vsl_lock );
+    xptr_t  gpt_lock_xp = XPTR( local_cxy , &vmm->gpt_lock );
+
+    // get root of vsegs list
+    xptr_t root_xp = XPTR( local_cxy , &vmm->vsegs_root );
+
+    // get the locks protecting TXT0, VSL, and GPT
+    remote_rwlock_rd_acquire( vsl_lock_xp );
+    remote_rwlock_rd_acquire( gpt_lock_xp );
+    remote_busylock_acquire( txt_lock_xp );
+
+    nolock_printk("\n***** VSL and GPT for process %x in cluster %x / PT1 = %x\n",
+    process->pid , local_cxy , vmm->gpt.ptr );
+
+    if( xlist_is_empty( root_xp ) )
+    {
+        nolock_printk("   ... no vsegs registered\n");
+    }
+    else  // scan the list of vsegs
+    {
+        xptr_t         iter_xp;
+        xptr_t         vseg_xp;
+        vseg_t       * vseg;
+
+        XLIST_FOREACH( root_xp , iter_xp )
         {
-            vpn_t    vpn     = vseg->vpn_base;
-            vpn_t    vpn_max = vpn + vseg->vpn_size;
-            ppn_t    ppn;
-            uint32_t attr;
-
-            while( vpn < vpn_max )
+            vseg_xp = XLIST_ELEMENT( iter_xp , vseg_t , xlist );
+            vseg    = GET_PTR( vseg_xp );
+
+            nolock_printk(" - %s : base = %X / size = %X / npages = %d\n",
+            vseg_type_str(vseg->type), vseg->min, vseg->max - vseg->min, vseg->vpn_size );
+
+            if( mapping )  
             {
-                hal_gpt_get_pte( XPTR( local_cxy , gpt ) , vpn , &attr , &ppn );
-
-                if( attr & GPT_MAPPED )
+                vpn_t    vpn     = vseg->vpn_base;
+                vpn_t    vpn_max = vpn + vseg->vpn_size;
+                ppn_t    ppn;
+                uint32_t attr;
+
+                while( vpn < vpn_max )   // scan the PTEs
                 {
-                    if( attr & GPT_SMALL )
+                    hal_gpt_get_pte( XPTR( local_cxy , &vmm->gpt ) , vpn , &attr , &ppn );
+
+                    if( attr & GPT_MAPPED )
                     {
-                        nolock_printk("    . SMALL : vpn = %X / attr = %X / ppn = %X\n",
-                        vpn , attr , ppn );
-                        vpn++;
+                        if( attr & GPT_SMALL )
+                        {
+                            nolock_printk("    . SMALL : vpn = %X / attr = %X / ppn = %X\n",
+                            vpn , attr , ppn );
+                            vpn++;
+                        }
+                        else
+                        {
+                            nolock_printk("    . BIG   : vpn = %X / attr = %X / ppn = %X\n",
+                            vpn , attr , ppn );
+                            vpn += 512;
+                        }
                     }
                     else
                     {
-                        nolock_printk("    . BIG   : vpn = %X / attr = %X / ppn = %X\n",
-                        vpn , attr , ppn );
-                        vpn += 512;
+                        vpn++;
                     }
-                }
-                else
-                {
-                    vpn++;
                 }
             }
@@ -280 +289 @@
     }
 
-    // release TXT0 lock
-    remote_busylock_release( lock_xp );
-
-    // release the VSK and GPT locks
-    remote_rwlock_rd_release( XPTR( local_cxy , &vmm->vsegs_lock ) );
-    remote_rwlock_rd_release( XPTR( local_cxy , &vmm->gpt_lock ) );
+    // release locks
+    remote_busylock_release( txt_lock_xp );
+    remote_rwlock_rd_release( gpt_lock_xp );
+    remote_rwlock_rd_release( vsl_lock_xp );
 
 }  // hal_vmm_display()