[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1241828002-12742-2-git-send-email-tj@kernel.org>
Date: Sat, 9 May 2009 09:13:20 +0900
From: Tejun Heo <tj@...nel.org>
To: jeff@...zik.org, linux-ide@...r.kernel.org, jens.axboe@...cle.com,
linux-kernel@...r.kernel.org, linux-scsi@...r.kernel.org,
James.Bottomley@...senPartnership.com, Mauelshagen@...Hat.com,
dm-devel@...Hat.com, dan.j.williams@...il.com
Cc: Tejun Heo <tj@...nel.org>
Subject: [PATCH 1/3] block: add alt_size
ATA disks have two sizes - the user visible size and native size. The
user visible size is usually used by the BIOS to hide certain area
(e.g. recovery partition) or trim size for various reasons. IDE and
libata can unlock these HPA areas and IDE does so by default and
libata depending on kernel parameters (some distros default to unlock
to maintain compatibility with IDE).
This usually doesn't matter but certain tools need to know what BIOS
wants the disk to look like. For example, certain BIOS RAID formats
put the metadata at the end of the disk where the 'end' is the trimmed
size, so without knowing the BIOS size, dmraid can't work reliably if
HPA is unlocked.
This patch adds alt_size to genhd and exports it via sysfs. alt_size
is always smaller than the regular size. Being a hint, alt_size can
also be set from userland by writing to the sysfs node mostly for
debugging and testing. Because initialization order isn't enforced,
the alt_size < size limitation is applied while getting the attribute.
Signed-off-by: Tejun Heo <tj@...nel.org>
Cc: Jens Axboe <jens.axboe@...cle.com>
Cc: Dan Williams <dan.j.williams@...il.com>
Cc: Jeff Garzik <jeff@...zik.org>
Cc: James Bottomley <James.Bottomley@...senPartnership.com>
---
block/genhd.c | 26 ++++++++++++++++++++++++++
include/linux/genhd.h | 13 ++++++++++++-
2 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 1a4916e..e6a3fdb 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -844,6 +844,29 @@ static ssize_t disk_ro_show(struct device *dev,
return sprintf(buf, "%d\n", get_disk_ro(disk) ? 1 : 0);
}
+static ssize_t disk_alt_size_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct gendisk *disk = dev_to_disk(dev);
+
+ return sprintf(buf, "%llu\n",
+ (unsigned long long)get_alt_capacity(disk));
+}
+
+static ssize_t disk_alt_size_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct gendisk *disk = dev_to_disk(dev);
+ sector_t new_size = simple_strtoull(buf, NULL, 0);
+
+ set_alt_capacity(disk, new_size);
+
+ if (get_alt_capacity(disk) == new_size)
+ return count;
+ return -EINVAL;
+}
+
static ssize_t disk_capability_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -857,6 +880,8 @@ static DEVICE_ATTR(ext_range, S_IRUGO, disk_ext_range_show, NULL);
static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL);
static DEVICE_ATTR(ro, S_IRUGO, disk_ro_show, NULL);
static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL);
+static DEVICE_ATTR(alt_size, S_IRUGO | S_IWUSR, disk_alt_size_show,
+ disk_alt_size_store);
static DEVICE_ATTR(capability, S_IRUGO, disk_capability_show, NULL);
static DEVICE_ATTR(stat, S_IRUGO, part_stat_show, NULL);
#ifdef CONFIG_FAIL_MAKE_REQUEST
@@ -875,6 +900,7 @@ static struct attribute *disk_attrs[] = {
&dev_attr_removable.attr,
&dev_attr_ro.attr,
&dev_attr_size.attr,
+ &dev_attr_alt_size.attr,
&dev_attr_capability.attr,
&dev_attr_stat.attr,
#ifdef CONFIG_FAIL_MAKE_REQUEST
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index a1a28ca..a83e4e6 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -159,7 +159,8 @@ struct gendisk {
struct timer_rand_state *random;
- atomic_t sync_io; /* RAID */
+ sector_t alt_nr_sects; /* alt sects, should be <= part0.sects */
+ atomic_t sync_io; /* RAID */
struct work_struct async_notify;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
@@ -364,10 +365,20 @@ static inline sector_t get_capacity(struct gendisk *disk)
{
return disk->part0.nr_sects;
}
+static inline sector_t get_alt_capacity(struct gendisk *disk)
+{
+ if (disk->alt_nr_sects && disk->alt_nr_sects < disk->part0.nr_sects)
+ return disk->alt_nr_sects;
+ return 0;
+}
static inline void set_capacity(struct gendisk *disk, sector_t size)
{
disk->part0.nr_sects = size;
}
+static inline void set_alt_capacity(struct gendisk *disk, sector_t size)
+{
+ disk->alt_nr_sects = size;
+}
#ifdef CONFIG_SOLARIS_X86_PARTITION
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists