From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: James Bottomley <james.bottomley@hansenpartnership.com>,
Christoph Hellwig <hch@infradead.org>,
Ewan Milne <emilne@redhat.com>,
Bart van Assche <bart.vanassche@sandisk.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Hannes Reinecke <hare@suse.com>
Subject: [PATCHv4 15/23] scsi_dh_alua: Add new blacklist flag 'BLIST_SYNC_ALUA'
Date: Tue, 19 Jan 2016 09:21:59 +0100 [thread overview]
Message-ID: <1453191727-3626-16-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1453191727-3626-1-git-send-email-hare@suse.de>
Add a new blacklist flag BLIST_SYNC_ALUA to instruct the
alua device handler to use synchronous command submission
for ALUA commands.
Signed-off-by: Hannes Reinecke <hare@suse.com>
---
drivers/scsi/device_handler/scsi_dh_alua.c | 2 ++
drivers/scsi/scsi_devinfo.c | 2 ++
drivers/scsi/scsi_scan.c | 3 +++
include/scsi/scsi_device.h | 1 +
include/scsi/scsi_devinfo.h | 1 +
5 files changed, 9 insertions(+)
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 4a3b0e7..57dd007 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -371,6 +371,8 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h,
} else {
rcu_assign_pointer(h->pg, pg);
}
+ if (sdev->synchronous_alua)
+ pg->flags |= ALUA_SYNC_STPG;
alua_rtpg_queue(h->pg, sdev, NULL);
spin_unlock(&h->pg_lock);
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 47b9d13..b4ef0c6 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -218,6 +218,8 @@ static struct {
{"NAKAMICH", "MJ-5.16S", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"NEC", "PD-1 ODX654P", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"NEC", "iStorage", NULL, BLIST_REPORTLUN2},
+ {"NETAPP", "LUN C-Mode", NULL, BLIST_SYNC_ALUA},
+ {"NETAPP", "INF-01-00", NULL, BLIST_SYNC_ALUA},
{"NRC", "MBR-7", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"NRC", "MBR-7.4", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"PIONEER", "CD-ROM DRM-600", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index a1c195d..af60709 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -959,6 +959,9 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
if (*bflags & BLIST_NO_DIF)
sdev->no_dif = 1;
+ if (*bflags & BLIST_SYNC_ALUA)
+ sdev->synchronous_alua = 1;
+
sdev->eh_timeout = SCSI_DEFAULT_EH_TIMEOUT;
if (*bflags & BLIST_TRY_VPD_PAGES)
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index f63a167..13339cd 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -176,6 +176,7 @@ struct scsi_device {
unsigned no_dif:1; /* T10 PI (DIF) should be disabled */
unsigned broken_fua:1; /* Don't set FUA bit */
unsigned lun_in_cdb:1; /* Store LUN bits in CDB[1] */
+ unsigned synchronous_alua:1; /* Synchronous ALUA commands */
atomic_t disk_events_disable_depth; /* disable depth for disk events */
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 96e3f56..9f750cb 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -37,5 +37,6 @@
#define BLIST_TRY_VPD_PAGES 0x10000000 /* Attempt to read VPD pages */
#define BLIST_NO_RSOC 0x20000000 /* don't try to issue RSOC */
#define BLIST_MAX_1024 0x40000000 /* maximum 1024 sector cdb length */
+#define BLIST_SYNC_ALUA 0x80000000 /* Synchronous ALUA commands */
#endif
--
1.8.5.6
next prev parent reply other threads:[~2016-01-19 8:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 8:21 [PATCHv4 00/23] ALUA device handler update, part II Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 01/23] scsi_dh_alua: Pass buffer as function argument Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 02/23] scsi_dh_alua: separate out alua_stpg() Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 03/23] scsi_dh_alua: Make stpg synchronous Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 04/23] scsi_dh_alua: call alua_rtpg() if stpg fails Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 05/23] scsi_dh_alua: switch to scsi_execute_req_flags() Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 06/23] scsi_dh_alua: allocate RTPG buffer separately Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 07/23] scsi_dh_alua: Use separate alua_port_group structure Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 08/23] scsi_dh_alua: use unique device id Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 09/23] scsi_dh_alua: simplify alua_initialize() Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 10/23] revert commit a8e5a2d593cb ("[SCSI] scsi_dh_alua: ALUA handler attach should succeed while TPG is transitioning") Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 11/23] scsi_dh_alua: move optimize_stpg evaluation Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 12/23] scsi_dh_alua: remove 'rel_port' from alua_dh_data structure Hannes Reinecke
2016-01-19 8:21 ` [PATCHv4 13/23] scsi_dh_alua: Use workqueue for RTPG Hannes Reinecke
2016-02-02 9:32 ` Christoph Hellwig
2016-01-19 8:21 ` [PATCHv4 14/23] scsi_dh_alua: Allow workqueue to run synchronously Hannes Reinecke
2016-01-19 8:21 ` Hannes Reinecke [this message]
2016-02-02 9:32 ` [PATCHv4 15/23] scsi_dh_alua: Add new blacklist flag 'BLIST_SYNC_ALUA' Christoph Hellwig
2016-01-19 8:22 ` [PATCHv4 16/23] scsi_dh_alua: Recheck state on unit attention Hannes Reinecke
2016-01-19 8:22 ` [PATCHv4 17/23] scsi_dh_alua: update all port states Hannes Reinecke
2016-01-19 8:22 ` [PATCHv4 18/23] scsi_dh_alua: Send TEST UNIT READY to poll for transitioning Hannes Reinecke
2016-01-19 8:22 ` [PATCHv4 19/23] scsi_dh: add 'rescan' callback Hannes Reinecke
2016-01-19 8:22 ` [PATCHv4 20/23] scsi: Add 'access_state' attribute Hannes Reinecke
2016-01-19 8:22 ` [PATCHv4 21/23] scsi_dh_alua: use common definitions for ALUA state Hannes Reinecke
2016-01-19 8:22 ` [PATCHv4 22/23] scsi_dh_alua: update 'access_state' field Hannes Reinecke
2016-02-02 18:16 ` Christoph Hellwig
2016-01-19 8:22 ` [PATCHv4 23/23] scsi_dh_alua: Update version to 2.0 Hannes Reinecke
2016-02-02 2:35 ` [PATCHv4 00/23] ALUA device handler update, part II Martin K. Petersen
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=1453191727-3626-16-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=bart.vanassche@sandisk.com \
--cc=emilne@redhat.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--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).