From nobody Fri May 16 08:20:21 2025 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 4ZzKlB5P7Nz5wJb3; Fri, 16 May 2025 08:20:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzKlB0WvWz3jYF; Fri, 16 May 2025 08:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747383622; 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=s6Pxj9Y31iR3JnWAXtXXYRJpAAyaakkI+s+nwWxXCDA=; b=GG9aFe7byAosKoFJlb3Z8kP6Hj7VAfukEzDlBOzDMbHcfObcOuxWcEFIMhQi4MzNbiY9V/ Qv0cdGgqFnBVLHxuqYfE7+oXZgnRnabB7j/k6X2CBeCd4SZKsOYWDkvpbTPJNMixf6/Fa1 cCm1DACCI97q2squv8Wl/R44wfzh2lCxVBT8rbT6atMT0QkZtXLJ3QCE2NZGYhBWaxqWDl ryhEheHaYJCK7naxY2IX849EntrmOaVghysRAK0d/TBGkZxvYX9gbalT+K5Inscivp/cvx PzoAWzrDAgNvNUUstDr6hdr19l5c5cj4VmObAO/Mx5O8cYNjPJregiJGWMPq4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747383622; 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=s6Pxj9Y31iR3JnWAXtXXYRJpAAyaakkI+s+nwWxXCDA=; b=IaC/TQUjsP2scdDR9txoeJ0YTL0NkYoHlKjNqSpCHWneJsFmi/xUxXyJxuSSQA0J4/MDDK mDTLSZpMcQY55izyoKMEFCWSB3V3SrC1sk8aKpxpSeaDfvXXHLDFCeaCtoJFzsqMIdd7A1 C1+2Ftfs+kL5dF9/gkoTq8o0L+5pmDX+djLhfSY3GdKjU7DWOx7eW7qLEamfVoEvn7n3/m ppUQL5YigEf+BM3GSqFPXxnImvQzVyj2v9u17nCNv+SiDElgsJ5HNzx9nzWuAOMjBxznhb oHrc8aFW6cOwN1CSSiZmpg8zgUXbrpje14gGt0zietzo5v2TfzuTkxWPylgyJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747383622; a=rsa-sha256; cv=none; b=PzJnFvchyOjib7jNMUnugbjKu7V8pTfrDJXCfu0InnjtNnCCDPqcK5kMcGCPLTIY4HhYN6 3kAZufsKnDZ/Gjb5HFNBHYr93PwG/L6GKKApavmit7cNhafSpMGtoYDnOBnz27DpPauJLc 6pEdrrzK87PRG/wJ0WLZJb4r7BFkDsHyXi0Tex/vQ5raz8CKHkmTHxGeKlG/hCAe2F2D+R +MvRwMg6E7anDIKxgvnMuqAnfJk/iRc20QJlnBavq7HvoDQnzFRhby1DCi7MyXS9WIikCB 1GUjML2/W1fzzo4JNjlYpE2dE0ZeSYjGzW+aBacM0FhyAuiWC9qF6txMqJUNlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZzKl95Q8bzw4M; Fri, 16 May 2025 08:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54G8KLdJ075393; Fri, 16 May 2025 08:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54G8KLtX075390; Fri, 16 May 2025 08:20:21 GMT (envelope-from git) Date: Fri, 16 May 2025 08:20:21 GMT Message-Id: <202505160820.54G8KLtX075390@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: 7c9fe7a7925b - main - vm_page: remove obsolete page alloc loops 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 7c9fe7a7925b8f60e056628fceaaf5f1a969fff4 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=7c9fe7a7925b8f60e056628fceaaf5f1a969fff4 commit 7c9fe7a7925b8f60e056628fceaaf5f1a969fff4 Author: Doug Moore AuthorDate: 2025-05-16 08:05:40 +0000 Commit: Doug Moore CommitDate: 2025-05-16 08:05:40 +0000 vm_page: remove obsolete page alloc loops When page_alloc_noobj functions were introduced, the need for loops to support cycles of try-alloc, then wait, then retry disppeared from vm_page_alloc_domain and vm_page_alloc_contig_domain functions, but loops remained. Remove them. Reported by: alc Reviewed by: alc, markj, kib Differential Revision: https://reviews.freebsd.org/D50263 --- sys/vm/vm_page.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 035b144ccd1e..f83df515a03d 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2140,8 +2140,6 @@ again: * Not allocatable, give up. */ pctrie_iter_reset(pages); - if (vm_domain_alloc_fail(vmd, object, req)) - goto again; return (NULL); } @@ -2333,23 +2331,23 @@ vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain, KASSERT(npages > 0, ("vm_page_alloc_contig: npages is zero")); vm_page_iter_init(&pages, object); - for (;;) { + m_ret = NULL; #if VM_NRESERVLEVEL > 0 - /* - * Can we allocate the pages from a reservation? - */ - if (vm_object_reserv(object) && - (m_ret = vm_reserv_alloc_contig(object, pindex, domain, - req, npages, low, high, alignment, boundary, &pages)) != - NULL) { - break; - } + /* + * Can we allocate the pages from a reservation? + */ + if (vm_object_reserv(object)) { + m_ret = vm_reserv_alloc_contig(object, pindex, domain, + req, npages, low, high, alignment, boundary, &pages); + } #endif - if ((m_ret = vm_page_find_contig_domain(domain, req, npages, - low, high, alignment, boundary)) != NULL) - break; - if (!vm_domain_alloc_fail(VM_DOMAIN(domain), object, req)) - return (NULL); + if (m_ret == NULL) { + m_ret = vm_page_find_contig_domain(domain, req, npages, + low, high, alignment, boundary); + } + if (m_ret == NULL) { + (void)vm_domain_alloc_fail(VM_DOMAIN(domain), object, req); + return (NULL); } /*