From nobody Thu Jan 26 22:12:09 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 4P2w161pDqz3c8f5; Thu, 26 Jan 2023 22:12:10 +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 4P2w160xYCz3wlH; Thu, 26 Jan 2023 22:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771130; 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=gYngDk4Nl4m0NbFgBAbVM7nnpqO+oAj0XQK9EiRg3rQ=; b=jnYR2ytdFrTJWObsmGn9BDfV0tEj3J8SZtlDs9vGJ/sRqWOIYzIf4eHN6dwCkNKWcbAwtW YhBX/Ghv0DYtDX1pHQVBBoTTdT1iDup+L1sVxMxt8R8OdlsSi6mgWZy6BhHYmqydVs8o6W P/EAU/qA3qloTe5sSCDmA0gVDfzQUWUvyZgoLOSjrHmHGt5U4Gil8Hb4jFmUI2hyOuYxFu +50dxwr5xFgPGSR8cYskPYJH4T8vOGiIYyuMCHCGNa79cklYwsLr3vKxwv1d4vygUTt+gc 0lOGHEU0lyeX+d33V5IWuFuqHpUG4Y3APdIPhq+9EjUrOKrzNpZfWcuQCy3Iow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771130; 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=gYngDk4Nl4m0NbFgBAbVM7nnpqO+oAj0XQK9EiRg3rQ=; b=aesKvOEkom5dvslzrSQSVlLCIwasCiMzf0NN1WSA1omxRcglODyPLyU+vlB8nlYoq5BAfD 8mKddKPrGS5ivWQvP+7tu+FbkzdFeF5VrxhTvQoCzqIk/mZ8zFFmnvpkk26FvdbdtP4Vtn q4mEFLZWdnVcZCCmQjNGwvRUOwnbZQaMEZ4mBPB19k2x/bkxPPctV99dBYIsUvtjj+hA+C jwTuk6RcKLQjwqUWgPGuYlE35F3yJ2zB/Fm1WymumGIAesT95Nyr8eAE1+xBt8ALtYK7al 3sKz0Ato19tCdCvjrm9dJc7IqxEjI+4EW5QWC8Q4QiNUZiz8fTsZ9jQIRbaJWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771130; a=rsa-sha256; cv=none; b=ZZWAW3gcmWSTmugqcpjUX9q8Nqdvfp9/B2U9b4To0QFbqI1eUdv2GrxvsvnRxaNQBTGexe xpXDDRrZjlyqBfUMoOHhiMWIR51VCPRjYMOCP5EwVEyrhpq9PpBleOgXOXvl+v3+KtbR3z 9b+biwffYohQvpcQ6YERSE3W+KBLXVrgit5h1nkpdq+e6V1sGyV1HRZxxuZbioaQitdwDW l1ay25fvmui3b+UOo4IijuWyrp9KVnrbbEhMM5g3OLYV7cKwtgQfgnh4njvKcolhx+5vPY DjYuSg3UyWqwVev9RH+Ocvw8Jvw2ILLWxrUHVza62eryvFgy40O/vbu0ma8Cjw== 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 4P2w156Ck6zljk; Thu, 26 Jan 2023 22:12:09 +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 30QMC93k022313; Thu, 26 Jan 2023 22:12:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMC9We022312; Thu, 26 Jan 2023 22:12:09 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:09 GMT Message-Id: <202301262212.30QMC9We022312@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: 8cd6af3324bf - stable/13 - vmm: take exclusive mem_segs_lock in vm_cleanup() 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: 8cd6af3324bfb563a64d34b581e88efa46db6ac5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8cd6af3324bfb563a64d34b581e88efa46db6ac5 commit 8cd6af3324bfb563a64d34b581e88efa46db6ac5 Author: Robert Wing AuthorDate: 2023-01-20 11:10:53 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:05:23 +0000 vmm: take exclusive mem_segs_lock in vm_cleanup() The consumers of vm_cleanup() are vm_reinit() and vm_destroy(). The vm_reinit() call path is, here vmmdev_ioctl() takes mem_segs_lock: vmmdev_ioctl() vm_reinit() vm_cleanup(destroy=false) The call path for vm_destroy() is (mem_segs_lock not taken): sysctl_vmm_destroy() vmmdev_destroy() vm_destroy() vm_cleanup(destroy=true) Fix this by taking mem_segs_lock in vm_cleanup() when destroy == true. Reviewed by: corvink, markj, jhb Fixes: 67b69e76e8ee ("vmm: Use an sx lock to protect the memory map.") Differential Revision: https://reviews.freebsd.org/D38071 (cherry picked from commit c668e8173a8fc047b54a5c51b0fe4637e87836b6) --- sys/amd64/vmm/vmm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 87f1d9e45d58..57c8555f08fe 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -576,6 +576,9 @@ vm_cleanup(struct vm *vm, bool destroy) struct mem_map *mm; int i; + if (destroy) + vm_xlock_memsegs(vm); + ppt_unassign_all(vm); if (vm->iommu != NULL) @@ -613,6 +616,7 @@ vm_cleanup(struct vm *vm, bool destroy) if (destroy) { for (i = 0; i < VM_MAX_MEMSEGS; i++) vm_free_memseg(vm, i); + vm_unlock_memsegs(vm); vmmops_vmspace_free(vm->vmspace); vm->vmspace = NULL;