From patchwork Tue Jun 7 17:36:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p57HZsog022911 for ; Tue, 7 Jun 2011 17:36:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756044Ab1FGRgL (ORCPT ); Tue, 7 Jun 2011 13:36:11 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:44219 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753745Ab1FGRgK (ORCPT ); Tue, 7 Jun 2011 13:36:10 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id CF411305A9D2; Tue, 7 Jun 2011 13:36:09 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bN4JJdJ9wH8b; Tue, 7 Jun 2011 13:36:07 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id B047A3083A6D; Tue, 7 Jun 2011 13:36:07 -0400 (EDT) Date: Tue, 7 Jun 2011 13:36:05 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 87/88] Add configurable prefetch size for layoutget Message-ID: <09142112ff0115f7f22124a69ead7b9bb5e0958f.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 17:36:12 +0000 (UTC) From: Peng Tao pnfs_layout_prefetch_kb can be modified via sysctl. Signed-off-by: Peng Tao Signed-off-by: Jim Rees --- fs/nfs/pnfs.c | 17 +++++++++++++++++ fs/nfs/pnfs.h | 1 + fs/nfs/sysctl.c | 10 ++++++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 9920bff..9c2b569 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -46,6 +46,11 @@ static DEFINE_SPINLOCK(pnfs_spinlock); */ static LIST_HEAD(pnfs_modules_tbl); +/* + * layoutget prefetch size + */ +unsigned int pnfs_layout_prefetch_kb = 2 << 10; + /* Return the registered pnfs layout driver module matching given id */ static struct pnfs_layoutdriver_type * find_pnfs_driver_locked(u32 id) @@ -906,6 +911,16 @@ pnfs_find_lseg(struct pnfs_layout_hdr *lo, } /* + * Set layout prefetch length. + */ +static void +pnfs_set_layout_prefetch(struct pnfs_layout_range *range) +{ + if (range->length < (pnfs_layout_prefetch_kb << 10)) + range->length = pnfs_layout_prefetch_kb << 10; +} + +/* * Layout segment is retreived from the server if not cached. * The appropriate layout segment is referenced and returned to the caller. */ @@ -956,6 +971,8 @@ pnfs_update_layout(struct inode *ino, if (pnfs_layoutgets_blocked(lo, NULL, 0)) goto out_unlock; + + pnfs_set_layout_prefetch(&arg); atomic_inc(&lo->plh_outstanding); get_layout_hdr(lo); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 28d57c9..563c67b 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -182,6 +182,7 @@ extern int nfs4_proc_layoutget(struct nfs4_layoutget *lgp); extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp); /* pnfs.c */ +extern unsigned int pnfs_layout_prefetch_kb; void get_layout_hdr(struct pnfs_layout_hdr *lo); void put_lseg(struct pnfs_layout_segment *lseg); struct pnfs_layout_segment * diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index 978aaeb..79a5134 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c @@ -14,6 +14,7 @@ #include #include "callback.h" +#include "pnfs.h" #ifdef CONFIG_NFS_V4 static const int nfs_set_port_min = 0; @@ -42,6 +43,15 @@ static ctl_table nfs_cb_sysctls[] = { }, #endif /* CONFIG_NFS_USE_NEW_IDMAPPER */ #endif +#ifdef CONFIG_NFS_V4_1 + { + .procname = "pnfs_layout_prefetch_kb", + .data = &pnfs_layout_prefetch_kb, + .maxlen = sizeof(pnfs_layout_prefetch_kb), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +#endif { .procname = "nfs_mountpoint_timeout", .data = &nfs_mountpoint_expiry_timeout,