Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3298325pxk; Mon, 21 Sep 2020 10:01:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmYmEPkFv1kJhFQOvOQz0ltuaBvfCDBzvoXFdSzjIYUuVxs3QlrBNFo3Zvp9UyvBIZoFUX X-Received: by 2002:a50:abc3:: with SMTP id u61mr584543edc.129.1600707668860; Mon, 21 Sep 2020 10:01:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600707668; cv=none; d=google.com; s=arc-20160816; b=yQyxMDWwS7rrIMUiUm2Dym7W1w90OqXhFfzapPXDGap0DYJs+X6MZRSRL0dVdFiwBg DRANldrFnJwSjJHw43GKKn1uVPtqd4hFfS6YcZGM9trXLo3NoGyhrfPBgQIRopQSQTa7 ZygQZO7MhrO8+15IEEVW51DPuWRGUupyP4OGSBNZEZxcA0KcmDHyfVo4CTVnvP29hmuE i+36brTY9frS28LOs0R1lbB9uqrXZYk7n+fga0+UDZ8qaEaWIBNIEFNhmiz+KwUW37IN Q51S1ElA3WGefvvat8UotAGp717XAoIV3tVOC5ZRuVn5T9HOfAzs8ifGr/xBo/JzzfB6 H+hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sAfoea0Ieit+OdTx0mtFIFg+HUpFYKbaNiCMKjjxkXw=; b=oKQOpmGsHXrIEFZTBU7q/hlIYirAROLqL4zZFx3woYMXOQ6KkFvreZXFsOuAJIE1vV RBvuPaFHvsmAcdS1Yvk2PqaY42xkJoNPIHcchG91eRoErA1xC85IUvvyJQh+Kp0ExCdS 2pIdAWMDFnRQvRGTTKZGdTQppSFE54ZLfoJs5ST7KljzyVkFGu2kL/Zt56TV2sUXY0vR 6rCSauxyWTwuztN//rxVJRsPCyNiGcs7Fu4IrLhIdJNrQ5BhnVD8Y+6UqmrYr+4T1XjU 6BRm+wM8CSLa7uXqswj7+/MAkxdano42b0j5eByb2kAxYAiYetkAkF3cz6fYR1UYpXgx jv3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kxvcoZHQ; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dt15si8710696ejb.22.2020.09.21.10.00.44; Mon, 21 Sep 2020 10:01:08 -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=kxvcoZHQ; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729850AbgIUQ7o (ORCPT + 99 others); Mon, 21 Sep 2020 12:59:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:44818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729429AbgIUQlV (ORCPT ); Mon, 21 Sep 2020 12:41:21 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 49E70235F9; Mon, 21 Sep 2020 16:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706480; bh=ovSjpe2ce2YVY9yKlvvgRCAOPx0oaHO+4EhjgHFnIVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kxvcoZHQIT3+EV0a8jXAMAMjMshMaXCKwj0PToJTFoi0sEZLxHj2eOATtIYllHnSh fJxGl4ij18Y0eAi9djVHzYsadJWgHK1LV9gosOJM9hwCkUKr5xbneg0Gx83PPBuIWC gEZlqA1SrLZDp6ThM0jlmDjgFtdXrteova0LM6rw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gabriel Krisman Bertazi , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 22/49] f2fs: Return EOF on unaligned end of file DIO read Date: Mon, 21 Sep 2020 18:28:06 +0200 Message-Id: <20200921162035.647101714@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162034.660953761@linuxfoundation.org> References: <20200921162034.660953761@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gabriel Krisman Bertazi [ Upstream commit 20d0a107fb35f37578b919f62bd474d6d358d579 ] Reading past end of file returns EOF for aligned reads but -EINVAL for unaligned reads on f2fs. While documentation is not strict about this corner case, most filesystem returns EOF on this case, like iomap filesystems. This patch consolidates the behavior for f2fs, by making it return EOF(0). it can be verified by a read loop on a file that does a partial read before EOF (A file that doesn't end at an aligned address). The following code fails on an unaligned file on f2fs, but not on btrfs, ext4, and xfs. while (done < total) { ssize_t delta = pread(fd, buf + done, total - done, off + done); if (!delta) break; ... } It is arguable whether filesystems should actually return EOF or -EINVAL, but since iomap filesystems support it, and so does the original DIO code, it seems reasonable to consolidate on that. Signed-off-by: Gabriel Krisman Bertazi Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/data.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index c81a1f3f0a101..c63f5e32630ee 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2490,6 +2490,9 @@ static int check_direct_IO(struct inode *inode, struct iov_iter *iter, unsigned long align = offset | iov_iter_alignment(iter); struct block_device *bdev = inode->i_sb->s_bdev; + if (iov_iter_rw(iter) == READ && offset >= i_size_read(inode)) + return 1; + if (align & blocksize_mask) { if (bdev) blkbits = blksize_bits(bdev_logical_block_size(bdev)); -- 2.25.1