scsi: core: Allow the state change from SDEV_QUIESCE to SDEV_BLOCK
PATCH 1/1 scsi: core: Allow the state change from SDEV_QUIESCE to SDEV_BLOCK
The APIs scsi_host_block()/scsi_host_unblock() are recently added by:2bb955840c1d ("scsi: core: add scsi_host_(block,unblock) helper function") and so far the APIs are only used by:3d3ca53b1639 ("scsi: aacraid: use scsi_host_(block,unblock) to block I/O")
However, from reading the code, I think the APIs don't really work for aacraid, because, in the resume path of hibernation, when aac_suspend() -> scsi_host_block() is called, scsi_device_quiesce() has set the state to SDEV_QUIESCE, so aac_suspend() -> scsi_host_block() returns -EINVAL.
Fix the issue by allowing the state change.
--- drivers/scsi/scsi_lib.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/scsi_lib.c +1 -0
@@ -2284,6 +2284,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)switch (oldstate) {case SDEV_RUNNING :case SDEV_CREATED_BLOCK : +case SDEV_QUIESCE :case SDEV_OFFLINE :break ;default :
Signature · 1 line
2.19.1
Quoted 23 lines · Dexuan Cui
The APIs scsi_host_block()/scsi_host_unblock() are recently added by:
2bb955840c1d("scsi: core: addscsi_host_(block,unblock)helper function") and so far the APIs are only used by:3d3ca53b1639("scsi: aacraid: usescsi_host_(block,unblock)to block I/O")However, from reading the code, I think the APIs don't really work for aacraid, because, in the resume path of hibernation, when
aac_suspend()->scsi_host_block()is called,scsi_device_quiesce()has set the state toSDEV_QUIESCE, soaac_suspend()->scsi_host_block()returns-EINVAL.Fix the issue by allowing the state change.
Fixes 2bb955840c1d ("scsi: core: add scsi_host_(block,unblock) helper function")Signed-off-by Dexuan Cui <[email protected]>--- drivers/scsi/scsi_lib.c | 1 + 1 file changed, 1 insertion(+)drivers/scsi/scsi_lib.c +0
-0
drivers/scsi/scsi_lib.c scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) · line 2290
Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-0@@ -2284,6 +2284,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)switch (oldstate) {case SDEV_RUNNING :case SDEV_CREATED_BLOCK : +case SDEV_QUIESCE :case SDEV_OFFLINE :break ;default :
Looks reasonable because SDEV_BLOCK is one more strict state than QEIESCE, so:
Thanks,
Ming
Quoted 36 lines
From: Ming Lei <[email protected]>
Sent: Friday, April 17, 2020 7:42 PM
To: Dexuan Cui <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Michael Kelley <[email protected]>; Long Li <[email protected]>
Subject: Re: [PATCH] scsi: core: Allow the state change fromSDEV_QUIESCEtoSDEV_BLOCKQuoted 5 lines · Dexuan Cui
The APIs scsi_host_block()/scsi_host_unblock() are recently added by:
2bb955840c1d("scsi: core: addscsi_host_(block,unblock)helper function") and so far the APIs are only used by:3d3ca53b1639("scsi: aacraid: usescsi_host_(block,unblock)to block I/O")Quoted 8 lines
However, from reading the code, I think the APIs don't really work for aacraid, because, in the resume path of hibernation, when
aac_suspend()->scsi_host_block()is called,scsi_device_quiesce()has set the state toSDEV_QUIESCE, soaac_suspend()->scsi_host_block()returns-EINVAL.Fix the issue by allowing the state change.
Fixes 2bb955840c1d ("scsi: core: add scsi_host_(block,unblock) helperfunction")
drivers/scsi/scsi_lib.c scsi_device_set_state(struct scsi_device *sdev,
Quoted 10 lines
Signed-off-by Dexuan Cui <[email protected]>--- drivers/scsi/scsi_lib.c | 1 + 1 file changed, 1 insertion(+)drivers/scsi/scsi_lib.c +0
-0@@ -2284,6 +2284,7 @@ scsi_device_set_state(struct scsi_device *sdev,enum
scsi_device_statestate)
Quoted 10 lines
drivers/scsi/scsi_lib.c scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) · line 2290
Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-0switch (oldstate) {case SDEV_RUNNING :case SDEV_CREATED_BLOCK : +case SDEV_QUIESCE :case SDEV_OFFLINE :break ;default :Looks reasonable because
SDEV_BLOCKis one more strict state than QEIESCE, so:
Thanks, Ming!
Quoted 4 lines
Reviewed-by Ming Lei <[email protected]>Thanks,
Ming
There should be a small typo: s/redha/redhat :-)
Thanks,
-- Dexuan
Ming Lei
Reviewed-byQuoted 47 lines · Dexuan Cui
Quoted 36 lines
From: Ming Lei <[email protected]>
Sent: Friday, April 17, 2020 7:42 PM
To: Dexuan Cui <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Michael Kelley <[email protected]>; Long Li <[email protected]>
Subject: Re: [PATCH] scsi: core: Allow the state change fromSDEV_QUIESCEtoSDEV_BLOCKQuoted 5 lines · Dexuan Cui
The APIs scsi_host_block()/scsi_host_unblock() are recently added by:
2bb955840c1d("scsi: core: addscsi_host_(block,unblock)helper function") and so far the APIs are only used by:3d3ca53b1639("scsi: aacraid: usescsi_host_(block,unblock)to block I/O")Quoted 8 lines
However, from reading the code, I think the APIs don't really work for aacraid, because, in the resume path of hibernation, when
aac_suspend()->scsi_host_block()is called,scsi_device_quiesce()has set the state toSDEV_QUIESCE, soaac_suspend()->scsi_host_block()returns-EINVAL.Fix the issue by allowing the state change.
Fixes 2bb955840c1d ("scsi: core: add scsi_host_(block,unblock) helperfunction")
drivers/scsi/scsi_lib.c scsi_device_set_state(struct scsi_device *sdev,
Quoted 10 lines
Signed-off-by Dexuan Cui <[email protected]>--- drivers/scsi/scsi_lib.c | 1 + 1 file changed, 1 insertion(+)drivers/scsi/scsi_lib.c +0
-0@@ -2284,6 +2284,7 @@ scsi_device_set_state(struct scsi_device *sdev,enum
scsi_device_statestate)Quoted 10 lines
drivers/scsi/scsi_lib.c scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) · line 2290
Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-0switch (oldstate) {case SDEV_RUNNING :case SDEV_CREATED_BLOCK : +case SDEV_QUIESCE :case SDEV_OFFLINE :break ;default :Looks reasonable because
SDEV_BLOCKis one more strict state than QEIESCE, so:
Quoted 8 lines
Thanks, Ming!
Quoted 4 lines
Reviewed-by Ming Lei <[email protected]>Thanks,
MingThere should be a small typo: s/redha/redhat :-)
Sorry for the fault:
Thanks,
Ming
Quoted 36 lines · Dexuan Cui
The APIs scsi_host_block()/scsi_host_unblock() are recently added by:
2bb955840c1d("scsi: core: addscsi_host_(block,unblock)helper function")
and so far the APIs are only used by:3d3ca53b1639("scsi: aacraid: usescsi_host_(block,unblock)to block I/O")However, from reading the code, I think the APIs don't really work for
aacraid, because, in the resume path of hibernation, whenaac_suspend()->scsi_host_block()is called,scsi_device_quiesce()has set the state toSDEV_QUIESCE, soaac_suspend()->scsi_host_block()returns-EINVAL.Fix the issue by allowing the state change.
Fixes 2bb955840c1d ("scsi: core: add scsi_host_(block,unblock)helper function")
Signed-off-by Dexuan Cui <[email protected]>--- drivers/scsi/scsi_lib.c | 1 + 1 file changed, 1 insertion(+)drivers/scsi/scsi_lib.c +1
-0@@ -2284,6 +2284,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) switch (oldstate) {case SDEV_RUNNING :case SDEV_CREATED_BLOCK : +case SDEV_QUIESCE :case SDEV_OFFLINE :break ;
Quoted 1 line
default:
I think this should be OK.
Martin K. Petersen
AppliedDexuan,
Quoted 7 lines
However, from reading the code, I think the APIs don't really work for aacraid, because, in the resume path of hibernation, when
aac_suspend()->scsi_host_block()is called,scsi_device_quiesce()has set the state toSDEV_QUIESCE, soaac_suspend()->scsi_host_block()returns-EINVAL.Fix the issue by allowing the state change.
Applied to 5.7/scsi-fixes, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering