X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/df1e857ac4d1410ae2bd354e361210b842ab7bc8..69777bdcab284335651a8002e2896f3862fa423d:/lunaix-os/kernel/block/block.c?ds=inline diff --git a/lunaix-os/kernel/block/block.c b/lunaix-os/kernel/block/block.c index bcbc60f..8ca5117 100644 --- a/lunaix-os/kernel/block/block.c +++ b/lunaix-os/kernel/block/block.c @@ -1,16 +1,18 @@ -#include -#include +#include #include + +#include + #include + +#include #include #include #include +#include #include -#include - -#include - #include +#include #define BLOCK_EREAD 1 #define BLOCK_ESIG 2 @@ -24,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 device_cat* blk_parent_dev; int free_slot = 0; @@ -41,6 +44,22 @@ 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"); +} + +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 @@ -74,23 +93,16 @@ __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); - if (!(errno = req->errcode)) { + if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) { memcpy(buf, head_buf + r, rd_size); errno = len; - } else { - errno = -errno; } if (head_buf) { vfree(head_buf); } - blkio_free_req(req); - vbuf_free(vbuf); return errno; } @@ -98,10 +110,10 @@ int __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, + 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; } @@ -123,27 +135,118 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len) vbuf_alloc(&vbuf, buf + wr_size, llen); } - req = blkio_vwr(vbuf, rd_block, NULL, NULL, 0); - blkio_commit(bdev->blkio, req); + req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0); - pwait(&req->wait); - - int errno = req->errcode; - if (!errno) { + int errno; + if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) { errno = len; - } else { - errno = -errno; } if (tmp_buf) { vfree(tmp_buf); } - blkio_free_req(req); - vbuf_free(vbuf); 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 + PAGE_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); + + int errno; + if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) { + errno = rd_lba * bdev->blk_size; + } + + 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 wr_lba = MIN(lba + PAGE_SIZE / bdev->blk_size, bdev->end_lba); + + if (wr_lba <= lba) { + return 0; + } + + wr_lba -= lba; + + vbuf_alloc(&vbuf, buf, wr_lba * bdev->blk_size); + + struct blkio_req* req = blkio_vwr(vbuf, lba, NULL, NULL, 0); + + int errno; + if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) { + errno = wr_lba * bdev->blk_size; + } + + 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); + + int errno; + if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) { + errno = count; + } + + 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); + + int errno; + if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) { + errno = count; + } + + 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) { @@ -155,6 +258,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->ops = (struct block_dev_ops){ .block_read = __block_rd_lb, + .block_write = __block_wr_lb }; return bdev; } @@ -171,7 +276,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export) 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... } @@ -183,7 +288,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export) 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; } @@ -194,13 +299,19 @@ __block_register(struct block_dev* bdev) 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(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.read_page = __block_read_page; bdev->dev = dev; - strcpy(bdev->bdev_id, dev->name_val); + + register_device(dev, bdev->class, "sd%c", 'a' + free_slot); dev_registry[free_slot++] = bdev; + + strcpy(bdev->bdev_id, dev->name_val); + return 1; } @@ -214,10 +325,11 @@ blk_mount_part(struct block_dev* bdev, struct block_dev* pbdev = cake_grab(lbd_pile); memcpy(pbdev, bdev, sizeof(*bdev)); - struct device* dev = - device_addvol(NULL, pbdev, "%sp%d", bdev->bdev_id, index + 1); - dev->write = __block_write; - dev->read = __block_read; + 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; @@ -230,5 +342,7 @@ blk_mount_part(struct block_dev* bdev, llist_append(&bdev->parts, &pbdev->parts); + register_device(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1); + return pbdev; } \ No newline at end of file