diff mbox

[RFC,1/2] block: implement an unprep function corresponding directly to prep

Message ID 20100705160023S.fujita.tomonori@lab.ntt.co.jp
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

FUJITA Tomonori July 5, 2010, 7 a.m. UTC 
Cc'ed to linux-ide,

On Fri, 2 Jul 2010 13:03:44 +0200
Christoph Hellwig <hch@lst.de> wrote:

> On Thu, Jul 01, 2010 at 10:47:12AM +0900, FUJITA Tomonori wrote:
> > I think so. If I can figure out why qemu scsi driver is broken, the
> > job is done.
> 
> Well, I still have problems even with libata + a trim capable SSD.
> Dmesg from the last attept with your patch to use FS requests all the
> way:

Thanks for testing.

Did you tested my discard branch, right?

Wired, I've just got Intel SSD X25-M drives and mkfs.xfs worked well.

REQ_TYPE_FS should give the same scsi_cmnd struct as
REQ_TYPE_BLOCK_PC... I've attached a patch to print some debug info.

Ide people, any idea about what the following error message means?

I've been trying to convert WRITE_SAME_16 from REQ_TYPE_BLOCK_PC to
REQ_TYPE_FS.


> [   27.669404] ata2.00: exception Emask 0x10 SAct 0x1 SErr 0x400100 action 0x6 frozen
> [   27.669533] ata2.00: irq_stat 0x08000000, interface fatal error
> [   27.669627] ata2: SError: { UnrecovData Handshk }
> [   27.669720] ata2.00: failed command: WRITE FPDMA QUEUED
> [   27.669819] ata2.00: cmd 61/ff:00:00:00:00/ff:00:00:00:00/40 tag 0 ncq 33553920 out
> [   27.669821]          res 40/00:00:00:00:00/00:00:00:00:00/40 Emask 0x10 (ATA bus error)
> [   27.670096] ata2.00: status: { DRDY }
> [   27.670196] ata2: hard resetting link
> [   27.975118] ata2: SATA link up 3.0 Gbps (SStatus 123 SControl 300)
> [   27.978618] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   27.978628] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   27.978756] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   27.984299] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   27.984309] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   27.984437] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   27.984814] ata2.00: configured for UDMA/133
> [   27.987548] ata2.00: configured for UDMA/133
> [   27.987645] ata2: EH complete
> [   27.987784] ata2.00: exception Emask 0x10 SAct 0x1 SErr 0x400100 action 0x6 frozen
> [   27.987915] ata2.00: irq_stat 0x08000000, interface fatal error
> [   27.988026] ata2: SError: { UnrecovData Handshk }
> [   27.988128] ata2.00: failed command: WRITE FPDMA QUEUED
> [   27.988234] ata2.00: cmd 61/ff:00:00:00:00/ff:00:00:00:00/40 tag 0 ncq 33553920 out
> [   27.988236]          res 40/00:00:00:00:00/00:00:00:00:00/40 Emask 0x10 (ATA bus error)
> [   27.988499] ata2.00: status: { DRDY }
> [   27.988591] ata2: hard resetting link
> [   28.293109] ata2: SATA link up 3.0 Gbps (SStatus 123 SControl 300)
> [   28.297509] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   28.297518] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   28.297648] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   28.301854] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   28.301863] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   28.301991] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   28.302378] ata2.00: configured for UDMA/133
> [   28.305024] ata2.00: configured for UDMA/133
> [   28.305123] ata2: EH complete
> [   28.305292] ata2.00: exception Emask 0x10 SAct 0x1 SErr 0x400100 action 0x6 frozen
> [   28.305421] ata2.00: irq_stat 0x08000000, interface fatal error
> [   28.305513] ata2: SError: { UnrecovData Handshk }
> [   28.305605] ata2.00: failed command: WRITE FPDMA QUEUED
> [   28.305703] ata2.00: cmd 61/ff:00:00:00:00/ff:00:00:00:00/40 tag 0 ncq 33553920 out
> [   28.305705]          res 40/00:00:00:00:00/00:00:00:00:00/40 Emask 0x10 (ATA bus error)
> [   28.305948] ata2.00: status: { DRDY }
> [   28.306066] ata2: hard resetting link
> [   28.611111] ata2: SATA link up 3.0 Gbps (SStatus 123 SControl 300)
> [   28.613232] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   28.613241] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   28.613378] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   28.619103] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   28.619112] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   28.619240] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   28.619616] ata2.00: configured for UDMA/133
> [   28.623193] ata2.00: configured for UDMA/133
> [   28.623289] ata2: EH complete
> [   28.623427] ata2: limiting SATA link speed to 1.5 Gbps
> [   28.623528] ata2.00: exception Emask 0x10 SAct 0x1 SErr 0x400100 action 0x6 frozen
> [   28.623651] ata2.00: irq_stat 0x08000000, interface fatal error
> [   28.623745] ata2: SError: { UnrecovData Handshk }
> [   28.623836] ata2.00: failed command: WRITE FPDMA QUEUED
> [   28.623934] ata2.00: cmd 61/ff:00:00:00:00/ff:00:00:00:00/40 tag 0 ncq 33553920 out
> [   28.623937]          res 40/00:00:00:00:00/00:00:00:00:00/40 Emask 0x10 (ATA bus error)
> [   28.624202] ata2.00: status: { DRDY }
> [   28.624303] ata2: hard resetting link
> [   28.929103] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 310)
> [   28.932449] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   28.932458] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   28.932587] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   28.939190] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   28.939200] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   28.939328] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   28.939763] ata2.00: configured for UDMA/133
> [   28.941154] ata2.00: configured for UDMA/133
> [   28.941250] ata2: EH complete
> [   28.941414] ata2.00: exception Emask 0x10 SAct 0x1 SErr 0x400100 action 0x6 frozen
> [   28.941538] ata2.00: irq_stat 0x08000000, interface fatal error
> [   28.941631] ata2: SError: { UnrecovData Handshk }
> [   28.941722] ata2.00: failed command: WRITE FPDMA QUEUED
> [   28.941821] ata2.00: cmd 61/ff:00:00:00:00/ff:00:00:00:00/40 tag 0 ncq 33553920 out
> [   28.941823]          res 40/00:00:00:00:00/00:00:00:00:00/40 Emask 0x10 (ATA bus error)
> [   28.942091] ata2.00: status: { DRDY }
> [   28.942187] ata2: hard resetting link
> [   29.247116] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 310)
> [   29.250536] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   29.250545] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   29.250673] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   29.256129] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   29.256138] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   29.256266] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   29.256651] ata2.00: configured for UDMA/133
> [   29.259263] ata2.00: configured for UDMA/133
> [   29.259359] ata2: EH complete
> [   29.259533] ata2.00: exception Emask 0x10 SAct 0x1 SErr 0x400100 action 0x6 frozen
> [   29.259659] ata2.00: irq_stat 0x08000000, interface fatal error
> [   29.259752] ata2: SError: { UnrecovData Handshk }
> [   29.259843] ata2.00: failed command: WRITE FPDMA QUEUED
> [   29.259942] ata2.00: cmd 61/ff:00:00:00:00/ff:00:00:00:00/40 tag 0 ncq 33553920 out
> [   29.259945]          res 40/00:00:00:00:00/00:00:00:00:00/40 Emask 0x10 (ATA bus error)
> [   29.260218] ata2.00: status: { DRDY }
> [   29.260319] ata2: hard resetting link
> [   29.565102] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 310)
> [   29.569593] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   29.569603] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   29.569731] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   29.573969] ata2.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
> [   29.573978] ata2.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
> [   29.574127] ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
> [   29.574543] ata2.00: configured for UDMA/133
> [   29.577217] ata2.00: configured for UDMA/133
> [   29.577313] sd 1:0:0:0: [sdb] Result: hostbyte=DID_OK
> driverbyte=DRIVER_SENSE
> [   29.577460] sd 1:0:0:0: [sdb] Sense Key : Aborted Command [current] [descriptor]
> [   29.577786] Descriptor sense data with sense descriptors (in hex):
> [   29.577928]         72 0b 00 00 00 00 00 0c 00 0a 80 00 00 00 00 00
> [   29.578923]         00 00 00 00
> [   29.579301] sd 1:0:0:0: [sdb] Add. Sense: No additional sense information
> [   29.579496] sd 1:0:0:0: [sdb] CDB: Write(10): 2a 00 00 00 00 00 00 ff ff 00
> [   29.580281] end_request: I/O error, dev sdb, sector 0
> [   29.580395] ata2: EH complete


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Christoph Hellwig July 5, 2010, 7:24 p.m. UTC | #1 
On Mon, Jul 05, 2010 at 04:00:44PM +0900, FUJITA Tomonori wrote:
> Did you tested my discard branch, right?

I tested the patch that you sent out back then.

> Wired, I've just got Intel SSD X25-M drives and mkfs.xfs worked well.

What codebase were you testing on?  Sorry, but curently I'm a bit lost
in the maze of patches.  I've got both and intel and an OCZ SSD (right
now I'm travelling with only access to the OCZ actually) and I'd like
to test the latest variant again.

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Lord July 5, 2010, 9:50 p.m. UTC | #2 
On 05/07/10 03:24 PM, Christoph Hellwig wrote:
>
> What codebase were you testing on?  Sorry, but curently I'm a bit lost
> in the maze of patches.  I've got both and intel and an OCZ SSD (right
> now I'm travelling with only access to the OCZ actually) and I'd like
> to test the latest variant again.
..

Speaking of which..  I have recently noticed that some OCZ drives
fail TRIM commands when issued for the final sector of the drive..
which happens by default with "mke2fs -t ext4".

So I now partition those to not include the final sector.

Keep your eyes peeled for stuff like that.

Cheers
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Lord July 5, 2010, 9:54 p.m. UTC | #3 
> On 05/07/10 03:24 PM, Christoph Hellwig wrote:
>>
>> What codebase were you testing on? Sorry, but curently I'm a bit lost
>> in the maze of patches. I've got both and intel and an OCZ SSD
..

Do you, or anyone else with one, know what the upper limit is on
TRIM operations with the Intel SSDs ?

I need to know the maximum amount of TRIM ranges they will process
in a single command.

Eg. Indilinx-based SSDs don't appear to have a limit -- they'll accept
a TRIM command with thousands of LBA ranges included.

Sandforce-based SSDs appear to restrict things to max 4KB of range data.

So.. what about Intel?

Thanks

  
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik July 5, 2010, 10 p.m. UTC | #4 
On 07/05/2010 05:54 PM, Mark Lord wrote:
>> On 05/07/10 03:24 PM, Christoph Hellwig wrote:
>>>
>>> What codebase were you testing on? Sorry, but curently I'm a bit lost
>>> in the maze of patches. I've got both and intel and an OCZ SSD
> ..
>
> Do you, or anyone else with one, know what the upper limit is on
> TRIM operations with the Intel SSDs ?
>
> I need to know the maximum amount of TRIM ranges they will process
> in a single command.
>
> Eg. Indilinx-based SSDs don't appear to have a limit -- they'll accept
> a TRIM command with thousands of LBA ranges included.
>
> Sandforce-based SSDs appear to restrict things to max 4KB of range data.
>
> So.. what about Intel?

Lovely :(  I wonder if we could test for that limit at mke2fs time, or 
similar.

Seeing a 4k limit on other SSDs would not surprise me.  Or even a 512-b 
limit.

	Jeff



--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
FUJITA Tomonori July 6, 2010, 7:04 a.m. UTC | #5 
On Mon, 5 Jul 2010 21:24:13 +0200
Christoph Hellwig <hch@lst.de> wrote:

> > Wired, I've just got Intel SSD X25-M drives and mkfs.xfs worked well.
> 
> What codebase were you testing on?  Sorry, but curently I'm a bit lost
> in the maze of patches.  I've got both and intel and an OCZ SSD (right
> now I'm travelling with only access to the OCZ actually) and I'd like
> to test the latest variant again.

I tested:

git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git discard


I rebased the changes against Jens' for-2.6.36 and I've just sent the
latest patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Lord Aug. 3, 2010, 3:01 a.m. UTC | #6 
On 10-07-05 05:54 PM, Mark Lord wrote:
>> On 05/07/10 03:24 PM, Christoph Hellwig wrote:
>>>
>>> What codebase were you testing on? Sorry, but curently I'm a bit lost
>>> in the maze of patches. I've got both and intel and an OCZ SSD
> ..
>
> Do you, or anyone else with one, know what the upper limit is on
> TRIM operations with the Intel SSDs ?
>
> I need to know the maximum amount of TRIM ranges they will process
> in a single command.
>
> Eg. Indilinx-based SSDs don't appear to have a limit -- they'll accept
> a TRIM command with thousands of LBA ranges included.
>
> Sandforce-based SSDs appear to restrict things to max 4KB of range data.
>
> So.. what about Intel?


Well, I still don't know about Intel drives -- anyone?

But for the latest hardware, some manufacturers are now reporting
their TRIM limits in word[105] of the identify data,
as described (optional) in the latest draft ATA ACS-2 specs.

It appears that Sandforce drives officially only allow 512-bytes of range data.
So I'll limit hdparm's TRIM functions to match word[105] when it is specified.

The Indilinx drives I have here don't report anything in word[105], though.

Cheers
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 0a8cd34..70b6b3d 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3020,6 +3020,9 @@  static unsigned int ata_scsi_write_same_xlat(struct ata_queued_cmd *qc)
 
 	ata_qc_set_pc_nbytes(qc);
 
+	printk("%s %d: %p %d %d %d\n", __func__, __LINE__, scmd,
+	       scsi_bufflen(scmd), qc->extrabytes, size);
+
 	return 0;
 
  invalid_fld:
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ad0ed21..9e98d0b 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -838,6 +838,13 @@  void scsi_finish_command(struct scsi_cmnd *cmd)
 				"(result %x)\n", cmd->result));
 
 	good_bytes = scsi_bufflen(cmd);
+
+	if (cmd->request->cmd_flags & REQ_DISCARD)
+		printk("%s %d: %p %d %d %d %u %d\n", __func__, __LINE__,
+		       cmd->request, scsi_bufflen(cmd), good_bytes,
+		       scsi_get_resid(cmd), cmd->request->errors,
+		       cmd->result);
+
         if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
 		int old_good_bytes = good_bytes;
 		drv = scsi_cmd_to_driver(cmd);
@@ -849,9 +856,16 @@  void scsi_finish_command(struct scsi_cmnd *cmd)
 		 * residue if drv->done() error processing indicates no
 		 * change to the completion length.
 		 */
+
+		if (cmd->request->cmd_flags & REQ_DISCARD)
+			printk("%s %d: %p %d %d %d\n", __func__, __LINE__,
+			       cmd->request, good_bytes, old_good_bytes,
+			       scsi_get_resid(cmd));
+
 		if (good_bytes == old_good_bytes)
 			good_bytes -= scsi_get_resid(cmd);
 	}
+
 	scsi_io_completion(cmd, good_bytes);
 }
 EXPORT_SYMBOL(scsi_finish_command);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8c1b084..f92bbff 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -464,6 +464,10 @@  static int scsi_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq)
 	}
 
 	blk_add_request_payload(rq, page, len);
+
+	printk("%s %d: %p %d %d\n", __func__, __LINE__, rq, sdkp->unmap,
+		len);
+
 	return scsi_setup_blk_pc_cmnd(sdp, rq);
 }