Commit 71f4ecdb authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Jens Axboe
Browse files

block: remove gfp_flags from blkdev_zone_mgmt 



Now that all callers pass in GFP_KERNEL to blkdev_zone_mgmt() and use
memalloc_no{io,fs}_{save,restore}() to define the allocation scope, we can
drop the gfp_mask parameter from blkdev_zone_mgmt() as well as
blkdev_zone_reset_all() and blkdev_zone_reset_all_emulated().

Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarMike Snitzer <snitzer@kernel.org>
Link: https://lore.kernel.org/r/20240128-zonefs_nofs-v3-5-ae3b7c8def61@wdc.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 147ec1c6

block/blk-zoned.c

+8 −11
Original line number Diff line number Diff line
@@ -177,8 +177,7 @@ static int blk_zone_need_reset_cb(struct blk_zone *zone, unsigned int idx, 
	}

}



static int blkdev_zone_reset_all_emulated(struct block_device *bdev,

					  gfp_t gfp_mask)

static int blkdev_zone_reset_all_emulated(struct block_device *bdev)

{

	struct gendisk *disk = bdev->bd_disk;

	sector_t capacity = bdev_nr_sectors(bdev);
@@ -205,7 +204,7 @@ static int blkdev_zone_reset_all_emulated(struct block_device *bdev, 
		}



		bio = blk_next_bio(bio, bdev, 0, REQ_OP_ZONE_RESET | REQ_SYNC,

				   gfp_mask);

				   GFP_KERNEL);

		bio->bi_iter.bi_sector = sector;

		sector += zone_sectors;
@@ -223,7 +222,7 @@ static int blkdev_zone_reset_all_emulated(struct block_device *bdev, 
	return ret;

}



static int blkdev_zone_reset_all(struct block_device *bdev, gfp_t gfp_mask)

static int blkdev_zone_reset_all(struct block_device *bdev)

{

	struct bio bio;
@@ -238,7 +237,6 @@ static int blkdev_zone_reset_all(struct block_device *bdev, gfp_t gfp_mask) 
 * @sector:	Start sector of the first zone to operate on

 * @nr_sectors:	Number of sectors, should be at least the length of one zone and

 *		must be zone size aligned.

 * @gfp_mask:	Memory allocation flags (for bio_alloc)

 *

 * Description:

 *    Perform the specified operation on the range of zones specified by
@@ -248,7 +246,7 @@ static int blkdev_zone_reset_all(struct block_device *bdev, gfp_t gfp_mask) 
 *    or finish request.

 */

int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op,

		     sector_t sector, sector_t nr_sectors, gfp_t gfp_mask)

		     sector_t sector, sector_t nr_sectors)

{

	struct request_queue *q = bdev_get_queue(bdev);

	sector_t zone_sectors = bdev_zone_sectors(bdev);
@@ -285,12 +283,12 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op, 
	 */

	if (op == REQ_OP_ZONE_RESET && sector == 0 && nr_sectors == capacity) {

		if (!blk_queue_zone_resetall(q))

			return blkdev_zone_reset_all_emulated(bdev, gfp_mask);

		return blkdev_zone_reset_all(bdev, gfp_mask);

			return blkdev_zone_reset_all_emulated(bdev);

		return blkdev_zone_reset_all(bdev);

	}



	while (sector < end_sector) {

		bio = blk_next_bio(bio, bdev, 0, op | REQ_SYNC, gfp_mask);

		bio = blk_next_bio(bio, bdev, 0, op | REQ_SYNC, GFP_KERNEL);

		bio->bi_iter.bi_sector = sector;

		sector += zone_sectors;
@@ -419,8 +417,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, blk_mode_t mode, 
		return -ENOTTY;

	}



	ret = blkdev_zone_mgmt(bdev, op, zrange.sector, zrange.nr_sectors,

			       GFP_KERNEL);

	ret = blkdev_zone_mgmt(bdev, op, zrange.sector, zrange.nr_sectors);



fail:

	if (cmd == BLKRESETZONE)

drivers/md/dm-zoned-metadata.c

+1 −1
Original line number Diff line number Diff line
@@ -1660,7 +1660,7 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone) 
		noio_flag = memalloc_noio_save();

		ret = blkdev_zone_mgmt(dev->bdev, REQ_OP_ZONE_RESET,

				       dmz_start_sect(zmd, zone),

				       zmd->zone_nr_sectors, GFP_KERNEL);

				       zmd->zone_nr_sectors);

		memalloc_noio_restore(noio_flag);

		if (ret) {

			dmz_dev_err(dev, "Reset zone %u failed %d",

drivers/nvme/target/zns.c

+2 −3
Original line number Diff line number Diff line
@@ -456,8 +456,7 @@ static u16 nvmet_bdev_execute_zmgmt_send_all(struct nvmet_req *req) 
	switch (zsa_req_op(req->cmd->zms.zsa)) {

	case REQ_OP_ZONE_RESET:

		ret = blkdev_zone_mgmt(req->ns->bdev, REQ_OP_ZONE_RESET, 0,

				       get_capacity(req->ns->bdev->bd_disk),

				       GFP_KERNEL);

				       get_capacity(req->ns->bdev->bd_disk));

		if (ret < 0)

			return blkdev_zone_mgmt_errno_to_nvme_status(ret);

		break;
@@ -508,7 +507,7 @@ static void nvmet_bdev_zmgmt_send_work(struct work_struct *w) 
		goto out;

	}



	ret = blkdev_zone_mgmt(bdev, op, sect, zone_sectors, GFP_KERNEL);

	ret = blkdev_zone_mgmt(bdev, op, sect, zone_sectors);

	if (ret < 0)

		status = blkdev_zone_mgmt_errno_to_nvme_status(ret);

fs/btrfs/zoned.c

+5 −9
Original line number Diff line number Diff line
@@ -830,8 +830,7 @@ static int sb_log_location(struct block_device *bdev, struct blk_zone *zones, 


			nofs_flags = memalloc_nofs_save();

			ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,

					       reset->start, reset->len,

					       GFP_KERNEL);

					       reset->start, reset->len);

			memalloc_nofs_restore(nofs_flags);

			if (ret)

				return ret;
@@ -984,7 +983,7 @@ int btrfs_advance_sb_log(struct btrfs_device *device, int mirror) 
				nofs_flags = memalloc_nofs_save();

				ret = blkdev_zone_mgmt(device->bdev,

						REQ_OP_ZONE_FINISH, zone->start,

						zone->len, GFP_KERNEL);

						zone->len);

				memalloc_nofs_restore(nofs_flags);

				if (ret)

					return ret;
@@ -1023,8 +1022,7 @@ int btrfs_reset_sb_log_zones(struct block_device *bdev, int mirror) 
	nofs_flags = memalloc_nofs_save();

	ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,

			       zone_start_sector(sb_zone, bdev),

			       zone_sectors * BTRFS_NR_SB_LOG_ZONES,

			       GFP_KERNEL);

			       zone_sectors * BTRFS_NR_SB_LOG_ZONES);

	memalloc_nofs_restore(nofs_flags);

	return ret;

}
@@ -1143,8 +1141,7 @@ int btrfs_reset_device_zone(struct btrfs_device *device, u64 physical, 
	*bytes = 0;

	nofs_flags = memalloc_nofs_save();

	ret = blkdev_zone_mgmt(device->bdev, REQ_OP_ZONE_RESET,

			       physical >> SECTOR_SHIFT, length >> SECTOR_SHIFT,

			       GFP_KERNEL);

			       physical >> SECTOR_SHIFT, length >> SECTOR_SHIFT);

	memalloc_nofs_restore(nofs_flags);

	if (ret)

		return ret;
@@ -2258,8 +2255,7 @@ static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_writ 
		nofs_flags = memalloc_nofs_save();

		ret = blkdev_zone_mgmt(device->bdev, REQ_OP_ZONE_FINISH,

				       physical >> SECTOR_SHIFT,

				       zinfo->zone_size >> SECTOR_SHIFT,

				       GFP_KERNEL);

				       zinfo->zone_size >> SECTOR_SHIFT);

		memalloc_nofs_restore(nofs_flags);



		if (ret)

fs/f2fs/segment.c

+2 −2
Original line number Diff line number Diff line
@@ -1977,7 +1977,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, 
			trace_f2fs_issue_reset_zone(bdev, blkstart);

			nofs_flags = memalloc_nofs_save();

			ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,

						sector, nr_sects, GFP_KERNEL);

						sector, nr_sects);

			memalloc_nofs_restore(nofs_flags);

			return ret;

		}
@@ -4921,7 +4921,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi, 


	nofs_flags = memalloc_nofs_save();

	ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,

				zone->start, zone->len, GFP_KERNEL);

				zone->start, zone->len);

	memalloc_nofs_restore(nofs_flags);

	if (ret == -EOPNOTSUPP) {

		ret = blkdev_issue_zeroout(fdev->bdev, zone->wp,