Merge branch 'for-4.4/io-poll' of git://git.kernel.dk/linux-block

Pull block IO poll support from Jens Axboe:
 "Various groups have been doing experimentation around IO polling for
  (really) fast devices.  The code has been reviewed and has been
  sitting on the side for a few releases, but this is now good enough
  for coordinated benchmarking and further experimentation.

  Currently O_DIRECT sync read/write are supported.  A framework is in
  the works that allows scalable stats tracking so we can auto-tune
  this.  And we'll add libaio support as well soon.  Fow now, it's an
  opt-in feature for test purposes"

* 'for-4.4/io-poll' of git://git.kernel.dk/linux-block:
  direct-io: be sure to assign dio->bio_bdev for both paths
  directio: add block polling support
  NVMe: add blk polling support
  block: add block polling support
  blk-mq: return tag/queue combo in the make_request_fn handlers
  block: change ->make_request_fn() and users to return a queue cookie

1 files changed, 10 insertions, 4 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 18e7554cf94c..cb5337d8c273 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -109,6 +109,8 @@ struct dio_submit {
 struct dio {
         int flags;                      /* doesn't change */
         int rw;
+        blk_qc_t bio_cookie;
+        struct block_device *bio_bdev;
         struct inode *inode;
         loff_t i_size;                  /* i_size when submitted */
         dio_iodone_t *end_io;           /* IO completion function */
@@ -397,11 +399,14 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio)
         if (dio->is_async && dio->rw == READ && dio->should_dirty)
                 bio_set_pages_dirty(bio);
 
-        if (sdio->submit_io)
+        dio->bio_bdev = bio->bi_bdev;
+
+        if (sdio->submit_io) {
                 sdio->submit_io(dio->rw, bio, dio->inode,
                                sdio->logical_offset_in_bio);
-        else
-                submit_bio(dio->rw, bio);
+                dio->bio_cookie = BLK_QC_T_NONE;
+        } else
+                dio->bio_cookie = submit_bio(dio->rw, bio);
 
         sdio->bio = NULL;
         sdio->boundary = 0;
@@ -440,7 +445,8 @@ static struct bio *dio_await_one(struct dio *dio)
                 __set_current_state(TASK_UNINTERRUPTIBLE);
                 dio->waiter = current;
                 spin_unlock_irqrestore(&dio->bio_lock, flags);
-                io_schedule();
+                if (!blk_poll(bdev_get_queue(dio->bio_bdev), dio->bio_cookie))
+                        io_schedule();
                 /* wake up sets us TASK_RUNNING */
                 spin_lock_irqsave(&dio->bio_lock, flags);
                 dio->waiter = NULL;