From nobody Fri Dec 22 17:34:32 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 4SxZDS5Pq6z54FHp; Fri, 22 Dec 2023 17:34:32 +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 4SxZDS4dg2z3ZyW; Fri, 22 Dec 2023 17:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703266472; 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=vjQs3tJC8CpYytbiLD/HNZoSKpZEEmcTzQiyJvHvDUY=; b=gXQc/54BgfYB7mr9Ci4tOlgy29C7/50C3iIl6MnJTCyccjCmc5CUeQ4UNnncQ+6wXmxIBu v2DyodPhyCcainj72tXcp87mNO1jK8XWU8u2LucQWdVLV5GCxzZPtSwct7idgr+y88Iaag vkGjBfZ0lTPz6SXvpqifMRzZaFnqZbb+96YV8pC+g2rsbMc3LBXf8nvnVvdQjv8+Vw+RMB Tz6Bt1gGqMFChweoBZD/z+IVbX8NaXeQd9kCDtRfPOLyiZ/R/j1lVkyk4UeTdaPTjHZ/LH tPOPYoDqObXTQ+UxBd3qt0vpFcZ7bqV/qokIaKoSKoP//xjwlg/B6JGdDFipxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703266472; a=rsa-sha256; cv=none; b=E3WrLS0U+F+lExyJdMEq0f7U7qcJXaR44fj7PQlQVJgZiZJyHR0pk9C/YWqIYH0nFe6JdC FOAS0RRhxT9ie4vtinZbEdAJ2bB0vaMaM/hsdJ46S/w8QI7DQaJGljiS0l+PImKz4IqhnK 0HcY6AaP4silxRU+Qf+O9OiZA8GSNTUQY2VZNZrzSu5XfaaZwT+4UGbA+nk+CjZQ9zBsJI y2EbQlFae1vEoJ+zUb3MqMx8s8cWCQc4rTPENaJy14vQKRp1v4x94Os17wcYbaWxV47ji4 YmsbwAAla3Ce+BpG9yPxwwF/K0C9bEjWzVjcj4L3bP+6rjNc/fHz0Gz5atNEyw== 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=1703266472; 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=vjQs3tJC8CpYytbiLD/HNZoSKpZEEmcTzQiyJvHvDUY=; b=t762PcwsZ9IiVRO+X0oYOCQXRgBpMqin1EhtjwQbJhO3/CV+ywiqweawZ4wSOISO5RGzD9 Zc/5yZ/yrJqlhzYqu4V56fjp3zc1wIulVdq7DYcNSrCE5RitOODSBqwpI5xEJGP7R6ugQu isZu+oiW40eZYW9s0rrpbwBjCAGKTGihEEoQFB8xDBlB88x9bmApzizWzVS/957sbyzR1Z fvMSo2unOIp1Y/aVvjC1Y/saqmPjNqo5dWti1bNejmbjoVmW2ZS3azNCx/FxE3huAq6k3P LJFCS2C7yyAXywaByf7ARkZTwY6u9UDo0tdmQiYUXylwuAAHjNgBFkUzBmtKjg== 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 4SxZDS3Qngz9wl; Fri, 22 Dec 2023 17:34:32 +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 3BMHYWYI078721; Fri, 22 Dec 2023 17:34:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BMHYWDS078718; Fri, 22 Dec 2023 17:34:32 GMT (envelope-from git) Date: Fri, 22 Dec 2023 17:34:32 GMT Message-Id: <202312221734.3BMHYWDS078718@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: 3abc72f8716b - main - vmm_iommu_modify(): split vm_iommu_map()/unmap() into separate functions 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: 3abc72f8716b55fc71e9463388f5a74fb6abf5ce Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3abc72f8716b55fc71e9463388f5a74fb6abf5ce commit 3abc72f8716b55fc71e9463388f5a74fb6abf5ce Author: Konstantin Belousov AuthorDate: 2023-12-21 00:00:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-22 17:34:27 +0000 vmm_iommu_modify(): split vm_iommu_map()/unmap() into separate functions Reviewed by: alc, jhb, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43140 --- sys/amd64/vmm/vmm.c | 82 +++++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index ae2ed8e6ea0f..32ae9f9050a7 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1037,54 +1037,68 @@ vmm_sysmem_maxaddr(struct vm *vm) } static void -vm_iommu_modify(struct vm *vm, bool map) +vm_iommu_map(struct vm *vm) { - int i, sz; vm_paddr_t gpa, hpa; struct mem_map *mm; - void *vp, *cookie, *host_domain; - - sz = PAGE_SIZE; - host_domain = iommu_host_domain(); + void *vp, *cookie; + int i; for (i = 0; i < VM_MAX_MEMMAPS; i++) { mm = &vm->mem_maps[i]; if (!sysmem_mapping(vm, mm)) continue; - if (map) { - KASSERT((mm->flags & VM_MEMMAP_F_IOMMU) == 0, - ("iommu map found invalid memmap %#lx/%#lx/%#x", - mm->gpa, mm->len, mm->flags)); - if ((mm->flags & VM_MEMMAP_F_WIRED) == 0) - continue; - mm->flags |= VM_MEMMAP_F_IOMMU; - } else { - if ((mm->flags & VM_MEMMAP_F_IOMMU) == 0) - continue; - mm->flags &= ~VM_MEMMAP_F_IOMMU; - KASSERT((mm->flags & VM_MEMMAP_F_WIRED) != 0, - ("iommu unmap found invalid memmap %#lx/%#lx/%#x", - mm->gpa, mm->len, mm->flags)); - } + KASSERT((mm->flags & VM_MEMMAP_F_IOMMU) == 0, + ("iommu map found invalid memmap %#lx/%#lx/%#x", + mm->gpa, mm->len, mm->flags)); + if ((mm->flags & VM_MEMMAP_F_WIRED) == 0) + continue; + mm->flags |= VM_MEMMAP_F_IOMMU; - gpa = mm->gpa; - while (gpa < mm->gpa + mm->len) { + for (gpa = mm->gpa; gpa < mm->gpa + mm->len; gpa += PAGE_SIZE) { vp = vm_gpa_hold_global(vm, gpa, PAGE_SIZE, VM_PROT_WRITE, &cookie); KASSERT(vp != NULL, ("vm(%s) could not map gpa %#lx", vm_name(vm), gpa)); - vm_gpa_release(cookie); hpa = DMAP_TO_PHYS((uintptr_t)vp); - if (map) { - iommu_create_mapping(vm->iommu, gpa, hpa, sz); - } else { - iommu_remove_mapping(vm->iommu, gpa, sz); - } + iommu_create_mapping(vm->iommu, gpa, hpa, PAGE_SIZE); + } + } + + iommu_invalidate_tlb(iommu_host_domain()); +} + +static void +vm_iommu_unmap(struct vm *vm) +{ + vm_paddr_t gpa; + struct mem_map *mm; + void *vp, *cookie; + int i; + + for (i = 0; i < VM_MAX_MEMMAPS; i++) { + mm = &vm->mem_maps[i]; + if (!sysmem_mapping(vm, mm)) + continue; + + if ((mm->flags & VM_MEMMAP_F_IOMMU) == 0) + continue; + mm->flags &= ~VM_MEMMAP_F_IOMMU; + KASSERT((mm->flags & VM_MEMMAP_F_WIRED) != 0, + ("iommu unmap found invalid memmap %#lx/%#lx/%#x", + mm->gpa, mm->len, mm->flags)); - gpa += PAGE_SIZE; + for (gpa = mm->gpa; gpa < mm->gpa + mm->len; gpa += PAGE_SIZE) { + vp = vm_gpa_hold_global(vm, gpa, PAGE_SIZE, + VM_PROT_WRITE, &cookie); + KASSERT(vp != NULL, ("vm(%s) could not map gpa %#lx", + vm_name(vm), gpa)); + vm_gpa_release(cookie); + + iommu_remove_mapping(vm->iommu, gpa, PAGE_SIZE); } } @@ -1092,15 +1106,9 @@ vm_iommu_modify(struct vm *vm, bool map) * Invalidate the cached translations associated with the domain * from which pages were removed. */ - if (map) - iommu_invalidate_tlb(host_domain); - else - iommu_invalidate_tlb(vm->iommu); + iommu_invalidate_tlb(vm->iommu); } -#define vm_iommu_unmap(vm) vm_iommu_modify((vm), false) -#define vm_iommu_map(vm) vm_iommu_modify((vm), true) - int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func) {