From patchwork Sat Jan 20 10:37:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 189732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp1546776dyb; Sat, 20 Jan 2024 02:43:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIZgYpL4gFvelnq0kVPNvd7NaHhDVwg+lJtvYYenyDawvj4hjLDx23MrashLemuF8gablV X-Received: by 2002:a05:6a20:7a98:b0:199:d6ea:a39a with SMTP id u24-20020a056a207a9800b00199d6eaa39amr1241165pzh.120.1705747392557; Sat, 20 Jan 2024 02:43:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705747392; cv=pass; d=google.com; s=arc-20160816; b=oLWsSDfnzgNwydY8UPRivm7KpelhXyqx4MZ0EwMts1zv9o9zpq49ggHimB0uDCVYqF KSyvzn6/FsiY4QooLInFqVd7oRdGsPWBqSlZkqFVGoEDgiKWTWax8BY1Gnq8YqupqHlI xoQOT96I51aABlK4/ShPfSfWGkyjth20HG4XEMT2lJGtzjMVWFDDywDvvlYZG103oWi0 4v46J3o4IdWQZmoUP+JOoUOzivVWrUqctybGwG0X6HGunC4reyC7dU8v42TVbfrANooO J8G/acFVSZahbwxmyNOW9BK9jmCCjtQgLA9fgX9wgkoezkeQj/EGcxzM+U9jLdme9YzY vw/Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=bEFytn5D3bcPFgK9qXucDVuI1aZwt9HDZYjn9qBJHsc=; fh=y2Ma2pP32dbTTwcFlrDJ//qG1pVVCx07l+xa/F5EZpc=; b=UaaxMhvyh8SyBUrv65IvybrX2fgB0eIPFP/AjS8243WOJcZ9EcVO4zQlJouwxcCVwE 0o08MybhouAh9JpxoD7okpalTeBl54M3359AcMsvQbIvITOTZ2GDqtOHsGvKXAcOh0SW kWr7C2KWQUooaeJJe7SdnYa4MoxqHhFl00W6LIphGLNgODNBP1TxfSMuP1nGBnd04joG tr9iPjqkqZ7C4xa1SB28UzMXSsYmpV2WZaQLgbLeoXb4Om7cKdGj5oll5pQMa826n0Y7 Wxe6LZcyr1ge3CN2ksGJHs6OOG5yr3B9P7hc+EoCIXeW4reEUYMz3Au+BOtG8OQKGkcF 5o8A== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31763-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31763-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s193-20020a632cca000000b005cec8ed4f83si4846725pgs.587.2024.01.20.02.43.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 02:43:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31763-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31763-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31763-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 242A928164A for ; Sat, 20 Jan 2024 10:43:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A3F8D12E5D; Sat, 20 Jan 2024 10:41:28 +0000 (UTC) Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 904DC10961; Sat, 20 Jan 2024 10:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747287; cv=none; b=rFH0vcd8yZCiQ7yd1kD+x7WJx45onmgjmO6S6GH1St6EOoBDZzqVZIv98gs1he3Sj/E6exzW9K9Hn9f5AV0WEl/H8Vmld7JcinyQ+6ShzFPke6ytSFizGlq2H61mk7qbrQv4lzhjgPEmG1dsje8Aai/lhtHLURHKIOKgCz0hzX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747287; c=relaxed/simple; bh=oFTiKVMXXKW9m6GUH6h2P+FXhLEEPVreOg5yS2EU93A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fjVchrcTLdBxopiCHtKqYjyW+7bZtm4vQvHWXslh6zSNXc09NQINpahKsrcnKf0Yayn4sMyrkIdaYsr9LsqZZPK3Be2FKlakOKZaD05BjRnSxcCs91Ql3e7XTlqGv+AojBSIJh8bqEn2ahN3TmgqkJwL5W9oXE8Awau34rahLyE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4THCh91hynz4f3jsD; Sat, 20 Jan 2024 18:41:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 116811A09F2; Sat, 20 Jan 2024 18:41:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAn+RFKo6tlY4mmBQ--.38494S5; Sat, 20 Jan 2024 18:41:16 +0800 (CST) From: Yu Kuai To: mpatocka@redhat.com, dm-devel@lists.linux.dev, msnitzer@redhat.com, heinzm@redhat.com, song@kernel.org, yukuai3@huawei.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH 1/5] md: don't ignore suspended array in md_check_recovery() Date: Sat, 20 Jan 2024 18:37:30 +0800 Message-Id: <20240120103734.4155446-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240120103734.4155446-1-yukuai1@huaweicloud.com> References: <20240120103734.4155446-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAn+RFKo6tlY4mmBQ--.38494S5 X-Coremail-Antispam: 1UD129KBjvdXoWrKF1UCryfKw1fKw4UKF4DJwb_yoWfArcEgF s5ur93W347urnIvr1aqr1avryjyanrWr17XF1ftryayFy5GryIgrW8Zw15A347ZFZ8C3Z0 kryUZr4avrs5GjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84 ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I2 62IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcV AFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG 0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka0xkIwI 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfU86wZUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788605778178118371 X-GMAIL-MSGID: 1788605778178118371 From: Yu Kuai mddev_suspend() never stop sync_thread, hence it dones't make sense to ignore suspended array in md_check_recovery(), which might cause sync_thread can't be unregistered. Before this patch, use stop_sync_thread() directly for syspended array will hang because md_check_recovery() can't clear MD_RECOVERY_RUNING, which is possible for dm-raid. Signed-off-by: Yu Kuai --- drivers/md/md.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 2266358d8074..07b80278eaa5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9469,9 +9469,6 @@ static void md_start_sync(struct work_struct *ws) */ void md_check_recovery(struct mddev *mddev) { - if (READ_ONCE(mddev->suspended)) - return; - if (mddev->bitmap) md_bitmap_daemon_work(mddev); From patchwork Sat Jan 20 10:37:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 189731 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp1546654dyb; Sat, 20 Jan 2024 02:42:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlLTm1pNbmpjRNwf53cmLxrEcrUXXmMatbfKUfhwO9yeGevRWaU8/ZbMcQbo/3n6vol6P0 X-Received: by 2002:a05:620a:4552:b0:783:379a:397c with SMTP id u18-20020a05620a455200b00783379a397cmr1542451qkp.46.1705747358055; Sat, 20 Jan 2024 02:42:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705747358; cv=pass; d=google.com; s=arc-20160816; b=YypRGnUPnYSbzJXkDXBkOuAi3SbecSaTprtwbzg30dx8xTOYoJ0kTTkcm2C/Ugaybf IcXwm0HKJHDk+Ln5gFAfkyBnY3EHx7cK47DJ4hlM+EplkHNOzl+dl5H+KkSJq/k8VZC5 UKpjtrTxF0mNWSHgQVDbJeZabvfkesfCUrUFZ6oDi5NolbX+bTuBn8daKLDmvkOF2USY t4tByx4n72rFQJtl7uY22A5NOHA57FPJHIn5ThsKkUxJmkIcWsyV400gg4D9VJSuNFZR TPnAEY56HAgU5Gytbl1OZdUSBGNhUThWx8lPPONffJD05HFheBktgCtZ7vUjM2DjxxTD PTMg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=ilQYcktv0VKw5GA8OSxUBeiwerQO+4ia1w2zNMSdoY8=; fh=y2Ma2pP32dbTTwcFlrDJ//qG1pVVCx07l+xa/F5EZpc=; b=0a/Q2BNG2EdzBBV0pFYUx7dWikgpi3dhQIGg52ITHPIE/NbAX/4W7isg9+MFzBz6BV 148y/tSkhyat9kdPtJLlgeN74ADgJVUo7yHciLlRJ6Vo4fLGPGTAH05sXM4FJ+lX9gwy 8F0LUeiNWu8E1CRzk/o300r19YVG2ObzowybFR/qwcAb6JE8GTQAg+dFpLMrrOK0I3Is 8qEJyXXl1x/xCiiIKQjGloIXkz5SyFob3fGhk2HpT2FM2vRVyfpZ5H99LURsgN1IkS4+ b0Nt4bxxLiU4B4k+pxxeSDe1VEFZ/ZLKvBlw4flQEvQ7RZiyARjXeu1GbV+QZhhxk+G9 agwg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31762-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31762-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id p7-20020a05620a22a700b007837e9e6f93si1207340qkh.612.2024.01.20.02.42.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 02:42:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31762-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31762-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31762-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C781B1C211EE for ; Sat, 20 Jan 2024 10:42:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1252210788; Sat, 20 Jan 2024 10:41:25 +0000 (UTC) Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5A07D512; Sat, 20 Jan 2024 10:41:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747283; cv=none; b=Tm033afJILfVH7gRpq6BcLe5U4J670LBOcidt993OfjwkZp36jz+/mF01Fhm0oTIP9lJAlJS9lH5kNONA3p1blVB4+tF9YJSor4ealAKuRYAk7YsI1OD9aVMUGZEJ7l8RklNCU9jDWA+ByBEF1vHbDZIkATEi23qgpLDRcJOd2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747283; c=relaxed/simple; bh=XWCMatNblyNOOG9ZYuVi232xYuylTRA2/wcziHuRmDA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=djgcRN54rPeUM1X9HFMzVu7zDcifwBLwGb8ai2gPmNr7lKRQ5aiRrsLIjo2r9dawPCCDKYo+KIfRHNiOYke8jEHnDWk5OxpR6h1PZJuHBvGFtvFF8xkmhEiA8BjDSUGfq7AHf+dc/lcE7rZx/YwbS29jW+wi7QBpj1xIHypRp/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4THCh72RZ6z4f3lfV; Sat, 20 Jan 2024 18:41:11 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 84A7B1A0172; Sat, 20 Jan 2024 18:41:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAn+RFKo6tlY4mmBQ--.38494S6; Sat, 20 Jan 2024 18:41:17 +0800 (CST) From: Yu Kuai To: mpatocka@redhat.com, dm-devel@lists.linux.dev, msnitzer@redhat.com, heinzm@redhat.com, song@kernel.org, yukuai3@huawei.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH 2/5] md: don't ignore read-only array in md_check_recovery() Date: Sat, 20 Jan 2024 18:37:31 +0800 Message-Id: <20240120103734.4155446-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240120103734.4155446-1-yukuai1@huaweicloud.com> References: <20240120103734.4155446-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAn+RFKo6tlY4mmBQ--.38494S6 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr1fXFy5AF1DCr1rAFWfuFg_yoW8Kw1rpa yfKas8WrW8XF93ZrZrK3WDXay5uw10vrWjyry3u34fAw1rtr43C345uF1UAFWkJa4Fva1j v3WrJF43ZFy8Gw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04 v7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbdOz7UUUUU= = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788605741581937120 X-GMAIL-MSGID: 1788605741581937120 From: Yu Kuai If array is read-only and md_do_sync() is done. Currently md_check_recovery() ignore this case, henc sync_thread can't be unregistered. Before this patch, use stop_sync_thread() directly for read-only array will hang because md_check_recovery() can't clear MD_RECOVERY_RUNNING, which is possible for dm-raid. Signed-off-by: Yu Kuai --- drivers/md/md.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 07b80278eaa5..6906d023f1d6 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9445,6 +9445,20 @@ static void md_start_sync(struct work_struct *ws) sysfs_notify_dirent_safe(mddev->sysfs_action); } +static void unregister_sync_thread(struct mddev *mddev) +{ + if (!test_bit(MD_RECOVERY_DONE, &mddev->recovery)) { + /* resync/recovery still happening */ + clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery); + return; + } + + if (WARN_ON_ONCE(!mddev->sync_thread)) + return; + + md_reap_sync_thread(mddev); +} + /* * This routine is regularly called by all per-raid-array threads to * deal with generic issues like resync and super-block update. @@ -9482,7 +9496,8 @@ void md_check_recovery(struct mddev *mddev) } if (!md_is_rdwr(mddev) && - !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) + !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) && + !test_bit(MD_RECOVERY_DONE, &mddev->recovery)) return; if ( ! ( (mddev->sb_flags & ~ (1<recovery)) { - /* sync_work already queued. */ - clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery); + unregister_sync_thread(mddev); goto unlock; } @@ -9568,16 +9582,7 @@ void md_check_recovery(struct mddev *mddev) * still set. */ if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) { - if (!test_bit(MD_RECOVERY_DONE, &mddev->recovery)) { - /* resync/recovery still happening */ - clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery); - goto unlock; - } - - if (WARN_ON_ONCE(!mddev->sync_thread)) - goto unlock; - - md_reap_sync_thread(mddev); + unregister_sync_thread(mddev); goto unlock; } From patchwork Sat Jan 20 10:37:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 189730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp1546529dyb; Sat, 20 Jan 2024 02:42:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbZoLv+2pYi5JzUzf7YkBFAX3vMJpJqeiUHX9eKKRqCK5CvlZWVMINgVrLvyvad1UYOW05 X-Received: by 2002:aa7:c713:0:b0:559:fde9:1716 with SMTP id i19-20020aa7c713000000b00559fde91716mr603077edq.74.1705747333152; Sat, 20 Jan 2024 02:42:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705747333; cv=pass; d=google.com; s=arc-20160816; b=lklloJAxgQiuMLw1slyt+Go5OCSvtHxaf1XwB/3Fpx8a3QviRuTnZGJYy+rP7evpPV GpkCX5iX0AydAZYadAp4CpcSVq1Phc+1jpnjFrgjfXe9UW4a8aKAnVZLBtW2zcVQty7h vhtfrTLpMeWMUz7oAsWk9I57gybeCBoQ95pyj24nxEF9Rr5puFstMdMwZD849Dxevy32 XPDkYMt01AcBD+RluVdKY3ATof42hTvC1jQlH58sPcN6vHgOc+v1E2PIfe+gwVsIgcQj 3DGEuff2dJfG6MXeIOE8MhdaaHAEcZooGuScIT7DxMas5NZwcYfdPjz41j5qbwuhUmVk Yp0g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=nrtSR/YAXze4kaPPkc4IMcl7Wj/hz8xCZK3LMn4eWKE=; fh=y2Ma2pP32dbTTwcFlrDJ//qG1pVVCx07l+xa/F5EZpc=; b=0F1xRMthGUsgWQs5po8FuiaX3Lt0kCwskfgNUt3WQNmhq0o3CkHRby90wkUT9ga/lr UdEeKLf1QYKTsgMJ4/pRG2XmQHkFQ1G+ansHj6TLMHAKFs4qRa4Kow75Dn6V+W6nOUnR k+qmIavXVdgTHqyO4EyMlfVKLYTf3e2mRhZLYzWGL1XZm2eFPZFKDfp3HTXJz9YFLHYD 1kbOx/CDqUgbs09ixZsMwoWgGUt+a1wDhIRfqtHCErq6ZOK4GMNEu85YdY+sAheM/WfT kUXLq+ThVugpJ5+wniE5lGTcS6BS/r1xnbybcP3YT3AAM9Dy63nwjWZEOZywCQ4FX7tv Ndqg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31760-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31760-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a10-20020a50c30a000000b0055a55a7b7f1si1770926edb.671.2024.01.20.02.42.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 02:42:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31760-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31760-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31760-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C30FE1F22158 for ; Sat, 20 Jan 2024 10:42:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0AFCEF9F7; Sat, 20 Jan 2024 10:41:24 +0000 (UTC) Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C59DBD502; Sat, 20 Jan 2024 10:41:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747282; cv=none; b=O4bFDLIevcCHGDa7Kn0s/b9zk/Bb53JMixQbVzpYlvZnoEfAlnAEWeSYxmqtWdedgsyJjZPmUj2DySskLNJ1odue4qm5kt4HRtmhYQWfjYgb/vob3Du0z2A0dOylpq/dXRt/GMoSrCq/Ea7AqhlFCYs56rHGV2pEcVjuCGpz6rg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747282; c=relaxed/simple; bh=7f5Ea4YOXZsVcffF1Kp4uocWgltKhjuUuA7JtCWrFY0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BwR6oGid3Ec/6XM4Xtheoij7y78mzY/ShrmYP0+yA/rpBsf4OLbm0InE8LkxQJkrNqEGWYoQgStK5c15awTY8yQ65DJu90FCu+sh8wHaESnVF4cBFzETzOcfaEvYgtjLfR7NeWHCMzGLVEE2ObRpZjDhnzgiKUWchbt0eA/V7lY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4THCh75rjtz4f3l1m; Sat, 20 Jan 2024 18:41:11 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 05CBA1A0B44; Sat, 20 Jan 2024 18:41:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAn+RFKo6tlY4mmBQ--.38494S7; Sat, 20 Jan 2024 18:41:17 +0800 (CST) From: Yu Kuai To: mpatocka@redhat.com, dm-devel@lists.linux.dev, msnitzer@redhat.com, heinzm@redhat.com, song@kernel.org, yukuai3@huawei.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH 3/5] md: make sure md_do_sync() will set MD_RECOVERY_DONE Date: Sat, 20 Jan 2024 18:37:32 +0800 Message-Id: <20240120103734.4155446-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240120103734.4155446-1-yukuai1@huaweicloud.com> References: <20240120103734.4155446-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAn+RFKo6tlY4mmBQ--.38494S7 X-Coremail-Antispam: 1UD129KBjvJXoW7WF48JF18KF45Gw4rCFy7GFg_yoW8Ar1kpa ykGF9IvrW8ArW3urW2qa4DXa45Aw1Ivry3CFyfuas8AF1fta1akFW5uF1UXaykta4fJayY va15JF9xZF95C3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04 v7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbJ73DUUUUU= = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788605715655095181 X-GMAIL-MSGID: 1788605715655095181 From: Yu Kuai stop_sync_thread() will interrupt md_do_sync(), and md_do_sync() must set MD_RECOVERY_DONE, so that follow up md_check_recovery() will unregister sync_thread, clear MD_RECOVERY_RUNNING and wake up stop_sync_thread(). Before this patch, if MD_RECOVERY_WAIT is set or the array is read-only, md_do_sync() will return without setting MD_RECOVERY_DONE, hence use stop_sync_thread() directly will hang because md_check_recovery() can't clear MD_RECOVERY_RUNNING, which is possible for dm-raid. Signed-off-by: Yu Kuai --- drivers/md/md.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 6906d023f1d6..ba45c7be3dbe 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8788,12 +8788,13 @@ void md_do_sync(struct md_thread *thread) int ret; /* just incase thread restarts... */ - if (test_bit(MD_RECOVERY_DONE, &mddev->recovery) || - test_bit(MD_RECOVERY_WAIT, &mddev->recovery)) + if (test_bit(MD_RECOVERY_DONE, &mddev->recovery)) return; - if (!md_is_rdwr(mddev)) {/* never try to sync a read-only array */ + + if (test_bit(MD_RECOVERY_WAIT, &mddev->recovery) || + !md_is_rdwr(mddev)) {/* never try to sync a read-only array */ set_bit(MD_RECOVERY_INTR, &mddev->recovery); - return; + goto out; } if (mddev_is_clustered(mddev)) { @@ -9171,6 +9172,7 @@ void md_do_sync(struct md_thread *thread) mddev->array_sectors); } +out: spin_lock(&mddev->lock); if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) { /* We completed so min/max setting can be forgotten if used. */ From patchwork Sat Jan 20 10:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 189734 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp1547140dyb; Sat, 20 Jan 2024 02:44:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvkUipj4P5g9twMVW06C8cxCSUbsCxahHogOq7Te5r81TtQinCyqAVCoibSHWfInbMGM2J X-Received: by 2002:a05:6a20:1442:b0:19a:f4c9:5e96 with SMTP id a2-20020a056a20144200b0019af4c95e96mr1700786pzi.34.1705747464111; Sat, 20 Jan 2024 02:44:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705747464; cv=pass; d=google.com; s=arc-20160816; b=V0zCEc4ePBh06PAZ5DBcif1+VQxkUq0w3sBE2h4rSGMLnBlP/cVCCv3RCSpe17D2n8 xl6TlPft7Lsdboyy0hVESzcp2JIZJjbK6f0AzDfZG7dkxYlkPxMA9PG4qyIMc/9Hb8Ti wuZvYOhThaJz8Tn1TQ0rCIc2I/Xo592BGMUU91mw8GT3l0yvxTyVqg3CkCmwVyacvYCq RDBJoKrjdFTwwwRl8HYQwhY9negb6mYotzSIN2UsShYzzGeDiMM3/HiceUg5kY3jq52C sjnwNADwsGkDWkBNQmQjVWD5NNa5ytOFnTRF/nX97o3Lnep9e3ETydeQZxP70M+vKUKJ h4kw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=7BGSdJgIzYw2AJNqeHeKJz5N273teE6FaoJpJ0nWSQA=; fh=y2Ma2pP32dbTTwcFlrDJ//qG1pVVCx07l+xa/F5EZpc=; b=0IRzojEsnIM6Xa+6M+NeFPRPk0HTHqKXk4JZmC52mc6OUZuJRfdoIn4tvn/OgZ3a8Z ZCKZcjTBHK/5BNvklLEkzXoO7NTB3IshpXhWei20UrLYVNxqnrir7AhMRV+NsinyjmN9 xdH9DZ9eQVLjjFUqxjK+A6AyTwsaveoqOChA8dzRXw3XGa/30/lsYk5CoaS8RXDvgh0y eD9e/HciSTC/m+BPb+pUFPpuPIx361fCvZ4Gp8NLLxLCQASTlpDXt4AL0KsYMFBBEoe9 HSupoEuLLNfTAKhbctdstjMMsj8P51Ve1yKy334Ub0PTHmTe2hSRQbgt8K90ST4OxYlH UV6A== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31764-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31764-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id s123-20020a632c81000000b005ce24eeba8esi4730370pgs.552.2024.01.20.02.44.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 02:44:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31764-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31764-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31764-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 328EFB22693 for ; Sat, 20 Jan 2024 10:43:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E39E914A92; Sat, 20 Jan 2024 10:41:29 +0000 (UTC) Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB68F10A03; Sat, 20 Jan 2024 10:41:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747288; cv=none; b=uRU9FQWL2zKJrh1VdyKZVVGQFn/Z/Yp+hgJTo5wIDwiggwk7D0BYYZ9NGz6M9NrezDT2uKMyEanE89Jk/Mmak2oE8/MVTaRyxIWQIHgknMLMRF4CQh+0wD+SEN2csaN5LImn2neJ+jXnmMt5QZ3xKEnbR3OZEEHAOzFDghtHMR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747288; c=relaxed/simple; bh=3MODqV2PUrLDsdNPK/NCVS5UAxs9MVyQ33m5klLn2q8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uow2akqkB3pQX7ZseiEa3Rx5kSs8rjwkPZUm6pztAmtVUHrP/oV7JIA6o1FTPnQ9iUpczr2GhA24S5ixp60JMb00IRT2HD1OoCzdT7t/wG/5F1o6xzFADhss9x1g2d4snem1bUJYlS8TsUBQ7dF+hC27ZpBrp58LBR5LPpgYeVs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4THChB4kPyz4f3jsB; Sat, 20 Jan 2024 18:41:14 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 788371A0CBD; Sat, 20 Jan 2024 18:41:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAn+RFKo6tlY4mmBQ--.38494S8; Sat, 20 Jan 2024 18:41:18 +0800 (CST) From: Yu Kuai To: mpatocka@redhat.com, dm-devel@lists.linux.dev, msnitzer@redhat.com, heinzm@redhat.com, song@kernel.org, yukuai3@huawei.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH RFC 4/5] md: revert commit fa2bbff7b0b4 ("md: synchronize flush io with array reconfiguration") for dm-raid Date: Sat, 20 Jan 2024 18:37:33 +0800 Message-Id: <20240120103734.4155446-5-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240120103734.4155446-1-yukuai1@huaweicloud.com> References: <20240120103734.4155446-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAn+RFKo6tlY4mmBQ--.38494S8 X-Coremail-Antispam: 1UD129KBjvJXoW7WF47JrW5tr47GFyrWryUWrg_yoW8Xw4Upa yxXas8Ar4kXF98Gw4UJF4kXFyY9a4ktFWkKFW3Zw1jyF17Wr1kWw1akry8Xrnxur1fAw4D Zw4DJr1UJa4jkrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr 1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2 IY04v7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQSdkU UUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788605852901194781 X-GMAIL-MSGID: 1788605852901194781 From: Yu Kuai This commit is used to fix a problem for md/raid, due to rdev lifetime in conf is different from the array. However, on the one hand, the management of rdev is completely different from dm-raid; on the other hand, this commit breaks dm-raid and the test shell/integrity-caching.sh will hang. The root cause of the hang is still not clear yet, however, let's revert the commit for dm-raid to prevent regression first. We can decide what to do after figuring out the root cause. Fixes: fa2bbff7b0b4 ("md: synchronize flush io with array reconfiguration") 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 ba45c7be3dbe..7db749ba7e60 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -544,7 +544,8 @@ static void md_end_flush(struct bio *bio) if (atomic_dec_and_test(&mddev->flush_pending)) { /* The pair is percpu_ref_get() from md_flush_request() */ - percpu_ref_put(&mddev->active_io); + if (mddev->gendisk) + percpu_ref_put(&mddev->active_io); /* The pre-request flush has finished */ queue_work(md_wq, &mddev->flush_work); @@ -640,7 +641,8 @@ bool md_flush_request(struct mddev *mddev, struct bio *bio) * concurrently. */ WARN_ON(percpu_ref_is_zero(&mddev->active_io)); - percpu_ref_get(&mddev->active_io); + if (mddev->gendisk) + percpu_ref_get(&mddev->active_io); mddev->flush_bio = bio; bio = NULL; } From patchwork Sat Jan 20 10:37:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 189733 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp1546943dyb; Sat, 20 Jan 2024 02:43:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0IAL6+NS2cRC1Q3inDQSyUsQidMM+WxHlw7w2b8IlaHkNMe/Ue+S3Dsf7XHxPVYHGq4h4 X-Received: by 2002:a05:6a00:3a0c:b0:6da:ca92:3e2e with SMTP id fj12-20020a056a003a0c00b006daca923e2emr3330752pfb.7.1705747429189; Sat, 20 Jan 2024 02:43:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705747429; cv=pass; d=google.com; s=arc-20160816; b=a02Yw1DkNsOPcD3Waprznjf8FfH++9M24RJLKJo3RM3jp6ieuJXy5snhZQ3sRaBU4S z514LSf1VBrEiR68yp9J6LatarJGFOAWD8Z3G2+0NfxRdDnteo/wHSZoDjjFvONgQEJQ jRDfqOYpBnOu2Zkjbvlc59nP+WbJiuBmqgGSpodqXD3ZmRp3IJTWtmk0N3Y16Q96sAl+ C2T4zauDeK0M5WlaQu0LG3qN2KCxcEMo8VkhHBDBVUAN6l+Ne/+6P/kLrhMAI4n89Xe8 W1zDEMYIW6oo5SnGttg/icCI4GUUynuujnCqkLbaXaBm1tYDFnQuUDQ2LjwB9xjy8b6/ fmNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=J55X/o3qp8dvNiu9Ry884uFweEtuQY0vPCQbEunqmMU=; fh=y2Ma2pP32dbTTwcFlrDJ//qG1pVVCx07l+xa/F5EZpc=; b=NRqjGlCHiV6Ag9UXeRMEqeWCTYdjTjvb1W/AQS5MOyvklwo/7uw+Knu1DPkLu5xwDu wGk3emG8XWcp4iHnbeLiFZuZYg+rmkYh1G2F92PPw7zvk1T/pWHzF+/N5O2Qgtg1zjQ9 qwQQVWRijTERfXVNA3N64SOr3ky8T3AAPOCfScT3Do6QDOgoaO6caEAo7L59+2t7a/yR MgTBZVElZL3FCfkv/shPZiA4ParL7BIbdsypndk8AgYfhltF1fFCU9ADGFi24CM8f0zh JbGQPEUwbaZE9HE7kYVA8BVYsfckc1xkY2GskGS8eelwS0hvu8YdpYZxBwh8SHf1jtQa iNlw== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31765-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31765-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id c16-20020a056a00009000b006dbb2b6571asi3496440pfj.81.2024.01.20.02.43.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 02:43:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31765-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-kernel+bounces-31765-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31765-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E74132836A7 for ; Sat, 20 Jan 2024 10:43:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5CE7614F78; Sat, 20 Jan 2024 10:41:31 +0000 (UTC) Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61DF412B86; Sat, 20 Jan 2024 10:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747289; cv=none; b=FKsbrMRxQB6d+Uza2CJuNFdgL9+hdkPCaOaa0Plu5piRxWQqaJfg657UlMR43I26LoasVUdHbLjHVUlkRk4LOtyyuAxMJb73qB9614SZ/6Vpeyshz/T2BH/D0bcPjSqng5tByacCqNWhxiO1/GbZRbCOeLZX7S3B2dfbLLb1Bo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705747289; c=relaxed/simple; bh=vYtge49+SIPK2TMqk3PqdGYdBsr5TMvfVLJDD/vFH2A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uv8fEd0TgWjCJzkNH53aobzlt8gXoQ7EYr9f7SuXHroZArtJNLFhi7WgenGQLcnwZdbV498LN/2RmdG7e2+z7veUdW8gU1swX6CZWuGEVodCaPsvWqh2GRHTlrJp19KvA1dvv3S4Zs20RsU+WJj+XRmnerlL5TubKlm4nmmXpww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4THChC0zdZz4f3kG2; Sat, 20 Jan 2024 18:41:15 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id EBD201A0171; Sat, 20 Jan 2024 18:41:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgAn+RFKo6tlY4mmBQ--.38494S9; Sat, 20 Jan 2024 18:41:18 +0800 (CST) From: Yu Kuai To: mpatocka@redhat.com, dm-devel@lists.linux.dev, msnitzer@redhat.com, heinzm@redhat.com, song@kernel.org, yukuai3@huawei.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH RFC 5/5] md: use md_reap_sync_thread() directly for dm-raid Date: Sat, 20 Jan 2024 18:37:34 +0800 Message-Id: <20240120103734.4155446-6-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240120103734.4155446-1-yukuai1@huaweicloud.com> References: <20240120103734.4155446-1-yukuai1@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAn+RFKo6tlY4mmBQ--.38494S9 X-Coremail-Antispam: 1UD129KBjvJXoWrtr1UWw1xZFWUJw4kWryDJrb_yoW8JrWDp3 yfWFy5Cr15Crs7Ar17WFyDZFyrZw1S9rWqyr9xCay3Z3W5Jr47Cr1F9FyjgFyDuFWfJwsx XF4rJFWfCa48KrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2 kIc2xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUOBTY UUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788605816397316609 X-GMAIL-MSGID: 1788605816397316609 From: Yu Kuai Now that previous patch make sure that stop_sync_thread() can successfully stop sync_thread, and lvm2 tests won't hang anymore. However, the test lvconvert-raid-reshape.sh still fail and complain that ext4 is corrupted. The root cause is still not clear yet, however, let's convert dm-raid back to use md_reap_sync_thread() directly. This is not safe but at least there won't be new regressions. We can decide what to do after figuring out the root cause. Signed-off-by: Yu Kuai --- drivers/md/md.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/md/md.c b/drivers/md/md.c index 7db749ba7e60..3e8dd020bf9f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4909,6 +4909,14 @@ static void stop_sync_thread(struct mddev *mddev, bool locked, bool check_seq) if (work_pending(&mddev->sync_work)) flush_work(&mddev->sync_work); + if (!mddev->gendisk) { + mddev_lock_nointr(mddev); + md_reap_sync_thread(mddev); + if (!locked) + mddev_unlock(mddev); + return; + } + wait_event(resync_wait, !test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) || (check_seq && sync_seq != atomic_read(&mddev->sync_seq)));