Re: [PATCH] vfs: Fix vmtruncate() regression

[Nick Piggin]

On Tue, Jan 12, 2010 at 03:40:42AM +0900, OGAWA Hirofumi wrote:
> Hi,
> 
> Could you review this one?
> 
> 
> 
> If __block_prepare_write() was failed in block_write_begin(), the
> allocated blocks can be outside of ->i_size.
> 
> But new truncate_pagecache() in vmtuncate() does nothing if new < old.
> It means the above usage is not working anymore.
> 
> So, this patch fixes it by removing "new < old" check. It would need
> more cleanup/change. But, now -rc and truncate working is in progress,
> so, this tried to fix it minimum change.
> 
> Cc: stable@xxxxxxxxxx
> Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>

Hmm, truncate_pagecache() is for truncating the mm/vm part of the
pagecache. vmtruncate should still call inode->i_op->truncate() to
trim blocks if required.

However I'd say we do still need to ensure do_invalidatepage is
called for the page, for private metadata. So yes I think your patch
looks good.

Acked-by: Nick Piggin <npiggin@xxxxxxx>

Please apply to mainline and 2.6.32.

> ---
> 
>  mm/truncate.c |   28 +++++++++++++---------------
>  1 file changed, 13 insertions(+), 15 deletions(-)
> 
> diff -puN mm/truncate.c~truncate_pagecache-fix mm/truncate.c
> --- linux-2.6/mm/truncate.c~truncate_pagecache-fix	2010-01-12 02:41:27.000000000 +0900
> +++ linux-2.6-hirofumi/mm/truncate.c	2010-01-12 02:42:53.000000000 +0900
> @@ -522,22 +522,20 @@ EXPORT_SYMBOL_GPL(invalidate_inode_pages
>   */
>  void truncate_pagecache(struct inode *inode, loff_t old, loff_t new)
>  {
> -	if (new < old) {
> -		struct address_space *mapping = inode->i_mapping;
> +	struct address_space *mapping = inode->i_mapping;
>  
> -		/*
> -		 * unmap_mapping_range is called twice, first simply for
> -		 * efficiency so that truncate_inode_pages does fewer
> -		 * single-page unmaps.  However after this first call, and
> -		 * before truncate_inode_pages finishes, it is possible for
> -		 * private pages to be COWed, which remain after
> -		 * truncate_inode_pages finishes, hence the second
> -		 * unmap_mapping_range call must be made for correctness.
> -		 */
> -		unmap_mapping_range(mapping, new + PAGE_SIZE - 1, 0, 1);
> -		truncate_inode_pages(mapping, new);
> -		unmap_mapping_range(mapping, new + PAGE_SIZE - 1, 0, 1);
> -	}
> +	/*
> +	 * unmap_mapping_range is called twice, first simply for
> +	 * efficiency so that truncate_inode_pages does fewer
> +	 * single-page unmaps.  However after this first call, and
> +	 * before truncate_inode_pages finishes, it is possible for
> +	 * private pages to be COWed, which remain after
> +	 * truncate_inode_pages finishes, hence the second
> +	 * unmap_mapping_range call must be made for correctness.
> +	 */
> +	unmap_mapping_range(mapping, new + PAGE_SIZE - 1, 0, 1);
> +	truncate_inode_pages(mapping, new);
> +	unmap_mapping_range(mapping, new + PAGE_SIZE - 1, 0, 1);
>  }
>  EXPORT_SYMBOL(truncate_pagecache);
>  
> _
> 
> -- 
> OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/