From patchwork Wed Jun 28 01:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 113645 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8590165vqr; Tue, 27 Jun 2023 18:41:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4B2Ycul/R3Y0vlq4XBBwsXZ5/ckh/DraCbKvQAhaXut0iiqxMv74WamPj40zRbSY1MF+HX X-Received: by 2002:a05:6a20:440d:b0:123:149b:a34f with SMTP id ce13-20020a056a20440d00b00123149ba34fmr22862982pzb.1.1687916479756; Tue, 27 Jun 2023 18:41:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687916479; cv=none; d=google.com; s=arc-20160816; b=am4M0VBogo806E4qlEWp91dFd2y0akRbrA86+PSAMnLggZUkOA/qax9apFij3G70wQ VBUBQdbG0oFQHGUUt7ho5n+Tu98s9evnLonRswR1BdXN+cyaZvZ3NlzCKfK50v+Hafwm pSwYGWkWs+Sj4AhxPTx89gBWGjJOPPSdHzJcmhJDZwgEW/g6maTjvf0oLkWzWf/JO4+8 AkxO8yiHgmKGdJiAgF1XBJ4M0F2pPJ8TXFf7kBFacR2Gbna32xYyyPInhJBmdXsnfGzt amqyAFqD912qBn0RJ/A6a8Rf1zNWq188K5tBv8LBq/aoVVcMoXG3Jz88Tsh6FCKmRxC2 RUEA== 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=i/kpf7WXNU8BEkIWEcntw0O4s0QoptH4WwEDFu9tNKg=; fh=iMZZX0FFO55NaIpXGwWN3J7WjJd6DgeE9WUHpdANwGQ=; b=ybi3y3UaVLzIm+04VdZR7RTER15rEqQbBYLE/CbOBeoi3/CP7s9CnmNAJeb/X/SAmT YSzvVu1NeqecnflvD4EQr8XgWR3HKftWd4k/cHnLS5qKPAUBfIkD41mtHy/bB7phQHnA ER6gPqf2A8SOkBYGj6ryeC0RjAkWZfJmSFaQNwG2t/FlyPIMxxt7z/D6cc05Uc1DobYZ zd/x15mZ5+Cuq+4lSeJXIS9iA4rEgqz7oDJy4bIn6KgeOUVP/FOJex4yDP02LHaDDrMN 8Rh4XJXNdW/JPk+Cjr2EDxpJ6lOMKKg5gMeq3Lj4mSVFUOhBi6mTH1qysq5alsQcWaVd x1dQ== 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 v16-20020a63d550000000b005578df5d315si7441641pgi.676.2023.06.27.18.41.05; Tue, 27 Jun 2023 18:41:19 -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 S230400AbjF1Bac (ORCPT + 99 others); Tue, 27 Jun 2023 21:30:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230188AbjF1Ba0 (ORCPT ); Tue, 27 Jun 2023 21:30:26 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91A812973; Tue, 27 Jun 2023 18:30:25 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4QrPCf1l10z4f3vfg; Wed, 28 Jun 2023 09:30:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAHcLMtjZtksx7IMg--.35564S5; Wed, 28 Jun 2023 09:30:22 +0800 (CST) From: Yu Kuai To: xni@redhat.com, song@kernel.org, colyli@suse.de 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 1/2] md: don't quiesce in mddev_suspend() Date: Wed, 28 Jun 2023 09:29:30 +0800 Message-Id: <20230628012931.88911-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628012931.88911-1-yukuai1@huaweicloud.com> References: <20230628012931.88911-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHcLMtjZtksx7IMg--.35564S5 X-Coremail-Antispam: 1UD129KBjvJXoW7KrW7ZFyftFyUJw1xtrWkWFg_yoW8Gr15p3 97tF98JryUJF90yw4UA3Z8Wa45X3WqgrWvyFy3u3yYv3ZFgr95Gr1fua9rXr9rCasayrsx Aw4UJr48Ar109rDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9m14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUHyIUUUUUU= 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?1769908710701842603?= X-GMAIL-MSGID: =?utf-8?q?1769908710701842603?= From: Yu Kuai Some levels doesn't implement "pers->quiesce", for example raid0_quiesce() is empty, and now that all levels will drop 'active_io' until io is done, wait for 'active_io' to be 0 is enough to make sure all normal io is done, and percpu_ref_kill() for 'active_io' will make sure no new normal io can be dispatched. There is no need to call "pers->quiesce" anymore from mddev_suspend(). Signed-off-by: Yu Kuai --- drivers/md/md.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index abb616720393..962dacfd98cf 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -453,7 +453,6 @@ void mddev_suspend(struct mddev *mddev) mddev->pers->prepare_suspend(mddev); wait_event(mddev->sb_wait, percpu_ref_is_zero(&mddev->active_io)); - mddev->pers->quiesce(mddev, 1); clear_bit_unlock(MD_ALLOW_SB_UPDATE, &mddev->flags); wait_event(mddev->sb_wait, !test_bit(MD_UPDATING_SB, &mddev->flags)); @@ -472,7 +471,6 @@ void mddev_resume(struct mddev *mddev) return; percpu_ref_resurrect(&mddev->active_io); wake_up(&mddev->sb_wait); - mddev->pers->quiesce(mddev, 0); set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); md_wakeup_thread(mddev->thread); From patchwork Wed Jun 28 01:29:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 113647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8595202vqr; Tue, 27 Jun 2023 18:54:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5KTSM9oUBPWxjV6WczTR5H0Ea8gEj7A2qFCMmdcdWfZgbKnIzI1/QEuTrroRGH9MHhthwH X-Received: by 2002:a05:6a20:7493:b0:111:a0e5:d2b7 with SMTP id p19-20020a056a20749300b00111a0e5d2b7mr39991487pzd.4.1687917282271; Tue, 27 Jun 2023 18:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687917282; cv=none; d=google.com; s=arc-20160816; b=mzQNzA724JTCWIsQVA11YL10ykWdD8uWSV95hGMyx0Q3Khqin2Zle/JzKGJCkk2xXJ iU0Py323ic18nai7NNijV5HN/7d0wMHb/kO59hUy0fn/O7rNvDcoScEHAund6JcCw2qW EbbB5nm/vNgkQ6YiYav9mVwTgymOWqVbEa0RUD8C6/Sbbd8/3hq0A6Dc/8OBu14hb7s0 nDStqq1Jht2lTz2LlYs9g1z2yixQ15UfGB8iriBVVT7CDHNtMd9N8ed2gQibIkff9DUk KydMVg91HD9FZ6EiXORlk5iMKfJqv67hjrzXyo7beVA52aHYD8FDqL/yKIJAD8sUXqHT JgGQ== 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=hMPIfRxDZiReoPm4AuISBFy5GY1QloLCEoMXbaVb2zM=; fh=iMZZX0FFO55NaIpXGwWN3J7WjJd6DgeE9WUHpdANwGQ=; b=OKYgLMOLbWkG7D5lQAO3MrRey0TrEHHCaLdOfyZulfir4i/jmkG9XsAGAMj9dBt2CO 6o+U4BK4CMYmPkKLRKEpG4kivFxhZjJW6mhUkHlsNCkg59T6jT5ITCRIp9jevxDM2xX3 KogNt3zZ27KUmJURu05Om5m66RGjnVMUrb5WsmfCfEoDrfB7OFgMkerF0ujlTJQzgbYN +1GqX6a1DgFrw1D3FhsyrVrLVIUDiFEy+wbE4FgYxMLUqQ5n6uQpzX+Ebalr1Hdiymoo JlaSlEu/ltvQIHd1eKArk//1UCe8vnS4iIS85nZAJN5N1GFBfJ7/kXCC6IIGx/KX/7ZH lNvg== 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 e19-20020a056a001a9300b0063b356e36fesi8129291pfv.372.2023.06.27.18.54.28; Tue, 27 Jun 2023 18:54:42 -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 S230399AbjF1Bae (ORCPT + 99 others); Tue, 27 Jun 2023 21:30:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230238AbjF1Ba1 (ORCPT ); Tue, 27 Jun 2023 21:30:27 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 253F6297A; Tue, 27 Jun 2023 18:30:26 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4QrPCf4B0Kz4f3l8j; Wed, 28 Jun 2023 09:30:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAHcLMtjZtksx7IMg--.35564S6; Wed, 28 Jun 2023 09:30:23 +0800 (CST) From: Yu Kuai To: xni@redhat.com, song@kernel.org, colyli@suse.de 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 2/2] md: restore 'noio_flag' for the last mddev_resume() Date: Wed, 28 Jun 2023 09:29:31 +0800 Message-Id: <20230628012931.88911-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628012931.88911-1-yukuai1@huaweicloud.com> References: <20230628012931.88911-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHcLMtjZtksx7IMg--.35564S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF4rtFWkCF47GrWDWF45ZFb_yoW8Jw1rp3 yIqFZYyry8AFZ8Ar4Dta4kWFy5Jan3KrZFy3y3uw43Z3W3ur1UCr4rWr1DXFyqkFWIyr4D tw40vayrAw1UC3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9m14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUfwIDUUUUU= 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?1769909551704196578?= X-GMAIL-MSGID: =?utf-8?q?1769909551704196578?= From: Yu Kuai memalloc_noio_save() is called for the first mddev_suspend(), and repeated mddev_suspend() only increase 'suspended'. However, memalloc_noio_restore() is also called for the first mddev_resume(), which means that memory reclaim will be enabled before the last mddev_resume() is called, while the array is still suspended. Fix this problem by restore 'noio_flag' for the last mddev_resume(). Fixes: 78f57ef9d50a ("md: use memalloc scope APIs in mddev_suspend()/mddev_resume()") Signed-off-by: Yu Kuai --- drivers/md/md.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 962dacfd98cf..a3d98273b295 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -464,11 +464,13 @@ EXPORT_SYMBOL_GPL(mddev_suspend); void mddev_resume(struct mddev *mddev) { - /* entred the memalloc scope from mddev_suspend() */ - memalloc_noio_restore(mddev->noio_flag); lockdep_assert_held(&mddev->reconfig_mutex); if (--mddev->suspended) return; + + /* entred the memalloc scope from mddev_suspend() */ + memalloc_noio_restore(mddev->noio_flag); + percpu_ref_resurrect(&mddev->active_io); wake_up(&mddev->sb_wait);