From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, bvanassche@acm.org,
        linux-kernel@vger.kernel.org, dgilbert@interlog.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RESEND v2 08/11] scsi: scsi_debug: Drop check for num_in_q exceeding queue depth
Date:   Mon, 13 Mar 2023 09:31:11 +0000
Message-Id: <20230313093114.1498305-9-john.g.garry@oracle.com>
In-Reply-To: <20230313093114.1498305-1-john.g.garry@oracle.com>
References: <20230313093114.1498305-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?ptViY02FdGmH1mTkcFF0yOHzKnBtcrpTvvuIsvRPy4xTATrPIkEOXKwXBpFo?=
 =?us-ascii?Q?ZAWdgmQVtHXOGCNycAVAftfOA58OQWjFJ0sjnd084kEegvUEgRvPZET9n/kt?=
 =?us-ascii?Q?QBP6U1PyBriPEBEahTdb84t1z7VCDgpFbOsq6lphZ39BgJ90msZlMS4lZTsJ?=
 =?us-ascii?Q?SC+37HBOBqL2NtRpe4jbBhEUswwYZt0oXoeHYsW5PqLa71tSsfve5djh77HD?=
 =?us-ascii?Q?JPR0oiLtKY0swAjo2sjPtj/Z8QV69w5S50hqcyfeRNk2WhjZDp6uf0Fj5eaJ?=
 =?us-ascii?Q?tegTNshC8Di1HLR66dpwOnBSts/mLLo6QA7dEuQYmSkWCEl8EMZ5BPL54hq7?=
 =?us-ascii?Q?XE0+mmXn0Z2YgatejJ8zAJeqdd/2dxejVE0qhIcnT5AD8swBsQrcbXYg5Fa7?=
 =?us-ascii?Q?qu3fvmcWDbz6u94cYMqmGOAeen/HIOySGg3Wr47iFXVf68UEoxuR+/9MGHCe?=
 =?us-ascii?Q?m9kCeDHT/MWMwB3Ha4Le/QBzHfXhluxJC+4dUvo3IdkeBmDtkl4qCiS6Z/iR?=
 =?us-ascii?Q?G/sbAxcTcRFOKsXEDzN6lbqJ3BUgR2hM/Y+nL7p+bBx6au1gwQ2Hk+JE3z5r?=
 =?us-ascii?Q?Si0hRQmTmLWkJnO+GcCIuhZsprAOxT9/L+sTSHUgwzXU0XTTd/Qh5ABnUeqX?=
 =?us-ascii?Q?OiuOh8qlHr63ovaY6xLdDYkbKnKAYQbJKlRMpZsvSKSafvWBJ0LTawHxVzxT?=
 =?us-ascii?Q?D/i8D8AriP05wXicG110BMVeL5VI43CDQohkHLoPkEXvJrlCj29rk9MKXxDH?=
 =?us-ascii?Q?YpNge7NHlUe3z2kADnj6F0MgOxfY32jRY2Typ/ydF5UibBw4Zh9W84qOYmFq?=
 =?us-ascii?Q?estSmtlWM9rvW7xxvMFFSetpwBE1B3HKip9XPqNhqKf5de0XA5wJvTLrM73F?=
 =?us-ascii?Q?YKC7KrzyEZ1u8jcygjVDiwJtQPICeEVgsoWNqw7L7vib5qWWsh1jthYhpK85?=
 =?us-ascii?Q?BEXHP01o/tHMtV2MUJ4TyL4WA82TlUt1kgGLK/YElPQVg8YZhUztzIX0Juve?=
 =?us-ascii?Q?XSNjKAwCECT3I0yP5PobgObYd03S2P87hWKzhw56JPVY+ICxszutuCUxCEiR?=
 =?us-ascii?Q?mcggPxZMn4i+tiPnKrOUOILaHiYMMOCAKEhT3oT4CKXyRLJdDTDRelnKGuDS?=
 =?us-ascii?Q?aRG8jsIm1eWl0dlTnC/7WpSt0Vdpto+hA0rJ644Kd4AxaUxcfwcKv94y1Fjm?=
 =?us-ascii?Q?20wuchYlPu2rHoxs4vcqvckfhzlRD47WyTAaRHVa9YvgUeZ4p08qznZWKk88?=
 =?us-ascii?Q?23bFBkQSwtPR+o3wCdtsQIKufR38JNzuu1GECF/wvdf8nNaKqEcM83y0v1xX?=
 =?us-ascii?Q?JAl6hVO1NMEjB5x7IaZZtzvapAH9OOs7MRCzaXAXeNfKRxvdLHD4UTmCPq/N?=
 =?us-ascii?Q?Q5IYpyrQqQvmibXtfveVGTyXZ7Z6nqmZtSQ3qMIwb/21GjiuO3F0dFuVbc23?=
 =?us-ascii?Q?3oZ236n790VWDhwFpFL5QnHYuMxiKr2ulkGIz6i/6BTmaPsiLKwWU9Lhv5Bv?=
 =?us-ascii?Q?kxVS5xAm+lMxp36tbIV74CVZzUtv+AuJHRkZQwdGEXQv4X/fN8a1sXhn8Suv?=
 =?us-ascii?Q?UduF5gPLGxhmso6eTXKW4U7lKQDMrUkYx2VBS6S/LpC+JaPpqav1S7BCkqUR?=
 =?us-ascii?Q?dQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: kThzC0ktoDddgNvgE7YTu1r40x26Mllt/05v4MmXAMMKaNWqGr5gEtN3jcftQVezIFV/rkWJUGzaiL4cRD24Bsbl+jgP+ztPTZObbMvLjhJFUVv3rExWQMfgXXOT5ud0AqHPJI8na/3kd0NkI0SRkd4ibR3oKuoYuTVY0Bu8Ao14iqIuwqOE8LJWkD/gj7m4lzeDw66qfOPoqPmYjDVUesSmIzv8Mz6YNOCPLZzp96iQMdFTeGVyRFuPB4lhvmjDqb4ANs/XHBOVOevZjTfAy4wbtlwpkdBk1zzZVILggJaEKFPKVCdkLieFVEadJg3T/6m6rA7OHusA9fBsxFmjxj1j2PvL3Rmmkfc5m9bx2Akufkfsivh4O6Gq1WLN4K1hhNiStnKhdnhkTLFgsuivNosJg5rr9qQVA2lqbTgN7qvRpVZEnzT0U10qhY6TpuXxMngiZcB37vetnUzQVN9mhcYp7NZD+txqvcWddtc16M9qUDUjk1A/fGJ4Td7AUwgPcC1gioejADAcFWyFwvF35q6GyFkYAKKuOIe1kYbEgMXcI9xTCJfdoE1f7pFyae4VSgyH+5Kb8rFq4PNbzGZNkzQ2kIjRDsYj720SHuigJtRHt6LwzKooTMt8wXolCgxjxtE4zkPriypkvcW30CyEG9iW3zZt5teSekMi9PTF7HLFPXPoYJX6st03tzcvuVBiB9m28u9fcoz1ttK0/QROjoOjLwtBb5mcDIZpgrFHF8Wr3ibtaBTP/tPdcTnn16DaaTbRF8w9Iiqt61JLxuROM7AiestToZJe6xl9wOGOXtzLrIf2ejIha3gpN6ZoTEoYR9jhkXCUFWperPFevUu6cvgOAdupEQf2wMwOvC4wzPo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 11b9a4dd-b8d3-4245-76d9-08db23a5c769
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 09:31:52.6929
 (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: SItzw3ofX/Vj2Qby43WWqLTxvrQVo6XK0udK35fo1MDi0TLh1cc/65/LF/NeZexmWue7sfnTbf6sIECp4c3gkA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB7048
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-13_02,2023-03-10_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0
 suspectscore=0 spamscore=0 malwarescore=0 adultscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2303130077
X-Proofpoint-ORIG-GUID: bsKQt3nwa43I2YQHblmw0yaqz3DqxV67
X-Proofpoint-GUID: bsKQt3nwa43I2YQHblmw0yaqz3DqxV67
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The per-device num_in_q value cannot exceed the device queue depth, so drop
the check.

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

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 47820b9f6326..0d515bac93bf 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5593,15 +5593,8 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,
 	}
 	num_in_q = atomic_read(&devip->num_in_q);
 	qdepth = cmnd->device->queue_depth;
-	if (unlikely((qdepth > 0) && (num_in_q >= qdepth))) {
-		if (scsi_result) {
-			spin_unlock_irqrestore(&sqp->qc_lock, iflags);
-			goto respond_in_thread;
-		} else
-			scsi_result = device_qfull_result;
-	} else if (unlikely(sdebug_every_nth &&
-			    (SDEBUG_OPT_RARE_TSF & sdebug_opts) &&
-			    (scsi_result == 0))) {
+	if (unlikely(sdebug_every_nth && (SDEBUG_OPT_RARE_TSF & sdebug_opts) &&
+		     (scsi_result == 0))) {
 		if ((num_in_q == (qdepth - 1)) &&
 		    (atomic_inc_return(&sdebug_a_tsf) >=
 		     abs(sdebug_every_nth))) {
-- 
2.35.3