From nobody Fri Jan 20 19:04:44 2023 X-Original-To: dev-commits-src-all@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 4Nz87c5MDNz2v20S; Fri, 20 Jan 2023 19:04:44 +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 4Nz87c4pSLz3DK2; Fri, 20 Jan 2023 19:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674241484; 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=y2sIX6Vq8RWXqvy415piBIbJOPUvNwTlWkmL4NTTTdM=; b=lPEVG6lo5A4M8Oe6mG8+k7gZ9kGGD/MrrsezMp6RQBJjqK/aouLMTbllJnkxffN6+WSD8/ WN3LhXboPFJA+X0VpWn0IPsFftKrzuNEHuvAtDdSnDqkUo7fmV4jx3qKCduji2jylLZvkX ooh1baoBNU85amDbfEtMe6CXAJvBnZMJb8RzjGoJV9fyg/Ko4IRb3BgSORWvQkdrPqhVdW MqCbVnhvVhHYjhMWneja9u3x2lSI0mKE2mNJXP/dbbxblKbkHcdzWiCeMy5aLLr3pXr/1g 4Aa/pXkld2eRZZbF4jnRO0+wfUbsMtFCoNlFIUwlYetsb8IERq2DeepRla2bPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674241484; 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=y2sIX6Vq8RWXqvy415piBIbJOPUvNwTlWkmL4NTTTdM=; b=g1uYwIwak1MVxTLCn6eX4dcEX7PI6XxUYwO3LbxkaXNZUTdMa71S8s7rwtatFYlwDMqpji NCJ/m20ApwhgoxIrm2uqwTNJPjuNBJ4aZ7McTe9ADwDiCk3TWaYF8oZP/IO1u8/O7uGK6L xvCPaauDhvQKlPN4XP/Vjl2VPcsyJArTxLLI6r32l2QceoZyI02+taiZn+GZrjJa5Hu5bI 8PLchI/6LSf3s1sZzAXSsq92WSL4ttWc9GrJfkfiNEDukgr0PiVPdTptYSVu10dL6ZegC5 KaQjW22MN6pT6bUsVRe3Br+r9kUbo2NpyFo7QtV/PCvs+R+JvULRt3I1gY77wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674241484; a=rsa-sha256; cv=none; b=VLMib1KFgaAkULO2gcu2Imy7RAqKuFswJqWEgr9kJlvyUjIEqNjkce+WeSMAZsZWfpHbaW NhVcdZxxV9q15DS0AE/5+Ne+Iimo3NXtDTrueFte/+L/88vrXXsJl5IcQ2ZMI85X9J1R9r OOgxMWuJIKadaxx2KO5+zaHo+bOD6aSY2HQK2G7Oa6tVyMfQ4OSIy//YGaUS0KzKp3QBgl rW9odPcSDben5LxVpI3bG7bHVD5+4TDpvXwPR6HBVsP6m4n5NveXmhKuOcQ0sgCwOPU+sw excuIztBUmf3n1Gw+Jzex1B7aqLLpPqbCdzm9nHbBGYFLvG10AM69rYd+H99rA== 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 4Nz87c3qTDzhXs; Fri, 20 Jan 2023 19:04:44 +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 30KJ4ic6084873; Fri, 20 Jan 2023 19:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KJ4iOV084872; Fri, 20 Jan 2023 19:04:44 GMT (envelope-from git) Date: Fri, 20 Jan 2023 19:04:44 GMT Message-Id: <202301201904.30KJ4iOV084872@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: ccf32a68f821 - main - vmm: take exclusive mem_segs_lock when (un)assigning ppt dev List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ccf32a68f821c5c724fb9a5b4b9576925122292f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=ccf32a68f821c5c724fb9a5b4b9576925122292f commit ccf32a68f821c5c724fb9a5b4b9576925122292f Author: Robert Wing AuthorDate: 2023-01-20 10:03:59 +0000 Commit: Robert Wing CommitDate: 2023-01-20 10:03:59 +0000 vmm: take exclusive mem_segs_lock when (un)assigning ppt dev PR: 268744 Reported by: mmatalka@gmail.com Reviewed by: corvink, markj, jhb Fixes: 67b69e76e8ee ("vmm: Use an sx lock to protect the memory map.") Differential Revision: https://reviews.freebsd.org/D37962 --- sys/amd64/vmm/vmm_dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 98738b1f0692..2d8ff43a74dd 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -479,6 +479,8 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, case VM_ALLOC_MEMSEG_FBSD12: #endif case VM_ALLOC_MEMSEG: + case VM_BIND_PPTDEV: + case VM_UNBIND_PPTDEV: case VM_MMAP_MEMSEG: case VM_MUNMAP_MEMSEG: case VM_REINIT: @@ -491,8 +493,6 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, /* FALLTHROUGH */ case VM_MAP_PPTDEV_MMIO: case VM_UNMAP_PPTDEV_MMIO: - case VM_BIND_PPTDEV: - case VM_UNBIND_PPTDEV: #ifdef BHYVE_SNAPSHOT case VM_SNAPSHOT_REQ: case VM_RESTORE_TIME: