From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 525B3C48BE5 for ; Tue, 22 Jun 2021 11:03:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 377EE613AB for ; Tue, 22 Jun 2021 11:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230004AbhFVLFd (ORCPT ); Tue, 22 Jun 2021 07:05:33 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:47650 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229900AbhFVLFd (ORCPT ); Tue, 22 Jun 2021 07:05:33 -0400 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E348221988; Tue, 22 Jun 2021 11:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624359796; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3D3aW/V05aLINFNcUIf3KE73OQ5UUnT/BqChuKJjiv0=; b=xPeWoGxIbyfeNESBdlDGIUskWGP39CRemrkCAZCwX4Pa6ipvZesQolOLu50HlOcEnWvsWU 8cPgjPafHRhJrfA+qXoKY8hbNjQRQM7aV//rXn/86KTkjDq9zv3VDy9y05fRJvMAZsmkq/ L10Emhgbp/G27+CSM1Wj58At7CPmEBg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624359796; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3D3aW/V05aLINFNcUIf3KE73OQ5UUnT/BqChuKJjiv0=; b=y6XcyEhG4U2nsmgJF+zMIqFxoNYLXJNfypXK2hf7HFe0GnmlNWyo3ZBtkyhkLULTwkzKIs LD4YqsE2nzaIpJDg== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id D4326118DD; Tue, 22 Jun 2021 11:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624359796; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3D3aW/V05aLINFNcUIf3KE73OQ5UUnT/BqChuKJjiv0=; b=xPeWoGxIbyfeNESBdlDGIUskWGP39CRemrkCAZCwX4Pa6ipvZesQolOLu50HlOcEnWvsWU 8cPgjPafHRhJrfA+qXoKY8hbNjQRQM7aV//rXn/86KTkjDq9zv3VDy9y05fRJvMAZsmkq/ L10Emhgbp/G27+CSM1Wj58At7CPmEBg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624359796; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3D3aW/V05aLINFNcUIf3KE73OQ5UUnT/BqChuKJjiv0=; b=y6XcyEhG4U2nsmgJF+zMIqFxoNYLXJNfypXK2hf7HFe0GnmlNWyo3ZBtkyhkLULTwkzKIs LD4YqsE2nzaIpJDg== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id 5pWTM3TD0WAaYQAALh3uQQ (envelope-from ); Tue, 22 Jun 2021 11:03:16 +0000 Subject: Re: [PATCH 12/14] bcache: support storing bcache journal into NVDIMM meta device To: Coly Li , axboe@kernel.dk Cc: linux-bcache@vger.kernel.org, linux-block@vger.kernel.org, Jianpeng Ma , Qiaowei Ren References: <20210615054921.101421-1-colyli@suse.de> <20210615054921.101421-13-colyli@suse.de> From: Hannes Reinecke Message-ID: Date: Tue, 22 Jun 2021 13:03:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <20210615054921.101421-13-colyli@suse.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 6/15/21 7:49 AM, Coly Li wrote: > This patch implements two methods to store bcache journal to, > 1) __journal_write_unlocked() for block interface device > The latency method to compose bio and issue the jset bio to cache > device (e.g. SSD). c->journal.key.ptr[0] indicates the LBA on cache > device to store the journal jset. > 2) __journal_nvdimm_write_unlocked() for memory interface NVDIMM > Use memory interface to access NVDIMM pages and store the jset by > memcpy_flushcache(). c->journal.key.ptr[0] indicates the linear > address from the NVDIMM pages to store the journal jset. > > For lagency configuration without NVDIMM meta device, journal I/O is legacy? > handled by __journal_write_unlocked() with existing code logic. If the > NVDIMM meta device is used (by bcache-tools), the journal I/O will > be handled by __journal_nvdimm_write_unlocked() and go into the NVDIMM > pages. > > And when NVDIMM meta device is used, sb.d[] stores the linear addresses > from NVDIMM pages (no more bucket index), in journal_reclaim() the > journaling location in c->journal.key.ptr[0] should also be updated by > linear address from NVDIMM pages (no more LBA combined by sectors offset > and bucket index). > > Signed-off-by: Coly Li > Cc: Jianpeng Ma > Cc: Qiaowei Ren > --- > drivers/md/bcache/journal.c | 119 ++++++++++++++++++++++++---------- > drivers/md/bcache/nvm-pages.h | 1 + > drivers/md/bcache/super.c | 28 +++++++- > 3 files changed, 110 insertions(+), 38 deletions(-) > > diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c > index 32599d2ff5d2..03ecedf813b0 100644 > --- a/drivers/md/bcache/journal.c > +++ b/drivers/md/bcache/journal.c > @@ -596,6 +596,8 @@ static void do_journal_discard(struct cache *ca) > return; > } > > + BUG_ON(bch_has_feature_nvdimm_meta(&ca->sb)); > + > switch (atomic_read(&ja->discard_in_flight)) { > case DISCARD_IN_FLIGHT: > return; > @@ -661,9 +663,13 @@ static void journal_reclaim(struct cache_set *c) > goto out; > > ja->cur_idx = next; > - k->ptr[0] = MAKE_PTR(0, > - bucket_to_sector(c, ca->sb.d[ja->cur_idx]), > - ca->sb.nr_this_dev); > + if (!bch_has_feature_nvdimm_meta(&ca->sb)) > + k->ptr[0] = MAKE_PTR(0, > + bucket_to_sector(c, ca->sb.d[ja->cur_idx]), > + ca->sb.nr_this_dev); > + else > + k->ptr[0] = ca->sb.d[ja->cur_idx]; > + > atomic_long_inc(&c->reclaimed_journal_buckets); > > bkey_init(k); > @@ -729,46 +735,21 @@ static void journal_write_unlock(struct closure *cl) > spin_unlock(&c->journal.lock); > } > > -static void journal_write_unlocked(struct closure *cl) > + > +static void __journal_write_unlocked(struct cache_set *c) > __releases(c->journal.lock) > { > - struct cache_set *c = container_of(cl, struct cache_set, journal.io); > - struct cache *ca = c->cache; > - struct journal_write *w = c->journal.cur; > struct bkey *k = &c->journal.key; > - unsigned int i, sectors = set_blocks(w->data, block_bytes(ca)) * > - ca->sb.block_size; > - > + struct journal_write *w = c->journal.cur; > + struct closure *cl = &c->journal.io; > + struct cache *ca = c->cache; > struct bio *bio; > struct bio_list list; > + unsigned int i, sectors = set_blocks(w->data, block_bytes(ca)) * > + ca->sb.block_size; > > bio_list_init(&list); > > - if (!w->need_write) { > - closure_return_with_destructor(cl, journal_write_unlock); > - return; > - } else if (journal_full(&c->journal)) { > - journal_reclaim(c); > - spin_unlock(&c->journal.lock); > - > - btree_flush_write(c); > - continue_at(cl, journal_write, bch_journal_wq); > - return; > - } > - > - c->journal.blocks_free -= set_blocks(w->data, block_bytes(ca)); > - > - w->data->btree_level = c->root->level; > - > - bkey_copy(&w->data->btree_root, &c->root->key); > - bkey_copy(&w->data->uuid_bucket, &c->uuid_bucket); > - > - w->data->prio_bucket[ca->sb.nr_this_dev] = ca->prio_buckets[0]; > - w->data->magic = jset_magic(&ca->sb); > - w->data->version = BCACHE_JSET_VERSION; > - w->data->last_seq = last_seq(&c->journal); > - w->data->csum = csum_set(w->data); > - > for (i = 0; i < KEY_PTRS(k); i++) { > ca = c->cache; > bio = &ca->journal.bio; > @@ -793,7 +774,6 @@ static void journal_write_unlocked(struct closure *cl) > > ca->journal.seq[ca->journal.cur_idx] = w->data->seq; > } > - > /* If KEY_PTRS(k) == 0, this jset gets lost in air */ > BUG_ON(i == 0); > > @@ -805,6 +785,73 @@ static void journal_write_unlocked(struct closure *cl) > > while ((bio = bio_list_pop(&list))) > closure_bio_submit(c, bio, cl); > +} > + > +#if defined(CONFIG_BCACHE_NVM_PAGES) > + > +static void __journal_nvdimm_write_unlocked(struct cache_set *c) > + __releases(c->journal.lock) > +{ > + struct journal_write *w = c->journal.cur; > + struct cache *ca = c->cache; > + unsigned int sectors; > + > + sectors = set_blocks(w->data, block_bytes(ca)) * ca->sb.block_size; > + atomic_long_add(sectors, &ca->meta_sectors_written); > + > + memcpy_flushcache((void *)c->journal.key.ptr[0], w->data, sectors << 9); > + > + c->journal.key.ptr[0] += sectors << 9; > + ca->journal.seq[ca->journal.cur_idx] = w->data->seq; > + > + atomic_dec_bug(&fifo_back(&c->journal.pin)); > + bch_journal_next(&c->journal); > + journal_reclaim(c); > + > + spin_unlock(&c->journal.lock); > +} > + > +#else /* CONFIG_BCACHE_NVM_PAGES */ > + > +static void __journal_nvdimm_write_unlocked(struct cache_set *c) { } > + > +#endif /* CONFIG_BCACHE_NVM_PAGES */ > + > +static void journal_write_unlocked(struct closure *cl) > +{ > + struct cache_set *c = container_of(cl, struct cache_set, journal.io); > + struct cache *ca = c->cache; > + struct journal_write *w = c->journal.cur; > + > + if (!w->need_write) { > + closure_return_with_destructor(cl, journal_write_unlock); > + return; > + } else if (journal_full(&c->journal)) { > + journal_reclaim(c); > + spin_unlock(&c->journal.lock); > + > + btree_flush_write(c); > + continue_at(cl, journal_write, bch_journal_wq); > + return; > + } > + > + c->journal.blocks_free -= set_blocks(w->data, block_bytes(ca)); > + > + w->data->btree_level = c->root->level; > + > + bkey_copy(&w->data->btree_root, &c->root->key); > + bkey_copy(&w->data->uuid_bucket, &c->uuid_bucket); > + > + w->data->prio_bucket[ca->sb.nr_this_dev] = ca->prio_buckets[0]; > + w->data->magic = jset_magic(&ca->sb); > + w->data->version = BCACHE_JSET_VERSION; > + w->data->last_seq = last_seq(&c->journal); > + w->data->csum = csum_set(w->data); > + > + if (!bch_has_feature_nvdimm_meta(&ca->sb)) > + __journal_write_unlocked(c); > + else > + __journal_nvdimm_write_unlocked(c); > > continue_at(cl, journal_write_done, NULL); > } > diff --git a/drivers/md/bcache/nvm-pages.h b/drivers/md/bcache/nvm-pages.h > index c763bf2e2721..736a661777b7 100644 > --- a/drivers/md/bcache/nvm-pages.h > +++ b/drivers/md/bcache/nvm-pages.h > @@ -5,6 +5,7 @@ > > #if defined(CONFIG_BCACHE_NVM_PAGES) > #include > +#include > #endif /* CONFIG_BCACHE_NVM_PAGES */ > > /* > diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c > index cce0f6bf0944..4d6666d03aa7 100644 > --- a/drivers/md/bcache/super.c > +++ b/drivers/md/bcache/super.c > @@ -1686,7 +1686,32 @@ void bch_cache_set_release(struct kobject *kobj) > static void cache_set_free(struct closure *cl) > { > struct cache_set *c = container_of(cl, struct cache_set, cl); > - struct cache *ca; > + struct cache *ca = c->cache; > + > +#if defined(CONFIG_BCACHE_NVM_PAGES) > + /* Flush cache if journal stored in NVDIMM */ > + if (ca && bch_has_feature_nvdimm_meta(&ca->sb)) { > + unsigned long bucket_size = ca->sb.bucket_size; > + int i; > + > + for (i = 0; i < ca->sb.keys; i++) { > + unsigned long offset = 0; > + unsigned int len = round_down(UINT_MAX, 2); > + > + if ((void *)ca->sb.d[i] == NULL) > + continue; > + > + while (bucket_size > 0) { > + if (len > bucket_size) > + len = bucket_size; > + arch_invalidate_pmem( > + (void *)(ca->sb.d[i] + offset), len); > + offset += len; > + bucket_size -= len; > + } > + } > + } > +#endif /* CONFIG_BCACHE_NVM_PAGES */ > > debugfs_remove(c->debug); > > @@ -1698,7 +1723,6 @@ static void cache_set_free(struct closure *cl) > bch_bset_sort_state_free(&c->sort); > free_pages((unsigned long) c->uuids, ilog2(meta_bucket_pages(&c->cache->sb))); > > - ca = c->cache; > if (ca) { > ca->set = NULL; > c->cache = NULL; > Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), GF: Felix Imendörffer