Off-load TLB invalidations to host for !GTSE
cover Off-load TLB invalidations to host for !GTSE
Hypervisor may choose not to enable Guest Translation Shootdown Enable (GTSE) option for the guest. When GTSE isn't ON, the guest OS isn't permitted to use instructions like tblie and tlbsync directly, but is expected to make hypervisor calls to get the TLB flushed.
This series enables the TLB flush routines in the radix code to off-load TLB flushing to hypervisor via the newly proposed hcall H_RPT_INVALIDATE. The specification of this hcall is still evolving while the patchset is posted here for any early comments.
To easily check the availability of GTSE, it is made an MMU feature. (TODO: Check if this can be a static key instead of MMU feature)
The OV5 handling and H_REGISTER_PROC_TBL hcall are changed to handle GTSE as an optionally available feature and to not assume GTSE when radix support is available.
H_RPT_INVALIDATE
================
Syntax:
int64 /* H_Success: Return code on successful completion */
/* H_Busy - repeat the call with the same */
/* H_P2, H_P3, H_P4, H_Parameter: Invalid parameters */
hcall(const uint64 H_RPT_INVALIDATE, /* Invalidate process scoped RPT lookaside information */
uint64 pid, /* PID to invalidate */
uint64 target, /* Invalidation target */
uint64 what, /* What type of lookaside information */
uint64 pages, /* Page sizes */
uint64 start, /* Start of Effective Address (EA) range */
uint64 end) /* End of EA range */
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.
What to invalidate (what)
-------------------------
Reserved 0x0001 /* Reserved */ TLB 0x0002 /* Invalidate TLB */ PWC 0x0004 /* Invalidate Page Walk Cache */ PRS 0x0008 /* Invalidate Process Table Entries */
A combination of the above can be specified.
Page size mask (pages)
----------------------
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, what or pages parameters are different from the defined values.
* Return H_PARAMETER if (start, end) doesn't form a valid range.
* May invalidate more translation information than was specified.
* 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 pid = 0 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 call to optimally invalidate ranges that may contain mixed page sizes.
* Return H_SUCCESS on success.
Bharata B Rao (3):
powerpc/mm: Make GTSE as MMU FTR
powerpc/prom_init: Ask for Radix GTSE only if supported. powerpc/pseries: H_REGISTER_PROC_TBL should ask for GTSE only if
enabled
Nicholas Piggin (1):
powerpc/mm/book3s64/radix: Off-load TLB invalidations to host when
!GTSE
arch/powerpc/include/asm/hvcall.h | 1 + arch/powerpc/include/asm/mmu.h | 4 + arch/powerpc/include/asm/plpar_wrappers.h | 14 +++ arch/powerpc/kernel/dt_cpu_ftrs.c | 2 + arch/powerpc/kernel/prom_init.c | 13 +-- arch/powerpc/mm/book3s64/radix_tlb.c | 105 ++++++++++++++++++++-- arch/powerpc/mm/init_64.c | 6 +- arch/powerpc/platforms/pseries/lpar.c | 8 +- 8 files changed, 137 insertions(+), 16 deletions(-)
Signature · 1 line
2.21.3
RFC PATCH 1/4 powerpc/mm: Make GTSE as MMU FTR
Make GTSE as an MMU feature and enable it by default for radix. However for guest, conditionally enable it if hypervisor supports it via OV5 vector.
Making GTSE as a MMU feature will make it easy to enable radix without GTSE.
--- arch/powerpc/include/asm/mmu.h | 4 ++++ arch/powerpc/kernel/dt_cpu_ftrs.c | 2 ++ arch/powerpc/mm/init_64.c | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/mmu.h +4 -0
@@ -28,6 +28,9 @@* Individual features below. */ +/* Guest Translation Shootdown Enable */ +#define MMU_FTR_GTSE ASM_CONST(0x00001000) +/* * Support for 68 bit VA space. We added that from ISA 2.05 */
@@ -173,6 +176,7 @@ enum {#endif #ifdef CONFIG_PPC_RADIX_MMU MMU_FTR_TYPE_RADIX | + MMU_FTR_GTSE |#ifdef CONFIG_PPC_KUAP MMU_FTR_RADIX_KUAP |#endif /* CONFIG_PPC_KUAP */
arch/powerpc/kernel/dt_cpu_ftrs.c +2 -0
@@ -337,6 +337,8 @@ static int __init feat_enable_mmu_radix(struct dt_cpu_feature *f)#ifdef CONFIG_PPC_RADIX_MMU cur_cpu_spec->mmu_features |=MMU_FTR_TYPE_RADIX ; cur_cpu_spec->mmu_features |=MMU_FTRS_HASH_BASE ; +/* TODO: Does this need a separate cpu dt feature? */ + cur_cpu_spec->mmu_features |=MMU_FTR_GTSE ; cur_cpu_spec->cpu_user_features |=PPC_FEATURE_HAS_MMU ;return 1 ;
arch/powerpc/mm/init_64.c +5 -1
@@ -408,13 +408,17 @@ static void __init early_check_vec5(void)if (!(vec5[OV5_INDX (OV5_RADIX_GTSE )] &OV5_FEAT (OV5_RADIX_GTSE ))) {pr_warn ("WARNING: Hypervisor doesn't support RADIX with GTSE\n" ); - } + cur_cpu_spec->mmu_features &= ~MMU_FTR_GTSE ; + }else + cur_cpu_spec->mmu_features |=MMU_FTR_GTSE ;/* Do radix anyway - the hypervisor said we had to */ cur_cpu_spec->mmu_features |=MMU_FTR_TYPE_RADIX ; }else if (mmu_supported ==OV5_FEAT (OV5_MMU_HASH )) {/* Hypervisor only supports hash - disable radix */ cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX ; + cur_cpu_spec->mmu_features &= ~MMU_FTR_GTSE ; } + }void __init mmu_early_init_devtree (void )
Signature · 1 line
2.21.3
RFC PATCH 2/4 powerpc/prom_init: Ask for Radix GTSE only if supported.
In reply to Bharata B RaoIn the case of radix, don't ask for GTSE by default but ask only if GTSE is enabled.
--- arch/powerpc/kernel/prom_init.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
arch/powerpc/kernel/prom_init.c +8 -5
@@ -1336,12 +1336,15 @@ static void __init prom_check_platform_support(void) } } -if (supported.radix_mmu && supported.radix_gtse && -IS_ENABLED (CONFIG_PPC_RADIX_MMU )) { -/* Radix preferred - but we require GTSE for now */ -prom_debug ("Asking for radix with GTSE\n" ); +if (supported.radix_mmu &&IS_ENABLED (CONFIG_PPC_RADIX_MMU )) { +/* Radix preferred - Check if GTSE is also supported */ +prom_debug ("Asking for radix\n" ); ibm_architecture_vec.vec5.mmu =OV5_FEAT (OV5_MMU_RADIX ); - ibm_architecture_vec.vec5.radix_ext =OV5_FEAT (OV5_RADIX_GTSE ); +if (supported.radix_gtse) + ibm_architecture_vec.vec5.radix_ext = +OV5_FEAT (OV5_RADIX_GTSE ); +else +prom_debug ("Radix GTSE isn't supported\n" ); }else if (supported.hash_mmu) {/* Default to hash mmu (if we can) */ prom_debug ("Asking for hash\n" );
Signature · 1 line
2.21.3
RFC PATCH 3/4 powerpc/pseries: H_REGISTER_PROC_TBL should ask for GTSE only if enabled
In reply to Bharata B RaoH_REGISTER_PROC_TBL asks for GTSE by default. GTSE flag bit should be set only when GTSE is supported.
--- arch/powerpc/platforms/pseries/lpar.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/powerpc/platforms/pseries/lpar.c +5 -3
@@ -1680,9 +1680,11 @@ static int pseries_lpar_register_process_table(unsigned long base,if (table_size) flags |=PROC_TABLE_NEW ; -if (radix_enabled ()) - flags |=PROC_TABLE_RADIX |PROC_TABLE_GTSE ; -else +if (radix_enabled ()) { + flags |=PROC_TABLE_RADIX ; +if (mmu_has_feature (MMU_FTR_GTSE )) + flags |=PROC_TABLE_GTSE ; + }else flags |=PROC_TABLE_HPT_SLB ;for (;;) { rc = plpar_hcall_norets(H_REGISTER_PROC_TBL, flags, base,
Signature · 1 line
2.21.3
RFC PATCH 4/4 powerpc/mm/book3s64/radix: Off-load TLB invalidations to host when !GTSE
In reply to Bharata B RaoFrom: Nicholas Piggin <[email protected]>
When platform doesn't support GTSE, let TLB invalidation requests for radix guests be off-loaded to the host using H_RPT_INVALIDATE hcall
--- arch/powerpc/include/asm/hvcall.h | 1 + arch/powerpc/include/asm/plpar_wrappers.h | 14 +++ arch/powerpc/mm/book3s64/radix_tlb.c | 105 ++++++++++++++++++++-- 3 files changed, 113 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/hvcall.h +1 -0
@@ -335,6 +335,7 @@#define H_GET_24X7_CATALOG_PAGE 0xF078#define H_GET_24X7_DATA 0xF07C#define H_GET_PERF_COUNTER_INFO 0xF080 +#define H_RPT_INVALIDATE 0xF084/* Platform-specific hcalls used for nested HV KVM */ #define H_SET_PARTITION_TABLE 0xF800
arch/powerpc/include/asm/plpar_wrappers.h +14 -0
@@ -334,6 +334,13 @@ static inline long plpar_get_cpu_characteristics(struct h_cpu_char_result *p) return rc; } +static inline long pseries_rpt_invalidate (u32 pid,u64 target,u64 what, +u64 pages,u64 start,u64 end) +{ +return plpar_hcall_norets (H_RPT_INVALIDATE , pid, target, what, + pages, start, end); +} +#else /* !CONFIG_PPC_PSERIES */ static inline long plpar_set_ciabr (unsigned long ciabr)
@@ -346,6 +353,13 @@ static inline long plpar_pte_read_4(unsigned long flags, unsigned long ptex, {return 0 ; } + +static inline long pseries_rpt_invalidate (u32 pid,u64 target,u64 what, +u64 pages,u64 start,u64 end) +{ +return 0 ; +} +#endif /* CONFIG_PPC_PSERIES */ #endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */
arch/powerpc/mm/book3s64/radix_tlb.c +98 -7
158 lines not on this page · raw message
Signature · 1 line
2.21.3