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.3 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, 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 76FCCC48BC2 for ; Wed, 23 Jun 2021 06:09:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F73060FDA for ; Wed, 23 Jun 2021 06:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229826AbhFWGLX (ORCPT ); Wed, 23 Jun 2021 02:11:23 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:43056 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbhFWGLW (ORCPT ); Wed, 23 Jun 2021 02:11:22 -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 3725A21968; Wed, 23 Jun 2021 06:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624428545; 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=htpCyUM3LIKLMzXZPP/8i4rAZsTZXFvgdKi9Zw7AtOs=; b=aszNr43g7iRFSgE24od8SNK5LoA/UcCXXSweJnreqvca6se9CWHxCtEf9KnnQJqSi3/ZXc pJInCO/+kue5Fp3Id8yEMFooxL769C7iKD8J5+L8t6PXeRmBRLyQdFJ4qGtpWog2HeDS3K FrF1Gj3CtU3rB3bJk/aKOah/vmZFurA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624428545; 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=htpCyUM3LIKLMzXZPP/8i4rAZsTZXFvgdKi9Zw7AtOs=; b=F5wSz66H+oGoECnmE2+kO0tDR84bCDb5Cvr2ErOXF0wSX2nem37L25UY+DYFQJut/V81LY eaFStZScagvIrWCA== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id F326E11A97; Wed, 23 Jun 2021 06:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624428545; 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=htpCyUM3LIKLMzXZPP/8i4rAZsTZXFvgdKi9Zw7AtOs=; b=aszNr43g7iRFSgE24od8SNK5LoA/UcCXXSweJnreqvca6se9CWHxCtEf9KnnQJqSi3/ZXc pJInCO/+kue5Fp3Id8yEMFooxL769C7iKD8J5+L8t6PXeRmBRLyQdFJ4qGtpWog2HeDS3K FrF1Gj3CtU3rB3bJk/aKOah/vmZFurA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624428545; 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=htpCyUM3LIKLMzXZPP/8i4rAZsTZXFvgdKi9Zw7AtOs=; b=F5wSz66H+oGoECnmE2+kO0tDR84bCDb5Cvr2ErOXF0wSX2nem37L25UY+DYFQJut/V81LY eaFStZScagvIrWCA== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id mFisIv/P0mByXgAALh3uQQ (envelope-from ); Wed, 23 Jun 2021 06:09:03 +0000 Subject: Re: [PATCH 09/14] bcache: use bucket index to set GC_MARK_METADATA for journal buckets in bch_btree_gc_finish() To: Hannes Reinecke Cc: linux-bcache@vger.kernel.org, axboe@kernel.dk, linux-block@vger.kernel.org, Jianpeng Ma , Qiaowei Ren References: <20210615054921.101421-1-colyli@suse.de> <20210615054921.101421-10-colyli@suse.de> From: Coly Li Message-ID: Date: Wed, 23 Jun 2021 14:09:01 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 6/22/21 6:55 PM, Hannes Reinecke wrote: > On 6/15/21 7:49 AM, Coly Li wrote: >> 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 >> Cc: Jianpeng Ma >> Cc: Qiaowei Ren >> --- >> 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++) >> > Reviewed-by: Hannes Reinecke Thanks for your review. Coly Li