From nobody Mon Oct 6 15:14:25 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (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 49763235064; Sat, 19 Jul 2025 08:37:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752914255; cv=none; b=ZTQuqodUNNs3sFAf45Vx5Oyc2b72vgnPxuDzgMu2iNBTFoM496EnR6/VvREWjS3mIoWZ9juBJB4w/dFfNCvFPm9GGcg8FJEPVXoI1zbY9jnzavC51yforPaNYjFsSEx+S5oR74f8gTvP5gEP9UwbxaZALKVwZH/iizdi0uOqY34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752914255; c=relaxed/simple; bh=oSZjEVIiER5+Mz5NQu4W408lsjIKD/TG839onCKJzSQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rocM8uST5mbri8T5xX4ighJWDgPcpkBvyDOLx1ZKWrV1dE8a9zqOS0WArsWJSEv6sCCObEoPcxF0JtdoMOqkHIRF+mntSEX8GysMvBNBu/JaODQzTKj7oXkSiKlJUZ9AlbGWaZIVl79graOosJubnU+fCL39wGN96F7sJ/G67lQ= 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.51 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.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4bkg5S0H0rzYQv3T; Sat, 19 Jul 2025 16:37:32 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id BEB161A0ECB; Sat, 19 Jul 2025 16:37:30 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgBHERJIWXtorEYVAw--.20439S5; Sat, 19 Jul 2025 16:37:30 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, yukuai3@huawei.com, martin.petersen@oracle.com, hare@suse.de, axboe@kernel.dk Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, bvanassche@acm.org, hch@infradead.org, filipe.c.maia@gmail.com, linan666@huaweicloud.com, yangerkun@huawei.com, yi.zhang@huawei.com Subject: [PATCH v2 1/3] md: prevent adding disks with larger logical_block_size to active arrays Date: Sat, 19 Jul 2025 16:31:17 +0800 Message-Id: <20250719083119.1068811-2-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250719083119.1068811-1-linan666@huaweicloud.com> References: <20250719083119.1068811-1-linan666@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgBHERJIWXtorEYVAw--.20439S5 X-Coremail-Antispam: 1UD129KBjvdXoWrKFyDGFyDXFW5tFW8WF45Wrg_yoWkXrcE9a 1YvrZ2qr4UGF9I93WjvrWxZFyrKa1kua1kXFnFg3W3uas8JF1kCFyxu343XrWqvay7GFy5 Kw1kKw4fAr4DCjkaLaAFLSUrUUUU1b8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb_8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r18M2 8IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK 021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r 4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ GcCE3s1ln4kS14v26r1Y6r17M2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20x vEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj 6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7 I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04v7M4kE6xkIj40Ew7xC 0wCY1x0262kKe7AKxVW8ZVWrXwCF04k20xvY0x0EwIxGrwCF54CYxVAaw2AFwI0_Jrv_JF 1l4c8EcI0Ec7CjxVAaw2AFwI0_GFv_Wryl4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV W8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR qzuWUUUUU X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Li Nan When adding a disk to a md array, avoid updating the array's logical_block_size to match the new disk. This prevents accidental partition table loss that renders the array unusable. The later patch will introduce a way to configure the array's logical_block_size. Signed-off-by: Li Nan Reviewed-by: Martin K. Petersen --- drivers/md/md.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/md/md.c b/drivers/md/md.c index 0f03b21e66e4..b1fceda89846 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5841,6 +5841,13 @@ int mddev_stack_new_rdev(struct mddev *mddev, struct= md_rdev *rdev) if (mddev_is_dm(mddev)) return 0; =20 + if (queue_logical_block_size(rdev->bdev->bd_disk->queue) > + queue_logical_block_size(mddev->gendisk->queue)) { + pr_err("%s: incompatible logical_block_size, can not add\n", + mdname(mddev)); + return -EINVAL; + } + lim =3D queue_limits_start_update(mddev->gendisk->queue); queue_limits_stack_bdev(&lim, rdev->bdev, rdev->data_offset, mddev->gendisk->disk_name); --=20 2.39.2 From nobody Mon Oct 6 15:14:25 2025 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 C6BC1235079; Sat, 19 Jul 2025 08:37:33 +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=1752914255; cv=none; b=Rw8jc2uxIPgS3MvuqeEtA2BW6HB7zAyNgHJzXe4cb3SLRRmZSXzTF6MEK/LlYFwNzy1MrLbFAqefJFW9KWYz3OFSPUafX8OxiqNy/Xr7YpKWaj4wEbHitXVWg0eLlrot8u9qxO3v+vdOCgI3InJgUUkgv29hLsM4KsKfcyiVnOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752914255; c=relaxed/simple; bh=ottWTCcLGS6drWcUnMZXO8vksmDHWK8WuyKlRtZzDG4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WsLgNrWlrrP79OgJyCk0z5RzQRdD6LsZauC1beegx4DQJ900qbVEGSYH74d0h+uuq10NOHPGBaRT6HO7OX17lkMJa1AAErvwog0k3os+OVBinwNyaz/THdf73DNo7DOBUL3aQ+PXTcNOVB3YRhKX04XqGoalA/++V0BB/i06JwE= 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 4bkg5S4rfKzKHMSV; Sat, 19 Jul 2025 16:37:32 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 518171A0BAC; Sat, 19 Jul 2025 16:37:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgBHERJIWXtorEYVAw--.20439S6; Sat, 19 Jul 2025 16:37:31 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, yukuai3@huawei.com, martin.petersen@oracle.com, hare@suse.de, axboe@kernel.dk Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, bvanassche@acm.org, hch@infradead.org, filipe.c.maia@gmail.com, linan666@huaweicloud.com, yangerkun@huawei.com, yi.zhang@huawei.com Subject: [PATCH v2 2/3] md: allow configuring logical_block_size Date: Sat, 19 Jul 2025 16:31:18 +0800 Message-Id: <20250719083119.1068811-3-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250719083119.1068811-1-linan666@huaweicloud.com> References: <20250719083119.1068811-1-linan666@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgBHERJIWXtorEYVAw--.20439S6 X-Coremail-Antispam: 1UD129KBjvJXoW3JF4kWr1rXFWUKrWUuw45KFg_yoWDJrWkpa 97ZFyfu34UXayYy3Z7AFykuF15X3yUKFWqkrya93y0vF9Ivr17GF4fWFy5Xryqqwn8AwnF q3WDKrWDu3WIgr7anT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUULq14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAa w2AFwI0_Jrv_JF1lnxkEFVAIw20F6cxK64vIFxWle2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II 8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lw4CEc2x0rVAKj4xxMxkF7I0E n4kS14v26r4a6rW5MxAIw28IcxkI7VAKI48JMxAqzxv262kKe7AKxVWUXVWUAwCF54CYxV CY1x0262kKe7AKxVW8ZVWrXwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pR2LviUUUUU = X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Li Nan Previously, raid array used the maximum logical_block_size (LBS) of all member disks. Adding a larger LBS during disk at runtime could unexpectedly increase RAID's LBS, risking corruption of existing partitions. Simply restricting larger-LBS disks is inflexible. In some scenarios, only disks with 512 LBS are available currently, but later, disks with 4k LBS may be added to the array. Making LBS configurable is the best way to solve this scenario. After this patch, the raid will: - stores LBS in disk metadata. - add a read-write sysfs 'mdX/logical_block_size'. Future mdadm should support setting LBS via metadata field during RAID creation and the new sysfs. Though the kernel allows runtime LBS changes, users should avoid modifying it after creating partitions or filesystems to prevent compatibility issues. Signed-off-by: Li Nan --- drivers/md/md.h | 1 + include/uapi/linux/raid/md_p.h | 6 ++-- drivers/md/md-linear.c | 1 + drivers/md/md.c | 65 ++++++++++++++++++++++++++++++++++ drivers/md/raid0.c | 1 + drivers/md/raid1.c | 1 + drivers/md/raid10.c | 1 + drivers/md/raid5.c | 1 + 8 files changed, 75 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.h b/drivers/md/md.h index d45a9e6ead80..2af2df153c58 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -431,6 +431,7 @@ struct mddev { sector_t array_sectors; /* exported array size */ int external_size; /* size managed * externally */ + unsigned int logical_block_size; __u64 events; /* If the last 'event' was simply a clean->dirty transition, and * we didn't write it to the spares, then it is safe and simple diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index ff47b6f0ba0f..ad1c84e772ba 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h @@ -180,7 +180,8 @@ typedef struct mdp_superblock_s { __u32 delta_disks; /* 15 change in number of raid_disks */ __u32 new_layout; /* 16 new layout */ __u32 new_chunk; /* 17 new chunk size (bytes) */ - __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 18]; + __u32 logical_block_size; /* same as q->limits->logical_block_size */ + __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 19]; =20 /* * Personality information @@ -291,7 +292,8 @@ struct mdp_superblock_1 { __le64 resync_offset; /* data before this offset (from data_offset) known= to be in sync */ __le32 sb_csum; /* checksum up to devs[max_dev] */ __le32 max_dev; /* size of devs[] array to consider */ - __u8 pad3[64-32]; /* set to 0 when writing */ + __le32 logical_block_size; /* same as q->limits->logical_block_size */ + __u8 pad3[64-36]; /* set to 0 when writing */ =20 /* device state information. Indexed by dev_number. * 2 bytes per device diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c index 5d9b08115375..da8babb8da59 100644 --- a/drivers/md/md-linear.c +++ b/drivers/md/md-linear.c @@ -72,6 +72,7 @@ static int linear_set_limits(struct mddev *mddev) =20 md_init_stacking_limits(&lim); lim.max_hw_sectors =3D mddev->chunk_sectors; + lim.logical_block_size =3D mddev->logical_block_size; lim.max_write_zeroes_sectors =3D mddev->chunk_sectors; lim.io_min =3D mddev->chunk_sectors << 9; err =3D mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY); diff --git a/drivers/md/md.c b/drivers/md/md.c index b1fceda89846..ad8d44493c0f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1382,6 +1382,7 @@ static int super_90_validate(struct mddev *mddev, str= uct md_rdev *freshest, stru mddev->bitmap_info.default_offset =3D MD_SB_BYTES >> 9; mddev->bitmap_info.default_space =3D 64*2 - (MD_SB_BYTES >> 9); mddev->reshape_backwards =3D 0; + mddev->logical_block_size =3D sb->logical_block_size; =20 if (mddev->minor_version >=3D 91) { mddev->reshape_position =3D sb->reshape_position; @@ -1544,6 +1545,7 @@ static void super_90_sync(struct mddev *mddev, struct= md_rdev *rdev) =20 sb->layout =3D mddev->layout; sb->chunk_size =3D mddev->chunk_sectors << 9; + sb->logical_block_size =3D mddev->logical_block_size; =20 if (mddev->bitmap && mddev->bitmap_info.file =3D=3D NULL) sb->state |=3D (1<layout =3D le32_to_cpu(sb->layout); mddev->raid_disks =3D le32_to_cpu(sb->raid_disks); mddev->dev_sectors =3D le64_to_cpu(sb->size); + mddev->logical_block_size =3D le32_to_cpu(sb->logical_block_size); mddev->events =3D ev1; mddev->bitmap_info.offset =3D 0; mddev->bitmap_info.space =3D 0; @@ -2087,6 +2090,7 @@ static void super_1_sync(struct mddev *mddev, struct = md_rdev *rdev) sb->chunksize =3D cpu_to_le32(mddev->chunk_sectors); sb->level =3D cpu_to_le32(mddev->level); sb->layout =3D cpu_to_le32(mddev->layout); + sb->logical_block_size =3D cpu_to_le32(mddev->logical_block_size); if (test_bit(FailFast, &rdev->flags)) sb->devflags |=3D FailFast1; else @@ -5689,6 +5693,64 @@ static struct md_sysfs_entry md_serialize_policy =3D __ATTR(serialize_policy, S_IRUGO | S_IWUSR, serialize_policy_show, serialize_policy_store); =20 +static int mddev_set_logical_block_size(struct mddev *mddev, + unsigned int lbs) +{ + int err =3D 0; + struct queue_limits lim; + + if (queue_logical_block_size(mddev->gendisk->queue) >=3D lbs) { + pr_err("%s: incompatible logical_block_size %u, can not set\n", + mdname(mddev), lbs); + return -EINVAL; + } + + lim =3D queue_limits_start_update(mddev->gendisk->queue); + lim.logical_block_size =3D lbs; + pr_info("%s: logical_block_size is changed, data may be lost\n", + mdname(mddev)); + err =3D queue_limits_commit_update(mddev->gendisk->queue, &lim); + if (err) + return err; + + mddev->logical_block_size =3D lbs; + md_update_sb(mddev, 1); + + return 0; +} + +static ssize_t +lbs_show(struct mddev *mddev, char *page) +{ + return sprintf(page, "%u\n", mddev->logical_block_size); +} + +static ssize_t +lbs_store(struct mddev *mddev, const char *buf, size_t len) +{ + unsigned int lbs; + int err =3D -EBUSY; + + if (mddev->pers) + goto unlock; + + err =3D kstrtouint(buf, 10, &lbs); + if (err < 0) + return err; + + err =3D mddev_lock(mddev); + if (err) + return err; + + err =3D mddev_set_logical_block_size(mddev, lbs); + +unlock: + mddev_unlock(mddev); + return err ?: len; +} + +static struct md_sysfs_entry md_logical_block_size =3D +__ATTR(logical_block_size, S_IRUGO|S_IWUSR, lbs_show, lbs_store); =20 static struct attribute *md_default_attrs[] =3D { &md_level.attr, @@ -5721,6 +5783,7 @@ static struct attribute *md_redundancy_attrs[] =3D { &md_scan_mode.attr, &md_last_scan_mode.attr, &md_mismatches.attr, + &md_logical_block_size.attr, &md_sync_min.attr, &md_sync_max.attr, &md_sync_io_depth.attr, @@ -5828,6 +5891,7 @@ int mddev_stack_rdev_limits(struct mddev *mddev, stru= ct queue_limits *lim, !queue_limits_stack_integrity_bdev(lim, rdev->bdev)) return -EINVAL; } + mddev->logical_block_size =3D queue_logical_block_size(mddev->gendisk->qu= eue); =20 return 0; } @@ -6435,6 +6499,7 @@ static void md_clean(struct mddev *mddev) mddev->chunk_sectors =3D 0; mddev->ctime =3D mddev->utime =3D 0; mddev->layout =3D 0; + mddev->logical_block_size =3D 0; mddev->max_disks =3D 0; mddev->events =3D 0; mddev->can_decrease_events =3D 0; diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index d8f639f4ae12..c65732b330eb 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -382,6 +382,7 @@ static int raid0_set_limits(struct mddev *mddev) md_init_stacking_limits(&lim); lim.max_hw_sectors =3D mddev->chunk_sectors; lim.max_write_zeroes_sectors =3D mddev->chunk_sectors; + lim.logical_block_size =3D mddev->logical_block_size; lim.io_min =3D mddev->chunk_sectors << 9; lim.io_opt =3D lim.io_min * mddev->raid_disks; lim.features |=3D BLK_FEAT_ATOMIC_WRITES; diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 19c5a0ce5a40..7e37f1015646 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -3218,6 +3218,7 @@ static int raid1_set_limits(struct mddev *mddev) =20 md_init_stacking_limits(&lim); lim.max_write_zeroes_sectors =3D 0; + lim.logical_block_size =3D mddev->logical_block_size; lim.features |=3D BLK_FEAT_ATOMIC_WRITES; err =3D mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY); if (err) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index b74780af4c22..ead49c752e42 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -4003,6 +4003,7 @@ static int raid10_set_queue_limits(struct mddev *mdde= v) =20 md_init_stacking_limits(&lim); lim.max_write_zeroes_sectors =3D 0; + lim.logical_block_size =3D mddev->logical_block_size; lim.io_min =3D mddev->chunk_sectors << 9; lim.io_opt =3D lim.io_min * raid10_nr_stripes(conf); lim.features |=3D BLK_FEAT_ATOMIC_WRITES; diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index ca5b0e8ba707..963b0310bc13 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7727,6 +7727,7 @@ static int raid5_set_limits(struct mddev *mddev) stripe =3D roundup_pow_of_two(data_disks * (mddev->chunk_sectors << 9)); =20 md_init_stacking_limits(&lim); + lim.logical_block_size =3D mddev->logical_block_size; lim.io_min =3D mddev->chunk_sectors << 9; lim.io_opt =3D lim.io_min * (conf->raid_disks - conf->max_degraded); lim.features |=3D BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE; --=20 2.39.2 From nobody Mon Oct 6 15:14:25 2025 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 EF6AF23534D; Sat, 19 Jul 2025 08:37:33 +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=1752914255; cv=none; b=LwudzPtJF5JHJ5gxfw8leqUsTUqJfqYRmflRVDyVX3J53Zfocp4K6BJ3eZGRfkURXnfzXPjjAciNsI7/efEWA6t9IAXtZP/NacTL2eHZyrGRhnBd4LGwXEbt/ASY9dIqLTLg6+E1PUwCFCV3W49FG1FYSOum3APHMnnhpiHjx1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752914255; c=relaxed/simple; bh=p7bpIvZCIm0RHjrxeNtvLnmg5tVr/XRCGk0rMkfZ0qQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G+6O2WnK8iQ2ck56Zxf6ba3WJAlyqFkLFUuh9LrDSSe9jWfBflYnOjrtmEQBe1g7F8hIncGnWuHr/GrV7eP1Zpxy8jkU6YX8KoDCi6fQu59S5tEyBwClIxp5JqvBPWFEeCdkcOYL+Qaf6yHcFVrshfJepMOv7oQd4gdw6/dwJyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none 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=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4bkg5T1RwRzKHMgc; Sat, 19 Jul 2025 16:37:33 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id CFDA81A0DDB; Sat, 19 Jul 2025 16:37:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgBHERJIWXtorEYVAw--.20439S7; Sat, 19 Jul 2025 16:37:31 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, yukuai3@huawei.com, martin.petersen@oracle.com, hare@suse.de, axboe@kernel.dk Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, bvanassche@acm.org, hch@infradead.org, filipe.c.maia@gmail.com, linan666@huaweicloud.com, yangerkun@huawei.com, yi.zhang@huawei.com Subject: [PATCH v2 3/3] md: Fix the return value of mddev_stack_new_rdev Date: Sat, 19 Jul 2025 16:31:19 +0800 Message-Id: <20250719083119.1068811-4-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250719083119.1068811-1-linan666@huaweicloud.com> References: <20250719083119.1068811-1-linan666@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgBHERJIWXtorEYVAw--.20439S7 X-Coremail-Antispam: 1UD129KBjvdXoWruFyDZF43Gr45Kw4kKF1Dtrb_yoWftwc_CF sYvFy0grykCF97Zw15Z3yxZryDJw1kWanrXF12gryfZFW3Xrn5GFy8C343W3yrC3y3AryU KrsF9aySvw4akjkaLaAFLSUrUUUU1b8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbNkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY02 0Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2kK e7AKxVWUXVWUAwAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc 02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAF wI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4 CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2xKxwAKzVCY07xG64k0F24lc7CjxVAa w2AFwI0_GFv_Wryl42xK82IYc2Ij64vIr41l4c8EcI0En4kS14v26r1Y6r17MxAqzxv26x kF7I0En4kS14v26r4a6rW5MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWx JVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjTRA_-BDUUU U X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Li Nan In mddev_stack_new_rdev(), if the integrity profile check fails, it returns -ENXIO, which means "No such device or address". This is inaccurate and can mislead users. Change it to return -EINVAL. Fixes: c6e56cf6b2e7 ("block: move integrity information into queue_limits") Signed-off-by: Li Nan --- drivers/md/md.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index ad8d44493c0f..f2dfe0a72c51 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5920,7 +5920,7 @@ int mddev_stack_new_rdev(struct mddev *mddev, struct = md_rdev *rdev) pr_err("%s: incompatible integrity profile for %pg\n", mdname(mddev), rdev->bdev); queue_limits_cancel_update(mddev->gendisk->queue); - return -ENXIO; + return -EINVAL; } =20 return queue_limits_commit_update(mddev->gendisk->queue, &lim); --=20 2.39.2