Modules/RTL8139 - Fixed bug if BAR is invalid

[tpg/acess2.git] / Kernel / arch / x86_64 / mm_virt.c

diff --git a/Kernel/arch/x86_64/mm_virt.c b/Kernel/arch/x86_64/mm_virt.c
index 1bb890c..c04fcf3 100644 (file)
--- a/Kernel/arch/x86_64/mm_virt.c
+++ b/Kernel/arch/x86_64/mm_virt.c
@@ -80,7 +80,7 @@ tPAddr        gMM_ZeroPage;
 // === CODE ===
 void MM_InitVirt(void)
 {
-       Log_Debug("MMVirt", "&PAGEMAPLVL4(0) = %p", &PAGEMAPLVL4(0));
+//     Log_Debug("MMVirt", "&PAGEMAPLVL4(0) = %p", &PAGEMAPLVL4(0));
 //     MM_DumpTables(0, -1L);
 }
 
@@ -106,6 +106,7 @@ void MM_int_ClonePageEnt( Uint64 *Ent, void *NextLevel, tVAddr Addr, int bTable
        {
                *Ent &= ~PF_COW;
                *Ent |= PF_PRESENT|PF_WRITE;
+//             Log_Debug("MMVirt", "COW ent at %p (%p) only %P", Ent, NextLevel, curpage);
        }
        else
        {
@@ -201,6 +202,7 @@ int MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs)
                Warning("User Pagefault: Instruction at %04x:%p accessed %p",
                        Regs->CS, Regs->RIP, Addr);
                __asm__ __volatile__ ("sti");   // Restart IRQs
+               Error_Backtrace(Regs->RIP, Regs->RBP);
                Threads_SegFault(Addr);
                return 0;
        }
@@ -231,12 +233,13 @@ int MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs)
 void MM_int_DumpTablesEnt(tVAddr RangeStart, size_t Length, tPAddr Expected)
 {
        #define CANOICAL(addr)  ((addr)&0x800000000000?(addr)|0xFFFF000000000000:(addr))
-       LogF("%6llx %6llx %6llx %016llx => ",
-               MM_GetPhysAddr( (tVAddr)&PAGEDIRPTR(RangeStart>>30) ),
-               MM_GetPhysAddr( (tVAddr)&PAGEDIR(RangeStart>>21) ),
-               MM_GetPhysAddr( (tVAddr)&PAGETABLE(RangeStart>>12) ),
-               CANOICAL(RangeStart)
-               );
+       LogF("%016llx => ", CANOICAL(RangeStart));
+//     LogF("%6llx %6llx %6llx %016llx => ",
+//             MM_GetPhysAddr( (tVAddr)&PAGEDIRPTR(RangeStart>>30) ),
+//             MM_GetPhysAddr( (tVAddr)&PAGEDIR(RangeStart>>21) ),
+//             MM_GetPhysAddr( (tVAddr)&PAGETABLE(RangeStart>>12) ),
+//             CANOICAL(RangeStart)
+//             );
        if( gMM_ZeroPage && (PAGETABLE(RangeStart>>12) & PADDR_MASK) == gMM_ZeroPage )
                LogF("%13s", "zero" );
        else
@@ -413,7 +416,7 @@ int MM_MapEx(tVAddr VAddr, tPAddr PAddr, BOOL bTemp, BOOL bLarge)
        tPAddr  *ent;
         int    rv;
        
-       ENTER("xVAddr xPAddr", VAddr, PAddr);
+       ENTER("pVAddr PPAddr", VAddr, PAddr);
        
        // Get page pointer (Allow allocating)
        rv = MM_GetPageEntryPtr(VAddr, bTemp, 1, bLarge, &ent);
@@ -665,6 +668,8 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
                }
                if( num >= 0 )  continue;
                
+//             Log_Debug("MMVirt", "Mapping %i pages to %p (base %P)", Number, ret-Number*0x1000, PAddr);
+
                PAddr += 0x1000 * Number;
                
                while( Number -- )
@@ -678,7 +683,7 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
                return ret;
        }
        
-       Log_KernelPanic("MM", "TODO: Implement MM_MapHWPages");
+       Log_Error("MM", "MM_MapHWPages - No space for %i pages", Number);
        return 0;
 }
 
@@ -820,18 +825,21 @@ tPAddr MM_Clone(void)
                if( TMPMAPLVL4(i) & 1 )
                        MM_RefPhys( TMPMAPLVL4(i) & PADDR_MASK );
        }
+
+       // Mark Per-Process data as COW
+       TMPMAPLVL4(MM_PPD_BASE>>39) |= PF_COW;
+       TMPMAPLVL4(MM_PPD_BASE>>39) &= ~PF_WRITE;
        
        // #5 Set fractal mapping
-       TMPMAPLVL4(508) = ret | 3;      // Main
-       TMPMAPLVL4(509) = 0;    // Temp
+       TMPMAPLVL4(MM_FRACTAL_BASE>>39) = ret | 3;      // Main
+       TMPMAPLVL4(MM_TMPFRAC_BASE>>39) = 0;    // Temp
        
        // #6 Create kernel stack
        //  tThread->KernelStack is the top
        //  There is 1 guard page below the stack
        kstackbase = Proc_GetCurThread()->KernelStack - KERNEL_STACK_SIZE;
 
-       Log("MM_Clone: kstackbase = %p", kstackbase);
-       
+       // Clone stack
        TMPMAPLVL4(MM_KSTACK_BASE >> PML4_SHIFT) = 0;
        for( i = 1; i < KERNEL_STACK_SIZE/0x1000; i ++ )
        {
@@ -839,9 +847,6 @@ tPAddr MM_Clone(void)
                tVAddr  tmpmapping;
                MM_MapEx(kstackbase+i*0x1000, phys, 1, 0);
                
-               Log_Debug("MM", "MM_Clone: Cloning stack page %p from %P to %P",
-                       kstackbase+i*0x1000, MM_GetPhysAddr( kstackbase+i*0x1000 ), phys
-                       );
                tmpmapping = MM_MapTemp(phys);
                if( MM_GetPhysAddr( kstackbase+i*0x1000 ) )
                        memcpy((void*)tmpmapping, (void*)(kstackbase+i*0x1000), 0x1000);
@@ -867,7 +872,7 @@ void MM_int_ClearTableLevel(tVAddr VAddr, int LevelBits, int MaxEnts)
        Uint64  * const table_bases[] = {&PAGETABLE(0), &PAGEDIR(0), &PAGEDIRPTR(0), &PAGEMAPLVL4(0)};
        Uint64  *table = table_bases[(LevelBits-12)/9] + (VAddr >> LevelBits);
         int    i;
-       Log("MM_int_ClearTableLevel: (VAddr=%p, LevelBits=%i, MaxEnts=%i)", VAddr, LevelBits, MaxEnts);
+//     Log("MM_int_ClearTableLevel: (VAddr=%p, LevelBits=%i, MaxEnts=%i)", VAddr, LevelBits, MaxEnts);
        for( i = 0; i < MaxEnts; i ++ )
        {
                // Skip non-present tables