Skip to contentSkip to conversation

scsi: core: Fix the unit attention counter implementation

PATCH Applied Bart Van Assche 3 participants 3 messages Oct 14, 2025 – Oct 22, 2025 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: core: Fix the unit attention counter implementation

scsi_decide_disposition() may call scsi_check_sense(). scsi_decide_disposition() calls are not serialized. Hence, counter updates by scsi_check_sense() must be serialized. Hence this patch that makes the counters updated by scsi_check_sense() atomic.

Cc Kai Mäkisara <[email protected]>
Fixes a5d518cd4e3e ("scsi: core: Add counters for New Media and Power On/Reset UNIT ATTENTIONs")
---
 drivers/scsi/scsi_error.c  |  4 ++--
 include/scsi/scsi_device.h | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/scsi/scsi_error.c +2 -2
index 746ff6a1f309..1c13812a3f03 100644
@@ -554,9 +554,9 @@ enum scsi_disposition scsi_check_sense(struct scsi_cmnd *scmd)
 		 * happened, even if someone else gets the sense data.
 		 */
 		if (sshdr.asc == 0x28)
-			scmd->device->ua_new_media_ctr++;
+			atomic_inc(&sdev->ua_new_media_ctr);
 		else if (sshdr.asc == 0x29)
-			scmd->device->ua_por_ctr++;
+			atomic_inc(&sdev->ua_por_ctr);
 	}
 
 	if (scsi_sense_is_deferred(&sshdr))
include/scsi/scsi_device.h +4 -6
index 4c106342c4ae..3c6c8e3995c3 100644
@@ -252,8 +252,8 @@ struct scsi_device {
 	unsigned int queue_stopped;	/* request queue is quiesced */
 	bool offline_already;		/* Device offline message logged */
 
-	unsigned int ua_new_media_ctr;	/* Counter for New Media UNIT ATTENTIONs */
-	unsigned int ua_por_ctr;	/* Counter for Power On / Reset UAs */
+	atomic_t ua_new_media_ctr;	/* Counter for New Media UNIT ATTENTIONs */
+	atomic_t ua_por_ctr;		/* Counter for Power On / Reset UAs */
 
 	atomic_t disk_events_disable_depth; /* disable depth for disk events */
 
@@ -693,10 +693,8 @@ static inline int scsi_device_busy(struct scsi_device *sdev)
 }
 
 /* Macros to access the UNIT ATTENTION counters */
-#define scsi_get_ua_new_media_ctr(sdev) \
-	((const unsigned int)(sdev->ua_new_media_ctr))
-#define scsi_get_ua_por_ctr(sdev) \
-	((const unsigned int)(sdev->ua_por_ctr))
+#define scsi_get_ua_new_media_ctr(sdev)	atomic_read(&sdev->ua_new_media_ctr)
+#define scsi_get_ua_por_ctr(sdev)	atomic_read(&sdev->ua_por_ctr)
 
 #define MODULE_ALIAS_SCSI_DEVICE(type) \
 	MODULE_ALIAS("scsi:t-" __stringify(type) "*")
Reviewed-by on v1 1/1
#1 lore raw
Quoted 49 lines · Bart Van Assche

scsi_decide_disposition() may call scsi_check_sense(). scsi_decide_disposition() calls are not serialized. Hence, counter updates by scsi_check_sense() must be serialized. Hence this patch that makes the counters updated by scsi_check_sense() atomic.

Cc Kai Mäkisara <[email protected]>
Fixes a5d518cd4e3e ("scsi: core: Add counters for New Media and Power On/Reset UNIT ATTENTIONs")
---
 drivers/scsi/scsi_error.c  |  4 ++--
 include/scsi/scsi_device.h | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/scsi/scsi_error.c +2 -2
index 746ff6a1f309..1c13812a3f03 100644
@@ -554,9 +554,9 @@ enum scsi_disposition scsi_check_sense(struct scsi_cmnd *scmd)
                 * happened, even if someone else gets the sense data.
                 */
                if (sshdr.asc == 0x28)
-                       scmd->device->ua_new_media_ctr++;
+                       atomic_inc(&sdev->ua_new_media_ctr);
                else if (sshdr.asc == 0x29)
-                       scmd->device->ua_por_ctr++;
+                       atomic_inc(&sdev->ua_por_ctr);
        }
 
        if (scsi_sense_is_deferred(&sshdr))
include/scsi/scsi_device.h +2 -2
index 4c106342c4ae..3c6c8e3995c3 100644
@@ -252,8 +252,8 @@ struct scsi_device {
        unsigned int queue_stopped;     /* request queue is quiesced */
        bool offline_already;           /* Device offline message logged */
 
-       unsigned int ua_new_media_ctr;  /* Counter for New Media UNIT ATTENTIONs */
-       unsigned int ua_por_ctr;        /* Counter for Power On / Reset UAs */
+       atomic_t ua_new_media_ctr;      /* Counter for New Media UNIT ATTENTIONs */
+       atomic_t ua_por_ctr;            /* Counter for Power On / Reset UAs */
 
        atomic_t disk_events_disable_depth; /* disable depth for disk events */
 
@@ -693,10 +693,8 @@ static inline int scsi_device_busy(struct scsi_device *sdev)
 }
 

include/scsi/scsi_device.h static inline int scsi_device_busy(struct scsi_device *sdev) · line 700

Quoted 10 lines
include/scsi/scsi_device.h +2 -4
 /* Macros to access the UNIT ATTENTION counters */
-#define scsi_get_ua_new_media_ctr(sdev) \
-       ((const unsigned int)(sdev->ua_new_media_ctr))
-#define scsi_get_ua_por_ctr(sdev) \
-       ((const unsigned int)(sdev->ua_por_ctr))
+#define scsi_get_ua_new_media_ctr(sdev)        atomic_read(&sdev->ua_new_media_ctr)
+#define scsi_get_ua_por_ctr(sdev)      atomic_read(&sdev->ua_por_ctr)
 
 #define MODULE_ALIAS_SCSI_DEVICE(type) \
        MODULE_ALIAS("scsi:t-" __stringify(type) "*")
#2 lore raw
In reply to Bart Van Assche

Bart,

Quoted 4 lines

scsi_decide_disposition() may call scsi_check_sense(). scsi_decide_disposition() calls are not serialized. Hence, counter updates by scsi_check_sense() must be serialized. Hence this patch that makes the counters updated by scsi_check_sense() atomic.

Applied to 6.18/scsi-fixes, thanks!

Signature · 1 line
Martin K. Petersen