From nobody Tue Jan 02 00:42:46 2024 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 4T3vFz1Kzlz560Kj; Tue, 2 Jan 2024 00:42:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T3vFy5fF6z3RtH; Tue, 2 Jan 2024 00:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704156166; 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=3xqa7DawWHDk+Iy5OlYYJncJU3HLKIW9JAD1lceLXxM=; b=jKQ70UwSyo9KZWT06ig29t2w/Fd690yNZjzQlL3FI+kaG5WsTmtJt0iV1/94VrzrCLLbZc oORrFGirunkpiN3GorZ5l0vT3SK6s+v0hVSpawvn+uq191ENMSezoeLZ4KMwssosTX+xrZ FrH/oDTudHn+Qf3Ny1Se1cHO9Oj/BBSMUfCEZgJxV8n+0RoaykhJ+Pj/eACy3eilDMtvl4 7rLUjVnqtuFHoAlk56sNnq08AjEdJOBh4jfzPfo/tXaGdVTNZxLIosODpf7jcYIIfuaASa DD+46c+T1IUjCtOoyLozSCKOwpwFfGCqBlY9rCnciE61/U9iUHR2m+X2hTthUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704156166; a=rsa-sha256; cv=none; b=P6whRwkqWXh5lm+N9b4PyFPHNhE0aBvYLccJcIQgGliwc2gsBW2Xk4Jd4qNmaiL+CxVZsU KzK8IeUgApPZvolWnKalQHMXF9PgnciINyz6+2c5ydbu+evEfoZQJ+ksLvnmTzpWqbpAms Fr6xozf0Z7ZFEfydH6yRhhHoezXW127ZC90goVyFVhf8VeVEUhttqaQs01nyMRqynlVjnx t2gxIPsBPT6wtKKj376OPBBSrbc5ZvApWheX8b4zgNl25VCQcQgEWpwv9s+jW+zmh3yhhO bD1BFQRRo8qYl03t2d6nH29xtyXwZ67POgXLdGVljZYER5JaT78Oq4iFweHfAQ== 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=1704156166; 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=3xqa7DawWHDk+Iy5OlYYJncJU3HLKIW9JAD1lceLXxM=; b=RyFx8XXM7KykyDPlqL0shrk8Pt0qHNM53VZnwW+azhIB5GTbbadd2aEMiIZicoZ73g6CuM x9Dj36COMpyw6jBQa2qoQcNJhDDJfZjcnGQdtutJDUuqw6K5BFndNClb0LhAYrgqSVy2dD Nc4/UUGTCGBxyyUCjZGdeaVMcNbYC8FsMsx7HSDEqKjENA1j3OpKMSneViTiIQr4Sg/JwO cvhiFNbg4XBQyZbJ3V0Umw3Egs76mTum0cuw9deG3+jSzEmY3Mokj1/2/gieu5CQJJxM7b yAbGTIwcilq/RLrzR/CWToKVtZBd2zPATQPuWtmJy/tMuwhWa6HajqiBIDyBww== 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 4T3vFy4dTKzfcC; Tue, 2 Jan 2024 00:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4020gkaR004293; Tue, 2 Jan 2024 00:42:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020gkJ6004290; Tue, 2 Jan 2024 00:42:46 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:42:46 GMT Message-Id: <202401020042.4020gkJ6004290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a7f3fe764cfb - stable/13 - iommu_gas_remove(): consolidate places where decision is made to keep the entry 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7f3fe764cfbdec5aea4102414edaec721b1c33e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a7f3fe764cfbdec5aea4102414edaec721b1c33e commit a7f3fe764cfbdec5aea4102414edaec721b1c33e Author: Konstantin Belousov AuthorDate: 2023-12-22 22:41:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-02 00:42:13 +0000 iommu_gas_remove(): consolidate places where decision is made to keep the entry (cherry picked from commit c0047e7c356953d138194ff71cc510ffe85425f0) --- sys/dev/iommu/iommu_gas.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index cfd375c658c3..4b6141b981da 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -693,6 +693,7 @@ iommu_gas_remove_unmap(struct iommu_domain *domain, IOMMU_DOMAIN_ASSERT_LOCKED(domain); if ((entry->flags & (IOMMU_MAP_ENTRY_UNMAPPED | + IOMMU_MAP_ENTRY_RMRR | IOMMU_MAP_ENTRY_REMOVING)) != 0) return; MPASS((entry->flags & IOMMU_MAP_ENTRY_PLACE) == 0); @@ -720,8 +721,6 @@ iommu_gas_remove_locked(struct iommu_domain *domain, KASSERT(start <= entry->start, ("iommu_gas_remove entry (%#jx, %#jx) start %#jx", entry->start, entry->end, start)); - if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0) - continue; iommu_gas_remove_unmap(domain, entry, gc); } if (iommu_gas_remove_clip_right(domain, end, entry, *r2)) {