scsi: sd: Do not attempt to configure discard unless LBPME is set

martinkpetersen · martinkpetersen · commit cbaac68987b8 · 2024-08-16T21:16:49.000-04:00
Commit f874d72 ("scsi: sd: Keep the discard mode stable") attempted to address an issue where one mode of discard operation got configured prior to the device completing full discovery. Unfortunately this change assumed discard was always enabled on the device. Do not attempt to configure discard unless LBPME is enabled. Link: https://lore.kernel.org/r/20240817005325.3319384-1-martin.petersen@oracle.com Fixes: f874d72 ("scsi: sd: Keep the discard mode stable") Reported-by: Chris Bainbridge <chris.bainbridge@gmail.com> Tested-by: Chris Bainbridge <chris.bainbridge@gmail.com> Tested-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Tested-by: John Garry <john.g.garry@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
@@ -3308,6 +3308,9 @@ static void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
 
 static unsigned int sd_discard_mode(struct scsi_disk *sdkp)
 {
+	if (!sdkp->lbpme)
+		return SD_LBP_FULL;
+
 	if (!sdkp->lbpvpd) {
 		/* LBP VPD page not provided */
 		if (sdkp->max_unmap_blocks)

Original file line number	Diff line number	Diff line change
`@@ -3308,6 +3308,9 @@ static void sd_read_app_tag_own(struct scsi_disk sdkp, unsigned char buffer)`
`3308`	`3308`
`3309`	`3309`	`static unsigned int sd_discard_mode(struct scsi_disk *sdkp)`
`3310`	`3310`	`{`
	`3311`	`+ if (!sdkp->lbpme)`
	`3312`	`+ return SD_LBP_FULL;`
	`3313`	`+`
`3311`	`3314`	`if (!sdkp->lbpvpd) {`
`3312`	`3315`	`/* LBP VPD page not provided */`
`3313`	`3316`	`if (sdkp->max_unmap_blocks)`