Message-Id: <1169482343.6083.7.camel@lade.trondhjem.org>
Date:	Mon, 22 Jan 2007 11:12:23 -0500
From:	Trond Myklebust <trond.myklebust@....uio.no>
To:	Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc:	Christoph Lameter <clameter@....com>,
	Andrew Morton <akpm@...l.org>, linux-kernel@...r.kernel.org,
	linux-mm@...ck.org, pj@....com
Subject: Re: [PATCH] nfs: fix congestion control -v3

On Sat, 2007-01-20 at 08:01 +0100, Peter Zijlstra wrote:
> Subject: nfs: fix congestion control
> 
> The current NFS client congestion logic is severly broken, it marks the backing
> device congested during each nfs_writepages() call but doesn't mirror this in
> nfs_writepage() which makes for deadlocks. Also it implements its own waitqueue.
> 
> Replace this by a more regular congestion implementation that puts a cap on the
> number of active writeback pages and uses the bdi congestion waitqueue.
> 
> Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
> Cc: Trond Myklebust <trond.myklebust@....uio.no>
> ---
>  fs/nfs/super.c              |    4 -
>  fs/nfs/sysctl.c             |    8 +++
>  fs/nfs/write.c              |  116 ++++++++++++++++++++++++++++----------------
>  include/linux/backing-dev.h |    1 
>  include/linux/nfs_fs.h      |    1 
>  include/linux/nfs_fs_sb.h   |    1 
>  mm/backing-dev.c            |   16 ++++++
>  7 files changed, 104 insertions(+), 43 deletions(-)
> 
> Index: linux-2.6-git/fs/nfs/write.c
> ===================================================================
> --- linux-2.6-git.orig/fs/nfs/write.c	2007-01-20 07:20:10.000000000 +0100
> +++ linux-2.6-git/fs/nfs/write.c	2007-01-20 07:20:12.000000000 +0100
> @@ -89,8 +89,6 @@ static struct kmem_cache *nfs_wdata_cach
>  static mempool_t *nfs_wdata_mempool;
>  static mempool_t *nfs_commit_mempool;
>  
> -static DECLARE_WAIT_QUEUE_HEAD(nfs_write_congestion);
> -
>  struct nfs_write_data *nfs_commit_alloc(void)
>  {
>  	struct nfs_write_data *p = mempool_alloc(nfs_commit_mempool, GFP_NOFS);
> @@ -245,6 +243,39 @@ static int wb_priority(struct writeback_
>  }
>  
>  /*
> + * NFS congestion control
> + */
> +
> +int nfs_congestion_kb;
> +
> +#define NFS_CONGESTION_ON_THRESH 	(nfs_congestion_kb >> (PAGE_SHIFT-10))
> +#define NFS_CONGESTION_OFF_THRESH	\
> +	(NFS_CONGESTION_ON_THRESH - (NFS_CONGESTION_ON_THRESH >> 2))
> +
> +static inline void nfs_set_page_writeback(struct page *page)
> +{
> +	if (!test_set_page_writeback(page)) {
> +		struct inode *inode = page->mapping->host;
> +		struct nfs_server *nfss = NFS_SERVER(inode);
> +
> +		if (atomic_inc_return(&nfss->writeback) > NFS_CONGESTION_ON_THRESH)
> +			set_bdi_congested(&nfss->backing_dev_info, WRITE);
> +	}
> +}
> +
> +static inline void nfs_end_page_writeback(struct page *page)
> +{
> +	struct inode *inode = page->mapping->host;
> +	struct nfs_server *nfss = NFS_SERVER(inode);
> +
> +	end_page_writeback(page);
> +	if (atomic_dec_return(&nfss->writeback) < NFS_CONGESTION_OFF_THRESH) {
> +		clear_bdi_congested(&nfss->backing_dev_info, WRITE);
> +		congestion_end(WRITE);
> +	}
> +}
> +
> +/*
>   * Find an associated nfs write request, and prepare to flush it out
>   * Returns 1 if there was no write request, or if the request was
>   * already tagged by nfs_set_page_dirty.Returns 0 if the request
> @@ -281,7 +312,7 @@ static int nfs_page_mark_flush(struct pa
>  	spin_unlock(req_lock);
>  	if (test_and_set_bit(PG_FLUSHING, &req->wb_flags) == 0) {
>  		nfs_mark_request_dirty(req);
> -		set_page_writeback(page);
> +		nfs_set_page_writeback(page);
>  	}
>  	ret = test_bit(PG_NEED_FLUSH, &req->wb_flags);
>  	nfs_unlock_request(req);
> @@ -336,13 +367,8 @@ int nfs_writepage(struct page *page, str
>  	return err; 
>  }
>  
> -/*
> - * Note: causes nfs_update_request() to block on the assumption
> - * 	 that the writeback is generated due to memory pressure.
> - */
>  int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
>  {
> -	struct backing_dev_info *bdi = mapping->backing_dev_info;
>  	struct inode *inode = mapping->host;
>  	int err;
>  
> @@ -351,11 +377,6 @@ int nfs_writepages(struct address_space 
>  	err = generic_writepages(mapping, wbc);
>  	if (err)
>  		return err;
> -	while (test_and_set_bit(BDI_write_congested, &bdi->state) != 0) {
> -		if (wbc->nonblocking)
> -			return 0;
> -		nfs_wait_on_write_congestion(mapping, 0);
> -	}
>  	err = nfs_flush_mapping(mapping, wbc, wb_priority(wbc));
>  	if (err < 0)
>  		goto out;
> @@ -369,9 +390,6 @@ int nfs_writepages(struct address_space 
>  	if (err > 0)
>  		err = 0;
>  out:
> -	clear_bit(BDI_write_congested, &bdi->state);
> -	wake_up_all(&nfs_write_congestion);
> -	congestion_end(WRITE);
>  	return err;
>  }
>  
> @@ -401,7 +419,7 @@ static int nfs_inode_add_request(struct 
>  }
>  
>  /*
> - * Insert a write request into an inode
> + * Remove a write request from an inode
>   */
>  static void nfs_inode_remove_request(struct nfs_page *req)
>  {
> @@ -585,8 +603,8 @@ static inline int nfs_scan_commit(struct
>  
>  static int nfs_wait_on_write_congestion(struct address_space *mapping, int intr)
>  {
> +	struct inode *inode = mapping->host;
>  	struct backing_dev_info *bdi = mapping->backing_dev_info;
> -	DEFINE_WAIT(wait);
>  	int ret = 0;
>  
>  	might_sleep();
> @@ -594,31 +612,27 @@ static int nfs_wait_on_write_congestion(
>  	if (!bdi_write_congested(bdi))
>  		return 0;
>  
> -	nfs_inc_stats(mapping->host, NFSIOS_CONGESTIONWAIT);
> +	nfs_inc_stats(inode, NFSIOS_CONGESTIONWAIT);
>  
> -	if (intr) {
> -		struct rpc_clnt *clnt = NFS_CLIENT(mapping->host);
> -		sigset_t oldset;
> -
> -		rpc_clnt_sigmask(clnt, &oldset);
> -		prepare_to_wait(&nfs_write_congestion, &wait, TASK_INTERRUPTIBLE);
> -		if (bdi_write_congested(bdi)) {
> -			if (signalled())
> -				ret = -ERESTARTSYS;
> -			else
> -				schedule();
> +	do {
> +		if (intr) {
> +			struct rpc_clnt *clnt = NFS_CLIENT(inode);
> +			sigset_t oldset;
> +
> +			rpc_clnt_sigmask(clnt, &oldset);
> +			ret = congestion_wait_interruptible(WRITE, HZ/10);
> +			rpc_clnt_sigunmask(clnt, &oldset);
> +			if (ret == -ERESTARTSYS)
> +				return ret;
> +			ret = 0;
> +		} else {
> +			congestion_wait(WRITE, HZ/10);
>  		}

rpc_clnt_sigmask() will always set the correct sigmask, so you don't
need to test for 'intr'. In fact, since we do want to allow people to
SIGKILL the process even if intr is unset, it would be preferable to
drop that test.

> -		rpc_clnt_sigunmask(clnt, &oldset);
> -	} else {
> -		prepare_to_wait(&nfs_write_congestion, &wait, TASK_UNINTERRUPTIBLE);
> -		if (bdi_write_congested(bdi))
> -			schedule();
> -	}
> -	finish_wait(&nfs_write_congestion, &wait);
> +	} while (bdi_write_congested(bdi));
> +
>  	return ret;
>  }
>  
> -
>  /*
>   * Try to update any existing write request, or create one if there is none.
>   * In order to match, the request's credentials must match those of
> @@ -779,7 +793,7 @@ int nfs_updatepage(struct file *file, st
>  
>  static void nfs_writepage_release(struct nfs_page *req)
>  {
> -	end_page_writeback(req->wb_page);
> +	nfs_end_page_writeback(req->wb_page);
>  
>  #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
>  	if (!PageError(req->wb_page)) {
> @@ -1095,12 +1109,12 @@ static void nfs_writeback_done_full(stru
>  			ClearPageUptodate(page);
>  			SetPageError(page);
>  			req->wb_context->error = task->tk_status;
> -			end_page_writeback(page);
> +			nfs_end_page_writeback(page);
>  			nfs_inode_remove_request(req);
>  			dprintk(", error = %d\n", task->tk_status);
>  			goto next;
>  		}
> -		end_page_writeback(page);
> +		nfs_end_page_writeback(page);
>  
>  #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
>  		if (data->args.stable != NFS_UNSTABLE || data->verf.committed == NFS_FILE_SYNC) {
> @@ -1565,6 +1579,26 @@ int __init nfs_init_writepagecache(void)
>  	if (nfs_commit_mempool == NULL)
>  		return -ENOMEM;
>  
> +	/*
> +	 * NFS congestion size, scale with available memory.
> +	 *
> +	 *  64MB:    8192k
> +	 * 128MB:   11585k
> +	 * 256MB:   16384k
> +	 * 512MB:   23170k
> +	 *   1GB:   32768k
> +	 *   2GB:   46340k
> +	 *   4GB:   65536k
> +	 *   8GB:   92681k
> +	 *  16GB:  131072k
> +	 *
> +	 * This allows larger machines to have larger/more transfers.
> +	 * Limit the default to 256M
> +	 */
> +	nfs_congestion_kb = (16*int_sqrt(totalram_pages)) << (PAGE_SHIFT-10);
> +	if (nfs_congestion_kb > 256*1024)
> +		nfs_congestion_kb = 256*1024;
> +
>  	return 0;
>  }
>  
> Index: linux-2.6-git/mm/backing-dev.c
> ===================================================================
> --- linux-2.6-git.orig/mm/backing-dev.c	2007-01-20 07:20:10.000000000 +0100
> +++ linux-2.6-git/mm/backing-dev.c	2007-01-20 07:20:12.000000000 +0100
> @@ -55,6 +55,22 @@ long congestion_wait(int rw, long timeou
>  }
>  EXPORT_SYMBOL(congestion_wait);
>  
> +long congestion_wait_interruptible(int rw, long timeout)
> +{
> +	long ret;
> +	DEFINE_WAIT(wait);
> +	wait_queue_head_t *wqh = &congestion_wqh[rw];
> +
> +	prepare_to_wait(wqh, &wait, TASK_INTERRUPTIBLE);
> +	if (signal_pending(current))
> +		ret = -ERESTARTSYS;
> +	else
> +		ret = io_schedule_timeout(timeout);
> +	finish_wait(wqh, &wait);
> +	return ret;
> +}
> +EXPORT_SYMBOL(congestion_wait_interruptible);
> +
>  /**
>   * congestion_end - wake up sleepers on a congested backing_dev_info
>   * @rw: READ or WRITE
> Index: linux-2.6-git/include/linux/nfs_fs_sb.h
> ===================================================================
> --- linux-2.6-git.orig/include/linux/nfs_fs_sb.h	2007-01-20 07:20:10.000000000 +0100
> +++ linux-2.6-git/include/linux/nfs_fs_sb.h	2007-01-20 07:20:12.000000000 +0100
> @@ -82,6 +82,7 @@ struct nfs_server {
>  	struct rpc_clnt *	client_acl;	/* ACL RPC client handle */
>  	struct nfs_iostats *	io_stats;	/* I/O statistics */
>  	struct backing_dev_info	backing_dev_info;
> +	atomic_t		writeback;	/* number of writeback pages */
>  	int			flags;		/* various flags */
>  	unsigned int		caps;		/* server capabilities */
>  	unsigned int		rsize;		/* read size */
> Index: linux-2.6-git/include/linux/backing-dev.h
> ===================================================================
> --- linux-2.6-git.orig/include/linux/backing-dev.h	2007-01-20 07:20:10.000000000 +0100
> +++ linux-2.6-git/include/linux/backing-dev.h	2007-01-20 07:20:12.000000000 +0100
> @@ -93,6 +93,7 @@ static inline int bdi_rw_congested(struc
>  void clear_bdi_congested(struct backing_dev_info *bdi, int rw);
>  void set_bdi_congested(struct backing_dev_info *bdi, int rw);
>  long congestion_wait(int rw, long timeout);
> +long congestion_wait_interruptible(int rw, long timeout);
>  void congestion_end(int rw);
>  
>  #define bdi_cap_writeback_dirty(bdi) \
> Index: linux-2.6-git/fs/nfs/sysctl.c
> ===================================================================
> --- linux-2.6-git.orig/fs/nfs/sysctl.c	2007-01-20 07:20:10.000000000 +0100
> +++ linux-2.6-git/fs/nfs/sysctl.c	2007-01-20 07:20:12.000000000 +0100
> @@ -50,6 +50,14 @@ static ctl_table nfs_cb_sysctls[] = {
>  		.proc_handler	= &proc_dointvec_jiffies,
>  		.strategy	= &sysctl_jiffies,
>  	},
> +	{
> +		.ctl_name	= CTL_UNNUMBERED,
> +		.procname	= "nfs_congestion_kb",
> +		.data		= &nfs_congestion_kb,
> +		.maxlen		= sizeof(nfs_congestion_kb),
> +		.mode		= 0644,
> +		.proc_handler	= &proc_dointvec,
> +	},
>  	{ .ctl_name = 0 }
>  };
>  
> Index: linux-2.6-git/include/linux/nfs_fs.h
> ===================================================================
> --- linux-2.6-git.orig/include/linux/nfs_fs.h	2007-01-20 07:20:10.000000000 +0100
> +++ linux-2.6-git/include/linux/nfs_fs.h	2007-01-20 07:20:12.000000000 +0100
> @@ -422,6 +422,7 @@ extern void nfs_complete_unlink(struct d
>  /*
>   * linux/fs/nfs/write.c
>   */
> +extern int  nfs_congestion_kb;
>  extern int  nfs_writepage(struct page *page, struct writeback_control *wbc);
>  extern int  nfs_writepages(struct address_space *, struct writeback_control *);
>  extern int  nfs_flush_incompatible(struct file *file, struct page *page);
> Index: linux-2.6-git/fs/nfs/super.c
> ===================================================================
> --- linux-2.6-git.orig/fs/nfs/super.c	2007-01-20 07:20:23.000000000 +0100
> +++ linux-2.6-git/fs/nfs/super.c	2007-01-20 07:20:29.000000000 +0100
> @@ -150,10 +150,10 @@ int __init register_nfs_fs(void)
>  	if (ret < 0)
>  		goto error_0;
>  
> -#ifdef CONFIG_NFS_V4
>  	ret = nfs_register_sysctl();
>  	if (ret < 0)
>  		goto error_1;
> +#ifdef CONFIG_NFS_V4
>  	ret = register_filesystem(&nfs4_fs_type);
>  	if (ret < 0)
>  		goto error_2;
> @@ -164,9 +164,9 @@ int __init register_nfs_fs(void)
>  #ifdef CONFIG_NFS_V4
>  error_2:
>  	nfs_unregister_sysctl();
> +#endif
>  error_1:
>  	unregister_filesystem(&nfs_fs_type);
> -#endif
>  error_0:
>  	return ret;
>  }

The rest looks fine...

Trond

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

Powered by blists - more mailing lists