Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Dexuan Cui <decui@microsoft.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        hch@lst.de, bvanassche@acm.org, hare@suse.de,
        mikelley@microsoft.com, longli@microsoft.com, ming.lei@redhat.com
Cc:     Dexuan Cui <decui@microsoft.com>
Subject: [PATCH] scsi: core: Allow the state change from SDEV_QUIESCE to SDEV_BLOCK
Date:   Fri, 17 Apr 2020 17:40:45 -0700
Message-Id: <1587170445-50013-1-git-send-email-decui@microsoft.com>
Reply-To: decui@microsoft.com
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (13.77.154.182) by MW2PR16CA0041.namprd16.prod.outlook.com (2603:10b6:907:1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25 via Frontend Transport; Sat, 18 Apr 2020 00:42:13 +0000
X-Mailer: git-send-email 1.8.3.1
X-Originating-IP: [13.77.154.182]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 57bb415a-f2f4-4a31-c4fc-08d7e33156da
X-MS-TrafficTypeDiagnostic: BN8PR21MB1156:|BN8PR21MB1156:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BN8PR21MB1156D5160E597019EFF9ED10BFD60@BN8PR21MB1156.namprd21.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5236;
X-Forefront-PRVS: 0377802854
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN8PR21MB1139.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(4636009)(376002)(39860400002)(136003)(396003)(366004)(346002)(4326008)(10290500003)(8936002)(66556008)(36756003)(6512007)(107886003)(66476007)(6486002)(478600001)(66946007)(316002)(6666004)(8676002)(82960400001)(2906002)(3450700001)(956004)(2616005)(86362001)(186003)(81156014)(5660300002)(26005)(6506007)(16526019)(52116002)(82950400001)(921003);DIR:OUT;SFP:1102;
Received-SPF: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: DbzYaRGIWME7SsF70pknn5umw8GswiinfsidFHjdVUjNO3TKLK9v0+cpfDq3irJE3+UrB3IKX4WhnEevrmrJ9mGes2BuPqIzVZ2SQpELRu3gG1KQyG3J8yuIQzcNghrXXkixJbLs7AWo6aQMRRmBTRlT/B9e8yMADvgvj+VlanQzL1F67bn6UayyZZbKVvFmliEcdIhMzockGdKnqor1KCTUKMxlCXCj7FahBmbqmGlYss/C2NPuSGk+efpSIs8B6G2eq9eCp6Y2euttxe9G25LtYTQ5X3Gy+HhwbpZ8NyXtrpKfDVcZKws25OXAiTiAYcCY8k3IfdvZktJenaytP2HoMXkpoiN5WR+6cbKp8jTOs9V3+bodJtC45bxfKbGRJ3czrw66+/VOq6oCCdh79+mrQ/dcgMWMMOvmY9fCC1SoAJCYeMIjhaURok0+Ntu+ZbO0/8TogCI4xOp6+Wwq05FTwJxXpdFDrVvT3tjHGBU=
X-MS-Exchange-AntiSpam-MessageData: Dy9vkuwJhCOiM36AA1IWPzxuOsM0JCSmdvwhqtCjz+O1We1egWdN3Y9H37dPhyOqBroJP78KCAOpN1D38jEQbBBsvoxvK8gPKh8R+4tShm5Q9psgW9EPVD8dOq4CiIIvov36DjqziUlwApBFXSRQuQbab80gRKp4JSFwAPjhnBkfe+SVn8yJ89xsa6AUZBQ23wjj8eJc2radgn1LpMGfnUaaKaoAvHCHXUKh7JmHCHTNQFC6Wu47I8SrGVZFiZ2A2nnYG3dN4HSC4kIyb+dR2U2RIBDqFdiCPCoBQy2xn7PNO7C9OMz0VFUKCUAi4naHg+rRZJgstLIkqKVk/S2Eo7yuBThA+gBt+5qab3NrYhycv2CejWf86t1p7YDMg/aAUZivIih4n0vBnKYSrHfGzV/4pOiqbambdY5piffajwq6QlaLDO8PmcNQWjIQDVFoienZgHRqp1PycRE4CuBnA7bNtw9xwGA9zz0QZE+YbH76ipoJSUbmz999r9qMzujxnkT2g0BO4AFFG7vspD/k+OY/rHJ7piaGf0xsCXFsypbAiJs2uBZ1Uw3tteDDCcLGUg+PZhome+pwYUOW/rgPOS6yBZWpQB87e27ixielfz542bKCOJq+vHGPBLzjBofzf6OlUK9SUmlLmBswFpk6aRo3c1aLRFgAK3piObNdgdrBwYTKjqVhv/y72aFrFyhx/JfpzB/n18ZpjOPvd3Mmpu1rju2/J6xUlY1S2XY7swawxQl2ewzqKIQG+0MrsmmKzIc/9Sl1z0gqM6oFNmFQUWqiyntlenPFmuDIlqNV21M=
X-OriginatorOrg: microsoft.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 57bb415a-f2f4-4a31-c4fc-08d7e33156da
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2020 00:42:15.1202
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: teMvReK8se7Qe08QgEsPUhQN9/VpfGNtsMOj1NQtvoH9jabaK4cQdNL8kketPVkD402kzF8npCMo0pz9ZpNZsg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR21MB1156
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

Fixes: 2bb955840c1d ("scsi: core: add scsi_host_(block,unblock) helper function")
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---
 drivers/scsi/scsi_lib.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 47835c4b4ee0..06c260f6cdae 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -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:
-- 
2.19.1