From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: James Bottomley <james.bottomley@hansenpartnership.com>,
Christoph Hellwig <hch@lst.de>,
Bart von Assche <bart.vanassche@sandisk.com>,
Ewan Milne <emilne@redhat.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCHv3 21/24] scsi: Add 'access_state' attribute
Date: Wed, 13 Jan 2016 09:09:56 +0100 [thread overview]
Message-ID: <1452672599-9820-22-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1452672599-9820-1-git-send-email-hare@suse.de>
Add an 'access_state' attribute to struct scsi_device to
display the asymmetric LUN access state.
Reviewed-by: Christoph Hellwig <hch@lst.de>
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 05dc1aa..9fc1531 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -231,6 +231,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 ef36053..80b4c67 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;
@@ -973,6 +1001,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
@@ -1047,6 +1095,7 @@ static struct attribute *scsi_sdev_attrs[] = {
&dev_attr_wwid.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 f63a167..5dd00e9f 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:[~2016-01-13 8:10 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 8:09 [PATCHv3 00/24] ALUA device handler update, part II Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 01/24] scsi_dh_alua: Pass buffer as function argument Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 02/24] scsi_dh_alua: separate out alua_stpg() Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 03/24] scsi_dh_alua: Make stpg synchronous Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 04/24] scsi_dh_alua: call alua_rtpg() if stpg fails Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 05/24] scsi_dh_alua: switch to scsi_execute_req_flags() Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 06/24] scsi_dh_alua: allocate RTPG buffer separately Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 07/24] scsi_dh_alua: Use separate alua_port_group structure Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 08/24] scsi_dh_alua: use unique device id Hannes Reinecke
2016-01-18 17:44 ` Christoph Hellwig
2016-01-13 8:09 ` [PATCHv3 09/24] scsi_dh_alua: simplify alua_initialize() Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 10/24] revert commit a8e5a2d593cb ("[SCSI] scsi_dh_alua: ALUA handler attach should succeed while TPG is transitioning") Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 11/24] scsi_dh_alua: move optimize_stpg evaluation Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 12/24] scsi_dh_alua: remove 'rel_port' from alua_dh_data structure Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 13/24] scsi_dh_alua: Use workqueue for RTPG Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 14/24] scsi_dh_alua: Allow workqueue to run synchronously Hannes Reinecke
2016-01-18 17:45 ` Christoph Hellwig
2016-01-13 8:09 ` [PATCHv3 15/24] scsi_devinfo: move scsi_get_device_flags into scsi_devinfo.h Hannes Reinecke
2016-01-18 17:49 ` Christoph Hellwig
2016-01-13 8:09 ` [PATCHv3 16/24] scsi_dh_alua: Add new blacklist flag 'BLIST_SYNC_ALUA' Hannes Reinecke
2016-01-18 17:50 ` Christoph Hellwig
2016-01-13 8:09 ` [PATCHv3 17/24] scsi_dh_alua: Recheck state on unit attention Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 18/24] scsi_dh_alua: update all port states Hannes Reinecke
2016-01-18 17:51 ` Christoph Hellwig
2016-01-13 8:09 ` [PATCHv3 19/24] scsi_dh_alua: Send TEST UNIT READY to poll for transitioning Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 20/24] scsi_dh: add 'rescan' callback Hannes Reinecke
2016-01-13 8:09 ` Hannes Reinecke [this message]
2016-01-13 8:09 ` [PATCHv3 22/24] scsi_dh_alua: use common definitions for ALUA state Hannes Reinecke
2016-01-13 8:09 ` [PATCHv3 23/24] scsi_dh_alua: update 'access_state' field Hannes Reinecke
2016-01-18 17:52 ` Christoph Hellwig
2016-01-13 8:09 ` [PATCHv3 24/24] scsi_dh_alua: Update version to 2.0 Hannes Reinecke
2016-01-18 17:52 ` Christoph Hellwig
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=1452672599-9820-22-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.