block: Kill gfp_t argument of blkdev_report_zones()

Only GFP_KERNEL and GFP_NOIO are used with blkdev_report_zones(). In
preparation of using vmalloc() for large report buffer and zone array
allocations used by this function, remove its "gfp_t gfp_mask" argument
and rely on the caller context to use memalloc_noio_save/restore() where
necessary (block layer zone revalidation and dm-zoned I/O error path).

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

8 files changed, 23 insertions, 24 deletions

diff --git a/drivers/block/null_blk.h b/drivers/block/null_blk.h
index 34b22d6523ba..4b9bbe3bb5a1 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);
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;
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index a9bc518156f2..2900fbde89b3 100644
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -461,15 +461,14 @@ static int flakey_prepare_ioctl(struct dm_target *ti, struct block_device **bdev
 
 #ifdef CONFIG_BLK_DEV_ZONED
 static int flakey_report_zones(struct dm_target *ti, sector_t sector,
-                               struct blk_zone *zones, unsigned int *nr_zones,
-                               gfp_t gfp_mask)
+                               struct blk_zone *zones, unsigned int *nr_zones)
 {
         struct flakey_c *fc = ti->private;
         int ret;
 
         /* Do report and remap it */
         ret = blkdev_report_zones(fc->dev->bdev, flakey_map_sector(ti, sector),
-                                  zones, nr_zones, gfp_mask);
+                                  zones, nr_zones);
         if (ret != 0)
                 return ret;
 
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index ad980a38fb1e..ecefe6703736 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -137,15 +137,14 @@ static int linear_prepare_ioctl(struct dm_target *ti, struct block_device **bdev
 
 #ifdef CONFIG_BLK_DEV_ZONED
 static int linear_report_zones(struct dm_target *ti, sector_t sector,
-                               struct blk_zone *zones, unsigned int *nr_zones,
-                               gfp_t gfp_mask)
+                               struct blk_zone *zones, unsigned int *nr_zones)
 {
         struct linear_c *lc = (struct linear_c *) ti->private;
         int ret;
 
         /* Do report and remap it */
         ret = blkdev_report_zones(lc->dev->bdev, linear_map_sector(ti, sector),
-                                  zones, nr_zones, gfp_mask);
+                                  zones, nr_zones);
         if (ret != 0)
                 return ret;
 
diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
index d8334cd45d7c..9faf3e49c7af 100644
--- a/drivers/md/dm-zoned-metadata.c
+++ b/drivers/md/dm-zoned-metadata.c
@@ -8,6 +8,7 @@
 
 #include <linux/module.h>
 #include <linux/crc32.h>
+#include <linux/sched/mm.h>
 
 #define DM_MSG_PREFIX           "zoned metadata"
 
@@ -1162,8 +1163,7 @@ static int dmz_init_zones(struct dmz_metadata *zmd)
         while (sector < dev->capacity) {
                 /* Get zone information */
                 nr_blkz = DMZ_REPORT_NR_ZONES;
-                ret = blkdev_report_zones(dev->bdev, sector, blkz,
-                                          &nr_blkz, GFP_KERNEL);
+                ret = blkdev_report_zones(dev->bdev, sector, blkz, &nr_blkz);
                 if (ret) {
                         dmz_dev_err(dev, "Report zones failed %d", ret);
                         goto out;
@@ -1201,12 +1201,20 @@ out:
 static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)
 {
         unsigned int nr_blkz = 1;
+        unsigned int noio_flag;
         struct blk_zone blkz;
         int ret;
 
-        /* Get zone information from disk */
+        /*
+         * Get zone information from disk. Since blkdev_report_zones() uses
+         * GFP_KERNEL by default for memory allocations, set the per-task
+         * PF_MEMALLOC_NOIO flag so that all allocations are done as if
+         * GFP_NOIO was specified.
+         */
+        noio_flag = memalloc_noio_save();
         ret = blkdev_report_zones(zmd->dev->bdev, dmz_start_sect(zmd, zone),
-                                  &blkz, &nr_blkz, GFP_NOIO);
+                                  &blkz, &nr_blkz);
+        memalloc_noio_restore(noio_flag);
         if (!nr_blkz)
                 ret = -EIO;
         if (ret) {
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 5475081dcbd6..61f1152b74e9 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -441,8 +441,7 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 }
 
 static int dm_blk_report_zones(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)
 {
 #ifdef CONFIG_BLK_DEV_ZONED
         struct mapped_device *md = disk->private_data;
@@ -480,8 +479,7 @@ static int dm_blk_report_zones(struct gendisk *disk, sector_t sector,
          * So there is no need to loop here trying to fill the entire array
          * of zones.
          */
-        ret = tgt->type->report_zones(tgt, sector, zones,
-                                      nr_zones, gfp_mask);
+        ret = tgt->type->report_zones(tgt, sector, zones, nr_zones);
 
 out:
         dm_put_live_table(md, srcu_idx);
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 5796ace76225..38c50946fc42 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -213,8 +213,7 @@ extern blk_status_t sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd);
 extern void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes,
                             struct scsi_sense_hdr *sshdr);
 extern int sd_zbc_report_zones(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);
 
 #else /* CONFIG_BLK_DEV_ZONED */
 
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index 7334024b64f1..ec3764c8f3f1 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -109,13 +109,11 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf,
  * @sector: Start 512B sector of the report
  * @zones: Array of zone descriptors
  * @nr_zones: Number of descriptors in the array
- * @gfp_mask: Memory allocation mask
  *
  * Execute a report zones command on the target disk.
  */
 int sd_zbc_report_zones(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 scsi_disk *sdkp = scsi_disk(disk);
         unsigned int i, buflen, nrz = *nr_zones;
@@ -134,7 +132,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector,
          */
         buflen = min(queue_max_hw_sectors(disk->queue) << 9,
                      roundup((nrz + 1) * 64, 512));
-        buf = kmalloc(buflen, gfp_mask);
+        buf = kmalloc(buflen, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;