From nobody Fri Dec 24 08:51:39 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 8AF1C19073C4; Fri, 24 Dec 2021 08:51:39 +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 4JL1571qvSz4kPw; Fri, 24 Dec 2021 08:51:39 +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 1EBED21338; Fri, 24 Dec 2021 08:51:39 +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 1BO8pd5T043306; Fri, 24 Dec 2021 08:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BO8pdnH043305; Fri, 24 Dec 2021 08:51:39 GMT (envelope-from git) Date: Fri, 24 Dec 2021 08:51:39 GMT Message-Id: <202112240851.1BO8pdnH043305@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: 184c63db3c94 - main - Fix clerical error in page alloc 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 184c63db3c949d8ba766dc7b2bd2f082404e169d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640335899; 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=20rzRHPrtMuOKqlvykSzfSYtkmCuZv2A4WtewLPRnWU=; b=E7IihtPxK+oypz1gDDROHwn/lKNla9WWkGI317kBop77GmUjr3sM/Jn3vGPT5+eUz5fmQx 8PKGQiRVx/wM0HyLjyeGdTB3zWXzWLN2JJonr/kmdzw8Hf9vp/W28FqbZHZXsVuUG/KV9T T1V/sAHQLFIvNQDFOYr5bBs94WJphifJh0+aydJfme2wikIlAefXmSOD7d3e0TLKsw6Sja JCF2yulKZ9YiBLdaiG8cIT6CXoESjLwqEYZMtxCiTE/pLQGngE+pmDKL29buada88ZycWm 9OLfizs4m1npQb+kyQ/209u77IdpjIP9d4cvkeZSK8op0+DNmcJvGimOu8mvaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640335899; a=rsa-sha256; cv=none; b=Tm50jPLMhHWvijbODeRUWMSjv3tMvNq1Vtxwinqj9H2B1pud3aXAlekhbIay1LDurM81KZ cLH8OsP5UXE1KZWfgDT8iZ0de+brhpsa5rpVfefpHPGW5wJlDaI/jvfBFbeJwP/pYRpdt5 9AYHQwNJwjqoxj/o7jvJWDS97cq/DwOw7vw0841GhLLyEjib0PnM9oc3Hb1QkTqcafqSH4 BVjA7Ojags+LHX2+BngYn1IlMfOz1GpgJ+xygvwHhg1DawFFjAwiznlsmPYlZfZrIioxK6 3jyOkZk3XJ6ZLyHHGdWkK56FqXxPEqpvJs8LIOXxZsWLJ7dtqIH/WZEpeMijzw== 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=184c63db3c949d8ba766dc7b2bd2f082404e169d commit 184c63db3c949d8ba766dc7b2bd2f082404e169d Author: Doug Moore AuthorDate: 2021-12-24 08:47:21 +0000 Commit: Doug Moore CommitDate: 2021-12-24 08:47:21 +0000 Fix clerical error in page alloc Fix a very recent change that introduced a page accounting error in case of a reserveration being broken. Reviewed by: alc Fixes: fb38b29b5609 (page_alloc_br) vm_page: Remove extra test, dup code from page alloc Differential Revision: https://reviews.freebsd.org/D33645 --- sys/vm/vm_page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index c24da96f4312..03351b0ad3dd 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2186,11 +2186,11 @@ vm_page_find_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, vm_page_t m_ret; vmd = VM_DOMAIN(domain); - if (!vm_domain_allocate(vmd, req, npages)) - return (NULL); #if VM_NRESERVLEVEL > 0 again: #endif + if (!vm_domain_allocate(vmd, req, npages)) + return (NULL); /* * Try to allocate the pages from the free page queues. */