Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

Pull core block layer updates from Jens Axboe:
 "This is the main pull request for block storage for 4.15-rc1.

  Nothing out of the ordinary in here, and no API changes or anything
  like that. Just various new features for drivers, core changes, etc.
  In particular, this pull request contains:

   - A patch series from Bart, closing the whole on blk/scsi-mq queue
     quescing.

   - A series from Christoph, building towards hidden gendisks (for
     multipath) and ability to move bio chains around.

   - NVMe
        - Support for native multipath for NVMe (Christoph).
        - Userspace notifications for AENs (Keith).
        - Command side-effects support (Keith).
        - SGL support (Chaitanya Kulkarni)
        - FC fixes and improvements (James Smart)
        - Lots of fixes and tweaks (Various)

   - bcache
        - New maintainer (Michael Lyle)
        - Writeback control improvements (Michael)
        - Various fixes (Coly, Elena, Eric, Liang, et al)

   - lightnvm updates, mostly centered around the pblk interface
     (Javier, Hans, and Rakesh).

   - Removal of unused bio/bvec kmap atomic interfaces (me, Christoph)

   - Writeback series that fix the much discussed hundreds of millions
     of sync-all units. This goes all the way, as discussed previously
     (me).

   - Fix for missing wakeup on writeback timer adjustments (Yafang
     Shao).

   - Fix laptop mode on blk-mq (me).

   - {mq,name} tupple lookup for IO schedulers, allowing us to have
     alias names. This means you can use 'deadline' on both !mq and on
     mq (where it's called mq-deadline). (me).

   - blktrace race fix, oopsing on sg load (me).

   - blk-mq optimizations (me).

   - Obscure waitqueue race fix for kyber (Omar).

   - NBD fixes (Josef).

   - Disable writeback throttling by default on bfq, like we do on cfq
     (Luca Miccio).

   - Series from Ming that enable us to treat flush requests on blk-mq
     like any other request. This is a really nice cleanup.

   - Series from Ming that improves merging on blk-mq with schedulers,
     getting us closer to flipping the switch on scsi-mq again.

   - BFQ updates (Paolo).

   - blk-mq atomic flags memory ordering fixes (Peter Z).

   - Loop cgroup support (Shaohua).

   - Lots of minor fixes from lots of different folks, both for core and
     driver code"

* 'for-4.15/block' of git://git.kernel.dk/linux-block: (294 commits)
  nvme: fix visibility of "uuid" ns attribute
  blk-mq: fixup some comment typos and lengths
  ide: ide-atapi: fix compile error with defining macro DEBUG
  blk-mq: improve tag waiting setup for non-shared tags
  brd: remove unused brd_mutex
  blk-mq: only run the hardware queue if IO is pending
  block: avoid null pointer dereference on null disk
  fs: guard_bio_eod() needs to consider partitions
  xtensa/simdisk: fix compile error
  nvme: expose subsys attribute to sysfs
  nvme: create 'slaves' and 'holders' entries for hidden controllers
  block: create 'slaves' and 'holders' entries for hidden gendisks
  nvme: also expose the namespace identification sysfs files for mpath nodes
  nvme: implement multipath access to nvme subsystems
  nvme: track shared namespaces
  nvme: introduce a nvme_ns_ids structure
  nvme: track subsystems
  block, nvme: Introduce blk_mq_req_flags_t
  block, scsi: Make SCSI quiesce and resume work reliably
  block: Add the QUEUE_FLAG_PREEMPT_ONLY request queue flag
  ...

1 files changed, 12 insertions, 18 deletions

diff --git a/drivers/lightnvm/pblk-rb.c b/drivers/lightnvm/pblk-rb.c
index 9bc32578a766..b8f78e401482 100644
--- a/drivers/lightnvm/pblk-rb.c
+++ b/drivers/lightnvm/pblk-rb.c
@@ -201,8 +201,7 @@ unsigned int pblk_rb_read_commit(struct pblk_rb *rb, unsigned int nr_entries)
         return subm;
 }
 
-static int __pblk_rb_update_l2p(struct pblk_rb *rb, unsigned int *l2p_upd,
-                                unsigned int to_update)
+static int __pblk_rb_update_l2p(struct pblk_rb *rb, unsigned int to_update)
 {
         struct pblk *pblk = container_of(rb, struct pblk, rwb);
         struct pblk_line *line;
@@ -213,7 +212,7 @@ static int __pblk_rb_update_l2p(struct pblk_rb *rb, unsigned int *l2p_upd,
         int flags;
 
         for (i = 0; i < to_update; i++) {
-                entry = &rb->entries[*l2p_upd];
+                entry = &rb->entries[rb->l2p_update];
                 w_ctx = &entry->w_ctx;
 
                 flags = READ_ONCE(entry->w_ctx.flags);
@@ -230,7 +229,7 @@ static int __pblk_rb_update_l2p(struct pblk_rb *rb, unsigned int *l2p_upd,
                 line = &pblk->lines[pblk_tgt_ppa_to_line(w_ctx->ppa)];
                 kref_put(&line->ref, pblk_line_put);
                 clean_wctx(w_ctx);
-                *l2p_upd = (*l2p_upd + 1) & (rb->nr_entries - 1);
+                rb->l2p_update = (rb->l2p_update + 1) & (rb->nr_entries - 1);
         }
 
         pblk_rl_out(&pblk->rl, user_io, gc_io);
@@ -258,7 +257,7 @@ static int pblk_rb_update_l2p(struct pblk_rb *rb, unsigned int nr_entries,
 
         count = nr_entries - space;
         /* l2p_update used exclusively under rb->w_lock */
-        ret = __pblk_rb_update_l2p(rb, &rb->l2p_update, count);
+        ret = __pblk_rb_update_l2p(rb, count);
 
 out:
         return ret;
@@ -280,7 +279,7 @@ void pblk_rb_sync_l2p(struct pblk_rb *rb)
         sync = smp_load_acquire(&rb->sync);
 
         to_update = pblk_rb_ring_count(sync, rb->l2p_update, rb->nr_entries);
-        __pblk_rb_update_l2p(rb, &rb->l2p_update, to_update);
+        __pblk_rb_update_l2p(rb, to_update);
 
         spin_unlock(&rb->w_lock);
 }
@@ -325,8 +324,8 @@ void pblk_rb_write_entry_user(struct pblk_rb *rb, void *data,
 }
 
 void pblk_rb_write_entry_gc(struct pblk_rb *rb, void *data,
-                            struct pblk_w_ctx w_ctx, struct pblk_line *gc_line,
-                            unsigned int ring_pos)
+                            struct pblk_w_ctx w_ctx, struct pblk_line *line,
+                            u64 paddr, unsigned int ring_pos)
 {
         struct pblk *pblk = container_of(rb, struct pblk, rwb);
         struct pblk_rb_entry *entry;
@@ -341,7 +340,7 @@ void pblk_rb_write_entry_gc(struct pblk_rb *rb, void *data,
 
         __pblk_rb_write_entry(rb, data, w_ctx, entry);
 
-        if (!pblk_update_map_gc(pblk, w_ctx.lba, entry->cacheline, gc_line))
+        if (!pblk_update_map_gc(pblk, w_ctx.lba, entry->cacheline, line, paddr))
                 entry->w_ctx.lba = ADDR_EMPTY;
 
         flags = w_ctx.flags | PBLK_WRITTEN_DATA;
@@ -355,7 +354,6 @@ static int pblk_rb_sync_point_set(struct pblk_rb *rb, struct bio *bio,
 {
         struct pblk_rb_entry *entry;
         unsigned int subm, sync_point;
-        int flags;
 
         subm = READ_ONCE(rb->subm);
 
@@ -369,12 +367,6 @@ static int pblk_rb_sync_point_set(struct pblk_rb *rb, struct bio *bio,
         sync_point = (pos == 0) ? (rb->nr_entries - 1) : (pos - 1);
         entry = &rb->entries[sync_point];
 
-        flags = READ_ONCE(entry->w_ctx.flags);
-        flags |= PBLK_FLUSH_ENTRY;
-
-        /* Release flags on context. Protect from writes */
-        smp_store_release(&entry->w_ctx.flags, flags);
-
         /* Protect syncs */
         smp_store_release(&rb->sync_point, sync_point);
 
@@ -454,6 +446,7 @@ static int pblk_rb_may_write_flush(struct pblk_rb *rb, unsigned int nr_entries,
 
         /* Protect from read count */
         smp_store_release(&rb->mem, mem);
+
         return 1;
 }
 
@@ -558,12 +551,13 @@ out:
  * persist data on the write buffer to the media.
  */
 unsigned int pblk_rb_read_to_bio(struct pblk_rb *rb, struct nvm_rq *rqd,
-                                 struct bio *bio, unsigned int pos,
-                                 unsigned int nr_entries, unsigned int count)
+                                 unsigned int pos, unsigned int nr_entries,
+                                 unsigned int count)
 {
         struct pblk *pblk = container_of(rb, struct pblk, rwb);
         struct request_queue *q = pblk->dev->q;
         struct pblk_c_ctx *c_ctx = nvm_rq_to_pdu(rqd);
+        struct bio *bio = rqd->bio;
         struct pblk_rb_entry *entry;
         struct page *page;
         unsigned int pad = 0, to_read = nr_entries;