From patchwork Thu Jul 6 07:16:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 116543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2380116vqx; Thu, 6 Jul 2023 00:40:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlHsVGCw3Z7SkiuGE+e/q+LdJCcl1387xy7o99dLbC5F7YligP1BprQ92jQOIcWhbmgkf3FG X-Received: by 2002:a17:90b:24c:b0:264:929:ed96 with SMTP id fz12-20020a17090b024c00b002640929ed96mr670426pjb.9.1688629253263; Thu, 06 Jul 2023 00:40:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688629253; cv=none; d=google.com; s=arc-20160816; b=lD+bYg3N6M4n8bBolIf7qxwIhjanYsMnj0kbAZ2Hp5MzJd5MKXXAokmFCN3xLHx1q0 P4cgPSz4KYqZ4QUgDvMS295XkRdybGf5TGqlXuQi9a/2D+7fS7tj5+3V6+jJFbSFrX1L +X46yzvqNl5Ntr6K7XO6reS5VqM6S75f2Seta449mpFUvi0CpF/z6fcp2m46Ur0Em+qy zHKc+wMYbnbamXqdNJCbP5D3Uc6wR0b8GEKzishUNcUrmf/egBnQGPmsF4afeQcO9ZdT 61Jpx1rFmxXJimXyGwiWsGe5UcUPDqCZ1iblK/9zkAqb+HcpdoUiL9Jgwk1VsSHLQOjz pc5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QwjOAOGvsufBBAtplBzpQ+l8U/2gt0DrJS3SVYwArUk=; fh=8SRQxsru4ZyU8ltobz7jrssUFGgn+ZlQ5Br9i4TubRA=; b=j6jObc86Vnx0I3B46pgtXNmW7dOL6L/vXWybfIw09xB0aApt+ctfwkgTgNULPkE+GW TSQ45smj1WB14mZKsoKyvSAG/jwrKu2JO3P+e8U19wW5axVZePj/kfxz1M4S/EnxaI1U 9TtmMthrLgWmskhgqSMSi2y9hmR9oHJ/l7+PV+HJ2uS8QB/PjXdaLr+qUVQym1mPBPsn ZEarSEwkZLG7z0E0UfgSMXgoafQp60aK1cCq6O2OLipnMhGMVTiD1Sv3sTTLEjvrLCuA fyduGfm619r85ruusQxqvI4bCVRZK4y+jlgvhjziys0WsITRAeBPIrgrRMWdu4FbW1mA /1EA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b12-20020a17090a9bcc00b00263f45720besi937622pjw.169.2023.07.06.00.40.38; Thu, 06 Jul 2023 00:40:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233774AbjGFHSA (ORCPT + 99 others); Thu, 6 Jul 2023 03:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233476AbjGFHRt (ORCPT ); Thu, 6 Jul 2023 03:17:49 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC0B11BCA; Thu, 6 Jul 2023 00:17:48 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4QxSXk6WsLz4f3kG8; Thu, 6 Jul 2023 15:17:42 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCnD7OVaqZkZ3pMNQ--.43123S5; Thu, 06 Jul 2023 15:17:44 +0800 (CST) From: Yu Kuai To: agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, song@kernel.org, heinzm@redhat.com, neilb@suse.de, jbrassow@redhat.com Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 1/3] md/dm-raid: fix that 'reconfig_mutex' is not released from error path in raid_ctr() Date: Thu, 6 Jul 2023 15:16:20 +0800 Message-Id: <20230706071622.563073-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706071622.563073-1-yukuai1@huaweicloud.com> References: <20230706071622.563073-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCnD7OVaqZkZ3pMNQ--.43123S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tr18GrW8tF43uF45Xr4xJFb_yoW8GFy5pa 9ag3y5tr18X39IgF4vvw1DWFyrKas5XryayrZrCayfZw4Y9r43Ww1rWFWYqr1UJFWfJa4Y yF1UArWUXFWjkaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JU4T5dUUUUU = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770656107807025079?= X-GMAIL-MSGID: =?utf-8?q?1770656107807025079?= From: Yu Kuai In the error path 'bad_stripe_cache' and 'bad_check_reshape', 'reconfig_mutex' is still held after raid_ctr() returns. Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target") Signed-off-by: Yu Kuai --- drivers/md/dm-raid.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 1f22bef27841..4c819d5f93fd 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3271,15 +3271,19 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) /* Try to adjust the raid4/5/6 stripe cache size to the stripe size */ if (rs_is_raid456(rs)) { r = rs_set_raid456_stripe_cache(rs); - if (r) + if (r) { + mddev_unlock(&rs->md); goto bad_stripe_cache; + } } /* Now do an early reshape check */ if (test_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags)) { r = rs_check_reshape(rs); - if (r) + if (r) { + mddev_unlock(&rs->md); goto bad_check_reshape; + } /* Restore new, ctr requested layout to perform check */ rs_config_restore(rs, &rs_layout); @@ -3288,6 +3292,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = rs->md.pers->check_reshape(&rs->md); if (r) { ti->error = "Reshape check failed"; + mddev_unlock(&rs->md); goto bad_check_reshape; } } From patchwork Thu Jul 6 07:16:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 116533 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2372435vqx; Thu, 6 Jul 2023 00:21:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlHc3Q4rr40HlSHn+ToVLO5i6ZXpVnp/deeNKWXMXXXuRcbPjEwIRENpWogwrMqUWP06WpqB X-Received: by 2002:a05:6870:4191:b0:1b0:37a0:b1fe with SMTP id y17-20020a056870419100b001b037a0b1femr2270662oac.59.1688628100545; Thu, 06 Jul 2023 00:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688628100; cv=none; d=google.com; s=arc-20160816; b=mS2dtvNxCLB70+JJbHAs/FwTlpSXCsm7EoPYtGqYnm0CHM0+Zjlrf1nwzx1IK2F2RW l8dEDcy7ImNxdGs4ene3NpE6/aB4o5tbnbYC3jF+eulEYBergqBYTh8aap95unb/wWFu GQH/5quhEm29VQO2EHgvZgDsECKP7XxFVr46MCtG9vSRp6fdy3/VUdRB2rI+XEJ8uGT6 JTn2qEA5I/nCdL62IeLlQCc+lRMgybwFTa5+k1Md7nWfbBMIUUpcO000GNQSPfRZ6pIy Ogdq8OWWnIuH6QWOFWOnTAIWYGTNopsvXT6DS5pTV0HylC1W1U8VhnfZlphgwBpvM0ip WFag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=650HeZBvsSWEESSg6iJRoeXT6QuKfJ9urowCqbHHRsA=; fh=8SRQxsru4ZyU8ltobz7jrssUFGgn+ZlQ5Br9i4TubRA=; b=Wr+gLGobOjVIVgkRwJp70q2W1UfKWOarEZZmlDzfqQARqg9M65nS0nQFOd+Ay96sD8 AGZ021L9aqDSyjvtt70Ux6I76xZNoqmPUuEBwZUdvUUFmyW/Ohhooh1uOjFmDFBNEai+ 2QfEViqpWqSqoun9C0O8pwLGp0q8VPfV7ivjaewXnG9NXgCyNFUnr/0n7CtDnHgo6V34 IydOwp13KsivJNA41E3PMQgB2Cu1Vvdj3JipBcx6px8m49AFNuqgfXx0E2g9Vatnd2X8 /n2KTe43DV/AjSj4mrx5KLi5eHBSN+KOxDD0kfK+xIISAzpegvhUBbE+D9U5wzVrFYKm oDJA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y125-20020a636483000000b0055ac5d0fc79si903590pgb.648.2023.07.06.00.21.27; Thu, 06 Jul 2023 00:21:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233518AbjGFHRu (ORCPT + 99 others); Thu, 6 Jul 2023 03:17:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230115AbjGFHRt (ORCPT ); Thu, 6 Jul 2023 03:17:49 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 893A9DA; Thu, 6 Jul 2023 00:17:47 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4QxSXl5yYTz4f3nTX; Thu, 6 Jul 2023 15:17:43 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCnD7OVaqZkZ3pMNQ--.43123S6; Thu, 06 Jul 2023 15:17:44 +0800 (CST) From: Yu Kuai To: agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, song@kernel.org, heinzm@redhat.com, neilb@suse.de, jbrassow@redhat.com Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 2/3] md/dm-raid: cleanup multiple equivalent goto tags from raid_ctr() Date: Thu, 6 Jul 2023 15:16:21 +0800 Message-Id: <20230706071622.563073-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706071622.563073-1-yukuai1@huaweicloud.com> References: <20230706071622.563073-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCnD7OVaqZkZ3pMNQ--.43123S6 X-Coremail-Antispam: 1UD129KBjvJXoW7WrWUXr4xCw47Ww43KF1rWFg_yoW8Kw4kpF 4aga9Ikr18X39IgFW0gr4kWF15Ka4FgryUKrs3CFWrZa1Y9r4agw18GFyUXryUJFyrJa4D AF1UAr4DWay0kaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUHbyAUUUUU = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770654898829239747?= X-GMAIL-MSGID: =?utf-8?q?1770654898829239747?= From: Yu Kuai There are four equivalent goto tags in raid_ctr(), clean them up to use just one, there are no functional change and prepare to fix that md_stop() is not protected. Signed-off-by: Yu Kuai --- drivers/md/dm-raid.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 4c819d5f93fd..33742f5e7ee5 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3251,8 +3251,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = md_start(&rs->md); if (r) { ti->error = "Failed to start raid array"; - mddev_unlock(&rs->md); - goto bad_md_start; + goto bad_unlock; } /* If raid4/5/6 journal mode explicitly requested (only possible with journal dev) -> set it */ @@ -3260,8 +3259,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode); if (r) { ti->error = "Failed to set raid4/5/6 journal mode"; - mddev_unlock(&rs->md); - goto bad_journal_mode_set; + goto bad_unlock; } } @@ -3271,19 +3269,15 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) /* Try to adjust the raid4/5/6 stripe cache size to the stripe size */ if (rs_is_raid456(rs)) { r = rs_set_raid456_stripe_cache(rs); - if (r) { - mddev_unlock(&rs->md); - goto bad_stripe_cache; - } + if (r) + goto bad_unlock; } /* Now do an early reshape check */ if (test_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags)) { r = rs_check_reshape(rs); - if (r) { - mddev_unlock(&rs->md); - goto bad_check_reshape; - } + if (r) + goto bad_unlock; /* Restore new, ctr requested layout to perform check */ rs_config_restore(rs, &rs_layout); @@ -3292,8 +3286,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) r = rs->md.pers->check_reshape(&rs->md); if (r) { ti->error = "Reshape check failed"; - mddev_unlock(&rs->md); - goto bad_check_reshape; + goto bad_unlock; } } } @@ -3304,10 +3297,8 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) mddev_unlock(&rs->md); return 0; -bad_md_start: -bad_journal_mode_set: -bad_stripe_cache: -bad_check_reshape: +bad_unlock: + mddev_unlock(&rs->md); md_stop(&rs->md); bad: raid_set_free(rs); From patchwork Thu Jul 6 07:16:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 116534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2372462vqx; Thu, 6 Jul 2023 00:21:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlEHfsbMs/O71pxokOXPrNJJGifII85LSWY1VWwPiLk7yt2TZAJigPW7o5yo/L06cYvWUJEH X-Received: by 2002:a17:902:bb93:b0:1b8:6cae:3570 with SMTP id m19-20020a170902bb9300b001b86cae3570mr1231596pls.11.1688628103900; Thu, 06 Jul 2023 00:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688628103; cv=none; d=google.com; s=arc-20160816; b=aQgsT4Zl9my1H82ZprpCOe1ILvbfAUgo0TCkCJFkLxybeEky1ml7lWaT6BwSpoCmce sUFnFfyi/uSijHNdsOKB5eDc11MOSd6yu9IphDSYpRoEPFiOMvJHrAyX/W+HicwyBgUs bg50zD+aR+6/kWjqlrF1kN6Gd5NwzJFK88Nb3ctQW4oEfFDjEi8zv4UxF+bhWlwTpDkO H8dgDymP032KQLbVHYh91gKC605VO4NZMMfcQXVX6A+Oh9zhRGFOkkhWCz3H/l6VOfBi g+rvf+2600xRVXwQBlgrm6s87/HzcEVE3BJffQKFXn5M2KObEFQvtEW9qZD3s4HrDmlp 9o8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZsBQLy8zOAqsJnJvyfeCGcoPR77/CjEzvqLAyfZ5b+k=; fh=8SRQxsru4ZyU8ltobz7jrssUFGgn+ZlQ5Br9i4TubRA=; b=hCD6QdEqX8Xxb2dBVzVwMKgGdB6LcHQDc5QnLSK/dQfBGUITEaPTG4NcsGX+nrwSHV OcHyIDSWKlcVQqs+10J+ssB3tpla4sPJUoygIOz2V4C3g6VpDJr8SisPDz5O1V4DXAAu mQttbrokA7yFlqzqyCKHF1OH7XNBDhDkM8wSKXwiK4/ZeRY3zeKVMAIhxbS+BYOQTMhs R9BCmgo0UGRrYmrhiErO3rnjMmlFnJ72j7NRwlhUg2S6NQEbmjwDag9iWfVQAvKLvftV YBHfdnGFIPMK1fx7qoLIcXlyHh8Wq4IzpNCtVZcNDUYXWSyg/OKaTK6qb0IXtqFleUJ6 nm5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x2-20020a17090300c200b001b85ab48092si687637plc.499.2023.07.06.00.21.30; Thu, 06 Jul 2023 00:21:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233570AbjGFHRy (ORCPT + 99 others); Thu, 6 Jul 2023 03:17:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233024AbjGFHRt (ORCPT ); Thu, 6 Jul 2023 03:17:49 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAB0A1990; Thu, 6 Jul 2023 00:17:47 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4QxSXm2z1Gz4f3lY8; Thu, 6 Jul 2023 15:17:44 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCnD7OVaqZkZ3pMNQ--.43123S7; Thu, 06 Jul 2023 15:17:45 +0800 (CST) From: Yu Kuai To: agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, song@kernel.org, heinzm@redhat.com, neilb@suse.de, jbrassow@redhat.com Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 3/3] md/dm-raid: protect md_stop() with 'reconfig_mutex' Date: Thu, 6 Jul 2023 15:16:22 +0800 Message-Id: <20230706071622.563073-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706071622.563073-1-yukuai1@huaweicloud.com> References: <20230706071622.563073-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCnD7OVaqZkZ3pMNQ--.43123S7 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr4ktFyDGrykWw4rAF1rtFb_yoW8Gw15pr Z7Xr9xAr15X39rXFyDW3ykua45t3ZIgry0yr93Ca95Za4a9F43uan5KayUurWDJFy3K3ZI vF4UZrn8Way8KwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPj14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8Jw CI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUojjgUUUU U X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770654902920578888?= X-GMAIL-MSGID: =?utf-8?q?1770654902920578888?= From: Yu Kuai __md_stop_writes() and __md_stop() will modify many fields that is protected by 'reconfig_mutex', and all the callers will grab 'reconfig_mtuex' expect for md_stop(). Fixes: 9d09e663d550 ("dm: raid456 basic support") Signed-off-by: Yu Kuai --- drivers/md/dm-raid.c | 4 +++- drivers/md/md.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 33742f5e7ee5..5f9991765f27 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3298,8 +3298,8 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) return 0; bad_unlock: - mddev_unlock(&rs->md); md_stop(&rs->md); + mddev_unlock(&rs->md); bad: raid_set_free(rs); @@ -3310,7 +3310,9 @@ static void raid_dtr(struct dm_target *ti) { struct raid_set *rs = ti->private; + mddev_lock_nointr(&rs->md); md_stop(&rs->md); + mddev_unlock(&rs->md); raid_set_free(rs); } diff --git a/drivers/md/md.c b/drivers/md/md.c index abb616720393..a61c49e6e189 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6290,6 +6290,8 @@ static void __md_stop(struct mddev *mddev) void md_stop(struct mddev *mddev) { + lockdep_assert_held(&mddev->reconfig_mutex); + /* stop the array and free an attached data structures. * This is called from dm-raid */