From nobody Fri Jan 20 20:11:11 2023 X-Original-To: dev-commits-src-main@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 4Nz9cH61Gkz2vB4K; Fri, 20 Jan 2023 20:11:11 +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 4Nz9cH5ZSGz3Jwp; Fri, 20 Jan 2023 20:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674245471; 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=BhDlCJKrcohLtMeUBWSbAeT+eul5O6Fs9M6NWljFtsw=; b=D0GpmDPVBEsliQmIOcGs9JP2OSehf8GdmIW0TmA07tfdiyD6ZWxVG/1YGAVyeVpSwY08NT xuNIv6xbwWyJfXEteexXNr9Vl2f4Hzi4flX1KJS9MXpy6YpqB9UnQxfuIcePFuEARBxRGB kBC0bNqM1CJistgFyttxmWW2+lrvjgYlawP0YzzvRI5bUUmM8xDFjNqE6+4VmE8WU7qSDL oMjnpKkk3WjpXoFvrXBqbFTNyTmZqXfUjd0hcgiykKXsthqay2sPqT6fLwsJUB+esNJR5w /tWT4gU8llRt41w93x106vynKuCSCFStaAo1dqcl5XWOANF1vmHfk7OuWogh2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674245471; 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=BhDlCJKrcohLtMeUBWSbAeT+eul5O6Fs9M6NWljFtsw=; b=mrpzQXrw8KMgpwByr5IHa8yvezR4D90KsuvrsTH1Lm61np446iAOjg4VfW/soo/gvo200O jWYzcrIwLAvr74XWaElljssuSRmhCOVZFwfB6K8C+P/mETloaRaIFoQsg6qG2+yJOkH57s c6WlnOzHf+0SgtNpKpYAaZTmtynCW47NIIJ8t3jzAOgS5GgET8t782U+x5XxHRFnWPzucs a1BM50fi+gy1A4/mW1NedLwTj4W8Jq0Jzo1ZY/w/TniBeIKbwUAZy6sl013ae3/Ew8LaqD QeJ64XkPS8wXt/rfZg+yCkmP10KjFlOseoCSDJkiMFbqBwBdUsKw4PWKJrOymA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674245471; a=rsa-sha256; cv=none; b=BCUVtKeKa8aZyFjk5/DJJW04oqiuhOEhRT/fNFM8/UzOyD+2VPaqcjlshZwZy0ZNHkaXfZ /ROAZnBW5nN2XOJMSLeMYgzmMGYDSqkukluLfopBgtZornRfPGpgyLQ8I/3Nl3uoEDQuKq 5XrNnp+3gwfVukSZLsdwySxDBg+Vzbe8auQf+Td3Ezw3SxdpqpuDB/xL+/Jwx46e1oSB4r LDKMt3g2b7mJHudBSdZ9VVx90GmBU52VkN9EzrV74mufecBT6DkOrLxFpyJtLMKPjjGyhw AlZjE+1WPSEPdDx6ZtFntJYo4d0kqyJVGRYUIoQXTbl2CmURm9YyhU4S1QgJTA== 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 4Nz9cH4f3RzjqJ; Fri, 20 Jan 2023 20:11:11 +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 30KKBBjj082543; Fri, 20 Jan 2023 20:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KKBBCi082542; Fri, 20 Jan 2023 20:11:11 GMT (envelope-from git) Date: Fri, 20 Jan 2023 20:11:11 GMT Message-Id: <202301202011.30KKBBCi082542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: c668e8173a8f - main - vmm: take exclusive mem_segs_lock in vm_cleanup() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c668e8173a8fc047b54a5c51b0fe4637e87836b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=c668e8173a8fc047b54a5c51b0fe4637e87836b6 commit c668e8173a8fc047b54a5c51b0fe4637e87836b6 Author: Robert Wing AuthorDate: 2023-01-20 11:10:53 +0000 Commit: Robert Wing CommitDate: 2023-01-20 11:10:53 +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 --- 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 169109e8df6e..24f97a9244f0 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -651,6 +651,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) @@ -690,6 +693,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;