From nobody Mon Aug 8 03:22:03 2022 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 4M1M240h4nz4YjVY; Mon, 8 Aug 2022 03:22:04 +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 4M1M2374pXz44VY; Mon, 8 Aug 2022 03:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659928924; 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=1gOY2QAHAD33xAiHyIE0pY+saOVIY80SjJT9EPU+5jU=; b=uSLwoBLlANacVR2X5waiFMCVhuV4BUoB1K6Mp1GMwoQOk9PKQNRTFbKwTjbvNx6tWhsV/l MKrm7vHQWZo5iOf/ojnW5+OMzGY3Y4f7mnn9gnNGOsNAEuDsIAN2q2vLVMts7KxLDGs0mc SF246EZ3qYkGLOPFJc5bsExUX7LksNHJbqlL2IhgOLuXDfwaj5yzRS+XBIMXTcvIaVxxcL klZSkkPDAf5KrSKwzRn05xgwou4H2sGT5aI6bhYIXfizdC7uA5J82fqgXHKfOZdm/jFfJK BuQvct4FL+OeOIqaXlGEPf3sUEOtsUoU7lPwfELiXE2b/gpcGOkHLrUF4XXGHg== 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 4M1M235w3dzcXB; Mon, 8 Aug 2022 03:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2783M3ZT017646; Mon, 8 Aug 2022 03:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2783M34f017645; Mon, 8 Aug 2022 03:22:03 GMT (envelope-from git) Date: Mon, 8 Aug 2022 03:22:03 GMT Message-Id: <202208080322.2783M34f017645@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: e9711ea5e2f5 - stable/13 - iommu_gas: Avoid double unmapping on error 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9711ea5e2f5749e0dc6602ae109c786c728d6f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659928924; 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=1gOY2QAHAD33xAiHyIE0pY+saOVIY80SjJT9EPU+5jU=; b=E64QitBHU9GFp0ytIfZ+h+I0KhOOwa/kLt0NrI6hlkgG23+t3xIUixz7O5+pIiRLrp8jre N5i76re5Vo4GkIgnuKIFuQ5+E1ssCrFijUe/iRKbyee+TaxDDPGKZl5aPDUU2ncv4/xGlP e1Jg0Bc1ChNYvRxNH8qXMfhgUy8OHzatWV+W34ArkqNyWzvZyl0/sojlcu+iLT1mb2yr3j sh3WRDqxfRCne00o0Ce0vyFlmV76hBBLtLCS1W9rrY6+bqauvCCbOEGKvA+I/LoXSyXl9T 6NaT04qhJU72kBLema8KvfUbMcjXQvPHx7BEK+VydoBqy/qK2z8RTt+jX0rkjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659928924; a=rsa-sha256; cv=none; b=MaI4Jlvi+dODDNOpz3z9xPjoKrINm8jaP+wPm3tIpXFu4PXoxphr7PLWbVAq0UgAhtllYG Rf7OulNonCVHx4qPREvgRo2yPprv7t/mDwlPvfiO6mmnpCkWd3GbNe+/cibpNWVx8pO3Zm SsKfN+w41kVOAFDqsvsVYrxA40DZfmvDAiehJE4gaKyo6umF6WEHBn7fOoS9Uj0x3h4xNu GRWyiaZ7C/iTbeBcbL4kZRPzXzjRDllEgH55Jjz5ESssp9YHbRC21buoXdj+Y6hwHg4p3d Y+9z/pMnZeIe/jptW2UQtiNupe0lIFSF/XOP+5+RhNdedxx1YQB5OihSpgfyPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e9711ea5e2f5749e0dc6602ae109c786c728d6f5 commit e9711ea5e2f5749e0dc6602ae109c786c728d6f5 Author: Alan Cox AuthorDate: 2022-07-21 06:53:54 +0000 Commit: Doug Moore CommitDate: 2022-08-08 03:16:49 +0000 iommu_gas: Avoid double unmapping on error In the extremely unlikely case that the iommu_gas_map_region() call in bus_dma_iommu_load_ident() failed, we would attempt to unmap the failed entry twice, first in iommu_gas_map_region(), and a second time in the caller. Once is enough, and twice is problematic because it leads to a second RB_REMOVE call on the same tree node. Like it or not, RB_TREE does not handle that possibility. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35869 (cherry picked from commit dfabdacb279ca603d008a0e7e952c5c59ac51da4) --- sys/dev/iommu/busdma_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 594e685e074a..33549b4af011 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -1047,7 +1047,7 @@ bus_dma_iommu_load_ident(bus_dma_tag_t dmat, bus_dmamap_t map1, TAILQ_INSERT_TAIL(&map->map_entries, entry, dmamap_link); IOMMU_DMAMAP_UNLOCK(map); } else { - iommu_domain_unload_entry(entry, true); + iommu_gas_free_entry(domain, entry); } for (i = 0; i < atop(length); i++) vm_page_putfake(ma[i]);