From nobody Wed Dec 17 02:46:28 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 4dWJ8j0LT7z6LhVP for ; Wed, 17 Dec 2025 02:46:29 +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 4dWJ8h6sK9z44Sj for ; Wed, 17 Dec 2025 02:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765939589; 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=NsfvboRJsqgvVgKAo3EzsoeBSOhxzZOL/McdpeTCFrg=; b=RUgyQyGQNQ0Qer0dT1KJwNhNVCvAmBLv7If0AGsH6XGgQVP9D8QtXBrMZ3djYLJERyqTQr pinMkb9x/+2ourwRqueVrpXkukHI19tUU7pbWHHuae680p95d0jLvH4un8ZEEsJyuBmlAd gvMXwj0/bbfnlVU9r6ewvTjT1SNukBcmB0/hWoLMknNgdpU61DfSUcFoXHPD97/eUeyj9g qZNLDHW0UbGFv+UelWGPKWoIAUdGaC/nGkTk1myndJJWUS7vV88/ubmPv7ZVsydRkRq4o1 Ilpd5YBbQQG7QGrB4wCyATivs7uxo/UzdhVyxl2txnvu5Wnh78FsA60cAMk96A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765939589; 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=NsfvboRJsqgvVgKAo3EzsoeBSOhxzZOL/McdpeTCFrg=; b=pEV5VoSLPd76wlsKEdQUeX1vy7J2f1tB8bP6SsddjftvQKaz+cwR05pNCiCShEVjS30RjN /gzpEHxUYBH8Mdhb/xJcWoLxDIoDwpY9kqzzA+BlLnM2wiyAZ7PcnHM6TmM4d9bYxRmwl/ CDIb9bETyu4YIKvyRt30fQkx4efgTcvwkQ7nxpr8kI0vj3iUz/HxDeFgn/DdKO4NqHmHts vKmJspUWeGRSCawlCZaujIcSe+ZCuq1Y3EDPDI4NuMyae2eBzL6e//4fe2ZNxkJ3m6SV3l oopepFXZBg3JDmM6ruTBH+FUEfmMzkpT/b8osu1ucwKAZEOQqxpkKchrsx3wsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765939589; a=rsa-sha256; cv=none; b=ra4Ry+x16fyboZnhTATR/okur+KdUbLv2r/TDHF7Ajqv4j8Q8gNne7ydMSKOiCo0bRMc+M xaAhuChgg/mFvOj9YVC3LQVUvVUMw3zcFdlktMpoqoe4UTYbTiaCWhj1HL0RziS8kHR4RO +06LueEp6I6siKmhEP7in2H/xW6YF5zqQLwlOHow9mlNv2jjirD/7328LKiwsFfFW6p3Y6 rexj9IQ+bmQKudX/cRpbJ00UNTR2psyhAyp0zowYfyVVssop6Zseeu10xQlMduhmVcHb71 e7CuliW13tWP/ow8hhm/8YikT772DKF0bNpq2/XQM62JtXV5Jp928ZCC7gYZdw== 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 4dWJ8h5xMpzZkk for ; Wed, 17 Dec 2025 02:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d8d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Dec 2025 02:46:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Austin Shafer Subject: git: 30d5fc82cf8b - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 30d5fc82cf8beedbc8996fd14392f21c7143cbaf Auto-Submitted: auto-generated Date: Wed, 17 Dec 2025 02:46:28 +0000 Message-Id: <69421984.3d8d5.75628d00@gitrepo.freebsd.org> The branch stable/15 has been updated by ashafer: URL: https://cgit.FreeBSD.org/src/commit/?id=30d5fc82cf8beedbc8996fd14392f21c7143cbaf commit 30d5fc82cf8beedbc8996fd14392f21c7143cbaf Author: Austin Shafer AuthorDate: 2025-12-09 15:33:17 +0000 Commit: Austin Shafer CommitDate: 2025-12-17 02:45:17 +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 (cherry picked from commit 4ae02d9792272fa8c43f4982cf338123d9bcaed2) --- 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;