From nobody Thu Jan 26 22:11:52 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 4P2w0n1xn0z3c8K9; Thu, 26 Jan 2023 22:11:53 +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 4P2w0n0Fcmz3vvf; Thu, 26 Jan 2023 22:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771113; 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=/Mr8Gp/q1POaY9YA14KxTLn1Y2jXPsARzUyKIQBGOgs=; b=HQI+SY3FrTdjINt3ZIBi2yNaoJ1bUGAbKb5t/2rE9xinYH9O2DoAKogM6Z3EIPwZExwtnC k4W+uYOoO752BtIZRd0dBD2OjS27QC5QOgmrTJfNI6EUckbkFtJjQCBjqkpZF4yPLC1zPD /uPXX9c/Nstb8+AGiGVjWfFcJMbWGmhVRo1ND7+VnpZRkjmZGy0q/oIiIGJxvidmu7CpGL YTxw5H7qIA43g58GQ6w6ipkzM9cY/QGUuwz8DIYNYZf2xjJ1NwlsJOD4yWYIqCDg24WvqI D8SuIbXsRRowtXf45cDTwoHg7fP/udHXP+ltAWEgUjYkMNRiepBqk94UPe4Qog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771113; 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=/Mr8Gp/q1POaY9YA14KxTLn1Y2jXPsARzUyKIQBGOgs=; b=gtrLnKUFg+H9coKVCh+aal5SbAVwQOWgw/msyfkSGEl4Zj8vhlw01mJOuAWdJ5we0a8auB WSHKldTA6WOoVGJDjE/PXg6+ze/y2Dq6AB/IYj4cGR5srcIexZdT86TFVpiLaePp5jBOQz qX9d2iKO0TlusGpT+9d1e0UZUns2XFFSNZ8hs2Hvz4nA9aoNjQHzW0NwYqUgd3QsR9PtLH pYI/3f9T5hhtwKly9ohMN0VR3PvJxj4aXBnAJthm0b3n4Q0+tvODYJhKqwjmNyJSL0pDaM yRycm9cL8Uj6CLI0BQJkbZx35mU/ITcf0+fkc1ySKvYHWg/PKEK1NwzDswcHYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771113; a=rsa-sha256; cv=none; b=MvdXeoAVbCw7XbZpbOYkjiKgFnD12hEzKZUPI8biv6bFjje/ARpnIur1Z9qKRojtdsz2x+ OVsE27Vd4ILUvLPIP7cvl6OxHm8n5LmxD2MGYmwUA6ASNseF4NMShDtj8NiysS8WUvPeaG Tb19tHeDlveJ8sJh34N0C8JafqDiDHmo1UwJ0yElPdYHBwyu3Gk4We+UtJDRd9NKnOJYiy OXr6RMNpeu07ZMvirtgTeuNgjAtXvJaKYxhOOFjcRIDueI4PzXtumIWU731GJwhC/3exaC 2OHIu9WY67GBI5eUrfdH9cNIF6a2NT3A8BhmDjYi42Kvx3+vQ6JrRQq8geIzJA== 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 4P2w0m63qYzm5Z; Thu, 26 Jan 2023 22:11:52 +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 30QMBqGY021922; Thu, 26 Jan 2023 22:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMBqgD021921; Thu, 26 Jan 2023 22:11:52 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:11:52 GMT Message-Id: <202301262211.30QMBqgD021921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 6cedf47c177b - stable/13 - vmm: Add vm_gpa_hold_global wrapper function. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cedf47c177b7afe730a2276064da4f8e8110f5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6cedf47c177b7afe730a2276064da4f8e8110f5f commit 6cedf47c177b7afe730a2276064da4f8e8110f5f Author: John Baldwin AuthorDate: 2022-11-18 18:01:57 +0000 Commit: John Baldwin CommitDate: 2023-01-26 21:47:28 +0000 vmm: Add vm_gpa_hold_global wrapper function. This handles the case that guest pages are being held not on behalf of a virtual CPU but globally. Previously this was handled by passing a vcpuid of -1 to vm_gpa_hold, but that will not work in the future when vm_gpa_hold is changed to accept a struct vcpu pointer. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37160 (cherry picked from commit 28b561ad9d03617418aed33b9b8c1311e940f0c8) --- sys/amd64/include/vmm.h | 2 ++ sys/amd64/vmm/vmm.c | 64 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index e632a0fbf01e..315a1b19f8f6 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -253,6 +253,8 @@ int vm_get_memseg(struct vm *vm, int ident, size_t *len, bool *sysmem, vm_paddr_t vmm_sysmem_maxaddr(struct vm *vm); void *vm_gpa_hold(struct vm *, int vcpuid, vm_paddr_t gpa, size_t len, int prot, void **cookie); +void *vm_gpa_hold_global(struct vm *vm, vm_paddr_t gpa, size_t len, + int prot, void **cookie); void vm_gpa_release(void *cookie); bool vm_mem_allocated(struct vm *vm, int vcpuid, vm_paddr_t gpa); diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 079577784f52..6b93708ba9cc 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -965,8 +965,8 @@ vm_iommu_modify(struct vm *vm, bool map) gpa = mm->gpa; while (gpa < mm->gpa + mm->len) { - vp = vm_gpa_hold(vm, -1, gpa, PAGE_SIZE, VM_PROT_WRITE, - &cookie); + 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)); @@ -1032,30 +1032,14 @@ vm_assign_pptdev(struct vm *vm, int bus, int slot, int func) return (error); } -void * -vm_gpa_hold(struct vm *vm, int vcpuid, vm_paddr_t gpa, size_t len, int reqprot, - void **cookie) +static void * +_vm_gpa_hold(struct vm *vm, vm_paddr_t gpa, size_t len, int reqprot, + void **cookie) { int i, count, pageoff; struct mem_map *mm; vm_page_t m; -#ifdef INVARIANTS - /* - * All vcpus are frozen by ioctls that modify the memory map - * (e.g. VM_MMAP_MEMSEG). Therefore 'vm->memmap[]' stability is - * guaranteed if at least one vcpu is in the VCPU_FROZEN state. - */ - int state; - KASSERT(vcpuid >= -1 && vcpuid < vm->maxcpus, ("%s: invalid vcpuid %d", - __func__, vcpuid)); - for (i = 0; i < vm->maxcpus; i++) { - if (vcpuid != -1 && vcpuid != i) - continue; - state = vcpu_get_state(vm, i, NULL); - KASSERT(state == VCPU_FROZEN, ("%s: invalid vcpu state %d", - __func__, state)); - } -#endif + pageoff = gpa & PAGE_MASK; if (len > PAGE_SIZE - pageoff) panic("vm_gpa_hold: invalid gpa/len: 0x%016lx/%lu", gpa, len); @@ -1079,6 +1063,42 @@ vm_gpa_hold(struct vm *vm, int vcpuid, vm_paddr_t gpa, size_t len, int reqprot, } } +void * +vm_gpa_hold(struct vm *vm, int vcpuid, vm_paddr_t gpa, size_t len, int reqprot, + void **cookie) +{ +#ifdef INVARIANTS + /* + * The current vcpu should be frozen to ensure 'vm_memmap[]' + * stability. + */ + int state = vcpu_get_state(vm, vcpuid, NULL); + KASSERT(state == VCPU_FROZEN, ("%s: invalid vcpu state %d", + __func__, state)); +#endif + return (_vm_gpa_hold(vm, gpa, len, reqprot, cookie)); +} + +void * +vm_gpa_hold_global(struct vm *vm, vm_paddr_t gpa, size_t len, int reqprot, + void **cookie) +{ +#ifdef INVARIANTS + /* + * All vcpus are frozen by ioctls that modify the memory map + * (e.g. VM_MMAP_MEMSEG). Therefore 'vm->memmap[]' stability is + * guaranteed if at least one vcpu is in the VCPU_FROZEN state. + */ + int state; + for (int i = 0; i < vm->maxcpus; i++) { + state = vcpu_get_state(vm, i, NULL); + KASSERT(state == VCPU_FROZEN, ("%s: invalid vcpu state %d", + __func__, state)); + } +#endif + return (_vm_gpa_hold(vm, gpa, len, reqprot, cookie)); +} + void vm_gpa_release(void *cookie) {