[SCSI] scsi_dh_alua: Optimize the STPG command

This patch optimizes the set target port group(STPG) command. During our
testing, we found that it is not optimal to send stpg command every time
the path group switch happens. This patch uses PREF (preferred target port)
bit with combination of flags passed by multipath user level tool to
optimize this behaviour. If PREF bit is set then it issues a STPG command,
otherwise it will let implicit transfer take place.

By default there is no change in the behaviour. User tool needs to pass the
parameter to make this change take effect. Patch has been tested on NetApp
E series storage.

Signed-off-by: Babu Moger <babu.moger@netapp.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 4865a99d9c38bf8816ee95d9d6d715e5bcada1fa..fda9cdea0e60aa6d78c399b38e8d1ed635fb034f 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -675,14 +675,37 @@ static int alua_activate(struct scsi_device *sdev,
 {
        struct alua_dh_data *h = get_alua_data(sdev);
        int err = SCSI_DH_OK;
+       int stpg = 0;
 
        err = alua_rtpg(sdev, h);
        if (err != SCSI_DH_OK)
                goto out;
 
-       if (h->tpgs & TPGS_MODE_EXPLICIT &&
-           h->state != TPGS_STATE_OPTIMIZED &&
-           h->state != TPGS_STATE_LBA_DEPENDENT) {
+       if (h->tpgs & TPGS_MODE_EXPLICIT) {
+               switch (h->state) {
+               case TPGS_STATE_NONOPTIMIZED:
+                       stpg = 1;
+                       if ((h->flags & ALUA_OPTIMIZE_STPG) &&
+                           (!h->pref) &&
+                           (h->tpgs & TPGS_MODE_IMPLICIT))
+                               stpg = 0;
+                       break;
+               case TPGS_STATE_STANDBY:
+                       stpg = 1;
+                       break;
+               case TPGS_STATE_UNAVAILABLE:
+               case TPGS_STATE_OFFLINE:
+                       err = SCSI_DH_IO;
+                       break;
+               case TPGS_STATE_TRANSITIONING:
+                       err = SCSI_DH_RETRY;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       if (stpg) {
                h->callback_fn = fn;
                h->callback_data = data;
                err = submit_stpg(h);