Changeset 587 for trunk/hal/tsar_mips32/core/hal_exception.c

Timestamp:

Nov 1, 2018, 12:39:27 PM (5 years ago)

Author:

alain

Message:

Modify the GPT (Generic Page Table) API to support remote accesses,
in order to improve page faults and COW handling.

File:

• trunk/hal/tsar_mips32/core/hal_exception.c (modified) (8 diffs)

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -46 +46 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// This enum defines the global exception types after analysis by the exception handler.
-//////////////////////////////////////////////////////////////////////////////////////////
-
-typedef enum
-{
-    EXCP_NON_FATAL,
-    EXCP_USER_ERROR,
-    EXCP_KERNEL_PANIC,
-}
-exception_handling_type_t;
-
-//////////////////////////////////////////////////////////////////////////////////////////
 // This enum defines the mask values for an MMU exception code reported by the mips32.
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -219 +207 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x in process %x enter / is_ins %d / %s / vaddr %x / cycle %d\n",
-__FUNCTION__, this->trdid, process->pid,
+printk("\n[DBG] %s : thread[%x,%x] enter / is_ins %d / %s / vaddr %x / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid,
 is_ins, hal_mmu_exception_str(excp_code), bad_vaddr, cycle);
 #endif
@@ -234 +222 @@
             // try to map the unmapped PTE
             error = vmm_handle_page_fault( process, 
-                                           bad_vaddr >> CONFIG_PPM_PAGE_SHIFT,  // vpn
-                                           false );                             // not a COW
-            if( error )   
-            {
-                printk("\n[USER ERROR] in %s for thread %x in process %x\n"
-                "   cannot map vaddr = %x / is_ins %d / epc %x\n",
-                __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
-
-                        return EXCP_USER_ERROR;
-            } 
-            else            // page fault successfull
+                                           bad_vaddr >> CONFIG_PPM_PAGE_SHIFT );
+
+            if( error == EXCP_NON_FATAL )            // page-fault successfully handled
             {
 
@@ -250 +230 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x in process %x exit / page-fault handled for vaddr = %x\n",
-__FUNCTION__, this->trdid, process->pid, bad_vaddr );
+printk("\n[DBG] %s : thread[%x,%x] exit / page-fault handled for vaddr = %x\n",
+__FUNCTION__, process->pid, this->trdid, bad_vaddr );
 #endif
   
                 return EXCP_NON_FATAL;
             }
+            else if( error == EXCP_USER_ERROR )      // illegal vaddr
+            {
+                printk("\n[USER ERROR] in %s for thread %x in process %x\n"
+                "   illegal vaddr = %x / is_ins %d / epc %x\n",
+                __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
+
+                        return EXCP_USER_ERROR;
+            } 
+            else  // error == EXCP_KERNEL_PANIC  
+            {
+                printk("\n[KERNEL ERROR] in %s for thread %x in process %x\n"
+                "   no memory to map vaddr = %x / is_ins %d / epc %x\n",
+                __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
+
+                        return EXCP_KERNEL_PANIC;
+            } 
         }
         case MMU_WRITE_PRIVILEGE_VIOLATION:  // illegal access user error
         case MMU_READ_PRIVILEGE_VIOLATION:
         {
-            printk("\n[USER ERROR] in %s for thread %x in process %x\n"
+            printk("\n[USER ERROR] in %s : thread %x in process %x\n"
             "   illegal user access to vaddr = %x / is_ins %d / epc %x\n",
             __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
@@ -275 +271 @@
             {
                 // try to allocate and copy the page
-                error = vmm_handle_page_fault( process,
-                                               bad_vaddr >> CONFIG_PPM_PAGE_SHIFT,  // vpn
-                                               true );                              // COW
-                if( error )
-                {
-                    printk("\n[USER ERROR] in %s for thread %x in process %x\n"
-                    "   cannot cow vaddr = %x / is_ins %d / epc %x\n",
-                    __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
-
-                            return EXCP_USER_ERROR;
-                }
-                else         // Copy on write successfull
+                error = vmm_handle_cow( process,
+                                        bad_vaddr >> CONFIG_PPM_PAGE_SHIFT );
+
+                if( error == EXCP_NON_FATAL )        // Copy on write successfull
                 {
 
@@ -292 +280 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x in process %x exit / copy-on-write handled for vaddr = %x\n",
-__FUNCTION__, this->trdid, process->pid, bad_vaddr );
+printk("\n[DBG] %s : thread[%x,%x] exit / copy-on-write handled for vaddr = %x\n",
+__FUNCTION__, process->pid, this->trdid, bad_vaddr );
 #endif
 
                     return EXCP_NON_FATAL;
                 } 
+                else if( error == EXCP_USER_ERROR )  // illegal user access
+                {
+                    printk("\n[USER ERROR] in %s : thread %x in process %x\n"
+                    "   cannot cow vaddr = %x / is_ins %d / epc %x\n",
+                    __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
+
+                            return EXCP_USER_ERROR;
+                }
+                else   // error == EXCP_KERNEL_PANIC
+                {
+                    printk("\n[KERNEL ERROR] in %s : thread %x in process %x\n"
+                    "   no memoty to cow vaddr = %x / is_ins %d / epc %x\n",
+                    __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
+
+                            return EXCP_USER_ERROR;
+                }
             }
             else                             // non writable user error
             {
-                printk("\n[USER ERROR] in %s for thread %x in process %x\n"
+                printk("\n[USER ERROR] in %s : thread %x in process %x\n"
                 "   non-writable vaddr = %x / is_ins %d / epc %x\n",
                 __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
@@ -310 +314 @@
         case MMU_READ_EXEC_VIOLATION:        // user error
         {
-            printk("\n[USER_ERROR] in %s for thread %x in process %x\n"
+            printk("\n[USER_ERROR] in %s : thread %x in process %x\n"
             "   non-executable vaddr = %x / is_ins %d / epc %x\n",
             __FUNCTION__, this->trdid, this->process->pid, bad_vaddr, is_ins, excPC );
@@ -318 +322 @@
         default:                             // this is a kernel error    
         {
-            printk("\n[KERNEL ERROR] in %s for thread %x in process %x\n"
+            printk("\n[KERNEL ERROR] in %s : thread %x in process %x\n"
             "  epc %x / badvaddr %x / is_ins %d\n",
             __FUNCTION__, this->trdid, this->process->pid, excPC, bad_vaddr, is_ins );