target_core_spc: Include target device descriptor in VPD page 83

We should be including a descriptor referring to the target device
to allow identification of different TCM instances.

(nab: Bump SE_INQUIRY_BUF to 1024 bytes to handle 2x 256 byte SCSI names)

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

2 files changed, 43 insertions, 2 deletions

diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index 603c41105aa7..39054d9029f3 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -267,7 +267,7 @@ check_t10_vend_desc:
         port = lun->lun_sep;
         if (port) {
                 struct t10_alua_lu_gp *lu_gp;
-                u32 padding, scsi_name_len;
+                u32 padding, scsi_name_len, scsi_target_len;
                 u16 lu_gp_id = 0;
                 u16 tg_pt_gp_id = 0;
                 u16 tpgt;
@@ -402,6 +402,47 @@ check_scsi_name:
                 off += scsi_name_len;
                 /* Header size + Designation descriptor */
                 len += (scsi_name_len + 4);
+
+                /*
+                 * Target device designator
+                 */
+                buf[off] =
+                        (tpg->se_tpg_tfo->get_fabric_proto_ident(tpg) << 4);
+                buf[off++] |= 0x3; /* CODE SET == UTF-8 */
+                buf[off] = 0x80; /* Set PIV=1 */
+                /* Set ASSOCIATION == target device: 10b */
+                buf[off] |= 0x20;
+                /* DESIGNATOR TYPE == SCSI name string */
+                buf[off++] |= 0x8;
+                off += 2; /* Skip over Reserved and length */
+                /*
+                 * SCSI name string identifer containing, $FABRIC_MOD
+                 * dependent information.  For LIO-Target and iSCSI
+                 * Target Port, this means "<iSCSI name>" in
+                 * UTF-8 encoding.
+                 */
+                scsi_target_len = sprintf(&buf[off], "%s",
+                                          tpg->se_tpg_tfo->tpg_get_wwn(tpg));
+                scsi_target_len += 1 /* Include  NULL terminator */;
+                /*
+                 * The null-terminated, null-padded (see 4.4.2) SCSI
+                 * NAME STRING field contains a UTF-8 format string.
+                 * The number of bytes in the SCSI NAME STRING field
+                 * (i.e., the value in the DESIGNATOR LENGTH field)
+                 * shall be no larger than 256 and shall be a multiple
+                 * of four.
+                 */
+                padding = ((-scsi_target_len) & 3);
+                if (padding)
+                        scsi_target_len += padding;
+                if (scsi_name_len > 256)
+                        scsi_name_len = 256;
+
+                buf[off-1] = scsi_target_len;
+                off += scsi_target_len;
+
+                /* Header size + Designation descriptor */
+                len += (scsi_target_len + 4);
         }
         buf[2] = ((len >> 8) & 0xff);
         buf[3] = (len & 0xff); /* Page Length for VPD 0x83 */
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index e653110acb61..6c8001516c6d 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -112,7 +112,7 @@
 /* Queue Algorithm Modifier default for restricted reordering in control mode page */
 #define DA_EMULATE_REST_REORD                   0
 
-#define SE_INQUIRY_BUF                          512
+#define SE_INQUIRY_BUF                          768
 #define SE_MODE_PAGE_BUF                        512
 #define SE_SENSE_BUF                            96