Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1438261
| From | Matias Bjørling <m@bjorling.me> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 13/17] lightnvm: remove _unlocked variant of [get/put]_blk |
| Date | 2016-07-07 10:00 +0200 |
| Message-ID | <rSco2-3Zm-39@gated-at.bofh.it> (permalink) |
| References | <rSco1-3Zm-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The [get/put]_blk API enables targets to get ownership of blocks at
runtime. This information is currently not recorded on disk, and the
information is therefore lost on power failure. To restore the
metadata, the [get/put]_blk must persist its metadata. In that case,
we need to control the outer lock, so that we can disable them while
updating the on-disk metadata. Fortunately, the _unlocked versions can
be removed, which allows us to move the lock into the [get/put]_blk
functions.
Signed-off-by: Matias Bjørling <m@bjorling.me>
---
drivers/lightnvm/core.c | 14 --------------
drivers/lightnvm/gennvm.c | 32 ++++----------------------------
drivers/lightnvm/rrpc.c | 14 ++------------
include/linux/lightnvm.h | 6 ------
4 files changed, 6 insertions(+), 60 deletions(-)
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 04469e0..ddc8098 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -176,20 +176,6 @@ static struct nvm_dev *nvm_find_nvm_dev(const char *name)
return NULL;
}
-struct nvm_block *nvm_get_blk_unlocked(struct nvm_dev *dev, struct nvm_lun *lun,
- unsigned long flags)
-{
- return dev->mt->get_blk_unlocked(dev, lun, flags);
-}
-EXPORT_SYMBOL(nvm_get_blk_unlocked);
-
-/* Assumes that all valid pages have already been moved on release to bm */
-void nvm_put_blk_unlocked(struct nvm_dev *dev, struct nvm_block *blk)
-{
- return dev->mt->put_blk_unlocked(dev, blk);
-}
-EXPORT_SYMBOL(nvm_put_blk_unlocked);
-
struct nvm_block *nvm_get_blk(struct nvm_dev *dev, struct nvm_lun *lun,
unsigned long flags)
{
diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index 41760b2..c65fb67 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -473,15 +473,14 @@ static void gen_unregister(struct nvm_dev *dev)
module_put(THIS_MODULE);
}
-static struct nvm_block *gen_get_blk_unlocked(struct nvm_dev *dev,
+static struct nvm_block *gen_get_blk(struct nvm_dev *dev,
struct nvm_lun *vlun, unsigned long flags)
{
struct gen_lun *lun = container_of(vlun, struct gen_lun, vlun);
struct nvm_block *blk = NULL;
int is_gc = flags & NVM_IOTYPE_GC;
- assert_spin_locked(&vlun->lock);
-
+ spin_lock(&vlun->lock);
if (list_empty(&lun->free_list)) {
pr_err_ratelimited("gen: lun %u have no free pages available",
lun->vlun.id);
@@ -496,29 +495,17 @@ static struct nvm_block *gen_get_blk_unlocked(struct nvm_dev *dev,
list_move_tail(&blk->list, &lun->used_list);
blk->state = NVM_BLK_ST_TGT;
lun->vlun.nr_free_blocks--;
-
out:
- return blk;
-}
-
-static struct nvm_block *gen_get_blk(struct nvm_dev *dev,
- struct nvm_lun *vlun, unsigned long flags)
-{
- struct nvm_block *blk;
-
- spin_lock(&vlun->lock);
- blk = gen_get_blk_unlocked(dev, vlun, flags);
spin_unlock(&vlun->lock);
return blk;
}
-static void gen_put_blk_unlocked(struct nvm_dev *dev, struct nvm_block *blk)
+static void gen_put_blk(struct nvm_dev *dev, struct nvm_block *blk)
{
struct nvm_lun *vlun = blk->lun;
struct gen_lun *lun = container_of(vlun, struct gen_lun, vlun);
- assert_spin_locked(&vlun->lock);
-
+ spin_lock(&vlun->lock);
if (blk->state & NVM_BLK_ST_TGT) {
list_move_tail(&blk->list, &lun->free_list);
lun->vlun.nr_free_blocks++;
@@ -532,14 +519,6 @@ static void gen_put_blk_unlocked(struct nvm_dev *dev, struct nvm_block *blk)
blk->id, blk->state);
list_move_tail(&blk->list, &lun->bb_list);
}
-}
-
-static void gen_put_blk(struct nvm_dev *dev, struct nvm_block *blk)
-{
- struct nvm_lun *vlun = blk->lun;
-
- spin_lock(&vlun->lock);
- gen_put_blk_unlocked(dev, blk);
spin_unlock(&vlun->lock);
}
@@ -669,9 +648,6 @@ static struct nvmm_type gen = {
.create_tgt = gen_create_tgt,
.remove_tgt = gen_remove_tgt,
- .get_blk_unlocked = gen_get_blk_unlocked,
- .put_blk_unlocked = gen_put_blk_unlocked,
-
.get_blk = gen_get_blk,
.put_blk = gen_put_blk,
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index 10ed22b..fa8d5be 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -192,21 +192,16 @@ static void rrpc_set_lun_cur(struct rrpc_lun *rlun, struct rrpc_block *rblk)
static struct rrpc_block *rrpc_get_blk(struct rrpc *rrpc, struct rrpc_lun *rlun,
unsigned long flags)
{
- struct nvm_lun *lun = rlun->parent;
struct nvm_block *blk;
struct rrpc_block *rblk;
- spin_lock(&lun->lock);
- blk = nvm_get_blk_unlocked(rrpc->dev, rlun->parent, flags);
+ blk = nvm_get_blk(rrpc->dev, rlun->parent, flags);
if (!blk) {
pr_err("nvm: rrpc: cannot get new block from media manager\n");
- spin_unlock(&lun->lock);
return NULL;
}
rblk = rrpc_get_rblk(rlun, blk->id);
- spin_unlock(&lun->lock);
-
blk->priv = rblk;
bitmap_zero(rblk->invalid_pages, rrpc->dev->sec_per_blk);
rblk->next_page = 0;
@@ -218,12 +213,7 @@ static struct rrpc_block *rrpc_get_blk(struct rrpc *rrpc, struct rrpc_lun *rlun,
static void rrpc_put_blk(struct rrpc *rrpc, struct rrpc_block *rblk)
{
- struct rrpc_lun *rlun = rblk->rlun;
- struct nvm_lun *lun = rlun->parent;
-
- spin_lock(&lun->lock);
- nvm_put_blk_unlocked(rrpc->dev, rblk->parent);
- spin_unlock(&lun->lock);
+ nvm_put_blk(rrpc->dev, rblk->parent);
}
static void rrpc_put_blks(struct rrpc *rrpc)
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index d619f6d..e9836cf 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -491,8 +491,6 @@ struct nvmm_type {
nvmm_remove_tgt_fn *remove_tgt;
/* Block administration callbacks */
- nvmm_get_blk_fn *get_blk_unlocked;
- nvmm_put_blk_fn *put_blk_unlocked;
nvmm_get_blk_fn *get_blk;
nvmm_put_blk_fn *put_blk;
nvmm_open_blk_fn *open_blk;
@@ -522,10 +520,6 @@ struct nvmm_type {
extern int nvm_register_mgr(struct nvmm_type *);
extern void nvm_unregister_mgr(struct nvmm_type *);
-extern struct nvm_block *nvm_get_blk_unlocked(struct nvm_dev *,
- struct nvm_lun *, unsigned long);
-extern void nvm_put_blk_unlocked(struct nvm_dev *, struct nvm_block *);
-
extern struct nvm_block *nvm_get_blk(struct nvm_dev *, struct nvm_lun *,
unsigned long);
extern void nvm_put_blk(struct nvm_dev *, struct nvm_block *);
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 00/17] LightNVM pull request for 4.8 Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 03/17] lightnvm: initialize ppa_addr in dev_to_generic_addr() Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 06/17] lightnvm: remove checkpatch warning for unsigned ints Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 12/17] lightnvm: remove unused lists from struct rrpc_block Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 13/17] lightnvm: remove _unlocked variant of [get/put]_blk Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 11/17] lightnvm: remove nested lock conflict with mm Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 15/17] lightnvm: fix lun offset calculation for mark blk Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 04/17] nvme: lightnvm: make MLC num_pairs little endian Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 02/17] lightnvm: add media manager mark_blk helper Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 05/17] lightnvm: Make functions not used by ouside static Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 09/17] lightnvm: rename gennvm and update description Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 17/17] lightnvm: make __nvm_submit_ppa static Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 16/17] lightnvm: make ppa_list const in nvm_set_rqd_list Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 07/17] lightnvm: fix checkpatch terse errors Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 10/17] lightnvm: move target mgmt into media mgr Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 14/17] lightnvm: make rrpc_map_page call nvm_get_blk outside locks Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 [PATCH 01/17] lightnvm: break the loop when rqd is not null Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200 Re: [GIT PULL 00/17] LightNVM pull request for 4.8 Jens Axboe <axboe@kernel.dk> - 2016-07-07 17:00 +0200
csiph-web