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 02/11] scsi: scsi_debug: Don't iter all shosts in clear_luns_changed_on_target()
Date:   Mon, 27 Mar 2023 07:43:01 +0000
Message-Id: <20230327074310.1862889-3-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?3uOgYgX/yO5Mor1BDndTcp4jzCAEUQ8UE5N3E+tjZrFsReAo3/FNRv2EBjYb?=
 =?us-ascii?Q?8MQWDEh9O3J7k0KZ2LdeEm/kFh/sqyLyDxHsOiiHuApLi9cgQh3tg4KPF9LH?=
 =?us-ascii?Q?pWV2Sf/3xAqK14+EGTDa+KIV96zUI1lxHC4/sXHORuuvH3S2PkLeGdL9EsSe?=
 =?us-ascii?Q?1TemcK/YKwtDTgheqfFcJo29L+1vvkZa3w+rCzeRrWEzWYU0UWG1s6zkXBDH?=
 =?us-ascii?Q?9K4lrzgQe5kscjIBfOjAPvyKI23ahT6ZdvQ9kkv//5S8sBuxc6f5qYHeIw0m?=
 =?us-ascii?Q?tIl8fwVa2n0dpCt3r9rfEyd2gUg41yhwRwtJsK9BCtQr8CGQaZ0RElaNmvaq?=
 =?us-ascii?Q?u7iVDykLL7saCZ/WTxG3bwO4i8p83S7rqqGo8UJv6IjbWc77mwXn3Eh+KN9+?=
 =?us-ascii?Q?0vkahnnQsCG37kwVnuCrPqzH/7AqR4CF1yJTfsh8vw6qeftgm7y3VutTRKT3?=
 =?us-ascii?Q?zfBNqfXezIJaB1pDJDTnZiOZ6jfQ4zgfjR2cY47JSO/UugLAow6E+QKRKGrJ?=
 =?us-ascii?Q?70wKEb1kHmyzN9A+cpc35Jx2dR2iYv/mmIZp5dT0hnCHJti6k645H6V7AIVs?=
 =?us-ascii?Q?yeKFG7Y3xHk/uYdOGn4oboYJWrj1aQda3Us8ZOYVH+C1Y4pDjaGPhkkPKwG/?=
 =?us-ascii?Q?wBKw5V1E+6QxlkAgLErFU4AteRCBM1JSNjVV2BqxAQE/S68b3Jtir2XYlhZh?=
 =?us-ascii?Q?7YxHUF7MzskQdHxZPbv5FXFy7q4jTNlQObumuF7LvIBP3CBL2SXkdSsbWVkH?=
 =?us-ascii?Q?krRPczGL+ovslZ1c1iZDw9dN/Uy1Hmn8zCpVJA41gkunFAaGQFNxctjWKOaJ?=
 =?us-ascii?Q?esrSUI4VC7y4/mSRjSjY+h5zcJwxqVVO49jShjLonyoGcxsJUuBgVhKNsnEC?=
 =?us-ascii?Q?BnMdE6jtPPtSPhvCeBcz2YssltzehcG66w4Ptq4A9hJ70Aue/dBtjhpZBL6M?=
 =?us-ascii?Q?aLt3oSg5yhh1IcQwyB8ORb6EiZ4+CenkJpkklRvXF8hSbhTvdRri8HcYhc4U?=
 =?us-ascii?Q?Ugwctyxx5pXfUaLircdPKihSSqwk+i0EZohrPOfpJJ3OLUshGwYEu80vG8dk?=
 =?us-ascii?Q?KvbUQnJZKV/xrJJofW4yYtYDCSGfoXAeC10CM96RksjIsk+7z4teqyQ3w4VF?=
 =?us-ascii?Q?K/PKnTi5Vy33z9Ax6uagt+Y1jn23DAyxdnx5l4DPbEBidaVjS121E1ihO4sd?=
 =?us-ascii?Q?o4ovDAeTdE2lVMstf8vf1JnUz1Gxcy+3nj6E453OoMN5KL9JBZApe6ntWJrv?=
 =?us-ascii?Q?n+5ERg96sQvn6sAAiIhR2SrHSdk4EgVTP6qgSjTWbpkFEjLB07s+TrWc5R+L?=
 =?us-ascii?Q?aEwumJ6iTFAURQPdcAiVfYBTyfDuSZrgvSXKSpG4hLumES3rFineNtrTg9eL?=
 =?us-ascii?Q?Z4EdQduBCwYtYLzbIFg4VIjMk+M6SDoy9z2OxVMjEPNF1VrpsxgWs2xgd3Gs?=
 =?us-ascii?Q?0dq//kjfxy9wZoIZ7X634AB4QvkWkN/OEXeh8hRTCjDKh9V5yf/354iWNpmT?=
 =?us-ascii?Q?QsBkFZ+2FSsHyQhq8kHIIO9DbP+7dVjKXtQBKzN10JdGRMQ9nZ3ucv+adgtZ?=
 =?us-ascii?Q?mjQQEgqam53DSx9mzSorXGRPlTzk/yAr4GkwmATY+cpaY4bQFUEOCJDiCK8f?=
 =?us-ascii?Q?ZQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: EbYuII+OQftvaYH4+8X8z0JNgjpNpEXWs4elWnFeiL2nuK4mPzG5ewewkXgDXzUgKhPBq2xRAWFAHh9YJw3Mbz5SeSXIDdj7OguOyY/BVpp96+ZnklXz6wEOaKD8WBrXSmyNmQ/rYZfxVvXYFethE5QyKLCZZrYGZCsu5djFQEaxHhZlgiWX6QS2fmpZ7AjEa6Kh4v8AEi1rAqWYwig/q/zpTnkIXmvZeTdCRGwA7564j+smEmtxHqUS4TVQfMQfLKWzB/Y8dhP10D7E0EFDYr95vage4+TjmyXdGoix5qB4qougNEJR3va78xy3Fhhc6jdmLl/RtgZ4uDIFpYSLl5SrVXhHBLiIWEOgGEE9bmDbSQyFfgVe/Z4gWZt/f/Iz2aqs4XA+JvSoqZP8i1h3luInoP52yD6UCoBVbTMrgrAvym51fT8gzeU3O246bhS8eA4tu8cu7alDjzBV75HYdxy7uDtKQntDbBuUD1AC66dZdBcGAswJb0MUK10wFuSVvU3GFUQunI5P0vlrLckNOQjS/xjynyo4UfIYMsLjy19NSmOAskpzVbarzjT51CJGbplPiap/z6KRs/ZDU+ZRQ7e3zfK3LVG88JSgpf/0/I34gx6Rc6cU0kWo3k7J/OFLSucxa27U5jHMw6AxdbbwsuuUqYlEqtI9d3G0F82eNZFR6Osb/azExWkaBx5sPPWV8qDQM/42QDKC73AqglQrQMPKZLJXKSEvLqE71+fBy+aHJheTcPjGrD/sCIH5XXcSIBWc5BDd7aWPi7mM9WvF5HsljBCNGxHOPUWnltdi0vt0LGVzGjT9gE58wuZUpjC4Pi6JbTtVw2lqE1ltz2iFKxvKq/IEF5NXV4R7DA/tQqA=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f0a69e6e-548d-48d4-b5f7-08db2e96f053
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:21.5515
 (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: DQp1AV6dSIVtEh2gFTj0+P1vzsPyij/m3bysRC3BHXvc1yRzvyETLNhKaXdqrjFMxUgNua/Z3pe6H2/bSrCRaQ==
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: E4bcptEgjTaHcCUNOOELuuaEYSoo7d4v
X-Proofpoint-GUID: E4bcptEgjTaHcCUNOOELuuaEYSoo7d4v
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

In clear_luns_changed_on_target(), we iter all devices for all shosts to
conditionally clear the SDEBUG_UA_LUNS_CHANGED flag in the per-device
uas_bm.

One condition to see whether we clear the flag is to test whether the host
for the device under consideration is the same as the matching device's
(devip) host. This check will only ever pass for devices for the same
shost, so only iter the devices for the matching device shost.

We can now drop the spinlock'ing of the sdebug_host_list_lock in the same
function. This will allow us to use a mutex instead of the spinlock for
the global shost lock, as clear_luns_changed_on_target() could be called
in non-blocking context, in scsi_debug_queuecommand() -> make_ua() ->
clear_luns_changed_on_target() (which is why required a spinlock).

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

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 782515abca2c..eba6eca81e84 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1063,18 +1063,15 @@ static void all_config_cdb_len(void)
 
 static void clear_luns_changed_on_target(struct sdebug_dev_info *devip)
 {
-	struct sdebug_host_info *sdhp;
+	struct sdebug_host_info *sdhp = devip->sdbg_host;
 	struct sdebug_dev_info *dp;
 
-	spin_lock(&sdebug_host_list_lock);
-	list_for_each_entry(sdhp, &sdebug_host_list, host_list) {
-		list_for_each_entry(dp, &sdhp->dev_info_list, dev_list) {
-			if ((devip->sdbg_host == dp->sdbg_host) &&
-			    (devip->target == dp->target))
-				clear_bit(SDEBUG_UA_LUNS_CHANGED, dp->uas_bm);
+	list_for_each_entry(dp, &sdhp->dev_info_list, dev_list) {
+		if ((devip->sdbg_host == dp->sdbg_host) &&
+		    (devip->target == dp->target)) {
+			clear_bit(SDEBUG_UA_LUNS_CHANGED, dp->uas_bm);
 		}
 	}
-	spin_unlock(&sdebug_host_list_lock);
 }
 
 static int make_ua(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)
-- 
2.35.3