From owner-svn-src-projects@FreeBSD.ORG Mon Jun 9 14:34:34 2014 Return-Path: Delivered-To: svn-src-projects@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 ESMTPS id 6887FA79; Mon, 9 Jun 2014 14:34:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55B002AA3; Mon, 9 Jun 2014 14:34:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59EYYYL044558; Mon, 9 Jun 2014 14:34:34 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59EYYeV044557; Mon, 9 Jun 2014 14:34:34 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201406091434.s59EYYeV044557@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 9 Jun 2014 14:34:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267275 - projects/sendfile/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 14:34:34 -0000 Author: glebius Date: Mon Jun 9 14:34:33 2014 New Revision: 267275 URL: http://svnweb.freebsd.org/changeset/base/267275 Log: - In sf_io_done() remove a hack that did a zero length pru_send, and instead call pru_ready. This is more efficient and makes sendfile() working on AF_LOCAL sockets. - Mark mbufs as M_NOTREADY only if sendfile_swapin() reported that it issued I/Os. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Mon Jun 9 14:31:35 2014 (r267274) +++ projects/sendfile/sys/kern/uipc_syscalls.c Mon Jun 9 14:34:33 2014 (r267275) @@ -2715,22 +2715,9 @@ sf_io_done(void *arg) if (!refcount_release(&sfio->nios)) return; - so = sfio->sock_fp->f_data; + so = sfio->sock_fp->f_data; - if (sbready(&so->so_snd, sfio->m, sfio->npages) == 0) { - struct mbuf *m; - - m = m_get(M_NOWAIT, MT_DATA); - if (m == NULL) { - panic("XXXGL"); - } - m->m_len = 0; - CURVNET_SET(so->so_vnet); - /* XXXGL: curthread */ - (void )(so->so_proto->pr_usrreqs->pru_send) - (so, 0, m, NULL, NULL, curthread); - CURVNET_RESTORE(); - } + (void)(so->so_proto->pr_usrreqs->pru_ready)(so, sfio->m, sfio->npages); /* XXXGL: curthread */ fdrop(sfio->sock_fp, curthread); @@ -3141,7 +3128,8 @@ retry_space: m0->m_data = (char *)sf_buf_kva(sf) + (vmoff(i, off) & PAGE_MASK); m0->m_len = xfsize(i, npages, off, space); - m0->m_flags |= M_NOTREADY; + if (nios) + m0->m_flags |= M_NOTREADY; if (i == 0) sfio->m = m0;