Support for H_RPT_INVALIDATE in PowerPC KVM
Subsystems (4)
v3 cover Support for H_RPT_INVALIDATE in PowerPC KVM
This patchset adds support for the new hcall H_RPT_INVALIDATE and replaces the nested tlb flush calls with this new hcall if support for the same exists.
Changes in v3:
-------------
- Reused the tlb flush routines from radix_tlb.c
- Ensured fixups are take care of due to the above change.
v2: https://lore.kernel.org/linuxppc-dev/[email protected]/T/#t
H_RPT_INVALIDATE
================
Syntax:
int64 /* H_Success: Return code on successful completion */
/* H_Busy - repeat the call with the same */
/* H_Parameter, H_P2, H_P3, H_P4, H_P5 : Invalid parameters */
hcall(const uint64 H_RPT_INVALIDATE, /* Invalidate RPT translation lookaside information */ uint64 pid, /* PID/LPID to invalidate */
uint64 target, /* Invalidation target */
uint64 type, /* Type of lookaside information */
uint64 pageSizes, /* Page sizes */
uint64 start, /* Start of Effective Address (EA) range (inclusive) */ uint64 end) /* End of EA range (exclusive) */
Invalidation targets (target)
-----------------------------
Core MMU 0x01 /* All virtual processors in the partition */ Core local MMU 0x02 /* Current virtual processor */
Nest MMU 0x04 /* All nest/accelerator agents in use by the partition */
A combination of the above can be specified, except core and core local.
Type of translation to invalidate (type)
---------------------------------------
NESTED 0x0001 /* Invalidate nested guest partition-scope */ TLB 0x0002 /* Invalidate TLB */
PWC 0x0004 /* Invalidate Page Walk Cache */
PRT 0x0008 /* Invalidate Process Table Entries if NESTED is clear */ PAT 0x0008 /* Invalidate Partition Table Entries if NESTED is set */
A combination of the above can be specified.
Page size mask (pageSizes)
--------------------------
4K 0x01
64K 0x02
2M 0x04
1G 0x08
All sizes (-1UL)
A combination of the above can be specified.
All page sizes can be selected with -1.
Semantics: Invalidate radix tree lookaside information
matching the parameters given.
* Return H_P2, H_P3 or H_P4 if target, type, or pageSizes parameters are different from the defined values.
* Return H_PARAMETER if NESTED is set and pid is not a valid nested LPID allocated to this partition
* Return H_P5 if (start, end) doesn't form a valid range. Start and end should be a valid Quadrant address and end > start.
* Return H_NotSupported if the partition is not in running in radix translation mode.
* May invalidate more translation information than requested.
* If start = 0 and end = -1, set the range to cover all valid addresses. Else start and end should be aligned to 4kB (lower 11 bits clear).
* If NESTED is clear, then invalidate process scoped lookaside information. Else pid specifies a nested LPID, and the invalidation is performed on nested guest partition table and nested guest partition scope real addresses.
* If pid = 0 and NESTED is clear, then valid addresses are quadrant 3 and quadrant 0 spaces, Else valid addresses are quadrant 0.
* Pages which are fully covered by the range are to be invalidated. Those which are partially covered are considered outside invalidation range, which allows a caller to optimally invalidate ranges that may contain mixed page sizes.
* Return H_SUCCESS on success.
Bharata B Rao (2):
KVM: PPC: Book3S HV: Add support for H_RPT_INVALIDATE
KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM
Documentation/virt/kvm/api.rst | 17 +++ .../include/asm/book3s/64/tlbflush-radix.h | 18 +++ arch/powerpc/include/asm/kvm_book3s.h | 3 + arch/powerpc/include/asm/mmu_context.h | 7 ++ arch/powerpc/kvm/book3s_64_mmu_radix.c | 27 ++++- arch/powerpc/kvm/book3s_hv.c | 56 +++++++++ arch/powerpc/kvm/book3s_hv_nested.c | 108 +++++++++++++++++- arch/powerpc/kvm/powerpc.c | 3 + arch/powerpc/mm/book3s64/radix_tlb.c | 24 +++- include/uapi/linux/kvm.h | 1 + 10 files changed, 253 insertions(+), 11 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/2 KVM: PPC: Book3S HV: Add support for H_RPT_INVALIDATE
Implement H_RPT_INVALIDATE hcall and add KVM capability KVM_CAP_PPC_RPT_INVALIDATE to indicate the support for the same.
This hcall does two types of TLB invalidations:
1. Process-scoped invalidations for guests with LPCR[GTSE]=0. This is currently not used in KVM as GTSE is not usually disabled in KVM.
2. Partition-scoped invalidations that an L1 hypervisor does on behalf of an L2 guest. This replaces the uses of the existing hcall H_TLB_INVALIDATE.
--- Documentation/virt/kvm/api.rst | 17 ++++ .../include/asm/book3s/64/tlbflush-radix.h | 18 ++++ arch/powerpc/include/asm/kvm_book3s.h | 3 + arch/powerpc/include/asm/mmu_context.h | 7 ++ arch/powerpc/kvm/book3s_hv.c | 56 +++++++++++ arch/powerpc/kvm/book3s_hv_nested.c | 96 +++++++++++++++++++ arch/powerpc/kvm/powerpc.c | 3 + arch/powerpc/mm/book3s64/radix_tlb.c | 24 ++++- include/uapi/linux/kvm.h | 1 + 9 files changed, 221 insertions(+), 4 deletions(-)
Documentation/virt/kvm/api.rst +17 -0
@@ -6032,6 +6032,23 @@ KVM_EXIT_X86_RDMSR and KVM_EXIT_X86_WRMSR exit notifications which user space can then handle to implement model specific MSR handling and/or user notifications to inform a user that an MSR was not handled. +7.22 KVM_CAP_PPC_RPT_INVALIDATE +------------------------------ + +:Capability: KVM_CAP_PPC_RPT_INVALIDATE +:Architectures: ppc +:Type: vm + +This capability indicates that the kernel is capable of handling +H_RPT_INVALIDATE hcall. + +In order to enable the use of H_RPT_INVALIDATE in the guest, +user space might have to advertise it for the guest. For example, +IBM pSeries (sPAPR) guest starts using it if "hcall-rpt-invalidate" is +present in the "ibm,hypertas-functions" device-tree property. + +This capability is always enabled. + 8. Other capabilities. ======================
arch/powerpc/include/asm/book3s/64/tlbflush-radix.h +18 -0
@@ -4,6 +4,10 @@#include <asm/hvcall.h> +#define RIC_FLUSH_TLB 0 +#define RIC_FLUSH_PWC 1 +#define RIC_FLUSH_ALL 2 +struct vm_area_struct ;struct mm_struct ;struct mmu_gather ;
@@ -21,6 +25,20 @@ static inline u64 psize_to_rpti_pgsize(unsigned long psize)return H_RPTI_PAGE_ALL ; } +static inline int rpti_pgsize_to_psize (unsigned long page_size) +{ +if (page_size ==H_RPTI_PAGE_4K ) +return MMU_PAGE_4K ; +if (page_size ==H_RPTI_PAGE_64K ) +return MMU_PAGE_64K ; +if (page_size ==H_RPTI_PAGE_2M ) +return MMU_PAGE_2M ; +if (page_size ==H_RPTI_PAGE_1G ) +return MMU_PAGE_1G ; +else +return MMU_PAGE_64K ;/* Default */ +} +static inline int mmu_get_ap (int psize) {return mmu_psize_defs[psize].ap;
arch/powerpc/include/asm/kvm_book3s.h +3 -0
@@ -298,6 +298,9 @@ void kvmhv_set_ptbl_entry(unsigned int lpid, u64 dw0, u64 dw1);void kvmhv_release_all_nested (struct kvm *kvm);long kvmhv_enter_nested_guest (struct kvm_vcpu *vcpu);long kvmhv_do_nested_tlbie (struct kvm_vcpu *vcpu); +long kvmhv_h_rpti_nested (struct kvm_vcpu *vcpu,unsigned long lpid, +unsigned long type,unsigned long pg_sizes, +unsigned long start,unsigned long end);int kvmhv_run_single_vcpu (struct kvm_vcpu *vcpu,u64 time_limit,unsigned long lpcr);void kvmhv_save_hv_regs (struct kvm_vcpu *vcpu,struct hv_guest_state *hr);
arch/powerpc/include/asm/mmu_context.h +7 -0
@@ -124,8 +124,15 @@ static inline bool need_extra_context(struct mm_struct *mm, unsigned long ea)#if defined(CONFIG_KVM_BOOK3S_HV_POSSIBLE ) && defined(CONFIG_PPC_RADIX_MMU )extern void radix_kvm_prefetch_workaround (struct mm_struct *mm); +void do_h_rpt_invalidate (unsigned long pid,unsigned long type, +unsigned long page_size,unsigned long psize, +unsigned long start,unsigned long end);#else static inline void radix_kvm_prefetch_workaround (struct mm_struct *mm) { } +static inline void do_h_rpt_invalidate (unsigned long pid,unsigned long type, +unsigned long page_size, +unsigned long psize,unsigned long start, +unsigned long end) { }#endif extern void switch_cop (struct mm_struct *next);
arch/powerpc/kvm/book3s_hv.c +56 -0
74 lines not on this page · raw message
arch/powerpc/kvm/book3s_hv_nested.c +96 -0
102 lines not on this page · raw message
arch/powerpc/kvm/powerpc.c +3 -0
@@ -678,6 +678,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = hv_enabled && kvmppc_hv_ops->enable_svm && !kvmppc_hv_ops->enable_svm (NULL );break ; +case KVM_CAP_PPC_RPT_INVALIDATE : + r =1 ; +break ;#endif default : r =0 ;
arch/powerpc/mm/book3s64/radix_tlb.c +20 -4
@@ -18,10 +18,6 @@#include <asm/cputhreads.h> #include <asm/plpar_wrappers.h> -#define RIC_FLUSH_TLB 0 -#define RIC_FLUSH_PWC 1 -#define RIC_FLUSH_ALL 2 -/* * tlbiel instruction for radix, set invalidation * i.e., r=1 and is=01 or is=10 or is=11
@@ -1286,4 +1282,24 @@ extern void radix_kvm_prefetch_workaround(struct mm_struct *mm) } }EXPORT_SYMBOL_GPL (radix_kvm_prefetch_workaround); + +void do_h_rpt_invalidate (unsigned long pid,unsigned long type, +unsigned long page_size,unsigned long psize, +unsigned long start,unsigned long end) +{ +if ((type &H_RPTI_TYPE_ALL ) ==H_RPTI_TYPE_ALL ) { +_tlbie_pid (pid,RIC_FLUSH_ALL ); +return ; + } + +if (type &H_RPTI_TYPE_PWC ) +_tlbie_pid (pid,RIC_FLUSH_PWC ); + +if (!start && end ==-1 )/* PID */ +_tlbie_pid (pid,RIC_FLUSH_TLB ); +else /* EA */ +_tlbie_va_range (start, end, pid, page_size, psize, false); +} +EXPORT_SYMBOL_GPL (do_h_rpt_invalidate); +#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */
include/uapi/linux/kvm.h +1 -0
@@ -1056,6 +1056,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190#define KVM_CAP_SYS_HYPERV_CPUID 191#define KVM_CAP_DIRTY_LOG_RING 192 +#define KVM_CAP_PPC_RPT_INVALIDATE 193#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.26.2
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v3 1/2] KVM: PPC: Book3S HV: Add support for H_RPT_INVALIDATE
Quoted 22 lines · Fabiano Rosas
Quoted 8 lines · Bharata B Rao
arch/powerpc/kvm/book3s_hv_nested.c +8
-0+ +long kvmhv_h_rpti_nested (struct kvm_vcpu *vcpu,unsigned long lpid, +unsigned long type,unsigned long pg_sizes, +unsigned long start,unsigned long end) +{ +struct kvm_nested_guest *gp; +long ret; +unsigned long psize, ap;arch/powerpc/kvm/book3s_hv_nested.c long kvmhv_do_nested_tlbie(struct kvm_vcpu *vcpu) · line 1203
Quoted 10 lines
arch/powerpc/kvm/book3s_hv_nested.c +10
-0+ +/* +* If L2 lpid isn't valid, we need to return H_PARAMETER. +* +* However, nested KVM issues a L2 lpid flush call when creating +* partition table entries for L2. This happens even before the +* corresponding shadow lpid is created in HV which happens in +* H_ENTER_NESTED call. Since we can't differentiate this case from +* the invalid case, we ignore such flush requests and return success. +*/ So for a nested lpid the
H_TLB_INVALIDATEin:
Quoted 5 lines
kvmppc_core_init_vm_hv->kvmppc_setup_partition_table->kvmhv_set_ptbl_entry->kvmhv_flush_lpidhas always been a noop? It seems that we could just skip
kvmhv_flush_lpidin L1 duringinit_vmthen.
May be, but I suppose that flush is required and could be fixed eventually.
Regards,
Bharata.
PATCH v3 2/2 KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM
In reply to Bharata B RaoIn the nested KVM case, replace H_TLB_INVALIDATE by the new hcall H_RPT_INVALIDATE if available. The availability of this hcall is determined from "hcall-rpt-invalidate" string in ibm,hypertas-functions DT property.
--- arch/powerpc/kvm/book3s_64_mmu_radix.c | 27 +++++++++++++++++++++----- arch/powerpc/kvm/book3s_hv_nested.c | 12 ++++++++++-- 2 files changed, 32 insertions(+), 7 deletions(-)
arch/powerpc/kvm/book3s_64_mmu_radix.c +22 -5
@@ -21,6 +21,7 @@#include <asm/pte-walk.h> #include <asm/ultravisor.h> #include <asm/kvm_book3s_uvmem.h> +#include <asm/plpar_wrappers.h> /* * Supported radix tree geometry.
@@ -318,9 +319,19 @@ void kvmppc_radix_tlbie_page(struct kvm *kvm, unsigned long addr, } psi =shift_to_mmu_psize (pshift); - rb = addr | (mmu_get_ap (psi) <<PPC_BITLSHIFT (58 )); - rc =plpar_hcall_norets (H_TLB_INVALIDATE ,H_TLBIE_P1_ENC (0 ,0 ,1 ), - lpid, rb); + +if (!firmware_has_feature (FW_FEATURE_RPT_INVALIDATE )) { + rb = addr | (mmu_get_ap (psi) <<PPC_BITLSHIFT (58 )); + rc =plpar_hcall_norets (H_TLB_INVALIDATE ,H_TLBIE_P1_ENC (0 ,0 ,1 ), + lpid, rb); + }else { + rc =pseries_rpt_invalidate (lpid,H_RPTI_TARGET_CMMU , +H_RPTI_TYPE_NESTED | +H_RPTI_TYPE_TLB , +psize_to_rpti_pgsize (psi), + addr, addr + psize); + } +if (rc)pr_err ("KVM: TLB page invalidation hcall failed, rc=%ld\n" , rc); }
@@ -334,8 +345,14 @@ static void kvmppc_radix_flush_pwc(struct kvm *kvm, unsigned int lpid)return ; } - rc =plpar_hcall_norets (H_TLB_INVALIDATE ,H_TLBIE_P1_ENC (1 ,0 ,1 ), - lpid,TLBIEL_INVAL_SET_LPID ); +if (!firmware_has_feature (FW_FEATURE_RPT_INVALIDATE )) + rc =plpar_hcall_norets (H_TLB_INVALIDATE ,H_TLBIE_P1_ENC (1 ,0 ,1 ), + lpid,TLBIEL_INVAL_SET_LPID ); +else + rc =pseries_rpt_invalidate (lpid,H_RPTI_TARGET_CMMU , +H_RPTI_TYPE_NESTED | +H_RPTI_TYPE_PWC ,H_RPTI_PAGE_ALL , +0 ,-1UL );if (rc)pr_err ("KVM: TLB PWC invalidation hcall failed, rc=%ld\n" , rc); }
arch/powerpc/kvm/book3s_hv_nested.c +10 -2
@@ -19,6 +19,7 @@#include <asm/pgalloc.h> #include <asm/pte-walk.h> #include <asm/reg.h> +#include <asm/plpar_wrappers.h> static struct patb_entry *pseries_partition_tb;
@@ -402,8 +403,15 @@ static void kvmhv_flush_lpid(unsigned int lpid)return ; } - rc =plpar_hcall_norets (H_TLB_INVALIDATE ,H_TLBIE_P1_ENC (2 ,0 ,1 ), - lpid,TLBIEL_INVAL_SET_LPID ); +if (!firmware_has_feature (FW_FEATURE_RPT_INVALIDATE )) + rc =plpar_hcall_norets (H_TLB_INVALIDATE ,H_TLBIE_P1_ENC (2 ,0 ,1 ), + lpid,TLBIEL_INVAL_SET_LPID ); +else + rc =pseries_rpt_invalidate (lpid,H_RPTI_TARGET_CMMU , +H_RPTI_TYPE_NESTED | +H_RPTI_TYPE_TLB |H_RPTI_TYPE_PWC | +H_RPTI_TYPE_PAT , +H_RPTI_PAGE_ALL ,0 ,-1UL );if (rc)pr_err ("KVM: TLB LPID invalidation hcall failed, rc=%ld\n" , rc); }
Signature · 1 line
2.26.2