Commit 9c88ea00 authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Anna Schumaker
Browse files

NFS: Fix /proc/PID/io read_bytes for buffered reads 

Prior to commit 8786fde8 ("Convert NFS from readpages to
readahead"), nfs_readpages() used the old mm interface read_cache_pages()
which called task_io_account_read() for each NFS page read.  After
this commit, nfs_readpages() is converted to nfs_readahead(), which
now uses the new mm interface readahead_page().  The new interface
requires callers to call task_io_account_read() themselves.
In addition, to nfs_readahead() task_io_account_read() should also
be called from nfs_read_folio().

Fixes: 8786fde8 ("Convert NFS from readpages to readahead")
Link: https://lore.kernel.org/linux-nfs/CAPt2mGNEYUk5u8V4abe=5MM5msZqmvzCVrtCP4Qw1n=gCHCnww@mail.gmail.com/


Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent eeac8ede

fs/nfs/read.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/stat.h>

#include <linux/stat.h>

#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/task_io_accounting_ops.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/clnt.h>

#include <linux/nfs_fs.h>

#include <linux/nfs_fs.h>
@@ -337,6 +338,7 @@ int nfs_read_folio(struct file *file, struct folio *folio) 




	trace_nfs_aop_readpage(inode, folio);

	trace_nfs_aop_readpage(inode, folio);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);

	task_io_account_read(folio_size(folio));





	/*

	/*

	 * Try to flush any pending writes to the file..

	 * Try to flush any pending writes to the file..
@@ -393,6 +395,7 @@ void nfs_readahead(struct readahead_control *ractl) 




	trace_nfs_aop_readahead(inode, readahead_pos(ractl), nr_pages);

	trace_nfs_aop_readahead(inode, readahead_pos(ractl), nr_pages);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGES);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGES);

	task_io_account_read(readahead_length(ractl));





	ret = -ESTALE;

	ret = -ESTALE;

	if (NFS_STALE(inode))

	if (NFS_STALE(inode))