From: Jens Axboe <axboe@kernel.dk> To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 02/15] block: wire up block device iopoll method Date: Wed, 9 Jan 2019 19:43:51 -0700 [thread overview] Message-ID: <20190110024404.25372-3-axboe@kernel.dk> (raw) In-Reply-To: <20190110024404.25372-1-axboe@kernel.dk> From: Christoph Hellwig <hch@lst.de> Just call blk_poll on the iocb cookie, we can derive the block device from the inode trivially. Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/block_dev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index c546cdce77e6..5415579f3e14 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -279,6 +279,14 @@ struct blkdev_dio { static struct bio_set blkdev_dio_pool; +static int blkdev_iopoll(struct kiocb *kiocb, bool wait) +{ + struct block_device *bdev = I_BDEV(kiocb->ki_filp->f_mapping->host); + struct request_queue *q = bdev_get_queue(bdev); + + return blk_poll(q, READ_ONCE(kiocb->ki_cookie), wait); +} + static void blkdev_bio_end_io(struct bio *bio) { struct blkdev_dio *dio = bio->bi_private; @@ -396,6 +404,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf |= REQ_HIPRI; qc = submit_bio(bio); + WRITE_ONCE(iocb->ki_cookie, qc); break; } @@ -2068,6 +2077,7 @@ const struct file_operations def_blk_fops = { .llseek = block_llseek, .read_iter = blkdev_read_iter, .write_iter = blkdev_write_iter, + .iopoll = blkdev_iopoll, .mmap = generic_file_mmap, .fsync = blkdev_fsync, .unlocked_ioctl = block_ioctl, -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Jens Axboe <axboe@kernel.dk> To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 02/15] block: wire up block device iopoll method Date: Wed, 9 Jan 2019 19:43:51 -0700 [thread overview] Message-ID: <20190110024404.25372-3-axboe@kernel.dk> (raw) In-Reply-To: <20190110024404.25372-1-axboe@kernel.dk> From: Christoph Hellwig <hch@lst.de> Just call blk_poll on the iocb cookie, we can derive the block device from the inode trivially. Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/block_dev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index c546cdce77e6..5415579f3e14 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -279,6 +279,14 @@ struct blkdev_dio { static struct bio_set blkdev_dio_pool; +static int blkdev_iopoll(struct kiocb *kiocb, bool wait) +{ + struct block_device *bdev = I_BDEV(kiocb->ki_filp->f_mapping->host); + struct request_queue *q = bdev_get_queue(bdev); + + return blk_poll(q, READ_ONCE(kiocb->ki_cookie), wait); +} + static void blkdev_bio_end_io(struct bio *bio) { struct blkdev_dio *dio = bio->bi_private; @@ -396,6 +404,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf |= REQ_HIPRI; qc = submit_bio(bio); + WRITE_ONCE(iocb->ki_cookie, qc); break; } @@ -2068,6 +2077,7 @@ const struct file_operations def_blk_fops = { .llseek = block_llseek, .read_iter = blkdev_read_iter, .write_iter = blkdev_write_iter, + .iopoll = blkdev_iopoll, .mmap = generic_file_mmap, .fsync = blkdev_fsync, .unlocked_ioctl = block_ioctl, -- 2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
next prev parent reply other threads:[~2019-01-10 2:44 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-10 2:43 [PATCHSET v2] io_uring IO interface Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 01/15] fs: add an iopoll method to struct file_operations Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` Jens Axboe [this message] 2019-01-10 2:43 ` [PATCH 02/15] block: wire up block device iopoll method Jens Axboe 2019-01-10 2:43 ` [PATCH 03/15] block: add bio_set_polled() helper Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 04/15] iomap: wire up the iopoll method Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 05/15] Add io_uring IO interface Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-11 18:19 ` Martin K. Petersen 2019-01-11 18:19 ` Martin K. Petersen 2019-01-11 18:34 ` Jens Axboe 2019-01-11 18:34 ` Jens Axboe 2019-01-13 16:22 ` Jens Axboe 2019-01-13 16:22 ` Jens Axboe 2019-01-15 17:31 ` Martin K. Petersen 2019-01-15 17:31 ` Martin K. Petersen 2019-01-10 2:43 ` [PATCH 06/15] io_uring: support for IO polling Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 07/15] io_uring: add submission side request cache Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 08/15] fs: add fget_many() and fput_many() Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 09/15] io_uring: use fget/fput_many() for file references Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:43 ` [PATCH 10/15] io_uring: batch io_kiocb allocation Jens Axboe 2019-01-10 2:43 ` Jens Axboe 2019-01-10 2:44 ` [PATCH 11/15] block: implement bio helper to add iter bvec pages to bio Jens Axboe 2019-01-10 2:44 ` Jens Axboe 2019-01-10 2:44 ` [PATCH 12/15] io_uring: add support for pre-mapped user IO buffers Jens Axboe 2019-01-10 2:44 ` Jens Axboe 2019-01-10 2:44 ` [PATCH 13/15] io_uring: support kernel side submission Jens Axboe 2019-01-10 2:44 ` Jens Axboe 2019-01-10 2:44 ` [PATCH 14/15] io_uring: add submission polling Jens Axboe 2019-01-10 2:44 ` Jens Axboe 2019-01-10 2:44 ` [PATCH 15/15] io_uring: add io_uring_event cache hit information Jens Axboe 2019-01-10 2:44 ` Jens Axboe 2019-01-10 23:12 ` Jeff Moyer 2019-01-10 23:12 ` Jeff Moyer 2019-01-10 23:12 ` Jeff Moyer 2019-01-10 23:47 ` Jens Axboe 2019-01-10 23:47 ` Jens Axboe 2019-01-11 9:46 ` [PATCHSET v2] io_uring IO interface Roman Penyaev 2019-01-11 9:46 ` Roman Penyaev 2019-01-11 16:11 ` Ilya Dryomov 2019-01-11 16:11 ` Ilya Dryomov 2019-01-11 16:21 ` Christoph Hellwig 2019-01-11 16:21 ` Christoph Hellwig 2019-01-11 16:39 ` Roman Penyaev 2019-01-11 16:39 ` Roman Penyaev 2019-01-11 18:05 ` Jens Axboe 2019-01-11 18:05 ` Jens Axboe 2019-01-16 17:49 [PATCHSET v5] " Jens Axboe 2019-01-16 17:49 ` [PATCH 02/15] block: wire up block device iopoll method Jens Axboe 2019-01-16 17:49 ` Jens Axboe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190110024404.25372-3-axboe@kernel.dk \ --to=axboe@kernel.dk \ --cc=avi@scylladb.com \ --cc=hch@lst.de \ --cc=jmoyer@redhat.com \ --cc=linux-aio@kvack.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.