Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

KVM: arm64: Re-allow hyp tracing HVCs for [nh]VHE

The introduction of __KVM_HOST_SMCCC_FUNC_MAX_NO_PKVM excluded hyp
tracing HVCs from the common [nh]VHE/pKVM list. Re-allow them.

Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Link: https://patch.msgid.link/20260414100231.1859687-1-vdonnefort@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

authored by

Vincent Donnefort and committed by
Marc Zyngier
ccab51d6 94b4ae79

+16 -16
+8 -8
arch/arm64/include/asm/kvm_asm.h
··· 72 72 __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_range, 73 73 __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context, 74 74 __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff, 75 + __KVM_HOST_SMCCC_FUNC___tracing_load, 76 + __KVM_HOST_SMCCC_FUNC___tracing_unload, 77 + __KVM_HOST_SMCCC_FUNC___tracing_enable, 78 + __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, 79 + __KVM_HOST_SMCCC_FUNC___tracing_update_clock, 80 + __KVM_HOST_SMCCC_FUNC___tracing_reset, 81 + __KVM_HOST_SMCCC_FUNC___tracing_enable_event, 82 + __KVM_HOST_SMCCC_FUNC___tracing_write_event, 75 83 __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs, 76 84 __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs, 77 85 __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, ··· 108 100 __KVM_HOST_SMCCC_FUNC___pkvm_vcpu_load, 109 101 __KVM_HOST_SMCCC_FUNC___pkvm_vcpu_put, 110 102 __KVM_HOST_SMCCC_FUNC___pkvm_tlb_flush_vmid, 111 - __KVM_HOST_SMCCC_FUNC___tracing_load, 112 - __KVM_HOST_SMCCC_FUNC___tracing_unload, 113 - __KVM_HOST_SMCCC_FUNC___tracing_enable, 114 - __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, 115 - __KVM_HOST_SMCCC_FUNC___tracing_update_clock, 116 - __KVM_HOST_SMCCC_FUNC___tracing_reset, 117 - __KVM_HOST_SMCCC_FUNC___tracing_enable_event, 118 - __KVM_HOST_SMCCC_FUNC___tracing_write_event, 119 103 }; 120 104 121 105 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[]
+8 -8
arch/arm64/kvm/hyp/nvhe/hyp-main.c
··· 709 709 HANDLE_FUNC(__kvm_tlb_flush_vmid_range), 710 710 HANDLE_FUNC(__kvm_flush_cpu_context), 711 711 HANDLE_FUNC(__kvm_timer_set_cntvoff), 712 + HANDLE_FUNC(__tracing_load), 713 + HANDLE_FUNC(__tracing_unload), 714 + HANDLE_FUNC(__tracing_enable), 715 + HANDLE_FUNC(__tracing_swap_reader), 716 + HANDLE_FUNC(__tracing_update_clock), 717 + HANDLE_FUNC(__tracing_reset), 718 + HANDLE_FUNC(__tracing_enable_event), 719 + HANDLE_FUNC(__tracing_write_event), 712 720 HANDLE_FUNC(__vgic_v3_save_aprs), 713 721 HANDLE_FUNC(__vgic_v3_restore_vmcr_aprs), 714 722 HANDLE_FUNC(__vgic_v5_save_apr), ··· 743 735 HANDLE_FUNC(__pkvm_vcpu_load), 744 736 HANDLE_FUNC(__pkvm_vcpu_put), 745 737 HANDLE_FUNC(__pkvm_tlb_flush_vmid), 746 - HANDLE_FUNC(__tracing_load), 747 - HANDLE_FUNC(__tracing_unload), 748 - HANDLE_FUNC(__tracing_enable), 749 - HANDLE_FUNC(__tracing_swap_reader), 750 - HANDLE_FUNC(__tracing_update_clock), 751 - HANDLE_FUNC(__tracing_reset), 752 - HANDLE_FUNC(__tracing_enable_event), 753 - HANDLE_FUNC(__tracing_write_event), 754 738 }; 755 739 756 740 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt)