Patch "scsi: sd: Do not repeat the starting disk message" has been added to the 6.6-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    scsi: sd: Do not repeat the starting disk message

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     scsi-sd-do-not-repeat-the-starting-disk-message.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 65effe509d84eb211b961a87b3f29a99d0e42080
Author: Damien Le Moal <dlemoal@xxxxxxxxxx>
Date:   Tue Jul 2 06:53:26 2024 +0900

    scsi: sd: Do not repeat the starting disk message
    
    [ Upstream commit 7a6bbc2829d4ab592c7e440a6f6f5deb3cd95db4 ]
    
    The SCSI disk message "Starting disk" to signal resuming of a suspended
    disk is printed in both sd_resume() and sd_resume_common() which results
    in this message being printed twice when resuming from e.g. autosuspend:
    
    $ echo 5000 > /sys/block/sda/device/power/autosuspend_delay_ms
    $ echo auto > /sys/block/sda/device/power/control
    
    [ 4962.438293] sd 0:0:0:0: [sda] Synchronizing SCSI cache
    [ 4962.501121] sd 0:0:0:0: [sda] Stopping disk
    
    $ echo on > /sys/block/sda/device/power/control
    
    [ 4972.805851] sd 0:0:0:0: [sda] Starting disk
    [ 4980.558806] sd 0:0:0:0: [sda] Starting disk
    
    Fix this double print by removing the call to sd_printk() from sd_resume()
    and moving the call to sd_printk() in sd_resume_common() earlier in the
    function, before the check using sd_do_start_stop().  Doing so, the message
    is printed once regardless if sd_resume_common() actually executes
    sd_start_stop_device() (i.e. SCSI device case) or not (libsas and libata
    managed ATA devices case).
    
    Fixes: 0c76106cb975 ("scsi: sd: Fix TCG OPAL unlock on system resume")
    Cc: stable@xxxxxxxxxxxxxxx
    Signed-off-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240701215326.128067-1-dlemoal@xxxxxxxxxx
    Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>
    Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
    Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 2c627deedc1fa..7c25adb00e95d 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3955,8 +3955,6 @@ static int sd_resume(struct device *dev)
 {
 	struct scsi_disk *sdkp = dev_get_drvdata(dev);
 
-	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
-
 	if (opal_unlock_from_suspend(sdkp->opal_dev)) {
 		sd_printk(KERN_NOTICE, sdkp, "OPAL unlock failed\n");
 		return -EIO;
@@ -3973,12 +3971,13 @@ static int sd_resume_common(struct device *dev, bool runtime)
 	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */
 		return 0;
 
+	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
+
 	if (!sd_do_start_stop(sdkp->device, runtime)) {
 		sdkp->suspended = false;
 		return 0;
 	}
 
-	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
 	ret = sd_start_stop_device(sdkp, 1);
 	if (!ret) {
 		sd_resume(dev);




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux