Changeset 441 for trunk/kernel/mm

Timestamp:

May 9, 2018, 3:13:56 PM (6 years ago)

Author:

alain

Message:

Fix a bug in rpc_vmm_get_pte_client() function (bad RPC index).

File:

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

trunk/kernel/mm/vmm.c

@@ -1395 +1395 @@
 
 #if DEBUG_VMM_GET_ONE_PPN 
-if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+thread_t * this = CURRENT_THREAD;
+// if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x enter for vpn = %x / type = %s / index = %d\n",
-__FUNCTION__, CURRENT_THREAD, vpn, vseg_type_str(type), index );
+__FUNCTION__, this, vpn, vseg_type_str(type), index );
 #endif
 
@@ -1458 +1460 @@
 
 #if (DEBUG_VMM_GET_ONE_PPN & 0x1)
-if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
+// if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
 printk("\n[DBG] %s : thread %x for vpn = %x / elf_offset = %x\n",
-__FUNCTION__, CURRENT_THREAD, vpn, elf_offset );
+__FUNCTION__, this, vpn, elf_offset );
 #endif
 
@@ -1474 +1477 @@
 
 #if (DEBUG_VMM_GET_ONE_PPN & 0x1)
-if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+// if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread%x for vpn = %x / fully in BSS\n",
-__FUNCTION__, CURRENT_THREAD, vpn );
+__FUNCTION__, this, vpn );
 #endif
 
@@ -1493 +1497 @@
 
 #if (DEBUG_VMM_GET_ONE_PPN & 0x1)
-if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+// if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x, for vpn = %x / fully in mapper\n",
-__FUNCTION__, CURRENT_THREAD, vpn );
+__FUNCTION__, this, vpn );
 #endif
                 if( mapper_cxy == local_cxy ) 
@@ -1524 +1529 @@
 
 #if (DEBUG_VMM_GET_ONE_PPN & 0x1)
-if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+// if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x for vpn = %x / both mapper & BSS\n"
 "      %d bytes from mapper / %d bytes from BSS\n",
-__FUNCTION__, CURRENT_THREAD, vpn,
+__FUNCTION__, this, vpn,
 file_size - offset , offset + CONFIG_PPM_PAGE_SIZE - file_size  );
 #endif
@@ -1571 +1577 @@
 
 #if DEBUG_VMM_GET_ONE_PPN
-if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+// if( DEBUG_VMM_GET_ONE_PPN < (uint32_t)hal_get_cycles() )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x exit for vpn = %x / ppn = %x\n",
-__FUNCTION__ , CURRENT_THREAD , vpn , *ppn );
+__FUNCTION__ , this , vpn , *ppn );
 #endif
 
@@ -1595 +1602 @@
     error_t    error;
 
+    thread_t * this  = CURRENT_THREAD;
+
 #if DEBUG_VMM_GET_PTE
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_VMM_GET_PTE < cycle )
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+// if( DEBUG_VMM_GET_PTE < cycle )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x enter / vpn %x / process %x / cow %d / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , vpn , process->pid , cow , cycle );
+__FUNCTION__ , this , vpn , process->pid , cow , cycle );
 #endif
 
@@ -1613 +1623 @@
     assert( (vseg != NULL) , __FUNCTION__,
     "vseg undefined / vpn %x / thread %x / process %x / core[%x,%d] / cycle %d\n", 
-    vpn, CURRENT_THREAD, process->pid, local_cxy, CURRENT_THREAD->core->lid,
+    vpn, this, process->pid, local_cxy, this->core->lid,
     (uint32_t)hal_get_cycles() );
 
@@ -1627 +1637 @@
         assert( (old_attr & GPT_MAPPED), __FUNCTION__,
         "PTE unmapped for a COW exception / vpn %x / thread %x / process %x / cycle %d\n",
-        vpn, CURRENT_THREAD, process->pid, (uint32_t)hal_get_cycles() );
+        vpn, this, process->pid, (uint32_t)hal_get_cycles() );
 
 #if( DEBUG_VMM_GET_PTE & 1 )
-if( DEBUG_VMM_GET_PTE < cycle )
+// if( DEBUG_VMM_GET_PTE < cycle )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x handling COW for vpn %x in process %x\n",
-__FUNCTION__, CURRENT_THREAD, vpn, process->pid );
+__FUNCTION__, this, vpn, process->pid );
 #endif
 
@@ -1691 +1702 @@
 
 #if( DEBUG_VMM_GET_PTE & 1 )
-if( DEBUG_VMM_GET_PTE < cycle )
+// if( DEBUG_VMM_GET_PTE < cycle )
+if( (vpn == 0x403) && ((local_cxy == 0) || (this->type == THREAD_RPC)) )
 printk("\n[DBG] %s : thread %x handling page fault for vpn %x in process %x\n",
-__FUNCTION__, CURRENT_THREAD, vpn, process->pid );
+__FUNCTION__, this, vpn, process->pid );
 #endif
             // allocate new_ppn, and initialize the new page
@@ -1733 +1745 @@
 #if DEBUG_VMM_GET_PTE
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_VMM_GET_PTE < cycle )
+// if( DEBUG_VMM_GET_PTE < cycle )
+if( (vpn == 0x403) && (local_cxy == 0) )
 printk("\n[DBG] %s : thread %x exit / vpn %x in process %x / ppn %x / attr %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, vpn, process->pid, new_ppn, new_attr, cycle );
+__FUNCTION__, this, vpn, process->pid, new_ppn, new_attr, cycle );
 #endif
 
@@ -1762 +1775 @@
 #if DEBUG_VMM_HANDLE_PAGE_FAULT
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_VMM_HANDLE_PAGE_FAULT < cycle )
-printk("\n[DBG] %s : thread %x enter for vpn %x / process %x / core[%x,%d] / cycle %d\n",
-__FUNCTION__, this, vpn, process->pid, local_cxy, this->core->lid, cycle );
+// if( DEBUG_VMM_HANDLE_PAGE_FAULT < cycle )
+if( (vpn == 0x403) && (local_cxy == 0) )
+printk("\n[DBG] %s : thread %x in process %x enter for vpn %x / core[%x,%d] / cycle %d\n",
+__FUNCTION__, this, process->pid, vpn, local_cxy, this->core->lid, cycle );
 #endif
 
@@ -1798 +1812 @@
     if( local_cxy != ref_cxy )  
     {
+
+#if DEBUG_VMM_HANDLE_PAGE_FAULT
+// if( DEBUG_VMM_HANDLE_PAGE_FAULT < cycle )
+if( (vpn == 0x403) && (local_cxy == 0) )
+printk("\n[DBG] %s : thread %x in process %x call RPC_VMM_GET_PTE\n",
+__FUNCTION__, this, process->pid );
+#endif
+
         rpc_vmm_get_pte_client( ref_cxy,
                                 ref_ptr,
@@ -1826 +1848 @@
 #if DEBUG_VMM_HANDLE_PAGE_FAULT
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_VMM_HANDLE_PAGE_FAULT < cycle )
-printk("\n[DBG] %s : thread %x exit for vpn %x / process %x / cycle %d\n",
-__FUNCTION__, this->trdid, vpn, process->pid, cycle );
+// if( DEBUG_VMM_HANDLE_PAGE_FAULT < cycle )
+if( (vpn == 0x403) && (local_cxy == 0) )
+printk("\n[DBG] %s : thread %x in process %x exit for vpn %x / core[%x,%d] / cycle %d\n",
+__FUNCTION__, this, process->pid, vpn, local_cxy, this->core->lid, cycle );
 #endif
 
     return error;
 
-}  // end vmm_handle_page_fault()
+}   // end vmm_handle_page_fault()
+
+
+
+
+
+
+
+
 
 /* deprecated April 2018  [AG]