[PATCH 3/5] block: wire up support for file_operations->uring_cmd()

Jens Axboe
2021-01-27T21:27:05Z

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
block/blk-mq.c | 11 +++++++++++
fs/block_dev.c | 10 ++++++++++
include/linux/blk-mq.h | 6 ++++++
include/linux/blkdev.h | 1 +
4 files changed, 28 insertions(+)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index f285a9123a8b..00114f838ac2 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3893,6 +3893,17 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)
}
EXPORT_SYMBOL_GPL(blk_poll);

+int blk_uring_cmd(struct block_device *bdev, struct io_uring_cmd *cmd,
+ bool force_nonblock)
+{
+ struct request_queue *q = bdev_get_queue(bdev);
+
+ if (!q->mq_ops || !q->mq_ops->uring_cmd)
+ return -EINVAL;
+
+ return q->mq_ops->uring_cmd(q, cmd, force_nonblock);
+}
+
unsigned int blk_mq_rq_cpu(struct request *rq)
{
return rq->mq_ctx->cpu;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 3b8963e228a1..c837912c1d72 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -34,6 +34,7 @@
#include <linux/part_stat.h>
#include <linux/uaccess.h>
#include <linux/suspend.h>
+#include <linux/io_uring.h>
#include "internal.h"

struct bdev_inode {
@@ -301,6 +302,14 @@ struct blkdev_dio {

static struct bio_set blkdev_dio_pool;

+static int blkdev_uring_cmd(struct io_uring_cmd *cmd,
+ enum io_uring_cmd_flags flags)
+{
+ struct block_device *bdev = I_BDEV(cmd->file->f_mapping->host);
+
+ return blk_uring_cmd(bdev, cmd, flags);
+}
+
static int blkdev_iopoll(struct kiocb *kiocb, bool wait)
{
struct block_device *bdev = I_BDEV(kiocb->ki_filp->f_mapping->host);
@@ -1825,6 +1834,7 @@ const struct file_operations def_blk_fops = {
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
.fallocate = blkdev_fallocate,
+ .uring_cmd = blkdev_uring_cmd,
};

/**
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index d705b174d346..ddc0e1f07548 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -380,6 +380,12 @@ struct blk_mq_ops {
*/
int (*map_queues)(struct blk_mq_tag_set *set);

+ /**
+ * @uring_cmd: queues requests through io_uring IORING_OP_URING_CMD
+ */
+ int (*uring_cmd)(struct request_queue *q, struct io_uring_cmd *cmd,
+ bool force_nonblock);
+
#ifdef CONFIG_BLK_DEBUG_FS
/**
* @show_rq: Used by the debugfs implementation to show driver-specific
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f94ee3089e01..d5af592d73fe 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -960,6 +960,7 @@ int blk_status_to_errno(blk_status_t status);
blk_status_t errno_to_blk_status(int errno);

int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin);
+int blk_uring_cmd(struct block_device *bdev, struct io_uring_cmd *cmd, bool force_nonblock);

static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
{
--
2.30.0