diff options
Diffstat (limited to 'queue/lightnvm-pblk-use-right-flag-for-GC-allocation.patch')
| -rw-r--r-- | queue/lightnvm-pblk-use-right-flag-for-GC-allocation.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/queue/lightnvm-pblk-use-right-flag-for-GC-allocation.patch b/queue/lightnvm-pblk-use-right-flag-for-GC-allocation.patch new file mode 100644 index 0000000..a38bde0 --- /dev/null +++ b/queue/lightnvm-pblk-use-right-flag-for-GC-allocation.patch @@ -0,0 +1,59 @@ +From 7d327a9ed6c4dca341ebf99012e0a6b80a3050e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= <javier@cnexlabs.com> +Date: Fri, 13 Oct 2017 14:46:02 +0200 +Subject: [PATCH] lightnvm: pblk: use right flag for GC allocation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +commit 7d327a9ed6c4dca341ebf99012e0a6b80a3050e6 upstream. + +The data buffer for the GC path allocates virtual memory through +vmalloc. When this change was introduced, a flag signaling kmalloc'ed +memory was wrongly introduced. Use the right flag when creating a bio +from this buffer. + +Fixes: de54e703a422 ("lightnvm: pblk: use vmalloc for GC data buffer") +Signed-off-by: Javier González <javier@cnexlabs.com> +Signed-off-by: Matias Bjørling <m@bjorling.me> +Signed-off-by: Jens Axboe <axboe@kernel.dk> + +diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c +index d682e89e6493..ee8efb55b330 100644 +--- a/drivers/lightnvm/pblk-read.c ++++ b/drivers/lightnvm/pblk-read.c +@@ -499,7 +499,7 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, + + data_len = (*secs_to_gc) * geo->sec_size; + bio = pblk_bio_map_addr(pblk, data, *secs_to_gc, data_len, +- PBLK_KMALLOC_META, GFP_KERNEL); ++ PBLK_VMALLOC_META, GFP_KERNEL); + if (IS_ERR(bio)) { + pr_err("pblk: could not allocate GC bio (%lu)\n", PTR_ERR(bio)); + goto err_free_dma; +@@ -519,7 +519,7 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, + if (ret) { + bio_endio(bio); + pr_err("pblk: GC read request failed\n"); +- goto err_free_dma; ++ goto err_free_bio; + } + + if (!wait_for_completion_io_timeout(&wait, +@@ -541,10 +541,13 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, + atomic_long_sub(*secs_to_gc, &pblk->inflight_reads); + #endif + ++ bio_put(bio); + out: + nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list); + return NVM_IO_OK; + ++err_free_bio: ++ bio_put(bio); + err_free_dma: + nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list); + return NVM_IO_ERR; +-- +2.15.0 + |