Add AnonMem, and s/get_entry/get_mapping/.

diff --git a/kernel/include/kern/mem.h b/kernel/include/kern/mem.h
index 2e1cdc240b60e401b572dda15b890f6406b8b09f..ac60e84ba663644e8e3ab3a970baf267b442927d 100644 (file)
--- a/kernel/include/kern/mem.h
+++ b/kernel/include/kern/mem.h
@@ -157,7 +157,7 @@ namespace Mem {
                // other flags are undefined, and pagein() should be retried.
                // rmap_lock must be held.
                
                // other flags are undefined, and pagein() should be retried.
                // rmap_lock must be held.
                

-               virtual void get_entry(u64 vaddr, u64 *phys, PTEFlags *flags) = 0;
+               virtual void get_mapping(u64 vaddr, u64 *phys, PTEFlags *flags) = 0;

 
                #include <servers/mem/addrspace/Mem/Mappable.h>
                
 
                #include <servers/mem/addrspace/Mem/Mappable.h>
                


@@ -218,7 +218,7 @@ namespace Mem {
        };
        
        // This lock protects the rmap chains and rmap tables.  It also makes
        };
        
        // This lock protects the rmap chains and rmap tables.  It also makes

-       // atomic the PageTable::get_entry, RMapTable::map, PageTable::map
+       // atomic the PageTable::get_mapping, RMapTable::map, PageTable::map

        // sequence.
        //
        // OPT: This lock is acquired on all map/unmap activity; if/when this
        // sequence.
        //
        // OPT: This lock is acquired on all map/unmap activity; if/when this


@@ -284,7 +284,7 @@ namespace Mem {
                // other flags are undefined.  This function is mainly used for
                // propagating stacked aspace PTEs.
                
                // other flags are undefined.  This function is mainly used for
                // propagating stacked aspace PTEs.
                

-               virtual void get_entry(u64 vaddr, u64 *phys, Flags *flags) = 0;
+               virtual void get_mapping(u64 vaddr, u64 *phys, Flags *flags) = 0;

                
                virtual void get_size(u64 *size) = 0;
                
                
                virtual void get_size(u64 *size) = 0;
                


@@ -318,7 +318,7 @@ namespace Mem {
        
                // Unexported
                virtual void pagein(u64 vaddr, PTEFlags reqflags);
        
                // Unexported
                virtual void pagein(u64 vaddr, PTEFlags reqflags);

-               virtual void get_entry(u64 vaddr, u64 *phys, PTEFlags *flags);
+               virtual void get_mapping(u64 vaddr, u64 *phys, PTEFlags *flags);

 
                friend class AddrSpace;
        };
 
                friend class AddrSpace;
        };

diff --git a/kernel/include/kern/pagetable.h b/kernel/include/kern/pagetable.h
index a1cd84b391fc08751ac6caef3cc95523212ed8e0..436a81c23fd49c6094883e190140f84a537323d2 100644 (file)
--- a/kernel/include/kern/pagetable.h
+++ b/kernel/include/kern/pagetable.h
@@ -69,7 +69,7 @@ namespace Mem {
                virtual void map(RegionWithOffset region, Flags flags);
                virtual void unmap(Region region);
                virtual void set_flags(Region region, Flags flags, Flags mask);
                virtual void map(RegionWithOffset region, Flags flags);
                virtual void unmap(Region region);
                virtual void set_flags(Region region, Flags flags, Flags mask);

-               virtual void get_entry(u64 addr, u64 *phys, Flags *flags);
+               virtual void get_mapping(u64 addr, u64 *phys, Flags *flags);

 
                virtual void get_size(u64 *size)
                {
 
                virtual void get_size(u64 *size)
                {

diff --git a/kernel/mem/addrspace.cc b/kernel/mem/addrspace.cc
index 324421f7f2b1f7fd1be271fb7f6c210c662cdb29..b9bd07af82f54c2c92e483fbda899aa7eb58d83f 100644 (file)
--- a/kernel/mem/addrspace.cc
+++ b/kernel/mem/addrspace.cc
@@ -499,9 +499,9 @@ namespace Mem {
                new_page->release();
        }
 
                new_page->release();
        }
 

-       void ASpaceMappable::get_entry(u64 vaddr, u64 *phys, PTEFlags *flags)
+       void ASpaceMappable::get_mapping(u64 vaddr, u64 *phys, PTEFlags *flags)

        {
        {

-               aspace->page_table->get_entry(vaddr, phys, flags);
+               aspace->page_table->get_mapping(vaddr, phys, flags);

        }
        
        bool AddrSpace::map(VirtualArea *va, u64 vaddr, PTEFlags reqflags)
        }
        
        bool AddrSpace::map(VirtualArea *va, u64 vaddr, PTEFlags reqflags)


@@ -511,7 +511,7 @@ namespace Mem {
                        
                u64 phys;
                PTEFlags flags;
                        
                u64 phys;
                PTEFlags flags;

-               va->ma->get_entry(vaddr + va->offset, &phys, &flags);
+               va->ma->get_mapping(vaddr + va->offset, &phys, &flags);

 
                PTEFlags newflags = flags & va->flags;
                newflags.FaultOnWrite = flags.FaultOnWrite | va->flags.FaultOnWrite;
 
                PTEFlags newflags = flags & va->flags;
                newflags.FaultOnWrite = flags.FaultOnWrite | va->flags.FaultOnWrite;


@@ -526,7 +526,7 @@ namespace Mem {
 
                u64 oldphys;
                PTEFlags oldflags;
 
                u64 oldphys;
                PTEFlags oldflags;

-               page_table->get_entry(vaddr, &oldphys, &oldflags);
+               page_table->get_mapping(vaddr, &oldphys, &oldflags);

                
                if (oldflags.Valid &&
                    !(reqflags.Writeable && oldflags.FaultOnWrite))
                
                if (oldflags.Valid &&
                    !(reqflags.Writeable && oldflags.FaultOnWrite))


@@ -826,7 +826,7 @@ namespace Mem {
                        // once high memory support is added.
                }
                
                        // once high memory support is added.
                }
                

-               void get_entry(u64 addr, u64 *phys, PTEFlags *flags)
+               void get_mapping(u64 addr, u64 *phys, PTEFlags *flags)

                {
                        *phys = addr;
                        *flags = 0;
                {
                        *phys = addr;
                        *flags = 0;


@@ -840,6 +840,45 @@ namespace Mem {
        
        PhysMem real_physmem;
        IMappable physmem = real_physmem;
        
        PhysMem real_physmem;
        IMappable physmem = real_physmem;

+
+       class AnonMem : public Mappable {
+       public:
+               void get_size(u64 *size)
+               {
+                       if (sizeof(long) == 8)
+                               *size = 1ULL << (64 - Arch::page_shift);
+                       else
+                               *size = 1ULL << (32 - Arch::page_shift);
+               }
+       
+               void pagein(u64 vaddr, PTEFlags reqflags)
+               {
+                       // Doesn't need to do anything yet, though it may later
+                       // once high memory support is added.
+               }
+               
+               void get_mapping(u64 addr, u64 *phys, PTEFlags *flags)
+               {
+                       Page *page = PageAlloc::alloc(1);
+                       
+                       // OPT: Only zero if it was asked for.
+                       // OPT: Eventually, have separate pagelists for zeroed and
+                       // unzeroed memory, and a low-priority background thread
+                       // that zeroes pages and moves them to the zeroed list.
+                       bzero(page_to_kvirt(page), Arch::page_size);
+                       
+                       *phys = page_to_phys(page);
+                       *flags = 0;
+                       flags->Valid = 1;
+                       flags->Readable = 1;
+                       flags->Writeable = 1;
+                       flags->Executable = 1;
+                       flags->User = 1;
+               }
+       };
+       
+       AnonMem real_anonmem;
+       IMappable anonmem = real_anonmem;

 }
 
 #include <servers/mem/addrspace/footer.cc>
 }
 
 #include <servers/mem/addrspace/footer.cc>

diff --git a/kernel/mem/pagetable.cc b/kernel/mem/pagetable.cc
index 976e579286b5d076b0652bc7e88de788e8522723..93a7caed263e2111c2cb8f4c8ec2c9acd062c5fb 100644 (file)
--- a/kernel/mem/pagetable.cc
+++ b/kernel/mem/pagetable.cc
@@ -421,7 +421,7 @@ namespace Mem {
        }
        
        template <typename PTE>
        }
        
        template <typename PTE>

-       void PageTableImpl<PTE>::get_entry(u64 addr, u64 *phys, Flags *flags)
+       void PageTableImpl<PTE>::get_mapping(u64 addr, u64 *phys, Flags *flags)

        {
                Lock::AutoLock autolock(lock);
                int shift = toplevel_shift;
        {
                Lock::AutoLock autolock(lock);
                int shift = toplevel_shift;