Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com,
        dgilbert@interlog.com
Cc:     linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>,
        kernel test robot <yujie.liu@intel.com>
Subject: [PATCH] scsi: scsi_debug: Abort commands from scsi_debug_device_reset()
Date:   Sun, 16 Apr 2023 17:56:54 +0000
Message-Id: <20230416175654.159163-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ky2HSwWIsrdb+3yxZZI7zMa9Y/8XP5G7P56mckj/uhpE5EZJBntAYX/WD0Wc?=
 =?us-ascii?Q?9UumI4LszzrfxxKacdvtEyVq/Zu5C4ONwvHufznD+Z/aYEf0YznvhDk35CKj?=
 =?us-ascii?Q?vVx5IoDeTKrVG7r49qyFXENLZjImiJdkwqY3C2zw12H0zFYHPA7emaCZJUm6?=
 =?us-ascii?Q?oLiyiaDQR4lo2jRS5RwTBZE1nt5cpwXwVHryWvDZSstp4CKP9Je+HcvYxIIk?=
 =?us-ascii?Q?5lE1AKrI3acuOxRldAZs2Mhrj5CDRv/GG7A0rV4WCO9AfOTO/lbBWivvslO8?=
 =?us-ascii?Q?oWevRDB5b4rh+g8Tz53ZDIgB835heNtEWpYiIk6K/aCAKLGnxBAAd2kaw9p/?=
 =?us-ascii?Q?XI3y1Ief4CfXJS4lvgULPcMB+wBQVTIUBPUkNfuaP+nvVEmK4A8SwcT7TVZD?=
 =?us-ascii?Q?tkAZnKsG2PArlguHrFZatSdKzgjl9cmJIBVCKtBmTJnzl4vX24Rxa28CMSO/?=
 =?us-ascii?Q?pmgP2MVS04rUmGJbhFmbXbUCJe7w9SDS3g0Znan4zZUhBmY8+B0mD4qR0Nte?=
 =?us-ascii?Q?z+XhhBLx6VzHptR9UVKD1IykGepeYAPLMfd+hvrBi/JbrP3/W/MZsUvK7E0A?=
 =?us-ascii?Q?tIrKBPZndk21SFm1oCiXTRaFq5otxi6H9QD7ADli9kRwd02meVtgB6nXXLNW?=
 =?us-ascii?Q?JrzmIkC6w95VQAQjsmE6Gi6QqVv/fIIFcWxJ3Aew8ibbt/ZVi6nECl6v1cr7?=
 =?us-ascii?Q?Gjj0u/qMExKhzti2+Jt+TKE/ms9E2z0YcSM1xnykt7NZdtNGtYq2IVRf1wAv?=
 =?us-ascii?Q?7i+7NzDccnRfaEx9qpa9yQBSMk5t+Idp7UmMov2O9sN7kQ3SnMDtPap+hXrH?=
 =?us-ascii?Q?qyFlezbdlBSFys11zn9vYR+X4XRd+1eohStb0HwLX6HBbD0F6pRlpxkVbiIs?=
 =?us-ascii?Q?CC+NQZsrLzqSx3jjtlMWDuPCYBidm2XiCfeZptFU7IR6C/DzDurw38qeKXP9?=
 =?us-ascii?Q?U4n7HDHPoi7ubqjO+HnrBzf2iEyD759uR3GSX7LXXeEc6FqGpWKgcquyG/54?=
 =?us-ascii?Q?299PbNrwBe1LwS9aK7xGiRakZul/irrmdUqjbhQx5Eq2X2rn/o2nSpN3rdRM?=
 =?us-ascii?Q?DeVMI475/Ar+Lrf0a9JSOTdXb5Gfp9u0FYM1ewd1oCg8G26Ivk4ibLIzB4N4?=
 =?us-ascii?Q?G/HxgBQvNid57dnvF87VVJ7GMWrNxq+KRZLdDwdVBJDAI1MsNLmJopulKFKw?=
 =?us-ascii?Q?LwwKDypPxhoQI41E6k8O1Aga4/uhGi8zxnpaG33+t/3UaXpm9+jca6oiKQwB?=
 =?us-ascii?Q?aE8zdccxmnegGa2EhgteE9QxfrGz4a5leNBsQI5tTHdP4aBPbeTUhrfi/qva?=
 =?us-ascii?Q?wOM+ouLcKRY0LAdHM2uiOoKrOTQ06ON4rPWgGgsf42k2o5RuKEcQKeK07sqC?=
 =?us-ascii?Q?QO+zeAeUz5lBIorhHAYhqhxmOZyUWGcS4VYI+KMDQR9IitxOSGhkEpL0K+4R?=
 =?us-ascii?Q?nFRdNk7paBcEJKjhj9oT7IKTsieZOLQlt90ICORheRfpU5ugh3y9lekmF/Dd?=
 =?us-ascii?Q?+H2SuDhSINf4xJPsOlBrS8/zDYOy8H4Xv9GfsM1aK77IH60IOW9E26l+o63R?=
 =?us-ascii?Q?yIywDfOKIVuSphugS9QKoGMlCW5faKr4Gs//cVw4?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: woHvOodGnxHX7Au8m0U8YeM+MjXuSQLvXdJYHbclByiYOcCdEPvviYVJ7h3K4Wr4wRwGj5odVJtz3Rd0PEiztKxFSSFNw5FhQ+T0Z0FKP0IqnwSGhZDZLkx21JrShTUsyFq21+OM8RYpx+Kh1UuYGcVaBt1EJ6JkDhQ129W2WYwJMRXSqqc6Yddq4fNQRzvDdKIrqGn0rAoiZ62MmlgqBH5RTB9jwOKzrXDxVh3A8HvDqdPioVIUI8CcA/ngPV+VIQJmWSQLw01spWPkm4j3NYDNpmOSuVamDBi0rvJfaiYNXKgoqLUWv6sK3EHlbXWqCdWpbGkJEVrEnVYdpWAmNU9GtLlT7+uYOKrCEwXqaLR3x1ECXX/OnbsTMbQKMcWJXNq1VenQEk/h5BMdfMnB4KnCTo5Ssl8DTPeW+8vy0g6xI9ifx8jENqPEy58f7ao69GeQrPQ+HBXrQKDIjjdYChXjkLaX78G0adIEUIJvGPg7uXNsSB/OqbgdXu/93/2RZuJHFvOWLWfiX1dEMuWrjDlDAMdYzX4/mqO2TlvPdLZjmzjG6NkM5jc8l/mt6k4yQmcsRWY5FXi1lsq0t+D4NNWRJK7HSg1LIvb7bz/5YUbhtBfPPYUsccPKvx6s7s4R8c780wsMdJpxRCLZkZCBJaFO0g+YKLXJ9kyrrvzOWKXa/rLMY05oCfgjP1q8+3Sy3buIdnTmu1XofoByaK4XDurPD0F5FkjkicHNRv7RQtCo1SLqvSdUQ9DXk6rZKMFBtbcqziiDYoqc1sej6FcnxmL8fXnhf11kHYw83flC7oAFTUxp0W9zS9f6two9da7IKtZ1XrwOTcX0W2OVG1QdqJgaaloD849Dmppc8GzWx54=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b24b41ad-ba5e-4a16-c8c2-08db3ea3f873
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Apr 2023 17:56:57.3340
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fNCroLg0LUgk9SyAy8+xZZokjZuvJbrzCoFLT57oocAjObMo8FFym+TWfVNrU2cCRtOgzax2dLycFNGKCbU7rA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4340
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-16_12,2023-04-14_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 bulkscore=0
 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2304160169
X-Proofpoint-GUID: W8JIAnHfxPaqeETw-hbNUt1yIldhBeOz
X-Proofpoint-ORIG-GUID: W8JIAnHfxPaqeETw-hbNUt1yIldhBeOz
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Currently scsi_debug_device_reset() does not do much apart from setting
the SDEBUG_UA_POR ("Power on, reset, or bus device reset") flag, which is
eventually passed back to the SCSI midlayer later for a "unit attention"
command.

There is a report that blktest scsi/007 test fails due to commit
1107c7b24ee3 ("scsi: scsi_debug: Dynamically allocate sdebug_queued_cmd").
The problem there is that there are dangling scsi_debug queued commands
when we attempt to remove the driver.

scsi/007 test triggers SCSI EH and attempts to abort a timed-out command.
Function scsi_debug_device_reset() is called as part of the EH, but does
not deal with outstanding erroneous command. Prior to the named commit,
removing the driver caused all dangling queued commands to be stopped -
this should have not been necessary.

Fix by aborting outstanding commands on a scsi_device basis from
scsi_debug_device_reset().

Fixes: 1107c7b24ee3 ("scsi: scsi_debug: Dynamically allocate sdebug_queued_cmd")
Reported-by: kernel test robot <yujie.liu@intel.com>
Link: https://lore.kernel.org/oe-lkp/202304071111.e762fcbd-yujie.liu@intel.com
Signed-off-by: John Garry <john.g.garry@oracle.com>

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index fd1c28352df0..c2d2ed3a2db1 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5291,6 +5291,26 @@ static int scsi_debug_abort(struct scsi_cmnd *SCpnt)
 	return SUCCESS;
 }
 
+static bool scsi_debug_stop_all_queued_iter(struct request *rq, void *data)
+{
+	struct scsi_device *sdp = data;
+	struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
+
+	if (scmd->device == sdp)
+		scsi_debug_abort_cmnd(scmd);
+
+	return true;
+}
+
+/* Deletes (stops) timers or work queues of all queued commands per sdev */
+static void scsi_debug_stop_all_queued(struct scsi_device *sdp)
+{
+	struct Scsi_Host *shost = sdp->host;
+
+	blk_mq_tagset_busy_iter(&shost->tag_set,
+				scsi_debug_stop_all_queued_iter, sdp);
+}
+
 static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)
 {
 	struct scsi_device *sdp = SCpnt->device;
@@ -5300,6 +5320,8 @@ static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)
 
 	if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
 		sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
+
+	scsi_debug_stop_all_queued(sdp);
 	if (devip)
 		set_bit(SDEBUG_UA_POR, devip->uas_bm);
 
-- 
2.35.3