openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

zram: Fix deadlock bug in partial read/write 

Now zram allocates new page with GFP_KERNEL in zram I/O path
if IO is partial. Unfortunately, It may cause deadlock with
reclaim path like below.

write_page from fs
fs_lock
allocation(GFP_KERNEL)
reclaim
pageout
				write_page from fs
				fs_lock <-- deadlock

This patch fixes it by using GFP_NOIO.  In read path, we
reorganize code flow so that kmap_atomic is called after the
GFP_NOIO allocation.

Cc: stable@vger.kernel.org
Acked-by: Jerome Marchand <jmarchand@redhat.com>
Acked-by: Nitin Gupta <ngupta@vflare.org>
[ penberg@kernel.org: don't use GFP_ATOMIC ]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Minchan Kim 2013-01-30 11:41:39 +09:00 committed by Greg Kroah-Hartman
parent 7f70410fe0
commit 7e5a5104c6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/zram/zram_drv.c
View File

@ -217,11 +217,12 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
return 0; return 0;
} }
user_mem = kmap_atomic(page);
if (is_partial_io(bvec)) if (is_partial_io(bvec))
/* Use a temporary buffer to decompress the page */ /* Use a temporary buffer to decompress the page */
uncmem = kmalloc(PAGE_SIZE, GFP_KERNEL); uncmem = kmalloc(PAGE_SIZE, GFP_NOIO);
else
user_mem = kmap_atomic(page);
if (!is_partial_io(bvec))
uncmem = user_mem; uncmem = user_mem;
if (!uncmem) { if (!uncmem) {
@ -268,7 +269,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
* This is a partial IO. We need to read the full page * This is a partial IO. We need to read the full page
* before to write the changes. * before to write the changes.
*/ */
uncmem = kmalloc(PAGE_SIZE, GFP_KERNEL); uncmem = kmalloc(PAGE_SIZE, GFP_NOIO);
if (!uncmem) { if (!uncmem) {
pr_info("Error allocating temp memory!\n"); pr_info("Error allocating temp memory!\n");
ret = -ENOMEM; ret = -ENOMEM;