rpms/kernel/FC-4 linux-2.6-sata-locking-fix.patch, NONE, 1.1 kernel-2.6.spec, 1.1520, 1.1521

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20459

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sata-locking-fix.patch 
Log Message:
fix sata locking


linux-2.6-sata-locking-fix.patch:
 libata-core.c |    2 --
 libata-scsi.c |    9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-sata-locking-fix.patch ---

tree 5b270817df4bc9661365d789d51c04f3774c3ddd
parent e533825447dcb60a82b7cc9d73d06423c849b9a2
author Jeff Garzik <jgarzik at pobox.com> Mon, 31 Oct 2005 09:31:48 -0500
committer Jeff Garzik <jgarzik at pobox.com> Mon, 31 Oct 2005 09:31:48 -0500

[libata] locking rewrite (== fix)

A lot of power packed into a little patch.

This change eliminates the sharing between our controller-wide spinlock
and the SCSI core's Scsi_Host lock.  As the locking in libata was
already highly compartmentalized, always referencing our own lock, and
never scsi_host::host_lock.

As a side effect, this change eliminates a deadlock from calling
scsi_finish_command() while inside our spinlock.

 drivers/scsi/libata-core.c |    2 --
 drivers/scsi/libata-scsi.c |    9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4089,8 +4089,6 @@ static void ata_host_init(struct ata_por
 	host->unique_id = ata_unique_id++;
 	host->max_cmd_len = 12;
 
-	scsi_assign_lock(host, &host_set->lock);
-
 	ap->flags = ATA_FLAG_PORT_DISABLED;
 	ap->id = host->unique_id;
 	ap->host = host;
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -39,6 +39,7 @@
 #include <scsi/scsi.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
 #include <linux/libata.h>
 #include <linux/hdreg.h>
 #include <asm/uaccess.h>
@@ -2405,8 +2406,12 @@ int ata_scsi_queuecmd(struct scsi_cmnd *
 	struct ata_port *ap;
 	struct ata_device *dev;
 	struct scsi_device *scsidev = cmd->device;
+	struct Scsi_Host *shost = scsidev->host;
 
-	ap = (struct ata_port *) &scsidev->host->hostdata[0];
+	ap = (struct ata_port *) &shost->hostdata[0];
+
+	spin_unlock(shost->host_lock);
+	spin_lock(&ap->host_set->lock);
 
 	ata_scsi_dump_cdb(ap, cmd);
 
@@ -2429,6 +2434,8 @@ int ata_scsi_queuecmd(struct scsi_cmnd *
 		ata_scsi_translate(ap, dev, cmd, done, atapi_xlat);
 
 out_unlock:
+	spin_unlock(&ap->host_set->lock);
+	spin_lock(shost->host_lock);
 	return 0;
 }
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1520
retrieving revision 1.1521
diff -u -r1.1520 -r1.1521
--- kernel-2.6.spec	29 Nov 2005 17:49:34 -0000	1.1520
+++ kernel-2.6.spec	29 Nov 2005 22:43:41 -0000	1.1521
@@ -344,6 +344,7 @@
 Patch1760: linux-2.6-firmware-timeout.patch
 Patch1761: linux-2.6-suspend-mxcsr.patch
 Patch1762: linux-2.6-i8k-dmi.patch
+Patch1770: linux-2.6-sata-locking-fix.patch
 
 
 # ACPI patches.
@@ -790,6 +791,8 @@
 %patch1761 -p1
 # Fix up DMI usage in i8k driver.
 %patch1762 -p1
+# Fix locking in SATA
+%patch1770 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1259,6 +1262,9 @@
 %endif
 
 %changelog
+* Mon Nov 28 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1646_FC4]
+- Fix SATA locking.
+
 * Mon Nov 28 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1645_FC4]
 - Unbreak the cciss cli tools. (#170351)