From nobody Mon Aug 08 07:08:07 2022 X-Original-To: dev-commits-src-branches@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 4M1S2w1SbKz4YGtY; Mon, 8 Aug 2022 07:08:08 +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 4M1S2v6Ssxz3DPD; Mon, 8 Aug 2022 07:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659942487; 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=fgEE/d/f2cRnzhFZA5VaZ8g1F236k7TtehJiU8ICMWI=; b=BG95Q35EqvcfN8QeL1HaADWoI+qsGaQZgEWrnJ+bbkGCE9uhxA17LIaL8FGWR0RFlC/eB9 wDwkuEcm598iaiR+Mo5xT+rfaZqopIAG1pJOfavY+b1chycp9n2bmjKucdCOin5iqA95C+ 3raObCia3VbsEJdPOo8kMFNzjJJSH2L4vU3huZqvS9PRACp20RgRDXp+nCrDup8+xU60s/ xcy7svSNqAl8kU6T5FtxoBfSlJNiROfEfjMjK3QzsRBodjjRY+5uQEetGMkkTmrk/gSOFc zoucZMjO4n57xYeRTX0IIXVEptdogNWIw4ttoo4OYP6CSs0beqmzA9nURK6Gig== 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 4M1S2v5YFNzjGj; Mon, 8 Aug 2022 07:08:07 +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 278787Sn019213; Mon, 8 Aug 2022 07:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278787Dh019212; Mon, 8 Aug 2022 07:08:07 GMT (envelope-from git) Date: Mon, 8 Aug 2022 07:08:07 GMT Message-Id: <202208080708.278787Dh019212@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: 5639dde5edc9 - stable/13 - x86/iommu: Correct a recent change to iommu_domain_unload_entry() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 5639dde5edc9b2bd0502f55bce2e07af2ddb01c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659942487; 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=fgEE/d/f2cRnzhFZA5VaZ8g1F236k7TtehJiU8ICMWI=; b=vpa0XhKghJcBzkY2Tv+zmNS9oNZZATG814/A/Yu8EgUCzNbwukEtlsyQRBcmH4j3FDxEow FqVz0f70ueXdqErlc4g/iIQmYGcDROFHKVho+ka01JB1pJ5JnEoUDrwnKDa9x6KnItmwr1 Ma7ORPCks2lZ+A85NtdXlu4Dv5AHNQcocghNr0qJBWkHAieUQWZ+3RQ6K1+uzM2coNUtox XLKKzMkeCZZbUpLge6jJcrytsJSlOLFiBG67yKumk28JIZm5xWp9Fg8Hs2O3+3Eo/QEcdh C7lpdZGGhb2mxIgI/xCa8a7NHzgaDtPqpL985tsMMvTuQK4gLW6F8kCIe2XaZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659942487; a=rsa-sha256; cv=none; b=tbkZ7tQyEo3MYlfgRTB2waiJ7qADMNVT1Fg2PBKhdcalKeT3lgMVYNh3PA8MgkoSIEpgbS LO4AKNvBYiOO+8tgrkBihEw+zbQogGmHyxXWoXgTt5prBPuaUxtfEMugsJtz9SnJmuT/Ag JRxuiy2xPRBPeNDV0d/LKxNu2sQ3Cwsmofon2oZRMNvhzcae+5fRoj/iPiO+LxVqjGqtci 8s4sqc6m4ugqAMQtg9uoTjayPaCG8ucm7UulslL+/0QJCG8d4KQ0zK6E1uzeQtSSXDy74g S8cl6wYYXvvK3ZjVW1RT/Q2ECqjg6ok9Sh/Ow6zgJ9UxCBnXMft9tl/0WQQA7A== 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=5639dde5edc9b2bd0502f55bce2e07af2ddb01c7 commit 5639dde5edc9b2bd0502f55bce2e07af2ddb01c7 Author: Alan Cox AuthorDate: 2022-07-26 04:53:15 +0000 Commit: Doug Moore CommitDate: 2022-08-08 07:07:20 +0000 x86/iommu: Correct a recent change to iommu_domain_unload_entry() Correct 8bc367384745. When iommu_domain_unload_entry() performs a synchronous IOTLB invalidation, it must call dmar_domain_free_entry() to remove the entry from the domain's RB_TREE. Push down the acquisition and release of the DMAR lock into the recently introduced function dmar_qi_invalidate_sync_locked() and remove the _locked suffix. MFC with: 8bc367384745 (cherry picked from commit c251563470831c34cf53242936425a0d4d995edf) --- sys/x86/iommu/intel_ctx.c | 7 ++++--- sys/x86/iommu/intel_dmar.h | 4 ++-- sys/x86/iommu/intel_qi.c | 9 ++++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 1bb923f33d86..98dfed7aaa17 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -879,17 +879,18 @@ iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free, * dmar_qi_task() is finished processing it. */ if (unit->qi_enabled) { - DMAR_LOCK(unit); if (free) { + DMAR_LOCK(unit); dmar_qi_invalidate_locked(domain, entry->start, entry->end - entry->start, &entry->gseq, true); TAILQ_INSERT_TAIL(&unit->tlb_flush_entries, entry, dmamap_link); + DMAR_UNLOCK(unit); } else { - dmar_qi_invalidate_sync_locked(domain, entry->start, + dmar_qi_invalidate_sync(domain, entry->start, entry->end - entry->start, cansleep); + dmar_domain_free_entry(entry, false); } - DMAR_UNLOCK(unit); } else { domain_flush_iotlb_sync(domain, entry->start, entry->end - entry->start); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 21e626257a0d..2840646f89a6 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -250,8 +250,8 @@ int dmar_init_qi(struct dmar_unit *unit); void dmar_fini_qi(struct dmar_unit *unit); void dmar_qi_invalidate_locked(struct dmar_domain *domain, iommu_gaddr_t start, iommu_gaddr_t size, struct iommu_qi_genseq *psec, bool emit_wait); -void dmar_qi_invalidate_sync_locked(struct dmar_domain *domain, - iommu_gaddr_t start, iommu_gaddr_t size, bool cansleep); +void dmar_qi_invalidate_sync(struct dmar_domain *domain, iommu_gaddr_t start, + iommu_gaddr_t size, bool cansleep); void dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit); void dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit); void dmar_qi_invalidate_iec_glob(struct dmar_unit *unit); diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c index 174cf9ea19a8..32f01a2787b0 100644 --- a/sys/x86/iommu/intel_qi.c +++ b/sys/x86/iommu/intel_qi.c @@ -243,14 +243,17 @@ dmar_qi_invalidate_locked(struct dmar_domain *domain, iommu_gaddr_t base, } void -dmar_qi_invalidate_sync_locked(struct dmar_domain *domain, iommu_gaddr_t base, +dmar_qi_invalidate_sync(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, bool cansleep) { + struct dmar_unit *unit; struct iommu_qi_genseq gseq; - DMAR_ASSERT_LOCKED(domain->dmar); + unit = domain->dmar; + DMAR_LOCK(unit); dmar_qi_invalidate_locked(domain, base, size, &gseq, true); - dmar_qi_wait_for_seq(domain->dmar, &gseq, !cansleep); + dmar_qi_wait_for_seq(unit, &gseq, !cansleep); + DMAR_UNLOCK(unit); } void