From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <james.bottomley@hansenpartnership.com>
Cc: linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Bart van Assche <bart.vanassche@sandisk.com>,
Ewan Milne <emilne@redhat.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 33/36] scsi: Add 'access_state' attribute
Date: Tue, 29 Sep 2015 12:47:35 +0200 [thread overview]
Message-ID: <1443523658-87622-34-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1443523658-87622-1-git-send-email-hare@suse.de>
Add an 'access_state' attribute to struct scsi_device to
display the asymmetric LUN access state.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_scan.c | 1 +
drivers/scsi/scsi_sysfs.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
include/scsi/scsi_device.h | 1 +
include/scsi/scsi_proto.h | 13 ++++++++++++
4 files changed, 64 insertions(+)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 5d3e2ae..76e771e 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -230,6 +230,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
sdev->lun = lun;
sdev->channel = starget->channel;
sdev->sdev_state = SDEV_CREATED;
+ sdev->access_state = SCSI_ACCESS_STATE_UNKNOWN;
INIT_LIST_HEAD(&sdev->siblings);
INIT_LIST_HEAD(&sdev->same_target_siblings);
INIT_LIST_HEAD(&sdev->cmd_list);
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 37799dc..38e157a 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -81,6 +81,34 @@ const char *scsi_host_state_name(enum scsi_host_state state)
return name;
}
+static const struct {
+ enum scsi_access_state value;
+ char *name;
+} sdev_access_states[] = {
+ { SCSI_ACCESS_STATE_OPTIMAL, "active/optimized" },
+ { SCSI_ACCESS_STATE_ACTIVE, "active/non-optimized" },
+ { SCSI_ACCESS_STATE_STANDBY, "standby" },
+ { SCSI_ACCESS_STATE_UNAVAILABLE, "unavailable" },
+ { SCSI_ACCESS_STATE_LBA, "lba-dependent" },
+ { SCSI_ACCESS_STATE_OFFLINE, "offline" },
+ { SCSI_ACCESS_STATE_TRANSITIONING, "transitioning" },
+ { SCSI_ACCESS_STATE_UNKNOWN, "unknown" },
+};
+
+const char *scsi_access_state_name(enum scsi_access_state state)
+{
+ int i;
+ char *name = NULL;
+
+ for (i = 0; i < ARRAY_SIZE(sdev_access_states); i++) {
+ if (sdev_access_states[i].value == state) {
+ name = sdev_access_states[i].name;
+ break;
+ }
+ }
+ return name;
+}
+
static int check_set(unsigned long long *val, char *src)
{
char *last;
@@ -932,6 +960,26 @@ sdev_store_dh_state(struct device *dev, struct device_attribute *attr,
static DEVICE_ATTR(dh_state, S_IRUGO | S_IWUSR, sdev_show_dh_state,
sdev_store_dh_state);
+
+static ssize_t
+sdev_show_access_state(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct scsi_device *sdev = to_scsi_device(dev);
+ enum scsi_access_state access_state;
+ bool pref = false;
+
+ if (sdev->access_state & SCSI_ACCESS_STATE_PREFERRED)
+ pref = true;
+
+ access_state = (sdev->access_state & SCSI_ACCESS_STATE_MASK);
+
+ return snprintf(buf, 32, "%s%s\n",
+ scsi_access_state_name(access_state),
+ pref ? " preferred" :"");
+}
+static DEVICE_ATTR(access_state, S_IRUGO, sdev_show_access_state, NULL);
#endif
static ssize_t
@@ -1005,6 +1053,7 @@ static struct attribute *scsi_sdev_attrs[] = {
&dev_attr_queue_type.attr,
#ifdef CONFIG_SCSI_DH
&dev_attr_dh_state.attr,
+ &dev_attr_access_state.attr,
#endif
&dev_attr_queue_ramp_up_period.attr,
REF_EVT(media_change),
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index cfc23a4..666359f 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -200,6 +200,7 @@ struct scsi_device {
struct scsi_device_handler *handler;
void *handler_data;
+ enum scsi_access_state access_state;
enum scsi_device_state sdev_state;
unsigned long sdev_data[0];
} __attribute__((aligned(sizeof(unsigned long))));
diff --git a/include/scsi/scsi_proto.h b/include/scsi/scsi_proto.h
index a9fbf1b..80e85e7 100644
--- a/include/scsi/scsi_proto.h
+++ b/include/scsi/scsi_proto.h
@@ -277,5 +277,18 @@ struct scsi_lun {
__u8 scsi_lun[8];
};
+/* SPC asymmetric access states */
+enum scsi_access_state {
+ SCSI_ACCESS_STATE_OPTIMAL = 0,
+ SCSI_ACCESS_STATE_ACTIVE,
+ SCSI_ACCESS_STATE_STANDBY,
+ SCSI_ACCESS_STATE_UNAVAILABLE,
+ SCSI_ACCESS_STATE_LBA,
+ SCSI_ACCESS_STATE_OFFLINE = 0xe,
+ SCSI_ACCESS_STATE_TRANSITIONING = 0xf,
+ SCSI_ACCESS_STATE_UNKNOWN = 0x70,
+};
+#define SCSI_ACCESS_STATE_MASK 0x0f
+#define SCSI_ACCESS_STATE_PREFERRED 0x80
#endif /* _SCSI_PROTO_H_ */
--
1.8.5.6
next prev parent reply other threads:[~2015-09-29 10:48 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 10:47 [PATCHv5 00/36] asynchronous ALUA device handler Hannes Reinecke
2015-09-29 10:47 ` [PATCH 01/36] scsi_dh: move 'dh_state' sysfs attribute to generic code Hannes Reinecke
2015-10-01 23:18 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 02/36] scsi: ignore errors from scsi_dh_add_device() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 03/36] scsi_dh_alua: Disable ALUA handling for non-disk devices Hannes Reinecke
2015-09-29 10:47 ` [PATCH 04/36] scsi_dh_alua: Use vpd_pg83 information Hannes Reinecke
2015-09-29 10:47 ` [PATCH 05/36] scsi_dh_alua: improved logging Hannes Reinecke
2015-09-29 10:47 ` [PATCH 06/36] scsi_dh_alua: sanitze sense code handling Hannes Reinecke
2015-10-01 23:39 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 07/36] scsi_dh_alua: use standard logging functions Hannes Reinecke
2015-10-01 23:50 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 08/36] scsi_dh_alua: return standard SCSI return codes in submit_rtpg Hannes Reinecke
2015-10-01 23:58 ` Bart Van Assche
2015-10-02 6:03 ` Hannes Reinecke
2015-09-29 10:47 ` [PATCH 09/36] scsi_dh_alua: fixup description of stpg_endio() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 10/36] scsi: remove scsi_show_sense_hdr() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 11/36] scsi_dh_alua: use flag for RTPG extended header Hannes Reinecke
2015-09-29 10:47 ` [PATCH 12/36] scsi_dh_alua: use unaligned access macros Hannes Reinecke
2015-10-02 0:01 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 13/36] scsi_dh_alua: Pass buffer as function argument Hannes Reinecke
2015-09-29 10:47 ` [PATCH 14/36] scsi_dh_alua: separate out alua_stpg() Hannes Reinecke
2015-10-02 0:07 ` Bart Van Assche
2015-10-02 6:06 ` Hannes Reinecke
2015-10-02 15:03 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 15/36] scsi_dh_alua: Make stpg synchronous Hannes Reinecke
2015-10-02 17:33 ` Bart Van Assche
2015-10-07 20:48 ` Hannes Reinecke
2015-09-29 10:47 ` [PATCH 16/36] scsi_dh_alua: call alua_rtpg() if stpg fails Hannes Reinecke
2015-10-02 17:14 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 17/36] scsi_dh_alua: switch to scsi_execute_req_flags() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 18/36] scsi_dh_alua: rework alua_check_tpgs() to return the tpgs mode Hannes Reinecke
2015-09-29 10:47 ` [PATCH 19/36] scsi_dh_alua: Use separate alua_port_group structure Hannes Reinecke
2015-09-29 10:47 ` [PATCH 20/36] scsi_dh_alua: allocate RTPG buffer separately Hannes Reinecke
2015-09-29 10:47 ` [PATCH 21/36] scsi_dh_alua: simplify sense code handling Hannes Reinecke
2015-09-29 10:47 ` [PATCH 22/36] scsi: Add scsi_vpd_lun_id() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 23/36] scsi_dh_alua: use unique device id Hannes Reinecke
2015-09-29 10:47 ` [PATCH 24/36] scsi: Add scsi_vpd_tpg_id() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 25/36] scsi_dh_alua: simplify alua_initialize() Hannes Reinecke
2015-09-29 10:47 ` [PATCH 26/36] revert "scsi_dh_alua: ALUA hander attach should succeed while TPG is transitioning" Hannes Reinecke
2015-09-29 10:47 ` [PATCH 27/36] scsi_dh_alua: Use workqueue for RTPG Hannes Reinecke
2015-09-29 13:27 ` kbuild test robot
2015-10-01 23:34 ` Bart Van Assche
2015-10-02 5:59 ` Hannes Reinecke
2015-09-29 10:47 ` [PATCH 28/36] scsi_dh_alua: Recheck state on unit attention Hannes Reinecke
2015-09-29 10:47 ` [PATCH 29/36] scsi_dh_alua: update all port states Hannes Reinecke
2015-09-29 10:47 ` [PATCH 30/36] scsi_dh_alua: Send TEST UNIT READY to poll for transitioning Hannes Reinecke
2015-09-29 10:47 ` [PATCH 31/36] scsi: rescan VPD attributes Hannes Reinecke
2015-09-29 13:38 ` kbuild test robot
2015-09-29 13:40 ` [PATCH] scsi: fix ifnullfree.cocci warnings kbuild test robot
2015-09-29 13:40 ` [PATCH 31/36] scsi: rescan VPD attributes kbuild test robot
2015-09-29 10:47 ` [PATCH 32/36] scsi_dh: add 'rescan' callback Hannes Reinecke
2015-09-29 10:47 ` Hannes Reinecke [this message]
2015-09-29 13:51 ` [PATCH 33/36] scsi: Add 'access_state' attribute kbuild test robot
2015-10-01 23:04 ` Bart Van Assche
2015-09-29 10:47 ` [PATCH 34/36] scsi_dh_alua: use common definitions for ALUA state Hannes Reinecke
2015-09-29 10:47 ` [PATCH 35/36] scsi_dh_alua: update 'access_state' field Hannes Reinecke
2015-09-29 10:47 ` [PATCH 36/36] scsi_dh_alua: Update version to 2.0 Hannes Reinecke
2015-09-29 18:29 ` [PATCHv5 00/36] asynchronous ALUA device handler Bart Van Assche
2015-09-30 13:21 ` Hannes Reinecke
2015-09-30 21:32 ` Bart Van Assche
2015-10-13 9:44 ` Hannes Reinecke
2015-10-13 15:07 ` Bart Van Assche
2015-10-13 15:13 ` Hannes Reinecke
2015-10-13 15:40 ` 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=1443523658-87622-34-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=bart.vanassche@sandisk.com \
--cc=emilne@redhat.com \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--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;
as well as URLs for NNTP newsgroup(s).