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

Pull followup block layer updates from Jens Axboe:
 "I ended up splitting the main pull request for this series into two,
  mainly because of clashes between NVMe fixes that went into 4.13 after
  the for-4.14 branches were split off. This pull request is mostly
  NVMe, but not exclusively. In detail, it contains:

   - Two pull request for NVMe changes from Christoph. Nothing new on
     the feature front, basically just fixes all over the map for the
     core bits, transport, rdma, etc.

   - Series from Bart, cleaning up various bits in the BFQ scheduler.

   - Series of bcache fixes, which has been lingering for a release or
     two. Coly sent this in, but patches from various people in this
     area.

   - Set of patches for BFQ from Paolo himself, updating both
     documentation and fixing some corner cases in performance.

   - Series from Omar, attempting to now get the 4k loop support
     correct. Our confidence level is higher this time.

   - Series from Shaohua for loop as well, improving O_DIRECT
     performance and fixing a use-after-free"

* 'for-4.14/block-postmerge' of git://git.kernel.dk/linux-block: (74 commits)
  bcache: initialize dirty stripes in flash_dev_run()
  loop: set physical block size to logical block size
  bcache: fix bch_hprint crash and improve output
  bcache: Update continue_at() documentation
  bcache: silence static checker warning
  bcache: fix for gc and write-back race
  bcache: increase the number of open buckets
  bcache: Correct return value for sysfs attach errors
  bcache: correct cache_dirty_target in __update_writeback_rate()
  bcache: gc does not work when triggering by manual command
  bcache: Don't reinvent the wheel but use existing llist API
  bcache: do not subtract sectors_to_gc for bypassed IO
  bcache: fix sequential large write IO bypass
  bcache: Fix leak of bdev reference
  block/loop: remove unused field
  block/loop: fix use after free
  bfq: Use icq_to_bic() consistently
  bfq: Suppress compiler warnings about comparisons
  bfq: Check kstrtoul() return value
  bfq: Declare local functions static
  ...

1 files changed, 28 insertions, 9 deletions

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 8efff888bd9b..5144f9103723 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -32,6 +32,8 @@
 
 #define NVME_RDMA_IP_PORT       4420
 
+#define NVME_NSID_ALL           0xffffffff
+
 enum nvme_subsys_type {
         NVME_NQN_DISC   = 1,            /* Discovery type target subsystem */
         NVME_NQN_NVME   = 2,            /* NVME type target subsystem */
@@ -133,19 +135,26 @@ enum {
 enum {
         NVME_CC_ENABLE          = 1 << 0,
         NVME_CC_CSS_NVM         = 0 << 4,
+        NVME_CC_EN_SHIFT        = 0,
+        NVME_CC_CSS_SHIFT       = 4,
         NVME_CC_MPS_SHIFT       = 7,
-        NVME_CC_ARB_RR          = 0 << 11,
-        NVME_CC_ARB_WRRU        = 1 << 11,
-        NVME_CC_ARB_VS          = 7 << 11,
-        NVME_CC_SHN_NONE        = 0 << 14,
-        NVME_CC_SHN_NORMAL      = 1 << 14,
-        NVME_CC_SHN_ABRUPT      = 2 << 14,
-        NVME_CC_SHN_MASK        = 3 << 14,
-        NVME_CC_IOSQES          = NVME_NVM_IOSQES << 16,
-        NVME_CC_IOCQES          = NVME_NVM_IOCQES << 20,
+        NVME_CC_AMS_SHIFT       = 11,
+        NVME_CC_SHN_SHIFT       = 14,
+        NVME_CC_IOSQES_SHIFT    = 16,
+        NVME_CC_IOCQES_SHIFT    = 20,
+        NVME_CC_AMS_RR          = 0 << NVME_CC_AMS_SHIFT,
+        NVME_CC_AMS_WRRU        = 1 << NVME_CC_AMS_SHIFT,
+        NVME_CC_AMS_VS          = 7 << NVME_CC_AMS_SHIFT,
+        NVME_CC_SHN_NONE        = 0 << NVME_CC_SHN_SHIFT,
+        NVME_CC_SHN_NORMAL      = 1 << NVME_CC_SHN_SHIFT,
+        NVME_CC_SHN_ABRUPT      = 2 << NVME_CC_SHN_SHIFT,
+        NVME_CC_SHN_MASK        = 3 << NVME_CC_SHN_SHIFT,
+        NVME_CC_IOSQES          = NVME_NVM_IOSQES << NVME_CC_IOSQES_SHIFT,
+        NVME_CC_IOCQES          = NVME_NVM_IOCQES << NVME_CC_IOCQES_SHIFT,
         NVME_CSTS_RDY           = 1 << 0,
         NVME_CSTS_CFS           = 1 << 1,
         NVME_CSTS_NSSRO         = 1 << 4,
+        NVME_CSTS_PP            = 1 << 5,
         NVME_CSTS_SHST_NORMAL   = 0 << 2,
         NVME_CSTS_SHST_OCCUR    = 1 << 2,
         NVME_CSTS_SHST_CMPLT    = 2 << 2,
@@ -251,6 +260,7 @@ enum {
         NVME_CTRL_ONCS_WRITE_UNCORRECTABLE      = 1 << 1,
         NVME_CTRL_ONCS_DSM                      = 1 << 2,
         NVME_CTRL_ONCS_WRITE_ZEROES             = 1 << 3,
+        NVME_CTRL_ONCS_TIMESTAMP                = 1 << 6,
         NVME_CTRL_VWC_PRESENT                   = 1 << 0,
         NVME_CTRL_OACS_SEC_SUPP                 = 1 << 0,
         NVME_CTRL_OACS_DIRECTIVES               = 1 << 5,
@@ -376,6 +386,13 @@ struct nvme_smart_log {
         __u8                    rsvd216[296];
 };
 
+struct nvme_fw_slot_info_log {
+        __u8                    afi;
+        __u8                    rsvd1[7];
+        __le64                  frs[7];
+        __u8                    rsvd64[448];
+};
+
 enum {
         NVME_SMART_CRIT_SPARE           = 1 << 0,
         NVME_SMART_CRIT_TEMPERATURE     = 1 << 1,
@@ -386,6 +403,7 @@ enum {
 
 enum {
         NVME_AER_NOTICE_NS_CHANGED      = 0x0002,
+        NVME_AER_NOTICE_FW_ACT_STARTING = 0x0102,
 };
 
 struct nvme_lba_range_type {
@@ -677,6 +695,7 @@ enum {
         NVME_FEAT_ASYNC_EVENT   = 0x0b,
         NVME_FEAT_AUTO_PST      = 0x0c,
         NVME_FEAT_HOST_MEM_BUF  = 0x0d,
+        NVME_FEAT_TIMESTAMP     = 0x0e,
         NVME_FEAT_KATO          = 0x0f,
         NVME_FEAT_SW_PROGRESS   = 0x80,
         NVME_FEAT_HOST_ID       = 0x81,