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 a1632a1a6c71a3792056dc0bc75b329398b3c3cb..26e7ac4882035b0362eaa148931e79e1a816d3d5 100644 (file)
--- a/lunaix-os/kernel/fs/pcache.c
+++ b/lunaix-os/kernel/fs/pcache.c
@@ -2,41 +2,91 @@
 #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
 

+static struct lru_zone* pcache_zone;
+
+static int
+__pcache_try_evict(struct lru_node* obj)
+{
+    struct pcache_pg* page = container_of(obj, struct pcache_pg, lru);
+    pcache_invalidate(page->holder, page);
+    return 1;
+}
+
+static void
+pcache_free_page(void* va)
+{
+    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;
+    ptr_t va = 0;
+    struct leaflet* leaflet = alloc_leaflet(0);
+
+    if (!leaflet) {
+        return NULL;
+    }
+
+    if (!(va = (ptr_t)vmap(leaflet, KERNEL_DATA))) {
+        leaflet_return(leaflet);
+        return NULL;
+    }
+
+    return (void*)va;
+}
+

 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);

+
+    pcache_zone = lru_new_zone(__pcache_try_evict);

 }
 
 void
 pcache_release_page(struct pcache* pcache, struct pcache_pg* page)
 {
 }
 
 void
 pcache_release_page(struct pcache* pcache, struct pcache_pg* page)
 {

-    pmm_free_page(KERNEL_PID, page->pg);
-    vmm_del_mapping(PD_REFERENCED, page->pg);
+    pcache_free_page(page->pg);

 
     llist_delete(&page->pg_list);
 
 
     llist_delete(&page->pg_list);
 

+    btrie_remove(&pcache->tree, page->fpos);
+

     vfree(page);
 
     pcache->n_pages--;
 }
 
 struct pcache_pg*
     vfree(page);
 
     pcache->n_pages--;
 }
 
 struct pcache_pg*

-pcache_new_page(struct pcache* pcache, uint32_t index)
+pcache_new_page(struct pcache* pcache, u32_t index)

 {
 {

-    void* pg = pmm_alloc_page(KERNEL_PID, 0);
-    void* pg_v = vmm_vmap(pg, PG_SIZE, PG_PREM_URW);
-    struct pcache_pg* ppg = valloc(sizeof(struct pcache_pg));
-    ppg->pg = pg_v;
+    struct pcache_pg* ppg = vzalloc(sizeof(struct pcache_pg));
+    void* pg = pcache_alloc_page();
+
+    if (!ppg || !pg) {
+        lru_evict_one(pcache_zone);
+        if (!ppg && !(ppg = vzalloc(sizeof(struct pcache_pg)))) {
+            return NULL;
+        }
+
+        if (!pg && !(pg = pcache_alloc_page())) {
+            return NULL;
+        }
+    }
+
+    ppg->pg = pg;
+    ppg->holder = pcache;

 
     llist_append(&pcache->pages, &ppg->pg_list);
     btrie_set(&pcache->tree, index, ppg);
 
     llist_append(&pcache->pages, &ppg->pg_list);
     btrie_set(&pcache->tree, index, ppg);


@@ -54,73 +104,109 @@ pcache_set_dirty(struct pcache* pcache, struct pcache_pg* pg)
     }
 }
 
     }
 }
 

-struct pcache_pg*
+int

 pcache_get_page(struct pcache* pcache,
 pcache_get_page(struct pcache* pcache,

-                uint32_t index,
-                uint32_t* offset,
+                u32_t index,
+                u32_t* offset,

                 struct pcache_pg** page)
 {
     struct pcache_pg* pg = btrie_get(&pcache->tree, index);
     int is_new = 0;
                 struct pcache_pg** page)
 {
     struct pcache_pg* pg = btrie_get(&pcache->tree, index);
     int is_new = 0;

-    *offset = index & ((1 << pcache->tree.truncated) - 1);
-    if (!pg) {
-        pg = pcache_new_page(pcache, index);
-        pg->fpos = index - *offset;
+    u32_t mask = ((1 << pcache->tree.truncated) - 1);
+    *offset = index & mask;
+    if (!pg && (pg = pcache_new_page(pcache, index))) {
+        pg->fpos = index & ~mask;

         pcache->n_pages++;
         is_new = 1;
     }
         pcache->n_pages++;
         is_new = 1;
     }

+    if (pg)
+        lru_use_one(pcache_zone, &pg->lru);

     *page = pg;
     return is_new;
 }
 
 int
     *page = pg;
     return is_new;
 }
 
 int

-pcache_write(struct v_file* file, void* data, uint32_t len)
+pcache_write(struct v_inode* inode, void* data, u32_t len, u32_t fpos)

 {
 {

-    uint32_t pg_off, buf_off = 0, fpos = file->f_pos;
-    struct pcache* pcache = file->inode->pg_cache;
+    int errno = 0;
+    u32_t pg_off, buf_off = 0;
+    struct pcache* pcache = inode->pg_cache;

     struct pcache_pg* pg;
 
     struct pcache_pg* pg;
 

-    while (buf_off < len) {
-        pcache_get_page(pcache, fpos, &pg_off, &pg);
-        uint32_t wr_bytes = MIN(PG_SIZE - pg_off, len - buf_off);
-        memcpy(pg->pg + pg_off, (data + buf_off), wr_bytes);
+    while (buf_off < len && errno >= 0) {
+        u32_t wr_bytes = MIN(PAGE_SIZE - pg_off, len - buf_off);

 
 

+        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 (errno < 0) {
+                break;
+            }
+            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);
 
         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;
     }
 

-    return buf_off;
+    return errno < 0 ? errno : (int)buf_off;

 }
 
 int
 }
 
 int

-pcache_read(struct v_file* file, void* data, uint32_t len)
+pcache_read(struct v_inode* inode, void* data, u32_t len, u32_t fpos)

 {
 {

-    uint32_t pg_off, buf_off = 0, new_pg = 0, fpos = file->f_pos;
+    u32_t pg_off, buf_off = 0, new_pg = 0;

     int errno = 0;
     int errno = 0;

-    struct pcache* pcache = file->inode->pg_cache;
+    struct pcache* pcache = inode->pg_cache;

     struct pcache_pg* pg;
 
     while (buf_off < len) {
     struct pcache_pg* pg;
 
     while (buf_off < len) {

-        if (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
             // Filling up the page

-            errno = file->ops.read(file, pg->pg, PG_SIZE, pg->fpos);
-            if (errno > 0 && errno < PG_SIZE) {
-                // EOF
-                len = buf_off + errno;
-            } else if (errno < 0) {
+            errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos);
+
+            if (errno < 0) {

                 break;
             }
                 break;
             }

+            if (errno < (int)PAGE_SIZE) {
+                // EOF
+                len = MIN(len, buf_off + errno);
+            }
+
+            pg->len = errno;
+        } else if (!pg) {
+            errno = inode->default_fops->read(
+              inode, (data + buf_off), len - buf_off, pg->fpos);
+            buf_off = len;
+            break;

         }
         }

-        uint32_t rd_bytes = MIN(PG_SIZE - pg_off, len - buf_off);
+
+        u32_t rd_bytes = MIN(pg->len - pg_off, len - buf_off);
+
+        if (!rd_bytes)
+            break;
+

         memcpy((data + buf_off), pg->pg + pg_off, rd_bytes);
 
         buf_off += rd_bytes;
         fpos += rd_bytes;
     }
 
         memcpy((data + buf_off), pg->pg + pg_off, rd_bytes);
 
         buf_off += rd_bytes;
         fpos += rd_bytes;
     }
 

-    return errno < 0 ? errno : buf_off;
+    return errno < 0 ? errno : (int)buf_off;

 }
 
 void
 }
 
 void


@@ -129,6 +215,7 @@ pcache_release(struct pcache* pcache)
     struct pcache_pg *pos, *n;
     llist_for_each(pos, n, &pcache->pages, pg_list)
     {
     struct pcache_pg *pos, *n;
     llist_for_each(pos, n, &pcache->pages, pg_list)
     {

+        lru_remove(pcache_zone, &pos->lru);

         vfree(pos);
     }
 
         vfree(pos);
     }
 


@@ -136,37 +223,42 @@ pcache_release(struct pcache* pcache)
 }
 
 int
 }
 
 int

-pcache_commit(struct v_file* file, struct pcache_pg* page)
+pcache_commit(struct v_inode* inode, struct pcache_pg* page)

 {
     if (!(page->flags & PCACHE_DIRTY)) {
 {
     if (!(page->flags & PCACHE_DIRTY)) {

-        return;
+        return 0;

     }
 
     }
 

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

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

-        file->inode->pg_cache->n_dirty--;
+        inode->pg_cache->n_dirty--;

     }
 
     return errno;
 }
 
 void
     }
 
     return errno;
 }
 
 void

-pcache_commit_all(struct v_file* file)
+pcache_commit_all(struct v_inode* inode)

 {
 {

-    struct pcache* cache = file->inode->pg_cache;
+    if (!inode->pg_cache) {
+        return;
+    }
+
+    struct pcache* cache = inode->pg_cache;

     struct pcache_pg *pos, *n;
     struct pcache_pg *pos, *n;

+

     llist_for_each(pos, n, &cache->dirty, dirty_list)
     {
     llist_for_each(pos, n, &cache->dirty, dirty_list)
     {

-        pcache_commit(file, pos);
+        pcache_commit(inode, pos);

     }
 }
 
 void
     }
 }
 
 void

-pcache_invalidate(struct v_file* file, struct pcache_pg* page)
+pcache_invalidate(struct pcache* pcache, struct pcache_pg* page)

 {
 {

-    pcache_commit(file, page);
-    pcache_release_page(&file->inode->pg_cache, page);
+    pcache_commit(pcache->master, page);
+    pcache_release_page(pcache, page);

 }
\ No newline at end of file
 }
\ No newline at end of file