dedicated kthread interface and enablement of lrud auto-recycler

[lunaix-os.git] / lunaix-os / kernel / block / blkbuf.c

diff --git a/lunaix-os/kernel/block/blkbuf.c b/lunaix-os/kernel/block/blkbuf.c
index 862a48e9c019c2491793b20cf4896a9d979340b7..f72aea70053f3de30017b87d84dbd71a7118bf3f 100644 (file)
--- a/lunaix-os/kernel/block/blkbuf.c
+++ b/lunaix-os/kernel/block/blkbuf.c
@@ -5,7 +5,9 @@
 #include <lunaix/syslog.h>
 #include <asm/muldiv64.h>
 
 #include <lunaix/syslog.h>
 #include <asm/muldiv64.h>
 

-LOG_MODULE("blkbuf")  
+LOG_MODULE("blkbuf")
+
+#define MAX_DIRTY_COUNT     16

 
 #define bb_cache_obj(bcache) \
             container_of(bcache, struct blkbuf_cache, cached)
 
 #define bb_cache_obj(bcache) \
             container_of(bcache, struct blkbuf_cache, cached)


@@ -22,6 +24,18 @@ __tolba(struct blkbuf_cache* cache, unsigned int blk_id)
                     cache->blkdev->blk_size);
 }
 
                     cache->blkdev->blk_size);
 }
 

+static inline void
+__blkbuf_lock(struct blk_buf* buf)
+{
+    mutex_lock(&buf->lock);
+}
+
+static inline void
+__blkbuf_unlock(struct blk_buf* buf)
+{
+    mutex_unlock(&buf->lock);
+}
+

 static void
 __blkbuf_do_sync(struct bcache* bc, unsigned long tag, void* data)
 {
 static void
 __blkbuf_do_sync(struct bcache* bc, unsigned long tag, void* data)
 {


@@ -105,6 +119,7 @@ __blkbuf_take_slow_lockness(struct blkbuf_cache* bc, unsigned int block_id)
 
     // give dirty a know state
     llist_init_head(&buf->dirty);
 
     // give dirty a know state
     llist_init_head(&buf->dirty);

+    mutex_init(&buf->lock);

 
     blkio_setread(req);
     blkio_bindctx(req, bc->blkdev->blkio);
 
     blkio_setread(req);
     blkio_bindctx(req, bc->blkdev->blkio);


@@ -169,6 +184,21 @@ blkbuf_put(bbuf_t buf)
     bcache_return(bbuf->cobj);
 }
 
     bcache_return(bbuf->cobj);
 }
 

+
+static void
+__schedule_sync_nolock(struct blk_buf* bbuf, bool wait)
+{
+    struct blkio_req* blkio;
+
+    blkio = bbuf->breq;
+
+    blkio_setwrite(blkio);
+    blkio_commit(blkio, wait ? BLKIO_WAIT : BLKIO_NOWAIT);
+
+    llist_delete(&bbuf->dirty);
+    bbuf->dirty_count = 0;
+}
+

 void
 blkbuf_dirty(bbuf_t buf)
 {
 void
 blkbuf_dirty(bbuf_t buf)
 {


@@ -180,26 +210,21 @@ blkbuf_dirty(bbuf_t buf)
     bbuf = ((struct blk_buf*)buf);
     bc = bcache_holder_embed(bbuf->cobj, struct blkbuf_cache, cached);
     
     bbuf = ((struct blk_buf*)buf);
     bc = bcache_holder_embed(bbuf->cobj, struct blkbuf_cache, cached);
     

-    mutex_lock(&bc->lock);
+    __blkbuf_lock(bbuf);

     
     

-    if (llist_empty(&bbuf->dirty)) {
+    if (llist_empty(&bbuf->dirty)) 
+    {
+        mutex_lock(&bc->lock);

         llist_append(&bc->dirty, &bbuf->dirty);
         llist_append(&bc->dirty, &bbuf->dirty);

+        mutex_unlock(&bc->lock);

     }
 
     }
 

-    mutex_unlock(&bc->lock);
-}
-
-static inline void
-__schedule_sync_event(struct blk_buf* bbuf, bool wait)
-{
-    struct blkio_req* blkio;
-
-    blkio = bbuf->breq;
-
-    blkio_setwrite(blkio);
-    blkio_commit(blkio, wait ? BLKIO_WAIT : BLKIO_NOWAIT);
+    bbuf->dirty_count++;
+    if (bbuf->dirty_count >= MAX_DIRTY_COUNT) {
+        __schedule_sync_nolock(bbuf, false);
+    }

 
 

-    llist_delete(&bbuf->dirty);
+    __blkbuf_unlock(bbuf);

 }
 
 void
 }
 
 void


@@ -208,7 +233,9 @@ blkbuf_schedule_sync(bbuf_t buf)
     struct blk_buf* bbuf;
     bbuf = to_blkbuf(buf);
 
     struct blk_buf* bbuf;
     bbuf = to_blkbuf(buf);
 

-    __schedule_sync_event(bbuf, false);
+    __blkbuf_lock(bbuf);
+    __schedule_sync_nolock(bbuf, false);
+    __blkbuf_unlock(bbuf);

 }
 
 bool
 }
 
 bool


@@ -218,8 +245,11 @@ blkbuf_syncall(struct blkbuf_cache* bc, bool async)
 
     mutex_lock(&bc->lock);
 
 
     mutex_lock(&bc->lock);
 

-    llist_for_each(pos, n, &bc->dirty, dirty) {
-        __schedule_sync_event(pos, !async);
+    llist_for_each(pos, n, &bc->dirty, dirty) 
+    {
+        __blkbuf_lock(pos);
+        __schedule_sync_nolock(pos, !async);
+        __blkbuf_unlock(pos);

     }
 
     mutex_unlock(&bc->lock);
     }
 
     mutex_unlock(&bc->lock);


@@ -244,4 +274,4 @@ __init_blkbuf()
     bb_zone = bcache_create_zone("blk_buf");
     bb_pile = cake_new_pile("blk_buf", sizeof(struct blk_buf), 1, 0);
 }
     bb_zone = bcache_create_zone("blk_buf");
     bb_pile = cake_new_pile("blk_buf", sizeof(struct blk_buf), 1, 0);
 }

-owloysius_fetch_init(__init_blkbuf, on_earlyboot)
\ No newline at end of file
+owloysius_fetch_init(__init_blkbuf, on_sysconf)
\ No newline at end of file