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

Commit 3dc001f3 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: pblk: fix race condition on line retry 



When a pblk line fails (or is recovered), make sure to take the line
management lock.

Fixes: a4bd217b "lightnvm: physical block device (pblk) target"

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Reviewed-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2859323e

drivers/lightnvm/pblk-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1050,13 +1050,14 @@ int pblk_line_recov_alloc(struct pblk *pblk, struct pblk_line *line) 
	spin_lock(&l_mg->free_lock);

	l_mg->data_line = line;

	list_del(&line->list);

	spin_unlock(&l_mg->free_lock);



	ret = pblk_line_prepare(pblk, line);

	if (ret) {

		list_add(&line->list, &l_mg->free_list);

		spin_unlock(&l_mg->free_lock);

		return ret;

	}

	spin_unlock(&l_mg->free_lock);



	pblk_rl_free_lines_dec(&pblk->rl, line);
@@ -1140,6 +1141,7 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, 
	line->invalid_bitmap = NULL;

	line->smeta = NULL;

	line->emeta = NULL;

	l_mg->data_line = retry_line;

	spin_unlock(&l_mg->free_lock);



	if (pblk_line_erase(pblk, retry_line))
@@ -1147,8 +1149,6 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, 


	pblk_rl_free_lines_dec(&pblk->rl, retry_line);



	l_mg->data_line = retry_line;



	return retry_line;

}