Skip to content

resolve the bug that race condition in rrpc cur_rblk #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+10 −10
Closed

resolve the bug that race condition in rrpc cur_rblk #340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions drivers/lightnvm/rrpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,6 @@ static struct rrpc_addr *rrpc_map_page(struct rrpc *rrpc, sector_t laddr,
rlun = rrpc_get_lun_rr(rrpc, is_gc);
lun = rlun->parent;

if (!is_gc && lun->nr_free_blocks < rrpc->nr_luns * 4)
return NULL;

/*
* page allocation steps:
* 1. Try to allocate new page from current rblk
Expand All @@ -613,15 +610,19 @@ static struct rrpc_addr *rrpc_map_page(struct rrpc *rrpc, sector_t laddr,

spin_lock(&rlun->lock);
cur_rblk = &rlun->cur;
rblk = rlun->cur;
retry:
paddr = rrpc_alloc_addr(rrpc, rblk);
if (!is_gc && lun->nr_free_blocks < rrpc->nr_luns * 4) {
spin_unlock(&rlun->lock);
return NULL;
}

rblk = *cur_rblk;

paddr = rrpc_alloc_addr(rrpc, rblk);
if (paddr != ADDR_EMPTY)
goto done;

if (!list_empty(&rlun->wblk_list)) {
new_blk:
rblk = list_first_entry(&rlun->wblk_list, struct rrpc_block,
prio);
rrpc_set_lun_cur(rlun, rblk, cur_rblk);
Expand All @@ -639,19 +640,18 @@ static struct rrpc_addr *rrpc_map_page(struct rrpc *rrpc, sector_t laddr,
* Therefore, make sure that one is used, instead of the
* one just added.
*/
goto new_blk;
goto retry;
}

if (unlikely(is_gc) && !gc_force) {
/* retry from emergency gc block */
spin_lock(&rlun->lock);
cur_rblk = &rlun->gc_cur;
rblk = rlun->gc_cur;
gc_force = 1;
spin_lock(&rlun->lock);
goto retry;
}

pr_err("rrpc: failed to allocate new block\n");
pr_err("rrpc: failed to allocate new block (is_gc=%u)\n", is_gc);
return NULL;
done:
spin_unlock(&rlun->lock);
Expand Down