From nobody Thu Jan 26 22:12:22 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 4P2w1L3QGKz3c8k6; Thu, 26 Jan 2023 22:12:22 +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 4P2w1L1W75z3x0G; Thu, 26 Jan 2023 22:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771142; 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=x2uwD4GKi6vNgsouGOrIxeuI7nxYT2aqAxjUE3NfSws=; b=H+0cHulAkAuqUNMal/FtvHT0L+N5u1BkZOPhmvxrgMrfgpA7ZOEQ38Qb65fIvp2aS6Yg38 Oi+O7LU8oQmViJtEu2fGQemzannxQgwxHFp9PLMaPlCbwGvKT57+rRhoLgiWUiO2N8yfJH KI2AjN4j1EGIagtE+dD1uNyg7zPdqZFZlmS5GF/7cAFVV63AdpCnbj+AmJrHVaUOF44xuX lcefQbGtqUeKkwBaeJjrpbGy8GlW2LrC4UPEI4OYyb6M8Tzo0hO16lJGvwmkLRnNtW4zW8 jmUi6CEHU19g9eRkWoH67P4M+4ub4Tp8znEdbR7BMSV3jM9sJ2aaV6m+T2EGBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771142; 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=x2uwD4GKi6vNgsouGOrIxeuI7nxYT2aqAxjUE3NfSws=; b=pZ+JkdMXFab6oiS40zM/Fs6v0dFHQf+kpXB6kanx96Rj+b+Ti+P0kX6BkB8YMqq7L23HUx mCRxv81VUcdy80zuMOtd6BWtvyVbUaGXw7FNL3j5JtNJxodGB4czZ5tykVrrqMt7Ma3uhK LGjL2SzN6fBfBG99kfOHPyaVCLr4LwB9ojcK5KCFvqlmTKV7FyDAbOhKPwtN++zb20ac8y yNWlKUKOblsMlDu2Mz0Shtp7BnYVmAFpZn7oz2RpBSpDlrR0QkTwqAKZM/07YUSZHlWBlM +Ow4xhrEPUL5Tff0A0QjTfwybZnkhmkuv17Z1/ReexvT1bJgCH8GvyvYqegWCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771142; a=rsa-sha256; cv=none; b=MdE3FCeDGaGlXfZoLXCwSEGL1IaYWCYkcwNuU6kufXIVVuvB0D39BW0EpEuviHQlsUfBN/ dzfhqWbVJnEZPymJJX9N/0Fh/nxd40fP84g/5M5opLaSafCkOnA2YjsUExQOFEjqvsNcND f9oETsZGCdt6weDiM7asqrpIFgkI9AxvYg2G6aO1AYgjdfVF7gpcEKvf/s+QtQ+9zZF2dt iU10ipFqMKAj6mbF+rX92hBGbduIqB5y30R7Z8IHyd8NB94O2l8Z5r4EMIA+6ranlITBwd WDR9H/f+OMwo2WZWlm1OTin9zvMxHOIopttKHnVMsh1hVNeNSD3m+xMXKbauUQ== 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 4P2w1L0c0NzlhK; Thu, 26 Jan 2023 22:12:22 +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 30QMCMpk022601; Thu, 26 Jan 2023 22:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMCMkT022600; Thu, 26 Jan 2023 22:12:22 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:22 GMT Message-Id: <202301262212.30QMCMkT022600@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: 3bedbb1008a8 - stable/13 - vmm: Don't lock a vCPU for VM_PPTDEV_MSI[X]. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3bedbb1008a82641b785d58f5c0def8ce5ec5377 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3bedbb1008a82641b785d58f5c0def8ce5ec5377 commit 3bedbb1008a82641b785d58f5c0def8ce5ec5377 Author: John Baldwin AuthorDate: 2022-12-09 18:26:23 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:07:24 +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 (cherry picked from commit 91980db1beecd52e34a1550a247e374cfcc746a2) --- 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 9afcd1796173..94b462feef6a 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: