From: "Matias Bjørling" <mb@lightnvm.io>
To: axboe@fb.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
"Igor Konopko" <igor.j.konopko@intel.com>,
"Matias Bjørling" <mb@lightnvm.io>
Subject: [GIT PULL 06/26] lightnvm: pblk: fix race during put line
Date: Sat, 4 May 2019 20:37:51 +0200 [thread overview]
Message-ID: <20190504183811.18725-7-mb@lightnvm.io> (raw)
In-Reply-To: <20190504183811.18725-1-mb@lightnvm.io>
From: Igor Konopko <igor.j.konopko@intel.com>
In the pblk_put_line_back function, a race condition with
__pblk_map_invalidate can make a line not part of any lists.
Fix gc_list by resetting it to null fixes the above issue.
Fixes: a4bd217 ("lightnvm: physical block device (pblk) target")
Signed-off-by: Igor Konopko <igor.j.konopko@intel.com>
Reviewed-by: Javier González <javier@javigon.com>
Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
---
drivers/lightnvm/pblk-gc.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c
index ea9f392a395e..e23b1923b773 100644
--- a/drivers/lightnvm/pblk-gc.c
+++ b/drivers/lightnvm/pblk-gc.c
@@ -64,19 +64,23 @@ static void pblk_put_line_back(struct pblk *pblk, struct pblk_line *line)
struct pblk_line_mgmt *l_mg = &pblk->l_mg;
struct list_head *move_list;
+ spin_lock(&l_mg->gc_lock);
spin_lock(&line->lock);
WARN_ON(line->state != PBLK_LINESTATE_GC);
line->state = PBLK_LINESTATE_CLOSED;
trace_pblk_line_state(pblk_disk_name(pblk), line->id,
line->state);
+
+ /* We need to reset gc_group in order to ensure that
+ * pblk_line_gc_list will return proper move_list
+ * since right now current line is not on any of the
+ * gc lists.
+ */
+ line->gc_group = PBLK_LINEGC_NONE;
move_list = pblk_line_gc_list(pblk, line);
spin_unlock(&line->lock);
-
- if (move_list) {
- spin_lock(&l_mg->gc_lock);
- list_add_tail(&line->list, move_list);
- spin_unlock(&l_mg->gc_lock);
- }
+ list_add_tail(&line->list, move_list);
+ spin_unlock(&l_mg->gc_lock);
}
static void pblk_gc_line_ws(struct work_struct *work)
--
2.19.1
next prev parent reply other threads:[~2019-05-04 18:40 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-04 18:37 [GIT PULL 00/26] lightnvm updates for 5.2 Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 01/26] lightnvm: pblk: line reference fix in GC Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 02/26] lightnvm: pblk: rollback on error during gc read Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 03/26] lightnvm: pblk: reduce L2P memory footprint Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 04/26] lightnvm: pblk: remove unused smeta_ssec field Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 05/26] lightnvm: pblk: gracefully handle GC vmalloc fail Matias Bjørling
2019-05-04 18:37 ` Matias Bjørling [this message]
2019-05-04 18:37 ` [GIT PULL 07/26] lightnvm: pblk: ensure that erase is chunk aligned Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 08/26] lightnvm: pblk: cleanly fail when there is not enough memory Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 09/26] lightnvm: pblk: set proper read status in bio Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 10/26] lightnvm: Inherit mdts from the parent nvme device Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 11/26] lightnvm: pblk: fix bio leak when bio is split Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 12/26] lightnvm: pblk: set propper line as data_line after gc Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 13/26] lightnvm: prevent race condition on pblk remove Matias Bjørling
2019-05-04 18:37 ` [GIT PULL 14/26] lightnvm: pblk: fix lock order in pblk_rb_tear_down_check Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 15/26] lightnvm: pblk: kick writer on write recovery path Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 16/26] lightnvm: pblk: fix update line wp in OOB recovery Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 17/26] lightnvm: pblk: propagate errors when reading meta Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 18/26] lightnvm: pblk: wait for inflight IOs in recovery Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 19/26] lightnvm: pblk: remove internal IO timeout Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 20/26] lightnvm: pblk: GC error handling Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 21/26] lightnvm: pblk: IO path reorganization Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 22/26] lightnvm: pblk: recover only written metadata Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 23/26] lightnvm: track inflight target creations Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 24/26] lightnvm: do not remove instance under global lock Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 25/26] lightnvm: pblk: simplify partial read path Matias Bjørling
2019-05-04 18:38 ` [GIT PULL 26/26] lightnvm: pblk: use nvm_rq_to_ppa_list() Matias Bjørling
2019-05-06 16:20 ` [GIT PULL 00/26] lightnvm updates for 5.2 Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190504183811.18725-7-mb@lightnvm.io \
--to=mb@lightnvm.io \
--cc=axboe@fb.com \
--cc=igor.j.konopko@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®