From nobody Wed Dec 10 16:00:39 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 4dRL6J19YBz6KnMH for ; Wed, 10 Dec 2025 16:00:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRL6J0KpXz3Zrj for ; Wed, 10 Dec 2025 16:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765382440; 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=KoksV57Rz8pTQy/BNfyyv3yDjoagQ1XClG0LS+V3z8U=; b=jPbXackTqOigGa0neXnStoOd65855NEwZ7MgjBHZwTIj2bdgCDpRXtkGvlvASa3Lz0kSdr Q2j4SfzA3dUauwbwjIE6FvK067CTwyWAtTFCM3XVJEoMHLg2UigUFyKrUkwgY/JmrDMgYl NqMzLCBtdSlFkrW2xQ+qGSQpJgK+XpzPx68xNmh4CyDftya5iJ0oZ4HNQCXsCVx/NWTUrO 4atMjjpofXNW0JqCyARFH7z1bccEs2ujIWL/xFImjfJnsAlqYoRzL0suZYU9kj9Y6OrmMi GjL8Ksrv01Ws7rxGCQltuyUNPjjHDCEi+H+JcyYVwnkQklh70BoawsGKUhcDiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765382440; 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=KoksV57Rz8pTQy/BNfyyv3yDjoagQ1XClG0LS+V3z8U=; b=hyCNqMc2Y7fZd+JRjQj4xISVkZFCo4IuIGsFrLsEIQhlABJXdkiaZ9eHVkDBNrC3sYqtWd VhiNN+/DSx2Aoaf4mXNhRo7iCQ9rvgnR9fxC/OwVq91arZchHrZ8qVPWGCUUWkQ/HRX48m 49X3FAHWcD9Jk/EYK0gPm/IG0ejwCdil4s7puzKIRsQlXBBzAeKDBbR+EyUacBYDsYgJTA LWVl9ITB+wBO5EEKStJIyHA1am7FYKDQ638+wnm2uoVcMYpSP84KAQTVILl+95L+cX/cSE KAPRMXtD4XPOUoeP2ouBembL67ewoJiLGeBkiiUti6uwoO2E4tHysynnMlwGoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765382440; a=rsa-sha256; cv=none; b=IZYL7j0fbZiljj9eKzXNn+s+HxHsiTsQb6PoXCwsWhXtiBqphYRSSnBMtimjsopwub7l82 0VmcNev7QCrHTt1NZuOhZTsB/5c1ozKZ+TdizfgXXTHTrO6JLzA4+j/qVspIe8OktEoI5r ipwvpRR5rodS/NO0wxY6bKlXtljZpAs/o5UkqaKrLCvCXDGlZBSe4mKMBzBs3qGoyQVgfn 49LW4v9S4cCniBZ4YWK133GfAwWban/cGl24d0pz9HFXmTDWu6MKiUPfeVUwQIjnr+ytOv /HCF/+lVRfe3qASdlftN2Y2W3Ib5f8YeYB5727dVah9iV8CozcEOEO8NMt35VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dRL6H72j4zrlj for ; Wed, 10 Dec 2025 16:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39991 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 16:00:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Austin Shafer Subject: git: 4ae02d979227 - main - linuxkpi: clean up stray pctrie_iter_reset 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: ashafer X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ae02d9792272fa8c43f4982cf338123d9bcaed2 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 16:00:39 +0000 Message-Id: <69399927.39991.63f41f2f@gitrepo.freebsd.org> The branch main has been updated by ashafer: URL: https://cgit.FreeBSD.org/src/commit/?id=4ae02d9792272fa8c43f4982cf338123d9bcaed2 commit 4ae02d9792272fa8c43f4982cf338123d9bcaed2 Author: Austin Shafer AuthorDate: 2025-12-09 15:33:17 +0000 Commit: Austin Shafer CommitDate: 2025-12-10 16:00:08 +0000 linuxkpi: clean up stray pctrie_iter_reset This removes an extraneous pctrie_iter_reset before returning. This is not needed as it simply clears a local variable that will get cleaned up anyway as we immediately return from the function. MFC after: 1 week Sponsored by: NVIDIA Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D54153 --- sys/compat/linuxkpi/common/src/linux_page.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 2b2827579cba..c0d9d71ba1ce 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -345,10 +345,8 @@ retry: page = vm_page_grab_iter(vm_obj, pindex, VM_ALLOC_NOCREAT, &pages); if (page == NULL) { page = PHYS_TO_VM_PAGE(IDX_TO_OFF(pfn)); - if (page == NULL) { - pctrie_iter_reset(&pages); + if (page == NULL) return (VM_FAULT_SIGBUS); - } if (!vm_page_busy_acquire(page, VM_ALLOC_WAITFAIL)) { pctrie_iter_reset(&pages); goto retry;