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

Commit 875d94f3 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: pblk: allocate bio size more accurately 



Wait until we know the exact number of ppas to be sent to the device,
before allocating the bio.

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 6ca2f71f

drivers/lightnvm/pblk-rb.c

+3 −2
Original line number Diff line number Diff line
@@ -552,12 +552,13 @@ unsigned int pblk_rb_read_to_bio_list(struct pblk_rb *rb, struct bio *bio, 
 * persist data on the write buffer to the media.

 */

unsigned int pblk_rb_read_to_bio(struct pblk_rb *rb, struct nvm_rq *rqd,

				 struct bio *bio, unsigned int pos,

				 unsigned int nr_entries, unsigned int count)

				 unsigned int pos, unsigned int nr_entries,

				 unsigned int count)

{

	struct pblk *pblk = container_of(rb, struct pblk, rwb);

	struct request_queue *q = pblk->dev->q;

	struct pblk_c_ctx *c_ctx = nvm_rq_to_pdu(rqd);

	struct bio *bio = rqd->bio;

	struct pblk_rb_entry *entry;

	struct page *page;

	unsigned int pad = 0, to_read = nr_entries;

drivers/lightnvm/pblk-write.c

+10 −10
Original line number Diff line number Diff line
@@ -534,24 +534,24 @@ static int pblk_submit_write(struct pblk *pblk) 
	if (!secs_to_flush && secs_avail < pblk->min_write_pgs)

		return 1;



	bio = bio_alloc(GFP_KERNEL, pblk->max_write_pgs);



	bio->bi_iter.bi_sector = 0; /* internal bio */

	bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	rqd = pblk_alloc_rqd(pblk, WRITE);

	rqd->bio = bio;



	secs_to_sync = pblk_calc_secs_to_sync(pblk, secs_avail, secs_to_flush);

	if (secs_to_sync > pblk->max_write_pgs) {

		pr_err("pblk: bad buffer sync calculation\n");

		goto fail_put_bio;

		return 1;

	}



	secs_to_com = (secs_to_sync > secs_avail) ? secs_avail : secs_to_sync;

	pos = pblk_rb_read_commit(&pblk->rwb, secs_to_com);



	if (pblk_rb_read_to_bio(&pblk->rwb, rqd, bio, pos, secs_to_sync,

	bio = bio_alloc(GFP_KERNEL, secs_to_sync);



	bio->bi_iter.bi_sector = 0; /* internal bio */

	bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	rqd = pblk_alloc_rqd(pblk, WRITE);

	rqd->bio = bio;



	if (pblk_rb_read_to_bio(&pblk->rwb, rqd, pos, secs_to_sync,

								secs_avail)) {

		pr_err("pblk: corrupted write bio\n");

		goto fail_put_bio;

drivers/lightnvm/pblk.h

+2 −2
Original line number Diff line number Diff line
@@ -666,8 +666,8 @@ void pblk_rb_flush(struct pblk_rb *rb); 


void pblk_rb_sync_l2p(struct pblk_rb *rb);

unsigned int pblk_rb_read_to_bio(struct pblk_rb *rb, struct nvm_rq *rqd,

				 struct bio *bio, unsigned int pos,

				 unsigned int nr_entries, unsigned int count);

				 unsigned int pos, unsigned int nr_entries,

				 unsigned int count);

unsigned int pblk_rb_read_to_bio_list(struct pblk_rb *rb, struct bio *bio,

				      struct list_head *list,

				      unsigned int max);