From owner-svn-src-user@freebsd.org Mon May 1 02:08:45 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF395D58604 for ; Mon, 1 May 2017 02:08:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 BFD45139C; Mon, 1 May 2017 02:08:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4128iTb091851; Mon, 1 May 2017 02:08:44 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4128i3T091849; Mon, 1 May 2017 02:08:44 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201705010208.v4128i3T091849@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 1 May 2017 02:08:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317630 - user/markj/PQ_LAUNDRY_11/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2017 02:08:46 -0000 Author: markj Date: Mon May 1 02:08:44 2017 New Revision: 317630 URL: https://svnweb.freebsd.org/changeset/base/317630 Log: Restore VM_ALLOC_IF{,NOT}CACHED. VM_ALLOC_IFCACHED requests always fail, and VM_ALLOC_IFNOTCACHED has no effect. Modified: user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.c user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.h Modified: user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.c ============================================================================== --- user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.c Mon May 1 02:01:12 2017 (r317629) +++ user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.c Mon May 1 02:08:44 2017 (r317630) @@ -1521,6 +1521,9 @@ vm_page_alloc(vm_object_t object, vm_pin if (object != NULL) VM_OBJECT_ASSERT_WLOCKED(object); + if (__predict_false((req & VM_ALLOC_IFCACHED) != 0)) + return (NULL); + req_class = req & VM_ALLOC_CLASS_MASK; /* Modified: user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.h ============================================================================== --- user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.h Mon May 1 02:01:12 2017 (r317629) +++ user/markj/PQ_LAUNDRY_11/sys/vm/vm_page.h Mon May 1 02:08:44 2017 (r317630) @@ -405,6 +405,8 @@ vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa) #define VM_ALLOC_ZERO 0x0040 /* (acfg) Try to obtain a zeroed page */ #define VM_ALLOC_NOOBJ 0x0100 /* (acg) No associated object */ #define VM_ALLOC_NOBUSY 0x0200 /* (acg) Do not busy the page */ +#define VM_ALLOC_IFCACHED 0x0400 +#define VM_ALLOC_IFNOTCACHED 0x0800 #define VM_ALLOC_IGN_SBUSY 0x1000 /* (g) Ignore shared busy flag */ #define VM_ALLOC_NODUMP 0x2000 /* (ag) don't include in dump */ #define VM_ALLOC_SBUSY 0x4000 /* (acg) Shared busy the page */