From patchwork Sun Apr 2 09:12:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 78201 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1646636vqo; Sun, 2 Apr 2023 02:15:46 -0700 (PDT) X-Google-Smtp-Source: AKy350ZPxyHvRQGEPhxB21BsChZr/gqOdomyjpkoJTql1EzbG3S+cFnXapWfb805IV8Rh0lY2oRp X-Received: by 2002:a05:6a20:6d9f:b0:e5:5037:9785 with SMTP id gl31-20020a056a206d9f00b000e550379785mr2842895pzb.41.1680426945908; Sun, 02 Apr 2023 02:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680426945; cv=none; d=google.com; s=arc-20160816; b=Sw596EPaeC6qwGX60LfRtHB2eClkkkT3F1n1sd2cnMdMPz5hy3omabTeO7mE6UvA9v 6RfsORNcbHMwELwjpgH7VTTorrthCh26b5QyPQxu6PeoXQli382SImlfZakrP6OWhqxB 1fSOsm/z/eNjO4XHIg2xUA6umMh337SetgMkKvgNmis8xH+l4m/+IdlJozpaFBPi55cU 3B/oHnkKMhGuR0e5H/Kjl9glSto0xoPS21g25V627YccC+dyxNV6sEhufNHYqta5YXAU Bao624gWMG0LNa2p3VC3D6yJJlMFCwn8SqxfCehGdKwkoLhUaaothzGDN2qcCt66G34E xNpQ== 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=K7PpnKDV90nlqKbNbP9xTAd9RnHTMLhIyLWyzidkbmM=; b=uvp9JAcAW87E/50nGqVdOa3DL8B9gAIgeH+4jDIGZnfVXkDGxPXA10sSwUOjHT9g62 PuaTDhnc9ogbYFo4n7iznd2uEi0bhMpeVA1M+b9ZcLQMCoRG5L7MEz8dY4kPOKT6XzfS lG5yt+YF7ulFIqUl8G4XHaUK7NsWbOaA49KEQcPhxVlZutxgFsvhk/3VVWM1lwD6uTW2 LynixwuHcUPA982JihX5DPsvAqjp8/5Fwu2Hkw7reS4Ehidpr5Yn8yG1aYdx4kWpaRvW SrfhziWsGL4Qs+SxQ4Qhj92jv7pMBrsZf+kTLcvswjCk1nwVFILFQlFPwq/fw4EuCHsE eLjw== 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 v7-20020aa799c7000000b006254213ed4csi6500321pfi.91.2023.04.02.02.15.33; Sun, 02 Apr 2023 02:15:45 -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 S230312AbjDBJNP (ORCPT + 99 others); Sun, 2 Apr 2023 05:13:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbjDBJNK (ORCPT ); Sun, 2 Apr 2023 05:13:10 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B4DCCC19; Sun, 2 Apr 2023 02:13:08 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pq7bg0rxTz4f3lX9; Sun, 2 Apr 2023 17:13:03 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3X7MeRylkVUE8Gg--.50168S6; Sun, 02 Apr 2023 17:13:04 +0800 (CST) From: Yu Kuai To: logang@deltatee.com, song@kernel.org 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 v4 2/5] md: factor out a helper to wake up md_thread directly Date: Sun, 2 Apr 2023 17:12:33 +0800 Message-Id: <20230402091236.976723-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230402091236.976723-1-yukuai1@huaweicloud.com> References: <20230402091236.976723-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3X7MeRylkVUE8Gg--.50168S6 X-Coremail-Antispam: 1UD129KBjvJXoW7KryktrWfAw15uw43tFykGrg_yoW5JFy8pa y8tF15Wr48ArZxZFZrJa4qya45Xr10qFy7try3C3yrJw1rKw45tFya9Fyjya4DAF95Ar45 Xw15tFWruw4vkF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9v14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjYiiDUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1762055365276052736?= X-GMAIL-MSGID: =?utf-8?q?1762055365276052736?= From: Yu Kuai md_wakeup_thread() can't wakeup md_thread->tsk if md_thread->run is still in progress, and in some cases md_thread->tsk need to be woke up directly, like md_set_readonly(), do_md_stop(), and perhaps later in action_store(). This patch factor out a helper to wake up md_thread directly, prepare to protect md_thread with rcu. Signed-off-by: Yu Kuai --- drivers/md/md.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 1459c2cfb0dd..139c7b0202e3 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -92,6 +92,7 @@ static struct workqueue_struct *md_rdev_misc_wq; static int remove_and_add_spares(struct mddev *mddev, struct md_rdev *this); static void mddev_detach(struct mddev *mddev); +static void md_wakeup_thread_directly(struct md_thread *thread); enum md_ro_state { MD_RDWR, @@ -6269,10 +6270,12 @@ static int md_set_readonly(struct mddev *mddev, struct block_device *bdev) } if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) set_bit(MD_RECOVERY_INTR, &mddev->recovery); - if (mddev->sync_thread) - /* Thread might be blocked waiting for metadata update - * which will now never happen */ - wake_up_process(mddev->sync_thread->tsk); + + /* + * Thread might be blocked waiting for metadata update which will now + * never happen + */ + md_wakeup_thread_directly(mddev->sync_thread); if (mddev->external && test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags)) return -EBUSY; @@ -6333,10 +6336,12 @@ static int do_md_stop(struct mddev *mddev, int mode, } if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) set_bit(MD_RECOVERY_INTR, &mddev->recovery); - if (mddev->sync_thread) - /* Thread might be blocked waiting for metadata update - * which will now never happen */ - wake_up_process(mddev->sync_thread->tsk); + + /* + * Thread might be blocked waiting for metadata update which will now + * never happen + */ + md_wakeup_thread_directly(mddev->sync_thread); mddev_unlock(mddev); wait_event(resync_wait, (mddev->sync_thread == NULL && @@ -7886,6 +7891,12 @@ static int md_thread(void *arg) return 0; } +static void md_wakeup_thread_directly(struct md_thread *thread) +{ + if (thread) + wake_up_process(thread->tsk); +} + void md_wakeup_thread(struct md_thread *thread) { if (thread) {