From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517181108-2-10705317717722865781 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181107; b=aP+1SPdKH5xyFLjx3isuxVq2II4ENm5KFyxqEmZZK+dCXGZ yZosqhFAKytX7/W1vRj3gAlLvKh4SgldTprEUznCruFzV3MBVm26WjceAwv+of8S cXDmIRe0u6qeLreAwK5j6jCupTTycpwLaF2J/LVZgzfFfjRI+/z8YQa+q4U1zy6z rExhWESSG6S42ccGR39JmqJRgFFr+hu24wAdKqxH7hOVlV7O8R6+3WIQnP1Zh40a iDYvh+RHXq2aXRur6d/ALPA/6MPCZhysYzuTibLmIpBZI7IvnLN+lDflxEq6IPgJ rJXYG1TlaHtSM75hGUGvafFDkcthPoAoPd5NdVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181107; bh=vA7L21 IXxyrjFPLP4RH1wAF1Sp79tYPUllhtWua+JEQ=; b=iIiZrzGryhnPjLn3WsIEDm tMTRK/SeN9MP0hjzf2OqTdMb5nt363xeYuhiC48Q38YwxycjcIib5jKJD/VG3MTc FW81jBzH+Zfuop1F1g0MYXrblHqMpbSh8mnDBRedUJKn7ZIG90mh8nxHhJB3AQJu Uy1BtYSiIXh509jKwNttgsh4gi1wLvicNrqNUKWe3TrBKkT+aftTdTfh4byPopqt 8BEHV+/WXUkvKs/iLavts48t2kDQsbSiijtKdbH7oFnn1tnGHhIMvoIoL3le2MSJ QHhRltus/VeOm73Xf7yA98klmy6spsT80WlS5NaE095jF3XG+dn+GQrfCjM4rDsw == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GO73Nv7I x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GO73Nv7I x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753658AbeA1XLV (ORCPT ); Sun, 28 Jan 2018 18:11:21 -0500 Received: from mail-by2nam03on0099.outbound.protection.outlook.com ([104.47.42.99]:57621 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752109AbeA1W05 (ORCPT ); Sun, 28 Jan 2018 17:26:57 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: bingjingc , Shaohua Li , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 036/100] md/raid5: correct degraded calculation in raid5_error Thread-Topic: [PATCH AUTOSEL for 4.14 036/100] md/raid5: correct degraded calculation in raid5_error Thread-Index: AQHTmIcGmMR4VHfZ9ESSKfk1/P5m9g== Date: Sun, 28 Jan 2018 22:26:21 +0000 Message-ID: <20180128222547.7398-36-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MWHSPR01MB344;7:06aKMEBXtzR9xhm9BHwIkL6StWFGwpw4sPjrlCV/ZO/y955AazXLXok0rgojE0ey1810os6kjM+pi/uFyfBwKer48rbGpV/aJJsu4GnYvJFJkT8wQLSagCUVYGgS5FyElIgOiNs1uWi8g0RfxWaZOOzJcOsBUGfobrMBpk+zvIT7o4P7kA63ydsUkHIofRjGaCM4PopWtZMLb2yR+YAHBjXHTY4i8vfjc4WN2U9uNPZdIpaTkpbBkxmdjfQwIxhd x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c91ce929-529f-4a26-44da-08d5669e3b07 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MWHSPR01MB344; x-ms-traffictypediagnostic: MWHSPR01MB344: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(67672495146484); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:MWHSPR01MB344;BCL:0;PCL:0;RULEID:;SRVR:MWHSPR01MB344; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(366004)(396003)(376002)(39380400002)(189003)(199004)(10090500001)(86362001)(36756003)(99286004)(2900100001)(6486002)(6512007)(7736002)(1076002)(6436002)(3846002)(76176011)(2906002)(8676002)(86612001)(81156014)(105586002)(316002)(5250100002)(81166006)(66066001)(102836004)(478600001)(3280700002)(6116002)(14454004)(2501003)(4326008)(110136005)(10290500003)(26005)(54906003)(107886003)(53936002)(6666003)(186003)(25786009)(59450400001)(68736007)(6506007)(305945005)(5660300001)(106356001)(22452003)(2950100002)(8936002)(97736004)(3660700001)(72206003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHSPR01MB344;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: dKP1CQkuQyFQiwjtPnCzF4VLJDaq2BL3zf6xiM3TXD69+xfyADDVF4b3EuZwVcBFSxY1iCit1H9GfWKeC6jpXA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c91ce929-529f-4a26-44da-08d5669e3b07 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:21.7992 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR01MB344 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: bingjingc [ Upstream commit aff69d89bdebc39235cddb4445371eb979b49685 ] When disk failure occurs on new disks for reshape, mddev->degraded is not calculated correctly. Faulty bit of the failure device is not set before raid5_calc_degraded(conf). mdadm --create /dev/md0 --level=3D5 --raid-devices=3D3 /dev/loop[012] mdadm /dev/md0 -a /dev/loop3 mdadm /dev/md0 --grow -n4 mdadm /dev/md0 -f /dev/loop3 # simulating disk failure cat /sys/block/md0/md/degraded # it outputs 0, but it should be 1. However, mdadm -D /dev/md0 will show that it is degraded. It's a bug. It can be fixed by moving the resources raid5_calc_degraded() depends on before it. Reported-by: Roy Chung Reviewed-by: Alex Wu Signed-off-by: BingJing Chang Signed-off-by: Shaohua Li Signed-off-by: Sasha Levin --- drivers/md/raid5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index c406f16f5295..7ec822ced80b 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2678,13 +2678,13 @@ static void raid5_error(struct mddev *mddev, struct= md_rdev *rdev) pr_debug("raid456: error called\n"); =20 spin_lock_irqsave(&conf->device_lock, flags); + set_bit(Faulty, &rdev->flags); clear_bit(In_sync, &rdev->flags); mddev->degraded =3D raid5_calc_degraded(conf); spin_unlock_irqrestore(&conf->device_lock, flags); set_bit(MD_RECOVERY_INTR, &mddev->recovery); =20 set_bit(Blocked, &rdev->flags); - set_bit(Faulty, &rdev->flags); set_mask_bits(&mddev->sb_flags, 0, BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING)); pr_crit("md/raid:%s: Disk failure on %s, disabling device.\n" --=20 2.11.0