Update bcachefs sources to 18686af684 bcachefs: Inode backpointers

[bcachefs-tools-debian] / linux / blkdev.c

diff --git a/linux/blkdev.c b/linux/blkdev.c
index 19aa88b8e0dcb93315b94e2e8d6db24410904ef6..709e770345f925e31101a82ea3bd5366525bb848 100644 (file)
--- a/linux/blkdev.c
+++ b/linux/blkdev.c
@@ -10,7 +10,9 @@
 
 #include <libaio.h>
 
+#ifdef CONFIG_VALGRIND
 #include <valgrind/memcheck.h>
+#endif
 
 #include <linux/bio.h>
 #include <linux/blkdev.h>
@@ -21,6 +23,7 @@
 #include "tools-util.h"
 
 static io_context_t aio_ctx;
+static atomic_t running_requests;
 
 void generic_make_request(struct bio *bio)
 {
@@ -56,9 +59,11 @@ 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 = {
@@ -75,6 +80,7 @@ void generic_make_request(struct bio *bio)
                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));
@@ -85,6 +91,7 @@ void generic_make_request(struct bio *bio)
                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));
@@ -228,20 +235,16 @@ struct block_device *lookup_bdev(const char *path)
        return ERR_PTR(-EINVAL);
 }
 
-static atomic_t aio_thread_stop;
-
 static int aio_completion_thread(void *arg)
 {
        struct io_event events[8], *ev;
        int ret;
+       bool stop = false;
 
-       while (1) {
+       while (!stop) {
                ret = io_getevents(aio_ctx, 1, ARRAY_SIZE(events),
                                   events, NULL);
 
-               if (atomic_read(&aio_thread_stop))
-                       break;
-
                if (ret < 0 && ret == -EINTR)
                        continue;
                if (ret < 0)
@@ -250,10 +253,18 @@ static int aio_completion_thread(void *arg)
                for (ev = events; ev < events + ret; ev++) {
                        struct bio *bio = (struct bio *) ev->data;
 
+                       /* This should only happen during blkdev_cleanup() */
+                       if (!bio) {
+                               BUG_ON(atomic_read(&running_requests) != 0);
+                               stop = true;
+                               continue;
+                       }
+
                        if (ev->res != bio->bi_iter.bi_size)
                                bio->bi_status = BLK_STS_IOERR;
 
                        bio_endio(bio);
+                       atomic_dec(&running_requests);
                }
        }
 
@@ -283,8 +294,6 @@ static void blkdev_cleanup(void)
        swap(aio_task, p);
        get_task_struct(p);
 
-       atomic_set(&aio_thread_stop, 1);
-
        /* I mean, really?! IO_CMD_NOOP is even defined, but not implemented. */
        int fds[2];
        int ret = pipe(fds);
@@ -295,6 +304,7 @@ static void blkdev_cleanup(void)
        int junk = 0;
        struct iocb iocb = {
                .aio_lio_opcode = IO_CMD_PWRITE,
+               .data = NULL, /* Signal to stop */
                .aio_fildes = fds[1],
                .u.c.buf = &junk,
                .u.c.nbytes = 1,