From nobody Thu Apr 24 19:07:22 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 4Zk57v2x92z5tgnr; Thu, 24 Apr 2025 19:07:23 +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 4Zk57v19KPz3xnJ; Thu, 24 Apr 2025 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745521643; 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=i/Y4SoZ53QnDoMwxOZQGI2gnR6Zvaxw7Io5Q3W5EpdQ=; b=ZzXkd8c/m9TdR9OGixzPgnQp5/hrvvPQBUzCoT0OaxutUYqtyUPytg+rpe/kz3JN3diW1H YG2qRI0dV2Fg1D8f0imNPcx4rwrCD0XAD8mOgh2JuzKYHkr5chGk599VfxPdY+zO1t7FE7 TFMPBK6LLPEUW4EcC9hkh5DJ/G7Q9Z54FrJz+tjr97inmHZooxTRuaIPmL6otuUxJx93Ta OF1VTEtnFq07MA9o9CPDoXeWNQPjqlSb8wcSlx5Z7F5T7f08utsUTHLxOyMrUcqEzzZvjF XkT4uhSJ4k+bZoajPRiASHFSYAsruwHPSPV1Fvx4Rt23+azTG9R0Wm6AZf817g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745521643; a=rsa-sha256; cv=none; b=B1fsUJHF7foxEoxfPSXjOyed1BGi2+K652bPSvNpM7Dt48DZLXHkPoIuWcBl+89oWJ+5/v fF3wPrM1IoOT/UWnHgRLwDe0l5CID4Wfvj6iHPz6mw0vC5q7zI2vw+xlYEbbiBSt1uqIix lFOaX0w2IjPPddTSBA6M0z6w95QC645JXawcf+pAVuhfcojAMpuQ/WJTtMPY8Ogqrl9zsV xGlweypROytlRTlw7Bpn7FDcn5vx+tZA570DW5Na7hlH6GBKWM1UIhxlqSCaF6KiYnoCJR qmcibLULS+KkzT04CH/PUMb7wwLBJolbAC1eFWOgzQCmBamP3wlGtPcwTo/YHQ== 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=1745521643; 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=i/Y4SoZ53QnDoMwxOZQGI2gnR6Zvaxw7Io5Q3W5EpdQ=; b=ABG2v352wVOEA2k6wPf00UlyYf3//nGoDsqEQ6+owBpA40RtLbKAIk3VFjOp7XBXv58kxO av1R+mefVE8b37RdfUb1hlHNdhGTSifAmcN4hAqc1+zWZ9pdFqhVzI+cdHlPJAKwlB4uOp FOWeEaU+NgGiN4LVWfglPdPGmaLX7sUvRoP3H7mBlS0TbqzBbX2/eeNk9aDa+25MWoXU6U TSLwt/YBv0cFVC0+fzmK0LfH1yKr/2hU2TZEcoO43RBGEIgkkHRczPGqILwA7VNAFd8y05 LZsN4WbUt11tuYnCDEJ1uxGtTzk1zjY+uVVqBVrWVm5hTdOhX7aXEEary6+EVg== 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 4Zk57v0hq4z12cC; Thu, 24 Apr 2025 19:07:23 +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 53OJ7MBU081851; Thu, 24 Apr 2025 19:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53OJ7MWU081848; Thu, 24 Apr 2025 19:07:22 GMT (envelope-from git) Date: Thu, 24 Apr 2025 19:07:22 GMT Message-Id: <202504241907.53OJ7MWU081848@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: 2be18f348e60 - main - vm_object: use iterators in unwire() 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: 2be18f348e60c9fce7d1cf4a1c275ce89a03579c Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=2be18f348e60c9fce7d1cf4a1c275ce89a03579c commit 2be18f348e60c9fce7d1cf4a1c275ce89a03579c Author: Doug Moore AuthorDate: 2025-04-24 19:06:19 +0000 Commit: Doug Moore CommitDate: 2025-04-24 19:06:19 +0000 vm_object: use iterators in unwire() Use iterators in place of tailq pointers in vm_object_unwire(). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49939 --- sys/vm/vm_object.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 39f9f0a50d46..147221c1e7e3 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2352,6 +2352,7 @@ void vm_object_unwire(vm_object_t object, vm_ooffset_t offset, vm_size_t length, uint8_t queue) { + struct pctrie_iter pages; vm_object_t tobject, t1object; vm_page_t m, tm; vm_pindex_t end_pindex, pindex, tpindex; @@ -2366,10 +2367,11 @@ vm_object_unwire(vm_object_t object, vm_ooffset_t offset, vm_size_t length, return; pindex = OFF_TO_IDX(offset); end_pindex = pindex + atop(length); + vm_page_iter_init(&pages, object); again: locked_depth = 1; VM_OBJECT_RLOCK(object); - m = vm_page_find_least(object, pindex); + m = vm_radix_iter_lookup_ge(&pages, pindex); while (pindex < end_pindex) { if (m == NULL || pindex < m->pindex) { /* @@ -2397,7 +2399,7 @@ again: NULL); } else { tm = m; - m = TAILQ_NEXT(m, listq); + m = vm_radix_iter_step(&pages); } if (vm_page_trysbusy(tm) == 0) { for (tobject = object; locked_depth >= 1; @@ -2411,6 +2413,7 @@ again: if (!vm_page_busy_sleep(tm, "unwbo", VM_ALLOC_IGN_SBUSY)) VM_OBJECT_RUNLOCK(tobject); + pctrie_iter_reset(&pages); goto again; } vm_page_unwire(tm, queue);