From nobody Fri Apr 18 17:24:26 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 4ZfM7t6hP0z5t6Fr; Fri, 18 Apr 2025 17:24:26 +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 4ZfM7t43ppz3l3X; Fri, 18 Apr 2025 17:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744997066; 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=0tUnocam8a//xrQ5CA83PJ/t6nVmp3EXA0oqp3gEQ+U=; b=puRpfaFOifpELtOROSAZ1eM3hq40gHLqsGOPZMjxcXcXKU6IySitcIm0Y3qShXT73IwXJZ i6aZ5jR8dOBePv8pH5VKIl8Qb1r2u8/E8rye5bX6A9wzKzp5WidUbKqFHggIEG2HeJfG1i jMGm4pbpigJ2QBXMSQT5L+5OI2CLBzHLWc6gbBqpgXRuduML3rQcYWRVSFN3Yb0QWNEAVc lcd8hXnDrHObEZGRw9pduqEmnIWZTk+xjbW1AoqvhUYb7mcJJTCikEkNm0mbVDa61XM4Q9 JDsNFQHlCNYFmAODLMk+s8yhhU8skT5DPvgHUWpDxnhq3BJfNxCpa68vijXYhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744997066; a=rsa-sha256; cv=none; b=T2g0ujF1ChxtK59peHQg5vgo5pCGPtm7dXve0CjDSOaiSUJyQkobqHDeTFGE0T92mNH7+I FN5hxtcPQ7Xe/9Rzv77PZvW+6VCxGJA4QcWnj8Vz8rar44MQWBF42sX2cdAr5fS13T/5rU QjdHMxHVdIG1CHohzrYEtSVxV+ZA6gNrfqOocvJecRBqEVwEhJ3gAZ2avF6d17nA5YiffL FOGPTaRylwByvAGQOo2JuruI2djzUE2xI7TxPIaudud3Q33ZzsTOxK/DkR0gBooaF9nbUU pYNVI0QaN80MxgDyYudmJ/H7nVDRrq6sYhmVzz2qkARTIxLgBn8kyGTAJCJL9Q== 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=1744997066; 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=0tUnocam8a//xrQ5CA83PJ/t6nVmp3EXA0oqp3gEQ+U=; b=EcyBD7NDFJ6U0ufowHLeXfIUWouclv+5FB2U6A1zokeMS9sU2TlQc2h5WamX4xJk2sx60+ DQL4wHN8Dn6BJtG+URuP1bjo4xHESjMy3xR35gbknVZPOzkiTZGBOV5MUtXd3ZC850ZMiJ Giq8UcBf0vG40DPMisbmmqEi0BQ3hxEvkwWpS73jh+wea7xqq+6SpP2yZAgFYaK5rQwdZw dqngzGkzOGQjCdKAEXWzWJfqHTwP4UvNrprTn8/ERS5Hyr4NPYdpewyq3S/9erAyaIiNzI WewhWTPeEGbll6iVO7hTTbpS0VWUsIgh4s9tAmzGIg6vkuWin3ca82M6pv+jTw== 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 4ZfM7t3fFfzkYj; Fri, 18 Apr 2025 17:24:26 +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 53IHOQJK010960; Fri, 18 Apr 2025 17:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IHOQv6010957; Fri, 18 Apr 2025 17:24:26 GMT (envelope-from git) Date: Fri, 18 Apr 2025 17:24:26 GMT Message-Id: <202504181724.53IHOQv6010957@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: 81bd0f46fcf0 - main - intel_idpgtbl: use FORALL macro for page walk 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: 81bd0f46fcf07a2748f8093c07ece66227f03ae4 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=81bd0f46fcf07a2748f8093c07ece66227f03ae4 commit 81bd0f46fcf07a2748f8093c07ece66227f03ae4 Author: Doug Moore AuthorDate: 2025-04-18 17:21:48 +0000 Commit: Doug Moore CommitDate: 2025-04-18 17:24:05 +0000 intel_idpgtbl: use FORALL macro for page walk Change two loops to use VM_RADIX_FORALL and drop the use of vm_page_next(). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49891 --- sys/x86/iommu/intel_idpgtbl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index b133dc875515..e13555cdaaba 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -165,6 +166,7 @@ dmar_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, vm_object_t dmar_get_idmap_pgtbl(struct dmar_domain *domain, iommu_gaddr_t maxaddr) { + struct pctrie_iter pages; struct dmar_unit *unit; struct idpgtbl *tbl; vm_object_t res; @@ -260,9 +262,9 @@ end: */ unit = domain->dmar; if (!DMAR_IS_COHERENT(unit)) { + vm_page_iter_init(&pages, res); VM_OBJECT_WLOCK(res); - for (m = vm_page_lookup(res, 0); m != NULL; - m = vm_page_next(m)) + VM_RADIX_FORALL(m, &pages) pmap_invalidate_cache_pages(&m, 1); VM_OBJECT_WUNLOCK(res); } @@ -707,6 +709,7 @@ dmar_domain_alloc_pgtbl(struct dmar_domain *domain) void dmar_domain_free_pgtbl(struct dmar_domain *domain) { + struct pctrie_iter pages; vm_object_t obj; vm_page_t m; @@ -728,7 +731,8 @@ dmar_domain_free_pgtbl(struct dmar_domain *domain) /* Obliterate ref_counts */ VM_OBJECT_ASSERT_WLOCKED(obj); - for (m = vm_page_lookup(obj, 0); m != NULL; m = vm_page_next(m)) { + vm_page_iter_init(&pages, obj); + VM_RADIX_FORALL(m, &pages) { vm_page_clearref(m); vm_wire_sub(1); }