Received: by 2002:a05:7412:bbc7:b0:fc:a2b0:25d7 with SMTP id kh7csp2907929rdb; Tue, 6 Feb 2024 01:02:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQHgrKhqsulVYv3F7faIzDpfeLxYvNx4/v6+N9cjtKIzxtpT6v4sDSx41+Bd/53yLoYXBB X-Received: by 2002:a17:90a:ea14:b0:296:36d7:b366 with SMTP id w20-20020a17090aea1400b0029636d7b366mr1919155pjy.13.1707210135839; Tue, 06 Feb 2024 01:02:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707210135; cv=pass; d=google.com; s=arc-20160816; b=I+IA5eVSLQ1N69agGX5hdOhM5XEI+Suhh7tleapX7EMVaracE98Ahsx+4MM0UJVysO u4eWw/Ox1SbhVhF4629ySTh23A9arULRkcBsqVkv6ab/gzxrF71d876bfB19OUE0Mho5 8WEykiQifG3vKARVPSyp/bKVMbHBJ1uWRELrIpOZQzajEbylYZyrH3ASTjsTMhK7SivT H39J8+KeLbgsTJCRXCHhAASxQYx6/cEds+jfcUCOqQ5Pie+2OlDajPqF5r2yu//x1+xl zWGswS4B9SjZ0B9sxPrGkIwCUu4OVCHMPQzPQihAEenawlq9cG/x+kjxkoYa/0otgUIw QLww== 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=RXg3Ppcvq+Bb3hj6RdTsco9vbekBo7y2UqPplK/Rc2g=; fh=3EfTSj683qlmd4hrk4K+Ss0l5ZQdzv29Z6FO+44H5qU=; b=0hx0C3OyRHcWp4tzfLbPKh1uvSduCfISDfV3YqlnRWEyINBGXrSIjWEJbKyHGVhduJ ZF1jH+G6iY8e+1X9zFukUbMohTf3+U7uhy8LHV5ZcZ/2ICfd6HaoeEJamk4IVzhJNmdU Sv9sSlP4BPcrKalTw/f3FCKkOxo1y862YQW3KIaTTmMofYLtvVlguCujrnPQFkX4EAtg PbvshDEQMtfbRd+J/BgGZIPLc8Tuq/IdUPCxhIPuTXtjAvEni1Xfl/llSti6Tk53E6Lt V9yECtjtkDqrRmq1RKecdtcOTPfOqd/IQD43wo9mXAC8nOMuIjZfXQo++obZRdiRPIW8 dXwg==; 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-54548-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54548-linux.lists.archive=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCWc0DljGpfIaYzw+G8lsEuEGaYHdaewf0hf0LbCu8FeJ6cmqBpPx5gE0f/ActU/ctNHCzJQx4l3H25SJfPoLy/H+E7yq+WdCI3JwDnXLw== Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t9-20020a17090a0d0900b002960eb26889si791198pja.185.2024.02.06.01.02.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 01:02:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54548-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-54548-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54548-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 E3B9A28356B for ; Tue, 6 Feb 2024 09:01:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D16C12D759; Tue, 6 Feb 2024 09:00:01 +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 06C3212D15F; Tue, 6 Feb 2024 08:59:57 +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=1707210000; cv=none; b=OQ3IsrmUkh54cCzAiYDXcm2KsCagk5fAM00iDdRHC2JDa8lAkcAEiPPtMIgWsTpLDnyXH4JAYEJpIkUVbLJo1fKgsaZKg5zTWXohveVVTZeEb/U4CFgwRoytCj/qXcXidq3DkSGRDve24pgwd6LFPm+NPMRVTw+FBAEKb+AT0Rk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707210000; c=relaxed/simple; bh=MqM+wcbxq9vaxTluNjoJmJiRysA3/+CUnbH5KNM18FA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ThV2PzrGrmNG27egCthhlOlajIz7kX9LcDsLunO8h4deJWy9jd1cGULE+gdrBsJFFssYO9cb1YokTrZ6rC6hjukwA46DSVlo6W7W4v4Du3+mI1+rX61QrtUL/D6VIj3mqrUMDZc6ej4uGdAbRibNonOlpwFUXpTi5R8VA3yJXPI= 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 4TTcdL2jGFz4f3kj7; Tue, 6 Feb 2024 16:59:50 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id C60F21A027B; Tue, 6 Feb 2024 16:59:54 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP1 (Coremail) with SMTP id cCh0CgCXaBEG9cFldA+QDA--.34552S9; Tue, 06 Feb 2024 16:59:54 +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 5/9] md: Don't clear MD_CLOSING when the raid is about to stop Date: Tue, 6 Feb 2024 16:55:07 +0800 Message-Id: <20240206085511.2841555-6-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--.34552S9 X-Coremail-Antispam: 1UD129KBjvJXoW7Cw13Zr18XryUAw4DCFy5CFg_yoW8Zry7pa 1IgFy5KryUGr9I9w4Utw1kWa4FqrySqrWvyry2va4rWa4UAry7Jr9Yg3yDCr1kGFZ5AFs8 X3WUXayUWw18W3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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 The raid should not be opened anymore when it is about to be stopped. However, other processes can open it again if the flag MD_CLOSING is cleared before exiting. From now on, this flag will not be cleared when the raid will be stopped. Fixes: 065e519e71b2 ("md: MD_CLOSING needs to be cleared after called md_set_readonly or do_md_stop") Signed-off-by: Li Nan Reviewed-by: Yu Kuai --- drivers/md/md.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 02d6197dc944..c72af9fa3d7f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6247,7 +6247,15 @@ static void md_clean(struct mddev *mddev) mddev->persistent = 0; mddev->level = LEVEL_NONE; mddev->clevel[0] = 0; - mddev->flags = 0; + /* + * Don't clear MD_CLOSING, or mddev can be opened again. + * 'hold_active != 0' means mddev is still in the creation + * process and will be used later. + */ + if (mddev->hold_active) + mddev->flags = 0; + else + mddev->flags &= BIT_ULL_MASK(MD_CLOSING); mddev->sb_flags = 0; mddev->ro = MD_RDWR; mddev->metadata_type[0] = 0; @@ -7626,7 +7634,6 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode, int err = 0; void __user *argp = (void __user *)arg; struct mddev *mddev = NULL; - bool did_set_md_closing = false; err = md_ioctl_valid(cmd); if (err) @@ -7683,7 +7690,6 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode, mutex_unlock(&mddev->open_mutex); return -EBUSY; } - did_set_md_closing = true; mutex_unlock(&mddev->open_mutex); sync_blockdev(bdev); } @@ -7825,7 +7831,7 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode, mddev_unlock(mddev); out: - if(did_set_md_closing) + if (cmd == STOP_ARRAY_RO || (err && cmd == STOP_ARRAY)) clear_bit(MD_CLOSING, &mddev->flags); return err; } -- 2.39.2