Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3084464ybt; Mon, 29 Jun 2020 14:57:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3t60iXiLX8J+bn5ryeXBzeaD9rnYNM7c7Jn6YtqwrhKgOmVj9jUOehq3BvZ/d7s/a/bmf X-Received: by 2002:a17:906:8401:: with SMTP id n1mr15509828ejx.479.1593467866030; Mon, 29 Jun 2020 14:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593467866; cv=none; d=google.com; s=arc-20160816; b=bokpOnp9WFlk+ZoG2mzT0DmksX5EXeYjzq56FmzOv2X7lBgnhMZTcsBsthltBwdzrg aAhLBloJWxQgZ8R5ecG9/q0AtIxMSRjJ7avgFLTu44QEMPEesBT+moSR9QajuTT8dWIt FB95RD0pvdhHMKBbQRsqW1SoWjs0q7PkOywjSQGJLshT/765pCiOpuaxFZOTY+gK2kvO X2kDpQdvr9SsZISOgQCgbAKSGoRXWSCWJpOawJnVfwX4J57x1vXv1L3BL997onA4Y0ln Lg4Czh2O0WYw10OpfMzU9gVMw4LJ/K2GoQAaTvAEV4M2TXfXuDOj7CmweDuFSNt4RNhY QUmQ== 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=+4w6Rk1lhTpm8zeOKQRjDdXLqZHcBk9VO9qRe6b/C0o=; b=LuU/ShHV4X3Fu4tOOvKktE4nxDa5ijea7EFpWZiwWRCcQt2goiidLWzfKgwuKbAMNY hkdXrye/QfrmVjlGUuz+KCZQt46J0twqRJLGxCif16JNvhlFSFMnsOYgWCkPLoQVbE+g YlvVNv0EFcfVMx6bIDAuaOrs3dq4Fv6q2gGo9wBunfC6OX0So6UFeiSJLhpPDiYWELhs usdv47B7DzfQT1IvLrEb636eyvTBEhZkqQmXwsGm2zLXzTFSUh/3eDwNpG8vJNhDO4AX kr018bRHUUtgoCQkiSyafMNuLWzw5WwOtfvQI0A0jbg4sHoKVaeS6+sKwjOPeWsQ17EO EWmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0U0fsl1q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id p6si457406edx.295.2020.06.29.14.57.23; Mon, 29 Jun 2020 14:57:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0U0fsl1q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S2404670AbgF2V4W (ORCPT + 99 others); Mon, 29 Jun 2020 17:56:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:56814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726539AbgF2Sfb (ORCPT ); Mon, 29 Jun 2020 14:35:31 -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 5EEF0247AF; Mon, 29 Jun 2020 15:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444114; bh=ENgkJVTolnCjsYCFo4x7kLx6RHWaOF/1KVZMARmqOnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0U0fsl1q1b6UvByWqAqwnu3EsnYaiPmSNUrD3GyXN7j48EuSbPDLDgPsPc2A56i2I xUYUh9gJIy0E/I7V3ci806ZuPStCTOW0u+6LO78p5rL0+RoPkROLRrvb6CrCGxw8wh yFQqy/9sIigjxQwq2xGugXSLPOVop8lXZ3lwtn+M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , David Sterba , Greg Kroah-Hartman Subject: [PATCH 5.7 225/265] btrfs: fix hang on snapshot creation after RWF_NOWAIT write Date: Mon, 29 Jun 2020 11:17:38 -0400 Message-Id: <20200629151818.2493727-226-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 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: Filipe Manana commit f2cb2f39ccc30fa13d3ac078d461031a63960e5b upstream. If we do a successful RWF_NOWAIT write we end up locking the snapshot lock of the inode, through a call to check_can_nocow(), but we never unlock it. This means the next attempt to create a snapshot on the subvolume will hang forever. Trivial reproducer: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ touch /mnt/foobar $ chattr +C /mnt/foobar $ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foobar $ xfs_io -d -c "pwrite -N -V 1 -S 0xfe 0 64K" /mnt/foobar $ btrfs subvolume snapshot -r /mnt /mnt/snap --> hangs Fix this by unlocking the snapshot lock if check_can_nocow() returned success. Fixes: edf064e7c6fec3 ("btrfs: nowait aio support") CC: stable@vger.kernel.org # 4.14+ Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 719e68ab552c5..484803f8b2290 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1922,6 +1922,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, inode_unlock(inode); return -EAGAIN; } + /* check_can_nocow() locks the snapshot lock on success */ + btrfs_drew_write_unlock(&root->snapshot_lock); } current->backing_dev_info = inode_to_bdi(inode); -- 2.25.1