Received-SPF: pass (google.com: domain of linux-kernel+bounces-69656-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Dongli Zhang <dongli.zhang@oracle.com>
To: kvm@vger.kernel.org
Cc: seanjc@google.com, pbonzini@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] KVM: VMX: return early if msr_bitmap is not supported
Date: Fri, 16 Feb 2024 17:45:12 -0800
Message-Id: <20240217014513.7853-3-dongli.zhang@oracle.com>
In-Reply-To: <20240217014513.7853-1-dongli.zhang@oracle.com>
References: <20240217014513.7853-1-dongli.zhang@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?dAt5lRm34mCUxbUHE3RUWhRlem4Tw0zf9he/zDl5xqa0U9hx4S4CWdyU4xeX?=
 =?us-ascii?Q?lW04ut8v/tD2eIjf08A/kXmU55YdAgx1SIrlm20S5/GPLLrQp70cm8taIHUJ?=
 =?us-ascii?Q?Kw/yjhtgxrkXIBI629pla7IDlUq2B3h75m9mdr5vS12k/Zy/motiHpf1ME4/?=
 =?us-ascii?Q?tLghB0guf82qch95ZrCc3Vhu0PvKN7KZnTcS9TPoWo7+nXr1Dcl3A9DAczMd?=
 =?us-ascii?Q?f7wZkEh7EJIElvYVujrA+nKFS5HYYUvOpfpOG8fLkpdwMu0WxfHWUg4bpAWU?=
 =?us-ascii?Q?aXTnWIJG49XTStomEelLkJF1PXZSsxdf0KBr9yDgGgEiyX6KRBClgk0e1g6H?=
 =?us-ascii?Q?CxLR6Y5hH5k8ZTD8q14mZyMQB7zWwLYv452YbvCg8Rfqeso7wFH2iQJSj/In?=
 =?us-ascii?Q?lxiFdClI03Zd3lpZv/F6e7+x4uVXPWweTgKT+Ccq2ZjPmYNmA2nDJFHmsath?=
 =?us-ascii?Q?686aUYNk7H5wxwgxTJYgvncrsoqBmVNOuGU/k/I8g31pEqM41EjuPusmidQF?=
 =?us-ascii?Q?5pRHImQR5uXw6lQpIic/JMLOE/+qFY/vuLLMQ89qfHSj3unlvoWeVSv87jPb?=
 =?us-ascii?Q?FQ80oGs8QuY450QE5u3Bb1EgKJ2nxszosV8k4dL3+rGNZvW+K1FnIYlAVMbT?=
 =?us-ascii?Q?eytD9EHuTdnQkC/Tc48U/vDWpcJ2HcOfpM17qeQZH0jSjivrJjz9T9rvpAqh?=
 =?us-ascii?Q?Hrh0mle/UkwM/rVXabh/wGk3ZgAhAxpMWJsUs49saKG2VAWH6fHbVSWmYA83?=
 =?us-ascii?Q?SFrLI6wANcPL6qTYQu3S+DZhNfGe12WQyehVFqkwXPT90EWvMRSe3/tXKYEL?=
 =?us-ascii?Q?hTkMcffILPkTah6DbCJw7A39TZMK4LCkKr7BKlMowHqMWhgrf+EUyUdQE6Wv?=
 =?us-ascii?Q?q01DwfQhTnuUp0PBJYyLNsNsYzuKCnvs1rHuxY0I0sJpVABrL1kURlDq1N7q?=
 =?us-ascii?Q?WwcWrRkusbpXvpsHxJMd2ck9ujqDmPkweYP6EHxQ3IJUGhnCqW+MIH625PDp?=
 =?us-ascii?Q?tI/wBpi3Dz/UDsRQfVWENbUNabjbPT2vT31+D3x/vQQjobAe9iEbCiWtd6j5?=
 =?us-ascii?Q?8DS6Xhr4ZxHNrmQGoHEysiLWJzelPetdX6NdL/AispWK4PGR1C2cY6gZwcMT?=
 =?us-ascii?Q?l5mISxmgRnZxPMDQlCG5YeHwThgJDaU++Gtp3GpxZKGqVPmIsp5nw5L4eY+S?=
 =?us-ascii?Q?y4xolnucr1cdMyy/DLkGGtx3xgG9kGsdaDiSzzJYvGayBAopEBOQWgKHspH8?=
 =?us-ascii?Q?7VmrPhD4GomiQFVcrrErEEJgKvjvnHOwF0w+X302LpVhopZoD50JVG+08M+p?=
 =?us-ascii?Q?yvAhpx07xvaz8pEmpE3B0phqMLQ4WRwT/ZsIx1yr5dXH9EH2AiB/fWjmZnlW?=
 =?us-ascii?Q?Ut+xYxtmzXwEcos7RE2N9vb9UjfioiwFYg18cBqPNewiYA7b9S0wd/QUpw0i?=
 =?us-ascii?Q?iQVZ6kcuAnSK8LMTYXlT6Ono/8U6z8A/TGYEgDU9ICOJnsN7juP3F2FWXj0u?=
 =?us-ascii?Q?upEpPSA90NOKyQIfO9itq6bFZuGx5lg5BxynktSY5WkqV7sH+L/XXSYfgidB?=
 =?us-ascii?Q?+pFVxT8wtMnnsZ78kUFm+MrYpVCCjPJ3AxgeT1PP9bjfISIqySe2AI4naxPd?=
 =?us-ascii?Q?Jg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	7QTuhTiX5AITMXqdHyAwaPCq1Vxrkd/LXhySmzNLsGldmf1ybLFfED+l+hsTa9LLCudhWqj2SlhREJy9tmBRAmpa+r13k4scvVSuWUuKqAJjry+bT01xV/vA8MnXd8QyYcjFFVijaWZXoAopDvA3NGbU64pgX/KoaRwmWp5lPGdCclEfcV/zPhXL95BkQEm6kiwgXYOmFTI6DABOtunXwMIJeRHUzVkEOjw7jFSN0bwURUvjqGLT2VGViM2OIjUGztXbGjCcIcib04qH6tcDOviJfouJF3N4/iZUQPe1m8GVyFMuIPl/meci2FQNsHLeopF+KlC/DX/ZO+XkRseDx4eKKXF84CeWVFFUeLDgO//E/wonlOO8onL8JuR6/z9Ruf9ecdbCCsQBe6mZgzWxD+nFRRG8Yk+AaPUD6jdiM5UvQmBadpiPpXiTixN1RsL4HudgIeG1QIT30qcYDwg8enhmh5lAUGDejJGVGY/cLFKdVkC/9IyGk8sYRgsfzZy1I013zV8dTgcXmGXHc8rwDF1/wbQUOC3Z0c1hpQ8WLtoJShWoYkk66PwLffmDtgnxpblKQskgx875mlC8sdzZ2/D6BqaMquTMqvjeQiBz3SE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a7364534-8424-455f-6ba8-08dc2f5a2504
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2024 01:45:39.5348
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: VT0QoJDGLPda3sDJjxwVZA1/Kzd/KkYINM8+3tgsgigTaBDm5M39VhjPV82Mh7N7TxKKZuw3IufFjaJTGfLJjw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7299
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-16_25,2024-02-16_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0
 suspectscore=0 mlxscore=0 bulkscore=0 spamscore=0 mlxlogscore=999
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402170010
X-Proofpoint-GUID: R__Hif8hqIm6n2VrXGgr5y10utWjoPW9
X-Proofpoint-ORIG-GUID: R__Hif8hqIm6n2VrXGgr5y10utWjoPW9

The vmx_msr_filter_changed() may directly/indirectly calls only
vmx_enable_intercept_for_msr() or vmx_disable_intercept_for_msr(). Those
two functions may exit immediately if !cpu_has_vmx_msr_bitmap().

vmx_msr_filter_changed()
-> vmx_disable_intercept_for_msr()
-> pt_update_intercept_for_msr()
   -> vmx_set_intercept_for_msr()
      -> vmx_enable_intercept_for_msr()
      -> vmx_disable_intercept_for_msr()

Therefore, we exit early if !cpu_has_vmx_msr_bitmap().

Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
---
 arch/x86/kvm/vmx/vmx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 05319b74bd3d..5a866d3c2bc8 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -4127,6 +4127,9 @@ static void vmx_msr_filter_changed(struct kvm_vcpu *vcpu)
 	struct vcpu_vmx *vmx = to_vmx(vcpu);
 	u32 i;
 
+	if (!cpu_has_vmx_msr_bitmap())
+		return;
+
 	/*
 	 * Redo intercept permissions for MSRs that KVM is passing through to
 	 * the guest.  Disabling interception will check the new MSR filter and
-- 
2.34.1