From patchwork Fri Nov 10 17:28:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 163892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1304021vqs; Fri, 10 Nov 2023 10:29:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IHngjdjR9VaNmmPT1tMWVo2Xg6OuYK65Uzv1H9qbJiukPJuytWHAXjUAWF+lV0tYhRRRTLd X-Received: by 2002:a17:90b:3b4a:b0:27f:bd9e:5a15 with SMTP id ot10-20020a17090b3b4a00b0027fbd9e5a15mr6171759pjb.28.1699640995430; Fri, 10 Nov 2023 10:29:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699640995; cv=none; d=google.com; s=arc-20160816; b=xpBq2Mq+SFHOVUJ8M3PfzYMs+GQICfcVboe9db7Ap8E0r/AgJ1Q0Jl8RmGTmqrfKXJ 7iL7tr0PIFUyorV4NrzhhjE7EWnGmJ+UEOHOrXQ0wC+R2ROJ6SFsu2jj+M6sfjPOpUvy 6P+rVdmiUPSorHtXXigZvmcZmk5jKigiVM/JcqXyzDn18XqKGhiUNpG7ULOC4UUSQroO hPw9C0sDzByJsNF+qugFIU3FnsoA4AafAOCzqbtirhIGmK8tQWc3p0vhZDe6zzgQ6Urh es8UBTjycs/zPVJ89mmn/tchgRcAAuEsn0OgjOctUS/8as252Csi706Z/MVPDYh0DfiR vIaA== 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=bibJ0D/IWGFCLEK5VWhgBIDxutEuEiHGwnSqmoV9ud8=; fh=8k/d6E6r9fN2MUmxCda3gomiJvMOngrQQX+toNARU7g=; b=P6yyef9prtd7HdFCP17DUvIJ3/Xx7EWAS5AjUMAruftXtHojr6EvOgQdulJXR/KoiQ kQoAjfY6Ianx472sYVQ1x6YhA2XKRfOdBDxByAzFP25KDZ0oEqvztKBfLUTnuzU0Sg46 eOjrgO0jp0m96GuYtUplFvd/yRpsoDUlIcZuLeOaf84umU1i8+qPYQYRJ1TogbetMTvk mmRBPSEQ10KUpZHBIxOdbCV6uSUwrghGNbdr8Hl91sLNKSskDuch06/nKzx1cyyIJ5yi qfwf1MEqBuf0sojgQMz4uHzZsoWnxWbU0nsc8hoHKJVGbJgpV1PGax+RlVp1ys1V/W+r xKhw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id nl5-20020a17090b384500b0027762fed4a0si5155325pjb.11.2023.11.10.10.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 10:29:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 9880983CAC49; Fri, 10 Nov 2023 10:29:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235273AbjKJS3a (ORCPT + 30 others); Fri, 10 Nov 2023 13:29:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346558AbjKJS07 (ORCPT ); Fri, 10 Nov 2023 13:26:59 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3B9B244BA; Fri, 10 Nov 2023 01:34:00 -0800 (PST) Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4SRYYJ3m4tz4f3v76; Fri, 10 Nov 2023 17:33:56 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id AC62E1A0177; Fri, 10 Nov 2023 17:33:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgA3iA4E+U1l0pQlAg--.33627S5; Fri, 10 Nov 2023 17:33:57 +0800 (CST) From: Yu Kuai To: song@kernel.org, xni@redhat.com, yukuai3@huawei.com, neilb@suse.de Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 1/8] md: fix missing flush of sync_work Date: Sat, 11 Nov 2023 01:28:27 +0800 Message-Id: <20231110172834.3939490-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231110172834.3939490-1-yukuai1@huaweicloud.com> References: <20231110172834.3939490-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgA3iA4E+U1l0pQlAg--.33627S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tr18WF13Cr18Cr4kJw13Jwb_yoW8XFyfp3 ySqa45ArWrAay7t3yUGa4q9a4rWw10qrZrtrW3u345JF1aqF45G3WY9F1jqFykJF93Zwn8 ZF40ya9xZ3W0vr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRBMKJUUUUU = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-Spam-Status: No, score=2.7 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, KHOP_HELO_FCRDNS,MAY_BE_FORGED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 10 Nov 2023 10:29:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782202756770340153 X-GMAIL-MSGID: 1782202756770340153 From: Yu Kuai Commit ac619781967b ("md: use separate work_struct for md_start_sync()") use a new sync_work to replace del_work, however, stop_sync_thread() and __md_stop_writes() was trying to wait for sync_thread to be done, hence they should switch to use sync_work as well. Noted that md_start_sync() from sync_work will grab 'reconfig_mutex', hence other contex can't held the same lock to flush work, and this will be fixed in later patches. Fixes: ac619781967b ("md: use separate work_struct for md_start_sync()") Signed-off-by: Yu Kuai Signed-off-by: Yu Kuai --- drivers/md/md.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 09686d8db983..1701e2fb219f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4865,7 +4865,7 @@ static void stop_sync_thread(struct mddev *mddev) return; } - if (work_pending(&mddev->del_work)) + if (work_pending(&mddev->sync_work)) flush_workqueue(md_misc_wq); set_bit(MD_RECOVERY_INTR, &mddev->recovery); @@ -6273,7 +6273,7 @@ static void md_clean(struct mddev *mddev) static void __md_stop_writes(struct mddev *mddev) { set_bit(MD_RECOVERY_FROZEN, &mddev->recovery); - if (work_pending(&mddev->del_work)) + if (work_pending(&mddev->sync_work)) flush_workqueue(md_misc_wq); if (mddev->sync_thread) { set_bit(MD_RECOVERY_INTR, &mddev->recovery);