Commit 071f24ad authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Rename arch hooks related to per-CPU virtualization enabling 



Rename the per-CPU hooks used to enable virtualization in hardware to
align with the KVM-wide helpers in kvm_main.c, and to better capture that
the callbacks are invoked on every online CPU.

No functional change intended.

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Message-ID: <20240830043600.127750-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 70c01943

arch/arm64/kvm/arm.c

+3 −3
Original line number Diff line number Diff line
@@ -2163,7 +2163,7 @@ static void cpu_hyp_uninit(void *discard) 
	}

}



int kvm_arch_hardware_enable(void)

int kvm_arch_enable_virtualization_cpu(void)

{

	/*

	 * Most calls to this function are made with migration
@@ -2183,7 +2183,7 @@ int kvm_arch_hardware_enable(void) 
	return 0;

}



void kvm_arch_hardware_disable(void)

void kvm_arch_disable_virtualization_cpu(void)

{

	kvm_timer_cpu_down();

	kvm_vgic_cpu_down();
@@ -2379,7 +2379,7 @@ static int __init do_pkvm_init(u32 hyp_va_bits) 


	/*

	 * The stub hypercalls are now disabled, so set our local flag to

	 * prevent a later re-init attempt in kvm_arch_hardware_enable().

	 * prevent a later re-init attempt in kvm_arch_enable_virtualization_cpu().

	 */

	__this_cpu_write(kvm_hyp_initialized, 1);

	preempt_enable();

arch/loongarch/kvm/main.c

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ long kvm_arch_dev_ioctl(struct file *filp, 
	return -ENOIOCTLCMD;

}



int kvm_arch_hardware_enable(void)

int kvm_arch_enable_virtualization_cpu(void)

{

	unsigned long env, gcfg = 0;
@@ -300,7 +300,7 @@ int kvm_arch_hardware_enable(void) 
	return 0;

}



void kvm_arch_hardware_disable(void)

void kvm_arch_disable_virtualization_cpu(void)

{

	write_csr_gcfg(0);

	write_csr_gstat(0);

arch/mips/kvm/mips.c

+2 −2
Original line number Diff line number Diff line
@@ -125,12 +125,12 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) 
	return 1;

}



int kvm_arch_hardware_enable(void)

int kvm_arch_enable_virtualization_cpu(void)

{

	return kvm_mips_callbacks->hardware_enable();

}



void kvm_arch_hardware_disable(void)

void kvm_arch_disable_virtualization_cpu(void)

{

	kvm_mips_callbacks->hardware_disable();

}

arch/riscv/kvm/main.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ long kvm_arch_dev_ioctl(struct file *filp, 
	return -EINVAL;

}



int kvm_arch_hardware_enable(void)

int kvm_arch_enable_virtualization_cpu(void)

{

	csr_write(CSR_HEDELEG, KVM_HEDELEG_DEFAULT);

	csr_write(CSR_HIDELEG, KVM_HIDELEG_DEFAULT);
@@ -35,7 +35,7 @@ int kvm_arch_hardware_enable(void) 
	return 0;

}



void kvm_arch_hardware_disable(void)

void kvm_arch_disable_virtualization_cpu(void)

{

	kvm_riscv_aia_disable();

arch/x86/kvm/x86.c

+3 −3
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static void kvm_on_user_return(struct user_return_notifier *urn) 


	/*

	 * Disabling irqs at this point since the following code could be

	 * interrupted and executed through kvm_arch_hardware_disable()

	 * interrupted and executed through kvm_arch_disable_virtualization_cpu()

	 */

	local_irq_save(flags);

	if (msrs->registered) {
@@ -12512,7 +12512,7 @@ void kvm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector) 
}

EXPORT_SYMBOL_GPL(kvm_vcpu_deliver_sipi_vector);



int kvm_arch_hardware_enable(void)

int kvm_arch_enable_virtualization_cpu(void)

{

	struct kvm *kvm;

	struct kvm_vcpu *vcpu;
@@ -12608,7 +12608,7 @@ int kvm_arch_hardware_enable(void) 
	return 0;

}



void kvm_arch_hardware_disable(void)

void kvm_arch_disable_virtualization_cpu(void)

{

	kvm_x86_call(hardware_disable)();

	drop_user_return_notifiers();