From owner-svn-src-all@FreeBSD.ORG Fri Jul 4 16:06:57 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AD5922D; Fri, 4 Jul 2014 16:06:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3E92877; Fri, 4 Jul 2014 16:06:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64G6vAG036418; Fri, 4 Jul 2014 16:06:57 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64G6vub036417; Fri, 4 Jul 2014 16:06:57 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201407041606.s64G6vub036417@svn.freebsd.org> From: Alexander Motin Date: Fri, 4 Jul 2014 16:06:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268257 - stable/10/sys/cam/ctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2014 16:06:57 -0000 Author: mav Date: Fri Jul 4 16:06:56 2014 New Revision: 268257 URL: http://svnweb.freebsd.org/changeset/base/268257 Log: MFC r267547, r267551 (by trasz): Add LUN-associated name to VPD, to make Hyper-V Failover Cluster happy. Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Fri Jul 4 15:55:32 2014 (r268256) +++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Fri Jul 4 16:06:56 2014 (r268257) @@ -2032,13 +2032,13 @@ cfiscsi_devid(struct ctl_scsiio *ctsio, { struct cfiscsi_session *cs; struct scsi_vpd_device_id *devid_ptr; - struct scsi_vpd_id_descriptor *desc, *desc1; - struct scsi_vpd_id_descriptor *desc2, *desc3; /* for types 4h and 5h */ + struct scsi_vpd_id_descriptor *desc, *desc1, *desc2, *desc3, *desc4; struct scsi_vpd_id_t10 *t10id; struct ctl_lun *lun; const struct icl_pdu *request; + int i, ret; char *val; - size_t devid_len, wwpn_len; + size_t devid_len, wwpn_len, lun_name_len; lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr; request = ctsio->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr; @@ -2050,9 +2050,20 @@ cfiscsi_devid(struct ctl_scsiio *ctsio, if ((wwpn_len % 4) != 0) wwpn_len += (4 - (wwpn_len % 4)); + if (lun == NULL) { + lun_name_len = 0; + } else { + lun_name_len = strlen(cs->cs_target->ct_name); + lun_name_len += strlen(",lun,XXXXXXXX"); + lun_name_len += 1; /* '\0' */ + if ((lun_name_len % 4) != 0) + lun_name_len += (4 - (lun_name_len % 4)); + } + devid_len = sizeof(struct scsi_vpd_device_id) + sizeof(struct scsi_vpd_id_descriptor) + sizeof(struct scsi_vpd_id_t10) + CTL_DEVID_LEN + + sizeof(struct scsi_vpd_id_descriptor) + lun_name_len + sizeof(struct scsi_vpd_id_descriptor) + wwpn_len + sizeof(struct scsi_vpd_id_descriptor) + sizeof(struct scsi_vpd_id_rel_trgt_port_id) + @@ -2081,8 +2092,10 @@ cfiscsi_devid(struct ctl_scsiio *ctsio, desc1 = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] + sizeof(struct scsi_vpd_id_t10) + CTL_DEVID_LEN); desc2 = (struct scsi_vpd_id_descriptor *)(&desc1->identifier[0] + - wwpn_len); + lun_name_len); desc3 = (struct scsi_vpd_id_descriptor *)(&desc2->identifier[0] + + wwpn_len); + desc4 = (struct scsi_vpd_id_descriptor *)(&desc3->identifier[0] + sizeof(struct scsi_vpd_id_rel_trgt_port_id)); if (lun != NULL) @@ -2128,33 +2141,61 @@ cfiscsi_devid(struct ctl_scsiio *ctsio, } /* - * desc1 is for the WWPN which is a port asscociation. - */ - desc1->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_UTF8; - desc1->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT | - SVPD_ID_TYPE_SCSI_NAME; - desc1->length = wwpn_len; - snprintf(desc1->identifier, wwpn_len, "%s,t,0x%4.4x", - cs->cs_target->ct_name, cs->cs_portal_group_tag); + * desc1 is for the unique LUN name. + * + * XXX: According to SPC-3, LUN must report the same ID through + * all the ports. The code below, however, reports the + * ID only via iSCSI. + */ + desc1->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_UTF8; + desc1->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN | + SVPD_ID_TYPE_SCSI_NAME; + desc1->length = lun_name_len; + if (lun != NULL) { + /* + * Find the per-target LUN number. + */ + for (i = 0; i < CTL_MAX_LUNS; i++) { + if (cs->cs_target->ct_luns[i] == lun->lun) + break; + } + KASSERT(i < CTL_MAX_LUNS, + ("lun %jd not found", (uintmax_t)lun->lun)); + ret = snprintf(desc1->identifier, lun_name_len, "%s,lun,%d", + cs->cs_target->ct_name, i); + KASSERT(ret > 0 && ret <= lun_name_len, ("bad snprintf")); + } else { + KASSERT(lun_name_len == 0, ("no lun, but lun_name_len != 0")); + } /* - * desc2 is for the Relative Target Port(type 4h) identifier + * desc2 is for the WWPN which is a port asscociation. */ - desc2->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_BINARY; + desc2->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_UTF8; desc2->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT | - SVPD_ID_TYPE_RELTARG; - desc2->length = 4; - desc2->identifier[3] = 1; + SVPD_ID_TYPE_SCSI_NAME; + desc2->length = wwpn_len; + snprintf(desc2->identifier, wwpn_len, "%s,t,0x%4.4x", + cs->cs_target->ct_name, cs->cs_portal_group_tag); /* - * desc3 is for the Target Port Group(type 5h) identifier + * desc3 is for the Relative Target Port(type 4h) identifier */ desc3->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_BINARY; desc3->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT | - SVPD_ID_TYPE_TPORTGRP; + SVPD_ID_TYPE_RELTARG; desc3->length = 4; desc3->identifier[3] = 1; + /* + * desc4 is for the Target Port Group(type 5h) identifier + */ + desc4->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_BINARY; + desc4->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT | + SVPD_ID_TYPE_TPORTGRP; + desc4->length = 4; + desc4->identifier[3] = 1; + ctsio->scsi_status = SCSI_STATUS_OK; ctsio->be_move_done = ctl_config_move_done;