X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/270869139db617e29a35bb9ded41087bb702f9ac..refs/heads/cor/lrud:/lunaix-os/kernel/block/blkbuf.c

diff --git a/lunaix-os/kernel/block/blkbuf.c b/lunaix-os/kernel/block/blkbuf.c
index 4f255c9..f72aea7 100644
--- a/lunaix-os/kernel/block/blkbuf.c
+++ b/lunaix-os/kernel/block/blkbuf.c
@@ -3,8 +3,11 @@
 #include <lunaix/mm/valloc.h>
 #include <lunaix/owloysius.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)
@@ -17,7 +20,20 @@ static struct cake_pile* bb_pile;
 static inline u64_t
 __tolba(struct blkbuf_cache* cache, unsigned int blk_id)
 {
-    return ((u64_t)cache->blksize * (u64_t)blk_id) / cache->blkdev->blk_size;
+    return udiv64(((u64_t)cache->blksize * (u64_t)blk_id), 
+                    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
@@ -103,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);
+    mutex_init(&buf->lock);
 
     blkio_setread(req);
     blkio_bindctx(req, bc->blkdev->blkio);
@@ -167,6 +184,21 @@ blkbuf_put(bbuf_t buf)
     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)
 {
@@ -178,26 +210,21 @@ blkbuf_dirty(bbuf_t buf)
     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);
+        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
@@ -206,7 +233,9 @@ blkbuf_schedule_sync(bbuf_t 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
@@ -216,8 +245,11 @@ blkbuf_syncall(struct blkbuf_cache* bc, bool async)
 
     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);
@@ -242,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);
 }
-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