Commit cf648c40 authored by Clément Léger's avatar Clément Léger Committed by Anup Patel
Browse files

RISC-V: KVM: add SBI extension init()/deinit() functions 



The FWFT SBI extension will need to dynamically allocate memory and do
init time specific initialization. Add an init/deinit callbacks that
allows to do so.

Signed-off-by: default avatarClément Léger <cleger@rivosinc.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20250523101932.1594077-12-cleger@rivosinc.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 4cec89db

arch/riscv/include/asm/kvm_vcpu_sbi.h

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ struct kvm_vcpu_sbi_extension { 


	/* Extension specific probe function */

	unsigned long (*probe)(struct kvm_vcpu *vcpu);



	/*

	 * Init/deinit function called once during VCPU init/destroy. These

	 * might be use if the SBI extensions need to allocate or do specific

	 * init time only configuration.

	 */

	int (*init)(struct kvm_vcpu *vcpu);

	void (*deinit)(struct kvm_vcpu *vcpu);

};



void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run);
@@ -72,6 +80,7 @@ const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext( 
bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx);

int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run);

void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_sbi_deinit(struct kvm_vcpu *vcpu);



int kvm_riscv_vcpu_get_reg_sbi_sta(struct kvm_vcpu *vcpu, unsigned long reg_num,

				   unsigned long *reg_val);

arch/riscv/kvm/vcpu.c

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 


void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	kvm_riscv_vcpu_sbi_deinit(vcpu);



	/* Cleanup VCPU AIA context */

	kvm_riscv_vcpu_aia_deinit(vcpu);

arch/riscv/kvm/vcpu_sbi.c

+26 −0
Original line number Diff line number Diff line
@@ -536,5 +536,31 @@ void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu) 
		scontext->ext_status[idx] = ext->default_disabled ?

					KVM_RISCV_SBI_EXT_STATUS_DISABLED :

					KVM_RISCV_SBI_EXT_STATUS_ENABLED;



		if (ext->init && ext->init(vcpu) != 0)

			scontext->ext_status[idx] = KVM_RISCV_SBI_EXT_STATUS_UNAVAILABLE;

	}

}



void kvm_riscv_vcpu_sbi_deinit(struct kvm_vcpu *vcpu)

{

	struct kvm_vcpu_sbi_context *scontext = &vcpu->arch.sbi_context;

	const struct kvm_riscv_sbi_extension_entry *entry;

	const struct kvm_vcpu_sbi_extension *ext;

	int idx, i;



	for (i = 0; i < ARRAY_SIZE(sbi_ext); i++) {

		entry = &sbi_ext[i];

		ext = entry->ext_ptr;

		idx = entry->ext_idx;



		if (idx < 0 || idx >= ARRAY_SIZE(scontext->ext_status))

			continue;



		if (scontext->ext_status[idx] == KVM_RISCV_SBI_EXT_STATUS_UNAVAILABLE ||

		    !ext->deinit)

			continue;



		ext->deinit(vcpu);

	}

}