From nobody Fri Dec 09 18:31:37 2022 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 4NTKNn3s4zz4jx3y; Fri, 9 Dec 2022 18:31:37 +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 4NTKNn3HWPz3LKH; Fri, 9 Dec 2022 18:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670610697; 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=Z6Sd4t4V4v66+DZVzZ0bqKiv0c/0KkdMtCfp3g9cJRw=; b=ovgA57zAQuJaqAyHoAxqJMMtIHLFfCfXEtzLSEOWWmMBMiIdzcWNPOiS82TCcIxzbUpLhu QwzD3PpjxLlLt+Jm+smPdxoBoxxmMdqfV5pixLK1aYCSh2kmkRI7V9L/af0y6tIF6nQiKu dC4mymkmHYLj9GNuwlY5lqgUemCE4thmbtkNNElWezsdw+nWsu/9DGRInAW0RmYBbzRYa9 kgMhm9+CNLSLVJ+g8QRCISTH67JWlHl2KHcUCTvC6UP7pJRyVJwBBpbh442ioC8e7ICQWl PJ0Avxedb5RqJSEJ+mHTwtuGzqEbctlFNfCqQo0vXxS44CqX6f/JBCdZRNXC4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670610697; 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=Z6Sd4t4V4v66+DZVzZ0bqKiv0c/0KkdMtCfp3g9cJRw=; b=LzR4iSFUZCyWnckjlfKmF8Wz4Q7pXpikGOqxzIKX6myLV70MN78W0oX/DD1hOgxlYeQCpd 2Q9tu1OYZiHSXsuP8FURXPE4kG/O8ZihTz4kBeC8/AYppDsYzaHxTkZNrrSA2Cx8RDMoEI kKUOuApzR2MSuQfdppivb+Wav1Jyo23APBChoGTD46wOwu0yzb+vnV/r9geotuIXZ9vJJK kepOELM1fZNcGZpl+Lhtw1ay9s7vheNRD2Tu78HU1V8jjp/HgG1RNcSeX/z11uVXz/mq6I og3HMNQnPP1jvgZ8G+FYuqiEl3osrSaxCg5qgUg2jmfFAPT6sZd0HN5D6iv58w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670610697; a=rsa-sha256; cv=none; b=rP/q1osag39TAJqv9QleypPyHUK4ZsPWrgZt+nGRo/RWnhrzodHqtAXu9uCjRiOLu2tJCV GiPMNTEdQohq1dk4+Uzufy62gP6fFektT9uYAgtUla5BKcJo8nLjEKuHa8M8veXMxPPkFH ZJDchdTjd6KWcshgAZUPtezLa55SVSsqdIj25ugSlC4AsiVrdnyrcCM7rk+Ski7zJhVRRd zji1DikgYahuaqscuzuIsGNJaPuOPlX/lP7ITy7T69sYBLA5mJZ221i8OaT70RJz7waGUJ ud4LYKDBaTXgvrWflX0BeHK6sPEa+vlF8ltLECMvK4hqZRKx79LSdfDJ57Dxxg== 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 4NTKNn28FNzm0B; Fri, 9 Dec 2022 18:31:37 +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 2B9IVbcN024068; Fri, 9 Dec 2022 18:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9IVbC4024067; Fri, 9 Dec 2022 18:31:37 GMT (envelope-from git) Date: Fri, 9 Dec 2022 18:31:37 GMT Message-Id: <202212091831.2B9IVbC4024067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 91980db1beec - main - vmm: Don't lock a vCPU for VM_PPTDEV_MSI[X]. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91980db1beecd52e34a1550a247e374cfcc746a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=91980db1beecd52e34a1550a247e374cfcc746a2 commit 91980db1beecd52e34a1550a247e374cfcc746a2 Author: John Baldwin AuthorDate: 2022-12-09 18:26:23 +0000 Commit: John Baldwin CommitDate: 2022-12-09 18:26:23 +0000 vmm: Don't lock a vCPU for VM_PPTDEV_MSI[X]. These are manipulating state in a ppt(4) device none of which is vCPU-specific. Mark the vcpu fields in the relevant ioctl structures as unused, but don't remove them for now. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37639 --- sys/amd64/include/vmm_dev.h | 4 ++-- sys/amd64/vmm/vmm_dev.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h index 9ed8f32302ae..deeb125428f3 100644 --- a/sys/amd64/include/vmm_dev.h +++ b/sys/amd64/include/vmm_dev.h @@ -147,7 +147,7 @@ struct vm_pptdev_mmio { }; struct vm_pptdev_msi { - int vcpu; + int vcpu; /* unused */ int bus; int slot; int func; @@ -157,7 +157,7 @@ struct vm_pptdev_msi { }; struct vm_pptdev_msix { - int vcpu; + int vcpu; /* unused */ int bus; int slot; int func; diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 38990387c161..aad4cf893114 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -451,8 +451,6 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, case VM_INJECT_EXCEPTION: case VM_GET_CAPABILITY: case VM_SET_CAPABILITY: - case VM_PPTDEV_MSI: - case VM_PPTDEV_MSIX: case VM_SET_X2APIC_STATE: case VM_GLA2GPA: case VM_GLA2GPA_NOFAULT: