From owner-svn-src-projects@freebsd.org Wed Jul 26 22:32:58 2017 Return-Path: Delivered-To: svn-src-projects@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 6B104DB23D7 for ; Wed, 26 Jul 2017 22:32:58 +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 380FF7DE76; Wed, 26 Jul 2017 22:32:58 +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 v6QMWv6B024837; Wed, 26 Jul 2017 22:32:57 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6QMWv6c024836; Wed, 26 Jul 2017 22:32:57 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201707262232.v6QMWv6c024836@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 26 Jul 2017 22:32:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321590 - projects/numa2/sys/vm X-SVN-Group: projects X-SVN-Commit-Author: markj X-SVN-Commit-Paths: projects/numa2/sys/vm X-SVN-Commit-Revision: 321590 X-SVN-Commit-Repository: base 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.23 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, 26 Jul 2017 22:32:58 -0000 Author: markj Date: Wed Jul 26 22:32:57 2017 New Revision: 321590 URL: https://svnweb.freebsd.org/changeset/base/321590 Log: Let vm_page_alloc_domain() return NULL even when v_free_count is large. The selected domain may be exhausted even when plenty of free pages are available. Until we have a policy for handling local page shortages, just return NULL to signal that an allocation from a different domain should be attempted. Modified: projects/numa2/sys/vm/vm_page.c Modified: projects/numa2/sys/vm/vm_page.c ============================================================================== --- projects/numa2/sys/vm/vm_page.c Wed Jul 26 22:04:23 2017 (r321589) +++ projects/numa2/sys/vm/vm_page.c Wed Jul 26 22:32:57 2017 (r321590) @@ -1636,10 +1636,11 @@ vm_page_alloc_domain(vm_object_t object, vm_pindex_t p return (NULL); } - /* - * At this point we had better have found a good page. - */ - KASSERT(m != NULL, ("vm_page_alloc: missing page")); + if (m == NULL) { + /* XXX */ + mtx_unlock(&vm_page_queue_free_mtx); + return (NULL); + } vm_phys_freecnt_adj(m, -1); mtx_unlock(&vm_page_queue_free_mtx); vm_page_alloc_check(m);