From patchwork Thu Aug 3 13:29: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: 130618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1158023vqx; Thu, 3 Aug 2023 06:45:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlET+ENQcsDv7PxUkeKh9mA7aDo/Cs82E5xgAz8M3/QFXj3z+Q4GF38LmfTqv4C/S2lv7Uy4 X-Received: by 2002:a17:907:97d5:b0:992:13c7:560 with SMTP id js21-20020a17090797d500b0099213c70560mr9391641ejc.38.1691070301479; Thu, 03 Aug 2023 06:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691070301; cv=none; d=google.com; s=arc-20160816; b=gucAQyrsoV4MG3M4ipiHRB2upEAh4tl2Jxa76Y5AVR3g4RWhM+5KHL9d8Avy9wLeX9 leVbMKddaSUPtoRtLNrfzZm1pL6PZ2NGhZM3+OEqMIC+NfgWASpJgmKI+fPex2MEBcD3 u34WF/WrYa+S6Xe6zEW3KR76U4KGe+30v/xssdUMPdgXof+PAHU1yDKrJB69CnzqgBEw Q+27MmQCnFBfRe4Wz7uMFF+LLR/w9yc2bNHxfY5M6hQhOm/RMCLaCSKgW7BS56zWH5Gz lmrOjGUn0BBeHbAz4obmnP7atMTILlnK7NwvooY+fUZyj2M8iMKzKMcmVzIuOwxZlI/5 lkNQ== 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=bYkVIN2U25+fLRekCDA80z3p+DSd40YPtmTB5eCb4dM=; fh=Ktvf84aTmiKPjIiQsnocICsaz7FvZSNYviQ4CE4oKUo=; b=mhQ04BriuJ5khNtpayCil/Mc8emRUqQ/dsJLTc2FW56SlyIpSxOfK9rd+kUBOB01Rm 8p02jqpym3HJzkLvczJ+reBH3VuafhfSfqLLk4LWrwo2PWasPVJHBKOSOhZRsa2y3onn duyU/bCh2bySLnprCRSgPsbtEIx9oAEgXt/8mnFthlDzo6d0c49HwYfXWOK9IykiQpJY GH67zF/CpIF9rAb5bUVMImB95Dlli53QCNB11bA/dMiUxbMZ65XGCAtTxPnnq+PDVFRP tJKC//n1cLz7pPXBEJkc04xOzf6G+0ugc5iXIXUb9juOlBN6gBamTcCeZZobuOVcc1HQ ECcw== 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 by23-20020a170906a2d700b0096f4deef5basi6494754ejb.649.2023.08.03.06.44.36; Thu, 03 Aug 2023 06:45:01 -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 S231599AbjHCNfW (ORCPT + 99 others); Thu, 3 Aug 2023 09:35:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234875AbjHCNd4 (ORCPT ); Thu, 3 Aug 2023 09:33:56 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00FEF4EE0; Thu, 3 Aug 2023 06:32:38 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RGqXJ1Jkpz4f3lJn; Thu, 3 Aug 2023 21:32:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAHuKtqrMtkWHLlPQ--.49699S24; Thu, 03 Aug 2023 21:32:34 +0800 (CST) From: Yu Kuai To: song@kernel.org, xni@redhat.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 20/29] md: use new apis to suspend array for adding/removing rdev from state_store() Date: Thu, 3 Aug 2023 21:29:21 +0800 Message-Id: <20230803132930.2742286-21-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230803132930.2742286-1-yukuai1@huaweicloud.com> References: <20230803132930.2742286-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHuKtqrMtkWHLlPQ--.49699S24 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr4kXFWfAF4DCr48AFW5ZFb_yoW8ZF1kpa 17Ka4rWry7Jw45Gw4rZa1kua4Ygwn2grWqkrWa9w1Sy3WxGwnrGFy5tr4DAFyFv3ya9r13 Xw4UKw45G34fCrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBj14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVW7JVWDJwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwCI42IY6xAIw20E Y4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267 AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUqiihUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1773215732655663573 X-GMAIL-MSGID: 1773215732655663573 From: Yu Kuai User can write 'remove' and 're-add' to trigger array reconfiguration through sysfs, suspend array in this case so that io won't concurrent with array reconfiguration. Signed-off-by: Yu Kuai --- drivers/md/md.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 66bb6a585291..4a522558a570 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2916,11 +2916,7 @@ static int add_bound_rdev(struct md_rdev *rdev) */ super_types[mddev->major_version]. validate_super(mddev, rdev); - if (add_journal) - mddev_suspend(mddev); err = mddev->pers->hot_add_disk(mddev, rdev); - if (add_journal) - mddev_resume(mddev); if (err) { md_kick_rdev_from_array(rdev); return err; @@ -3687,6 +3683,7 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr, struct rdev_sysfs_entry *entry = container_of(attr, struct rdev_sysfs_entry, attr); struct md_rdev *rdev = container_of(kobj, struct md_rdev, kobj); struct kernfs_node *kn = NULL; + bool suspended = false; ssize_t rv; struct mddev *mddev = rdev->mddev; @@ -3695,8 +3692,14 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr, if (!capable(CAP_SYS_ADMIN)) return -EACCES; - if (entry->store == state_store && cmd_match(page, "remove")) - kn = sysfs_break_active_protection(kobj, attr); + if (entry->store == state_store) { + if (cmd_match(page, "remove")) + kn = sysfs_break_active_protection(kobj, attr); + if (cmd_match(page, "remove") || cmd_match(page, "re-add")) { + __mddev_suspend(mddev); + suspended = true; + } + } rv = mddev ? mddev_lock(mddev) : -ENODEV; if (!rv) { @@ -3705,6 +3708,9 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr, else rv = entry->store(rdev, page, length); mddev_unlock(mddev); + + if (suspended) + __mddev_resume(mddev); } if (kn)