]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - linux/blkdev.c
Update bcachefs sources to dfaf9a6ee2 lib/printbuf: Clean up headers
[bcachefs-tools-debian] / linux / blkdev.c
index 219f888e8a22ea1094903bd0284845db293a88ca..9b3ea93f8c19aecdaa0a6c9bb3e12eda2def00bf 100644 (file)
@@ -10,7 +10,9 @@
 
 #include <libaio.h>
 
+#ifdef CONFIG_VALGRIND
 #include <valgrind/memcheck.h>
+#endif
 
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 
 #include "tools-util.h"
 
+struct fops {
+       void (*init)(void);
+       void (*cleanup)(void);
+       void (*read)(struct bio *bio, struct iovec * iov, unsigned i);
+       void (*write)(struct bio *bio, struct iovec * iov, unsigned i);
+};
+
+static struct fops *fops;
 static io_context_t aio_ctx;
 static atomic_t running_requests;
 
@@ -57,40 +67,19 @@ void generic_make_request(struct bio *bio)
                        .iov_len = len,
                };
 
+#ifdef CONFIG_VALGRIND
                /* To be pedantic it should only be on IO completion. */
                if (bio_op(bio) == REQ_OP_READ)
                        VALGRIND_MAKE_MEM_DEFINED(start, len);
+#endif
        }
 
-       struct iocb iocb = {
-               .data           = bio,
-               .aio_fildes     = bio->bi_opf & REQ_FUA
-                       ? bio->bi_bdev->bd_sync_fd
-                       : bio->bi_bdev->bd_fd,
-       }, *iocbp = &iocb;
-
        switch (bio_op(bio)) {
        case REQ_OP_READ:
-               iocb.aio_lio_opcode     = IO_CMD_PREADV;
-               iocb.u.v.vec            = iov;
-               iocb.u.v.nr             = i;
-               iocb.u.v.offset         = bio->bi_iter.bi_sector << 9;
-
-               atomic_inc(&running_requests);
-               ret = io_submit(aio_ctx, 1, &iocbp);
-               if (ret != 1)
-                       die("io_submit err: %s", strerror(-ret));
+               fops->read(bio, iov, i);
                break;
        case REQ_OP_WRITE:
-               iocb.aio_lio_opcode     = IO_CMD_PWRITEV;
-               iocb.u.v.vec            = iov;
-               iocb.u.v.nr             = i;
-               iocb.u.v.offset         = bio->bi_iter.bi_sector << 9;
-
-               atomic_inc(&running_requests);
-               ret = io_submit(aio_ctx, 1, &iocbp);
-               if (ret != 1)
-                       die("io_submit err: %s", strerror(-ret));
+               fops->write(bio, iov, i);
                break;
        case REQ_OP_FLUSH:
                ret = fsync(bio->bi_bdev->bd_fd);
@@ -124,7 +113,7 @@ int submit_bio_wait(struct bio *bio)
 
 int blkdev_issue_discard(struct block_device *bdev,
                         sector_t sector, sector_t nr_sects,
-                        gfp_t gfp_mask, unsigned long flags)
+                        gfp_t gfp_mask)
 {
        return 0;
 }
@@ -139,12 +128,10 @@ unsigned bdev_logical_block_size(struct block_device *bdev)
        BUG_ON(ret);
 
        if (!S_ISBLK(statbuf.st_mode))
-               return statbuf.st_blksize >> 9;
+               return statbuf.st_blksize;
 
-       ret = ioctl(bdev->bd_fd, BLKPBSZGET, &blksize);
-       BUG_ON(ret);
-
-       return blksize >> 9;
+       xioctl(bdev->bd_fd, BLKPBSZGET, &blksize);
+       return blksize;
 }
 
 sector_t get_capacity(struct gendisk *disk)
@@ -179,7 +166,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
                                        void *holder)
 {
        struct block_device *bdev;
-       int fd, sync_fd, flags = O_DIRECT;
+       int fd, sync_fd, buffered_fd, flags = 0;
 
        if ((mode & (FMODE_READ|FMODE_WRITE)) == (FMODE_READ|FMODE_WRITE))
                flags = O_RDWR;
@@ -194,16 +181,12 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
                flags |= O_EXCL;
 #endif
 
-       fd = open(path, flags);
+       fd = open(path, flags|O_DIRECT);
        if (fd < 0)
                return ERR_PTR(-errno);
 
-       sync_fd = open(path, flags|O_SYNC);
-       if (sync_fd < 0) {
-               assert(0);
-               close(fd);
-               return ERR_PTR(-errno);
-       }
+       sync_fd = xopen(path, flags|O_DIRECT|O_SYNC);
+       buffered_fd = xopen(path, flags);
 
        bdev = malloc(sizeof(*bdev));
        memset(bdev, 0, sizeof(*bdev));
@@ -211,12 +194,14 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
        strncpy(bdev->name, path, sizeof(bdev->name));
        bdev->name[sizeof(bdev->name) - 1] = '\0';
 
+       bdev->bd_dev            = xfstat(fd).st_rdev;
        bdev->bd_fd             = fd;
        bdev->bd_sync_fd        = sync_fd;
+       bdev->bd_buffered_fd    = buffered_fd;
        bdev->bd_holder         = holder;
        bdev->bd_disk           = &bdev->__bd_disk;
-       bdev->bd_bdi            = &bdev->__bd_bdi;
-       bdev->queue.backing_dev_info = bdev->bd_bdi;
+       bdev->bd_disk->bdi      = &bdev->bd_disk->__bdi;
+       bdev->queue.backing_dev_info = bdev->bd_disk->bdi;
 
        return bdev;
 }
@@ -226,9 +211,58 @@ void bdput(struct block_device *bdev)
        BUG();
 }
 
-struct block_device *lookup_bdev(const char *path)
+int lookup_bdev(const char *path, dev_t *dev)
+{
+       return -EINVAL;
+}
+
+static void io_fallback(void)
+{
+       fops++;
+       if (fops->init == NULL)
+               die("no fallback possible, something is very wrong");
+       fops->init();
+}
+
+static void sync_check(struct bio *bio, int ret)
 {
-       return ERR_PTR(-EINVAL);
+       if (ret != bio->bi_iter.bi_size) {
+               die("IO error: %s\n", strerror(-ret));
+       }
+
+       if (bio->bi_opf & REQ_FUA) {
+               ret = fdatasync(bio->bi_bdev->bd_fd);
+               if (ret)
+                       die("fsync error: %s\n", strerror(-ret));
+       }
+       bio_endio(bio);
+}
+
+static void sync_init(void) {}
+
+static void sync_cleanup(void)
+{
+       /* not necessary? */
+       sync();
+}
+
+static void sync_read(struct bio *bio, struct iovec * iov, unsigned i)
+{
+
+       int fd = bio->bi_opf & REQ_FUA
+                       ? bio->bi_bdev->bd_sync_fd
+                       : bio->bi_bdev->bd_fd;
+       ssize_t ret = preadv(fd, iov, i, bio->bi_iter.bi_sector << 9);
+       sync_check(bio, ret);
+}
+
+static void sync_write(struct bio *bio, struct iovec * iov, unsigned i)
+{
+       int fd = bio->bi_opf & REQ_FUA
+                       ? bio->bi_bdev->bd_sync_fd
+                       : bio->bi_bdev->bd_fd;
+       ssize_t ret = pwritev(fd, iov, i, bio->bi_iter.bi_sector << 9);
+       sync_check(bio, ret);
 }
 
 static int aio_completion_thread(void *arg)
@@ -269,22 +303,24 @@ static int aio_completion_thread(void *arg)
 
 static struct task_struct *aio_task = NULL;
 
-__attribute__((constructor(102)))
-static void blkdev_init(void)
+static void aio_init(void)
 {
        struct task_struct *p;
+       long err = io_setup(256, &aio_ctx);
+       if (!err) {
+               p = kthread_run(aio_completion_thread, NULL, "aio_completion");
+               BUG_ON(IS_ERR(p));
 
-       if (io_setup(256, &aio_ctx))
-               die("io_setup() error: %m");
+               aio_task = p;
 
-       p = kthread_run(aio_completion_thread, NULL, "aio_completion");
-       BUG_ON(IS_ERR(p));
-
-       aio_task = p;
+       } else if (err == -ENOSYS) {
+               io_fallback();
+       } else {
+               die("io_setup() error: %s", strerror(err));
+       }
 }
 
-__attribute__((destructor(102)))
-static void blkdev_cleanup(void)
+static void aio_cleanup(void)
 {
        struct task_struct *p = NULL;
        swap(aio_task, p);
@@ -317,3 +353,71 @@ static void blkdev_cleanup(void)
        close(fds[0]);
        close(fds[1]);
 }
+
+static void aio_op(struct bio *bio, struct iovec *iov, unsigned i, int opcode)
+{
+       ssize_t ret;
+       struct iocb iocb = {
+               .data           = bio,
+               .aio_fildes     = bio->bi_opf & REQ_FUA
+                       ? bio->bi_bdev->bd_sync_fd
+                       : bio->bi_bdev->bd_fd,
+               .aio_lio_opcode = opcode,
+               .u.c.buf        = iov,
+               .u.c.nbytes     = i,
+               .u.c.offset     = bio->bi_iter.bi_sector << 9,
+
+       }, *iocbp = &iocb;
+
+       atomic_inc(&running_requests);
+       ret = io_submit(aio_ctx, 1, &iocbp);
+       if (ret != 1)
+               die("io_submit err: %s", strerror(-ret));
+}
+
+static void aio_read(struct bio *bio, struct iovec *iov, unsigned i)
+{
+       aio_op(bio, iov, i, IO_CMD_PREADV);
+}
+
+static void aio_write(struct bio *bio, struct iovec * iov, unsigned i)
+{
+       aio_op(bio, iov, i, IO_CMD_PWRITEV);
+}
+
+
+/* not implemented */
+static void uring_init(void) {
+       io_fallback();
+}
+
+struct fops fops_list[] = {
+       {
+               .init           = uring_init,
+       }, {
+               .init           = aio_init,
+               .cleanup        = aio_cleanup,
+               .read           = aio_read,
+               .write          = aio_write,
+       }, {
+               .init           = sync_init,
+               .cleanup        = sync_cleanup,
+               .read           = sync_read,
+               .write          = sync_write,
+       }, {
+               /* NULL */
+       }
+};
+
+__attribute__((constructor(102)))
+static void blkdev_init(void)
+{
+       fops = fops_list;
+       fops->init();
+}
+
+__attribute__((destructor(102)))
+static void blkdev_cleanup(void)
+{
+       fops->cleanup();
+}