A Total Overhaul on the Lunaix's Virtual Memory Model (#26)

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

diff --git a/lunaix-os/kernel/block/block.c b/lunaix-os/kernel/block/block.c
index c78cd26a1e522b1679c760c0c69caa2eb0d204f9..8ca511783e958138ff4d7d3dc5a5dca94f70df6c 100644 (file)
--- a/lunaix-os/kernel/block/block.c
+++ b/lunaix-os/kernel/block/block.c
@@ -1,4 +1,4 @@
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>

 #include <klibc/string.h>
 
 #include <hal/ahci/hba.h>
 #include <klibc/string.h>
 
 #include <hal/ahci/hba.h>


@@ -9,7 +9,7 @@
 #include <lunaix/block.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/block.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/mm/cake.h>

-#include <lunaix/mm/page.h>
+#include <lunaix/mm/pagetable.h>

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


@@ -26,7 +26,7 @@ LOG_MODULE("BLOCK")
 static struct cake_pile* lbd_pile;
 static struct block_dev** dev_registry;
 static struct twifs_node* blk_sysroot;
 static struct cake_pile* lbd_pile;
 static struct block_dev** dev_registry;
 static struct twifs_node* blk_sysroot;

-static struct device* blk_parent_dev;
+static struct device_cat* blk_parent_dev;

 
 int free_slot = 0;
 
 
 int free_slot = 0;
 


@@ -47,6 +47,21 @@ block_init()
     blk_parent_dev = device_addcat(NULL, "block");
 }
 
     blk_parent_dev = device_addcat(NULL, "block");
 }
 

+static int
+__block_commit(struct blkio_context* blkio, struct blkio_req* req, int flags)
+{
+    int errno;
+    blkio_commit(blkio, req, flags);
+
+    if ((errno = req->errcode)) {
+        errno = -errno;
+    }
+
+    vbuf_free(req->vbuf);
+    blkio_free_req(req);
+    return errno;
+}
+

 int
 __block_read(struct device* dev, void* buf, size_t offset, size_t len)
 {
 int
 __block_read(struct device* dev, void* buf, size_t offset, size_t len)
 {


@@ -78,21 +93,16 @@ __block_read(struct device* dev, void* buf, size_t offset, size_t len)
     }
 
     req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);
     }
 
     req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);

-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);

 
 

-    if (!(errno = req->errcode)) {
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {

         memcpy(buf, head_buf + r, rd_size);
         errno = len;
         memcpy(buf, head_buf + r, rd_size);
         errno = len;

-    } else {
-        errno = -errno;

     }
 
     if (head_buf) {
         vfree(head_buf);
     }
 
     }
 
     if (head_buf) {
         vfree(head_buf);
     }
 

-    blkio_free_req(req);
-    vbuf_free(vbuf);

     return errno;
 }
 
     return errno;
 }
 


@@ -126,21 +136,16 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len)
     }
 
     req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0);
     }
 
     req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0);

-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);

 
 

-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {

         errno = len;
         errno = len;

-    } else {
-        errno = -errno;

     }
 
     if (tmp_buf) {
         vfree(tmp_buf);
     }
 
     }
 
     if (tmp_buf) {
         vfree(tmp_buf);
     }
 

-    blkio_free_req(req);
-    vbuf_free(vbuf);

     return errno;
 }
 
     return errno;
 }
 


@@ -151,7 +156,7 @@ __block_read_page(struct device* dev, void* buf, size_t offset)
     struct block_dev* bdev = (struct block_dev*)dev->underlay;
 
     u32_t lba = offset / bdev->blk_size + bdev->start_lba;
     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);
+    u32_t rd_lba = MIN(lba + PAGE_SIZE / bdev->blk_size, bdev->end_lba);

 
     if (rd_lba <= lba) {
         return 0;
 
     if (rd_lba <= lba) {
         return 0;


@@ -163,17 +168,11 @@ __block_read_page(struct device* dev, void* buf, size_t offset)
 
     struct blkio_req* req = blkio_vrd(vbuf, lba, NULL, NULL, 0);
 
 
     struct blkio_req* req = blkio_vrd(vbuf, lba, NULL, NULL, 0);
 

-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
-
-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {

         errno = rd_lba * bdev->blk_size;
         errno = rd_lba * bdev->blk_size;

-    } else {
-        errno = -errno;

     }
 
     }
 

-    blkio_free_req(req);
-    vbuf_free(vbuf);

     return errno;
 }
 
     return errno;
 }
 


@@ -184,29 +183,23 @@ __block_write_page(struct device* dev, void* buf, size_t offset)
     struct block_dev* bdev = (struct block_dev*)dev->underlay;
 
     u32_t lba = offset / bdev->blk_size + bdev->start_lba;
     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);
+    u32_t wr_lba = MIN(lba + PAGE_SIZE / bdev->blk_size, bdev->end_lba);

 
 

-    if (rd_lba <= lba) {
+    if (wr_lba <= lba) {

         return 0;
     }
 
         return 0;
     }
 

-    rd_lba -= lba;
+    wr_lba -= lba;

 
 

-    vbuf_alloc(&vbuf, buf, rd_lba * bdev->blk_size);
+    vbuf_alloc(&vbuf, buf, wr_lba * bdev->blk_size);

 
     struct blkio_req* req = blkio_vwr(vbuf, lba, NULL, NULL, 0);
 
 
     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;
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
+        errno = wr_lba * bdev->blk_size;

     }
 
     }
 

-    blkio_free_req(req);
-    vbuf_free(vbuf);

     return errno;
 }
 
     return errno;
 }
 


@@ -217,18 +210,12 @@ __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);
     vbuf_alloc(&vbuf, buf, bdev->blk_size * count);
 
     struct blkio_req* req = blkio_vrd(vbuf, start, NULL, NULL, 0);

-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);

 
 

-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {

         errno = count;
         errno = count;

-    } else {
-        errno = -errno;

     }
 
     }
 

-    blkio_free_req(req);
-    vbuf_free(vbuf);
-

     return errno;
 }
 
     return errno;
 }
 


@@ -239,18 +226,12 @@ __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);
     vbuf_alloc(&vbuf, buf, bdev->blk_size * count);
 
     struct blkio_req* req = blkio_vwr(vbuf, start, NULL, NULL, 0);

-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);

 
 

-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {

         errno = count;
         errno = count;

-    } else {
-        errno = -errno;

     }
 
     }
 

-    blkio_free_req(req);
-    vbuf_free(vbuf);
-

     return errno;
 }
 
     return errno;
 }
 


@@ -295,7 +276,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
 
     errno = blkpart_probegpt(bdev->dev);
     if (errno < 0) {
 
     errno = blkpart_probegpt(bdev->dev);
     if (errno < 0) {

-        kprintf(KERROR "Fail to parse partition table (%d)\n", errno);
+        ERROR("Fail to parse partition table (%d)", errno);

     } else if (!errno) {
         // TODO try other PT parser...
     }
     } else if (!errno) {
         // TODO try other PT parser...
     }


@@ -307,7 +288,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
     return errno;
 
 error:
     return errno;
 
 error:

-    kprintf(KERROR "Fail to mount block device: %s (%x)\n", bdev->name, -errno);
+    ERROR("Fail to mount block device: %s (%x)", bdev->name, -errno);

     return errno;
 }
 
     return errno;
 }
 


@@ -318,7 +299,7 @@ __block_register(struct block_dev* bdev)
         return 0;
     }
 
         return 0;
     }
 

-    struct device* dev = device_allocvol(blk_parent_dev, bdev);
+    struct device* dev = device_allocvol(dev_meta(blk_parent_dev), bdev);

     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;
     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;


@@ -326,7 +307,7 @@ __block_register(struct block_dev* bdev)
 
     bdev->dev = dev;
 
 
     bdev->dev = dev;
 

-    device_register(dev, bdev->class, "sd%c", 'a' + free_slot);
+    register_device(dev, bdev->class, "sd%c", 'a' + free_slot);

     dev_registry[free_slot++] = bdev;
 
     strcpy(bdev->bdev_id, dev->name_val);
     dev_registry[free_slot++] = bdev;
 
     strcpy(bdev->bdev_id, dev->name_val);


@@ -361,7 +342,7 @@ blk_mount_part(struct block_dev* bdev,
 
     llist_append(&bdev->parts, &pbdev->parts);
 
 
     llist_append(&bdev->parts, &pbdev->parts);
 

-    device_register(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1);
+    register_device(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1);

 
     return pbdev;
 }
\ No newline at end of file
 
     return pbdev;
 }
\ No newline at end of file