From ce9c2ba7bd509d0d92c6f5a12ea27b9899126d6d Mon Sep 17 00:00:00 2001

From: Fam Zheng <famz@redhat.com>

Date: Fri, 4 Apr 2014 05:55:58 +0200

Subject: [PATCH 03/12] block/iscsi: query for supported VPD pages

RH-Author: Fam Zheng <famz@redhat.com>

Message-id: <1396590962-25815-4-git-send-email-famz@redhat.com>

Patchwork-id: 58340

O-Subject: [RHEL-7 0day qemu-kvm PATCH 3/7] block/iscsi: query for supported VPD pages

Bugzilla: 1083413

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Markus Armbruster <armbru@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

From: Peter Lieven <pl@kamp.de>

this patch ensures that we only query for block provisioning and

block limits vpd pages if they are advertised. It also cleans

up the inquiry code and eliminates some redundant code.

Signed-off-by: Peter Lieven <pl@kamp.de>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 24d3bd67aca958c8ea103646d9d326de00056e4d)

Signed-off-by: Fam Zheng <famz@redhat.com>

---

 block/iscsi.c | 107 +++++++++++++++++++++++++++++-----------------------------

 1 file changed, 54 insertions(+), 53 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/iscsi.c |  107 +++++++++++++++++++++++++++++----------------------------

 1 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c

index 537d2cb..d3c8802 100644

--- a/block/iscsi.c

+++ b/block/iscsi.c

@@ -1240,7 +1240,7 @@ static QemuOptsList runtime_opts = {

 };

 static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,

-                                          int evpd, int pc, Error **errp)

+                                          int evpd, int pc, void **inq, Error **errp)

 {

     int full_size;

     struct scsi_task *task = NULL;

@@ -1259,14 +1259,19 @@ static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,

         }

     }

+    *inq = scsi_datain_unmarshall(task);

+    if (*inq == NULL) {

+        error_setg(errp, "iSCSI: failed to unmarshall inquiry datain blob");

+        goto fail;

+    }

+

     return task;

 fail:

     error_setg(errp, "iSCSI: Inquiry command failed : %s",

                iscsi_get_error(iscsi));

-    if (task) {

+    if (task != NULL) {

         scsi_free_scsi_task(task);

-        return NULL;

     }

     return NULL;

 }

@@ -1283,11 +1288,12 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,

     struct iscsi_url *iscsi_url = NULL;

     struct scsi_task *task = NULL;

     struct scsi_inquiry_standard *inq = NULL;

+    struct scsi_inquiry_supported_pages *inq_vpd;

     char *initiator_name = NULL;

     QemuOpts *opts;

     Error *local_err = NULL;

     const char *filename;

-    int ret;

+    int i, ret;

     if ((BDRV_SECTOR_SIZE % 512) != 0) {

         error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. "

@@ -1373,24 +1379,17 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,

     iscsilun->iscsi = iscsi;

     iscsilun->lun   = iscsi_url->lun;

+    iscsilun->has_write_same = true;

-    task = iscsi_inquiry_sync(iscsi, iscsilun->lun, 0, 0, 36);

-

-    if (task == NULL || task->status != SCSI_STATUS_GOOD) {

-        error_setg(errp, "iSCSI: failed to send inquiry command.");

-        ret = -EINVAL;

-        goto out;

-    }

-

-    inq = scsi_datain_unmarshall(task);

-    if (inq == NULL) {

-        error_setg(errp, "iSCSI: Failed to unmarshall inquiry data.");

+    task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 0, 0,

+                            (void **) &inq, errp);

+    if (task == NULL) {

         ret = -EINVAL;

         goto out;

     }

-

     iscsilun->type = inq->periperal_device_type;

-    iscsilun->has_write_same = true;

+    scsi_free_scsi_task(task);

+    task = NULL;

     iscsi_readcapacity_sync(iscsilun, &local_err);

     if (local_err != NULL) {

@@ -1408,46 +1407,48 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,

         bs->sg = 1;

     }

-    if (iscsilun->lbpme) {

-        struct scsi_inquiry_logical_block_provisioning *inq_lbp;

-        task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

-                                SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING,

-                                errp);

-        if (task == NULL) {

-            ret = -EINVAL;

-            goto out;

-        }

-        inq_lbp = scsi_datain_unmarshall(task);

-        if (inq_lbp == NULL) {

-            error_setg(errp, "iSCSI: failed to unmarshall inquiry datain blob");

-            ret = -EINVAL;

-            goto out;

-        }

-        memcpy(&iscsilun->lbp, inq_lbp,

-               sizeof(struct scsi_inquiry_logical_block_provisioning));

-        scsi_free_scsi_task(task);

-        task = NULL;

+    task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

+                            SCSI_INQUIRY_PAGECODE_SUPPORTED_VPD_PAGES,

+                            (void **) &inq_vpd, errp);

+    if (task == NULL) {

+        ret = -EINVAL;

+        goto out;

     }

-

-    if (iscsilun->lbp.lbpu || iscsilun->lbp.lbpws) {

+    for (i = 0; i < inq_vpd->num_pages; i++) {

+        struct scsi_task *inq_task;

+        struct scsi_inquiry_logical_block_provisioning *inq_lbp;

         struct scsi_inquiry_block_limits *inq_bl;

-        task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

-                                SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS, errp);

-        if (task == NULL) {

-            ret = -EINVAL;

-            goto out;

-        }

-        inq_bl = scsi_datain_unmarshall(task);

-        if (inq_bl == NULL) {

-            error_setg(errp, "iSCSI: failed to unmarshall inquiry datain blob");

-            ret = -EINVAL;

-            goto out;

+        switch (inq_vpd->pages[i]) {

+        case SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING:

+            inq_task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

+                                        SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING,

+                                        (void **) &inq_lbp, errp);

+            if (inq_task == NULL) {

+                ret = -EINVAL;

+                goto out;

+            }

+            memcpy(&iscsilun->lbp, inq_lbp,

+                   sizeof(struct scsi_inquiry_logical_block_provisioning));

+            scsi_free_scsi_task(inq_task);

+            break;

+        case SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS:

+            inq_task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

+                                    SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS,

+                                    (void **) &inq_bl, errp);

+            if (inq_task == NULL) {

+                ret = -EINVAL;

+                goto out;

+            }

+            memcpy(&iscsilun->bl, inq_bl,

+                   sizeof(struct scsi_inquiry_block_limits));

+            scsi_free_scsi_task(inq_task);

+            break;

+        default:

+            break;

         }

-        memcpy(&iscsilun->bl, inq_bl,

-               sizeof(struct scsi_inquiry_block_limits));

-        scsi_free_scsi_task(task);

-        task = NULL;

     }

+    scsi_free_scsi_task(task);

+    task = NULL;

 #if defined(LIBISCSI_FEATURE_NOP_COUNTER)

     /* Set up a timer for sending out iSCSI NOPs */

-- 

1.7.1