Commit 71290be1 authored by Michael Kelley's avatar Michael Kelley Committed by Borislav Petkov (AMD)
Browse files

x86/hyperv: Reorder code to facilitate future work 



Reorder some code to facilitate future work. No functional
change.

Signed-off-by: default avatarMichael Kelley <mikelley@microsoft.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarTianyu Lan <Tianyu.Lan@microsoft.com>
Link: https://lore.kernel.org/r/1679838727-87310-3-git-send-email-mikelley@microsoft.com
parent 88e378d4

arch/x86/hyperv/ivm.c

+34 −34
Original line number Diff line number Diff line
@@ -235,40 +235,6 @@ void hv_ghcb_msr_read(u64 msr, u64 *value) 
EXPORT_SYMBOL_GPL(hv_ghcb_msr_read);

#endif



enum hv_isolation_type hv_get_isolation_type(void)

{

	if (!(ms_hyperv.priv_high & HV_ISOLATION))

		return HV_ISOLATION_TYPE_NONE;

	return FIELD_GET(HV_ISOLATION_TYPE, ms_hyperv.isolation_config_b);

}

EXPORT_SYMBOL_GPL(hv_get_isolation_type);



/*

 * hv_is_isolation_supported - Check system runs in the Hyper-V

 * isolation VM.

 */

bool hv_is_isolation_supported(void)

{

	if (!cpu_feature_enabled(X86_FEATURE_HYPERVISOR))

		return false;



	if (!hypervisor_is_type(X86_HYPER_MS_HYPERV))

		return false;



	return hv_get_isolation_type() != HV_ISOLATION_TYPE_NONE;

}



DEFINE_STATIC_KEY_FALSE(isolation_type_snp);



/*

 * hv_isolation_type_snp - Check system runs in the AMD SEV-SNP based

 * isolation VM.

 */

bool hv_isolation_type_snp(void)

{

	return static_branch_unlikely(&isolation_type_snp);

}



/*

 * hv_mark_gpa_visibility - Set pages visible to host via hvcall.

 *
@@ -387,3 +353,37 @@ void hv_unmap_memory(void *addr) 
{

	vunmap(addr);

}



enum hv_isolation_type hv_get_isolation_type(void)

{

	if (!(ms_hyperv.priv_high & HV_ISOLATION))

		return HV_ISOLATION_TYPE_NONE;

	return FIELD_GET(HV_ISOLATION_TYPE, ms_hyperv.isolation_config_b);

}

EXPORT_SYMBOL_GPL(hv_get_isolation_type);



/*

 * hv_is_isolation_supported - Check system runs in the Hyper-V

 * isolation VM.

 */

bool hv_is_isolation_supported(void)

{

	if (!cpu_feature_enabled(X86_FEATURE_HYPERVISOR))

		return false;



	if (!hypervisor_is_type(X86_HYPER_MS_HYPERV))

		return false;



	return hv_get_isolation_type() != HV_ISOLATION_TYPE_NONE;

}



DEFINE_STATIC_KEY_FALSE(isolation_type_snp);



/*

 * hv_isolation_type_snp - Check system runs in the AMD SEV-SNP based

 * isolation VM.

 */

bool hv_isolation_type_snp(void)

{

	return static_branch_unlikely(&isolation_type_snp);

}