From nobody Tue Dec 26 01:28:58 2023 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 4SzccV3Stgz55GPy; Tue, 26 Dec 2023 01:28:58 +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 4SzccV2FW6z3gJS; Tue, 26 Dec 2023 01:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554138; 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=b7abbNbeOU1m327+rtzPhzWc27cvTwX5RhGLNPDIrGE=; b=t7w+l5flIaQQXqc5E+21CZHBzxtBhT/H2SVU9B1khaveSdqvlRq2VPvSylTLNwxuqKR5e1 uL0IA3O9dbv+LcOEh7V5ynk14NY/DnRbG8oTfAnHkxaTfSPWpw138Jpp7MXU7oH4b+y2GV RsplbcQvMwWsK7CgxI1DSXglgEHwX15+7cDucBJkUrxQvR+rpPZo0uc5+LLrlnCWBkLvM6 dUsg83mKvBtPal3xFSnWD3NXlibmD3mDUq78CmWvExTKgEkurZZU1ULX3Io/kTQYjAbvNF TMtD/hESDd00bnX8ZSEsAgs4N9YQCBf2ztHsZ5/PGiqY7+XG+Ln15RzwMChr/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554138; a=rsa-sha256; cv=none; b=fBqba8bAbB3fjAwdll/1xjzYT2fUl8tVVemBxTWwIgZth5Nvbz77aPEEReMpRqCryiYkeT xTBXVxGazcjtJRwd+1U+ZdFDUbElEa02XmiTVy2PhoTbWORi+JoqyFuf1ko8wfTnB5nZZE +Xfw9OoSHEQjbzviLCQG+dabs6/OV35+PtY9QCTw9q14A8w25zQgNkALa1QCqo/l+N20xC n0CrLp/4cXn+9UAQKNxwC2s2+FkycpFoJm9nCUkWnr5qPRUpBKfKlvkFuuKBmn/g3tqeF0 JMjMwuoyp84mw/28P3LOeJcE9np1dokvZw5xXRsTfVzs5Z3i0XU7V8IuHGj6uA== 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=1703554138; 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=b7abbNbeOU1m327+rtzPhzWc27cvTwX5RhGLNPDIrGE=; b=jFZURxcnHCpIzqR6Ud1bVen5PNb0/Zb4fXfIRI98gNeuZxC3Ki1idhf/T+d0b0fF2+INkt 1n8UZWJQmxgZBL+x0iedQxhqFZQ2o+XIOZP41ewMeRJhwy0Ia8fYAnfkvojHhFw9TWmugM 7h6ttZypuePygdSeJEjEYgVvgVR3AQQztPQOZ4pn3m0H3OuDPMjvdoLlzY27hP/2yKQ4GA /y1Z0BUP+q+LVhnb+W9BYb5BQtuwshV9Ims5dZjlGvJUmx9TYiMxpSULsqS6DasoPMnScz 9jaYG6OmGbwQy+mvMY8f0EA+uYGvxxxXiwxyINZRUoq9m3sxs6NSvQSov/3oTg== 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 4SzccV1GRPzZcH; Tue, 26 Dec 2023 01:28:58 +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 3BQ1Sw3N035828; Tue, 26 Dec 2023 01:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1SwwE035825; Tue, 26 Dec 2023 01:28:58 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:58 GMT Message-Id: <202312260128.3BQ1SwwE035825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c0047e7c3569 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c0047e7c356953d138194ff71cc510ffe85425f0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c0047e7c356953d138194ff71cc510ffe85425f0 commit c0047e7c356953d138194ff71cc510ffe85425f0 Author: Konstantin Belousov AuthorDate: 2023-12-22 22:41:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:23 +0000 iommu_gas_remove(): consolidate places where decision is made to keep the entry Move all flag checks into iommu_gas_remove_unmap(). Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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)) {