Re: [PATCH] /dev/disk/by-id incomplete and unhelpful for SATA drives

[Chris Paulson-Ellis <chris@edesix.com>]

Douglas Gilbert wrote:
> Douglas Gilbert wrote:
> [snip]

I can confirm that your patch works for me too.

Original scsi_id output:

# scsi_id -g -x -s /block/sda | grep ID_SERIAL
ID_SERIAL=0ATA_Maxtor_6Y160M0_Linux_ATA-SCSI_simulator

After my patch:

# scsi_id -g -x -s /block/sda | grep ID_SERIAL
ID_SERIAL=0ATA_Maxtor_6Y160M0_Y4DCTR3E

After your patch:

# scsi_id -g -x -s /block/sda | grep ID_SERIAL
ID_SERIAL=1ATA_Maxtor_6Y160M0_Y4DCTR3E

Note that it is still a bit different to the page 0x80 output, but I 
don't think this matters (unless that '0' or '1' is a bug not a 
feature). For my purposes, it just needs to be unique.

# ( scsi_id -p 0x80 -g -x -s /block/sda ; \
     scsi_id -p 0x83 -g -x -s /block/sda ) | grep ID_SERIAL
ID_SERIAL=SATA_Maxtor_6Y160M0_Y4DCTR3E
ID_SERIAL=1ATA_Maxtor_6Y160M0_Y4DCTR3E

Many thanks,
Chris.

> 
> 
> The attachment adds the second item above to the patch
> suggested by Chris Paulson-Ellis <chris@edesix.com> in:
> http://marc.theaimsgroup.com/?l=linux-hotplug-devel&m=113529667019652&w=2
> 
> The patch is against lk 2.6.15 and was tested on a sil
> controller with a Seagate ST380013AS sata disk.
> 
> Changelog:
>   - make existing libata VPD device identification page (0x83)
>     supply the ATA serial number in the libata "vendor
>     specific" designator (from Chris Paulson-Ellis)
>   - add a "t10 vendor id based" designator as defined in
>     SAT rev 07a (section 10.3.4.2.3) that supplies ATA
>     model and serial numbers
>   - make the libata VPD page 0x83 more extensible (for
>     adding more designators in the future).
> 
> Signed-off-by: Douglas Gilbert <dougg@torque.net>
> 
> Doug Gilbert
> 
> 
> 
> ------------------------------------------------------------------------
> 
> --- linux/drivers/scsi/libata-scsi.c	2006-01-04 08:50:42.000000000 +1000
> +++ linux/drivers/scsi/libata-scsi.c2615vpd	2006-01-06 20:16:25.000000000 +1000
> @@ -1532,16 +1532,16 @@
>  	return 0;
>  }
>  
> -static const char *inq_83_str = "Linux ATA-SCSI simulator";
> -
>  /**
>   *	ata_scsiop_inq_83 - Simulate INQUIRY EVPD page 83, device identity
>   *	@args: device IDENTIFY data / SCSI command of interest.
>   *	@rbuf: Response buffer, to which simulated SCSI cmd output is sent.
>   *	@buflen: Response buffer length.
>   *
> - *	Returns device identification.  Currently hardcoded to
> - *	return "Linux ATA-SCSI simulator".
> + *	Yields two logocal unit device identification designators:
> + *	  - vendor specific ASCII containing the ATA serial number
> + *	  - SAT defined "t10 vendor id based" containing ASCII vendor
> + *	    name ("ATA     "), model and serial numbers.
>   *
>   *	LOCKING:
>   *	spin_lock_irqsave(host_set lock)
> @@ -1550,16 +1550,39 @@
>  unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
>  			      unsigned int buflen)
>  {
> +	int num;
> +	const int sat_model_serial_desc_len = 68;
> +	const int ata_model_byte_len = 40;
> +
>  	rbuf[1] = 0x83;			/* this page code */
> -	rbuf[3] = 4 + strlen(inq_83_str);	/* page len */
> +	num = 4;
>  
> -	/* our one and only identification descriptor (vendor-specific) */
> -	if (buflen > (strlen(inq_83_str) + 4 + 4 - 1)) {
> -		rbuf[4 + 0] = 2;	/* code set: ASCII */
> -		rbuf[4 + 3] = strlen(inq_83_str);
> -		memcpy(rbuf + 4 + 4, inq_83_str, strlen(inq_83_str));
> +	if (buflen > (ATA_SERNO_LEN + num + 3)) {
> +		/* piv=0, assoc=lu, code_set=ACSII, designator=vendor */
> +		rbuf[num + 0] = 2;	
> +		rbuf[num + 3] = ATA_SERNO_LEN;
> +		num += 4;
> +		ata_dev_id_string(args->id, (unsigned char *) rbuf + num,
> +				  ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
> +		num += ATA_SERNO_LEN;
>  	}
> -
> +	if (buflen > (sat_model_serial_desc_len + num + 3)) {
> +		/* SAT defined lu model and serial numbers descriptor */
> +		/* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */
> +		rbuf[num + 0] = 2;	
> +		rbuf[num + 1] = 1;	
> +		rbuf[num + 3] = sat_model_serial_desc_len;
> +		num += 4;
> +		strncpy(rbuf + num, "ATA     ", 8);
> +		num += 8;
> +		ata_dev_id_string(args->id, (unsigned char *) rbuf + num,
> +				  ATA_ID_PROD_OFS, ata_model_byte_len);
> +		num += ata_model_byte_len;
> +		ata_dev_id_string(args->id, (unsigned char *) rbuf + num,
> +				  ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
> +		num += ATA_SERNO_LEN;
> +	}
> +	rbuf[3] = num - 4;    /* page len (assume less than 256 bytes) */
>  	return 0;
>  }
>  
>