From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Christoph Hellwig <hch@lst.de>,
Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <dlemoal@kernel.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
Jason Yan <yanaijie@huawei.com>,
John Garry <john.g.garry@oracle.com>,
Wenchao Hao <haowenchao2@huawei.com>
Subject: [PATCH v14 05/19] scsi: Add an argument to scsi_eh_flush_done_q()
Date: Mon, 23 Oct 2023 14:53:56 -0700 [thread overview]
Message-ID: <20231023215638.3405959-6-bvanassche@acm.org> (raw)
In-Reply-To: <20231023215638.3405959-1-bvanassche@acm.org>
This patch prepares for using the host pointer directly in
scsi_eh_flush_done_q() in a later patch.
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/ata/libata-eh.c | 2 +-
drivers/scsi/libsas/sas_scsi_host.c | 2 +-
drivers/scsi/scsi_error.c | 5 +++--
include/scsi/scsi_eh.h | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 4cf4f57e57b8..9a1a06a8e5db 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -738,7 +738,7 @@ void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap)
spin_unlock_irqrestore(ap->lock, flags);
ata_eh_release(ap);
- scsi_eh_flush_done_q(&ap->eh_done_q);
+ scsi_eh_flush_done_q(host, &ap->eh_done_q);
/* clean up */
spin_lock_irqsave(ap->lock, flags);
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 9047cfcd1072..dd4fb97fdc4b 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -730,7 +730,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
/* now link into libata eh --- if we have any ata devices */
sas_ata_strategy_handler(shost);
- scsi_eh_flush_done_q(&ha->eh_done_q);
+ scsi_eh_flush_done_q(shost, &ha->eh_done_q);
/* check if any new eh work was scheduled during the last run */
spin_lock_irq(&ha->lock);
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index c67cdcdc3ba8..7390131e7f0a 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -2188,9 +2188,10 @@ EXPORT_SYMBOL_GPL(scsi_eh_ready_devs);
/**
* scsi_eh_flush_done_q - finish processed commands or retry them.
+ * @shost: SCSI host pointer.
* @done_q: list_head of processed commands.
*/
-void scsi_eh_flush_done_q(struct list_head *done_q)
+void scsi_eh_flush_done_q(struct Scsi_Host *shost, struct list_head *done_q)
{
struct scsi_cmnd *scmd, *next;
@@ -2265,7 +2266,7 @@ static void scsi_unjam_host(struct Scsi_Host *shost)
if (shost->eh_deadline != -1)
shost->last_reset = 0;
spin_unlock_irqrestore(shost->host_lock, flags);
- scsi_eh_flush_done_q(&eh_done_q);
+ scsi_eh_flush_done_q(shost, &eh_done_q);
}
/**
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 1ae08e81339f..d2807d799fda 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -11,7 +11,8 @@ struct Scsi_Host;
extern void scsi_eh_finish_cmd(struct scsi_cmnd *scmd,
struct list_head *done_q);
-extern void scsi_eh_flush_done_q(struct list_head *done_q);
+extern void scsi_eh_flush_done_q(struct Scsi_Host *shost,
+ struct list_head *done_q);
extern void scsi_report_bus_reset(struct Scsi_Host *, int);
extern void scsi_report_device_reset(struct Scsi_Host *, int, int);
extern int scsi_block_when_processing_errors(struct scsi_device *);
next prev parent reply other threads:[~2023-10-23 21:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 21:53 [PATCH v14 00/19] Improve write performance for zoned UFS devices Bart Van Assche
2023-10-23 21:53 ` [PATCH v14 01/19] block: Introduce more member variables related to zone write locking Bart Van Assche
2023-10-23 21:53 ` [PATCH v14 02/19] block: Only use write locking if necessary Bart Van Assche
2023-10-23 23:29 ` Damien Le Moal
2023-10-23 21:53 ` [PATCH v14 03/19] block: Preserve the order of requeued zoned writes Bart Van Assche
2023-10-23 23:30 ` Damien Le Moal
2023-10-23 21:53 ` [PATCH v14 04/19] block/mq-deadline: Only use zone locking if necessary Bart Van Assche
2023-10-23 21:53 ` Bart Van Assche [this message]
2023-10-24 0:07 ` [PATCH v14 05/19] scsi: Add an argument to scsi_eh_flush_done_q() Damien Le Moal
2023-10-24 9:26 ` John Garry
2023-10-24 17:17 ` Bart Van Assche
2023-10-24 18:20 ` John Garry
2023-10-23 21:53 ` [PATCH v14 06/19] scsi: core: Introduce a mechanism for reordering requests in the error handler Bart Van Assche
2023-10-24 0:09 ` Damien Le Moal
2023-10-23 21:53 ` [PATCH v14 07/19] scsi: core: Add unit tests for scsi_call_prepare_resubmit() Bart Van Assche
2023-10-23 21:53 ` [PATCH v14 08/19] scsi: sd: Sort commands by LBA before resubmitting Bart Van Assche
2023-10-24 0:11 ` Damien Le Moal
2023-10-23 21:54 ` [PATCH v14 09/19] scsi: sd: Add a unit test for sd_cmp_sector() Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 10/19] scsi: core: Retry unaligned zoned writes Bart Van Assche
2023-10-24 0:13 ` Damien Le Moal
2023-10-24 17:22 ` Bart Van Assche
2023-10-25 7:25 ` Damien Le Moal
2023-10-25 19:28 ` Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 11/19] scsi: sd_zbc: Only require an I/O scheduler if needed Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 12/19] scsi: scsi_debug: Add the preserves_write_order module parameter Bart Van Assche
2023-10-24 0:13 ` Damien Le Moal
2023-10-24 17:25 ` Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 13/19] scsi: scsi_debug: Support injecting unaligned write errors Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 14/19] scsi: ufs: hisi: Rework the code that disables auto-hibernation Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 15/19] scsi: ufs: Rename ufshcd_auto_hibern8_enable() and make it static Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 16/19] scsi: ufs: Change the return type of ufshcd_auto_hibern8_update() Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 17/19] scsi: ufs: Simplify ufshcd_auto_hibern8_update() Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 18/19] scsi: ufs: Forbid auto-hibernation without I/O scheduler Bart Van Assche
2023-10-23 21:54 ` [PATCH v14 19/19] scsi: ufs: Inform the block layer about write ordering Bart Van Assche
2023-10-23 23:43 ` [PATCH v14 00/19] Improve write performance for zoned UFS devices Bart Van Assche
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=20231023215638.3405959-6-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--cc=haowenchao2@huawei.com \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=john.g.garry@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=yanaijie@huawei.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;
as well as URLs for NNTP newsgroup(s).