From nobody Fri Dec 24 22:13:45 2021 X-Original-To: dev-commits-src-main@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 1C0431904ED7; Fri, 24 Dec 2021 22:13:46 +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 4JLLtd5tq2z3ssm; Fri, 24 Dec 2021 22:13:45 +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 AA8E23C52; Fri, 24 Dec 2021 22:13:45 +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 1BOMDjuK012269; Fri, 24 Dec 2021 22:13:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BOMDj54012268; Fri, 24 Dec 2021 22:13:45 GMT (envelope-from git) Date: Fri, 24 Dec 2021 22:13:45 GMT Message-Id: <202112242213.1BOMDj54012268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 4bae154fe8c7 - main - vm_page: Move a comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bae154fe8c7a84e3062bb0569ea190fc2e83182 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640384025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HeED2YXGJ9uR82QbytjtDRYeXsvZ3VaO/bB3lFU1dJ4=; b=nVl3/kNRdew0wElhzW9E5IRLVGO9+vSj4Dr480kGjMkrJQpqa3tjQ91UzJkZZNqSqbwh4d zfO2V7pDJ84I89Q0EN8q4d3FbOBrHzcUCYiUQj+0U5Jh05MReAdAs2CyOoQpCw7EirbIjC MOOqfy+X4fcHBxsPuXjQDIXxYiEoPyX+S1/kUMmJJUxP3hh3hBt6inBL6dgpiUFoRxGJNM 4fVETAGjstyRePLeFnhZu3PreHh5A0eM19AzulL5F8erhEls4VtJ7aCo02GUYIkspXeMlH ez1sPuw0jaS1LJWqN3Dsb6t6l/4X+p6faWdMrkweMVvTx2XkrP4yrKEVkTK5OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640384025; a=rsa-sha256; cv=none; b=MRG5W6ItVRlPz4YMoV7EhkIqzU9WrRxD3tfNNaEf3Ik1e841Y5YmtxTYoQnDvb+b31QPnI GA5M8N72peKLQxWTNNTi011l06SRHtVA6/Yu5PxGtX2UDlXbYv/U/GBaPCIs6fGIOnFOAa +jh2x4WwN0sEso7WsB/p3klvtvHAZCOCHQj9jl76iTVbhufr4fIMHQ/xjxKDBaVCdyd8I0 l5Gowq7AtNKS80Mv8J/RTFalMde6s2pmERkyar5gCyWCUXmRArDIVZMCahOYlOdu1qANCM urOBTNA5Uyu4zBv1cQxCUmmUwB6bYe+E6UMu3o4xXIAT/DQuSu33s9QHksHgdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=4bae154fe8c7a84e3062bb0569ea190fc2e83182 commit 4bae154fe8c7a84e3062bb0569ea190fc2e83182 Author: Doug Moore AuthorDate: 2021-12-24 22:10:30 +0000 Commit: Doug Moore CommitDate: 2021-12-24 22:10:30 +0000 vm_page: Move a comment fb38b29b5609 (page_alloc_br) vm_page: Remove extra test, dup code from page alloc should have moved a comment block when it moved the function call that followed it. Move the comment block now. --- sys/vm/vm_page.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 89fa9df9ef42..07691c15d8ef 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2185,6 +2185,10 @@ vm_page_find_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, struct vm_domain *vmd; vm_page_t m_ret; + /* + * Can we allocate the pages without the number of free pages falling + * below the lower bound for the allocation class? + */ vmd = VM_DOMAIN(domain); if (!vm_domain_allocate(vmd, req, npages)) return (NULL); @@ -2238,11 +2242,6 @@ vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain, mpred = vm_radix_lookup_le(&object->rtree, pindex); KASSERT(mpred == NULL || mpred->pindex != pindex, ("vm_page_alloc_contig: pindex already allocated")); - - /* - * Can we allocate the pages without the number of free pages falling - * below the lower bound for the allocation class? - */ for (;;) { #if VM_NRESERVLEVEL > 0 /*