Received: by 2002:a05:7412:bbc7:b0:fc:a2b0:25d7 with SMTP id kh7csp2908226rdb; Tue, 6 Feb 2024 01:02:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJrCCs1/z+9M64Zi0otUKrNyWbihpWpmSsay1f8VoGJvFL6NgtPplxs2n/pK1u5HZ+L4+P X-Received: by 2002:a17:903:22c3:b0:1d8:b778:e9b0 with SMTP id y3-20020a17090322c300b001d8b778e9b0mr1376170plg.0.1707210167736; Tue, 06 Feb 2024 01:02:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707210167; cv=pass; d=google.com; s=arc-20160816; b=aSWE+i2MLhKowyzXko17v4zY0zmkbWqJQpuGS4Wzp18hfcoSvqUca2kOrOTPt5yBdZ 07zaEk2mw6CVm5uie6pTIACFDSajL/A3IWjZ46KkfNyhcCdCqUDkOyQU828XuzIAMFmj de+eKW6+bstBi9+uRMerYYTWYv/jgCb48adQnCiHBPSEzo6mcZjMQ7MzCH5m4W6lvvkR B+zeLhlIfHhxT/2mDMo9jd7rrW99x01B2sS7X4zk50QkxEZSICdiKhl+MTRKaIJQQ2qs LuMhFo4zqcnP9W9otxyYjjn77m1CmY5XpbKtcLlacYWV21jCpfj2NmInnBoz5qlOpivO FmYA== 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=R1u9CwxrykkLWW08C+o1hmxsbYNdoK3wKpbd0ATspfU=; fh=aX0IvPi7A+i71v43E6zpmbab11MYOqUQUTLkwT2AAyA=; b=toaGW0vzsMhr85Sm7DHvABojRrZyJPAmVpHsXQr/MHhzPZqiG2GrMtuSmI/+5AgSyC vOfjND5ejqyz/CEqp5gKS7QG7WX7lpC2nH3aLdHKNJo1HgKfKCEqY2ikiqI3WWQKpe2I tD/H20b9hIKYs2vwk1HHRfIgZUNxqquua2T13zc603C2QcdtTouHvyIBs0spKVhr7YUg 8eFbPoBehfKCPuiyleZBqmvDdxQtUqifE+oz87YZze+mMFiPAtYewkzGaqSS0tfr83uq hU5o18mC635P7cKjwOWqyAL0MxHR2HhfDaR47fSDigdoU4PlT6QdJ7NwjAg2mVEovO0j uAjA==; dara=google.com 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-54550-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54550-linux.lists.archive=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCVZ1RQYHHJc0bMJLo9g/Zr/JNYRECObquTiSLqn5ZdIUgjrNSL4PL5juphC1zv+K18SSAZ8zsh3M9cL2Dt+/jb7SXPmQAr1aNV/88lrgw== Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q18-20020a170902c9d200b001d767748d26si1276879pld.629.2024.02.06.01.02.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 01:02:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54550-linux.lists.archive=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-54550-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54550-linux.lists.archive=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 6E35828215A for ; Tue, 6 Feb 2024 09:02:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29CE912F38E; Tue, 6 Feb 2024 09:00:02 +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 B94AA12DDB5; Tue, 6 Feb 2024 08:59:59 +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=1707210001; cv=none; b=RJcVB9awvpS5mA49t7PeSiLNozBc6duKJB6GBkCiB573Wep+JRnc8QrgL6vwo69xIK0Bxq+hSGC3qq8tKJMJtB4pP6Ub9u4OPLdYmCq9HNAEmHTVoWm05c18qv82GEVFEOwFfAL0BiVYmDLWtwuYmZTL2tEmI3cfKlmv+kf86qg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707210001; c=relaxed/simple; bh=fWwIL/Q8L4FYo1qkuolCGdD3WsSnWTNkmVtKCEyL6vQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XpfjvRPU1M61ZGo4o6+db4oH8sVX7sDtdPxrkgxsH8lKqk0bj/QB9VzB4JF4aqZg95rF3EfMomF2McrAJe9Rdd8nrCVrSBZD7W2rOpMvJ4j1IE579w5fnCx+gxLH+0UfY1AqyrKvWo5bkY7H+RcUhmfMtuOKaoEFElVXMaUXnKo= 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.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4TTcdM1ywGz4f3kjB; Tue, 6 Feb 2024 16:59:51 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id ACDC11A0232; Tue, 6 Feb 2024 16:59:55 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgCXaBEG9cFldA+QDA--.34552S11; Tue, 06 Feb 2024 16:59:55 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, mariusz.tkaczyk@linux.intel.com, shli@fb.com, neilb@suse.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, linan666@huaweicloud.com, yukuai3@huawei.com, yi.zhang@huawei.com, houtao1@huawei.com, yangerkun@huawei.com Subject: [PATCH v6 7/9] md: sync blockdev before stopping raid or setting readonly Date: Tue, 6 Feb 2024 16:55:09 +0800 Message-Id: <20240206085511.2841555-8-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240206085511.2841555-1-linan666@huaweicloud.com> References: <20240206085511.2841555-1-linan666@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgCXaBEG9cFldA+QDA--.34552S11 X-Coremail-Antispam: 1UD129KBjvJXoW7Cw4UuryxXry8Xw43tFW5KFg_yoW8XrWfpF s2yr15Wr1Ut34ftw43ua1kGa45Wa4xtrWDKry3Z34kZFy7AwnxGFZYgFWYvryDK34fGFW3 tw4UJFn8Wa4xtFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwACI402YVCY1x02628vn2kIc2xKxwAKzVCY07xG64k0F24l42xK82IYc2Ij64vIr41l 4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67 AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8I cVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4 v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AK xVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbxR67UUUUU== X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ From: Li Nan Commit a05b7ea03d72 ("md: avoid crash when stopping md array races with closing other open fds.") added sync_block before stopping raid and setting readonly. Later in commit 260fa034ef7a ("md: avoid deadlock when dirty buffers during md_stop.") it is moved to ioctl. array_state_store() was ignored. Add sync blockdev to array_state_store() now. Signed-off-by: Li Nan --- drivers/md/md.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/md/md.c b/drivers/md/md.c index 04826431d3c6..200410a8adf3 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4493,6 +4493,17 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len) case broken: /* cannot be set */ case bad_word: return -EINVAL; + case clear: + case readonly: + case inactive: + case read_auto: + if (!mddev->pers || !md_is_rdwr(mddev)) + break; + /* write sysfs will not open mddev and opener should be 0 */ + err = mddev_set_closing_and_sync_blockdev(mddev, 0); + if (err) + return err; + break; default: break; } @@ -4592,6 +4603,11 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len) sysfs_notify_dirent_safe(mddev->sysfs_state); } mddev_unlock(mddev); + + if (st == readonly || st == read_auto || st == inactive || + (err && st == clear)) + clear_bit(MD_CLOSING, &mddev->flags); + return err ?: len; } static struct md_sysfs_entry md_array_state = -- 2.39.2