From owner-svn-src-projects@FreeBSD.ORG Wed May 28 11:30:37 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 BE5B8DC1; Wed, 28 May 2014 11:30:37 +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 921C32B0B; Wed, 28 May 2014 11:30:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SBUb0H013758; Wed, 28 May 2014 11:30:37 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4SBUbqD013757; Wed, 28 May 2014 11:30:37 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201405281130.s4SBUbqD013757@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 28 May 2014 11:30:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r266797 - 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: Wed, 28 May 2014 11:30:37 -0000 Author: glebius Date: Wed May 28 11:30:37 2014 New Revision: 266797 URL: http://svnweb.freebsd.org/changeset/base/266797 Log: No need to embed rhpages into sfio. No need to embed npages into sfio if sendfile_swapin() didn't initialize any 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 Wed May 28 11:23:44 2014 (r266796) +++ projects/sendfile/sys/kern/uipc_syscalls.c Wed May 28 11:30:37 2014 (r266797) @@ -2701,7 +2701,6 @@ fixspace(int old, int new, off_t off, in struct sf_io { u_int nios; int npages; - int rhpages; struct file *sock_fp; struct mbuf *m; vm_page_t pa[]; @@ -2739,10 +2738,10 @@ sf_io_done(void *arg) } static int -sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len) +sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len, + int npages, int rhpages) { vm_page_t *pa = sfio->pa; - int npages = sfio->npages; int nios; nios = 0; @@ -2776,7 +2775,7 @@ sendfile_swapin(vm_object_t obj, struct if (i == j) continue; - count = min(a + 1, npages + sfio->rhpages - i); + count = min(a + 1, npages + rhpages - i); for (j = npages; j < i + count; j++) { pa[j] = vm_page_grab(obj, OFF_TO_IDX(vmoff(j, off)), VM_ALLOC_NORMAL | VM_ALLOC_NOWAIT); @@ -3089,10 +3088,8 @@ retry_space: sfio = malloc(sizeof(struct sf_io) + (rhpages + npages) * sizeof(vm_page_t), M_TEMP, M_WAITOK); refcount_init(&sfio->nios, 1); - sfio->npages = npages; - sfio->rhpages = rhpages; - nios = sendfile_swapin(obj, sfio, off, space); + nios = sendfile_swapin(obj, sfio, off, space, npages, rhpages); /* * Loop and construct maximum sized mbuf chain to be bulk @@ -3189,6 +3186,7 @@ retry_space: (so, 0, m, NULL, NULL, td); } else { sfio->sock_fp = sock_fp; + sfio->npages = npages; fhold(sock_fp); serror = (*so->so_proto->pr_usrreqs->pru_send) (so, PRUS_NOTREADY, m, NULL, NULL, td);