From nobody Mon Jul 11 05:41:25 2022 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 CE4221D037D3; Mon, 11 Jul 2022 05:41:25 +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 4LhCRn5ZJcz3yxF; Mon, 11 Jul 2022 05:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657518085; 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=VDsPQ/eQAyZouIsCK1eYFOUPOJ1Md9TsLKyWU12eOYw=; b=sBuE7jjMuFhlwtYzsdLwrUR8fYMYmOgDM7p6AkOsmp/Bnv0bcRaCJV0Tz80ew9IRm95WpE cj9V9tGLg6x9jV8mBxuMwM0KO/tbDpv7OUZISmkhFheSn3I9T20It/0Op8UQ3Yw2376l6q GTbBbpzJ/101IfIoMjIg+gt8NWZ21pHXBAtgW/oiHOL72P4K3ozubOZpeGRidjDcB4B3md xRy8yf/JI41lE4O3eZx6iXZiiZYMimc9SJrdic/h4M4N9VjFxFzlgrjEQNWWvtS2dVogc8 8uO6d3nGNGLIdfQItb08Cg3qE5duWGwTAeHhIQnGtu7RAyifpSjgD5JTjzyQ5g== 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 4LhCRn4gp9zstx; Mon, 11 Jul 2022 05:41: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 26B5fPL3048602; Mon, 11 Jul 2022 05:41:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26B5fPNd048601; Mon, 11 Jul 2022 05:41:25 GMT (envelope-from git) Date: Mon, 11 Jul 2022 05:41:25 GMT Message-Id: <202207110541.26B5fPNd048601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: b52d35520c51 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b52d35520c51b885f68256b1b5cd1931d07add49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657518085; 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=VDsPQ/eQAyZouIsCK1eYFOUPOJ1Md9TsLKyWU12eOYw=; b=EjlhtkZBU+ZbeHJi98PF3EzAvFCQZHduWYUi0umYWqqEkPgXObrpruDJxV0UvI0KuS1lQH pue/dPoJLZAWTzaW4DhEYs9V/cfYGZl4DrkRFQzJJ/P9eqg8a3zSDlJuzcFMSmiR5VAq2V a5C2qk1tZozCxYJ3uOV/cY4oVm3B+vzdbeVNgyVJUtxnV3m9nKKElDDfmoPfjy9YK5E/8q KROcWWsXiNqNfAqppJTzXFmz7xRn81tx3mkPX5T0GYjjeKeozAMRX8v6XzQ3d26v4P74Yi 9p3mMGCLoeWxfT7Xy/ZNZsGi2af49U7eUwZBnxe43P+FqDqR/gLpCN2RCNHR/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657518085; a=rsa-sha256; cv=none; b=LBle3MXT72OQWPMl/ku2UwANh1klpyFDGJzSritQL6j/J1x2h96B+RHUp7YR9vYjIJ7IVg v/vZEAuZIM+K+0Crt+XYh/J+3gmJyVR63fYAhL4mhtp95h7/jOp7uUTD1wE+xLMhRj4D03 Qn/0PB8OylUhM7YQoh/jOJ0NGEsmOU6hgvnqr2upiABrcQHrRylNIJ+bg7NQ6mmNQ+qJYA GpDOg+9r8tEhwfH6g9PLXNDw9WGZsNO15+Yz2YF/ToKsGZgCSf6RjZojY+HGatHzLHevLk MmJgFHasNyRHDYNUHa7XcUqysD8CB6Z2eX986TDh3oR+MNsEaN8QRI+6lazPdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b52d35520c51b885f68256b1b5cd1931d07add49 commit b52d35520c51b885f68256b1b5cd1931d07add49 Author: Doug Moore AuthorDate: 2021-12-24 08:47:21 +0000 Commit: Doug Moore CommitDate: 2022-07-11 05:41:06 +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 (cherry picked from commit 184c63db3c949d8ba766dc7b2bd2f082404e169d) --- 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 2b9e46674bdf..4db88c91cba4 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2195,11 +2195,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. */