Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp280379ybi; Wed, 29 May 2019 21:17:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyENywcE0Zox9DOQxRwzyDbdIEL7TadtRfAMP6HPtUoGz9WD051Tscd85DCxe90tqKYkGdX X-Received: by 2002:a17:902:a70f:: with SMTP id w15mr1910475plq.222.1559189833835; Wed, 29 May 2019 21:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559189833; cv=none; d=google.com; s=arc-20160816; b=f/XmMtaEUhZbytYSNib3xXM3fzxMPpdtR1Z8x8C62DYJIYJmh/fTdAAFHyyvf/E5Mp DUnlYxg0yN/oGgK64VpOb3XKl/EFBotgszLU50Ca0NDqHaZT4FKsywnTIKAlA8QO+dPS /+khx7fsmD3m1eghYr1ywh3EKRD2Lnzy6vVQWBoaa2vxQrZPkQq0jUIr3a91oUoc7gT4 cHrutaBTugvx02Gi437hheJ1lqUviTgFdJktt06MDRYnciWTJVmQXM+DPrIGMhJ8NwBc a2Qtrg3zszRtLeKF14cSEov16wyemQFfImrEhrwdeW4x/hWVVnmt9Y4vyg2kFBKvSA+n BXxg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=457wqwyudVXRt5x9wzt+6GbkHP2tLdsAzyBebBxMecI=; b=hoqwIuIIbe8JKFSvE+yIEOb4nqRUIyvNZAFyHOQd10Gkr3ERkvg6wO0AN1XUB++XYk wpVcxXyYraPwCGYyy3KtlItvbNW3DdPQTv1BulftNatl0vBAZyK9jD1xBlVsDS9WK6Rd 20OaRE4BCFtXQsLlW0s/+6ABPVWMSTwe9l1TWlqt/Jh3/aAqfX3gvZlHRpjV3e4pOTQZ pC027IgCw9ib+7k8jYnYpFr/pRz4mDo3V3ma5UgG7/QmzYfBqsymmzjcTtemf/sXy4fF Fln8ZSjmmw83/Es2jaD+/v5c6owdraaNhLw1ohbF2vW8kQuCvIu2TLY0YNgLiPxKZ6iY cQJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nC2VoI3q; 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 1si2218729plz.168.2019.05.29.21.16.58; Wed, 29 May 2019 21:17:13 -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=nC2VoI3q; 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 S1729575AbfE3EOz (ORCPT + 99 others); Thu, 30 May 2019 00:14:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:41138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730591AbfE3DQH (ORCPT ); Wed, 29 May 2019 23:16:07 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6DEB1245AF; Thu, 30 May 2019 03:16:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186166; bh=irsuCSjqH9Xp7SJpFQA1MXvfKEAZZxM4R5/EeSWs8qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nC2VoI3qEqYlEc+UuQXEo8tDfvXH26UAAUgGrp0Wix6Zp3cqU9/61BKDCSQNdPi2a 8lLJKsFCzx9HJWugrPc39Z+yyGCUp8m2+OKmRQEpOpXumDBQjYQ7CHAbIw4ijVNcaU hZxygSNwkztVvxdxBrO+Y0K3m+NqXN1Clhm74lkw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Filipe Manana , David Sterba Subject: [PATCH 4.19 019/276] Btrfs: avoid fallback to transaction commit during fsync of files with holes Date: Wed, 29 May 2019 20:02:57 -0700 Message-Id: <20190530030525.240003863@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Filipe Manana commit ebb929060aeb162417b4c1307e63daee47b208d9 upstream. When we are doing a full fsync (bit BTRFS_INODE_NEEDS_FULL_SYNC set) of a file that has holes and has file extent items spanning two or more leafs, we can end up falling to back to a full transaction commit due to a logic bug that leads to failure to insert a duplicate file extent item that is meant to represent a hole between the last file extent item of a leaf and the first file extent item in the next leaf. The failure (EEXIST error) leads to a transaction commit (as most errors when logging an inode do). For example, we have the two following leafs: Leaf N: ----------------------------------------------- | ..., ..., ..., (257, FILE_EXTENT_ITEM, 64K) | ----------------------------------------------- The file extent item at the end of leaf N has a length of 4Kb, representing the file range from 64K to 68K - 1. Leaf N + 1: ----------------------------------------------- | (257, FILE_EXTENT_ITEM, 72K), ..., ..., ... | ----------------------------------------------- The file extent item at the first slot of leaf N + 1 has a length of 4Kb too, representing the file range from 72K to 76K - 1. During the full fsync path, when we are at tree-log.c:copy_items() with leaf N as a parameter, after processing the last file extent item, that represents the extent at offset 64K, we take a look at the first file extent item at the next leaf (leaf N + 1), and notice there's a 4K hole between the two extents, and therefore we insert a file extent item representing that hole, starting at file offset 68K and ending at offset 72K - 1. However we don't update the value of *last_extent, which is used to represent the end offset (plus 1, non-inclusive end) of the last file extent item inserted in the log, so it stays with a value of 68K and not with a value of 72K. Then, when copy_items() is called for leaf N + 1, because the value of *last_extent is smaller then the offset of the first extent item in the leaf (68K < 72K), we look at the last file extent item in the previous leaf (leaf N) and see it there's a 4K gap between it and our first file extent item (again, 68K < 72K), so we decide to insert a file extent item representing the hole, starting at file offset 68K and ending at offset 72K - 1, this insertion will fail with -EEXIST being returned from btrfs_insert_file_extent() because we already inserted a file extent item representing a hole for this offset (68K) in the previous call to copy_items(), when processing leaf N. The -EEXIST error gets propagated to the fsync callback, btrfs_sync_file(), which falls back to a full transaction commit. Fix this by adjusting *last_extent after inserting a hole when we had to look at the next leaf. Fixes: 4ee3fad34a9c ("Btrfs: fix fsync after hole punching when using no-holes feature") Cc: stable@vger.kernel.org # 4.14+ Reviewed-by: Josef Bacik Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/tree-log.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4121,6 +4121,7 @@ fill_holes: *last_extent, 0, 0, len, 0, len, 0, 0, 0); + *last_extent += len; } } }