From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 869F22E3709; Fri, 1 Aug 2025 07:10:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754032253; cv=none; b=jMJUi/a5h2hSdBE6otsKP7xjQBUHTrUAeqNDMJcbzdMVOUnvw/fgsbN8Mn3aq/1Untw+1zS1RIBQdFB0rW7FIXHdEMpLoM/3JvyheikutiYJZIX59or0uwX3CPABn7qjZcJQ6BrRN+4wUgoG+RNc9bDUTefOBu5Zqk9Yc2ZaN2U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754032253; c=relaxed/simple; bh=WivEGCWT9ThaO1NiGLpYm3Mt64DthdRw3xjmWD2FTAM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gL/i4th2aI/Hh5kKj1Oap+ozjkpb3W4iyrypyVnR5EbwOxNxXWXD0TSaNGaYdMse5t58rbH1sy62TvCfi+1DYWNH0PFl0QkrRBYcoA+VLTeuK/3Ox8vTgsDJudexdLc7JZL5/Vh5JNbR+apSLCyJITZoCiZUqkszz21sLBIHkbY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4btcYQ2R4GzKHMqc; Fri, 1 Aug 2025 15:10:50 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 444A01A06DF; Fri, 1 Aug 2025 15:10:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgDHjxByaIxoqAzACA--.18978S8; Fri, 01 Aug 2025 15:10:48 +0800 (CST) From: Yu Kuai To: hch@lst.de, corbet@lwn.net, song@kernel.org, yukuai3@huawei.com, agk@redhat.com, snitzer@kernel.org, mpatocka@redhat.com, linan122@huawei.com, xni@redhat.com, hare@suse.de Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, dm-devel@lists.linux.dev, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com, johnny.chenyi@huawei.com Subject: [PATCH v5 04/11] md: add a new mddev field 'bitmap_id' Date: Fri, 1 Aug 2025 15:03:39 +0800 Message-Id: <20250801070346.4127558-5-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250801070346.4127558-1-yukuai1@huaweicloud.com> References: <20250801070346.4127558-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-raid@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgDHjxByaIxoqAzACA--.18978S8 X-Coremail-Antispam: 1UD129KBjvJXoWxuF4rGF1fWFWxJFyxCw1kuFg_yoW5Xryfpa yxXa4fCF4rXFZ2qw43Ga4DuFnYgwn2yFZFgFWfJ34rWFn8WrZ8WF4Fg3Wjqr1DG3WxXFnx Z3W5tr48Cry8ZF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUma14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2 kIc2xKxwCY1x0262kKe7AKxVW8ZVWrXwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkE bVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67 AF67kF1VAFwI0_GFv_WrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCw CI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsG vfC2KfnxnUUI43ZEXa7sRiHUDtUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ From: Yu Kuai Prepare to store the bitmap id selected by user, also refactor mddev_set_bitmap_ops a bit in case the value is invalid. Signed-off-by: Yu Kuai Reviewed-by: Hannes Reinecke Reviewed-by: Li Nan Reviewed-by: Xiao Ni --- drivers/md/md.c | 37 +++++++++++++++++++++++++++++++------ drivers/md/md.h | 2 ++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 4e90d2143813..393e6547a086 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -675,13 +675,33 @@ static void active_io_release(struct percpu_ref *ref) static void no_op(struct percpu_ref *r) {} -static void mddev_set_bitmap_ops(struct mddev *mddev, enum md_submodule_id id) +static bool mddev_set_bitmap_ops(struct mddev *mddev) { + struct md_submodule_head *head; + + if (mddev->bitmap_id == ID_BITMAP_NONE) + return true; + xa_lock(&md_submodule); - mddev->bitmap_ops = xa_load(&md_submodule, id); + head = xa_load(&md_submodule, mddev->bitmap_id); + + if (!head) { + pr_warn("md: can't find bitmap id %d\n", mddev->bitmap_id); + goto err; + } + + if (head->type != MD_BITMAP) { + pr_warn("md: invalid bitmap id %d\n", mddev->bitmap_id); + goto err; + } + + mddev->bitmap_ops = (void *)head; xa_unlock(&md_submodule); - if (!mddev->bitmap_ops) - pr_warn_once("md: can't find bitmap id %d\n", id); + return true; + +err: + xa_unlock(&md_submodule); + return false; } static void mddev_clear_bitmap_ops(struct mddev *mddev) @@ -691,8 +711,13 @@ static void mddev_clear_bitmap_ops(struct mddev *mddev) int mddev_init(struct mddev *mddev) { - /* TODO: support more versions */ - mddev_set_bitmap_ops(mddev, ID_BITMAP); + if (!IS_ENABLED(CONFIG_MD_BITMAP)) { + mddev->bitmap_id = ID_BITMAP_NONE; + } else { + mddev->bitmap_id = ID_BITMAP; + if (!mddev_set_bitmap_ops(mddev)) + return -EINVAL; + } if (percpu_ref_init(&mddev->active_io, active_io_release, PERCPU_REF_ALLOW_REINIT, GFP_KERNEL)) { diff --git a/drivers/md/md.h b/drivers/md/md.h index 1b767b5320cf..4fa5a3e68a0c 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -40,6 +40,7 @@ enum md_submodule_id { ID_CLUSTER, ID_BITMAP, ID_LLBITMAP, /* TODO */ + ID_BITMAP_NONE, }; struct md_submodule_head { @@ -565,6 +566,7 @@ struct mddev { struct percpu_ref writes_pending; int sync_checkers; /* # of threads checking writes_pending */ + enum md_submodule_id bitmap_id; void *bitmap; /* the bitmap for the device */ struct bitmap_operations *bitmap_ops; struct { -- 2.39.2