From nobody Tue Jan 02 00:42:01 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 4T3vF63m6tz560Cg; Tue, 2 Jan 2024 00:42:02 +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 4T3vF624DSz3Q0r; Tue, 2 Jan 2024 00:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704156122; 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=5briwcONE82Gqd1syE7I5Vkt7JCGjPvktZUww9YU+qA=; b=WcYXI6qC1+453Xi2joxCynXMVpnBIpIr8Bb6RPggaHsPOolR9pxUQvpsKD2Weaei6IFAst YDxA92ZoN7sTDOM3Ogw7XaV4o957Mlml0jHFeFapAGZf2/lqH9O5cHCq5FrraMVDP8b1Yd ITNVtJbMrQxPuJZTFFCJxVJvw/HigLXZUBUPsuijmieC++VJY1ft3g9RNY3Kxm4yPWaB8l ZdMn27diV1+cQ75hGjhnrlNSisUqNS3azljRNpLpmHmzCYf4uVnBZje/3EPoZ0p4XZaAtm dteM+XL9BwaPHEYQmyeYUuACwiBmTw0g3fi11ZnDgt/WQAuBSbfM632Y8f4J2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704156122; a=rsa-sha256; cv=none; b=uDPjnpV8rSEogDkWEFM8Y5OW6vz8csRu0Qz2yLiopYDRoBAuYGxngYl5DVfqCiCdG3UjJ4 Sz0IMK7epREejhmj/Yne6aXQS/69T5S0ygYpR6qIkySR0nSKutd+WHaD3OKJoFnxNV4JAz hor4Xh07E6dV8+GBPVtPilxOt7B7aJx39mV+1ee2nY8NZxuhHndGUCJ79JzxL2R9sSOBLK VR0keP9h4kP84ReZ/eVZ+lOji9Qj9MEz0hLTNUIvi6Tl2DLNX3aeJgRzu4fIUlHzcsQyco 3TyvlvwDDUVAC7IGIxVsJwte7gGmgblN6ToDadAPPPysXmWral0T8ToEuJcj/A== 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=1704156122; 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=5briwcONE82Gqd1syE7I5Vkt7JCGjPvktZUww9YU+qA=; b=w7eqgSGRCH44rVeeDZcRc7pLr3j92E6WMGPZmbc1pn+utqw8+jXiJXRlk+t1Lj7z+0TIQM 46iDKePmwmrdiOnosTMYICjR1reiKoyNw7PTwvnjsyfB8xmdRNll5w7WrSo88OKsgpwMy6 HudWHh82gngVBHft8peT41cWtMtnJwSXXrhOHTm61y1aRnmyDJh6FveEkvQnVMxX++fo5H D4EMt41W5QKvekyHMnB1meBfL9mt5t6NXRV8h8QjSkg5qDRlVucQZIAJS/ghU7BaMdBkng pkB1tMEE0eECVECek8Jafe7xYXQ4gCkhppVPzsp9JvJguVyR3eMQE2OcIxQLYw== 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 4T3vF604wCzfQl; Tue, 2 Jan 2024 00:42:02 +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 4020g16H097110; Tue, 2 Jan 2024 00:42:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020g1F8097107; Tue, 2 Jan 2024 00:42:01 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:42:01 GMT Message-Id: <202401020042.4020g1F8097107@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: aaa4654adc7e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: aaa4654adc7e19d679759a2e485ea740cf7b4817 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aaa4654adc7e19d679759a2e485ea740cf7b4817 commit aaa4654adc7e19d679759a2e485ea740cf7b4817 Author: Konstantin Belousov AuthorDate: 2023-12-22 22:41:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-02 00:41:39 +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)) {