From: John Garry <john.g.garry@oracle.com>
To: jejb@linux.ibm.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
dgilbert@interlog.com, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 08/11] scsi: scsi_debug: Drop check for num_in_q exceeding queue depth
Date: Tue, 7 Mar 2023 10:55:52 +0000 [thread overview]
Message-ID: <20230307105555.3745277-9-john.g.garry@oracle.com> (raw)
In-Reply-To: <20230307105555.3745277-1-john.g.garry@oracle.com>
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 6707ccdc07c9..fb7434d09cb9 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5599,15 +5599,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
next prev parent reply other threads:[~2023-03-07 10:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 10:55 [PATCH 00/11] scsi_debug: Some minor improvements John Garry
2023-03-07 10:55 ` [PATCH 01/11] scsi: scsi_debug: Don't hold driver host struct pointer in host->hostdata[] John Garry
2023-03-07 14:58 ` Bart Van Assche
2023-03-07 15:12 ` John Garry
2023-03-07 10:55 ` [PATCH 02/11] scsi: scsi_debug: Stop setting devip->sdbg_host twice John Garry
2023-03-07 10:55 ` [PATCH 03/11] scsi: scsi_debug: Drop scsi_debug_abort() NULL pointer checks John Garry
2023-03-07 10:55 ` [PATCH 04/11] scsi: scsi_debug: Drop scsi_debug_device_reset() " John Garry
2023-03-07 10:55 ` [PATCH 05/11] scsi: scsi_debug: Drop scsi_debug_target_reset() " John Garry
2023-03-07 10:55 ` [PATCH 06/11] scsi: scsi_debug: Drop scsi_debug_bus_reset() " John Garry
2023-03-07 10:55 ` [PATCH 07/11] scsi: scsi_debug: Drop scsi_debug_host_reset() device NULL pointer check John Garry
2023-03-07 10:55 ` John Garry [this message]
2023-03-07 10:55 ` [PATCH 09/11] scsi: scsi_debug: Drop sdebug_dev_info.num_in_q John Garry
2023-03-07 10:55 ` [PATCH 10/11] scsi: scsi_debug: Get command abort feature working again John Garry
2023-03-07 10:55 ` [PATCH 11/11] scsi: scsi_debug: Add poll mode deferred completions to statistics John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230307105555.3745277-9-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=dgilbert@interlog.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®