nvme-scsi: Use correct byte ordering for eui64 in Dev ID VPD
PATCH 1/1 nvme-scsi: Use correct byte ordering for eui64 in Dev ID VPD
NVME specifies an EUI64/NGUID in little-endian format, while SCSI specifies that the Device Identification VPD use big-endian for EUI formats. The current code copies this bytestream directly from the Identification Namespace page, meaning we just need to reverse the bytestream when passing it on to the VPD.
This results in the correct values being parsed by sg-tools, eg:
$ sg_inq -e -p 0x83 /dev/nvme1n1 -vvv
open /dev/nvme1n1 with flags=0x800
VPD INQUIRY: Device Identification page
inquiry cdb: 12 01 83 00 fc 00
duration=0 ms
Designation descriptor number 1, descriptor length: 20
designator_type: EUI-64 based, code_set: Binary
associated with the addressed logical unit
EUI-64 based 16 byte identifier
Identifier extension: 0x100000001
IEEE Company_id: 0x5cd2e4
Vendor Specific Extension Identifier: 0x0
[0x00000001000000015cd2e40000000000]--- drivers/nvme/host/scsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/host/scsi.c +3 -1
@@ -598,6 +598,7 @@ static int nvme_fill_device_id_eui64(struct nvme_ns *ns, struct sg_io_hdr *hdr,int nvme_sc, res;size_t len;void *eui; +int i; nvme_sc =nvme_identify_ns (ns->ctrl, ns->ns_id, &id_ns); res =nvme_trans_status_code (hdr, nvme_sc);
@@ -628,7 +629,8 @@ static int nvme_fill_device_id_eui64(struct nvme_ns *ns, struct sg_io_hdr *hdr, inq_response[5 ] =0x02 ;/* PIV=0b | Asso=00b | Designator Type=2h */ inq_response[6 ] =0x00 ;/* Rsvd */ inq_response[7 ] = len;/* Designator Length */ -memcpy (&inq_response[8 ], eui, len); +for (i =0 ; i < len; i++) + inq_response[8 + i] = ((char *)eui)[len - (i +1 )]; res =nvme_trans_copy_to_user (hdr, inq_response, alloc_len); out_free_id:
Signature · 1 line
2.9.3
PATCH 1/1 nvme-scsi: Use correct byte ordering for eui64 in Dev ID VPD
Quoted 6 lines · Jon Derrick
NVME specifies an EUI64/NGUID in little-endian format, while SCSI specifies that the Device Identification VPD use big-endian for EUI formats. The current code copies this bytestream directly from the Identification Namespace page, meaning we just need to reverse the bytestream when passing it on to the VPD.
This seems to hold true for NGUID devices, but Keith just pointed out to me that it may not hold true for EUI64 devices. It seems like that case needs byte swiveling within each field. So I'll NAK for now until I can figure out if that's the case.
PATCH 1/1 nvme-scsi: Use correct byte ordering for eui64 in Dev ID VPD
In reply to Jon DerrickQuoted 5 lines · Jon Derrick
NVME specifies an EUI64/NGUID in little-endian format, while SCSI specifies that the Device Identification VPD use big-endian for EUI formats. The current code copies this bytestream directly from the Identification Namespace page, meaning we just need to reverse the bytestream when passing it on to the VPD.
This will break existing setups that rely on VPD 0x83 for device identification (which I think includes older SuSE distros).
And once you change the setup anyway please stop using this buggy SCSI emulation.