linux-kernel - Re: [PATCH v2] mm: Stop filemap_read() from grabbing a superfluous page

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <6226035fc82495f7ba298659d9e658e0df7bcb47.camel@kernel.org>
Date:   Wed, 20 Oct 2021 06:20:41 -0400
From:   Jeff Layton <jlayton@...nel.org>
To:     David Howells <dhowells@...hat.com>, kent.overstreet@...il.com,
        willy@...radead.org
Cc:     Andrew Morton <akpm@...ux-foundation.org>, linux-mm@...ck.org,
        linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] mm: Stop filemap_read() from grabbing a superfluous
 page

On Wed, 2021-10-20 at 11:10 +0100, David Howells wrote:
> Under some circumstances, filemap_read() will allocate sufficient pages to
> read to the end of the file, call readahead/readpages on them and copy the
> data over - and then it will allocate another page at the EOF and call
> readpage on that and then ignore it.  This is unnecessary and a waste of
> time and resources.
> 
> filemap_read() *does* check for this, but only after it has already done
> the allocation and I/O.  Fix this by checking before calling
> filemap_get_pages() also.
> 
> Changes:
>  v2) Break out of the loop immediately rather than going to put_pages (the
>      pvec is unoccupied).  Setting isize is then unnecessary.
> 
> Signed-off-by: David Howells <dhowells@...hat.com>
> cc: Kent Overstreet <kent.overstreet@...il.com>
> cc: Matthew Wilcox (Oracle) <willy@...radead.org>
> cc: Andrew Morton <akpm@...ux-foundation.org>
> cc: Jeff Layton <jlayton@...hat.com>
> cc: linux-mm@...ck.org
> cc: linux-fsdevel@...r.kernel.org
> Link: https://lore.kernel.org/r/160588481358.3465195.16552616179674485179.stgit@warthog.procyon.org.uk/
> Link: https://lore.kernel.org/r/163456863216.2614702.6384850026368833133.stgit@warthog.procyon.org.uk/
> ---
> 
>  mm/filemap.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/mm/filemap.c b/mm/filemap.c
> index dae481293b5d..e50be519f6a4 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -2625,6 +2625,9 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter,
>  		if ((iocb->ki_flags & IOCB_WAITQ) && already_read)
>  			iocb->ki_flags |= IOCB_NOWAIT;
>  
> +		if (unlikely(iocb->ki_pos >= i_size_read(inode)))
> +			break;
> +
>  		error = filemap_get_pages(iocb, iter, &pvec);
>  		if (error < 0)
>  			break;
> 
> 

Even better.

Acked-by: Jeff Layton <jlayton@...nel.org>