Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block

Pull more block updates from Jens Axboe:
 "A later pull request with some followup items. I had some vacation
  coming up to the merge window, so certain things items were delayed a
  bit. This pull request also contains fixes that came in within the
  last few days of the merge window, which I didn't want to push right
  before sending you a pull request.

  This contains:

   - NVMe pull request, mostly fixes, but also a few minor items on the
     feature side that were timing constrained (Christoph et al)

   - Report zones fixes (Damien)

   - Removal of dead code (Damien)

   - Turn on cgroup psi memstall (Josef)

   - block cgroup MAINTAINERS entry (Konstantin)

   - Flush init fix (Josef)

   - blk-throttle low iops timing fix (Konstantin)

   - nbd resize fixes (Mike)

   - nbd 0 blocksize crash fix (Xiubo)

   - block integrity error leak fix (Wenwen)

   - blk-cgroup writeback and priority inheritance fixes (Tejun)"

* tag 'for-linus-20190715' of git://git.kernel.dk/linux-block: (42 commits)
  MAINTAINERS: add entry for block io cgroup
  null_blk: fixup ->report_zones() for !CONFIG_BLK_DEV_ZONED
  block: Limit zone array allocation size
  sd_zbc: Fix report zones buffer allocation
  block: Kill gfp_t argument of blkdev_report_zones()
  block: Allow mapping of vmalloc-ed buffers
  block/bio-integrity: fix a memory leak bug
  nvme: fix NULL deref for fabrics options
  nbd: add netlink reconfigure resize support
  nbd: fix crash when the blksize is zero
  block: Disable write plugging for zoned block devices
  block: Fix elevator name declaration
  block: Remove unused definitions
  nvme: fix regression upon hot device removal and insertion
  blk-throttle: fix zero wait time for iops throttled group
  block: Fix potential overflow in blk_report_zones()
  blkcg: implement REQ_CGROUP_PUNT
  blkcg, writeback: Implement wbc_blkcg_css()
  blkcg, writeback: Add wbc->no_cgroup_owner
  blkcg, writeback: Rename wbc_account_io() to wbc_account_cgroup_owner()
  ...

3 files changed, 49 insertions, 18 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 3a9bca3aa093..9bcde2325893 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -134,6 +134,8 @@ static struct dentry *nbd_dbg_dir;
 
 #define NBD_MAGIC 0x68797548
 
+#define NBD_DEF_BLKSIZE 1024
+
 static unsigned int nbds_max = 16;
 static int max_part = 16;
 static struct workqueue_struct *recv_workqueue;
@@ -1236,6 +1238,14 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd,
                 nbd_config_put(nbd);
 }
 
+static bool nbd_is_valid_blksize(unsigned long blksize)
+{
+        if (!blksize || !is_power_of_2(blksize) || blksize < 512 ||
+            blksize > PAGE_SIZE)
+                return false;
+        return true;
+}
+
 /* Must be called with config_lock held */
 static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                        unsigned int cmd, unsigned long arg)
@@ -1251,8 +1261,9 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
         case NBD_SET_SOCK:
                 return nbd_add_socket(nbd, arg, false);
         case NBD_SET_BLKSIZE:
-                if (!arg || !is_power_of_2(arg) || arg < 512 ||
-                    arg > PAGE_SIZE)
+                if (!arg)
+                        arg = NBD_DEF_BLKSIZE;
+                if (!nbd_is_valid_blksize(arg))
                         return -EINVAL;
                 nbd_size_set(nbd, arg,
                              div_s64(config->bytesize, arg));
@@ -1332,7 +1343,7 @@ static struct nbd_config *nbd_alloc_config(void)
         atomic_set(&config->recv_threads, 0);
         init_waitqueue_head(&config->recv_wq);
         init_waitqueue_head(&config->conn_wait);
-        config->blksize = 1024;
+        config->blksize = NBD_DEF_BLKSIZE;
         atomic_set(&config->live_connections, 0);
         try_module_get(THIS_MODULE);
         return config;
@@ -1673,6 +1684,30 @@ nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = {
         [NBD_DEVICE_CONNECTED]          =       { .type = NLA_U8 },
 };
 
+static int nbd_genl_size_set(struct genl_info *info, struct nbd_device *nbd)
+{
+        struct nbd_config *config = nbd->config;
+        u64 bsize = config->blksize;
+        u64 bytes = config->bytesize;
+
+        if (info->attrs[NBD_ATTR_SIZE_BYTES])
+                bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]);
+
+        if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) {
+                bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]);
+                if (!bsize)
+                        bsize = NBD_DEF_BLKSIZE;
+                if (!nbd_is_valid_blksize(bsize)) {
+                        printk(KERN_ERR "Invalid block size %llu\n", bsize);
+                        return -EINVAL;
+                }
+        }
+
+        if (bytes != config->bytesize || bsize != config->blksize)
+                nbd_size_set(nbd, bsize, div64_u64(bytes, bsize));
+        return 0;
+}
+
 static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 {
         struct nbd_device *nbd = NULL;
@@ -1760,16 +1795,10 @@ again:
         refcount_set(&nbd->config_refs, 1);
         set_bit(NBD_BOUND, &config->runtime_flags);
 
-        if (info->attrs[NBD_ATTR_SIZE_BYTES]) {
-                u64 bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]);
-                nbd_size_set(nbd, config->blksize,
-                             div64_u64(bytes, config->blksize));
-        }
-        if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) {
-                u64 bsize =
-                        nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]);
-                nbd_size_set(nbd, bsize, div64_u64(config->bytesize, bsize));
-        }
+        ret = nbd_genl_size_set(info, nbd);
+        if (ret)
+                goto out;
+
         if (info->attrs[NBD_ATTR_TIMEOUT]) {
                 u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]);
                 nbd->tag_set.timeout = timeout * HZ;
@@ -1938,6 +1967,10 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
+        ret = nbd_genl_size_set(info, nbd);
+        if (ret)
+                goto out;
+
         if (info->attrs[NBD_ATTR_TIMEOUT]) {
                 u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]);
                 nbd->tag_set.timeout = timeout * HZ;
diff --git a/drivers/block/null_blk.h b/drivers/block/null_blk.h
index 34b22d6523ba..a1b9929bd911 100644
--- a/drivers/block/null_blk.h
+++ b/drivers/block/null_blk.h
@@ -89,8 +89,7 @@ struct nullb {
 int null_zone_init(struct nullb_device *dev);
 void null_zone_exit(struct nullb_device *dev);
 int null_zone_report(struct gendisk *disk, sector_t sector,
-                     struct blk_zone *zones, unsigned int *nr_zones,
-                     gfp_t gfp_mask);
+                     struct blk_zone *zones, unsigned int *nr_zones);
 void null_zone_write(struct nullb_cmd *cmd, sector_t sector,
                         unsigned int nr_sectors);
 void null_zone_reset(struct nullb_cmd *cmd, sector_t sector);
@@ -103,7 +102,7 @@ static inline int null_zone_init(struct nullb_device *dev)
 static inline void null_zone_exit(struct nullb_device *dev) {}
 static inline int null_zone_report(struct gendisk *disk, sector_t sector,
                                    struct blk_zone *zones,
-                                   unsigned int *nr_zones, gfp_t gfp_mask)
+                                   unsigned int *nr_zones)
 {
         return -EOPNOTSUPP;
 }
diff --git a/drivers/block/null_blk_zoned.c b/drivers/block/null_blk_zoned.c
index fca0c97ff1aa..cb28d93f2bd1 100644
--- a/drivers/block/null_blk_zoned.c
+++ b/drivers/block/null_blk_zoned.c
@@ -67,8 +67,7 @@ void null_zone_exit(struct nullb_device *dev)
 }
 
 int null_zone_report(struct gendisk *disk, sector_t sector,
-                     struct blk_zone *zones, unsigned int *nr_zones,
-                     gfp_t gfp_mask)
+                     struct blk_zone *zones, unsigned int *nr_zones)
 {
         struct nullb *nullb = disk->private_data;
         struct nullb_device *dev = nullb->dev;