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-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        bvanassche@acm.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH v3 08/11] scsi: scsi_debug: Use blk_mq_tagset_busy_iter() in stop_all_queued()
Date:   Mon, 27 Mar 2023 07:43:07 +0000
Message-Id: <20230327074310.1862889-9-john.g.garry@oracle.com>
In-Reply-To: <20230327074310.1862889-1-john.g.garry@oracle.com>
References: <20230327074310.1862889-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?Id68dCqrTcLzcS6hKX9SX/ubq3Zj+S3f08DVXbpt2ay0J3ZPZzJAyp0/yqgC?=
 =?us-ascii?Q?Ubd0D6fWxeyPDx0pivhhOtgOhhOszyAWiC32WIKa/7MWWSfNdSn1CfLw7HiJ?=
 =?us-ascii?Q?jYJA2LDqEAW4UomupFeid52+HaypzCVWVTGnKcBxjASqfJ3DnHB/tKXqFVya?=
 =?us-ascii?Q?7mpi9fN6JS/8NYV20u26hAAeaMaoqY6/FpQG3PoZ9CGVMxk+7/H5JZhU+kX2?=
 =?us-ascii?Q?vteayalP0XK9R1mjPrdet1D9TTGiLKW5n+nzlEmcmHcPgOGBzBPkFEu5gpPG?=
 =?us-ascii?Q?ZP3NGv4DIh+TGuBMsNgGWIWMtc3ethNu8NPJdRh7AzbM1aDNyA9fk6/rDv9/?=
 =?us-ascii?Q?M2b7YFYuEHECEuvzonTEza4YwBmxH31MW7oiOZYCGPmQZrVE7Qjb1Lh/hOkR?=
 =?us-ascii?Q?vu2ULmxl2sVwwZbp4kKvJPvpQ9+h4WyiU2deDnu4lPYuOFaRpDLM5O32/XTw?=
 =?us-ascii?Q?buo47nYo6XWjk+8gkJH0VxXBm9FNw2/SYcqjiu7iTgFnTtwXPPRFZ0s8+ymc?=
 =?us-ascii?Q?duBXFdX9DnMNkYMXK1Fb7MpfCsHTSG5+aDg8+H+feioHQBRk79jEYiul52hb?=
 =?us-ascii?Q?lJtuXX1UJ61k4mqjPA7h1aupGcoJuwVsFN+ycmKP0QDqn1ZYeKhMM45l6nz0?=
 =?us-ascii?Q?ZasGLM5uoJ0HV9XxP6jbFgLrvjjTCDUQwrnZzL4n1Wq+yM1ymrLmyDsMO3oz?=
 =?us-ascii?Q?F8hdftOL9mpNAbrWr5vf0kW6DOpwKcI0ZVe3t7fAlVFbn8/Jf/gljuJ4GqKi?=
 =?us-ascii?Q?ZKgD0LhCKMhvgpeLCZNWeY36Kc7S0WcBynHv6aO86ReGE1o9SKAnbfQfBhAL?=
 =?us-ascii?Q?N1FXUaLKsVUKzoKwTF7lJexhQ6Fm9lNrut506/4XRprZC6i2iSCI8OtSAcWH?=
 =?us-ascii?Q?XwDktWtsHGxJsK+/F00zY+5Bg7U6UYkfMcSneux7Qa69Y4dOrOjNKdkVlBN4?=
 =?us-ascii?Q?adja7+FQDBNR0xNVgFvsWjp/6VSTXyt96IcRVds1Yda5A+UQyRbolWyCVcne?=
 =?us-ascii?Q?CT8ylDWwOx9AVyjkk1GUwRMOW/2tHv7j7QWYONmNNbH5P2rH6ZuUmz+/+8dl?=
 =?us-ascii?Q?vdmz6wW5CP/WPS9bhXtrtiVARUuImNWkHokqElWxHwMqMCaDp7I5nb5Hv8my?=
 =?us-ascii?Q?4FpzzRznNlMwBsIhcMKsYtQ/se+hv6ivCJc3grQUdJ33ufySyb3YsjRTQEdk?=
 =?us-ascii?Q?+H+BBcUFu5/Tjf/8M08ncGFlndDr1GMBghsgKkKXuU4xeCwxL+tT0hJsAmYb?=
 =?us-ascii?Q?0a0Padm74LWCI7Vn0aRg2ofCxG+BuL9X5thld8A55gscINiwHScJiENnkdkR?=
 =?us-ascii?Q?EScwFDTu//XJG2eG2tLrE8VYbzx3zQ6rIItUNC5I/SSJznI8GHRhxHWv7OkD?=
 =?us-ascii?Q?BGtxGBEFTA478bH082/IpOvY5ODqxtJCCjl02JfV9iHiTPlNAN7N51JOjw6c?=
 =?us-ascii?Q?vF9vRdFZ0BVgmnr8JdbXJHU0XVzHJSxNUgFrD8vysVFh9H/MMR5B/QiAizEF?=
 =?us-ascii?Q?2cWcZw4cnrbcq3r2dGjrAG++tlN2MNuBOu6EwIfNY9LM7/fxHQa9UVZ8dvn0?=
 =?us-ascii?Q?ye1EpFfkonKOeEIN6ALC8nXH9ekNiR6EkBONWXzF6lDqgnd8V0diANRxDjOG?=
 =?us-ascii?Q?yg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BanFRSTfZ9vmwNFos3AuYYkvP6QjStA5UXRauX8R9QcR9S20SfvMW69AAzAm4Wje1JsUGVFuqoeLTGZfjqhIBMPMWMaiUHbXfc2ePfnG9VgLZO+oUTYv0FWbsZi8cTcJOJC2Qp/3qWKLh2j8QhWMEgYUWlDdCKFNJiEybKrpKhxp/llV54bpbiWDYxeK8fvWxsWcmFFyCkfeWlkRZZjVIncckVolPaetfo08fq7uphLmug6uBlgcMnNyRWNkN88qZ0c5rznyVGSUuHLdw6j1oWYfweKQux6W0MKYmTwNgZtzABxTgDTrmQ0tJoq3NT043hKStjIg6T8/S1NyaCiRNhjdVXeWFjbF8wafSr7RhKWD9KP8enLGB+CBMn8Up5BIfEjv5E8K+LAASTw4KUhOKRKsfeXBe/bP66ZWgq3Tl+VZIHI1z5Wyt7622GnWslj3XYJ7DUACHWq6tFMPSA2AS9tlnUMs9HspWbtrXMaWgoHw1vij7Dp6LrvgjDqwUaYs4SF2kn8cuwkITl/dOK/CAqCyQ0k2RLaVWxuUMX3N17qTnyKVhyvFHD0HYytIEz7s3EkypK0gizO4hD83ix+i1CtGTnd4XyVyxqBvRfKs2Z0EYhi9SvZDKW9L6JA0sSeji934Xxu+RWzt9+KFtGSXxR1Mv8W8AuB6U+4FKTIabquYquHEarVLDyMUuTlhwt569IxOHvpUmHD+AIlRYWX1HLgtmkKYMlZUvRqNj6CEarUyYt+DEEucwu67JGDOiamxPXLO2iacLutppAplz3TaKsHQMiai4OL6Gp79Y4wecQxdJAOwUbIfnu9Ztz+o3GszjdURjKCc6ZvTVOpiRZGthzXHuW1eHTfK8NWnXw4hFP4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 52418e41-9b66-4455-d104-08db2e96f55d
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 07:43:30.0220
 (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: kUhT8KU26vfW8qS1XKfZ+MgGRHDSQD5TV6ZRK072nqmDpR5rwPCl0YfUwzAih5OVV/bV/LX8wbTWWaUFuWtf5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6728
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-03-24_11,2023-03-24_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 phishscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2303270062
X-Proofpoint-ORIG-GUID: KDNLsvIDvhklt04hjN3jl4BQZb0G1LSa
X-Proofpoint-GUID: KDNLsvIDvhklt04hjN3jl4BQZb0G1LSa
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,
        SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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

Instead of iterating all deferred commands in the submission queue
structures, use blk_mq_tagset_busy_iter(), which is a standard API for
this.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/scsi_debug.c | 45 +++++++++++++++------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 3330848f13cc..677fb177ccd3 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5326,40 +5326,29 @@ static bool scsi_debug_abort_cmnd(struct scsi_cmnd *cmnd)
 	return res;
 }
 
+/*
+ * All we can do is set the cmnd as internally aborted and wait for it to
+ * finish. We cannot call scsi_done() as normal completion path may do that.
+ */
+static bool sdebug_stop_cmnd(struct request *rq, void *data)
+{
+	scsi_debug_abort_cmnd(blk_mq_rq_to_pdu(rq));
+
+	return true;
+}
+
 /* Deletes (stops) timers or work queues of all queued commands */
 static void stop_all_queued(void)
 {
-	unsigned long iflags, flags;
-	int j, k;
-	struct sdebug_queue *sqp;
+	struct sdebug_host_info *sdhp;
 
-	for (j = 0, sqp = sdebug_q_arr; j < submit_queues; ++j, ++sqp) {
-		spin_lock_irqsave(&sqp->qc_lock, iflags);
-		for (k = 0; k < SDEBUG_CANQUEUE; ++k) {
-			if (test_bit(k, sqp->in_use_bm)) {
-				struct sdebug_queued_cmd *sqcp = sqp->qc_arr[k];
-				struct sdebug_scsi_cmd *sdsc;
-				struct scsi_cmnd *scmd;
+	mutex_lock(&sdebug_host_list_mutex);
+	list_for_each_entry(sdhp, &sdebug_host_list, host_list) {
+		struct Scsi_Host *shost = sdhp->shost;
 
-				if (!sqcp)
-					continue;
-				scmd = sqcp->scmd;
-				if (!scmd)
-					continue;
-				sdsc = scsi_cmd_priv(scmd);
-				spin_lock_irqsave(&sdsc->lock, flags);
-				if (TO_QEUEUED_CMD(scmd) != sqcp) {
-					spin_unlock_irqrestore(&sdsc->lock, flags);
-					continue;
-				}
-				scsi_debug_stop_cmnd(scmd, NULL);
-				spin_unlock_irqrestore(&sdsc->lock, flags);
-				sqp->qc_arr[k] = NULL;
-				clear_bit(k, sqp->in_use_bm);
-			}
-		}
-		spin_unlock_irqrestore(&sqp->qc_lock, iflags);
+		blk_mq_tagset_busy_iter(&shost->tag_set, sdebug_stop_cmnd, NULL);
 	}
+	mutex_unlock(&sdebug_host_list_mutex);
 }
 
 static int scsi_debug_abort(struct scsi_cmnd *SCpnt)
-- 
2.35.3