lightnvm: pblk: free padded entries in write buffer

commit cd8ddbf7a5e206fe6995ab0aee245d597dd6a7f2 upstream.

When a REQ_FLUSH reaches pblk, the bio cannot be directly completed.
Instead, data on the write buffer is flushed and the bio is completed on
the completion pah. This might require some sectors to be padded in
order to guarantee a successful write.

This patch fixes a memory leak on the padded pages. A consequence of
this bad free was that internal bios not containing data (only a flush)
were not being completed.

Fixes: a4bd217b4326 ("lightnvm: physical block device (pblk) target")
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>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 3f0ddc0d7393fdd477aa82578b43d37034e08e77..3fb65778e03d205df6ccd04a728d9241208ea1c0 100644 (file)
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -190,7 +190,6 @@ void pblk_bio_free_pages(struct pblk *pblk, struct bio *bio, int off,
 
        WARN_ON(off + nr_pages != bio->bi_vcnt);
 
-       bio_advance(bio, off * PBLK_EXPOSED_PAGE_SIZE);
        for (i = off; i < nr_pages + off; i++) {
                bv = bio->bi_io_vec[i];
                mempool_free(bv.bv_page, pblk->page_bio_pool);

diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index 3ad9e56d2473412ae3ead5b2946066643ebd541c..d89ac573f8d838eca3401f671f558c25df19260b 100644 (file)
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -33,6 +33,10 @@ static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd,
                        bio_endio(original_bio);
        }
 
+       if (c_ctx->nr_padded)
+               pblk_bio_free_pages(pblk, rqd->bio, c_ctx->nr_valid,
+                                                       c_ctx->nr_padded);
+
 #ifdef CONFIG_NVM_DEBUG
        atomic_long_add(c_ctx->nr_valid, &pblk->sync_writes);
 #endif
@@ -521,7 +525,8 @@ static void pblk_free_write_rqd(struct pblk *pblk, struct nvm_rq *rqd)
        struct bio *bio = rqd->bio;
 
        if (c_ctx->nr_padded)
-               pblk_bio_free_pages(pblk, bio, rqd->nr_ppas, c_ctx->nr_padded);
+               pblk_bio_free_pages(pblk, bio, c_ctx->nr_valid,
+                                                       c_ctx->nr_padded);
 }
 
 static int pblk_submit_write(struct pblk *pblk)