| Message ID | 20240325224417.1477135-1-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING | expand |
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.
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
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(-)