ACK: [SRU][Zesty][PATCH 1/1] xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff()

[Colin Ian King]

On 06/10/17 18:13, Joseph Salisbury wrote:
> From: Eryu Guan <eguan at redhat.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1696049
> 
> xfs_find_get_desired_pgoff() is used to search for offset of hole or
> data in page range [index, end] (both inclusive), and the max number
> of pages to search should be at least one, if end == index.
> Otherwise the only page is missed and no hole or data is found,
> which is not correct.
> 
> When block size is smaller than page size, this can be demonstrated
> by preallocating a file with size smaller than page size and writing
> data to the last block. E.g. run this xfs_io command on a 1k block
> size XFS on x86_64 host.
> 
>   # xfs_io -fc "falloc 0 3k" -c "pwrite 2k 1k" \
>   	    -c "seek -d 0" /mnt/xfs/testfile
>   wrote 1024/1024 bytes at offset 2048
>   1 KiB, 1 ops; 0.0000 sec (33.675 MiB/sec and 34482.7586 ops/sec)
>   Whence  Result
>   DATA    EOF
> 
> Data at offset 2k was missed, and lseek(2) returned ENXIO.
> 
> This is uncovered by generic/285 subtest 07 and 08 on ppc64 host,
> where pagesize is 64k. Because a recent change to generic/285
> reduced the preallocated file size to smaller than 64k.
> 
> Cc: stable at vger.kernel.org # v3.7+
> Signed-off-by: Eryu Guan <eguan at redhat.com>
> Reviewed-by: Jan Kara <jack at suse.cz>
> Reviewed-by: Darrick J. Wong <darrick.wong at oracle.com>
> Signed-off-by: Darrick J. Wong <darrick.wong at oracle.com>
> (cherry picked from commit 8affebe16d79ebefb1d9d6d56a46dc89716f9453)
> Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
> ---
>  fs/xfs/xfs_file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 2a695a8..2f472a2 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -1057,7 +1057,7 @@ xfs_find_get_desired_pgoff(
>  		unsigned	nr_pages;
>  		unsigned int	i;
>  
> -		want = min_t(pgoff_t, end - index, PAGEVEC_SIZE);
> +		want = min_t(pgoff_t, end - index, PAGEVEC_SIZE - 1) + 1;
>  		nr_pages = pagevec_lookup(&pvec, inode->i_mapping, index,
>  					  want);
>  		/*
> 
Clean cherry pick, positive test results. Thanks Joe.

Acked-by: Colin Ian King <colin.king at canonical.com>