From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>,
Bart Van Assche <bvanassche@acm.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
Daejun Park <daejun7.park@samsung.com>,
Bean Huo <beanhuo@micron.com>, Can Guo <cang@codeaurora.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Avri Altman <avri.altman@wdc.com>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>,
Stanley Chu <stanley.chu@mediatek.com>,
Asutosh Das <asutoshd@codeaurora.org>
Subject: [PATCH 5/5] scsi: ufs: Add a sysfs attribute for triggering the UFS EH
Date: Tue, 12 Oct 2021 14:54:33 -0700 [thread overview]
Message-ID: <20211012215433.3725777-6-bvanassche@acm.org> (raw)
In-Reply-To: <20211012215433.3725777-1-bvanassche@acm.org>
Make it possible to test the impact of the UFS error handler on software
that submits SCSI commands to the UFS driver.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
Documentation/ABI/testing/sysfs-driver-ufs | 10 ++++++
drivers/scsi/ufs/ufshcd.c | 37 ++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/Documentation/ABI/testing/sysfs-driver-ufs b/Documentation/ABI/testing/sysfs-driver-ufs
index ec3a7149ced5..2a46f91d3f1b 100644
--- a/Documentation/ABI/testing/sysfs-driver-ufs
+++ b/Documentation/ABI/testing/sysfs-driver-ufs
@@ -1534,3 +1534,13 @@ Contact: Avri Altman <avri.altman@wdc.com>
Description: In host control mode the host is the originator of map requests.
To avoid flooding the device with map requests, use a simple throttling
mechanism that limits the number of inflight map requests.
+
+What: /sys/class/scsi_host/*/trigger_eh
+Date: October 2021
+Contact: Bart Van Assche <bvanassche@acm.org>
+Description: Writing into this sysfs attribute triggers the UFS error
+ handler. This is useful for testing how the UFS error handler
+ affects SCSI command processing. The supported values are as
+ follows: "1" triggers the error handler without resetting the
+ host controller and "2" starts the error handler and makes it
+ reset the host interface.
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index ecfe1f124f8a..30ff93979840 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -8144,6 +8144,42 @@ static void ufshcd_async_scan(void *data, async_cookie_t cookie)
}
}
+static ssize_t trigger_eh_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct Scsi_Host *host = class_to_shost(dev);
+ struct ufs_hba *hba = shost_priv(host);
+
+ /*
+ * Using locking would be a better solution. However, this is a debug
+ * attribute so ufshcd_eh_in_progress() should be good enough.
+ */
+ if (ufshcd_eh_in_progress(hba))
+ return -EBUSY;
+
+ if (sysfs_streq(buf, "1")) {
+ hba->ufshcd_state = UFSHCD_STATE_EH_SCHEDULED_NON_FATAL;
+ hba->saved_err |= UIC_ERROR;
+ } else if (sysfs_streq(buf, "2")) {
+ hba->ufshcd_state = UFSHCD_STATE_EH_SCHEDULED_FATAL;
+ hba->saved_err |= UIC_ERROR;
+ } else {
+ return -EINVAL;
+ }
+
+ scsi_schedule_eh(hba->host);
+
+ return count;
+}
+
+static DEVICE_ATTR_WO(trigger_eh);
+
+static struct device_attribute *ufshcd_shost_attrs[] = {
+ &dev_attr_trigger_eh,
+ NULL
+};
+
static const struct attribute_group *ufshcd_driver_groups[] = {
&ufs_sysfs_unit_descriptor_group,
&ufs_sysfs_lun_attributes_group,
@@ -8183,6 +8219,7 @@ static struct scsi_host_template ufshcd_driver_template = {
.max_segment_size = PRDT_DATA_BYTE_COUNT_MAX,
.max_host_blocked = 1,
.track_queue_depth = 1,
+ .shost_attrs = ufshcd_shost_attrs,
.sdev_groups = ufshcd_driver_groups,
.dma_boundary = PAGE_SIZE - 1,
.rpm_autosuspend_delay = RPM_AUTOSUSPEND_DELAY_MS,
next prev parent reply other threads:[~2021-10-12 21:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-12 21:54 [PATCH 0/5] UFS patches for kernel v5.16 Bart Van Assche
2021-10-12 21:54 ` [PATCH 1/5] scsi: ufs: Revert "Retry aborted SCSI commands instead of completing these successfully" Bart Van Assche
2021-10-12 21:54 ` [PATCH 2/5] scsi: ufs: Improve source code comments Bart Van Assche
2021-10-12 21:54 ` [PATCH 3/5] scsi: ufs: Improve static type checking Bart Van Assche
2021-10-12 21:54 ` [PATCH 4/5] scsi: ufs: Log error handler activity Bart Van Assche
2021-10-13 7:43 ` Adrian Hunter
2021-10-12 21:54 ` Bart Van Assche [this message]
2021-10-13 7:19 ` [PATCH 5/5] scsi: ufs: Add a sysfs attribute for triggering the UFS EH Greg Kroah-Hartman
2021-10-13 16:50 ` Bart Van Assche
2021-10-13 8:09 ` Adrian Hunter
2021-10-13 10:11 ` Avri Altman
2021-10-13 16:56 ` Bart Van Assche
2021-10-14 6:11 ` Adrian Hunter
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=20211012215433.3725777-6-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=adrian.hunter@intel.com \
--cc=asutoshd@codeaurora.org \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=cang@codeaurora.org \
--cc=daejun7.park@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=jaegeuk@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=martin.petersen@oracle.com \
--cc=mchehab+huawei@kernel.org \
--cc=stanley.chu@mediatek.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