Received: by 10.213.65.68 with SMTP id h4csp682462imn; Fri, 6 Apr 2018 07:14:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/gweHhT/S6UxVK7new3ReAsLDZxPihL7E3lvAMkqiJvnYj5mKG27X4HKHfyQ/Ue0LAqPQA X-Received: by 2002:a17:902:51ee:: with SMTP id y101-v6mr28195537plh.359.1523024095852; Fri, 06 Apr 2018 07:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523024095; cv=none; d=google.com; s=arc-20160816; b=1HJqH63mUHKAy5z/Cme1C5fklU2JaZT+ZAJpOkkuwlkNi1LsXX5TaIAjh7N5G2sRhK ROqA0k06/+0DUL1yn9Ez+ASh9t5FKBw7qZFKzxXHKI0zTYmrc0bQSY3MRMS58b+AJhIc lTm3PcaO2C5M1eHwLInzuJ/3f6q/n0cx0ejDvv90Qe4G9ocHQ9RRp87fe0Vo8DP5fzvK 2lqNmfPjHI47ZTDHRw6CCY7astvrTIgBRMkvEfz293/3MxIuS4jebPZEBuU69Vua1v8r gmVlszUWmbO/6oo27XFxOjukSxywlFjIc1PVDE2Eq33C/hq3bYxOyPhRgVLaC59gpuuH ssew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=DsP8SOmKF031kuIBqjX275AqRUZfifrUf0zBWllaxNM=; b=FU9lFiCEu72lR1ZhmT9SywMQoFG72RWE1CcxPPQm1Wm/tpxfESRU/n7uGtmqhuAM8M SLFUGEVMBOMUSQ7/WTzEm6MR/A3wWRs+P3bDLPVqLgAK6wsCQ6OTK2sQU+XjogHSvwYK HbwjyveDhv8YbJ1Z8f2w1oKn9oNkewItpKbBsrCi4hxgqBeKfXMZjOnpJMHYQNpkFj0D qa/M7D9DRZ+2cB13d7xMsumHjZkv+1fUwamM2Oo688M3CAfrXEX6bf1vEXt4KmgZQAWd HV/vurIOEdF3UFQOVtA7tdpGO8Ok996jFbF65nlDDvws1ZpSnd016zwZQ/i1OR758gtL eLhQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d13si7393915pgn.334.2018.04.06.07.14.42; Fri, 06 Apr 2018 07:14: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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932694AbeDFNjl (ORCPT + 99 others); Fri, 6 Apr 2018 09:39:41 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34740 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932608AbeDFNji (ORCPT ); Fri, 6 Apr 2018 09:39:38 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 7BF0FD0A; Fri, 6 Apr 2018 13:39:37 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Bo , David Sterba Subject: [PATCH 4.14 54/67] Btrfs: fix unexpected cow in run_delalloc_nocow Date: Fri, 6 Apr 2018 15:24:24 +0200 Message-Id: <20180406084347.892236354@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084341.225558262@linuxfoundation.org> References: <20180406084341.225558262@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu Bo commit 5811375325420052fcadd944792a416a43072b7f upstream. Fstests generic/475 provides a way to fail metadata reads while checking if checksum exists for the inode inside run_delalloc_nocow(), and csum_exist_in_range() interprets error (-EIO) as inode having checksum and makes its caller enter the cow path. In case of free space inode, this ends up with a warning in cow_file_range(). The same problem applies to btrfs_cross_ref_exist() since it may also read metadata in between. With this, run_delalloc_nocow() bails out when errors occur at the two places. cc: v2.6.28+ Fixes: 17d217fe970d ("Btrfs: fix nodatasum handling in balancing code") Signed-off-by: Liu Bo Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1257,6 +1257,8 @@ static noinline int csum_exist_in_range( list_del(&sums->list); kfree(sums); } + if (ret < 0) + return ret; return 1; } @@ -1389,10 +1391,23 @@ next_slot: goto out_check; if (btrfs_extent_readonly(fs_info, disk_bytenr)) goto out_check; - if (btrfs_cross_ref_exist(root, ino, - found_key.offset - - extent_offset, disk_bytenr)) + ret = btrfs_cross_ref_exist(root, ino, + found_key.offset - + extent_offset, disk_bytenr); + if (ret) { + /* + * ret could be -EIO if the above fails to read + * metadata. + */ + if (ret < 0) { + if (cow_start != (u64)-1) + cur_offset = cow_start; + goto error; + } + + WARN_ON_ONCE(nolock); goto out_check; + } disk_bytenr += extent_offset; disk_bytenr += cur_offset - found_key.offset; num_bytes = min(end + 1, extent_end) - cur_offset; @@ -1410,10 +1425,22 @@ next_slot: * this ensure that csum for a given extent are * either valid or do not exist. */ - if (csum_exist_in_range(fs_info, disk_bytenr, - num_bytes)) { + ret = csum_exist_in_range(fs_info, disk_bytenr, + num_bytes); + if (ret) { if (!nolock) btrfs_end_write_no_snapshotting(root); + + /* + * ret could be -EIO if the above fails to read + * metadata. + */ + if (ret < 0) { + if (cow_start != (u64)-1) + cur_offset = cow_start; + goto error; + } + WARN_ON_ONCE(nolock); goto out_check; } if (!btrfs_inc_nocow_writers(fs_info, disk_bytenr)) {