From: Hans Holmberg <hans.ml.holmberg@owltronix.com>
To: Matias Bjorling <mb@lightnvm.io>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Javier Gonzales <jg@lightnvm.io>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Christoph Hellwig <hch@lst.de>,
Hans Holmberg <hans.holmberg@cnexlabs.com>
Subject: [PATCH] lightnvm: pblk: use vfree_atomic when freeing line metadata
Date: Tue, 3 Oct 2017 15:48:44 +0200 [thread overview]
Message-ID: <1507038524-24587-1-git-send-email-hans.ml.holmberg@owltronix.com> (raw)
From: Hans Holmberg <hans.holmberg@cnexlabs.com>
The commit bf22e37a6413 ("mm: add vfree_atomic()") made vfree unsafe to
call in atomic context (unless the call came from an interrupt) and
introduced vfree_atomic that is safe to call in atomic context.
So, since we're holding locks when freeing line metadata, we need to
use the atomic version of vfree.
Fix this by introducing an atomic variant of pblk_mfree and
switching to that in pblk_line_meta_free.
Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
---
The patch is for:
https://github.com/OpenChannelSSD/linux branch for-4.15/pblk
drivers/lightnvm/pblk-init.c | 3 ++-
drivers/lightnvm/pblk.h | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index c452478..3a191a6 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -396,7 +396,8 @@ static void pblk_line_meta_free(struct pblk *pblk)
spin_lock(&l_mg->free_lock);
for (i = 0; i < PBLK_DATA_LINES; i++) {
kfree(l_mg->sline_meta[i]);
- pblk_mfree(l_mg->eline_meta[i]->buf, l_mg->emeta_alloc_type);
+ pblk_mfree_atomic(l_mg->eline_meta[i]->buf,
+ l_mg->emeta_alloc_type);
kfree(l_mg->eline_meta[i]);
}
spin_unlock(&l_mg->free_lock);
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 03965da..93f98e3 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -881,6 +881,14 @@ static inline void pblk_mfree(void *ptr, int type)
vfree(ptr);
}
+static inline void pblk_mfree_atomic(void *ptr, int type)
+{
+ if (type == PBLK_KMALLOC_META)
+ kfree(ptr);
+ else
+ vfree_atomic(ptr);
+}
+
static inline struct nvm_rq *nvm_rq_from_c_ctx(void *c_ctx)
{
return c_ctx - sizeof(struct nvm_rq);
--
2.7.4
next reply other threads:[~2017-10-03 13:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 13:48 Hans Holmberg [this message]
2017-10-03 14:07 ` Andrey Ryabinin
2017-10-03 14:11 ` Javier González
2017-10-03 14:20 ` Andrey Ryabinin
2017-10-03 14:43 ` Javier González
2017-10-03 14:49 ` Javier González
2017-10-03 15:00 ` Hans Holmberg
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=1507038524-24587-1-git-send-email-hans.ml.holmberg@owltronix.com \
--to=hans.ml.holmberg@owltronix.com \
--cc=aryabinin@virtuozzo.com \
--cc=hans.holmberg@cnexlabs.com \
--cc=hch@lst.de \
--cc=jg@lightnvm.io \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mb@lightnvm.io \
/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®