[RFC V2 13/14] arm64/mm: Add an abstraction level for tlbi_op

[Ryan Roberts]

On 13/05/2026 05:45, Anshuman Khandual wrote:
> From: Linu Cherian <linu.cherian at arm.com>
> 
> With FEAT_D128, a new instruction aka TLBIP is being introduced for the TLB
> range operations which has an argument size of 128 bit.

nit: TLB range operations -> TLBI-by-range operations ?

> 
> Add an abstraction level to void (*tlbi_op)(u64 arg) helpers to support the
> D128 variations when applicable.
> 
> No functional changes are introduced with this patch.
> 
> Signed-off-by: Linu Cherian <linu.cherian at arm.com>
> Signed-off-by: Anshuman Khandual <anshuman.khandual at arm.com>
> ---
>  arch/arm64/include/asm/tlbflush.h | 70 ++++++++++++++++---------------
>  1 file changed, 37 insertions(+), 33 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h
> index c0bf5b398041..361d74ef8016 100644
> --- a/arch/arm64/include/asm/tlbflush.h
> +++ b/arch/arm64/include/asm/tlbflush.h
> @@ -162,49 +162,53 @@ static inline void sme_dvmsync_batch(struct arch_tlbflush_unmap_batch *batch)
>  
>  #define TLBI_TTL_UNKNOWN	INT_MAX
>  
> -typedef void (*tlbi_op)(u64 arg);
> +typedef u64 tlbi_args_t;

nit: tlbi_args_t -> tlbi_arg_t ?

> +#define __tlbi_wrapper(op, arg)		__tlbi(op, arg)
> +#define __tlbi_user_wrapper(op, arg)	__tlbi_user(op, arg)

I'm not a huge fan of these, but I can see why you did it this way.

Thanks,
Ryan


>  
> -static __always_inline void vae1is(u64 arg)
> +typedef void (*tlbi_op)(tlbi_args_t arg);
> +
> +static __always_inline void vae1is(tlbi_args_t arg)
>  {
> -	__tlbi(vae1is, arg);
> -	__tlbi_user(vae1is, arg);
> +	__tlbi_wrapper(vae1is, arg);
> +	__tlbi_user_wrapper(vae1is, arg);
>  }
>  
> -static __always_inline void vae2is(u64 arg)
> +static __always_inline void vae2is(tlbi_args_t arg)
>  {
> -	__tlbi(vae2is, arg);
> +	__tlbi_wrapper(vae2is, arg);
>  }
>  
> -static __always_inline void vale1(u64 arg)
> +static __always_inline void vale1(tlbi_args_t arg)
>  {
> -	__tlbi(vale1, arg);
> -	__tlbi_user(vale1, arg);
> +	__tlbi_wrapper(vale1, arg);
> +	__tlbi_user_wrapper(vale1, arg);
>  }
>  
> -static __always_inline void vale1is(u64 arg)
> +static __always_inline void vale1is(tlbi_args_t arg)
>  {
> -	__tlbi(vale1is, arg);
> -	__tlbi_user(vale1is, arg);
> +	__tlbi_wrapper(vale1is, arg);
> +	__tlbi_user_wrapper(vale1is, arg);
>  }
>  
> -static __always_inline void vale2is(u64 arg)
> +static __always_inline void vale2is(tlbi_args_t arg)
>  {
> -	__tlbi(vale2is, arg);
> +	__tlbi_wrapper(vale2is, arg);
>  }
>  
> -static __always_inline void vaale1is(u64 arg)
> +static __always_inline void vaale1is(tlbi_args_t arg)
>  {
> -	__tlbi(vaale1is, arg);
> +	__tlbi_wrapper(vaale1is, arg);
>  }
>  
> -static __always_inline void ipas2e1(u64 arg)
> +static __always_inline void ipas2e1(tlbi_args_t arg)
>  {
> -	__tlbi(ipas2e1, arg);
> +	__tlbi_wrapper(ipas2e1, arg);
>  }
>  
> -static __always_inline void ipas2e1is(u64 arg)
> +static __always_inline void ipas2e1is(tlbi_args_t arg)
>  {
> -	__tlbi(ipas2e1is, arg);
> +	__tlbi_wrapper(ipas2e1is, arg);
>  }
>  
>  static __always_inline void __tlbi_level_asid(tlbi_op op, u64 addr, u32 level,
> @@ -475,32 +479,32 @@ static inline void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)
>   *    operations can only span an even number of pages. We save this for last to
>   *    ensure 64KB start alignment is maintained for the LPA2 case.
>   */
> -static __always_inline void rvae1is(u64 arg)
> +static __always_inline void rvae1is(tlbi_args_t arg)
>  {
> -	__tlbi(rvae1is, arg);
> -	__tlbi_user(rvae1is, arg);
> +	__tlbi_wrapper(rvae1is, arg);
> +	__tlbi_user_wrapper(rvae1is, arg);
>  }
>  
> -static __always_inline void rvale1(u64 arg)
> +static __always_inline void rvale1(tlbi_args_t arg)
>  {
> -	__tlbi(rvale1, arg);
> -	__tlbi_user(rvale1, arg);
> +	__tlbi_wrapper(rvale1, arg);
> +	__tlbi_user_wrapper(rvale1, arg);
>  }
>  
> -static __always_inline void rvale1is(u64 arg)
> +static __always_inline void rvale1is(tlbi_args_t arg)
>  {
> -	__tlbi(rvale1is, arg);
> -	__tlbi_user(rvale1is, arg);
> +	__tlbi_wrapper(rvale1is, arg);
> +	__tlbi_user_wrapper(rvale1is, arg);
>  }
>  
> -static __always_inline void rvaale1is(u64 arg)
> +static __always_inline void rvaale1is(tlbi_args_t arg)
>  {
> -	__tlbi(rvaale1is, arg);
> +	__tlbi_wrapper(rvaale1is, arg);
>  }
>  
> -static __always_inline void ripas2e1is(u64 arg)
> +static __always_inline void ripas2e1is(tlbi_args_t arg)
>  {
> -	__tlbi(ripas2e1is, arg);
> +	__tlbi_wrapper(ripas2e1is, arg);
>  }
>  
>  static __always_inline void __tlbi_range(tlbi_op op, u64 addr,