feat: (iso9660) implement file read (for both interleaved and non-interleaved mode)

[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 216c0ef79a1eb7ea3e1be549c3dbc1646701dcb5..6203fc71a6862891000457bc64ddecce559f7bea 100644 (file)
--- a/lunaix-os/kernel/block/block.c
+++ b/lunaix-os/kernel/block/block.c
@@ -55,39 +55,36 @@ __block_read(struct device* dev, void* buf, size_t offset, size_t len)
         return 0;
     }
 
         return 0;
     }
 

-    struct vecbuf* vbuf = vbuf_alloc(NULL, buf, len);
+    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 = bsize;
-        vbuf->buf.buffer = tmp_buf;
+        vbuf_alloc(&vbuf, head_buf, bsize);
+    }

 
 

-        if ((len - rd_size)) {
-            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);
-
-    pwait(&req->wait);
-
-    // XXX temporary work-around
-    //      in case pwait used in proc0. Need a dummy process!
-    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;
     }
 
         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);


@@ -99,35 +96,33 @@ 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 + bdev->start_lba,
-           r = offset % bsize;
+    size_t bsize = bdev->blk_size, wr_block = offset / bsize + bdev->start_lba,
+           r = offset % bsize, wr_size = 0;

 
 

-    if (!(len = MIN(len, ((size_t)bdev->end_lba - rd_block + 1) * bsize))) {
+    if (!(len = MIN(len, ((size_t)bdev->end_lba - wr_block + 1) * bsize))) {

         return 0;
     }
 
         return 0;
     }
 

-    struct vecbuf* vbuf = vbuf_alloc(NULL, buf, len);
+    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, rd_size);
-        vbuf_alloc(vbuf, buf + rd_size, len - rd_size);
+        memcpy(tmp_buf + r, buf, wr_size);

     }
 
     }
 

-    req = blkio_vwr(vbuf, rd_block, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req);
-
-    pwait(&req->wait);
+    if ((len - wr_size)) {
+        size_t llen = len - wr_size;
+        assert_msg(!(llen % bsize), "misalign block write");
+        vbuf_alloc(&vbuf, buf + wr_size, llen);
+    }

 
 

-    // XXX temporary work-around
-    //      in case pwait used in proc0. Need a dummy process!
-    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;
     if (!errno) {
 
     int errno = req->errcode;
     if (!errno) {


@@ -145,6 +140,62 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len)
     return errno;
 }
 
     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*
 block_alloc_dev(const char* blk_id, void* driver, req_handler ioreq_handler)
 {


@@ -156,6 +207,8 @@ block_alloc_dev(const char* blk_id, void* driver, req_handler ioreq_handler)
     bdev->blkio = blkio_newctx(ioreq_handler);
     bdev->driver = driver;
     bdev->blkio->driver = driver;
     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;
 }


@@ -172,7 +225,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 "Corrupted partition table. (%d)", errno);
+        kprintf(KERROR "Fail to parse partition table (%d)\n", errno);

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