KVM: arm64: Refactor kvm_vcpu_enable_ptrauth() for hyp use

Fuad Tabba · oupton · commit 3663b258f723 · 2024-10-31T18:45:24.000Z
Move kvm_vcpu_enable_ptrauth() to a shared header to be used by hypervisor code in protected mode. No functional change intended. Signed-off-by: Fuad Tabba <tabba@google.com> Link: https://lore.kernel.org/r/20241018074833.2563674-3-tabba@google.com Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
@@ -693,4 +693,8 @@ static inline bool guest_hyp_sve_traps_enabled(const struct kvm_vcpu *vcpu)
 	return __guest_hyp_cptr_xen_trap_enabled(vcpu, ZEN);
 }
 
+static inline void kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)
+{
+	vcpu_set_flag(vcpu, GUEST_HAS_PTRAUTH);
+}
 #endif /* __ARM64_KVM_EMULATE_H__ */
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
@@ -167,11 +167,6 @@ static void kvm_vcpu_reset_sve(struct kvm_vcpu *vcpu)
 		memset(vcpu->arch.sve_state, 0, vcpu_sve_state_size(vcpu));
 }
 
-static void kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)
-{
-	vcpu_set_flag(vcpu, GUEST_HAS_PTRAUTH);
-}
-
 /**
  * kvm_reset_vcpu - sets core registers and sys_regs to reset value
  * @vcpu: The VCPU pointer

Original file line number	Diff line number	Diff line change
`@@ -693,4 +693,8 @@ static inline bool guest_hyp_sve_traps_enabled(const struct kvm_vcpu *vcpu)`
`693`	`693`	`return __guest_hyp_cptr_xen_trap_enabled(vcpu, ZEN);`
`694`	`694`	`}`
`695`	`695`
	`696`	`+static inline void kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)`
	`697`	`+{`
	`698`	`+ vcpu_set_flag(vcpu, GUEST_HAS_PTRAUTH);`
	`699`	`+}`
`696`	`700`	`#endif /* __ARM64_KVM_EMULATE_H__ */`