linux-bcache.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Coly Li <colyli@suse.de>
To: linux-bcache@vger.kernel.org
Cc: linux-block@vger.kernel.org, linux-nvdimm@lists.01.org,
	axboe@kernel.dk, jianpeng.ma@intel.com, qiaowei.ren@intel.com,
	hare@suse.com, jack@suse.cz, dan.j.williams@intel.com,
	Coly Li <colyli@suse.de>
Subject: [PATCH v7 07/16] bcache: nvm-pages fixes for bcache integration testing
Date: Sat, 10 Apr 2021 00:43:34 +0800	[thread overview]
Message-ID: <20210409164343.56828-8-colyli@suse.de> (raw)
In-Reply-To: <20210409164343.56828-1-colyli@suse.de>

There are two minor fixes in nvm-pages code, which can be added in next
nvm-pages series. Then I can drop this patch.

Signed-off-by: Coly Li <colyli@suse.de>
Cc: Jianpeng Ma <jianpeng.ma@intel.com>
Cc: Qiaowei Ren <qiaowei.ren@intel.com>
---
 drivers/md/bcache/nvm-pages.c | 29 +++++++++++++++++++++--------
 drivers/md/bcache/nvm-pages.h |  1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/drivers/md/bcache/nvm-pages.c b/drivers/md/bcache/nvm-pages.c
index 2ba02091bccf..c3ab396a45fa 100644
--- a/drivers/md/bcache/nvm-pages.c
+++ b/drivers/md/bcache/nvm-pages.c
@@ -73,24 +73,32 @@ static inline void remove_owner_space(struct bch_nvm_namespace *ns,
 static struct bch_nvm_pages_owner_head *find_owner_head(const char *owner_uuid, bool create)
 {
 	struct bch_owner_list_head *owner_list_head = only_set->owner_list_head;
+	struct bch_nvm_pages_owner_head *owner_head = NULL;
 	int i;
 
+	if (owner_list_head == NULL)
+		goto out;
+
 	for (i = 0; i < only_set->owner_list_used; i++) {
-		if (!memcmp(owner_uuid, owner_list_head->heads[i].uuid, 16))
-			return &(owner_list_head->heads[i]);
+		if (!memcmp(owner_uuid, owner_list_head->heads[i].uuid, 16)) {
+			owner_head = &(owner_list_head->heads[i]);
+			break;
+		}
 	}
 
-	if (create) {
+	if (!owner_head && create) {
 		int used = only_set->owner_list_used;
 
-		BUG_ON(only_set->owner_list_size == used);
-		memcpy(owner_list_head->heads[used].uuid, owner_uuid, 16);
+		BUG_ON((used > 0) && (only_set->owner_list_size == used));
+		memcpy_flushcache(owner_list_head->heads[used].uuid, owner_uuid, 16);
 		only_set->owner_list_used++;
 
 		owner_list_head->used++;
-		return &(owner_list_head->heads[used]);
-	} else
-		return NULL;
+		owner_head = &(owner_list_head->heads[used]);
+	}
+
+out:
+	return owner_head;
 }
 
 static struct bch_nvm_pgalloc_recs *find_empty_pgalloc_recs(void)
@@ -324,6 +332,10 @@ void *bch_nvm_alloc_pages(int order, const char *owner_uuid)
 
 	mutex_lock(&only_set->lock);
 	owner_head = find_owner_head(owner_uuid, true);
+	if (!owner_head) {
+		pr_err("can't find bch_nvm_pgalloc_recs by(uuid=%s)\n", owner_uuid);
+		goto unlock;
+	}
 
 	for (j = 0; j < only_set->total_namespaces_nr; j++) {
 		struct bch_nvm_namespace *ns = only_set->nss[j];
@@ -369,6 +381,7 @@ void *bch_nvm_alloc_pages(int order, const char *owner_uuid)
 		}
 	}
 
+unlock:
 	mutex_unlock(&only_set->lock);
 	return kaddr;
 }
diff --git a/drivers/md/bcache/nvm-pages.h b/drivers/md/bcache/nvm-pages.h
index 87b1efc301c8..b8a5cd0890d3 100644
--- a/drivers/md/bcache/nvm-pages.h
+++ b/drivers/md/bcache/nvm-pages.h
@@ -66,6 +66,7 @@ struct bch_nvm_pages_owner_head *bch_get_allocated_pages(const char *owner_uuid)
 #else
 
 static inline struct bch_nvm_namespace *bch_register_namespace(const char *dev_path)
+{
 	return NULL;
 }
 static inline int bch_nvm_init(void)
-- 
2.26.2


  parent reply	other threads:[~2021-04-09 16:44 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-09 16:43 [PATCH v7 00/16] bcache: support NVDIMM for journaling Coly Li
2021-04-09 16:43 ` [PATCH v7 01/16] bcache: add initial data structures for nvm pages Coly Li
2021-04-09 16:43 ` [PATCH v7 02/16] bcache: initialize the nvm pages allocator Coly Li
2021-04-09 16:43 ` [PATCH v7 03/16] bcache: initialization of the buddy Coly Li
2021-04-09 16:43 ` [PATCH v7 04/16] bcache: bch_nvm_alloc_pages() " Coly Li
2021-04-09 16:43 ` [PATCH v7 05/16] bcache: bch_nvm_free_pages() " Coly Li
2021-04-09 16:43 ` [PATCH v7 06/16] bcache: get allocated pages from specific owner Coly Li
2021-04-09 16:43 ` Coly Li [this message]
2021-04-09 16:43 ` [PATCH v7 08/16] bcache: use bucket index to set GC_MARK_METADATA for journal buckets in bch_btree_gc_finish() Coly Li
2021-04-09 16:43 ` [PATCH v7 09/16] bcache: add BCH_FEATURE_INCOMPAT_NVDIMM_META into incompat feature set Coly Li
2021-04-09 16:43 ` [PATCH v7 10/16] bcache: initialize bcache journal for NVDIMM meta device Coly Li
2021-04-09 16:43 ` [PATCH v7 11/16] bcache: support storing bcache journal into " Coly Li
2021-04-09 16:43 ` [PATCH v7 12/16] bcache: read jset from NVDIMM pages for journal replay Coly Li
2021-04-09 16:43 ` [PATCH v7 13/16] bcache: add sysfs interface register_nvdimm_meta to register NVDIMM meta device Coly Li
2021-04-09 16:43 ` [PATCH v7 14/16] bcache: use div_u64() in init_owner_info() Coly Li
2021-04-09 16:43 ` [PATCH v7 15/16] bcache: fix BCACHE_NVM_PAGES' dependences in Kconfig Coly Li
2021-04-09 16:43 ` [PATCH v7 16/16] bcache: more fix for compiling error when BCACHE_NVM_PAGES disabled Coly Li

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=20210409164343.56828-8-colyli@suse.de \
    --to=colyli@suse.de \
    --cc=axboe@kernel.dk \
    --cc=dan.j.williams@intel.com \
    --cc=hare@suse.com \
    --cc=jack@suse.cz \
    --cc=jianpeng.ma@intel.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=qiaowei.ren@intel.com \
    --subject='Re: [PATCH v7 07/16] bcache: nvm-pages fixes for bcache integration testing' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).