Date: Wed, 25 Jun 2008 15:00:41 +0200
From: Jens Axboe <jens.axboe@oracle.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
       linux-mm@kvack.org, torvalds@linux-foundation.org,
       akpm@linux-foundation.org, hugh@veritas.com, nickpiggin@yahoo.com.au
Subject: Re: [patch 2/2] splice: fix generic_file_splice_read() race with page invalidation
Message-ID: <20080625130041.GY20851@kernel.dk>
References: <20080625124038.103406301@szeredi.hu> <20080625124123.124728808@szeredi.hu>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20080625124123.124728808@szeredi.hu>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2171
Lines: 62

On Wed, Jun 25 2008, Miklos Szeredi wrote:
> From: Miklos Szeredi <mszeredi@suse.cz>
> 
> If a page was invalidated during splicing from file to a pipe, then
> generic_file_splice_read() could return a short or zero count.
> 
> This manifested itself in rare I/O errors seen on nfs exported fuse
> filesystems.  This is because nfsd uses splice_direct_to_actor() to
> read files, and fuse uses invalidate_inode_pages2() to invalidate
> stale data on open.
> 
> Fix by redoing the page find/create if it was found to be truncated
> (invalidated). 
> 
> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
> ---
>  fs/splice.c |   17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> Index: linux-2.6/fs/splice.c
> ===================================================================
> --- linux-2.6.orig/fs/splice.c	2008-06-25 08:18:51.000000000 +0200
> +++ linux-2.6/fs/splice.c	2008-06-25 11:57:33.000000000 +0200
> @@ -379,13 +379,22 @@ __generic_file_splice_read(struct file *
>  				lock_page(page);
>  
>  			/*
> -			 * page was truncated, stop here. if this isn't the
> -			 * first page, we'll just complete what we already
> -			 * added
> +			 * Page was truncated, or invalidated by the
> +			 * filesystem.  Redo the find/create, but this time the
> +			 * page is kept locked, so there's no chance of another
> +			 * race with truncate/invalidate.
>  			 */
>  			if (!page->mapping) {
>  				unlock_page(page);
> -				break;
> +				page = find_or_create_page(mapping, index,
> +						mapping_gfp_mask(mapping));
> +
> +				if (!page) {
> +					error = -ENOMEM;
> +					break;
> +				}
> +				page_cache_release(pages[page_nr]);
> +				pages[page_nr] = page;
>  			}
>  			/*
>  			 * page was already under io and is now done, great

This looks good to me, page locking is also consistent. You can add my
acked-by, I'm assuming Linus will just take it directly for 2.6.26.

-- 
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/