Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d360d4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: cpuid: extract do_cpuid_7_mask and support multiple subleafs 



CPUID function 7 has multiple subleafs.  Instead of having nested
switch statements, move the logic to filter supported features to
a separate function, and call it for each subleaf.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ab8bcf64

arch/x86/kvm/cpuid.c

+81 −47
Original line number Original line Diff line number Diff line
@@ -328,6 +328,71 @@ static int __do_cpuid_func_emulated(struct kvm_cpuid_entry2 *entry, 
	return 0;

	return 0;

}

}





static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry, int index)

{

	unsigned f_invpcid = kvm_x86_ops->invpcid_supported() ? F(INVPCID) : 0;

	unsigned f_mpx = kvm_mpx_supported() ? F(MPX) : 0;

	unsigned f_umip = kvm_x86_ops->umip_emulated() ? F(UMIP) : 0;

	unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0;

	unsigned f_la57;



	/* cpuid 7.0.ebx */

	const u32 kvm_cpuid_7_0_ebx_x86_features =

		F(FSGSBASE) | F(BMI1) | F(HLE) | F(AVX2) | F(SMEP) |

		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | f_mpx | F(RDSEED) |

		F(ADX) | F(SMAP) | F(AVX512IFMA) | F(AVX512F) | F(AVX512PF) |

		F(AVX512ER) | F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB) | F(AVX512DQ) |

		F(SHA_NI) | F(AVX512BW) | F(AVX512VL) | f_intel_pt;



	/* cpuid 7.0.ecx*/

	const u32 kvm_cpuid_7_0_ecx_x86_features =

		F(AVX512VBMI) | F(LA57) | F(PKU) | 0 /*OSPKE*/ |

		F(AVX512_VPOPCNTDQ) | F(UMIP) | F(AVX512_VBMI2) | F(GFNI) |

		F(VAES) | F(VPCLMULQDQ) | F(AVX512_VNNI) | F(AVX512_BITALG) |

		F(CLDEMOTE) | F(MOVDIRI) | F(MOVDIR64B);



	/* cpuid 7.0.edx*/

	const u32 kvm_cpuid_7_0_edx_x86_features =

		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |

		F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES) | F(INTEL_STIBP) |

		F(MD_CLEAR);



	switch (index) {

	case 0:

		entry->eax = 0;

		entry->ebx &= kvm_cpuid_7_0_ebx_x86_features;

		cpuid_mask(&entry->ebx, CPUID_7_0_EBX);

		/* TSC_ADJUST is emulated */

		entry->ebx |= F(TSC_ADJUST);



		entry->ecx &= kvm_cpuid_7_0_ecx_x86_features;

		f_la57 = entry->ecx & F(LA57);

		cpuid_mask(&entry->ecx, CPUID_7_ECX);

		/* Set LA57 based on hardware capability. */

		entry->ecx |= f_la57;

		entry->ecx |= f_umip;

		/* PKU is not yet implemented for shadow paging. */

		if (!tdp_enabled || !boot_cpu_has(X86_FEATURE_OSPKE))

			entry->ecx &= ~F(PKU);



		entry->edx &= kvm_cpuid_7_0_edx_x86_features;

		cpuid_mask(&entry->edx, CPUID_7_EDX);

		/*

		 * We emulate ARCH_CAPABILITIES in software even

		 * if the host doesn't support it.

		 */

		entry->edx |= F(ARCH_CAPABILITIES);

		break;

	default:

		WARN_ON_ONCE(1);

		entry->eax = 0;

		entry->ebx = 0;

		entry->ecx = 0;

		entry->edx = 0;

		break;

	}

}



static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,

static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,

				  int *nent, int maxnent)

				  int *nent, int maxnent)

{

{
@@ -342,12 +407,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, 
	unsigned f_lm = 0;

	unsigned f_lm = 0;

#endif

#endif

	unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported() ? F(RDTSCP) : 0;

	unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported() ? F(RDTSCP) : 0;

	unsigned f_invpcid = kvm_x86_ops->invpcid_supported() ? F(INVPCID) : 0;

	unsigned f_mpx = kvm_mpx_supported() ? F(MPX) : 0;

	unsigned f_xsaves = kvm_x86_ops->xsaves_supported() ? F(XSAVES) : 0;

	unsigned f_xsaves = kvm_x86_ops->xsaves_supported() ? F(XSAVES) : 0;

	unsigned f_umip = kvm_x86_ops->umip_emulated() ? F(UMIP) : 0;

	unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0;

	unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0;

	unsigned f_la57 = 0;





	/* cpuid 1.edx */

	/* cpuid 1.edx */

	const u32 kvm_cpuid_1_edx_x86_features =

	const u32 kvm_cpuid_1_edx_x86_features =
@@ -400,31 +461,10 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, 
		F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) |

		F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) |

		F(PMM) | F(PMM_EN);

		F(PMM) | F(PMM_EN);





	/* cpuid 7.0.ebx */

	const u32 kvm_cpuid_7_0_ebx_x86_features =

		F(FSGSBASE) | F(BMI1) | F(HLE) | F(AVX2) | F(SMEP) |

		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | f_mpx | F(RDSEED) |

		F(ADX) | F(SMAP) | F(AVX512IFMA) | F(AVX512F) | F(AVX512PF) |

		F(AVX512ER) | F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB) | F(AVX512DQ) |

		F(SHA_NI) | F(AVX512BW) | F(AVX512VL) | f_intel_pt;



	/* cpuid 0xD.1.eax */

	/* cpuid 0xD.1.eax */

	const u32 kvm_cpuid_D_1_eax_x86_features =

	const u32 kvm_cpuid_D_1_eax_x86_features =

		F(XSAVEOPT) | F(XSAVEC) | F(XGETBV1) | f_xsaves;

		F(XSAVEOPT) | F(XSAVEC) | F(XGETBV1) | f_xsaves;





	/* cpuid 7.0.ecx*/

	const u32 kvm_cpuid_7_0_ecx_x86_features =

		F(AVX512VBMI) | F(LA57) | F(PKU) | 0 /*OSPKE*/ |

		F(AVX512_VPOPCNTDQ) | F(UMIP) | F(AVX512_VBMI2) | F(GFNI) |

		F(VAES) | F(VPCLMULQDQ) | F(AVX512_VNNI) | F(AVX512_BITALG) |

		F(CLDEMOTE) | F(MOVDIRI) | F(MOVDIR64B);



	/* cpuid 7.0.edx*/

	const u32 kvm_cpuid_7_0_edx_x86_features =

		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |

		F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES) | F(INTEL_STIBP) |

		F(MD_CLEAR);



	/* all calls to cpuid_count() should be made on the same cpu */

	/* all calls to cpuid_count() should be made on the same cpu */

	get_cpu();

	get_cpu();
@@ -496,30 +536,24 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, 
		entry->ecx = 0;

		entry->ecx = 0;

		entry->edx = 0;

		entry->edx = 0;

		break;

		break;

	/* function 7 has additional index. */

	case 7: {

	case 7: {

		int i;



		entry->flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;

		entry->flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX;

		entry->eax = 0;

		for (i = 0; ; ) {

		/* Mask ebx against host capability word 9 */

			do_cpuid_7_mask(&entry[i], i);

		entry->ebx &= kvm_cpuid_7_0_ebx_x86_features;

			if (i == entry->eax)

		cpuid_mask(&entry->ebx, CPUID_7_0_EBX);

				break;

		// TSC_ADJUST is emulated

			if (*nent >= maxnent)

		entry->ebx |= F(TSC_ADJUST);

				goto out;

		entry->ecx &= kvm_cpuid_7_0_ecx_x86_features;



		f_la57 = entry->ecx & F(LA57);

			++i;

		cpuid_mask(&entry->ecx, CPUID_7_ECX);

			do_cpuid_1_ent(&entry[i], function, i);

		/* Set LA57 based on hardware capability. */

			entry[i].flags |=

		entry->ecx |= f_la57;

			       KVM_CPUID_FLAG_SIGNIFCANT_INDEX;

		entry->ecx |= f_umip;

			++*nent;

		/* PKU is not yet implemented for shadow paging. */

		}

		if (!tdp_enabled || !boot_cpu_has(X86_FEATURE_OSPKE))

			entry->ecx &= ~F(PKU);

		entry->edx &= kvm_cpuid_7_0_edx_x86_features;

		cpuid_mask(&entry->edx, CPUID_7_EDX);

		/*

		 * We emulate ARCH_CAPABILITIES in software even

		 * if the host doesn't support it.

		 */

		entry->edx |= F(ARCH_CAPABILITIES);

		break;

		break;

	}

	}

	case 9:

	case 9: