From owner-svn-src-releng@FreeBSD.ORG Sat Aug 24 00:26:15 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DC553454; Sat, 24 Aug 2013 00:26:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9ADD2E94; Sat, 24 Aug 2013 00:26:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7O0QFq8094356; Sat, 24 Aug 2013 00:26:15 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7O0QFDc094355; Sat, 24 Aug 2013 00:26:15 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201308240026.r7O0QFDc094355@svn.freebsd.org> From: Glen Barber Date: Sat, 24 Aug 2013 00:26:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r254754 - releng/9.2/sys/kern X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2013 00:26:15 -0000 Author: gjb Date: Sat Aug 24 00:26:15 2013 New Revision: 254754 URL: http://svnweb.freebsd.org/changeset/base/254754 Log: Revert r250907 from releng/9.2: Reports of NFS deadlocks on -stable@ suggest that reverting this change resolves the problem. This is a direct reverse-merge to releng/9.2, pending further review and analysis on the stable/9 branch. Approved by: re (marius) Discussed on: stable Modified: releng/9.2/sys/kern/uipc_syscalls.c Directory Properties: releng/9.2/sys/ (props changed) Modified: releng/9.2/sys/kern/uipc_syscalls.c ============================================================================== --- releng/9.2/sys/kern/uipc_syscalls.c Sat Aug 24 00:19:26 2013 (r254753) +++ releng/9.2/sys/kern/uipc_syscalls.c Sat Aug 24 00:26:15 2013 (r254754) @@ -1835,11 +1835,9 @@ kern_sendfile(struct thread *td, struct struct mbuf *m = NULL; struct sf_buf *sf; struct vm_page *pg; - struct vattr va; off_t off, xfsize, fsbytes = 0, sbytes = 0, rem = 0; int error, hdrlen = 0, mnw = 0; int vfslocked; - int bsize; struct sendfile_sync *sfs = NULL; /* @@ -1854,18 +1852,6 @@ kern_sendfile(struct thread *td, struct vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_lock(vp, LK_SHARED | LK_RETRY); if (vp->v_type == VREG) { - bsize = vp->v_mount->mnt_stat.f_iosize; - if (uap->nbytes == 0) { - error = VOP_GETATTR(vp, &va, td->td_ucred); - if (error != 0) { - VOP_UNLOCK(vp, 0); - VFS_UNLOCK_GIANT(vfslocked); - obj = NULL; - goto out; - } - rem = va.va_size; - } else - rem = uap->nbytes; obj = vp->v_object; if (obj != NULL) { /* @@ -1883,8 +1869,7 @@ kern_sendfile(struct thread *td, struct obj = NULL; } } - } else - bsize = 0; /* silence gcc */ + } VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); if (obj == NULL) { @@ -1977,20 +1962,11 @@ kern_sendfile(struct thread *td, struct * The outer loop checks the state and available space of the socket * and takes care of the overall progress. */ - for (off = uap->offset; ; ) { - struct mbuf *mtail; - int loopbytes; - int space; - int done; - - if ((uap->nbytes != 0 && uap->nbytes == fsbytes) || - (uap->nbytes == 0 && va.va_size == fsbytes)) - break; - - mtail = NULL; - loopbytes = 0; - space = 0; - done = 0; + for (off = uap->offset, rem = uap->nbytes; ; ) { + struct mbuf *mtail = NULL; + int loopbytes = 0; + int space = 0; + int done = 0; /* * Check the socket state for ongoing connection, @@ -2058,20 +2034,6 @@ retry_space: */ space -= hdrlen; - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - error = vn_lock(vp, LK_SHARED); - if (error != 0) { - VFS_UNLOCK_GIANT(vfslocked); - goto done; - } - error = VOP_GETATTR(vp, &va, td->td_ucred); - if (error != 0 || off >= va.va_size) { - VOP_UNLOCK(vp, 0); - VFS_UNLOCK_GIANT(vfslocked); - goto done; - } - VFS_UNLOCK_GIANT(vfslocked); - /* * Loop and construct maximum sized mbuf chain to be bulk * dumped into socket buffer. @@ -2081,20 +2043,25 @@ retry_space: vm_offset_t pgoff; struct mbuf *m0; + VM_OBJECT_LOCK(obj); /* * Calculate the amount to transfer. * Not to exceed a page, the EOF, * or the passed in nbytes. */ pgoff = (vm_offset_t)(off & PAGE_MASK); + xfsize = omin(PAGE_SIZE - pgoff, + obj->un_pager.vnp.vnp_size - uap->offset - + fsbytes - loopbytes); if (uap->nbytes) rem = (uap->nbytes - fsbytes - loopbytes); else - rem = va.va_size - + rem = obj->un_pager.vnp.vnp_size - uap->offset - fsbytes - loopbytes; - xfsize = omin(PAGE_SIZE - pgoff, rem); + xfsize = omin(rem, xfsize); xfsize = omin(space - loopbytes, xfsize); if (xfsize <= 0) { + VM_OBJECT_UNLOCK(obj); done = 1; /* all data sent */ break; } @@ -2104,7 +2071,6 @@ retry_space: * if not found or wait and loop if busy. */ pindex = OFF_TO_IDX(off); - VM_OBJECT_LOCK(obj); pg = vm_page_grab(obj, pindex, VM_ALLOC_NOBUSY | VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_RETRY); @@ -2122,6 +2088,7 @@ retry_space: else if (uap->flags & SF_NODISKIO) error = EBUSY; else { + int bsize; ssize_t resid; /* @@ -2133,16 +2100,25 @@ retry_space: /* * Get the page from backing store. + */ + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + error = vn_lock(vp, LK_SHARED); + if (error != 0) + goto after_read; + bsize = vp->v_mount->mnt_stat.f_iosize; + + /* * XXXMAC: Because we don't have fp->f_cred * here, we pass in NOCRED. This is probably * wrong, but is consistent with our original * implementation. */ - vfslocked = VFS_LOCK_GIANT(vp->v_mount); error = vn_rdwr(UIO_READ, vp, NULL, MAXBSIZE, trunc_page(off), UIO_NOCOPY, IO_NODELOCKED | IO_VMIO | ((MAXBSIZE / bsize) << IO_SEQSHIFT), td->td_ucred, NOCRED, &resid, td); + VOP_UNLOCK(vp, 0); + after_read: VFS_UNLOCK_GIANT(vfslocked); VM_OBJECT_LOCK(obj); vm_page_io_finish(pg); @@ -2198,7 +2174,7 @@ retry_space: m0 = m_get((mnw ? M_NOWAIT : M_WAITOK), MT_DATA); if (m0 == NULL) { error = (mnw ? EAGAIN : ENOBUFS); - sf_buf_mext(NULL, sf); + sf_buf_mext((void *)sf_buf_kva(sf), sf); break; } MEXTADD(m0, sf_buf_kva(sf), PAGE_SIZE, sf_buf_mext, @@ -2226,8 +2202,6 @@ retry_space: } } - VOP_UNLOCK(vp, 0); - /* Add the buffer chain to the socket buffer. */ if (m != NULL) { int mlen, err;