From: Coly Li <colyli@suse.de>
To: axboe@kernel.dk
Cc: linux-bcache@vger.kernel.org, linux-block@vger.kernel.org,
jianpeng.ma@intel.com, qiaowei.ren@intel.com,
Coly Li <colyli@suse.de>
Subject: [PATCH 07/13] bcache: use bucket index to set GC_MARK_METADATA for journal buckets in bch_btree_gc_finish()
Date: Wed, 14 Apr 2021 13:46:42 +0800 [thread overview]
Message-ID: <20210414054648.24098-8-colyli@suse.de> (raw)
In-Reply-To: <20210414054648.24098-1-colyli@suse.de>
Currently the meta data bucket locations on cache device are reserved
after the meta data stored on NVDIMM pages, for the meta data layout
consistentcy temporarily. So these buckets are still marked as meta data
by SET_GC_MARK() in bch_btree_gc_finish().
When BCH_FEATURE_INCOMPAT_NVDIMM_META is set, the sb.d[] stores linear
address of NVDIMM pages and not bucket index anymore. Therefore we
should avoid to find bucket index from sb.d[], and directly use bucket
index from ca->sb.first_bucket to (ca->sb.first_bucket +
ca->sb.njournal_bucketsi) for setting the gc mark of journal bucket.
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/btree.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 183a58c89377..e0d7135669ca 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -1761,8 +1761,10 @@ static void bch_btree_gc_finish(struct cache_set *c)
ca = c->cache;
ca->invalidate_needs_gc = 0;
- for (k = ca->sb.d; k < ca->sb.d + ca->sb.keys; k++)
- SET_GC_MARK(ca->buckets + *k, GC_MARK_METADATA);
+ /* Range [first_bucket, first_bucket + keys) is for journal buckets */
+ for (i = ca->sb.first_bucket;
+ i < ca->sb.first_bucket + ca->sb.njournal_buckets; i++)
+ SET_GC_MARK(ca->buckets + i, GC_MARK_METADATA);
for (k = ca->prio_buckets;
k < ca->prio_buckets + prio_buckets(ca) * 2; k++)
--
2.26.2
next prev parent reply other threads:[~2021-04-14 5:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 5:46 [PATCH 00/13] bcache patches for Linux v5.13 -- 2nd wave Coly Li
2021-04-14 5:46 ` [PATCH 01/13] bcache: add initial data structures for nvm pages Coly Li
2021-04-14 5:46 ` [PATCH 02/13] bcache: initialize the nvm pages allocator Coly Li
2021-04-14 5:46 ` [PATCH 03/13] bcache: initialization of the buddy Coly Li
2021-04-14 5:46 ` [PATCH 04/13] bcache: bch_nvm_alloc_pages() " Coly Li
2021-04-14 5:46 ` [PATCH 05/13] bcache: bch_nvm_free_pages() " Coly Li
2021-04-14 5:46 ` [PATCH 06/13] bcache: get allocated pages from specific owner Coly Li
2021-04-14 5:46 ` Coly Li [this message]
2021-04-14 5:46 ` [PATCH 08/13] bcache: add BCH_FEATURE_INCOMPAT_NVDIMM_META into incompat feature set Coly Li
2021-04-14 5:46 ` [PATCH 09/13] bcache: initialize bcache journal for NVDIMM meta device Coly Li
2021-04-14 5:46 ` [PATCH 10/13] bcache: support storing bcache journal into " Coly Li
2021-04-14 5:46 ` [PATCH 11/13] bcache: read jset from NVDIMM pages for journal replay Coly Li
2021-04-14 5:46 ` [PATCH 12/13] bcache: add sysfs interface register_nvdimm_meta to register NVDIMM meta device Coly Li
2021-04-14 5:46 ` [PATCH 13/13] bcache: use div_u64() in init_owner_info() Coly Li
2021-04-16 12:01 ` Jens Axboe
2021-04-16 3:55 ` [PATCH 00/13] bcache patches for Linux v5.13 -- 2nd wave Coly Li
2021-04-16 12:02 ` Jens Axboe
2021-04-16 12:26 ` 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=20210414054648.24098-8-colyli@suse.de \
--to=colyli@suse.de \
--cc=axboe@kernel.dk \
--cc=jianpeng.ma@intel.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=qiaowei.ren@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.