From nobody Fri Dec 29 00:34:58 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 4T1RGq0XfBz551vy; Fri, 29 Dec 2023 00:34:59 +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 4T1RGp6NPrz3SnT; Fri, 29 Dec 2023 00:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703810098; 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=F1uO+gJ5kTSO2pfXvXsx4M93Hzdxi5jk7uP3tvSUxr8=; b=aByZ/DoFzHOU+Io20YlHlYwk1Id+0QT6pjU+cRl0VJAhBWwzBOllFD5b36bOGA0RLRB0OD Xpn4H1F0BXThaFaT5lxxBKuq5zInvxg6Xvqz4D7IAhzL1X2MfEHcqeUNUduekjf5IWKqEv UG4cC0W4I/LDDk80SPzDAHWC3QSFITYwfcV2YZGp9WIffa9wxAwX+R70nvLqhel2cKzH2a ymEG3XOx8ZgPj8jxlqm5jmWtteZQTmQe3DoWaeu6YyAHbhrmUdwb8TVceCgBKvprrNZ7kL wz5iP8t2cCLn3uDC4EieTFxOC95y2hptJiqsu3Xv1s/VUaBn5qbNNLcdgeXOOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703810098; a=rsa-sha256; cv=none; b=ezqo+L9hwCWMVVCuzkFk+eWoy+O0U3AD7w+sYmYK4KLGoYcA3m+Ul/cslh9tSDTAH+fCN4 zE797EvOEYfkJs+pD+OJiVySppLcAiZKLI9c+SxArUNKV0KtCcfXwkBgDkmsvlOWuf2Sw4 NG1zur/PEWYzqlwpE7KxNZP9erOQkOJsvkiM6zWzLjcwKlPsigrbBMw9LsnyCUi5x75E9Y WHlg5wgaUSNzpQnIhmjr9DXrZnq0XV5VuMnF9Em8flFDY9WhzPBYYEL7dhiaY0envvsLvf zQyZd+W2iDdTNfBK/YVUHDM0cBLT8BehX+lHG4rl7gc1OC8ipGjIVfd5jYVXPg== 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=1703810098; 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=F1uO+gJ5kTSO2pfXvXsx4M93Hzdxi5jk7uP3tvSUxr8=; b=AJlJ0Op+wrqL7iIcg2VtcZS2BB024K8gUjacr7LsygwmFrrVNBd9dXrMgZQTkX5qTKBMLq ywEDpMHZL3YemxZH2Uhc6HDWgwi+BxqSJQEgMuULbuFyFBu+6FOfD/DzTzn0E1MlDQ2/5h WgrALvQE/kGFQBwTBsBZ2aFe1yAZDFmYi0/F2Khza1jWtN2F64saDOzDbWY3iyNa1nfUxs fj5NhgpKxCu7dFY8rvaHcp/Ou1g3Nq9bBfyUlFF/x6HbycFqCBqMyOJo9zxNFawY7WB8He hiHbvL6imvNQlv98eO1kxYvxvibBUph/3tMTue7uWe1AA/9aAFsB8tVtSkVZ7Q== 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 4T1RGp5SNYzl4G; Fri, 29 Dec 2023 00:34: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 3BT0YwPU009727; Fri, 29 Dec 2023 00:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BT0YwJS009724; Fri, 29 Dec 2023 00:34:58 GMT (envelope-from git) Date: Fri, 29 Dec 2023 00:34:58 GMT Message-Id: <202312290034.3BT0YwJS009724@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: e9251d68b206 - stable/14 - vm_iommu_map()/unmap(): stop transiently wiring already wired pages 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: e9251d68b206d4ea4be4413c17e008c76dd49e79 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9251d68b206d4ea4be4413c17e008c76dd49e79 commit e9251d68b206d4ea4be4413c17e008c76dd49e79 Author: Konstantin Belousov AuthorDate: 2023-12-21 00:12:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-29 00:33:21 +0000 vm_iommu_map()/unmap(): stop transiently wiring already wired pages (cherry picked from commit 671a00491d7ac9d6663cdc597ff8c13024eda00d) --- sys/amd64/vmm/vmm.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index db81f63c9614..d44adc86252d 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1044,9 +1044,10 @@ vm_iommu_map(struct vm *vm) { vm_paddr_t gpa, hpa; struct mem_map *mm; - void *vp, *cookie; int i; + sx_assert(&vm->mem_segs_lock, SX_LOCKED); + for (i = 0; i < VM_MAX_MEMMAPS; i++) { mm = &vm->mem_maps[i]; if (!sysmem_mapping(vm, mm)) @@ -1060,13 +1061,24 @@ vm_iommu_map(struct vm *vm) mm->flags |= VM_MEMMAP_F_IOMMU; 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 = pmap_extract(vmspace_pmap(vm->vmspace), gpa); + + /* + * All mappings in the vmm vmspace must be + * present since they are managed by vmm in this way. + * Because we are in pass-through mode, the + * mappings must also be wired. This implies + * that all pages must be mapped and wired, + * allowing to use pmap_extract() and avoiding the + * need to use vm_gpa_hold_global(). + * + * This could change if/when we start + * supporting page faults on IOMMU maps. + */ + KASSERT(vm_page_wired(PHYS_TO_VM_PAGE(hpa)), + ("vm_iommu_map: vm %p gpa %jx hpa %jx not wired", + vm, (uintmax_t)gpa, (uintmax_t)hpa)); - hpa = DMAP_TO_PHYS((uintptr_t)vp); iommu_create_mapping(vm->iommu, gpa, hpa, PAGE_SIZE); } } @@ -1079,9 +1091,10 @@ vm_iommu_unmap(struct vm *vm) { vm_paddr_t gpa; struct mem_map *mm; - void *vp, *cookie; int i; + sx_assert(&vm->mem_segs_lock, SX_LOCKED); + for (i = 0; i < VM_MAX_MEMMAPS; i++) { mm = &vm->mem_maps[i]; if (!sysmem_mapping(vm, mm)) @@ -1095,12 +1108,10 @@ vm_iommu_unmap(struct vm *vm) mm->gpa, mm->len, mm->flags)); 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); - + KASSERT(vm_page_wired(PHYS_TO_VM_PAGE(pmap_extract( + vmspace_pmap(vm->vmspace), gpa))), + ("vm_iommu_unmap: vm %p gpa %jx not wired", + vm, (uintmax_t)gpa)); iommu_remove_mapping(vm->iommu, gpa, PAGE_SIZE); } }