Use H_RPT_INVALIDATE for nested guest
Subsystems (4)
cover Use H_RPT_INVALIDATE for nested guest
This patchset adds support for the new hcall H_RPT_INVALIDATE (currently handles nested case only) and replaces the nested tlb flush calls with this new hcall if the support for the same exists.
This applies on top of "[PATCH v3 0/3] Off-load TLB invalidations to host for !GTSE" patchset that was posted at:
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 (nested case
only)
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/firmware.h | 4 +- arch/powerpc/include/asm/kvm_book3s.h | 3 + arch/powerpc/kvm/book3s_64_mmu_radix.c | 26 ++++- arch/powerpc/kvm/book3s_hv.c | 32 ++++++ arch/powerpc/kvm/book3s_hv_nested.c | 107 +++++++++++++++++- arch/powerpc/kvm/powerpc.c | 3 + arch/powerpc/mm/book3s64/radix_tlb.c | 4 - arch/powerpc/platforms/pseries/firmware.c | 1 + include/uapi/linux/kvm.h | 1 + 11 files changed, 204 insertions(+), 12 deletions(-)
Signature · 1 line
2.21.3
RFC PATCH 1/2 KVM: PPC: Book3S HV: Add support for H_RPT_INVALIDATE (nested case only)
Implements H_RPT_INVALIDATE hcall and supports only nested case currently.
A KVM capability KVM_CAP_RPT_INVALIDATE is added to indicate the support for this hcall.
--- Documentation/virt/kvm/api.rst | 17 ++++ .../include/asm/book3s/64/tlbflush-radix.h | 18 ++++ arch/powerpc/include/asm/kvm_book3s.h | 3 + arch/powerpc/kvm/book3s_hv.c | 32 +++++++ arch/powerpc/kvm/book3s_hv_nested.c | 94 +++++++++++++++++++ arch/powerpc/kvm/powerpc.c | 3 + arch/powerpc/mm/book3s64/radix_tlb.c | 4 - include/uapi/linux/kvm.h | 1 + 8 files changed, 168 insertions(+), 4 deletions(-)
Documentation/virt/kvm/api.rst +17 -0
@@ -5843,6 +5843,23 @@ controlled by the kvm module parameter halt_poll_ns. This capability allows the maximum halt time to specified on a per-VM basis, effectively overriding the module parameter for the target VM. +7.21 KVM_CAP_RPT_INVALIDATE +-------------------------- + +:Capability: KVM_CAP_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/kvm/book3s_hv.c +32 -0
@@ -895,6 +895,28 @@ static int kvmppc_get_yield_count(struct kvm_vcpu *vcpu)return yield_count; } +static long kvmppc_h_rpt_invalidate (struct kvm_vcpu *vcpu, +unsigned long pid,unsigned long target, +unsigned long type,unsigned long pg_sizes, +unsigned long start,unsigned long end) +{ +if (end < start) +return H_P5 ; + +if ((!type &H_RPTI_TYPE_NESTED )) +return H_P3 ; + +if (!nesting_enabled (vcpu->kvm)) +return H_FUNCTION ; + +/* Support only cores as target */ +if (target !=H_RPTI_TARGET_CMMU ) +return H_P2 ; + +return kvmhv_h_rpti_nested (vcpu, pid, (type & ~H_RPTI_TYPE_NESTED ), + pg_sizes, start, end); +} +int kvmppc_pseries_do_hcall (struct kvm_vcpu *vcpu) {unsigned long req =kvmppc_get_gpr (vcpu,3 );
@@ -1103,6 +1125,14 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)*/ ret =kvmppc_h_svm_init_abort (vcpu->kvm);break ; +case H_RPT_INVALIDATE : + ret =kvmppc_h_rpt_invalidate (vcpu,kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 ), +kvmppc_get_gpr (vcpu,6 ), +kvmppc_get_gpr (vcpu,7 ), +kvmppc_get_gpr (vcpu,8 ), +kvmppc_get_gpr (vcpu,9 )); +break ;default :return RESUME_HOST ;
@@ -1149,6 +1179,7 @@ static int kvmppc_hcall_impl_hv(unsigned long cmd)case H_XIRR_X :#endif case H_PAGE_INIT : +case H_RPT_INVALIDATE :return 1 ; }
@@ -5284,6 +5315,7 @@ static unsigned int default_hcall_list[] = {H_XIRR ,H_XIRR_X , #endif +H_RPT_INVALIDATE ,0 };
arch/powerpc/kvm/book3s_hv_nested.c +94 -0
100 lines not on this page · raw message
arch/powerpc/kvm/powerpc.c +3 -0
@@ -675,6 +675,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_RPT_INVALIDATE : + r =1 ; +break ;#endif default : r =0 ;
arch/powerpc/mm/book3s64/radix_tlb.c +0 -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
include/uapi/linux/kvm.h +1 -0
@@ -1031,6 +1031,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_PPC_SECURE_GUEST 181#define KVM_CAP_HALT_POLL 182#define KVM_CAP_ASYNC_PF_INT 183 +#define KVM_CAP_RPT_INVALIDATE 184#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.21.3
RFC PATCH 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/include/asm/firmware.h | 4 +++- arch/powerpc/kvm/book3s_64_mmu_radix.c | 26 ++++++++++++++++++----- arch/powerpc/kvm/book3s_hv_nested.c | 13 ++++++++++-- arch/powerpc/platforms/pseries/firmware.c | 1 + 4 files changed, 36 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/firmware.h +3 -1
@@ -52,6 +52,7 @@#define FW_FEATURE_PAPR_SCM ASM_CONST(0x0000002000000000)#define FW_FEATURE_ULTRAVISOR ASM_CONST(0x0000004000000000)#define FW_FEATURE_STUFF_TCE ASM_CONST(0x0000008000000000) +#define FW_FEATURE_RPT_INVALIDATE ASM_CONST(0x0000010000000000)#ifndef __ASSEMBLY__
@@ -71,7 +72,8 @@ enum {FW_FEATURE_TYPE1_AFFINITY |FW_FEATURE_PRRN |FW_FEATURE_HPT_RESIZE |FW_FEATURE_DRMEM_V2 |FW_FEATURE_DRC_INFO |FW_FEATURE_BLOCK_REMOVE | -FW_FEATURE_PAPR_SCM |FW_FEATURE_ULTRAVISOR , +FW_FEATURE_PAPR_SCM |FW_FEATURE_ULTRAVISOR | +FW_FEATURE_RPT_INVALIDATE ,FW_FEATURE_PSERIES_ALWAYS =0 ,FW_FEATURE_POWERNV_POSSIBLE =FW_FEATURE_OPAL |FW_FEATURE_ULTRAVISOR , FW_FEATURE_POWERNV_ALWAYS = 0,
arch/powerpc/kvm/book3s_64_mmu_radix.c +21 -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.
@@ -313,9 +314,17 @@ 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); }
@@ -329,8 +338,15 @@ 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 +11 -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;
@@ -401,8 +402,16 @@ 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); }
arch/powerpc/platforms/pseries/firmware.c +1 -0
@@ -65,6 +65,7 @@ hypertas_fw_features_table[] = { {FW_FEATURE_HPT_RESIZE, "hcall-hpt-resize"}, {FW_FEATURE_BLOCK_REMOVE, "hcall-block-remove"}, {FW_FEATURE_PAPR_SCM, "hcall-scm"}, + {FW_FEATURE_RPT_INVALIDATE, "hcall-rpt-invalidate"}, };/* Build up the firmware features bitmask using the contents of
Signature · 1 line
2.21.3
Re: [RFC PATCH v0 2/2] KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM
Quoted 4 lines · Bharata B Rao
In the nested KVM case, replace
H_TLB_INVALIDATEby the new hcallH_RPT_INVALIDATEif available. The availability of this hcall is determined from "hcall-rpt-invalidate" string in ibm,hypertas-functions DT property.
What are we going to use when nested KVM supports HPT guests at L2? L1 will need to do partition-scoped tlbies with R=0 via a hypercall, but H_RPT_INVALIDATE says in its name that it only handles radix page tables (i.e. R=1).
Paul.
Re: [RFC PATCH v0 2/2] KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM
Quoted 10 lines · Paul Mackerras
Quoted 4 lines · Bharata B Rao
In the nested KVM case, replace
H_TLB_INVALIDATEby the new hcallH_RPT_INVALIDATEif available. The availability of this hcall is determined from "hcall-rpt-invalidate" string in ibm,hypertas-functions DT property.What are we going to use when nested KVM supports HPT guests at L2? L1 will need to do partition-scoped tlbies with R=0 via a hypercall, but
H_RPT_INVALIDATEsays in its name that it only handles radix page tables (i.e. R=1).
For L2 HPT guests, the old hcall is expected to work after it adds support for R=0 case?
The new hcall should be advertised via ibm,hypertas-functions only for radix guests I suppose.
Regards,
Bharata.
Re: [RFC PATCH v0 2/2] KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM
Quoted 7 lines · Bharata B Rao
Quoted 6 lines · Paul Mackerras
Quoted 4 lines · Bharata B Rao
In the nested KVM case, replace
H_TLB_INVALIDATEby the new hcallH_RPT_INVALIDATEif available. The availability of this hcall is determined from "hcall-rpt-invalidate" string in ibm,hypertas-functions DT property.
Quoted 7 lines
Quoted 4 lines
What are we going to use when nested KVM supports HPT guests at L2? L1 will need to do partition-scoped tlbies with R=0 via a hypercall, but
H_RPT_INVALIDATEsays in its name that it only handles radix page tables (i.e. R=1).For L2 HPT guests, the old hcall is expected to work after it adds support for R=0 case?
That was the plan.
Quoted 2 lines
The new hcall should be advertised via ibm,hypertas-functions only for radix guests I suppose.
Well, the L1 hypervisor is a radix guest of L0, so it would have H_RPT_INVALIDATE available to it?
I guess the question is whether H_RPT_INVALIDATE is supposed to do everything, that is, radix process-scoped invalidations, radix partition-scoped invalidations, and HPT partition-scoped invalidations. If that is the plan then we should call it something different.
This patchset seems to imply that H_RPT_INVALIDATE is at least going to be used for radix partition-scoped invalidations as well as radix process-scoped invalidations. If you are thinking that in future when we need HPT partition-scoped invalidations for a radix L1 hypervisor running a HPT L2 guest, we are going to define a new hypercall for that, I suppose that is OK, though it doesn't really seem necessary.
Paul.
Re: [RFC PATCH v0 2/2] KVM: PPC: Book3S HV: Use H_RPT_INVALIDATE in nested KVM
Quoted 21 lines · Paul Mackerras
Quoted 7 lines · Bharata B Rao
Quoted 6 lines · Paul Mackerras
Quoted 4 lines · Bharata B Rao
In the nested KVM case, replace
H_TLB_INVALIDATEby the new hcallH_RPT_INVALIDATEif available. The availability of this hcall is determined from "hcall-rpt-invalidate" string in ibm,hypertas-functions DT property.Quoted 7 lines
Quoted 4 lines
What are we going to use when nested KVM supports HPT guests at L2? L1 will need to do partition-scoped tlbies with R=0 via a hypercall, but
H_RPT_INVALIDATEsays in its name that it only handles radix page tables (i.e. R=1).For L2 HPT guests, the old hcall is expected to work after it adds support for R=0 case?
That was the plan.
Quoted 2 lines
The new hcall should be advertised via ibm,hypertas-functions only for radix guests I suppose.
Quoted 8 lines
Well, the L1 hypervisor is a radix guest of L0, so it would have
H_RPT_INVALIDATEavailable to it?I guess the question is whether
H_RPT_INVALIDATEis supposed to do everything, that is, radix process-scoped invalidations, radix partition-scoped invalidations, and HPT partition-scoped invalidations. If that is the plan then we should call it something different.
Guess we are bit late now to rename it and include HPT in the scope.
Quoted 7 lines
This patchset seems to imply that
H_RPT_INVALIDATEis at least going to be used for radix partition-scoped invalidations as well as radix process-scoped invalidations. If you are thinking that in future when we need HPT partition-scoped invalidations for a radix L1 hypervisor running a HPT L2 guest, we are going to define a new hypercall for that, I suppose that is OK, though it doesn't really seem necessary.
Guess a new hcall would be the way forward to cover the HPT L2 guest requirements.
Thanks for pointing this out.
Regards,
Bharata.