Commit d3c63e48 authored by Bibo Mao's avatar Bibo Mao Committed by Xianglai Li
Browse files

LoongArch: KVM: Implement function kvm_para_has_feature() 

mainline inclusion
from mainline-v6.12-rc1
commit 3abb708ec0be25da16a1ee9f1ab5cbc93f3256f3
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZJDO


CVE: NA

--------------------------------

Implement function kvm_para_has_feature() to detect supported paravirt
features. It can be used by device driver to detect and enable paravirt
features, such as the EIOINTC irqchip driver is able to detect feature
KVM_FEATURE_VIRT_EXTIOI and do some optimization.

Signed-off-by: default avatarBibo Mao <maobibo@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarXianglai Li <lixianglai@loongson.cn>
parent 2e584981

arch/loongarch/include/asm/kvm_para.h

+10 −0
Original line number Diff line number Diff line
@@ -157,10 +157,20 @@ static __always_inline long kvm_hypercall5(u64 fid, 
	return ret;

}



#ifdef CONFIG_PARAVIRT

bool kvm_para_available(void);

unsigned int kvm_arch_para_features(void);

#else

static inline bool kvm_para_available(void)

{

	return false;

}



static inline unsigned int kvm_arch_para_features(void)

{

	return 0;

}

#endif



static inline unsigned int kvm_arch_para_hints(void)

{

arch/loongarch/kernel/paravirt.c

+23 −23
Original line number Diff line number Diff line
@@ -249,11 +249,14 @@ static int pv_cpu_down_prepare(unsigned int cpu) 
}

#endif



static bool kvm_para_available(void)

bool kvm_para_available(void)

{

	static int hypervisor_type;

	int config;



	if (!cpu_has_hypervisor)

		return false;



	if (!hypervisor_type) {

		config = read_cpucfg(CPUCFG_KVM_SIG);

		if (!memcmp(&config, KVM_SIGNATURE, 4))
@@ -263,28 +266,31 @@ static bool kvm_para_available(void) 
	return hypervisor_type == HYPERVISOR_KVM;

}



int __init pv_ipi_init(void)

unsigned int kvm_arch_para_features(void)

{

	int feature;

	static unsigned int feature;



	if (!cpu_has_hypervisor)

		return 0;

	if (!(feature & BIT(KVM_FEATURE_IPI)))

	if (!kvm_para_available())

		return 0;



	/*

	 * check whether KVM hypervisor supports pv_ipi or not

	 */

	if (!feature)

		feature = read_cpucfg(CPUCFG_KVM_FEATURE);



	return feature;

}



int __init pv_ipi_init(void)

{

	if (!kvm_para_has_feature(KVM_FEATURE_IPI))

		return 0;



#ifdef CONFIG_SMP

	if (feature & KVM_FEATURE_PV_IPI) {

	smp_ops.init_ipi		= pv_init_ipi;

	smp_ops.send_ipi_single		= pv_send_ipi_single;

	smp_ops.send_ipi_mask		= pv_send_ipi_mask;

	}

#endif



	return 1;

	return 0;

}



static void pv_cpu_reboot(void *unused)
@@ -408,15 +414,9 @@ static struct notifier_block pv_reboot_nb = { 


int __init pv_time_init(void)

{

	int r, feature;

	int r;



	if (!cpu_has_hypervisor)

		return 0;

	if (!kvm_para_available())

		return 0;



	feature = read_cpucfg(CPUCFG_KVM_FEATURE);

	if (!(feature & BIT(KVM_FEATURE_STEAL_TIME)))

	if (!kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))

		return 0;



	has_steal_clock = 1;