svn commit: r231332 - in stable/8/sys: fs/nfsclient nfsclient

[Rick Macklem]

Author: rmacklem
Date: Fri Feb 10 04:01:17 2012
New Revision: 231332
URL: http://svn.freebsd.org/changeset/base/231332

Log:
  MFC: r230605
  A problem with respect to data read through the buffer cache for both
  NFS clients was reported to freebsd-fs@ under the subject "NFS
  corruption in recent HEAD" on Nov. 26, 2011. This problem occurred when
  a TCP mounted root fs was changed to using UDP. I believe that this
  problem was caused by the change in mnt_stat.f_iosize that occurred
  because rsize was decreased to the maximum supported by UDP. This
  patch fixes the problem by using v_bufobj.bo_bsize instead of f_iosize,
  since the latter is set to f_iosize when the vnode is allocated, but
  does not change for a given vnode when f_iosize changes.

Modified:
  stable/8/sys/fs/nfsclient/nfs_clbio.c
  stable/8/sys/fs/nfsclient/nfs_clnode.c
  stable/8/sys/fs/nfsclient/nfs_clport.c
  stable/8/sys/nfsclient/nfs_bio.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clbio.c	Fri Feb 10 03:34:32 2012	(r231331)
+++ stable/8/sys/fs/nfsclient/nfs_clbio.c	Fri Feb 10 04:01:17 2012	(r231332)
@@ -469,7 +469,7 @@ ncl_bioread(struct vnode *vp, struct uio
 		/* No caching/ no readaheads. Just read data into the user buffer */
 		return ncl_readrpc(vp, uio, cred);
 
-	biosize = vp->v_mount->mnt_stat.f_iosize;
+	biosize = vp->v_bufobj.bo_bsize;
 	seqcount = (int)((off_t)(ioflag >> IO_SEQSHIFT) * biosize / BKVASIZE);
 	
 	error = nfs_bioread_check_cons(vp, td, cred);
@@ -947,7 +947,7 @@ flush_and_restart:
 	if (vn_rlimit_fsize(vp, uio, td))
 		return (EFBIG);
 
-	biosize = vp->v_mount->mnt_stat.f_iosize;
+	biosize = vp->v_bufobj.bo_bsize;
 	/*
 	 * Find all of this file's B_NEEDCOMMIT buffers.  If our writes
 	 * would exceed the local maximum per-file write commit size when
@@ -1251,12 +1251,8 @@ nfs_getcacheblk(struct vnode *vp, daddr_
 		bp = getblk(vp, bn, size, 0, 0, 0);
 	}
 
-	if (vp->v_type == VREG) {
-		int biosize;
-
-		biosize = mp->mnt_stat.f_iosize;
-		bp->b_blkno = bn * (biosize / DEV_BSIZE);
-	}
+	if (vp->v_type == VREG)
+		bp->b_blkno = bn * (vp->v_bufobj.bo_bsize / DEV_BSIZE);
 	return (bp);
 }
 
@@ -1771,7 +1767,7 @@ ncl_meta_setsize(struct vnode *vp, struc
 {
 	struct nfsnode *np = VTONFS(vp);
 	u_quad_t tsize;
-	int biosize = vp->v_mount->mnt_stat.f_iosize;
+	int biosize = vp->v_bufobj.bo_bsize;
 	int error = 0;
 
 	mtx_lock(&np->n_mtx);

Modified: stable/8/sys/fs/nfsclient/nfs_clnode.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clnode.c	Fri Feb 10 03:34:32 2012	(r231331)
+++ stable/8/sys/fs/nfsclient/nfs_clnode.c	Fri Feb 10 04:01:17 2012	(r231332)
@@ -133,6 +133,7 @@ ncl_nget(struct mount *mntp, u_int8_t *f
 		return (error);
 	}
 	vp = nvp;
+	KASSERT(vp->v_bufobj.bo_bsize != 0, ("ncl_nget: bo_bsize == 0"));
 	vp->v_bufobj.bo_ops = &buf_ops_newnfs;
 	vp->v_data = np;
 	np->n_vnode = vp;

Modified: stable/8/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clport.c	Fri Feb 10 03:34:32 2012	(r231331)
+++ stable/8/sys/fs/nfsclient/nfs_clport.c	Fri Feb 10 04:01:17 2012	(r231332)
@@ -189,6 +189,7 @@ nfscl_nget(struct mount *mntp, struct vn
 		return (error);
 	}
 	vp = nvp;
+	KASSERT(vp->v_bufobj.bo_bsize != 0, ("nfscl_nget: bo_bsize == 0"));
 	vp->v_bufobj.bo_ops = &buf_ops_newnfs;
 	vp->v_data = np;
 	np->n_vnode = vp;

Modified: stable/8/sys/nfsclient/nfs_bio.c
==============================================================================
--- stable/8/sys/nfsclient/nfs_bio.c	Fri Feb 10 03:34:32 2012	(r231331)
+++ stable/8/sys/nfsclient/nfs_bio.c	Fri Feb 10 04:01:17 2012	(r231332)
@@ -467,7 +467,7 @@ nfs_bioread(struct vnode *vp, struct uio
 		/* No caching/ no readaheads. Just read data into the user buffer */
 		return nfs_readrpc(vp, uio, cred);
 
-	biosize = vp->v_mount->mnt_stat.f_iosize;
+	biosize = vp->v_bufobj.bo_bsize;
 	seqcount = (int)((off_t)(ioflag >> IO_SEQSHIFT) * biosize / BKVASIZE);
 	
 	error = nfs_bioread_check_cons(vp, td, cred);
@@ -944,7 +944,7 @@ flush_and_restart:
 	if (vn_rlimit_fsize(vp, uio, td))
 		return (EFBIG);
 
-	biosize = vp->v_mount->mnt_stat.f_iosize;
+	biosize = vp->v_bufobj.bo_bsize;
 	/*
 	 * Find all of this file's B_NEEDCOMMIT buffers.  If our writes
 	 * would exceed the local maximum per-file write commit size when
@@ -1248,12 +1248,8 @@ nfs_getcacheblk(struct vnode *vp, daddr_
 		bp = getblk(vp, bn, size, 0, 0, 0);
 	}
 
-	if (vp->v_type == VREG) {
-		int biosize;
-
-		biosize = mp->mnt_stat.f_iosize;
-		bp->b_blkno = bn * (biosize / DEV_BSIZE);
-	}
+	if (vp->v_type == VREG)
+		bp->b_blkno = bn * (vp->v_bufobj.bo_bsize / DEV_BSIZE);
 	return (bp);
 }
 
@@ -1760,7 +1756,7 @@ nfs_meta_setsize(struct vnode *vp, struc
 {
 	struct nfsnode *np = VTONFS(vp);
 	u_quad_t tsize;
-	int biosize = vp->v_mount->mnt_stat.f_iosize;
+	int biosize = vp->v_bufobj.bo_bsize;
 	int error = 0;
 
 	mtx_lock(&np->n_mtx);