Attachment 315497 Details for Bug 460846 – patch

[patch] patch

03-dm-snapshot-per-snapshot-mempool.patch (text/plain), 3.61 KB, created by Mikuláš Patočka on 2008-09-01 22:48:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikuláš Patočka

Created: 2008-09-01 22:48:29 UTC

Size: 3.61 KB

patch

obsolete

>diff -u -r linux-2.6.18.x86_64.orig/drivers/md/dm-snap.c linux-2.6.18.x86_64/drivers/md/dm-snap.c
>--- linux-2.6.18.x86_64.orig/drivers/md/dm-snap.c	2008-09-02 00:09:14.000000000 +0200
>+++ linux-2.6.18.x86_64/drivers/md/dm-snap.c	2008-09-02 00:31:12.000000000 +0200
>@@ -95,7 +95,6 @@
>  */
> static kmem_cache_t *exception_cache;
> static kmem_cache_t *pending_cache;
>-static mempool_t *pending_pool;
> 
> struct dm_snap_tracked_chunk {
> 	struct hlist_node node;
>@@ -362,14 +361,18 @@
> 	kmem_cache_free(exception_cache, e);
> }
> 
>-static inline struct pending_exception *alloc_pending_exception(void)
>+static struct pending_exception *alloc_pending_exception(struct dm_snapshot *s)
> {
>-	return mempool_alloc(pending_pool, GFP_NOIO);
>+	struct pending_exception *pe = mempool_alloc(s->pending_pool, GFP_NOIO);
>+
>+	pe->snap = s;
>+
>+	return pe;
> }
> 
>-static inline void free_pending_exception(struct pending_exception *pe)
>+static void free_pending_exception(struct pending_exception *pe)
> {
>-	mempool_free(pe, pending_pool);
>+	mempool_free(pe, pe->snap->pending_pool);
> }
> 
> static void insert_completed_exception(struct dm_snapshot *s,
>@@ -636,12 +639,18 @@
> 		goto bad5;
> 	}
> 
>+	s->pending_pool = mempool_create_slab_pool(MIN_IOS, pending_cache);
>+	if (!s->pending_pool) {
>+		ti->error = "Could not allocate mempool for pending exceptions";
>+		goto bad6;
>+	}
>+
> 	s->tracked_chunk_pool = mempool_create_slab_pool(MIN_IOS,
> 							 tracked_chunk_cache);
> 	if (!s->tracked_chunk_pool) {
> 		ti->error = "Could not allocate tracked_chunk mempool for "
> 			    "tracking reads";
>-		goto bad6;
>+		goto bad_tracked_chunk_pool;
> 	}
> 
> 	for (i = 0; i < DM_TRACKED_CHUNK_HASH_SIZE; i++)
>@@ -678,6 +687,9 @@
>  bad_load_and_register:
> 	mempool_destroy(s->tracked_chunk_pool);
> 
>+ bad_tracked_chunk_pool:
>+	mempool_destroy(s->pending_pool);
>+
>  bad6:
> 	kcopyd_client_destroy(s->kcopyd_client);
> 
>@@ -727,6 +739,8 @@
> 	/* Deallocate memory used */
> 	s->store.destroy(&s->store);
> 
>+	mempool_destroy(s->pending_pool);
>+
> 	dm_put_device(ti, s->origin);
> 	dm_put_device(ti, s->cow);
> 
>@@ -971,7 +985,7 @@
> 	 * to hold the lock while we do this.
> 	 */
> 	up_write(&s->lock);
>-	pe = alloc_pending_exception();
>+	pe = alloc_pending_exception(s);
> 	down_write(&s->lock);
> 
> 	if (!s->valid) {
>@@ -991,7 +1005,6 @@
> 	bio_list_init(&pe->snapshot_bios);
> 	pe->primary_pe = NULL;
> 	atomic_set(&pe->ref_count, 0);
>-	pe->snap = s;
> 	pe->started = 0;
> 
> 	if (s->store.prepare_exception(&s->store, &pe->e)) {
>@@ -1437,24 +1450,15 @@
> 		goto bad5;
> 	}
> 
>-	pending_pool = mempool_create_slab_pool(128, pending_cache);
>-	if (!pending_pool) {
>-		DMERR("Couldn't create pending pool.");
>-		r = -ENOMEM;
>-		goto bad_pending_pool;
>-	}
>-
> 	ksnapd = create_singlethread_workqueue("ksnapd");
> 	if (!ksnapd) {
> 		DMERR("Failed to create ksnapd workqueue.");
> 		r = -ENOMEM;
>-		goto bad6;
>+		goto bad_pending_pool;
> 	}
> 
> 	return 0;
> 
>-      bad6:
>-	mempool_destroy(pending_pool);
>       bad_pending_pool:
> 	kmem_cache_destroy(tracked_chunk_cache);
>       bad5:
>@@ -1485,7 +1489,6 @@
> 		DMERR("origin unregister failed %d", r);
> 
> 	exit_origin_hash();
>-	mempool_destroy(pending_pool);
> 	kmem_cache_destroy(pending_cache);
> 	kmem_cache_destroy(exception_cache);
> 	kmem_cache_destroy(tracked_chunk_cache);
>diff -u -r linux-2.6.18.x86_64.orig/drivers/md/dm-snap.h linux-2.6.18.x86_64/drivers/md/dm-snap.h
>--- linux-2.6.18.x86_64.orig/drivers/md/dm-snap.h	2008-09-02 00:09:14.000000000 +0200
>+++ linux-2.6.18.x86_64/drivers/md/dm-snap.h	2008-09-02 00:12:08.000000000 +0200
>@@ -164,6 +164,8 @@
> 	/* The last percentage we notified */
> 	int last_percent;
> 
>+	mempool_t *pending_pool;
>+
> 	struct exception_table pending;
> 	struct exception_table complete;
>

Actions: View | Diff

Attachments on bug 460846: 315497