From nobody Wed Oct 20 01:23:25 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 24F1817F0098; Wed, 20 Oct 2021 01:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HYtCz5f62z3ljh; Wed, 20 Oct 2021 01:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50C661EB11; Wed, 20 Oct 2021 01:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19K1NPKb095668; Wed, 20 Oct 2021 01:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19K1NPnV095667; Wed, 20 Oct 2021 01:23:25 GMT (envelope-from git) Date: Wed, 20 Oct 2021 01:23:25 GMT Message-Id: <202110200123.19K1NPnV095667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a9d6f1fe0a2f - main - Remove some remaining references to VM_ALLOC_NOOBJ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9d6f1fe0a2f852efe7a324f65d7142537b2c14e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a9d6f1fe0a2f852efe7a324f65d7142537b2c14e commit a9d6f1fe0a2f852efe7a324f65d7142537b2c14e Author: Mark Johnston AuthorDate: 2021-10-20 00:28:54 +0000 Commit: Mark Johnston CommitDate: 2021-10-20 01:22:56 +0000 Remove some remaining references to VM_ALLOC_NOOBJ Reviewed by: alc, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32037 --- sys/vm/uma.h | 3 ++- sys/vm/uma_core.c | 2 +- sys/vm/vm_page.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 5d473ba909b6..743e02cdddf9 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -483,7 +483,8 @@ void uma_zone_reserve(uma_zone_t zone, int nitems); /* * Reserves the maximum KVA space required by the zone and configures the zone - * to use a VM_ALLOC_NOOBJ-based backend allocator. + * to use a backend that allocates physical memory and maps it using the + * reserved KVA. * * Arguments: * zone The zone to update. diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 68553bda2249..35ed473da5ca 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -2014,7 +2014,7 @@ fail: } /* - * Allocates a number of pages from within an object + * Allocates a number of pages not belonging to a VM object * * Arguments: * bytes The number of bytes requested diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 140ea7e2fadb..21e33facc0a8 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -542,9 +542,10 @@ vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa); #define VM_ALLOC_WIRED 0x0020 /* (acgnp) Allocate a wired page */ #define VM_ALLOC_ZERO 0x0040 /* (acgnp) Allocate a zeroed page */ #define VM_ALLOC_NORECLAIM 0x0080 /* (c) Do not reclaim after failure */ -#define VM_ALLOC_NOOBJ 0x0100 /* (acg) No associated object */ +#define VM_ALLOC_AVAIL0 0x0100 #define VM_ALLOC_NOBUSY 0x0200 /* (acgp) Do not excl busy the page */ #define VM_ALLOC_NOCREAT 0x0400 /* (gp) Don't create a page */ +#define VM_ALLOC_AVAIL1 0x0800 #define VM_ALLOC_IGN_SBUSY 0x1000 /* (gp) Ignore shared busy flag */ #define VM_ALLOC_NODUMP 0x2000 /* (ag) don't include in dump */ #define VM_ALLOC_SBUSY 0x4000 /* (acgp) Shared busy the page */