From nobody Thu Jan 26 22:12:08 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 4P2w151ttyz3c8kd; Thu, 26 Jan 2023 22:12:09 +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 4P2w1470GKz3wYq; Thu, 26 Jan 2023 22:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771129; 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=h9+gUMSzLmZ+I8qF6TZZ6jtnNp6yZFYGWjYqT9t+w1c=; b=qlzjToCCzkByESTNm2WIx6WzSHl36mNvE/LxP8EDSwO8AvMCTmYxacIHYuyH6gH7+J/mR4 60/um09Eo5W/Ou+UPltNvRFqz5daiTds6J5zRCxceQZiXJ2ACyfNaYOc/kHuCy2u+93/dj ciSCyqLbooE7gmOS/Dxa4s7IUwZk46E0AVYsC75zbIV0AhaXGPRBpqm+pB9/vgAUQzDJuJ z6QiCIKuyjeplzHGssv7m8brRE6ywyxvzlIfWR9h3uvkVx2Or7lH/LD6HWG1CUCswpA3Nz 8QVbDZ81n6cXOd7dt2vgwneLk/nNcRYdhjFWjUXcAypIXnlfcF/MW7p8M6Oogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771129; 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=h9+gUMSzLmZ+I8qF6TZZ6jtnNp6yZFYGWjYqT9t+w1c=; b=aAkKxtZQWnMQGLnypxgUZPV8tz0WHaMP+FCj5hxiCLgd2JITgrayvaQmZDxOkdNQOU8Jrl 2eCC3w/7xLkWi8Qnm4OGUwf4f7MftDNNWGH3hHpG0M02WiY3UIIrP16nE8MrGSPesg9Rso Xz33KX4o+KWTo4PCjxdnWlEt4VQAzidyd3JmzCh17ybsD75EJeOo/6AwWQmJVZ5iZ6N+Np bpl2gkF30TyMAD0ZpC/8Qz3koXHOR0z/K8iLl9ILUlCVVk4cKZe0dT52E9a/th5qDbfgnC fj8BcHSotAxthdrpCLem35HY+usao0+uRFcoyf9c7MW/7afmPG3Hy+ilnEIj+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771129; a=rsa-sha256; cv=none; b=Qbmn5rpuC5zIV8zcguovWb1FzBsdRiCeCEyUXzj6rXWrD9+HSytcreBakVu71R3Dm7YJUG 9rhTxBEasdm6m+H9BJG53v0W2uHBvs3KUDBZvPKLBLKHqo2MhQXB9h/Q5OpWIjo17QljXu qsLIPPMYvQDez+F9wwzkRj+qTeQ1utDZ4MaaPUgMemnnsIOyFShVnfRhS/Yrm/t4jIUUZs nYdS9qFKK4S/wUFWMA4RxPNZHZzUOZQkLDkF11Q54Sg1Yb9SpMZGgUc6VWbjh6lGDKlnV7 lf3J2/NeRvGm2nTbQZ4GwOG2M2u9SR1c7q4UTqELKEjihBzAeG9G4pUkMLUtFA== 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 4P2w145NJ4zlmJ; Thu, 26 Jan 2023 22:12:08 +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 30QMC8KG022289; Thu, 26 Jan 2023 22:12:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMC8r6022288; Thu, 26 Jan 2023 22:12:08 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:08 GMT Message-Id: <202301262212.30QMC8r6022288@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: eb37d3cc565e - stable/13 - vmm: take exclusive mem_segs_lock when (un)assigning ppt dev 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: eb37d3cc565e278d568b0454fc3b2b9cab4c3518 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eb37d3cc565e278d568b0454fc3b2b9cab4c3518 commit eb37d3cc565e278d568b0454fc3b2b9cab4c3518 Author: Robert Wing AuthorDate: 2023-01-20 10:03:59 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:05:13 +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 (cherry picked from commit ccf32a68f821c5c724fb9a5b4b9576925122292f) --- 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 1b8b1e6d388f..571e287dc4b6 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -476,6 +476,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: @@ -488,8 +490,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: