upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-23 23:28:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clip the settings for the NFS rsize, wsize mount options

Browse source 
to a power of 2. For non-power of 2 settings, intermittent
page faults have been reported. Although the bug that causes
these page faults/crashes has not been identified, it does
not appear to occur when rsize, wsize is a power of 2.

Reported by:	tcberner@gmail.com
MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2014-10-22 20:47:11 +00:00
parent 53f49a7bd8
commit 88cc4e92da
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sys/fs/nfsclient/nfs_clvfsops.c
View file

@ -552,7 +552,7 @@ static void
nfs_decode_args(struct mount *mp, struct nfsmount *nmp, struct nfs_args *argp,
const char *hostname, struct ucred *cred, struct thread *td)
{
int s;
int i, s;
int adjsock;
char *p;
@ -621,18 +621,36 @@ nfs_decode_args(struct mount *mp, struct nfsmount *nmp, struct nfs_args *argp,
if ((argp->flags & NFSMNT_WSIZE) && argp->wsize > 0) {
nmp->nm_wsize = argp->wsize;
/* Round down to multiple of blocksize */
nmp->nm_wsize &= ~(NFS_FABLKSIZE - 1);
if (nmp->nm_wsize <= 0)
nmp->nm_wsize = NFS_FABLKSIZE;
/*
* Clip at the power of 2 below the size. There is an
* issue (not isolated) that causes intermittent page
* faults if this is not done.
*/
i = NFS_FABLKSIZE;
for (;;) {
if (i * 2 > nmp->nm_wsize) {
nmp->nm_wsize = i;
break;
}
i *= 2;
}
}
if ((argp->flags & NFSMNT_RSIZE) && argp->rsize > 0) {
nmp->nm_rsize = argp->rsize;
/* Round down to multiple of blocksize */
nmp->nm_rsize &= ~(NFS_FABLKSIZE - 1);
if (nmp->nm_rsize <= 0)
nmp->nm_rsize = NFS_FABLKSIZE;
/*
* Clip at the power of 2 below the size. There is an
* issue (not isolated) that causes intermittent page
* faults if this is not done.
*/
i = NFS_FABLKSIZE;
for (;;) {
if (i * 2 > nmp->nm_rsize) {
nmp->nm_rsize = i;
break;
}
i *= 2;
}
}
if ((argp->flags & NFSMNT_READDIRSIZE) && argp->readdirsize > 0) {