Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3082713ybt; Mon, 29 Jun 2020 14:54:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpY8ma32ANfnFyA7s4HggfLAmNzpQWVrqGC5HDU7SSkJTokbevlHc02Y/w5gfU212qTNSi X-Received: by 2002:a17:906:8595:: with SMTP id v21mr16197217ejx.333.1593467654190; Mon, 29 Jun 2020 14:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593467654; cv=none; d=google.com; s=arc-20160816; b=lddUE5z0lwAZUDCO7vE3uUdYfFJby9ENcqUZE7yHKPyfsuVtJ4+dg0nxSxrDoLONeO E8sUQJC8Vf4tZkEE6QlpaZnAOmVBsdTFqCoj5peU+UHCwybqzWg9Rt1v/d2o43Vt+dOy nrElXRT1fOUv8ON534t+yf8lfXD8iYHsUnGks3WBDC52+5TCWmKNUrLWFKR/ksh6Zmhi 6Zy5r341vXlTbD5IHebl/4GLT+Fi2hAApMjInOZAF+uAFTRZhJ57IWH+0D6rEaEEWBIM whwSjBmYwf6U1lyD1U1Nd55gkMhaSdGB+m8eAL1idznVXwBNKF+fcEavlN0mNwErM1Da APOg== 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=JLM3O2d9u3vVcDDW28bSKaVmXwQea0zPKOHy3k0Gh6I=; b=o7+SF0Eok8+W3KvP2n/crUSS7bEYfQD6bzGwFZQ5zqc2LDcB3hecHtv0ZJWppe0gbv 5Vejl1lHd9wqjT3/CF8a6U7WqC0JlaKLdA/6MQ9NQs6dRhny5KrkKZJ2PedQuMCrk5iX sFsAvGCHlFMIg1lmtF7ZopUcMagSQrGSXFHQvyWaGc1rcD8RTCnNzJGyw4swrdzRiY/M QeRgfp+plMBUCy95ruRI5hw8GGsqdpNjevjJ7BCvznjtWU4Uigw2YmUabdIX+BHK0bcL V/7DasNzKZQIzEA9Gm4rfpzatNzmVwFPpdY2PAeQ3Slr2quCPN8qoHeL5LRPitCvXT3L S54A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lsDVryGM; 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 r14si451609eds.270.2020.06.29.14.53.51; Mon, 29 Jun 2020 14:54:14 -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=lsDVryGM; 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 S2391530AbgF2Vwm (ORCPT + 99 others); Mon, 29 Jun 2020 17:52:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:56794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726620AbgF2Sfj (ORCPT ); Mon, 29 Jun 2020 14:35:39 -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 3D928247B1; Mon, 29 Jun 2020 15:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444114; bh=Yn0VfqWS4xDvXpPauWQ/AwR0jBqLHAG+sbhriLI01aE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lsDVryGM5wt0lfyjuKnrDTZ8kiHIjxe+nT2D5ZV4nF5yXjQ22GFIzBxKH+vaepsse 3KcMThkvxXtiVHKpqOD0N6oxVFzY7aHFGdeR5ovw6G7TY67QppsyUGL9ogwRss7XvE pMj6yhDpkw7OGakCzL74bZanLka894NnUuKiZY4c= 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 226/265] btrfs: fix failure of RWF_NOWAIT write into prealloc extent beyond eof Date: Mon, 29 Jun 2020 11:17:39 -0400 Message-Id: <20200629151818.2493727-227-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 4b1946284dd6641afdb9457101056d9e6ee6204c upstream. If we attempt to write to prealloc extent located after eof using a RWF_NOWAIT write, we always fail with -EAGAIN. We do actually check if we have an allocated extent for the write at the start of btrfs_file_write_iter() through a call to check_can_nocow(), but later when we go into the actual direct IO write path we simply return -EAGAIN if the write starts at or beyond EOF. Trivial to reproduce: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ touch /mnt/foo $ chattr +C /mnt/foo $ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foo wrote 65536/65536 bytes at offset 0 64 KiB, 16 ops; 0.0004 sec (135.575 MiB/sec and 34707.1584 ops/sec) $ xfs_io -c "falloc -k 64K 1M" /mnt/foo $ xfs_io -d -c "pwrite -N -V 1 -S 0xfe -b 64K 64K 64K" /mnt/foo pwrite: Resource temporarily unavailable On xfs and ext4 the write succeeds, as expected. Fix this by removing the wrong check at btrfs_direct_IO(). 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/inode.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 18111b0263d71..6aa200e373c8f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8262,9 +8262,6 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) dio_data.overwrite = 1; inode_unlock(inode); relock = true; - } else if (iocb->ki_flags & IOCB_NOWAIT) { - ret = -EAGAIN; - goto out; } ret = btrfs_delalloc_reserve_space(inode, &data_reserved, offset, count); -- 2.25.1