Skip to contentSkip to conversation

FAILED: patch "[PATCH] scsi: sd: sd_zbc: Fix ZBC disk initialization" failed to apply to 5.8-stable tree

PATCH In review [email protected] 2 participants 2 messages Sep 28, 2020 – Sep 30, 2020

Subsystems (2)
Stable branch SCSI
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.8-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6c5dee18756b4721ac8518c69b22ee8ac0c9c442 Mon Sep 17 00:00:00 2001
From: Damien Le Moal <[email protected]>
Date: Tue, 15 Sep 2020 16:33:47 +0900
Subject: [PATCH] scsi: sd: sd_zbc: Fix ZBC disk initialization

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.

Link https://lore.kernel.org/r/[email protected] open here
Fixes 5795eb443060 ("scsi: sd_zbc: emulate ZONE_APPEND commands")
Cc <[email protected]> # v5.8+
Reported-by Borislav Petkov <[email protected]>
Tested-by Borislav Petkov <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Signed-off-by Damien Le Moal <[email protected]>
Signed-off-by Martin K. Petersen <[email protected]>
drivers/scsi/sd.c +0 -4
index 06286b6aeaec..16503e22691e 100644
@@ -3410,10 +3410,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;
drivers/scsi/sd.h +0 -6
index 7251434100e6..a3aad608bc38 100644
@@ -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,
drivers/scsi/sd_zbc.c +35 -25

75 lines not on this page · raw message

#1 lore raw

PATCH 2/2 scsi: sd: sd_zbc: Fix ZBC disk initialization

Upstream commit 6c5dee18756b4721ac8518c69b22ee8ac0c9c442

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.

Link https://lore.kernel.org/r/[email protected] open here
Fixes 5795eb443060 ("scsi: sd_zbc: emulate ZONE_APPEND commands")
Cc <[email protected]> # v5.8+
Reported-by Borislav Petkov <[email protected]>
Tested-by Borislav Petkov <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Signed-off-by Damien Le Moal <[email protected]>
Signed-off-by Martin K. Petersen <[email protected]>
---
 drivers/scsi/sd.c     |  4 --
 drivers/scsi/sd.h     | 12 ------
 drivers/scsi/sd_zbc.c | 94 ++++++++++++++++++++++++-------------------
 3 files changed, 52 insertions(+), 58 deletions(-)
drivers/scsi/sd.c +0 -4
index 0e1bd2e0475a..4b2117cb8483 100644
@@ -3404,10 +3404,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;
drivers/scsi/sd.h +0 -12
index e23d8e4ff654..9c24de305c6b 100644
@@ -213,7 +213,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);
 extern int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buffer);
 extern void sd_zbc_print_zones(struct scsi_disk *sdkp);

@@ -229,17 +228,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(void)
-{
-	return 0;
-}
-
-static inline int sd_zbc_init_disk(struct scsi_disk *sdkp)
-{
-	return 0;
-}
-
-static inline void sd_zbc_exit(void) {}
 static inline void sd_zbc_release_disk(struct scsi_disk *sdkp) {}
 
 static inline int sd_zbc_read_zones(struct scsi_disk *sdkp,
drivers/scsi/sd_zbc.c +52 -42

109 lines not on this page · raw message

Signature · 1 line
2.26.2