From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BE28C04A6A for ; Wed, 16 Aug 2023 01:08:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240926AbjHPBH5 (ORCPT ); Tue, 15 Aug 2023 21:07:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240923AbjHPBHc (ORCPT ); Tue, 15 Aug 2023 21:07:32 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD686211E; Tue, 15 Aug 2023 18:07:30 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RQVNY67Ssz4f3pHm; Wed, 16 Aug 2023 09:07:25 +0800 (CST) Received: from [10.174.176.73] (unknown [10.174.176.73]) by APP4 (Coremail) with SMTP id gCh0CgAHl6lNIdxkR5k_Aw--.16538S3; Wed, 16 Aug 2023 09:07:26 +0800 (CST) Subject: Re: [PATCH -next v2 3/7] md: delay choosing sync direction to md_start_sync() To: Song Liu , Yu Kuai Cc: xni@redhat.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, "yukuai (C)" References: <20230815030957.509535-1-yukuai1@huaweicloud.com> <20230815030957.509535-4-yukuai1@huaweicloud.com> From: Yu Kuai Message-ID: Date: Wed, 16 Aug 2023 09:07:25 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-CM-TRANSID: gCh0CgAHl6lNIdxkR5k_Aw--.16538S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr4UKrWkZFWrZr18tFWrKrg_yoW5JF1Upa yfJFn8GrW7XFy3XrW2q3Z0qayj9r1jqrZrJF43Wa4fJrnaqF1fKF1rWF17CFWDJa929a1r Zw48Ja9xZFyFgF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkG14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcVAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCYjI0SjxkI62AI1cAE67vI Y487MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI 0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y 0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxV WUJVW8JwCI42IY6xAIw20EY4v20xvaj40_WFyUJVCq3wCI42IY6I8E87Iv67AKxVWUJVW8 JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x0JUdHUDUUU UU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org Hi, 在 2023/08/15 23:54, Song Liu 写道: > On Tue, Aug 15, 2023 at 2:00 PM Yu Kuai wrote: > [...] >>> + >>> +not_running: >>> + clear_bit(MD_RECOVERY_SYNC, &mddev->recovery); >>> + clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery); >>> + clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery); >>> + clear_bit(MD_RECOVERY_CHECK, &mddev->recovery); >>> + clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery); >>> + mddev_unlock(mddev); >>> + >>> + wake_up(&resync_wait); >>> + if (test_and_clear_bit(MD_RECOVERY_RECOVER, &mddev->recovery) && >>> + mddev->sysfs_action) >>> + sysfs_notify_dirent_safe(mddev->sysfs_action); >>> } >>> >>> /* >>> @@ -9379,7 +9402,6 @@ void md_check_recovery(struct mddev *mddev) >>> return; >>> >>> if (mddev_trylock(mddev)) { >>> - int spares = 0; >>> bool try_set_sync = mddev->safemode != 0; >>> >>> if (!mddev->external && mddev->safemode == 1) >>> @@ -9467,29 +9489,11 @@ void md_check_recovery(struct mddev *mddev) >>> clear_bit(MD_RECOVERY_DONE, &mddev->recovery); >>> >>> if (!test_and_clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || >>> - test_bit(MD_RECOVERY_FROZEN, &mddev->recovery)) >>> - goto not_running; >>> - if (!md_choose_sync_direction(mddev, &spares)) >>> - goto not_running; >>> - if (mddev->pers->sync_request) { >>> - if (spares) { >>> - /* We are adding a device or devices to an array >>> - * which has the bitmap stored on all devices. >>> - * So make sure all bitmap pages get written >>> - */ >>> - md_bitmap_write_all(mddev->bitmap); >>> - } >>> + test_bit(MD_RECOVERY_FROZEN, &mddev->recovery)) { >> >> Sorry that I made a mistake here while rebasing v2, here should be >> >> !test_bit(MD_RECOVERY_FROZEN, &mddev->recovery) >> >> With this fixed, there are no new regression for mdadm tests using loop >> devicein my VM. > > if (!test_and_clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || > !test_bit(MD_RECOVERY_FROZEN, &mddev->recovery)) { > queue_work(md_misc_wq, &mddev->sync_work); > } else { > > This doesn't look right. Should we do > > if (test_and_clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery) && > !test_bit(MD_RECOVERY_FROZEN, &mddev->recovery)) { > queue_work(md_misc_wq, &mddev->sync_work); > } else { > > instead? > Yes you're right, this is exactly what I did in v1, sorry that I keep making mistake while rebasing. Thanks, Kuai > Thanks, > Song > . >