From patchwork Fri Apr 5 04:41:50 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: 13618492 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 EEAAB2C694; Fri, 5 Apr 2024 04:42:25 +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=1712292146; cv=none; b=SVCmUGj/EKo0YryUxLwrmrXCEkIYZ/brooW5FMgPxMJyjeeue02GE+VicSnhQ90HyKZbl0B3VrakjxkGtbAX9bwk/mDQnKqma87f1Nh3OMOOY5K8eVKAI7Y5j+42UwTpz2s0zjkdXX5DEaswNVLHA1LMoKk2ijUTbWLj5Rtf8Hs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712292146; c=relaxed/simple; bh=qh7ML2n0LpOfrnr2tkSeyd/xQE4MpdPe7WGuEmW7WWQ=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=smyBoBUJtnp8e2qpSF9Nki8bEsdsFPp678Sjy2QYJM5Iv9cXj/gEAgjPF02/HvE4YF6FyskxTUiSuhksG97ARlvy1tjpOaU16KzPypMRS6eHAgyNMjE6cW6sGJfRc9frawm6Bl+FeGI21U6fbYMm7gtuX/liQPuz6YB8N4vXCeY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ko5R/AVM; 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="Ko5R/AVM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A533FC433A6; Fri, 5 Apr 2024 04:42:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712292145; bh=qh7ML2n0LpOfrnr2tkSeyd/xQE4MpdPe7WGuEmW7WWQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ko5R/AVMtQhutyBx6lEArvflUUtGQT2ZSKscFQfk2LOp4mf0Zqlc4CFSeCOzxa9X2 6qgaduJwBcj/QX2DWOlkxO2PQlkSYCBGtlJgMS15b3KsIb7fCpsblZZOVyXgzNYt/6 TFO5ZB+H2Ub+z5mq/VjGqYd+wtpTFll+P/duV2c8DHkxhzCp2SCZRMtuNsAXWbi6/d HkGvM1dSYV6BPR+yVEVFNDDtE0uCB6DY7sXmrpM8F851a5BQFlK3cBvgBEIlbVG9h9 toqMzmxj2U9oWutnFk3nhBfE3LDUzGhOuVzHf5x/SW7g7DBZ3kw4v5FfPQ7ATZnnY8 OFYWr3c6IL8TQ== From: Damien Le Moal To: linux-block@vger.kernel.org, Jens Axboe , linux-scsi@vger.kernel.org, "Martin K . Petersen" , dm-devel@lists.linux.dev, Mike Snitzer , linux-nvme@lists.infradead.org, Keith Busch , Christoph Hellwig Subject: [PATCH v6 11/28] block: Allow BIO-based drivers to use blk_revalidate_disk_zones() Date: Fri, 5 Apr 2024 13:41:50 +0900 Message-ID: <20240405044207.1123462-12-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405044207.1123462-1-dlemoal@kernel.org> References: <20240405044207.1123462-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 preparation for allowing BIO based device drivers to use zone write plugging and its zone append emulation, allow these drivers to call blk_revalidate_disk_zones() so that all zone resources necessary to zone write plugging can be initialized. To do so, remove the check in blk_revalidate_disk_zones() restricting the use of this function to mq request-based drivers to allow also BIO-based drivers to use it. This is safe to do as long as the BIO-based block device queue is already setup and usable, as it should, and can be safely frozen. The helper function disk_need_zone_resources() is added to control the allocation and initialization of the zone write plug hash table and of the conventional zone bitmap only for mq devices and for BIO-based devices that require zone append emulation. Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Reviewed-by: Bart Van Assche Tested-by: Hans Holmberg --- block/blk-zoned.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index a60ac5b3e637..da0fc7e2d00a 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -1512,12 +1512,28 @@ void disk_free_zone_resources(struct gendisk *disk) disk->nr_zones = 0; } +static inline bool disk_need_zone_resources(struct gendisk *disk) +{ + /* + * All mq zoned devices need zone resources so that the block layer + * can automatically handle write BIO plugging. BIO-based device drivers + * (e.g. DM devices) are normally responsible for handling zone write + * ordering and do not need zone resources, unless the driver requires + * zone append emulation. + */ + return queue_is_mq(disk->queue) || + queue_emulates_zone_append(disk->queue); +} + static int disk_revalidate_zone_resources(struct gendisk *disk, unsigned int nr_zones) { struct queue_limits *lim = &disk->queue->limits; unsigned int pool_size; + if (!disk_need_zone_resources(disk)) + return 0; + /* * If the device has no limit on the maximum number of open and active * zones, use BLK_ZONE_WPLUG_DEFAULT_POOL_SIZE. @@ -1635,6 +1651,9 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx, disk->disk_name); return -ENODEV; } + + if (!disk_need_zone_resources(disk)) + break; if (!args->conv_zones_bitmap) { args->conv_zones_bitmap = blk_alloc_zone_bitmap(q->node, args->nr_zones); @@ -1666,10 +1685,11 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx, /* * We need to track the write pointer of all zones that are not * empty nor full. So make sure we have a zone write plug for - * such zone. + * such zone if the device has a zone write plug hash table. */ wp_offset = blk_zone_wp_offset(zone); - if (wp_offset && wp_offset < zone_sectors) { + if (disk->zone_wplugs_hash && + wp_offset && wp_offset < zone_sectors) { zwplug = disk_get_and_lock_zone_wplug(disk, zone->start, GFP_NOIO, &flags); if (!zwplug) @@ -1700,8 +1720,8 @@ static int blk_revalidate_zone_cb(struct blk_zone *zone, unsigned int idx, * be called within the disk ->revalidate method for blk-mq based drivers. * Before calling this function, the device driver must already have set the * device zone size (chunk_sector limit) and the max zone append limit. - * For BIO based drivers, this function cannot be used. BIO based device drivers - * only need to set disk->nr_zones so that the sysfs exposed value is correct. + * BIO based drivers can also use this function as long as the device queue + * can be safely frozen. * If the @update_driver_data callback function is not NULL, the callback is * executed with the device request queue frozen after all zones have been * checked. @@ -1718,8 +1738,6 @@ int blk_revalidate_disk_zones(struct gendisk *disk, if (WARN_ON_ONCE(!blk_queue_is_zoned(q))) return -EIO; - if (WARN_ON_ONCE(!queue_is_mq(q))) - return -EIO; if (!capacity) return -ENODEV;