* [PATCH v2] zram: free meta table in zram_meta_free
@ 2015-01-19 23:43 Ganesh Mahendran
2015-01-29 4:21 ` Sergey Senozhatsky
2015-01-29 5:22 ` Minchan Kim
0 siblings, 2 replies; 3+ messages in thread
From: Ganesh Mahendran @ 2015-01-19 23:43 UTC (permalink / raw)
To: minchan, ngupta, sergey.senozhatsky.work
Cc: akpm, linux-kernel, linux-mm, Ganesh Mahendran,
Sergey Senozhatsky
zram_meta_alloc() and zram_meta_free() are a pair.
In zram_meta_alloc(), meta table is allocated. So it it better to free
it in zram_meta_free().
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
v2: use zram->disksize to get num of pages - Sergey
---
drivers/block/zram/zram_drv.c | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 9250b3f..aa5a4c5 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -307,8 +307,21 @@ static inline int valid_io_request(struct zram *zram,
return 1;
}
-static void zram_meta_free(struct zram_meta *meta)
+static void zram_meta_free(struct zram_meta *meta, u64 disksize)
{
+ size_t num_pages = disksize >> PAGE_SHIFT;
+ size_t index;
+
+ /* Free all pages that are still in this zram device */
+ for (index = 0; index < num_pages; index++) {
+ unsigned long handle = meta->table[index].handle;
+
+ if (!handle)
+ continue;
+
+ zs_free(meta->mem_pool, handle);
+ }
+
zs_destroy_pool(meta->mem_pool);
vfree(meta->table);
kfree(meta);
@@ -706,9 +719,6 @@ static void zram_bio_discard(struct zram *zram, u32 index,
static void zram_reset_device(struct zram *zram, bool reset_capacity)
{
- size_t index;
- struct zram_meta *meta;
-
down_write(&zram->init_lock);
zram->limit_pages = 0;
@@ -718,20 +728,9 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)
return;
}
- meta = zram->meta;
- /* Free all pages that are still in this zram device */
- for (index = 0; index < zram->disksize >> PAGE_SHIFT; index++) {
- unsigned long handle = meta->table[index].handle;
- if (!handle)
- continue;
-
- zs_free(meta->mem_pool, handle);
- }
-
zcomp_destroy(zram->comp);
zram->max_comp_streams = 1;
-
- zram_meta_free(zram->meta);
+ zram_meta_free(zram->meta, zram->disksize);
zram->meta = NULL;
/* Reset stats */
memset(&zram->stats, 0, sizeof(zram->stats));
@@ -803,7 +802,7 @@ out_destroy_comp:
up_write(&zram->init_lock);
zcomp_destroy(comp);
out_free_meta:
- zram_meta_free(meta);
+ zram_meta_free(meta, disksize);
return err;
}
--
1.7.9.5
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] zram: free meta table in zram_meta_free
2015-01-19 23:43 [PATCH v2] zram: free meta table in zram_meta_free Ganesh Mahendran
@ 2015-01-29 4:21 ` Sergey Senozhatsky
2015-01-29 5:22 ` Minchan Kim
1 sibling, 0 replies; 3+ messages in thread
From: Sergey Senozhatsky @ 2015-01-29 4:21 UTC (permalink / raw)
To: Ganesh Mahendran
Cc: minchan, ngupta, sergey.senozhatsky.work, akpm, linux-kernel,
linux-mm, Sergey Senozhatsky
On (01/20/15 07:43), Ganesh Mahendran wrote:
> zram_meta_alloc() and zram_meta_free() are a pair.
> In zram_meta_alloc(), meta table is allocated. So it it better to free
> it in zram_meta_free().
>
> Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
> Cc: Nitin Gupta <ngupta@vflare.org>
> Cc: Minchan Kim <minchan@kernel.org>
> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-ss
> ---
> v2: use zram->disksize to get num of pages - Sergey
> ---
> drivers/block/zram/zram_drv.c | 33 ++++++++++++++++-----------------
> 1 file changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 9250b3f..aa5a4c5 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -307,8 +307,21 @@ static inline int valid_io_request(struct zram *zram,
> return 1;
> }
>
> -static void zram_meta_free(struct zram_meta *meta)
> +static void zram_meta_free(struct zram_meta *meta, u64 disksize)
> {
> + size_t num_pages = disksize >> PAGE_SHIFT;
> + size_t index;
> +
> + /* Free all pages that are still in this zram device */
> + for (index = 0; index < num_pages; index++) {
> + unsigned long handle = meta->table[index].handle;
> +
> + if (!handle)
> + continue;
> +
> + zs_free(meta->mem_pool, handle);
> + }
> +
> zs_destroy_pool(meta->mem_pool);
> vfree(meta->table);
> kfree(meta);
> @@ -706,9 +719,6 @@ static void zram_bio_discard(struct zram *zram, u32 index,
>
> static void zram_reset_device(struct zram *zram, bool reset_capacity)
> {
> - size_t index;
> - struct zram_meta *meta;
> -
> down_write(&zram->init_lock);
>
> zram->limit_pages = 0;
> @@ -718,20 +728,9 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)
> return;
> }
>
> - meta = zram->meta;
> - /* Free all pages that are still in this zram device */
> - for (index = 0; index < zram->disksize >> PAGE_SHIFT; index++) {
> - unsigned long handle = meta->table[index].handle;
> - if (!handle)
> - continue;
> -
> - zs_free(meta->mem_pool, handle);
> - }
> -
> zcomp_destroy(zram->comp);
> zram->max_comp_streams = 1;
> -
> - zram_meta_free(zram->meta);
> + zram_meta_free(zram->meta, zram->disksize);
> zram->meta = NULL;
> /* Reset stats */
> memset(&zram->stats, 0, sizeof(zram->stats));
> @@ -803,7 +802,7 @@ out_destroy_comp:
> up_write(&zram->init_lock);
> zcomp_destroy(comp);
> out_free_meta:
> - zram_meta_free(meta);
> + zram_meta_free(meta, disksize);
> return err;
> }
>
> --
> 1.7.9.5
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] zram: free meta table in zram_meta_free
2015-01-19 23:43 [PATCH v2] zram: free meta table in zram_meta_free Ganesh Mahendran
2015-01-29 4:21 ` Sergey Senozhatsky
@ 2015-01-29 5:22 ` Minchan Kim
1 sibling, 0 replies; 3+ messages in thread
From: Minchan Kim @ 2015-01-29 5:22 UTC (permalink / raw)
To: Ganesh Mahendran
Cc: ngupta, sergey.senozhatsky.work, akpm, linux-kernel, linux-mm,
Sergey Senozhatsky
On Tue, Jan 20, 2015 at 07:43:47AM +0800, Ganesh Mahendran wrote:
> zram_meta_alloc() and zram_meta_free() are a pair.
> In zram_meta_alloc(), meta table is allocated. So it it better to free
> it in zram_meta_free().
>
> Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Thanks.
--
Kind regards,
Minchan Kim
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-29 5:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-19 23:43 [PATCH v2] zram: free meta table in zram_meta_free Ganesh Mahendran
2015-01-29 4:21 ` Sergey Senozhatsky
2015-01-29 5:22 ` Minchan Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).