From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3878504-1523240746-2-5975018178783090216 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.25, MAILING_LIST_MULTI -1, 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=fm2; t= 1523240746; b=uPDeVOn4GeAFOkdkzA80H/zmbb53UCCkDSZx/2+MwY9oiJ6kbF 3pGEIVg/Y7lHMJyvkRoCkErgl9m1pAp3PU4z2W8m0bQ5veuBoRAPMJCCrjLovc9X pBgjCq/LyNc94xCpsWRidcByI+JFc1UBI4Jxp14QKsg7y6GtYaLCGFR1GJJkxn5y 6Ab7ARxtTc41R1ea3hpy/6A2kmTcMuxTbZcW/K56CtCVtIyh5SPH8DXe3jWI1RrQ YjTm8qcxJeXxQEWucLiQHhClWPHTdYKJxGTVcE2gTD6Kcgzwi1+o8uIvpePMdF3W NNIG1KN/xpWefyJ0QW+bAhZmo1uwj90BWGPg== 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=fm2; t=1523240746; bh=7VWd73XQpB QDu/EVJWwpqc+rCfDc+OUElosnKci1iHA=; b=Rsyk5BQ7VjLuB7rko16mCbOfl4 GAVmqYGwbHugClE8BU7yWSGM1AAoT8g8Ty8v4R6nUKHn4L2sVcbKpcK9JDvyFR1v 1D4rKO+4zr/VPb0dR1uugD9MBnPaJjD33ifkfTnEQ2miP1tQAIkK69gwrCa0KZ57 9Jg/qTnEKsCkg5BN/zKYlDsmz/eeYaB7c/5DHrEPkfcTMa8bpjQoMxbSVjLb5pRg p9c6w6VJd+9IgBNB3NERfu6/pyp04t+/YDg1qBrxm2wlRSlCsLWdq+FUcXYT5uhH MVLjjjCG4oAedc2Qwwtgn6BWDjWV79GdvemI7mlWfoE8WYxVTe80c6BN1FFQ== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=gtw41OrS 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-cm=none score=0; 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; x-vs=clean score=-100 state=0 Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=gtw41OrS 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-cm=none score=0; 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; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfHIojSMGq1oy1QhejNtC4TiltZWavp0P3pPKr8I4YYGyjGhdulLrhgboCW3iVor6m4aFT9TtLY32UIFXovvOs4NDlLRRS6+uQ3JGFsdTgoQCzW4fUdnN UrWYt3zvGticzvB9W7VCBMJwQWBIagEI+gFtPXa1t0osHoDGgMti0Hs60P6OK5S8LQcidwa3mXheTSZ9IYgPyvrcaSqaJNd4ZI6MJhKQAXOsR0hWA7bxJO/O X-CM-Analysis: v=2.3 cv=Tq3Iegfh c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=yPCof4ZbAAAA:8 a=iox4zFpeAAAA:8 a=yMhMjlubAAAA:8 a=sLElGgjd5OrDGVp6BKMA:9 a=NK6uLVygNTIT7gyA:21 a=UcunAN-FmZF65z0e:21 a=wPNLvfGTeEIA:10 a=WzC6qhA0u3u7Ye7llzcV:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755944AbeDIA3O (ORCPT ); Sun, 8 Apr 2018 20:29:14 -0400 Received: from mail-by2nam03on0120.outbound.protection.outlook.com ([104.47.42.120]:61603 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754269AbeDIA3K (ORCPT ); Sun, 8 Apr 2018 20:29:10 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Liu Bo , David Sterba , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 093/293] Btrfs: tolerate errors if we have retried successfully Thread-Topic: [PATCH AUTOSEL for 4.9 093/293] Btrfs: tolerate errors if we have retried successfully Thread-Index: AQHTz5kSX3tmU6dfYUOkJ9KDKtoXoQ== Date: Mon, 9 Apr 2018 00:24:06 +0000 Message-ID: <20180409002239.163177-93-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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;DM5PR2101MB0967;7:irv8cls0BHTnFOMYCz6YY4er8xdrSgJ+T3xs7oJTZogUT0OTMt+cpjOcPmPxBlPqhaGZkqIX6b7rwg0oPtWq+H+LXBq/cpd0IdWoMWM0KVP8tz4i/BBpWKOReuFdtyzeoDXPs6AROyHScsZeGKH8iz/+PyFW7YDci3GGCMfsBIdzaje7XKqyJbl9Ft8daQZEPCk2yQzbd2OrvZn6Uz2952t99lg9GB7ytJ3UOcUrIkFYI5DPcGrEMc5aVtOV7WDo;20:Kyae2uQAivZaOT7Q0Agz4rEC1hZ7N1r9EkNohGuIBXNc8wyNGxipxYE/Uh7PX3qV558nWLYSs54/FQ6kRfRkrXnKwb5SOmfRvFxEiyLMSe29mTR47rBVqXtHn6d5m04+3niX6USthqcPoFn7Q4wKvpUjdmsylTkujpVJCp/MdBI= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 0061c55d-07f0-4689-5eac-08d59db0e8d6 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0967; x-ms-traffictypediagnostic: DM5PR2101MB0967: 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)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB0967;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0967; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(366004)(376002)(39380400002)(346002)(199004)(189003)(6506007)(486006)(86362001)(14454004)(59450400001)(68736007)(102836004)(99286004)(26005)(3846002)(6116002)(186003)(476003)(2616005)(1076002)(3280700002)(86612001)(72206003)(4326008)(446003)(54906003)(76176011)(11346002)(2906002)(22452003)(3660700001)(110136005)(97736004)(316002)(5660300001)(478600001)(8676002)(6512007)(8936002)(107886003)(6486002)(53936002)(81166006)(36756003)(81156014)(10290500003)(6436002)(10090500001)(25786009)(66066001)(106356001)(305945005)(7736002)(2501003)(5250100002)(105586002)(2900100001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0967;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: WQRhQGiuvgdqOXqrfG0m4g5ZFskQxNDGKH7AzIKVgbAU6UTiUfJ5/9dkUS7sqbOdJJHLmANiVuipdXk5CYNO09pfjtdN5dquzDHmRDUhSzN/pNIXV9zC5hsEpAw4AmnXdicwVvz2mx+hz6HxYjsXS43TynG2q1v99McAIj6s6ZM5KpG4GGyT9NoTTSVQmB9fVf3ehuo5CgS72k+BgNVZib2OIhNzpVTTtV+dXLd1ahP2OJGpw8ElLKnyPKbX0v7+HiZCBct/HglAw9MfndFvmpmNNRqwd32gIcfBzh4xatKZAaPpsdeIrd0c9TDhwX7yD7iWJCOglDWg8vkiqy+Mmpmg/nEVPpLh3GM8zfo3yAgT0ZQWntwiylKc+VHIAQZ8ZLuVw2XT1thFVKAhx6wHjLRGCFoUo1eYma+kVoi7a94= 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: 0061c55d-07f0-4689-5eac-08d59db0e8d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:06.6593 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0967 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: Liu Bo [ Upstream commit e3d37faba2eb19a1d459917bbf54ac1c65711510 ] With raid1 profile, dio read isn't tolerating IO errors if read length is less than the stripe length (64K). Our bio didn't get split in btrfs_submit_direct_hook() if (dip->flags & BTRFS_DIO_ORIG_BIO_SUBMITTED) is true and that happens when the read length is less than 64k. In this case, if the underlying device returns error somehow, bio->bi_error has recorded that error. If we could recover the correct data from another copy in profile raid1/10/= 5/6, with btrfs_subio_endio_read() returning 0, bio would have the correct data = in its vector, but bio->bi_error is not updated accordingly so that the follow= ing dio_end_io(dio_bio, bio->bi_error) makes directIO think this read has faile= d. This fixes the problem by setting bio's error to 0 if a good copy has been found. Signed-off-by: Liu Bo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/inode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index ffd5831ca15c..389ffaff72bf 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8219,8 +8219,11 @@ static void btrfs_endio_direct_read(struct bio *bio) struct btrfs_io_bio *io_bio =3D btrfs_io_bio(bio); int err =3D bio->bi_error; =20 - if (dip->flags & BTRFS_DIO_ORIG_BIO_SUBMITTED) + if (dip->flags & BTRFS_DIO_ORIG_BIO_SUBMITTED) { err =3D btrfs_subio_endio_read(inode, io_bio, err); + if (!err) + bio->bi_error =3D 0; + } =20 unlock_extent(&BTRFS_I(inode)->io_tree, dip->logical_offset, dip->logical_offset + dip->bytes - 1); --=20 2.15.1