feat: kprintf now goes into dedicated pseudo-dev rather than flooding the framebuffer

[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 e25cf42ad3d0593c0365cf84a496749229a0a2e9..3f3c1e8ab647905375a0efb1acec730a8fbdbc98 100644 (file)
--- a/lunaix-os/kernel/block/block.c
+++ b/lunaix-os/kernel/block/block.c
@@ -1,14 +1,18 @@
-#include <hal/ahci/hba.h>
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>

 #include <klibc/string.h>
 #include <klibc/string.h>

+
+#include <hal/ahci/hba.h>
+

 #include <lib/crc.h>
 #include <lib/crc.h>

+
+#include <lunaix/blkpart_gpt.h>

 #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/valloc.h>
 #include <lunaix/mm/valloc.h>

-#include <lunaix/syslog.h>
-

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

+#include <lunaix/syslog.h>

 
 #define BLOCK_EREAD 1
 #define BLOCK_ESIG 2
 
 #define BLOCK_EREAD 1
 #define BLOCK_ESIG 2


@@ -22,6 +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;

 
 int free_slot = 0;
 
 
 int free_slot = 0;
 


@@ -34,10 +39,12 @@ __block_register(struct block_dev* dev);
 void
 block_init()
 {
 void
 block_init()
 {

+    blkio_init();

     lbd_pile = cake_new_pile("block_dev", sizeof(struct block_dev), 1, 0);
     dev_registry = vcalloc(sizeof(struct block_dev*), MAX_DEV);
     free_slot = 0;
     blk_sysroot = twifs_dir_node(NULL, "block");
     lbd_pile = cake_new_pile("block_dev", sizeof(struct block_dev), 1, 0);
     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
 }
 
 int


@@ -45,32 +52,43 @@ __block_read(struct device* dev, void* buf, size_t offset, size_t len)
 {
     int errno;
     struct block_dev* bdev = (struct block_dev*)dev->underlay;
 {
     int errno;
     struct block_dev* bdev = (struct block_dev*)dev->underlay;

-    size_t bsize = bdev->blk_size, rd_block = offset / bsize,
+    size_t bsize = bdev->blk_size, rd_block = offset / bsize + bdev->start_lba,

            r = offset % bsize, rd_size = 0;
 
            r = offset % bsize, rd_size = 0;
 

-    struct vecbuf* vbuf = vbuf_alloc(NULL, buf, len);
+    if (!(len = MIN(len, ((size_t)bdev->end_lba - rd_block + 1) * bsize))) {
+        return 0;
+    }
+
+    struct vecbuf* vbuf = NULL;

     struct blkio_req* req;
     struct blkio_req* req;

-    void* tmp_buf = NULL;
+    void *head_buf = NULL, *tail_buf = NULL;

 
 

-    if (r) {
-        tmp_buf = vzalloc(bsize);
+    // align the boundary
+    if (r || len < bsize) {
+        head_buf = valloc(bsize);

         rd_size = MIN(len, bsize - r);
         rd_size = MIN(len, bsize - r);

-        vbuf->buf.size = rd_size;
-        vbuf->buf.buffer = tmp_buf;
+        vbuf_alloc(&vbuf, head_buf, bsize);
+    }

 
 

-        vbuf_alloc(vbuf, buf + rd_size, len - rd_size);
+    // align the length
+    if ((len - rd_size)) {
+        size_t llen = len - rd_size;
+        assert_msg(!(llen % bsize), "misalign block read");
+        vbuf_alloc(&vbuf, buf + rd_size, llen);

     }
 
     req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);
     }
 
     req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);

-    blkio_commit(bdev->blkio, req);
-    wait_if(req->flags & BLKIO_PENDING);
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);

 
     if (!(errno = req->errcode)) {
 
     if (!(errno = req->errcode)) {

-        memcpy(buf, tmp_buf + r, rd_size);
+        memcpy(buf, head_buf + r, rd_size);
+        errno = len;
+    } else {
+        errno = -errno;

     }
 
     }
 

-    if (tmp_buf) {
-        vfree(tmp_buf);
+    if (head_buf) {
+        vfree(head_buf);

     }
 
     blkio_free_req(req);
     }
 
     blkio_free_req(req);


@@ -82,28 +100,40 @@ int
 __block_write(struct device* dev, void* buf, size_t offset, size_t len)
 {
     struct block_dev* bdev = (struct block_dev*)dev->underlay;
 __block_write(struct device* dev, void* buf, size_t offset, size_t len)
 {
     struct block_dev* bdev = (struct block_dev*)dev->underlay;

-    size_t bsize = bdev->blk_size, rd_block = offset / bsize,
-           r = offset % bsize;
+    size_t bsize = bdev->blk_size, wr_block = offset / bsize + bdev->start_lba,
+           r = offset % bsize, wr_size = 0;

 
 

-    struct vecbuf* vbuf = vbuf_alloc(NULL, buf, len);
+    if (!(len = MIN(len, ((size_t)bdev->end_lba - wr_block + 1) * bsize))) {
+        return 0;
+    }
+
+    struct vecbuf* vbuf = NULL;

     struct blkio_req* req;
     void* tmp_buf = NULL;
 
     if (r) {
     struct blkio_req* req;
     void* tmp_buf = NULL;
 
     if (r) {

-        size_t rd_size = MIN(len, bsize - r);
+        size_t wr_size = MIN(len, bsize - r);

         tmp_buf = vzalloc(bsize);
         tmp_buf = vzalloc(bsize);

-        vbuf->buf.size = bsize;
-        vbuf->buf.buffer = tmp_buf;
+        vbuf_alloc(&vbuf, tmp_buf, bsize);
+
+        memcpy(tmp_buf + r, buf, wr_size);
+    }

 
 

-        memcpy(tmp_buf + r, buf, rd_size);
-        vbuf_alloc(vbuf, buf + rd_size, len - rd_size);
+    if ((len - wr_size)) {
+        size_t llen = len - wr_size;
+        assert_msg(!(llen % bsize), "misalign block write");
+        vbuf_alloc(&vbuf, buf + wr_size, llen);

     }
 
     }
 

-    req = blkio_vwr(vbuf, rd_block, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req);
-    wait_if(req->flags & BLKIO_PENDING);
+    req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0);
+    blkio_commit(bdev->blkio, req, BLKIO_WAIT);

 
     int errno = req->errcode;
 
     int errno = req->errcode;

+    if (!errno) {
+        errno = len;
+    } else {
+        errno = -errno;
+    }

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


@@ -114,15 +144,141 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len)
     return errno;
 }
 
     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)
+{
+    struct vecbuf* vbuf = NULL;
+    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) {
+        errno = count;
+    } else {
+        errno = -errno;
+    }
+
+    blkio_free_req(req);
+    vbuf_free(vbuf);
+
+    return errno;
+}
+
+int
+__block_wr_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
+{
+    struct vecbuf* vbuf = NULL;
+    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) {
+        errno = count;
+    } else {
+        errno = -errno;
+    }
+
+    blkio_free_req(req);
+    vbuf_free(vbuf);
+
+    return errno;
+}
+
+void*
+block_alloc_buf(struct block_dev* bdev)
+{
+    return valloc(bdev->blk_size);
+}
+
+void
+block_free_buf(struct block_dev* bdev, void* buf)
+{
+    return vfree(buf);
+}
+

 struct block_dev*
 block_alloc_dev(const char* blk_id, void* driver, req_handler ioreq_handler)
 {
     struct block_dev* bdev = cake_grab(lbd_pile);
 struct block_dev*
 block_alloc_dev(const char* blk_id, void* driver, req_handler ioreq_handler)
 {
     struct block_dev* bdev = cake_grab(lbd_pile);

-    *bdev = (struct block_dev){ .driver = driver };
-
+    memset(bdev, 0, sizeof(struct block_dev));
+    llist_init_head(&bdev->parts);

     strncpy(bdev->name, blk_id, PARTITION_NAME_SIZE);
 
     bdev->blkio = blkio_newctx(ioreq_handler);
     strncpy(bdev->name, blk_id, PARTITION_NAME_SIZE);
 
     bdev->blkio = blkio_newctx(ioreq_handler);

+    bdev->driver = driver;
+    bdev->blkio->driver = driver;
+    bdev->ops = (struct block_dev_ops){ .block_read = __block_rd_lb,
+                                        .block_write = __block_wr_lb };

 
     return bdev;
 }
 
     return bdev;
 }


@@ -137,6 +293,13 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
         goto error;
     }
 
         goto error;
     }
 

+    errno = blkpart_probegpt(bdev->dev);
+    if (errno < 0) {
+        kprintf(KERROR "Fail to parse partition table (%d)", errno);
+    } else if (!errno) {
+        // TODO try other PT parser...
+    }
+

     struct twifs_node* dev_root = twifs_dir_node(blk_sysroot, bdev->bdev_id);
     blk_set_blkmapping(bdev, dev_root);
     fs_export(bdev, dev_root);
     struct twifs_node* dev_root = twifs_dir_node(blk_sysroot, bdev->bdev_id);
     blk_set_blkmapping(bdev, dev_root);
     fs_export(bdev, dev_root);


@@ -144,7 +307,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);
+    kprintf(KERROR "Fail to mount block device: %s (%x)", bdev->name, -errno);

     return errno;
 }
 
     return errno;
 }
 


@@ -155,12 +318,50 @@ __block_register(struct block_dev* bdev)
         return 0;
     }
 
         return 0;
     }
 

-    struct device* dev = device_addvol(NULL, bdev, "sd%c", 'a' + free_slot);
-    dev->write = __block_write;
-    dev->read = __block_read;
+    struct device* dev = device_allocvol(blk_parent_dev, bdev);
+    dev->ops.write = __block_write;
+    dev->ops.write_page = __block_write_page;
+    dev->ops.read = __block_read;
+    dev->ops.read_page = __block_read_page;

 
     bdev->dev = dev;
 
     bdev->dev = dev;

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

     dev_registry[free_slot++] = bdev;
     dev_registry[free_slot++] = bdev;

+
+    strcpy(bdev->bdev_id, dev->name_val);
+

     return 1;
     return 1;

+}
+
+struct block_dev*
+blk_mount_part(struct block_dev* bdev,
+               const char* name,
+               size_t index,
+               u64_t start_lba,
+               u64_t end_lba)
+{
+    struct block_dev* pbdev = cake_grab(lbd_pile);
+    memcpy(pbdev, bdev, sizeof(*bdev));
+
+    struct device* dev = device_allocvol(NULL, pbdev);
+    dev->ops.write = __block_write;
+    dev->ops.write_page = __block_write_page;
+    dev->ops.read = __block_read;
+    dev->ops.read_page = __block_read_page;
+
+    pbdev->start_lba = start_lba;
+    pbdev->end_lba = end_lba;
+    pbdev->dev = dev;
+
+    strcpy(pbdev->bdev_id, dev->name_val);
+    if (name) {
+        strncpy(pbdev->name, name, PARTITION_NAME_SIZE);
+    }
+
+    llist_append(&bdev->parts, &pbdev->parts);
+
+    device_register(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1);
+
+    return pbdev;

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