From patchwork Fri Mar 1 19:26:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 13579010 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06F643A1D8 for ; Fri, 1 Mar 2024 19:26:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709321203; cv=none; b=kYRFd1tIplkfJEifEe1opOG8kcudd65//GSZPjSmRy7lV+9nvwAFektaxAAs2LLkjO0hNCnLqMA3yRMOTd1czNvYFAmpnGp1ksJb/uNMSOt89/VHyZ2zpS07axK7CTfJsAX97tQMCgXd6EsjvaJ+5ub6+ET+P2Wm/uyYnx7E49k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709321203; c=relaxed/simple; bh=9BRqlpGezbpmeEDIDjIy0uF9xAZYDoSBU/efNeoSCH8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lann47yMLgwecCPCUZeufROPPg3o2AkmVpFlGuHXyiXaJcHx0rqJC2KbFjC5bZlj5ySvlKzvotyaQzboY/awtMIs6c7vEyfktzzCXdxzjaiOSh9a2CTc3ZsoFyCgOi9XEeFd6EfvcEoxM26IK3PZZmKn2MeUmH7tH1tDWkyAFMo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CEKHfEZ5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CEKHfEZ5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11C0DC433F1; Fri, 1 Mar 2024 19:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709321202; bh=9BRqlpGezbpmeEDIDjIy0uF9xAZYDoSBU/efNeoSCH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CEKHfEZ5ot0nzgefhVb33i8zaavCp0CnDuxTYW+EXrWMF1N+W2JxFKWyNSXpnVGvX QIzDxWLOmKxGr8zZ+Gu5lC9q+tZ5W8UDXjxAr2rsaBil3Sswvi6N9CShDGmgwktzl8 CFqTvLVpF5kU8tv7L9fexOKfAscC1CqIspAYW+jkhuQNE/J643ieuhl9+3OJRpYItz o+OAksw2FKMQqyHmWCa61rjww1oqqT/+zcEOl2o4p5NB6DwMkd92Ec+klodErDyQib U6QpBqgr/I4+++GIP+U0+JsvaVBbrBYY2GZiK19UgjE6JeUEq7gNinm+rUPliOu3XS NndhVHqyC/PIA== From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org Cc: Christoph Hellwig Subject: [PATCH 1/3] virtio_blk: Do not use disk_set_max_open/active_zones() Date: Sat, 2 Mar 2024 04:26:37 +0900 Message-ID: <20240301192639.410183-2-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240301192639.410183-1-dlemoal@kernel.org> References: <20240301192639.410183-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In virtblk_read_zoned_limits(), setting a zoned block device maximum number of open and active zones using the functions disk_set_max_open_zones() and disk_set_max_active_zones() is incorrect as setting the limits for the request queue is now done atomically when the gendisk is created (with blk_mq_alloc_disk()). The value set by the disk_set_max_open/active_zones() functions will be overwritten. Fix this by setting the maximum number of open and active zones directly in the queue_limits structure passed to virtblk_read_zoned_limits(). Fixes: 8b837256560c ("virtio_blk: pass queue_limits to blk_mq_alloc_disk") Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn --- drivers/block/virtio_blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index d8b55874cd59..aa9f86507719 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -732,12 +732,12 @@ static int virtblk_read_zoned_limits(struct virtio_blk *vblk, virtio_cread(vdev, struct virtio_blk_config, zoned.max_open_zones, &v); - disk_set_max_open_zones(vblk->disk, v); + lim->max_open_zones = v; dev_dbg(&vdev->dev, "max open zones = %u\n", v); virtio_cread(vdev, struct virtio_blk_config, zoned.max_active_zones, &v); - disk_set_max_active_zones(vblk->disk, v); + lim->max_active_zones = v; dev_dbg(&vdev->dev, "max active zones = %u\n", v); virtio_cread(vdev, struct virtio_blk_config, From patchwork Fri Mar 1 19:26:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 13579011 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0FA03B1AC for ; Fri, 1 Mar 2024 19:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709321204; cv=none; b=TF9GyppODZlcdyYfK5z/RjQwsxsiNRWgP6usK2fNwwtON7CMvm0cS8NasPJuCWkjF5kKrlhzwyWrRzLJnL5oNyxIhajHuR1e8/Q5WaBhRhb6JrityzsNiO/i6elD+lKZYJ6fD09S1wOo44LuF4CdBVzgUl5e3M1cj7BoDOUN2dI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709321204; c=relaxed/simple; bh=oGGwxmwRvIoDbvO7OkowjDueUy+e3pw4/hsWEadHa1o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ucd1Nd3O142hrf3SssrBE5d304dPYH3GW6jEUIQhHkiZjZmecv92uhJXukTPb1/3fVu12b2W52USKmc5VQgL7oqVLRHG1jFqx3R85Be9Mj2BI5A24Qy0It2vW5LxYVn4aZH54xJIDd69+1oDly1xeHjyvfJkso+pjFOOk7s/iWo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TQQ+f/5J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TQQ+f/5J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4547C433C7; Fri, 1 Mar 2024 19:26:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709321203; bh=oGGwxmwRvIoDbvO7OkowjDueUy+e3pw4/hsWEadHa1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TQQ+f/5JNgMudM7NM8T8nSHHgg/FzZt1R+Pfwu4ZZxHlfNXSbrtWler/D5VUPd1Ye kYouujXDQwkDDM0tGN2S4IjVvTQhHdFqqJjwhPQS01eOAnKJ6x9dDvygv6CMVgqiGa hLeM1HiWbMF83UpgJUt9HoNv8eBSQGeghIZ4amM+d8zfb9rn5PuAKW6yVRKcAr6jAt F8TVLgPHA24czgquQPumszDxrOuaIelm6HLjLl/SxkTI+XCCvGbfDeankhQIdDSTIG 1SNjm8MRlZvAwfcMHQbYtNCcU+e190zgQCdzPPgznAYykiNKYl6rEudIwQQumH5OW7 Y1seAd9M2Keew== From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org Cc: Christoph Hellwig Subject: [PATCH 2/3] block: Rename disk_set_zoned() Date: Sat, 2 Mar 2024 04:26:38 +0900 Message-ID: <20240301192639.410183-3-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240301192639.410183-1-dlemoal@kernel.org> References: <20240301192639.410183-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The disk_set_zoned() function operates on the zoned request queue limit of a block device and does not change anything to the gendisk of the device. To reflect this behavior and to be consistent with other request queue limit setting functions, rename disk_set_zoned() to blk_queue_zoned(). Signed-off-by: Damien Le Moal --- block/blk-settings.c | 10 ++++------ drivers/nvme/host/zns.c | 2 +- drivers/scsi/sd.c | 2 +- include/linux/blkdev.h | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index 13865a9f8972..a5102b1cd006 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -1108,13 +1108,11 @@ bool blk_queue_can_use_dma_map_merging(struct request_queue *q, EXPORT_SYMBOL_GPL(blk_queue_can_use_dma_map_merging); /** - * disk_set_zoned - inidicate a zoned device - * @disk: gendisk to configure + * blk_queue_zoned - indicate a zoned device + * @q: the request queue for the device */ -void disk_set_zoned(struct gendisk *disk) +void blk_queue_zoned(struct request_queue *q) { - struct request_queue *q = disk->queue; - WARN_ON_ONCE(!IS_ENABLED(CONFIG_BLK_DEV_ZONED)); /* @@ -1124,7 +1122,7 @@ void disk_set_zoned(struct gendisk *disk) q->limits.zoned = true; blk_queue_zone_write_granularity(q, queue_logical_block_size(q)); } -EXPORT_SYMBOL_GPL(disk_set_zoned); +EXPORT_SYMBOL_GPL(blk_queue_zoned); int bdev_alignment_offset(struct block_device *bdev) { diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 499bbb0eee8d..96d9206efc5e 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -109,7 +109,7 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) goto free_data; } - disk_set_zoned(ns->disk); + blk_queue_zoned(q); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); disk_set_max_open_zones(ns->disk, le32_to_cpu(id->mor) + 1); disk_set_max_active_zones(ns->disk, le32_to_cpu(id->mar) + 1); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 0833b3e6aa6e..477451a36038 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3141,7 +3141,7 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp) /* * Host-managed. */ - disk_set_zoned(sdkp->disk); + blk_queue_zoned(q); /* * Per ZBC and ZAC specifications, writes in sequential write diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 285e82723d64..1081c2d9e6bd 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -321,8 +321,6 @@ struct queue_limits { typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx, void *data); -void disk_set_zoned(struct gendisk *disk); - #define BLK_ALL_ZONES ((unsigned int)-1) int blkdev_report_zones(struct block_device *bdev, sector_t sector, unsigned int nr_zones, report_zones_cb cb, void *data); @@ -610,6 +608,8 @@ static inline enum rpm_status queue_rpm_status(struct request_queue *q) } #endif +void blk_queue_zoned(struct request_queue *q); + static inline bool blk_queue_is_zoned(struct request_queue *q) { return IS_ENABLED(CONFIG_BLK_DEV_ZONED) && q->limits.zoned; From patchwork Fri Mar 1 19:26:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 13579012 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3E523B289 for ; Fri, 1 Mar 2024 19:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709321204; cv=none; b=XVFs0dSiIsNNc0W8Rsx88ErEpiO7xrXD7H+Jl888HHaCUGEI2WrkWsh7cCT4UMRL+cXmyI66F6pSM6S5F3/MtPf/doummmfCk5TYemHE17FFpmBnNaZrj/iUmU9MCjfYf/APEDDxKudwLMSCihM7idOhfkZF2adgjjDJJq/WmWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709321204; c=relaxed/simple; bh=yd7PVRwiT59lOhC3Ybwp5+GGCrFtxBYtZuy/coSWh3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CWaMMwP2VFN23e6kCLmuj2CUZMa2UJUFIwh+qFe2vjLeOI99omYNfhgRz4LGb/WAyJtPCoHMQEctKrVbBSKi9+aWljBkXD9dbeKa4IYDIPPhtZY+0fwO9IsJbU22gNkd2ZS34viAF4uR+iMqNeOG3O9zOGxzVd3urt+7wJil/lQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eimr+HQJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eimr+HQJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1F2AC433F1; Fri, 1 Mar 2024 19:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709321204; bh=yd7PVRwiT59lOhC3Ybwp5+GGCrFtxBYtZuy/coSWh3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eimr+HQJTgAU7bfr+G2+7q0wYPQvv59L9U1GLR8T8InTfCaLygieujqYK+TLgDQal Tn4my1h1dGk19zzaXlsaxt2pk5ZEnWAzTkSIy0hSXFi3Vun+/ffp9KVnKCGfI2s64E SnIum6AEEaZhiv1YXXv7aVtWvRV6W/XKqNzwCEhR2eZo2xkcH0p+qXoolCFc5U0Spj KEteZWo+srfMngLKIDLKPEqYI71s8QfRpug6UbDaXfPJTEoueHeOmyOzWuQ+iY7B3d ww07wabbzJP0J6kGPta75jnY3UlO5Z/wcGiCI4SEYEjGEpXSEgROZeI8fgBMetZtbX PLEQTnJ08zPaw== From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org Cc: Christoph Hellwig Subject: [PATCH 3/3] block: Rename disk_set_max_open/active_zones() Date: Sat, 2 Mar 2024 04:26:39 +0900 Message-ID: <20240301192639.410183-4-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240301192639.410183-1-dlemoal@kernel.org> References: <20240301192639.410183-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Given that the max_open_zones and max_active_zones attributes of a zoned block device have been moved to the device request queue limit, rename the functions disk_set_max_open_zones() and disk_set_max_active_zones() to blk_queue_max_open_zones() and blk_queue_max_active_zones() to be consistent with other request queue limit setting functions. Signed-off-by: Damien Le Moal --- drivers/nvme/host/zns.c | 4 ++-- drivers/scsi/sd_zbc.c | 6 +++--- include/linux/blkdev.h | 26 ++++++++++++++------------ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 96d9206efc5e..7f86b169c373 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -111,8 +111,8 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) blk_queue_zoned(q); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); - disk_set_max_open_zones(ns->disk, le32_to_cpu(id->mor) + 1); - disk_set_max_active_zones(ns->disk, le32_to_cpu(id->mar) + 1); + blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1); + blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1); free_data: kfree(id); return status; diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 26af5ab7d7c1..2971c3269296 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -943,10 +943,10 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, u8 buf[SD_BUF_SIZE]) blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE); if (sdkp->zones_max_open == U32_MAX) - disk_set_max_open_zones(disk, 0); + blk_queue_max_open_zones(q, 0); else - disk_set_max_open_zones(disk, sdkp->zones_max_open); - disk_set_max_active_zones(disk, 0); + blk_queue_max_open_zones(q, sdkp->zones_max_open); + blk_queue_max_active_zones(q, 0); nr_zones = round_up(sdkp->capacity, zone_blocks) >> ilog2(zone_blocks); sdkp->early_zone_info.nr_zones = nr_zones; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 1081c2d9e6bd..55a68983fae8 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -615,6 +615,20 @@ static inline bool blk_queue_is_zoned(struct request_queue *q) return IS_ENABLED(CONFIG_BLK_DEV_ZONED) && q->limits.zoned; } +static inline void blk_queue_max_open_zones(struct request_queue *q, + unsigned int max_open_zones) +{ + WARN_ON_ONCE(!IS_ENABLED(CONFIG_BLK_DEV_ZONED)); + q->limits.max_open_zones = max_open_zones; +} + +static inline void blk_queue_max_active_zones(struct request_queue *q, + unsigned int max_active_zones) +{ + WARN_ON_ONCE(!IS_ENABLED(CONFIG_BLK_DEV_ZONED)); + q->limits.max_active_zones = max_active_zones; +} + #ifdef CONFIG_BLK_DEV_ZONED unsigned int bdev_nr_zones(struct block_device *bdev); @@ -639,18 +653,6 @@ static inline bool disk_zone_is_seq(struct gendisk *disk, sector_t sector) return !test_bit(disk_zone_no(disk, sector), disk->conv_zones_bitmap); } -static inline void disk_set_max_open_zones(struct gendisk *disk, - unsigned int max_open_zones) -{ - disk->queue->limits.max_open_zones = max_open_zones; -} - -static inline void disk_set_max_active_zones(struct gendisk *disk, - unsigned int max_active_zones) -{ - disk->queue->limits.max_active_zones = max_active_zones; -} - static inline unsigned int bdev_max_open_zones(struct block_device *bdev) { return bdev->bd_disk->queue->limits.max_open_zones;