Commit 8d92890b authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

mm/writeback: discard NR_UNSTABLE_NFS, use NR_WRITEBACK instead 



After an NFS page has been written it is considered "unstable" until a
COMMIT request succeeds.  If the COMMIT fails, the page will be
re-written.

These "unstable" pages are currently accounted as "reclaimable", either
in WB_RECLAIMABLE, or in NR_UNSTABLE_NFS which is included in a
'reclaimable' count.  This might have made sense when sending the COMMIT
required a separate action by the VFS/MM (e.g.  releasepage() used to
send a COMMIT).  However now that all writes generated by ->writepages()
will automatically be followed by a COMMIT (since commit 919e3bd9
("NFS: Ensure we commit after writeback is complete")) it makes more
sense to treat them as writeback pages.

So this patch removes NR_UNSTABLE_NFS and accounts unstable pages in
NR_WRITEBACK and WB_WRITEBACK.

A particular effect of this change is that when
wb_check_background_flush() calls wb_over_bg_threshold(), the latter
will report 'true' a lot less often as the 'unstable' pages are no
longer considered 'dirty' (as there is nothing that writeback can do
about them anyway).

Currently wb_check_background_flush() will trigger writeback to NFS even
when there are relatively few dirty pages (if there are lots of unstable
pages), this can result in small writes going to the server (10s of
Kilobytes rather than a Megabyte) which hurts throughput.  With this
patch, there are fewer writes which are each larger on average.

Where the NR_UNSTABLE_NFS count was included in statistics
virtual-files, the entry is retained, but the value is hard-coded as
zero.  static trace points and warning printks which mentioned this
counter no longer report it.

[akpm@linux-foundation.org: re-layout comment]
[akpm@linux-foundation.org: fix printk warning]
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Acked-by: Michal Hocko <mhocko@suse.com>	[mm]
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chuck Lever <chuck.lever@oracle.com>
Link: http://lkml.kernel.org/r/87d06j7gqa.fsf@notabene.neil.brown.name


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a37b0715

Documentation/filesystems/proc.rst

+2 −2
Original line number Diff line number Diff line
@@ -1042,8 +1042,8 @@ PageTables 
              amount of memory dedicated to the lowest level of page

              tables.

NFS_Unstable

              NFS pages sent to the server, but not yet committed to stable

	      storage

              Always zero. Previous counted pages which had been written to

              the server, but has not been committed to stable storage.

Bounce

              Memory used for block device "bounce buffers"

WritebackTmp

drivers/base/node.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static ssize_t node_read_meminfo(struct device *dev, 
		       nid, K(i.sharedram),

		       nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK_KB),

		       nid, K(sum_zone_node_page_state(nid, NR_PAGETABLE)),

		       nid, K(node_page_state(pgdat, NR_UNSTABLE_NFS)),

		       nid, 0UL,

		       nid, K(sum_zone_node_page_state(nid, NR_BOUNCE)),

		       nid, K(node_page_state(pgdat, NR_WRITEBACK_TEMP)),

		       nid, K(sreclaimable +

fs/fs-writeback.c

+0 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,6 @@ static void bdi_split_work_to_wbs(struct backing_dev_info *bdi, 
static unsigned long get_nr_dirty_pages(void)

{

	return global_node_page_state(NR_FILE_DIRTY) +

		global_node_page_state(NR_UNSTABLE_NFS) +

		get_nr_dirty_inodes();

}

fs/nfs/internal.h

+7 −3
Original line number Diff line number Diff line
@@ -668,7 +668,8 @@ void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize) 
}



/*

 * Record the page as unstable and mark its inode as dirty.

 * Record the page as unstable (an extra writeback period) and mark its

 * inode as dirty.

 */

static inline

void nfs_mark_page_unstable(struct page *page, struct nfs_commit_info *cinfo)
@@ -676,8 +677,11 @@ void nfs_mark_page_unstable(struct page *page, struct nfs_commit_info *cinfo) 
	if (!cinfo->dreq) {

		struct inode *inode = page_file_mapping(page)->host;



		inc_node_page_state(page, NR_UNSTABLE_NFS);

		inc_wb_stat(&inode_to_bdi(inode)->wb, WB_RECLAIMABLE);

		/* This page is really still in write-back - just that the

		 * writeback is happening on the server now.

		 */

		inc_node_page_state(page, NR_WRITEBACK);

		inc_wb_stat(&inode_to_bdi(inode)->wb, WB_WRITEBACK);

		__mark_inode_dirty(inode, I_DIRTY_DATASYNC);

	}

}

fs/nfs/write.c

+2 −2
Original line number Diff line number Diff line
@@ -946,9 +946,9 @@ nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg, 
static void

nfs_clear_page_commit(struct page *page)

{

	dec_node_page_state(page, NR_UNSTABLE_NFS);

	dec_node_page_state(page, NR_WRITEBACK);

	dec_wb_stat(&inode_to_bdi(page_file_mapping(page)->host)->wb,

		    WB_RECLAIMABLE);

		    WB_WRITEBACK);

}



/* Called holding the request lock on @req */