From owner-svn-src-projects@FreeBSD.ORG Wed May 28 13:01:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69DC87C3; Wed, 28 May 2014 13:01:11 +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 57186242E; Wed, 28 May 2014 13:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SD1BFa053089; Wed, 28 May 2014 13:01:11 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4SD1BkA053088; Wed, 28 May 2014 13:01:11 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201405281301.s4SD1BkA053088@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 28 May 2014 13:01:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r266804 - 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 13:01:11 -0000 Author: glebius Date: Wed May 28 13:01:10 2014 New Revision: 266804 URL: http://svnweb.freebsd.org/changeset/base/266804 Log: When working on a sparse file sendfile_getpages() could skip a page. This happened due to increment both in the for (;;) statement and in the loop itself. Fix this by removing increment in for (;;). Now all increments are done "manually", this fixes the bug and makes code more comprehendable. 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 12:58:37 2014 (r266803) +++ projects/sendfile/sys/kern/uipc_syscalls.c Wed May 28 13:01:10 2014 (r266804) @@ -2750,12 +2750,13 @@ sendfile_swapin(vm_object_t obj, struct pa[i] = vm_page_grab(obj, OFF_TO_IDX(vmoff(i, off)), VM_ALLOC_WIRED | VM_ALLOC_NORMAL); - for (int i = 0; i < npages; i++) { + for (int i = 0; i < npages;) { int j, a, count, rv; if (vm_page_is_valid(pa[i], vmoff(i, off) & PAGE_MASK, xfsize(i, npages, off, len))) { vm_page_xunbusy(pa[i]); + i++; continue; } @@ -2806,7 +2807,7 @@ sendfile_swapin(vm_object_t obj, struct ("pa[j] %p lookup %p\n", pa[j], vm_page_lookup(obj, OFF_TO_IDX(vmoff(j, off))))); - i += count - 1; + i += count; } VM_OBJECT_WUNLOCK(obj);