KVM: arm64: Boring cosmetic patches
Will Deacon
maintainercover KVM: arm64: Boring cosmetic patches
Hi all,
Here are some desperately dull patches I cooked while working on pkvm enablement. The latter isn't ready yet, but figured there wasn't much point me sitting on these. Although they're boring, the first patch does touch uapi/ so it's not completely trivial.
Cheers,
Will
--->8
Will Deacon (3):
KVM: arm64: Move 'struct kvm_arch_memory_slot' out of uapi/
KVM: arm64: Remove kvm_arch_vm_ioctl_check_extension()
KVM: arm64: Remove unused __extended_idmap_trampoline() prototype
arch/arm64/include/asm/cpufeature.h | 5 +++ arch/arm64/include/asm/kvm_host.h | 5 +-- arch/arm64/include/uapi/asm/kvm.h | 3 -- arch/arm64/kvm/arm.c | 31 +++++++++++++++-- arch/arm64/kvm/reset.c | 52 ----------------------------- 5 files changed, 37 insertions(+), 59 deletions(-)
Signature · 6 lines
2.29.2.299.gdc1121823c-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Will Deacon
maintainerPATCH 1/3 KVM: arm64: Move 'struct kvm_arch_memory_slot' out of uapi/
'struct kvm_arch_memory_slot' isn't part of the user ABI, so move it out of the uapi/ headers in case we start using it in future and accidentally back ourselves into a corner.
--- arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/include/uapi/asm/kvm.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/kvm_host.h +3 -0
@@ -89,6 +89,9 @@ struct kvm_s2_mmu {struct kvm *kvm; }; +struct kvm_arch_memory_slot { +}; +struct kvm_arch {struct kvm_s2_mmu mmu;
arch/arm64/include/uapi/asm/kvm.h +0 -3
@@ -156,9 +156,6 @@ struct kvm_sync_regs {__u64 device_irq_level; }; -struct kvm_arch_memory_slot { -}; -/* * PMU filter structure. Describe a range of events with a particular * action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.
Signature · 6 lines
2.29.2.299.gdc1121823c-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Will Deacon
maintainerPATCH 2/3 KVM: arm64: Remove kvm_arch_vm_ioctl_check_extension()
In reply to Will Deaconkvm_arch_vm_ioctl_check_extension() is only called from kvm_vm_ioctl_check_extension(), so we can inline it and remove the extra function.
--- arch/arm64/include/asm/cpufeature.h | 5 +++ arch/arm64/include/asm/kvm_host.h | 1 - arch/arm64/kvm/arm.c | 31 +++++++++++++++-- arch/arm64/kvm/reset.c | 52 ----------------------------- 4 files changed, 34 insertions(+), 55 deletions(-)
arch/arm64/include/asm/cpufeature.h +5 -0
@@ -699,6 +699,11 @@ static inline bool system_supports_generic_auth(void)cpus_have_const_cap (ARM64_HAS_GENERIC_AUTH ); } +static inline bool system_has_full_ptr_auth (void ) +{ +return system_supports_address_auth () &&system_supports_generic_auth (); +} + static __always_inline bool system_uses_irq_prio_masking(void) { return IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) &&
arch/arm64/include/asm/kvm_host.h +0 -1
@@ -58,7 +58,6 @@ int kvm_arm_init_sve(void); int __attribute_const__ kvm_target_cpu(void);int kvm_reset_vcpu (struct kvm_vcpu *vcpu);void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu); -int kvm_arch_vm_ioctl_check_extension (struct kvm *kvm,long ext);void __extended_idmap_trampoline (phys_addr_t boot_pgd,phys_addr_t idmap_start);struct kvm_vmid {
arch/arm64/kvm/arm.c +29 -2
@@ -198,6 +198,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 :case KVM_CAP_ARM_NISV_TO_USER :case KVM_CAP_ARM_INJECT_EXT_DABT : +case KVM_CAP_SET_GUEST_DEBUG : +case KVM_CAP_VCPU_ATTRIBUTES : r =1 ;break ;case KVM_CAP_ARM_SET_DEVICE_ADDR :
@@ -229,10 +231,35 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_STEAL_TIME : r =kvm_arm_pvtime_supported ();break ; -default : - r =kvm_arch_vm_ioctl_check_extension (kvm, ext); +case KVM_CAP_ARM_EL1_32BIT : + r =cpus_have_const_cap (ARM64_HAS_32BIT_EL1 ); +break ; +case KVM_CAP_GUEST_DEBUG_HW_BPS : + r =get_num_brps (); +break ; +case KVM_CAP_GUEST_DEBUG_HW_WPS : + r =get_num_wrps (); +break ; +case KVM_CAP_ARM_PMU_V3 : + r =kvm_arm_support_pmu_v3 (); +break ; +case KVM_CAP_ARM_INJECT_SERROR_ESR : + r =cpus_have_const_cap (ARM64_HAS_RAS_EXTN ); +break ; +case KVM_CAP_ARM_VM_IPA_SIZE : + r =get_kvm_ipa_limit ();break ; +case KVM_CAP_ARM_SVE : + r =system_supports_sve (); +break ; +case KVM_CAP_ARM_PTRAUTH_ADDRESS : +case KVM_CAP_ARM_PTRAUTH_GENERIC : + r =system_has_full_ptr_auth (); +break ; +default : + r =0 ; } +return r; }
arch/arm64/kvm/reset.c +0 -52
58 lines not on this page · raw message
Signature · 6 lines
2.29.2.299.gdc1121823c-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Will Deacon
maintainerPATCH 3/3 KVM: arm64: Remove unused __extended_idmap_trampoline() prototype
In reply to Will Deacon__extended_idmap_trampoline() was removed a long time ago by 3421e9d88d7a ("arm64: KVM: Simplify HYP init/teardown") so remove the unused function prototype.
--- arch/arm64/include/asm/kvm_host.h | 1 - 1 file changed, 1 deletion(-)
arch/arm64/include/asm/kvm_host.h +0 -1
@@ -58,7 +58,6 @@ int kvm_arm_init_sve(void); int __attribute_const__ kvm_target_cpu(void);int kvm_reset_vcpu (struct kvm_vcpu *vcpu);void kvm_arm_vcpu_destroy (struct kvm_vcpu *vcpu); -void __extended_idmap_trampoline (phys_addr_t boot_pgd,phys_addr_t idmap_start);struct kvm_vmid {/* The VMID generation used for the virt. memory system */
Signature · 6 lines
2.29.2.299.gdc1121823c-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 8 lines · Will Deacon
Here are some desperately dull patches I cooked while working on pkvm enablement. The latter isn't ready yet, but figured there wasn't much point me sitting on these. Although they're boring, the first patch does touch uapi/ so it's not completely trivial.
Cheers,
[...]
Applied to kvm-arm64/misc-5.11, thanks!
[1/3] KVM: arm64: Move 'struct kvm_arch_memory_slot' out of uapi/
commit: 8d14797b53f044fda3ed42b5b6357c7622b8af58
[2/3] KVM: arm64: Remove kvm_arch_vm_ioctl_check_extension()
commit: 36fb4cd55f626dff0f6e76bed14707fa00147b7f
[3/3] KVM: arm64: Remove unused __extended_idmap_trampoline() prototype
commit: bf118a5cb7e6d17e7ec9492e4dc676e7e7b69d01Cheers,
M.
Signature · 7 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm