pKVM: VMX: Use safe version MSR accessing wrapper to setup uret MSRs

Now the pKVM exception table is supported. The safe version MSR wrappers
can be used to access MSR in the pKVM. Remove the specific workaround
used for setup uret MSRs.

Signed-off-by: Chuanxiao Dong <[email protected]>

Author: cxdong

arch/x86/kvm/vmx/vmx.c

@@ -8696,25 +8696,8 @@ static __init void vmx_setup_user_return_msrs(void)
 
 	BUILD_BUG_ON(ARRAY_SIZE(vmx_uret_msrs_list) != MAX_NR_USER_RETURN_MSRS);
 
-#ifndef __PKVM_HYP__
 	for (i = 0; i < ARRAY_SIZE(vmx_uret_msrs_list); ++i)
 		kvm_add_user_return_msr(vmx_uret_msrs_list[i]);
-#else
-	for (i = 0; i < ARRAY_SIZE(vmx_uret_msrs_list); ++i) {
-		/*
-		 * TODO: As pKVM doesn't implement exception table so cannot
-		 * handle the exception generated by accessing MSR. To avoid
-		 * this, check cpu capability first before accessing a MSR which
-		 * might be not able to support. Once exception table is
-		 * supported, this can be removed.
-		 */
-		if (vmx_uret_msrs_list[i] == MSR_IA32_TSX_CTRL &&
-		    !boot_cpu_has(X86_FEATURE_MSR_TSX_CTRL))
-			continue;
-
-		kvm_add_user_return_msr(vmx_uret_msrs_list[i]);
-	}
-#endif
 }
 
 #ifndef __PKVM_HYP__