From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: rwheeler@redhat.com, snitzer@redhat.com, jeff@garzik.org,
neilb@suse.de, James.Bottomley@hansenpartnership.com,
dgilbert@interlog.com, jens.axboe@oracle.com,
linux-ide@vger.kernel.org
Subject: [PATCH 4 of 8] sd: Physical block size and alignment support
Date: Thu, 23 Apr 2009 01:29:31 -0400 [thread overview]
Message-ID: <fc4cc94aa1e2612b3489.1240464571@sermon.lab.mkp.net> (raw)
In-Reply-To: <patchbomb.1240464567@sermon.lab.mkp.net>
Extract physical block size and lowest aligned LBA from READ
CAPACITY(16) response and adjust queue parameters.
Report physical block size and alignment when applicable.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---
2 files changed, 22 insertions(+), 2 deletions(-)
drivers/scsi/sd.c | 23 +++++++++++++++++++++--
drivers/scsi/sd.h | 1 +
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1306,6 +1306,7 @@ static int read_capacity_16(struct scsi_
int sense_valid = 0;
int the_result;
int retries = 3;
+ unsigned int alignment;
unsigned long long lba;
unsigned sector_size;
@@ -1346,6 +1347,16 @@ static int read_capacity_16(struct scsi_
sector_size = (buffer[8] << 24) | (buffer[9] << 16) |
(buffer[10] << 8) | buffer[11];
+
+ /* Logical blocks per physical block exponent */
+ sdkp->hw_sector_size = (1 << (buffer[13] & 0xf)) * sector_size;
+
+ /* Lowest aligned logical block */
+ alignment = ((buffer[14] & 0x3f) << 8 | buffer[15]) * sector_size;
+ blk_queue_alignment(sdp->request_queue, alignment);
+ if (alignment && sdkp->first_scan)
+ sd_printk(KERN_NOTICE, sdkp, "%u-byte alignment\n", alignment);
+
lba = (((u64)buffer[0] << 56) | ((u64)buffer[1] << 48) |
((u64)buffer[2] << 40) | ((u64)buffer[3] << 32) |
((u64)buffer[4] << 24) | ((u64)buffer[5] << 16) |
@@ -1402,6 +1413,7 @@ static int read_capacity_10(struct scsi_
sector_size = (buffer[4] << 24) | (buffer[5] << 16) |
(buffer[6] << 8) | buffer[7];
+ sdkp->hw_sector_size = sector_size;
lba = (buffer[0] << 24) | (buffer[1] << 16) |
(buffer[2] << 8) | buffer[3];
@@ -1526,11 +1538,17 @@ got_data:
string_get_size(sz, STRING_UNITS_10, cap_str_10,
sizeof(cap_str_10));
- if (sdkp->first_scan || old_capacity != sdkp->capacity)
+ if (sdkp->first_scan || old_capacity != sdkp->capacity) {
sd_printk(KERN_NOTICE, sdkp,
- "%llu %d-byte hardware sectors: (%s/%s)\n",
+ "%llu %d-byte logical blocks: (%s/%s)\n",
(unsigned long long)sdkp->capacity,
sector_size, cap_str_10, cap_str_2);
+
+ if (sdkp->hw_sector_size != sector_size)
+ sd_printk(KERN_NOTICE, sdkp,
+ "%u-byte physical blocks\n",
+ sdkp->hw_sector_size);
+ }
}
/* Rescale capacity to 512-byte units */
@@ -1543,6 +1561,7 @@ got_data:
else if (sector_size == 256)
sdkp->capacity >>= 1;
+ blk_queue_granularity(sdp->request_queue, sdkp->hw_sector_size);
sdkp->device->sector_size = sector_size;
}
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -45,6 +45,7 @@ struct scsi_disk {
unsigned int openers; /* protected by BKL for now, yuck */
sector_t capacity; /* size in 512-byte sectors */
u32 index;
+ unsigned short hw_sector_size;
u8 media_present;
u8 write_prot;
u8 protection_type;/* Data Integrity Field */
next prev parent reply other threads:[~2009-04-23 5:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-23 5:29 [PATCH 0 of 8] I/O topology patch kit Martin K. Petersen
2009-04-23 5:29 ` [PATCH 1 of 8] block: Expose stacked device queues in sysfs Martin K. Petersen
2009-04-23 5:29 ` Martin K. Petersen
2009-04-23 5:29 ` [PATCH 2 of 8] block: Export I/O topology for block devices and partitions Martin K. Petersen
2009-04-23 10:51 ` Jens Axboe
2009-04-23 11:49 ` Matthew Wilcox
2009-04-23 11:55 ` Jens Axboe
2009-04-23 13:22 ` Matthew Wilcox
2009-04-23 13:30 ` Matthew Wilcox
2009-04-23 13:17 ` Martin K. Petersen
2009-04-23 18:13 ` Konrad Rzeszutek
2009-04-23 18:26 ` Ric Wheeler
2009-04-23 18:44 ` Matthew Wilcox
2009-04-23 18:34 ` Martin K. Petersen
2009-04-23 5:29 ` [PATCH 3 of 8] MD: Use new topology calls to indicate alignment and I/O sizes Martin K. Petersen
2009-04-23 5:29 ` Martin K. Petersen [this message]
2009-04-23 16:37 ` [PATCH 4 of 8] sd: Physical block size and alignment support Konrad Rzeszutek
2009-04-23 18:25 ` Martin K. Petersen
2009-04-23 18:44 ` Konrad Rzeszutek
2009-04-23 19:02 ` Martin K. Petersen
2009-04-23 5:29 ` Martin K. Petersen
2009-04-23 5:29 ` [PATCH 5 of 8] sd: Detect non-rotational devices Martin K. Petersen
2009-04-23 10:52 ` Jens Axboe
2009-04-23 11:09 ` Jeff Garzik
2009-04-23 11:13 ` Jens Axboe
2009-04-23 11:22 ` Jeff Garzik
2009-04-23 11:38 ` Matthew Wilcox
2009-04-23 11:58 ` Jeff Garzik
2009-04-23 12:03 ` Jens Axboe
2009-04-23 13:16 ` Martin K. Petersen
2009-04-23 13:33 ` Jeff Garzik
2009-04-23 14:10 ` James Bottomley
2009-04-23 14:16 ` Matthew Wilcox
2009-04-23 14:39 ` Jeff Garzik
2009-04-23 17:25 ` Matthew Wilcox
2009-04-23 17:37 ` James Bottomley
2009-04-23 5:29 ` [PATCH 6 of 8] sd: Block limits VPD support Martin K. Petersen
2009-04-23 5:29 ` [PATCH 7 of 8] scsi_debug: Add support for physical block exponent and alignment Martin K. Petersen
2009-04-23 5:29 ` [PATCH 8 of 8] libata: Report disk alignment and physical block size Martin K. Petersen
2009-04-23 13:46 ` Matthew Wilcox
2009-04-23 14:05 ` Martin K. Petersen
2009-04-23 5:29 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fc4cc94aa1e2612b3489.1240464571@sermon.lab.mkp.net \
--to=martin.petersen@oracle.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=dgilbert@interlog.com \
--cc=jeff@garzik.org \
--cc=jens.axboe@oracle.com \
--cc=linux-ide@vger.kernel.org \
--cc=neilb@suse.de \
--cc=rwheeler@redhat.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.