Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d327a9e authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: pblk: use right flag for GC allocation 



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: de54e703 ("lightnvm: pblk: use vmalloc for GC data buffer")
Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a1121176

drivers/lightnvm/pblk-read.c

+5 −2
Original line number Diff line number Diff line
@@ -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;