From nobody Mon Mar 24 03:21:27 2025 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 4ZLdcm0hR2z5rDt0; Mon, 24 Mar 2025 03:21:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLdcl6q9Tz3vZt; Mon, 24 Mar 2025 03:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742786488; 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=S4Up+qJhsYChniOwc3fHeZfeGQKE088qvwQgMz2hmfM=; b=XxlJYdxFuFV6b6lbj+/2reH9K0tXSVFzIEzgf/4JYxaAp4Z3CiS7iZ8k7DJz7UuwGxa6FW vNNGccNjqS/G2AttbA08rJ/wpR9tcqkPCSuc8oCEkFqtyfaIbPPeHVBHETSmn4czy6qDPb KloHquKI9bKj+KOXD5sj9R622t1jWQ8XKkJyoDSxMFdClOemPNEkudbdawKdn6Mr16lSdN iJbIdMx9zIhBwJFx2tIbkyr36BGGH4XjPy+mXt4yhCVLiXTOWnV+Jtj81+9uG6tRZI6Pfd 1GxfhCKUkNuTFS3cu5d5IzIRzKB6cW4FHQwZa91pDe9t7rcCNvCfbghpiyoxYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742786488; a=rsa-sha256; cv=none; b=lUaT9pzwapeM5+8uNcAYtofzB80w/6bt0WLCY6l0BmYvQlu+cdMwNkncXfdn4IJBP70FOx 0a0z2zBn0GJ2/jtH3UeW4WwbTJ90eZJe9f5/yDmchqVIqTSnS5Y6C+G/bdfEonBRlYfsEU 0s0Hav4AtAesWRy7HoWQd9kmSeg4Jeh94hW4WAVp7Xhk1sE5YsC1C3JE+rtLJ8H8Irlahe ovyL+gFmESG3it56r25vT8LhT0JtRpUnmPE+46kvmaMHZFV4bP3OkAHtoTWj3iy6+1tLfL Xmx2zT9eRwZKlKvJv6l4htOfErdFZBV4xwrn6cdrxz9M3uzniIM8IFVDLapmww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742786488; 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=S4Up+qJhsYChniOwc3fHeZfeGQKE088qvwQgMz2hmfM=; b=jjWdEQZtixwmk9EwF1VhwTiR822TkCJsAd2y2YLhrlm/zBiuYuPNTxEqE3FK+c4zIAotpe Bytmyhy9oYhYFNYSnu5wm2pBpWOkmpOFlJl0mxYIg8ZBr0PQsECtn2J8ewB0/f0l03amLk 0OSBbVo1RkttqZgmpfQKR8H1aeCasPh/kcaqB7/pkYeICTJZW7HFGBVy8lFIncRDezZ19w A5xAPjWL3TvsEAM3Cz5qzzRLBeVYs6hjY6fc0ggvpnJibmcAtS/cDyz52YinZUBnzMDmf9 z8uoUF4fvTzdK30nIK19mfmmavdw9HjofOaXQII04Kzu/ByNZpUWl+RWfdSt9Q== 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 4ZLdcl6Ng2zd0R; Mon, 24 Mar 2025 03:21:27 +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 52O3LRc7078094; Mon, 24 Mar 2025 03:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O3LR53078091; Mon, 24 Mar 2025 03:21:27 GMT (envelope-from git) Date: Mon, 24 Mar 2025 03:21:27 GMT Message-Id: <202503240321.52O3LR53078091@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: 626ec04c2b84 - main - vm_reserv: clarify reserv_from_object 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 626ec04c2b84f646c8b96e0fd1b4aac95d8035ce Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=626ec04c2b84f646c8b96e0fd1b4aac95d8035ce commit 626ec04c2b84f646c8b96e0fd1b4aac95d8035ce Author: Doug Moore AuthorDate: 2025-03-24 03:19:57 +0000 Commit: Doug Moore CommitDate: 2025-03-24 03:19:57 +0000 vm_reserv: clarify reserv_from_object vm_reserv_from_page returns an existing reservation, or initializes a successor pointer, or both. If it returns an existing reservation, callers will ignore the successor pointer, initialized or not, so initializing it serves no purpose. So, don't initialize it in that case, and make less ambiguous the comment that describes the function's behavior. Reviewed by: markj, kib, alc Differential Revision: https://reviews.freebsd.org/D49415 --- sys/vm/vm_reserv.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c index 1102cb61323a..3dc278851cc9 100644 --- a/sys/vm/vm_reserv.c +++ b/sys/vm/vm_reserv.c @@ -506,7 +506,8 @@ vm_reserv_from_page(vm_page_t m) } /* - * Returns an existing reservation or NULL and initialized successor pointer. + * Either returns an existing reservation or returns NULL and initializes + * successor pointer. */ static vm_reserv_t vm_reserv_from_object(vm_object_t object, vm_pindex_t pindex, @@ -515,7 +516,6 @@ vm_reserv_from_object(vm_object_t object, vm_pindex_t pindex, vm_reserv_t rv; vm_page_t msucc; - msucc = NULL; if (mpred != NULL) { KASSERT(mpred->object == object, ("vm_reserv_from_object: object doesn't contain mpred")); @@ -523,7 +523,7 @@ vm_reserv_from_object(vm_object_t object, vm_pindex_t pindex, ("vm_reserv_from_object: mpred doesn't precede pindex")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) - goto found; + return (rv); msucc = TAILQ_NEXT(mpred, listq); } else msucc = TAILQ_FIRST(&object->memq); @@ -532,14 +532,10 @@ vm_reserv_from_object(vm_object_t object, vm_pindex_t pindex, ("vm_reserv_from_object: msucc doesn't succeed pindex")); rv = vm_reserv_from_page(msucc); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) - goto found; + return (rv); } - rv = NULL; - -found: *msuccp = msucc; - - return (rv); + return (NULL); } /*