113 lines
4.4 KiB
Diff
113 lines
4.4 KiB
Diff
From 35bdd02a4c49dffc4fe6daccf6ba505f5c1a3bcd Mon Sep 17 00:00:00 2001
|
|
From: Fam Zheng <famz@redhat.com>
|
|
Date: Fri, 29 Jun 2018 06:11:46 +0200
|
|
Subject: [PATCH 172/268] iscsi: Query and save device designator when opening
|
|
|
|
RH-Author: Fam Zheng <famz@redhat.com>
|
|
Message-id: <20180629061153.12687-7-famz@redhat.com>
|
|
Patchwork-id: 81157
|
|
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH v2 06/13] iscsi: Query and save device designator when opening
|
|
Bugzilla: 1482537
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
The device designator data returned in INQUIRY command will be useful to
|
|
fill in source/target fields during copy offloading. Do this when
|
|
connecting to the target and save the data for later use.
|
|
|
|
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-id: 20180601092648.24614-7-famz@redhat.com
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit cc9743c236cce8a35449e3ef67140287b68bb705)
|
|
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
block/iscsi.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 41 insertions(+)
|
|
|
|
diff --git a/block/iscsi.c b/block/iscsi.c
|
|
index 1705187..a1a0044 100644
|
|
--- a/block/iscsi.c
|
|
+++ b/block/iscsi.c
|
|
@@ -69,6 +69,7 @@ typedef struct IscsiLun {
|
|
QemuMutex mutex;
|
|
struct scsi_inquiry_logical_block_provisioning lbp;
|
|
struct scsi_inquiry_block_limits bl;
|
|
+ struct scsi_inquiry_device_designator *dd;
|
|
unsigned char *zeroblock;
|
|
/* The allocmap tracks which clusters (pages) on the iSCSI target are
|
|
* allocated and which are not. In case a target returns zeros for
|
|
@@ -1737,6 +1738,30 @@ static QemuOptsList runtime_opts = {
|
|
},
|
|
};
|
|
|
|
+static void iscsi_save_designator(IscsiLun *lun,
|
|
+ struct scsi_inquiry_device_identification *inq_di)
|
|
+{
|
|
+ struct scsi_inquiry_device_designator *desig, *copy = NULL;
|
|
+
|
|
+ for (desig = inq_di->designators; desig; desig = desig->next) {
|
|
+ if (desig->association ||
|
|
+ desig->designator_type > SCSI_DESIGNATOR_TYPE_NAA) {
|
|
+ continue;
|
|
+ }
|
|
+ /* NAA works better than T10 vendor ID based designator. */
|
|
+ if (!copy || copy->designator_type < desig->designator_type) {
|
|
+ copy = desig;
|
|
+ }
|
|
+ }
|
|
+ if (copy) {
|
|
+ lun->dd = g_new(struct scsi_inquiry_device_designator, 1);
|
|
+ *lun->dd = *copy;
|
|
+ lun->dd->next = NULL;
|
|
+ lun->dd->designator = g_malloc(copy->designator_length);
|
|
+ memcpy(lun->dd->designator, copy->designator, copy->designator_length);
|
|
+ }
|
|
+}
|
|
+
|
|
static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
|
Error **errp)
|
|
{
|
|
@@ -1904,6 +1929,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
|
struct scsi_task *inq_task;
|
|
struct scsi_inquiry_logical_block_provisioning *inq_lbp;
|
|
struct scsi_inquiry_block_limits *inq_bl;
|
|
+ struct scsi_inquiry_device_identification *inq_di;
|
|
switch (inq_vpd->pages[i]) {
|
|
case SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING:
|
|
inq_task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,
|
|
@@ -1929,6 +1955,17 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
|
sizeof(struct scsi_inquiry_block_limits));
|
|
scsi_free_scsi_task(inq_task);
|
|
break;
|
|
+ case SCSI_INQUIRY_PAGECODE_DEVICE_IDENTIFICATION:
|
|
+ inq_task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,
|
|
+ SCSI_INQUIRY_PAGECODE_DEVICE_IDENTIFICATION,
|
|
+ (void **) &inq_di, errp);
|
|
+ if (inq_task == NULL) {
|
|
+ ret = -EINVAL;
|
|
+ goto out;
|
|
+ }
|
|
+ iscsi_save_designator(iscsilun, inq_di);
|
|
+ scsi_free_scsi_task(inq_task);
|
|
+ break;
|
|
default:
|
|
break;
|
|
}
|
|
@@ -1985,6 +2022,10 @@ static void iscsi_close(BlockDriverState *bs)
|
|
iscsi_logout_sync(iscsi);
|
|
}
|
|
iscsi_destroy_context(iscsi);
|
|
+ if (iscsilun->dd) {
|
|
+ g_free(iscsilun->dd->designator);
|
|
+ g_free(iscsilun->dd);
|
|
+ }
|
|
g_free(iscsilun->zeroblock);
|
|
iscsi_allocmap_free(iscsilun);
|
|
qemu_mutex_destroy(&iscsilun->mutex);
|
|
--
|
|
1.8.3.1
|
|
|