From sakamoto@sv.tsnr.com  Wed May 28 13:07:08 2008
Return-Path: <sakamoto@sv.tsnr.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6617E1065677
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 May 2008 13:07:08 +0000 (UTC)
	(envelope-from sakamoto@sv.tsnr.com)
Received: from sv.tsnr.com (sv.tsnr.com [203.181.83.169])
	by mx1.freebsd.org (Postfix) with ESMTP id 26AEC8FC2F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 May 2008 13:07:08 +0000 (UTC)
	(envelope-from sakamoto@sv.tsnr.com)
Received: by sv.tsnr.com (Postfix, from userid 10001)
	id 3B5102298C; Wed, 28 May 2008 21:47:59 +0900 (JST)
Message-Id: <20080528124759.3B5102298C@sv.tsnr.com>
Date: Wed, 28 May 2008 21:47:59 +0900 (JST)
From: Hideki Sakamoto <hsakamt@tsnr.com>
Reply-To: Hideki Sakamoto <hsakamt@tsnr.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ar] cannot handle >16 serial number with Intel MatrixRAID
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         124064
>Category:       kern
>Synopsis:       [ar] [patch] cannot handle >16 serial number with Intel MatrixRAID
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    mav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 28 13:10:02 UTC 2008
>Closed-Date:    Thu Apr 15 12:23:43 UTC 2010
>Last-Modified:  Thu Apr 15 12:30:04 UTC 2010
>Originator:     Hideki Sakamoto
>Release:        FreeBSD 6.2-RELEASE-p11, 7.0 and 8.0-CURRENT i386
>Organization:
Tsukuba Secure Network Research
>Environment:
System: FreeBSD sv.tsnr.com 6.2-RELEASE-p11 FreeBSD 6.2-RELEASE-p11 #3: Sat Feb 16 15:11:43 JST 2008 root@sv.tsnr.com:/usr/obj/usr/src/sys/GENERIC i386

System: FreeBSD inst.tsnr.com 8.0-CURRENT FreeBSD 8.0-CURRENT #12: Tue May 27 00:33:33 JST 2008 root@inst.tsnr.com:/usr/obj/usr/src/sys/GENERIC i386

Intel BOX33TLM(ICH9R)

	
>Description:
By chance I got two HDD those serial numbers are almost same. And I cannot
build raid because ataraid cut off a serial number at 16-th characters and
write it to HDD as RAID information.
Another problem is: I checked source and I found Intel MatrixRAID BIOS use
last 16 character of device's serial number though ataraid use first 16
character of it. So, ataraid cannot recognize raid drive built in BIOS
menu.
	
>How-To-Repeat:
Get HDD which returns serial number longer than 16 chars. And build a raid
with atacontrol command. I confirmed that a HGST 2.5inch HDD(5K250) raise
problems.
	
>Fix:
This is a patch for 8-CURRENT. 
note: HGST HDD returns <real serial nunber> + 0x03 0x00

--- /sys/dev/ata/ata-raid.c	2008-04-17 21:29:35.000000000 +0900
+++ ata/ata-raid.c	2008-05-27 02:37:24.000000000 +0900
@@ -2086,6 +2086,7 @@
     u_int32_t checksum, *ptr;
     int array, count, disk, volume = 1, retval = 0;
     char *tmp;
+    int snlen, snidx;
 
     if (!(meta = (struct intel_raid_conf *)
 	  malloc(1536, M_AR, M_NOWAIT | M_ZERO)))
@@ -2228,8 +2229,18 @@
 	    for (disk = 0; disk < raid->total_disks; disk++) {
 		struct ata_device *atadev = device_get_softc(parent);
 
-		if (!strncmp(raid->disks[disk].serial, atadev->param.serial,
-		    sizeof(raid->disks[disk].serial))) {
+                for (snlen=0;;snlen++) {
+		    if ((char)atadev->param.serial[snlen] == '\0' ||
+		        (char)atadev->param.serial[snlen] == 3) {  /* ascii EOT */
+                        if (snlen < 16)
+			    snidx = 0;
+		        else
+			    snidx = snlen - 16;
+		        break;
+		    }
+	        }
+		if (!strncmp(raid->disks[disk].serial, atadev->param.serial + snidx,
+		    min(snlen,sizeof(raid->disks[disk].serial)))) {
 		    raid->disks[disk].dev = parent;
 		    raid->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_ONLINE);
 		    ars->raid[raid->volume] = raid;
@@ -2273,6 +2284,7 @@
     u_int32_t checksum, *ptr;
     int count, disk, error = 0;
     char *tmp;
+    int snlen,snidx;
 
     if (!(meta = (struct intel_raid_conf *)
 	  malloc(1536, M_AR, M_NOWAIT | M_ZERO))) {
@@ -2299,8 +2311,19 @@
 	    struct ata_device *atadev =
 		device_get_softc(rdp->disks[disk].dev);
 
-	    bcopy(atadev->param.serial, meta->disk[disk].serial,
-		  sizeof(rdp->disks[disk].serial));
+            for (snlen=0;;snlen++) {
+		if ((char)atadev->param.serial[snlen] == '\0' ||
+		    (char)atadev->param.serial[snlen] == 3) {  /* ascii EOT */
+                    if (snlen < 16)
+			snidx = 0;
+		    else {
+			snidx = snlen - 16;
+		    }
+		    break;
+		}
+	    }
+	    bcopy(atadev->param.serial + snidx, meta->disk[disk].serial,
+		  min(snlen,sizeof(rdp->disks[disk].serial)));
 	    meta->disk[disk].sectors = rdp->disks[disk].sectors;
 	    meta->disk[disk].id = (ch->unit << 16) | atadev->unit;
 	}
	

	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->sos 
Responsible-Changed-By: remko 
Responsible-Changed-When: Fri May 30 14:44:34 UTC 2008 
Responsible-Changed-Why:  
Soren, can you comment on this pelase? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124064 
Responsible-Changed-From-To: sos->freebsd-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue May 12 04:52:53 UTC 2009 
Responsible-Changed-Why:  
sos@ is not actively working on ATA-related PRs. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124064 
Responsible-Changed-From-To: freebsd-bugs->mav 
Responsible-Changed-By: mav 
Responsible-Changed-When: Fri Mar 12 08:09:03 UTC 2010 
Responsible-Changed-Why:  
I'll check that. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124064 
State-Changed-From-To: open->patched 
State-Changed-By: mav 
State-Changed-When: Fri Mar 26 10:18:43 UTC 2010 
State-Changed-Why:  
tch committed to HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124064 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/124064: commit references a PR
Date: Fri, 26 Mar 2010 10:18:45 +0000 (UTC)

 Author: mav
 Date: Fri Mar 26 10:18:19 2010
 New Revision: 205680
 URL: http://svn.freebsd.org/changeset/base/205680
 
 Log:
   Use last 16 bytes of serial number in metadata instead of first ones,
   same as Intel MatrixRAID does.
   
   PR:		kern/124064
 
 Modified:
   head/sys/dev/ata/ata-raid.c
 
 Modified: head/sys/dev/ata/ata-raid.c
 ==============================================================================
 --- head/sys/dev/ata/ata-raid.c	Fri Mar 26 08:47:07 2010	(r205679)
 +++ head/sys/dev/ata/ata-raid.c	Fri Mar 26 10:18:19 2010	(r205680)
 @@ -2568,8 +2568,15 @@ ata_raid_intel_read_meta(device_t dev, s
  	if (meta->generation >= raid->generation) {
  	    for (disk = 0; disk < raid->total_disks; disk++) {
  		struct ata_device *atadev = device_get_softc(parent);
 +		int len;
  
 -		if (!strncmp(raid->disks[disk].serial, atadev->param.serial,
 +		for (len = 0; len < sizeof(atadev->param.serial); len++) {
 +		    if (atadev->param.serial[len] < 0x20)
 +			break;
 +		}
 +		len = (len > sizeof(raid->disks[disk].serial)) ?
 +		    len - sizeof(raid->disks[disk].serial) : 0;
 +		if (!strncmp(raid->disks[disk].serial, atadev->param.serial + len,
  		    sizeof(raid->disks[disk].serial))) {
  		    raid->disks[disk].dev = parent;
  		    raid->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_ONLINE);
 @@ -2639,8 +2646,15 @@ ata_raid_intel_write_meta(struct ar_soft
  		device_get_softc(device_get_parent(rdp->disks[disk].dev));
  	    struct ata_device *atadev =
  		device_get_softc(rdp->disks[disk].dev);
 +	    int len;
  
 -	    bcopy(atadev->param.serial, meta->disk[disk].serial,
 +	    for (len = 0; len < sizeof(atadev->param.serial); len++) {
 +		if (atadev->param.serial[len] < 0x20)
 +		    break;
 +	    }
 +	    len = (len > sizeof(rdp->disks[disk].serial)) ?
 +	        len - sizeof(rdp->disks[disk].serial) : 0;
 +	    bcopy(atadev->param.serial + len, meta->disk[disk].serial,
  		  sizeof(rdp->disks[disk].serial));
  	    meta->disk[disk].sectors = rdp->disks[disk].sectors;
  	    meta->disk[disk].id = (ch->unit << 16) | atadev->unit;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: mav 
State-Changed-When: Thu Apr 15 12:23:14 UTC 2010 
State-Changed-Why:  
Patch merged to 7/8-STABLE. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124064 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/124064: commit references a PR
Date: Thu, 15 Apr 2010 12:20:28 +0000 (UTC)

 Author: mav
 Date: Thu Apr 15 12:20:13 2010
 New Revision: 206653
 URL: http://svn.freebsd.org/changeset/base/206653
 
 Log:
   MFC r205680:
   Use last 16 bytes of serial number in metadata instead of first ones,
   same as Intel MatrixRAID does.
   
   PR:             kern/124064
 
 Modified:
   stable/8/sys/dev/ata/ata-raid.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/xen/xenpci/   (props changed)
 
 Modified: stable/8/sys/dev/ata/ata-raid.c
 ==============================================================================
 --- stable/8/sys/dev/ata/ata-raid.c	Thu Apr 15 11:17:33 2010	(r206652)
 +++ stable/8/sys/dev/ata/ata-raid.c	Thu Apr 15 12:20:13 2010	(r206653)
 @@ -2568,8 +2568,15 @@ ata_raid_intel_read_meta(device_t dev, s
  	if (meta->generation >= raid->generation) {
  	    for (disk = 0; disk < raid->total_disks; disk++) {
  		struct ata_device *atadev = device_get_softc(parent);
 +		int len;
  
 -		if (!strncmp(raid->disks[disk].serial, atadev->param.serial,
 +		for (len = 0; len < sizeof(atadev->param.serial); len++) {
 +		    if (atadev->param.serial[len] < 0x20)
 +			break;
 +		}
 +		len = (len > sizeof(raid->disks[disk].serial)) ?
 +		    len - sizeof(raid->disks[disk].serial) : 0;
 +		if (!strncmp(raid->disks[disk].serial, atadev->param.serial + len,
  		    sizeof(raid->disks[disk].serial))) {
  		    raid->disks[disk].dev = parent;
  		    raid->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_ONLINE);
 @@ -2639,8 +2646,15 @@ ata_raid_intel_write_meta(struct ar_soft
  		device_get_softc(device_get_parent(rdp->disks[disk].dev));
  	    struct ata_device *atadev =
  		device_get_softc(rdp->disks[disk].dev);
 +	    int len;
  
 -	    bcopy(atadev->param.serial, meta->disk[disk].serial,
 +	    for (len = 0; len < sizeof(atadev->param.serial); len++) {
 +		if (atadev->param.serial[len] < 0x20)
 +		    break;
 +	    }
 +	    len = (len > sizeof(rdp->disks[disk].serial)) ?
 +	        len - sizeof(rdp->disks[disk].serial) : 0;
 +	    bcopy(atadev->param.serial + len, meta->disk[disk].serial,
  		  sizeof(rdp->disks[disk].serial));
  	    meta->disk[disk].sectors = rdp->disks[disk].sectors;
  	    meta->disk[disk].id = (ch->unit << 16) | atadev->unit;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/124064: commit references a PR
Date: Thu, 15 Apr 2010 12:22:55 +0000 (UTC)

 Author: mav
 Date: Thu Apr 15 12:22:47 2010
 New Revision: 206654
 URL: http://svn.freebsd.org/changeset/base/206654
 
 Log:
   MFC r205680:
   Use last 16 bytes of serial number in metadata instead of first ones,
   same as Intel MatrixRAID does.
   
   PR:             kern/124064
 
 Modified:
   stable/7/sys/dev/ata/ata-raid.c
 Directory Properties:
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/sys/dev/ata/ata-raid.c
 ==============================================================================
 --- stable/7/sys/dev/ata/ata-raid.c	Thu Apr 15 12:20:13 2010	(r206653)
 +++ stable/7/sys/dev/ata/ata-raid.c	Thu Apr 15 12:22:47 2010	(r206654)
 @@ -2559,8 +2559,15 @@ ata_raid_intel_read_meta(device_t dev, s
  	if (meta->generation >= raid->generation) {
  	    for (disk = 0; disk < raid->total_disks; disk++) {
  		struct ata_device *atadev = device_get_softc(parent);
 +		int len;
  
 -		if (!strncmp(raid->disks[disk].serial, atadev->param.serial,
 +		for (len = 0; len < sizeof(atadev->param.serial); len++) {
 +		    if (atadev->param.serial[len] < 0x20)
 +			break;
 +		}
 +		len = (len > sizeof(raid->disks[disk].serial)) ?
 +		    len - sizeof(raid->disks[disk].serial) : 0;
 +		if (!strncmp(raid->disks[disk].serial, atadev->param.serial + len,
  		    sizeof(raid->disks[disk].serial))) {
  		    raid->disks[disk].dev = parent;
  		    raid->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_ONLINE);
 @@ -2627,8 +2634,15 @@ ata_raid_intel_write_meta(struct ar_soft
  		device_get_softc(device_get_parent(rdp->disks[disk].dev));
  	    struct ata_device *atadev =
  		device_get_softc(rdp->disks[disk].dev);
 +	    int len;
  
 -	    bcopy(atadev->param.serial, meta->disk[disk].serial,
 +	    for (len = 0; len < sizeof(atadev->param.serial); len++) {
 +		if (atadev->param.serial[len] < 0x20)
 +		    break;
 +	    }
 +	    len = (len > sizeof(rdp->disks[disk].serial)) ?
 +	        len - sizeof(rdp->disks[disk].serial) : 0;
 +	    bcopy(atadev->param.serial + len, meta->disk[disk].serial,
  		  sizeof(rdp->disks[disk].serial));
  	    meta->disk[disk].sectors = rdp->disks[disk].sectors;
  	    meta->disk[disk].id = (ch->unit << 16) | ATA_DEV(atadev->unit);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
