X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/c6de44b989e9d7286337e4cbf4d82d919f9120e6..b6ff3c7dbab3f40d03389808d95ac27d416c35e3:/lunaix-os/kernel/block/block.c

diff --git a/lunaix-os/kernel/block/block.c b/lunaix-os/kernel/block/block.c
index 494a977..f699169 100644
--- a/lunaix-os/kernel/block/block.c
+++ b/lunaix-os/kernel/block/block.c
@@ -24,6 +24,7 @@ LOG_MODULE("BLOCK")
 static struct cake_pile* lbd_pile;
 static struct block_dev** dev_registry;
 static struct twifs_node* blk_sysroot;
+static struct device* blk_parent_dev;
 
 int free_slot = 0;
 
@@ -41,6 +42,7 @@ block_init()
     dev_registry = vcalloc(sizeof(struct block_dev*), MAX_DEV);
     free_slot = 0;
     blk_sysroot = twifs_dir_node(NULL, "block");
+    blk_parent_dev = device_addcat(NULL, "block");
 }
 
 int
@@ -74,9 +76,7 @@ __block_read(struct device* dev, void* buf, size_t offset, size_t len)
     }
 
     req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req);
-
-    pwait(&req->wait);
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
     if (!(errno = req->errcode)) {
         memcpy(buf, head_buf + r, rd_size);
@@ -123,13 +123,8 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len)
         vbuf_alloc(&vbuf, buf + wr_size, llen);
     }
 
-    // FIXME race condition between blkio_commit and pwait.
-    //  Consider: what if scheduler complete the request before process enter
-    //  wait state?
     req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req);
-
-    pwait(&req->wait);
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
     int errno = req->errcode;
     if (!errno) {
@@ -147,6 +142,72 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len)
     return errno;
 }
 
+int
+__block_read_page(struct device* dev, void* buf, size_t offset)
+{
+    struct vecbuf* vbuf = NULL;
+    struct block_dev* bdev = (struct block_dev*)dev->underlay;
+
+    u32_t lba = offset / bdev->blk_size + bdev->start_lba;
+    u32_t rd_lba = MIN(lba + PG_SIZE / bdev->blk_size, bdev->end_lba);
+
+    if (rd_lba <= lba) {
+        return 0;
+    }
+
+    rd_lba -= lba;
+
+    vbuf_alloc(&vbuf, buf, rd_lba * bdev->blk_size);
+
+    struct blkio_req* req = blkio_vrd(vbuf, lba, NULL, NULL, 0);
+
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
+
+    int errno = req->errcode;
+    if (!errno) {
+        errno = rd_lba * bdev->blk_size;
+    } else {
+        errno = -errno;
+    }
+
+    blkio_free_req(req);
+    vbuf_free(vbuf);
+    return errno;
+}
+
+int
+__block_write_page(struct device* dev, void* buf, size_t offset)
+{
+    struct vecbuf* vbuf = NULL;
+    struct block_dev* bdev = (struct block_dev*)dev->underlay;
+
+    u32_t lba = offset / bdev->blk_size + bdev->start_lba;
+    u32_t rd_lba = MIN(lba + PG_SIZE / bdev->blk_size, bdev->end_lba);
+
+    if (rd_lba <= lba) {
+        return 0;
+    }
+
+    rd_lba -= lba;
+
+    vbuf_alloc(&vbuf, buf, rd_lba * bdev->blk_size);
+
+    struct blkio_req* req = blkio_vwr(vbuf, lba, NULL, NULL, 0);
+
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
+
+    int errno = req->errcode;
+    if (!errno) {
+        errno = rd_lba * bdev->blk_size;
+    } else {
+        errno = -errno;
+    }
+
+    blkio_free_req(req);
+    vbuf_free(vbuf);
+    return errno;
+}
+
 int
 __block_rd_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
 {
@@ -154,8 +215,7 @@ __block_rd_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
     vbuf_alloc(&vbuf, buf, bdev->blk_size * count);
 
     struct blkio_req* req = blkio_vrd(vbuf, start, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req);
-    pwait(&req->wait);
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
     int errno = req->errcode;
     if (!errno) {
@@ -177,8 +237,7 @@ __block_wr_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
     vbuf_alloc(&vbuf, buf, bdev->blk_size * count);
 
     struct blkio_req* req = blkio_vwr(vbuf, start, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req);
-    pwait(&req->wait);
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
     int errno = req->errcode;
     if (!errno) {
@@ -257,9 +316,12 @@ __block_register(struct block_dev* bdev)
         return 0;
     }
 
-    struct device* dev = device_addvol(NULL, bdev, "sd%c", 'a' + free_slot);
+    struct device* dev =
+      device_addvol(blk_parent_dev, bdev, "sd%c", 'a' + free_slot);
     dev->write = __block_write;
+    dev->write_page = __block_write_page;
     dev->read = __block_read;
+    dev->read_page = __block_read_page;
 
     bdev->dev = dev;
     strcpy(bdev->bdev_id, dev->name_val);
@@ -280,7 +342,9 @@ blk_mount_part(struct block_dev* bdev,
     struct device* dev =
       device_addvol(NULL, pbdev, "%sp%d", bdev->bdev_id, index + 1);
     dev->write = __block_write;
+    dev->write_page = __block_write_page;
     dev->read = __block_read;
+    dev->read_page = __block_read_page;
 
     pbdev->start_lba = start_lba;
     pbdev->end_lba = end_lba;