From nobody Fri Dec 29 00:34:57 2023 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 4T1RGp0Hrtz551vx; Fri, 29 Dec 2023 00:34: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 4T1RGn6BPsz3Sf9; Fri, 29 Dec 2023 00:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703810097; 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=pdYQT1unfc283sCASh9mUw9Bcy/0sGETDSsjMhXiX3w=; b=QIJOLe7NqNYRAuRMMU9bX71oAJE611GWayTRjKbyeF8EPyM46ogTffut2UTT3OTzdtc9pg ic6ISbUcMfJnYGypzIEXE6euiPC18EsYo+K3J0SApOWp9vSDDrX6jQJE05iLk+5JZlTRH8 3iyHczYAnnOF/zvIc557dAlvwY7ajD2r5eVxeu4+O5fMQN579UwSKgmZAvMnBUjYEHJ4fn WuxVienNqGYHauW0mlfTchR/3jMq+DqL7w0g0P1+MGGzyJ9Bnj7Ri9EU1rUeaCBB4T6F9v QWgSF6iXEmRNjP41jm4+xoH58ygvmX3sBKIsHK/5fgXtrlluxE3+MSUAnOnbNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703810097; a=rsa-sha256; cv=none; b=d1GY0csxCwO/XpanCH5aMsqeqN+q62cZwRgLPj2S+eh2ITxQWtOFvBD38OlzR+VCsa4Nma vsOf0apGCNgdnoo0a2/R4y7uJFFgwcetJUQFN+oKpNjacHQLGZe9XTf+4IgLKPXpzNTTYA KpzhCKcTgyeL9Mog7XtYR67TgT0V95cmJGH0ar5AkUilr193Ugp7tio06AMonGcOFRT+VV njjPhNkYYoz28UBZrVTy8JchsrK8E4uqPoSGpIVObn4uI8v84TRODotWx9qZeaViZBuM1z uUPCmFEZXVqFggPJo9A5ahytAE8u2wSsRANRL+/0zRAwaSOR7DL4RohnAmwTGA== 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=1703810097; 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=pdYQT1unfc283sCASh9mUw9Bcy/0sGETDSsjMhXiX3w=; b=kNfQugq64PAuRBzqZynRDZmAMUtEWmWi2/TqHG+BatKTi2GL03Y86Nd6vmHQz45x+Np7X4 Suhh+qA2zcSir1zwa9WbPedVj+ljZUhiHM8WNNyAxBrWvEEi+sr5oi8j+PmJOkIPUc+QlD vf2XgaU81ck4YgMgRuPAL4tAH7AgVBT4oPZbDuTzkiiBwqzRJ+DDDtVVkw3bqzq2mq8Ltg foUv3/P6pvwxZd8fubgo5FGvE3mCgY/+Jm7iKsSlrdzKpbHoC1AJZrXVfY/dhgHwGVVdQW zzWEak/NW/cjqld+Hclv46jQA60EAyPRc5HKxKxALkps0RgvmwHqdeoR2Bnb0Q== 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 4T1RGn57lJzksk; Fri, 29 Dec 2023 00:34:57 +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 3BT0Yvtq009679; Fri, 29 Dec 2023 00:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BT0Yv5T009676; Fri, 29 Dec 2023 00:34:57 GMT (envelope-from git) Date: Fri, 29 Dec 2023 00:34:57 GMT Message-Id: <202312290034.3BT0Yv5T009676@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: 6ed6db3206ea - stable/14 - vmm_iommu_modify(): split vm_iommu_map()/unmap() into separate functions 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ed6db3206ea96c68ffd2a952a5d0188c73b1260 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ed6db3206ea96c68ffd2a952a5d0188c73b1260 commit 6ed6db3206ea96c68ffd2a952a5d0188c73b1260 Author: Konstantin Belousov AuthorDate: 2023-12-21 00:00:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-29 00:33:21 +0000 vmm_iommu_modify(): split vm_iommu_map()/unmap() into separate functions (cherry picked from commit 3abc72f8716b55fc71e9463388f5a74fb6abf5ce) --- 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 bf5173d9d592..db81f63c9614 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1040,54 +1040,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); } } @@ -1095,15 +1109,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) {