From owner-svn-src-projects@FreeBSD.ORG Fri Mar 7 01:13:48 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 C66E1D05; Fri, 7 Mar 2014 01:13:48 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B451B6D6; Fri, 7 Mar 2014 01:13:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s271DmUl014930; Fri, 7 Mar 2014 01:13:48 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s271DmA5014927; Fri, 7 Mar 2014 01:13:48 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201403070113.s271DmA5014927@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 7 Mar 2014 01:13:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262881 - projects/sendfile/sys/vm 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.17 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: Fri, 07 Mar 2014 01:13:48 -0000 Author: glebius Date: Fri Mar 7 01:13:48 2014 New Revision: 262881 URL: http://svnweb.freebsd.org/changeset/base/262881 Log: Add VM_ALLOC_NOWAIT flag, that tells vm_page_grab() to fail in case if it needs to sleep(9). Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/vm/vm_page.h Modified: projects/sendfile/sys/vm/vm_page.c ============================================================================== --- projects/sendfile/sys/vm/vm_page.c Fri Mar 7 01:01:57 2014 (r262880) +++ projects/sendfile/sys/vm/vm_page.c Fri Mar 7 01:13:48 2014 (r262881) @@ -2689,6 +2689,8 @@ retrylookup: sleep = (allocflags & VM_ALLOC_IGN_SBUSY) != 0 ? vm_page_xbusied(m) : vm_page_busied(m); if (sleep) { + if (allocflags & VM_ALLOC_NOWAIT) + return (NULL); /* * Reference the page before unlocking and * sleeping so that the page daemon is less @@ -2716,6 +2718,8 @@ retrylookup: } m = vm_page_alloc(object, pindex, allocflags & ~VM_ALLOC_IGN_SBUSY); if (m == NULL) { + if (allocflags & VM_ALLOC_NOWAIT) + return (NULL); VM_OBJECT_WUNLOCK(object); VM_WAIT; VM_OBJECT_WLOCK(object); Modified: projects/sendfile/sys/vm/vm_page.h ============================================================================== --- projects/sendfile/sys/vm/vm_page.h Fri Mar 7 01:01:57 2014 (r262880) +++ projects/sendfile/sys/vm/vm_page.h Fri Mar 7 01:13:48 2014 (r262881) @@ -390,6 +390,7 @@ vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa) #define VM_ALLOC_IGN_SBUSY 0x1000 /* vm_page_grab() only */ #define VM_ALLOC_NODUMP 0x2000 /* don't include in dump */ #define VM_ALLOC_SBUSY 0x4000 /* Shared busy the page */ +#define VM_ALLOC_NOWAIT 0x8000 /* Return NULL instead of sleeping */ #define VM_ALLOC_COUNT_SHIFT 16 #define VM_ALLOC_COUNT(count) ((count) << VM_ALLOC_COUNT_SHIFT)