From patchwork Mon Sep 14 00:34:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 11772581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 690DC6CA for ; Mon, 14 Sep 2020 00:34:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CEC421897 for ; Mon, 14 Sep 2020 00:34:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="F2Sr9PqN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725962AbgINAe4 (ORCPT ); Sun, 13 Sep 2020 20:34:56 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:19485 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbgINAew (ORCPT ); Sun, 13 Sep 2020 20:34:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600043691; x=1631579691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ygpm7IRQfQLaFKbbiA4pC2Z0JlUnRkoy+qYbLfHnOE0=; b=F2Sr9PqNiZU17fT4BLpI8pNSGNTdV2ySMU51eMnUjK/CJgWc3nYKlwNM KlKxU+pg+d3YzlEsPuK2yxgrmXQVSJktPpueBYcNqx24fBFcnqSqijOU3 eBekygTaK+NHuVTbz3HYCOQo/w+hjWflHjB22+3aYaVc2g4PCsnJyGCxc ja1kXB7yKoxfr+GO1V6e/PHaC7AJittfkoUnvH9PZRTilWmwteXfdXFqQ g7WIexhIas+3YJyTd6RndEh5Ck0vFJ9HrorCS//XBUhozMxl3O6rPGo9j 46ZZ4VzRJ30QeHPC8D0/mjg0gHZJsYq/eMjPYJpCdD9LU62y5XeppNqdJ g==; IronPort-SDR: NcvbNq3q90Gv6j96H1w+yZ4iOycr286LzKIXavALcPhYxeMFLU4NaGZwuQtrT8m+ILZEToTEbQ HduaVuoIbRDvKHAdRVEGEi/T3Mq5d+XNNySPEV+upC2dUfqUJmlw4S4SdHcEqyUQDRG/LHeudU HdJu8bZirl95VwaIkZcJ3g3q8vjdRWz7654Yo9oD7GzIGq2RV1Qgmn8CnTVEik77WiE8uL71hj j5WgYJCAlrTG0CFTZOrMzBTpHzHyjEX/0uqAryVAxZwVuXyrkAzZ01rlIbbEFz6Tr576hj/KkX OeE= X-IronPort-AV: E=Sophos;i="5.76,424,1592841600"; d="scan'208";a="256887864" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 Sep 2020 08:34:51 +0800 IronPort-SDR: OKAVY+eceRWDsurHYOnLseAT4KrTa6zh76Gui8bSd2s32UtIFvBBe6SFOR0GFTtX8MjNT0JOh4 6BER6Cm8ccEA== Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2020 17:21:10 -0700 IronPort-SDR: QWUpSZCdq2SeS1ZcjWJHgBJPaC+vRMARbtyUYuvbRn9O6R+kGQx/S1Gnt8LhaNzJ2Sn8luBR6V VfJpSd3pewog== WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip01.wdc.com with ESMTP; 13 Sep 2020 17:34:51 -0700 From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Borislav Petkov Cc: linux-block@vger.kernel.org, Jens Axboe , Johannes Thumshirn Subject: [PATCH v2 1/2] scsi: Fix handling of host-aware ZBC disks Date: Mon, 14 Sep 2020 09:34:47 +0900 Message-Id: <20200914003448.471624-2-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200914003448.471624-1-damien.lemoal@wdc.com> References: <20200914003448.471624-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When CONFIG_BLK_DEV_ZONED is disabled, allow using host-aware ZBC disks as regular disks. In this case, ensure that command completion is correctly executed by changing sd_zbc_complete() to return good_bytes instead of 0, causing a hang during device probe (endless retries). When CONFIG_BLK_DEV_ZONED is enabled and a host-aware disk is detected to have partitions, it will be used as a regular disk. In this case, make sure to not do anything in sd_zbc_revalidate_zones() as that triggers warnings. Reported-by: Borislav Petkov Fixes: b72053072c0b ("block: allow partitions on host aware zone devices") Cc: Signed-off-by: Damien Le Moal Tested-by: Borislav Petkov Reviewed-by: Johannes Thumshirn --- drivers/scsi/sd.c | 28 ++++++++++++++++++++++------ drivers/scsi/sd.h | 2 +- drivers/scsi/sd_zbc.c | 6 +++++- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 95018e650f2d..e99f57bfeff4 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2968,22 +2968,38 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp) } else { sdkp->zoned = (buffer[8] >> 4) & 3; if (sdkp->zoned == 1 && !disk_has_partitions(sdkp->disk)) { - /* Host-aware */ - q->limits.zoned = BLK_ZONED_HA; + /* + * Host-aware disk without partition: use the disk as + * such if support for zoned block devices is enabled. + * Otherwise, use it as a regular disk. + */ + if (IS_ENABLED(CONFIG_BLK_DEV_ZONED)) + q->limits.zoned = BLK_ZONED_HA; + else + q->limits.zoned = BLK_ZONED_NONE; } else { /* * Treat drive-managed devices and host-aware devices * with partitions as regular block devices. */ q->limits.zoned = BLK_ZONED_NONE; - if (sdkp->zoned == 2 && sdkp->first_scan) - sd_printk(KERN_NOTICE, sdkp, - "Drive-managed SMR disk\n"); } } - if (blk_queue_is_zoned(q) && sdkp->first_scan) + + if (!sdkp->first_scan) + goto out; + + if (blk_queue_is_zoned(q)) { sd_printk(KERN_NOTICE, sdkp, "Host-%s zoned block device\n", q->limits.zoned == BLK_ZONED_HM ? "managed" : "aware"); + } else { + if (sdkp->zoned == 1) + sd_printk(KERN_NOTICE, sdkp, + "Host-aware SMR disk used as regular disk\n"); + else if (sdkp->zoned == 2) + sd_printk(KERN_NOTICE, sdkp, + "Drive-managed SMR disk\n"); + } out: kfree(buffer); diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 4933e7daf17d..7251434100e6 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -259,7 +259,7 @@ static inline blk_status_t sd_zbc_setup_zone_mgmt_cmnd(struct scsi_cmnd *cmd, static inline unsigned int sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes, struct scsi_sense_hdr *sshdr) { - return 0; + return good_bytes; } static inline blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 0e94ff056bff..a739456dea02 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -667,7 +667,11 @@ int sd_zbc_revalidate_zones(struct scsi_disk *sdkp) u32 max_append; int ret = 0; - if (!sd_is_zoned(sdkp)) + /* + * There is nothing to do for regular disks, including host-aware disks + * that have partitions. + */ + if (!blk_queue_is_zoned(q)) return 0; /* From patchwork Mon Sep 14 00:34:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 11772583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC94F6CA for ; Mon, 14 Sep 2020 00:35:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8E9D21897 for ; Mon, 14 Sep 2020 00:35:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="Z5rvHxUE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725989AbgINAe5 (ORCPT ); Sun, 13 Sep 2020 20:34:57 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:19482 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725975AbgINAez (ORCPT ); Sun, 13 Sep 2020 20:34:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600043693; x=1631579693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U9ANooNdVZ0JoKvrQwRumtEGDJMK0r+b8SPDTW2yODM=; b=Z5rvHxUEmLQHC1jNJ+ceZcWj+xrjTXG5Q92RSRKV4cXIhiNT4svPkud+ 6Hurou6x5j61MhQtAJQPJhdLEc7pImGev+UFjNAl9or29ytiPzbVNMjZZ 8z0iUJ34duwP7niWN2WoNsamo6fI7bS1l5sLBZnEr6DBRPFXXTKiYaUAC CPeocLA6un/A4H60p283PYcW7LWLyhsetcp+6LSB7CIlweESA4SSCQQIg 2caZgbip9AYIa9HJ3GztHIZpn3DaMufMCueiLsG96iw5ft0b8gkYSbK3Y wsdCjNftb1gIfTwho8wGqTZ9J6Ci5DwUrxWciPuUDuv+tvDYIZ4i9sZ7Y Q==; IronPort-SDR: M8uep3SuGi4tjfZEAH8eJJqgWmXaaZrWqyXBUduL+TtQtOI3zJau6Mew15Omw4a1vfLiKrmRov 0N64rH/wffEM/fZu+OELPFKKXmURVk9dj6vrBtkzU8lwutjZDxEiPHpW9yskbrRRsBiDIzbrxD v98bTzmKT97QLhACeBQcpcNsSPGZUxRwnI4Ke1AK3WEBH2iFenth5BuIVHY1geyk1FLtG9NwuC pOBFJ7VyldGOSLHXC1+tBDipHLHwoBS668kis6heQyix1SYA2rmqFp088Oo1enYZwlffd9wW7Q 1rI= X-IronPort-AV: E=Sophos;i="5.76,424,1592841600"; d="scan'208";a="256887865" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 Sep 2020 08:34:53 +0800 IronPort-SDR: e+vMWiGV8qn6GSjeOSrXQOZXsYiJoax2PENuB3LgWj+KmwS2zNamTVV+GKgTQfwnFQcqoU378w Z4HAZ90Tucpg== Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2020 17:21:11 -0700 IronPort-SDR: bgPaFOSPEX5XL74iL2tBHoNQYWFICuQ6k447hq3Pg/w5bq8sWlu7nUAp4wHRhwSlu8To0qxquu 1qUSaLugz3fw== WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip01.wdc.com with ESMTP; 13 Sep 2020 17:34:52 -0700 From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Borislav Petkov Cc: linux-block@vger.kernel.org, Jens Axboe , Johannes Thumshirn Subject: [PATCH v2 2/2] scsi: Fix ZBC disk initialization Date: Mon, 14 Sep 2020 09:34:48 +0900 Message-Id: <20200914003448.471624-3-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200914003448.471624-1-damien.lemoal@wdc.com> References: <20200914003448.471624-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Make sure to call sd_zbc_init_disk() when the sdkp->zoned field is known, that is, once sd_read_block_characteristics() is executed in sd_revalidate_disk(), so that host-aware disks also get initialized. To do so, move sd_zbc_init_disk() call in sd_zbc_revalidate_zones() and make sure to execute it for all zoned disks, including for host-aware disks used as regular disks as these disk zoned model may be changed back to BLK_ZONED_HA when partitions are deleted. Reported-by: Borislav Petkov Fixes: 5795eb443060 ("scsi: sd_zbc: emulate ZONE_APPEND commands") Cc: # v5.8+ Signed-off-by: Damien Le Moal Tested-by: Borislav Petkov Reviewed-by: Johannes Thumshirn --- drivers/scsi/sd.c | 4 --- drivers/scsi/sd.h | 6 ----- drivers/scsi/sd_zbc.c | 60 +++++++++++++++++++++++++------------------ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e99f57bfeff4..b3c80fa47c79 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3420,10 +3420,6 @@ static int sd_probe(struct device *dev) sdkp->first_scan = 1; sdkp->max_medium_access_timeouts = SD_MAX_MEDIUM_TIMEOUTS; - error = sd_zbc_init_disk(sdkp); - if (error) - goto out_free_index; - sd_revalidate_disk(gd); gd->flags = GENHD_FL_EXT_DEVT; diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 7251434100e6..a3aad608bc38 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -215,7 +215,6 @@ static inline int sd_is_zoned(struct scsi_disk *sdkp) #ifdef CONFIG_BLK_DEV_ZONED -int sd_zbc_init_disk(struct scsi_disk *sdkp); void sd_zbc_release_disk(struct scsi_disk *sdkp); int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buffer); int sd_zbc_revalidate_zones(struct scsi_disk *sdkp); @@ -231,11 +230,6 @@ blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, sector_t *lba, #else /* CONFIG_BLK_DEV_ZONED */ -static inline int sd_zbc_init_disk(struct scsi_disk *sdkp) -{ - return 0; -} - static inline void sd_zbc_release_disk(struct scsi_disk *sdkp) {} static inline int sd_zbc_read_zones(struct scsi_disk *sdkp, diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index a739456dea02..cf07b7f93579 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -651,6 +651,28 @@ static void sd_zbc_print_zones(struct scsi_disk *sdkp) sdkp->zone_blocks); } +static int sd_zbc_init_disk(struct scsi_disk *sdkp) +{ + sdkp->zones_wp_offset = NULL; + spin_lock_init(&sdkp->zones_wp_offset_lock); + sdkp->rev_wp_offset = NULL; + mutex_init(&sdkp->rev_mutex); + INIT_WORK(&sdkp->zone_wp_offset_work, sd_zbc_update_wp_offset_workfn); + sdkp->zone_wp_update_buf = kzalloc(SD_BUF_SIZE, GFP_KERNEL); + if (!sdkp->zone_wp_update_buf) + return -ENOMEM; + + return 0; +} + +void sd_zbc_release_disk(struct scsi_disk *sdkp) +{ + kvfree(sdkp->zones_wp_offset); + sdkp->zones_wp_offset = NULL; + kfree(sdkp->zone_wp_update_buf); + sdkp->zone_wp_update_buf = NULL; +} + static void sd_zbc_revalidate_zones_cb(struct gendisk *disk) { struct scsi_disk *sdkp = scsi_disk(disk); @@ -667,6 +689,19 @@ int sd_zbc_revalidate_zones(struct scsi_disk *sdkp) u32 max_append; int ret = 0; + /* + * For all zoned disks, initialize zone append emulation data if not + * already done. This is necessary also for host-aware disks used as + * regular disks due to the presence of partitions as these partitions + * may be deleted and the disk zoned model changed back from + * BLK_ZONED_NONE to BLK_ZONED_HA. + */ + if (sd_is_zoned(sdkp) && !sdkp->zone_wp_update_buf) { + ret = sd_zbc_init_disk(sdkp); + if (ret) + return ret; + } + /* * There is nothing to do for regular disks, including host-aware disks * that have partitions. @@ -768,28 +803,3 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buf) return ret; } - -int sd_zbc_init_disk(struct scsi_disk *sdkp) -{ - if (!sd_is_zoned(sdkp)) - return 0; - - sdkp->zones_wp_offset = NULL; - spin_lock_init(&sdkp->zones_wp_offset_lock); - sdkp->rev_wp_offset = NULL; - mutex_init(&sdkp->rev_mutex); - INIT_WORK(&sdkp->zone_wp_offset_work, sd_zbc_update_wp_offset_workfn); - sdkp->zone_wp_update_buf = kzalloc(SD_BUF_SIZE, GFP_KERNEL); - if (!sdkp->zone_wp_update_buf) - return -ENOMEM; - - return 0; -} - -void sd_zbc_release_disk(struct scsi_disk *sdkp) -{ - kvfree(sdkp->zones_wp_offset); - sdkp->zones_wp_offset = NULL; - kfree(sdkp->zone_wp_update_buf); - sdkp->zone_wp_update_buf = NULL; -}