From: Joe Thornber <ejt@xxxxxxxxxx>
Experimental reserve interface for XFS guys to play with.
I have big reservations (no pun intended) about this patch.
Not-Signed-off-by: Joe Thornber <ejt@xxxxxxxxxx>
Not-Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
---
drivers/md/dm-thin.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 132 insertions(+), 10 deletions(-)
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 92237b6..31d36da 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -271,6 +271,8 @@ struct pool {
process_mapping_fn process_prepared_discard;
struct dm_bio_prison_cell **cell_sort_array;
+
+ dm_block_t reserve_count;
};
static enum pool_mode get_pool_mode(struct pool *pool);
@@ -318,6 +320,8 @@ struct thin_c {
*/
atomic_t refcount;
struct completion can_destroy;
+
+ dm_block_t reserve_count;
};
/*----------------------------------------------------------------*/
@@ -1359,24 +1363,19 @@ static void check_low_water_mark(struct pool *pool, dm_block_t free_blocks)
}
}
-static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
+static int get_free_blocks(struct pool *pool, dm_block_t *free_blocks)
{
int r;
- dm_block_t free_blocks;
- struct pool *pool = tc->pool;
-
- if (WARN_ON(get_pool_mode(pool) != PM_WRITE))
- return -EINVAL;
- r = dm_pool_get_free_block_count(pool->pmd, &free_blocks);
+ r = dm_pool_get_free_block_count(pool->pmd, free_blocks);
if (r) {
metadata_operation_failed(pool, "dm_pool_get_free_block_count", r);
return r;
}
- check_low_water_mark(pool, free_blocks);
+ check_low_water_mark(pool, *free_blocks);
- if (!free_blocks) {
+ if (!*free_blocks) {
/*
* Try to commit to see if that will free up some
* more space.
@@ -1385,7 +1384,7 @@ static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
if (r)
return r;
- r = dm_pool_get_free_block_count(pool->pmd, &free_blocks);
+ r = dm_pool_get_free_block_count(pool->pmd, free_blocks);
if (r) {
metadata_operation_failed(pool, "dm_pool_get_free_block_count", r);
return r;
@@ -1397,6 +1396,78 @@ static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
}
}
+ return r;
+}
+
+/*
+ * Returns true iff either:
+ * i) decrement succeeded (ie. there was reserve left)
+ * ii) there is extra space in the pool
+ */
+static bool dec_reserve_count(struct thin_c *tc, dm_block_t free_blocks)
+{
+ bool r = false;
+ unsigned long flags;
+
+ if (!free_blocks)
+ return false;
+
+ spin_lock_irqsave(&tc->pool->lock, flags);
+ if (tc->reserve_count > 0) {
+ tc->reserve_count--;
+ tc->pool->reserve_count--;
+ r = true;
+ } else {
+ if (free_blocks > tc->pool->reserve_count)
+ r = true;
+ }
+ spin_unlock_irqrestore(&tc->pool->lock, flags);
+
+ return r;
+}
+
+static int set_reserve_count(struct thin_c *tc, dm_block_t count)
+{
+ int r;
+ dm_block_t free_blocks, delta;
+ unsigned long flags;
+
+ r = get_free_blocks(tc->pool, &free_blocks);
+ if (r)
+ return r;
+
+ spin_lock_irqsave(&tc->pool->lock, flags);
+ if (count <= tc->reserve_count)
+ goto out_unlock; /* nothing to do */
+ delta = count - tc->reserve_count;
+ if (tc->pool->reserve_count + delta > free_blocks)
+ r = -ENOSPC;
+ else {
+ tc->reserve_count = count;
+ tc->pool->reserve_count += delta;
+ }
+out_unlock:
+ spin_unlock_irqrestore(&tc->pool->lock, flags);
+
+ return r;
+}
+
+static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
+{
+ int r;
+ dm_block_t free_blocks;
+ struct pool *pool = tc->pool;
+
+ if (WARN_ON(get_pool_mode(pool) != PM_WRITE))
+ return -EINVAL;
+
+ r = get_free_blocks(tc->pool, &free_blocks);
+ if (r)
+ return r;
+
+ if (!dec_reserve_count(tc, free_blocks))
+ return -ENOSPC;
+
r = dm_pool_alloc_data_block(pool->pmd, result);
if (r) {
metadata_operation_failed(pool, "dm_pool_alloc_data_block", r);
@@ -2880,6 +2951,7 @@ static struct pool *pool_create(struct mapped_device *pool_md,
pool->last_commit_jiffies = jiffies;
pool->pool_md = pool_md;
pool->md_dev = metadata_dev;
+ pool->reserve_count = 0;
__pool_table_insert(pool);
return pool;
@@ -3895,6 +3967,19 @@ static void pool_io_hints(struct dm_target *ti, struct queue_limits *limits)
*/
}
+static int pool_get_reserved_space(struct dm_target *ti, sector_t *nr_sects)
+{
+ unsigned long flags;
+ struct pool_c *pt = ti->private;
+ struct pool *pool = pt->pool;
+
+ spin_lock_irqsave(&pool->lock, flags);
+ *nr_sects = pool->reserve_count * pool->sectors_per_block;
+ spin_unlock_irqrestore(&pool->lock, flags);
+
+ return 0;
+}
+
static struct target_type pool_target = {
.name = "thin-pool",
.features = DM_TARGET_SINGLETON | DM_TARGET_ALWAYS_WRITEABLE |
@@ -3913,6 +3998,7 @@ static struct target_type pool_target = {
.status = pool_status,
.iterate_devices = pool_iterate_devices,
.io_hints = pool_io_hints,
+ .get_reserved_space = pool_get_reserved_space,
};
/*----------------------------------------------------------------
@@ -3936,6 +4022,7 @@ static void thin_dtr(struct dm_target *ti)
spin_lock_irqsave(&tc->pool->lock, flags);
list_del_rcu(&tc->list);
+ tc->pool->reserve_count -= tc->reserve_count;
spin_unlock_irqrestore(&tc->pool->lock, flags);
synchronize_rcu();
@@ -4074,6 +4161,7 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv)
init_completion(&tc->can_destroy);
list_add_tail_rcu(&tc->list, &tc->pool->active_thins);
spin_unlock_irqrestore(&tc->pool->lock, flags);
+ tc->reserve_count = 0;
/*
* This synchronize_rcu() call is needed here otherwise we risk a
* wake_worker() call finding no bios to process (because the newly
@@ -4271,6 +4359,38 @@ static void thin_io_hints(struct dm_target *ti, struct queue_limits *limits)
limits->max_discard_sectors = 2048 * 1024 * 16; /* 16G */
}
+static int thin_reserve_space(struct dm_target *ti, sector_t nr_sects)
+{
+ struct thin_c *tc = ti->private;
+ struct pool *pool = tc->pool;
+ sector_t blocks;
+
+ /*
+ * @nr_sects must always be a factor of the pool's blocksize;
+ * upper layers can rely on the bdev's minimum_io_size for this.
+ */
+ if (!nr_sects || !is_factor(nr_sects, pool->sectors_per_block))
+ return -EINVAL;
+
+ blocks = nr_sects;
+ (void) sector_div(blocks, pool->sectors_per_block);
+
+ return set_reserve_count(tc, blocks);
+}
+
+static int thin_get_reserved_space(struct dm_target *ti, sector_t *nr_sects)
+{
+ unsigned long flags;
+ struct thin_c *tc = ti->private;
+ struct pool *pool = tc->pool;
+
+ spin_lock_irqsave(&tc->pool->lock, flags);
+ *nr_sects = tc->reserve_count * pool->sectors_per_block;
+ spin_unlock_irqrestore(&tc->pool->lock, flags);
+
+ return 0;
+}
+
static struct target_type thin_target = {
.name = "thin",
.version = {1, 18, 0},
@@ -4285,6 +4405,8 @@ static struct target_type thin_target = {
.status = thin_status,
.iterate_devices = thin_iterate_devices,
.io_hints = thin_io_hints,
+ .reserve_space = thin_reserve_space,
+ .get_reserved_space = thin_get_reserved_space,
};
/*----------------------------------------------------------------*/
--
2.4.3
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
