Commit 085eabaa authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Rename __check_nv_sr_forward() to triage_sysreg_trap() 



__check_nv_sr_forward() is not specific to NV anymore, and does
a lot more. Rename it to triage_sysreg_trap(), making it plain
that its role is to handle where an exception is to be handled.

Reviewed-by: default avatarJoey Gouly <joey.gouly@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240214131827.2856277-17-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent cc5f84fb

arch/arm64/include/asm/kvm_nested.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static inline u64 translate_ttbr0_el2_to_ttbr0_el1(u64 ttbr0) 
	return ttbr0 & ~GENMASK_ULL(63, 48);

}



extern bool __check_nv_sr_forward(struct kvm_vcpu *vcpu, int *sr_idx);



int kvm_init_nv_sysregs(struct kvm *kvm);

arch/arm64/kvm/emulate-nested.c

+1 −1
Original line number Diff line number Diff line
@@ -2007,7 +2007,7 @@ static bool check_fgt_bit(struct kvm *kvm, bool is_read, 
	return !(kvm_get_sysreg_res0(kvm, sr) & BIT(tc.bit));

}



bool __check_nv_sr_forward(struct kvm_vcpu *vcpu, int *sr_index)

bool triage_sysreg_trap(struct kvm_vcpu *vcpu, int *sr_index)

{

	union trap_config tc;

	enum trap_behaviour b;

arch/arm64/kvm/sys_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -3482,7 +3482,7 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu) 


	trace_kvm_handle_sys_reg(esr);



	if (__check_nv_sr_forward(vcpu, &sr_idx))

	if (triage_sysreg_trap(vcpu, &sr_idx))

		return 1;



	params = esr_sys64_to_params(esr);

arch/arm64/kvm/sys_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ int kvm_sys_reg_get_user(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg, 
int kvm_sys_reg_set_user(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg,

			 const struct sys_reg_desc table[], unsigned int num);



bool triage_sysreg_trap(struct kvm_vcpu *vcpu, int *sr_index);



#define AA32(_x)	.aarch32_map = AA32_##_x

#define Op0(_x) 	.Op0 = _x

#define Op1(_x) 	.Op1 = _x