[dm-devel] dm transaction manager: handle space map checker failure
Mike Snitzer
msnitzer at redhat.com
Thu Jun 21 06:10:09 UTC 2012
On Thu, Jun 21 2012 at 1:10am -0400,
Mike Snitzer <snitzer at redhat.com> wrote:
> Hey Vivek,
>
> Here is a more comprehensive patch (seems vmalloc doesn't support
> passing a @size of 0, whereas kmalloc does).
>
> But I know that this patch causes sm_checker_destroy() to crash in the
> kfree() from ca_destroy(&smc->old_counts);
>
> If I simply switch back from vzalloc to using kzalloc all works fine!?
>
> Seems very odd, will dig deeper when I get a chance.
Not odd, just a stupid oversight on my part. Needed to switch to using
vfree too ;)
Here is an updated patch.
(Joe and Alasdair, I'll post 2 new cleaned up patches for 3.5; the
dm-space-map-disk.c change in this patch needs to be folded into v2 of
the "dm transaction manager: handle space map checker failure" patch I
posted yesterday)
drivers/md/persistent-data/dm-space-map-checker.c | 28 ++++++++++++--------
drivers/md/persistent-data/dm-space-map-disk.c | 8 +++++-
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
index 6d7c832..f0eded3 100644
--- a/drivers/md/persistent-data/dm-space-map-checker.c
+++ b/drivers/md/persistent-data/dm-space-map-checker.c
@@ -89,13 +89,22 @@ static int ca_create(struct count_array *ca, struct dm_space_map *sm)
ca->nr = nr_blocks;
ca->nr_free = nr_blocks;
- ca->counts = kzalloc(sizeof(*ca->counts) * nr_blocks, GFP_KERNEL);
- if (!ca->counts)
- return -ENOMEM;
+
+ if (nr_blocks) {
+ ca->counts = vzalloc(sizeof(*ca->counts) * nr_blocks);
+ if (!ca->counts)
+ return -ENOMEM;
+ } else
+ ca->counts = NULL;
return 0;
}
+static void ca_destroy(struct count_array *ca)
+{
+ vfree(ca->counts);
+}
+
static int ca_load(struct count_array *ca, struct dm_space_map *sm)
{
int r;
@@ -126,12 +135,14 @@ static int ca_load(struct count_array *ca, struct dm_space_map *sm)
static int ca_extend(struct count_array *ca, dm_block_t extra_blocks)
{
dm_block_t nr_blocks = ca->nr + extra_blocks;
- uint32_t *counts = kzalloc(sizeof(*counts) * nr_blocks, GFP_KERNEL);
+ uint32_t *counts = vzalloc(sizeof(*counts) * nr_blocks);
if (!counts)
return -ENOMEM;
- memcpy(counts, ca->counts, sizeof(*counts) * ca->nr);
- kfree(ca->counts);
+ if (ca->counts) {
+ memcpy(counts, ca->counts, sizeof(*counts) * ca->nr);
+ ca_destroy(ca);
+ }
ca->nr = nr_blocks;
ca->nr_free += extra_blocks;
ca->counts = counts;
@@ -151,11 +162,6 @@ static int ca_commit(struct count_array *old, struct count_array *new)
return 0;
}
-static void ca_destroy(struct count_array *ca)
-{
- kfree(ca->counts);
-}
-
/*----------------------------------------------------------------*/
struct sm_checker {
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
index 9535234..124828b 100644
--- a/drivers/md/persistent-data/dm-space-map-disk.c
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
@@ -315,7 +315,13 @@ struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm,
dm_block_t nr_blocks)
{
struct dm_space_map *sm = dm_sm_disk_create_real(tm, nr_blocks);
- return dm_sm_checker_create_fresh(sm);
+ struct dm_space_map *smc = dm_sm_checker_create_fresh(sm);
+
+ if (IS_ERR(smc) && !IS_ERR_OR_NULL(sm))
+ dm_sm_destroy(sm);
+ sm = smc;
+
+ return sm;
}
EXPORT_SYMBOL_GPL(dm_sm_disk_create);
More information about the dm-devel
mailing list