Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3035925ybj; Mon, 23 Sep 2019 13:38:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfvxutI8a1GlDu8NzdtNpbsv5RT+nAeBnNIY9dVHra/M+WhGYwWNVZS/h9iqvpKD7hL5iv X-Received: by 2002:aa7:dcd7:: with SMTP id w23mr2106772edu.170.1569271135967; Mon, 23 Sep 2019 13:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569271135; cv=none; d=google.com; s=arc-20160816; b=YwlnIvk3Grip3g+sc62/iLJqTT05qqRcgCFdEnUffLwYLhR5X5DvhzmV4t1aultMUg rZd1dY1uoW5U/ENL/XqzlE9R+z6iYnYEN1usbObmWwtQ9QZK3Vhu0tD7oB3L5KcZJ6XU mzZnEGbOtTQtL2SWpO3PlWx3bGXd6DqSA5brfrARJrGLtzPplaZpT92VkI83/cAW8ali Ie8A5oPplk5O7j4GutzLstXb6mnFqM21c1sPd1aNdVQqSHdhM2ilAdWiOJF5wAtizR4S BUXB6aRLvmAHUmMFT7E6wV6eQ44Yp7HWvK7s4APz2UQvd6mx5SwqGzCeGCG24HNuDwWP HOZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZJiUrcx1QTUfqIaJqT+AKJGsxewdsbOifxsrAY/3d6M=; b=czOgbA7eU+uhVjlPsqU8kacwMM6S/preBvroWHDYx5ffc6CAc0xKxdhmIwWmeaxAgt tHYCWOvGMT4Zz3LC7W8wqmez8/7Gt65j1v42zTTYj3VnjzViG567MKuxljbPnyRbQ66O 3q2RPnwBoEM0U08e13MDbkL2E1LNGZ74Yv8Yx5jatiZX/ixUKXl2Y7k8NQtSqyooSdIY aLFQKpuu8Kg8yzjTdmDnGxEWOMCvC2PCtt5rd5hV0dciIpCSVFesAlhVji9NiqsRMHh6 9PGzgAw47Km6vZd88rMUc5I2CNiKNMUdB063qNkJ+JrCje1Lib543SS3P9B/x6VIo+9h kFaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fUeE8JkT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7si5434399eja.377.2019.09.23.13.38.31; Mon, 23 Sep 2019 13:38:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fUeE8JkT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389563AbfIVSpt (ORCPT + 99 others); Sun, 22 Sep 2019 14:45:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:41470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389398AbfIVSpo (ORCPT ); Sun, 22 Sep 2019 14:45:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 32BAC20882; Sun, 22 Sep 2019 18:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177943; bh=/SiC1b9j8s5dkXxghdD5HO3MXsCZs6ZS7C/TYS9uG9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUeE8JkTa27ZSJJLJ3tK2Qch/dViW9DVQJlBPKu2XB/6u+IFZedKlsLwTrmL2+jIE EHh6H70SeN5oAriuy4skaGH9VNQ+t29I9mIuC26puB8Boxdio5lSvIhFpWldN9yTKI 8UtPQhncAsBGkcHfZbOEoH1/muVIPzcS/tkPL3RM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guoqing Jiang , Guoqing Jiang , Song Liu , Sasha Levin , linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 052/203] md: don't set In_sync if array is frozen Date: Sun, 22 Sep 2019 14:41:18 -0400 Message-Id: <20190922184350.30563-52-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guoqing Jiang [ Upstream commit 062f5b2ae12a153644c765e7ba3b0f825427be1d ] When a disk is added to array, the following path is called in mdadm. Manage_subdevs -> sysfs_freeze_array -> Manage_add -> sysfs_set_str(&info, NULL, "sync_action","idle") Then from kernel side, Manage_add invokes the path (add_new_disk -> validate_super = super_1_validate) to set In_sync flag. Since In_sync means "device is in_sync with rest of array", and the new added disk need to resync thread to help the synchronization of data. And md_reap_sync_thread would call spare_active to set In_sync for the new added disk finally. So don't set In_sync if array is in frozen. Signed-off-by: Guoqing Jiang Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/md.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index fd62be3ca2871..232ea1f519963 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1826,8 +1826,15 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) if (!(le32_to_cpu(sb->feature_map) & MD_FEATURE_RECOVERY_BITMAP)) rdev->saved_raid_disk = -1; - } else - set_bit(In_sync, &rdev->flags); + } else { + /* + * If the array is FROZEN, then the device can't + * be in_sync with rest of array. + */ + if (!test_bit(MD_RECOVERY_FROZEN, + &mddev->recovery)) + set_bit(In_sync, &rdev->flags); + } rdev->raid_disk = role; break; } -- 2.20.1