From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, stable@vger.kernel.org,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
Mike Christie <michael.christie@oracle.com>
Subject: Re: [PATCH] scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
Date: Fri, 5 Apr 2024 12:49:49 -0700 [thread overview]
Message-ID: <5b36f7c4-faab-4cdc-ba80-e7135ba50242@acm.org> (raw)
In-Reply-To: <20240325224417.1477135-1-bvanassche@acm.org>
On 3/25/24 15:44, Bart Van Assche wrote:
> There is code in the SCSI core that sets the SCMD_FAIL_IF_RECOVERING
> flag but there is no code that clears this flag. Instead of only clearing
> SCMD_INITIALIZED in scsi_end_request(), clear all flags. It is never
> necessary to preserve any command flags inside scsi_end_request().
>
> Cc: stable@vger.kernel.org
> Fixes: 310bcaef6d7e ("scsi: core: Support failing requests while recovering")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/scsi_lib.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index ca48ba9a229a..2fc2b97777ca 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -633,10 +633,9 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
> if (blk_queue_add_random(q))
> add_disk_randomness(req->q->disk);
>
> - if (!blk_rq_is_passthrough(req)) {
> - WARN_ON_ONCE(!(cmd->flags & SCMD_INITIALIZED));
> - cmd->flags &= ~SCMD_INITIALIZED;
> - }
> + WARN_ON_ONCE(!blk_rq_is_passthrough(req) &&
> + !(cmd->flags & SCMD_INITIALIZED));
> + cmd->flags = 0;
>
> /*
> * Calling rcu_barrier() is not necessary here because the
Also for this patch, please help with reviewing this patch.
Thanks,
Bart.
prev parent reply other threads:[~2024-04-05 19:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 22:44 [PATCH] scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING Bart Van Assche
2024-04-05 19:49 ` Bart Van Assche [this message]
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=5b36f7c4-faab-4cdc-ba80-e7135ba50242@acm.org \
--to=bvanassche@acm.org \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=michael.christie@oracle.com \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).