Unifying the Lunaix's Physical Memory Model (#28)

[lunaix-os.git] / lunaix-os / kernel / fs / pcache.c

diff --git a/lunaix-os/kernel/fs/pcache.c b/lunaix-os/kernel/fs/pcache.c
index f1969bd524473f225a9beffa0c3b6d411f8053ea..26e7ac4882035b0362eaa148931e79e1a816d3d5 100644 (file)
--- a/lunaix-os/kernel/fs/pcache.c
+++ b/lunaix-os/kernel/fs/pcache.c
@@ -2,9 +2,7 @@
 #include <lunaix/ds/btrie.h>
 #include <lunaix/fs.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/ds/btrie.h>
 #include <lunaix/fs.h>
 #include <lunaix/mm/page.h>

-#include <lunaix/mm/pmm.h>

 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/valloc.h>

-#include <lunaix/mm/vmm.h>

 #include <lunaix/spike.h>
 
 #define PCACHE_DIRTY 0x1
 #include <lunaix/spike.h>
 
 #define PCACHE_DIRTY 0x1


@@ -22,22 +20,24 @@ __pcache_try_evict(struct lru_node* obj)
 static void
 pcache_free_page(void* va)
 {
 static void
 pcache_free_page(void* va)
 {

-    ptr_t pa = vmm_del_mapping(VMS_SELF, (ptr_t)va);
-    pmm_free_page(KERNEL_PID, pa);
+    pte_t* ptep = mkptep_va(VMS_SELF, (ptr_t)va);
+    pte_t pte = pte_at(ptep);
+    leaflet_return(pte_leaflet(pte));

 }
 
 static void*
 pcache_alloc_page()
 {
     int i = 0;
 }
 
 static void*
 pcache_alloc_page()
 {
     int i = 0;

-    ptr_t pp = pmm_alloc_page(KERNEL_PID, 0), va = 0;
+    ptr_t va = 0;
+    struct leaflet* leaflet = alloc_leaflet(0);

 
 

-    if (!pp) {
+    if (!leaflet) {

         return NULL;
     }
 
         return NULL;
     }
 

-    if (!(va = (ptr_t)vmap(pp, PG_SIZE, PG_PREM_RW, 0))) {
-        pmm_free_page(KERNEL_PID, pp);
+    if (!(va = (ptr_t)vmap(leaflet, KERNEL_DATA))) {
+        leaflet_return(leaflet);

         return NULL;
     }
 
         return NULL;
     }
 


@@ -47,7 +47,7 @@ pcache_alloc_page()
 void
 pcache_init(struct pcache* pcache)
 {
 void
 pcache_init(struct pcache* pcache)
 {

-    btrie_init(&pcache->tree, PG_SIZE_BITS);
+    btrie_init(&pcache->tree, PAGE_SHIFT);

     llist_init_head(&pcache->dirty);
     llist_init_head(&pcache->pages);
 
     llist_init_head(&pcache->dirty);
     llist_init_head(&pcache->pages);
 


@@ -133,23 +133,31 @@ pcache_write(struct v_inode* inode, void* data, u32_t len, u32_t fpos)
     struct pcache* pcache = inode->pg_cache;
     struct pcache_pg* pg;
 
     struct pcache* pcache = inode->pg_cache;
     struct pcache_pg* pg;
 

-    while (buf_off < len) {
-        u32_t wr_bytes = MIN(PG_SIZE - pg_off, len - buf_off);
+    while (buf_off < len && errno >= 0) {
+        u32_t wr_bytes = MIN(PAGE_SIZE - pg_off, len - buf_off);

 
 

-        pcache_get_page(pcache, fpos, &pg_off, &pg);
+        int new_page = pcache_get_page(pcache, fpos, &pg_off, &pg);
+
+        if (new_page) {
+            // Filling up the page
+            errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos);

 
 

-        if (!pg) {
-            errno = inode->default_fops->write(inode, data, wr_bytes, fpos);

             if (errno < 0) {
                 break;
             }
             if (errno < 0) {
                 break;
             }

-        } else {
-            memcpy(pg->pg + pg_off, (data + buf_off), wr_bytes);
-            pcache_set_dirty(pcache, pg);
-
-            pg->len = pg_off + wr_bytes;
+            if (errno < (int)PAGE_SIZE) {
+                // EOF
+                len = MIN(len, buf_off + errno);
+            }
+        } else if (!pg) {
+            errno = inode->default_fops->write(inode, data, wr_bytes, fpos);
+            continue;

         }
 
         }
 

+        memcpy(pg->pg + pg_off, (data + buf_off), wr_bytes);
+        pcache_set_dirty(pcache, pg);
+
+        pg->len = pg_off + wr_bytes;

         buf_off += wr_bytes;
         fpos += wr_bytes;
     }
         buf_off += wr_bytes;
         fpos += wr_bytes;
     }


@@ -169,20 +177,19 @@ pcache_read(struct v_inode* inode, void* data, u32_t len, u32_t fpos)
         int new_page = pcache_get_page(pcache, fpos, &pg_off, &pg);
         if (new_page) {
             // Filling up the page
         int new_page = pcache_get_page(pcache, fpos, &pg_off, &pg);
         if (new_page) {
             // Filling up the page

-            errno =
-              inode->default_fops->read_page(inode, pg->pg, PG_SIZE, pg->fpos);
+            errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos);

 
             if (errno < 0) {
                 break;
             }
 
             if (errno < 0) {
                 break;
             }

-            if (errno < PG_SIZE) {
+            if (errno < (int)PAGE_SIZE) {

                 // EOF
                 len = MIN(len, buf_off + errno);
             }
 
             pg->len = errno;
         } else if (!pg) {
                 // EOF
                 len = MIN(len, buf_off + errno);
             }
 
             pg->len = errno;
         } else if (!pg) {

-            errno = inode->default_fops->read_page(
+            errno = inode->default_fops->read(

               inode, (data + buf_off), len - buf_off, pg->fpos);
             buf_off = len;
             break;
               inode, (data + buf_off), len - buf_off, pg->fpos);
             buf_off = len;
             break;


@@ -222,8 +229,7 @@ pcache_commit(struct v_inode* inode, struct pcache_pg* page)
         return 0;
     }
 
         return 0;
     }
 

-    int errno =
-      inode->default_fops->write_page(inode, page->pg, PG_SIZE, page->fpos);
+    int errno = inode->default_fops->write_page(inode, page->pg, page->fpos);

 
     if (!errno) {
         page->flags &= ~PCACHE_DIRTY;
 
     if (!errno) {
         page->flags &= ~PCACHE_DIRTY;