[PATCH V2] arm64/mm: Rename ptdesc_t
Anshuman Khandual
anshuman.khandual at arm.com
Sun May 31 20:50:02 PDT 2026
On 20/05/26 12:04 PM, Anshuman Khandual wrote:
> ptdesc_t sounds very similar to the core MM struct ptdesc which is actually
> the memory descriptor for page table allocations. Hence rename this typedef
> element as ptval_t instead for better clarity and separation.
>
> Cc: Catalin Marinas <catalin.marinas at arm.com>
> Cc: Will Deacon <will at kernel.org>
> Cc: David Hildenbrand <david at kernel.org>
> Cc: Mike Rapoport <rppt at kernel.org>
> Cc: linux-efi at vger.kernel.org
> Cc: linux-kernel at vger.kernel.org
> Cc: linux-arm-kernel at lists.infradead.org
> Acked-by: Mike Rapoport (Microsoft) <rppt at kernel.org>
> Acked-by: David Hildenbrand (Arm) <david at kernel.org>
> Suggested-by: David Hildenbrand (Arm) <david at kernel.org>
> Signed-off-by: Anshuman Khandual <anshuman.khandual at arm.com>
> ---
> This patch applies on v7.1-rc4.
>
> Changes in V2:
>
> - Renamed pxxval_t as ptval_t per Mike and David
>
> Changes in V1:
>
> https://lore.kernel.org/all/20260430034933.541634-1-anshuman.khandual@arm.com/
>
> arch/arm64/include/asm/io.h | 2 +-
> arch/arm64/include/asm/pgtable-types.h | 14 +++++++-------
> arch/arm64/include/asm/ptdump.h | 8 ++++----
> arch/arm64/include/asm/tlbflush.h | 4 ++--
> arch/arm64/kernel/efi.c | 4 ++--
> arch/arm64/kernel/pi/map_kernel.c | 2 +-
> arch/arm64/kernel/pi/map_range.c | 4 ++--
> arch/arm64/kernel/pi/pi.h | 2 +-
> arch/arm64/mm/mmap.c | 4 ++--
> arch/arm64/mm/pageattr.c | 2 +-
> arch/arm64/mm/ptdump.c | 2 +-
> 11 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
> index 8cbd1e96fd50..21c8e400107c 100644
> --- a/arch/arm64/include/asm/io.h
> +++ b/arch/arm64/include/asm/io.h
> @@ -270,7 +270,7 @@ static inline void __iomem *ioremap_prot(phys_addr_t phys, size_t size,
> pgprot_t user_prot)
> {
> pgprot_t prot;
> - ptdesc_t user_prot_val = pgprot_val(user_prot);
> + ptval_t user_prot_val = pgprot_val(user_prot);
>
> if (WARN_ON_ONCE(!(user_prot_val & PTE_USER)))
> return NULL;
> diff --git a/arch/arm64/include/asm/pgtable-types.h b/arch/arm64/include/asm/pgtable-types.h
> index 265e8301d7ba..2f2f5527930f 100644
> --- a/arch/arm64/include/asm/pgtable-types.h
> +++ b/arch/arm64/include/asm/pgtable-types.h
> @@ -17,13 +17,13 @@
> * Generic page table descriptor format from which
> * all level specific descriptors can be derived.
> */
> -typedef u64 ptdesc_t;
> +typedef u64 ptval_t;
>
> -typedef ptdesc_t pteval_t;
> -typedef ptdesc_t pmdval_t;
> -typedef ptdesc_t pudval_t;
> -typedef ptdesc_t p4dval_t;
> -typedef ptdesc_t pgdval_t;
> +typedef ptval_t pteval_t;
> +typedef ptval_t pmdval_t;
> +typedef ptval_t pudval_t;
> +typedef ptval_t p4dval_t;
> +typedef ptval_t pgdval_t;
>
> /*
> * These are used to make use of C type-checking..
> @@ -54,7 +54,7 @@ typedef struct { pgdval_t pgd; } pgd_t;
> #define pgd_val(x) ((x).pgd)
> #define __pgd(x) ((pgd_t) { (x) } )
>
> -typedef struct { ptdesc_t pgprot; } pgprot_t;
> +typedef struct { ptval_t pgprot; } pgprot_t;
> #define pgprot_val(x) ((x).pgprot)
> #define __pgprot(x) ((pgprot_t) { (x) } )
>
> diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdump.h
> index baff24004459..5b374a6ab34a 100644
> --- a/arch/arm64/include/asm/ptdump.h
> +++ b/arch/arm64/include/asm/ptdump.h
> @@ -26,8 +26,8 @@ struct ptdump_info {
> };
>
> struct ptdump_prot_bits {
> - ptdesc_t mask;
> - ptdesc_t val;
> + ptval_t mask;
> + ptval_t val;
> const char *set;
> const char *clear;
> };
> @@ -36,7 +36,7 @@ struct ptdump_pg_level {
> const struct ptdump_prot_bits *bits;
> char name[4];
> int num;
> - ptdesc_t mask;
> + ptval_t mask;
> };
>
> /*
> @@ -53,7 +53,7 @@ struct ptdump_pg_state {
> const struct mm_struct *mm;
> unsigned long start_address;
> int level;
> - ptdesc_t current_prot;
> + ptval_t current_prot;
> bool check_wx;
> unsigned long wx_pages;
> unsigned long uxn_pages;
> diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h
> index c0bf5b398041..d52ac8c17190 100644
> --- a/arch/arm64/include/asm/tlbflush.h
> +++ b/arch/arm64/include/asm/tlbflush.h
> @@ -725,9 +725,9 @@ static inline void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *b
> sme_dvmsync_add_pending(batch, mm);
> }
>
> -static inline bool __pte_flags_need_flush(ptdesc_t oldval, ptdesc_t newval)
> +static inline bool __pte_flags_need_flush(ptval_t oldval, ptval_t newval)
> {
> - ptdesc_t diff = oldval ^ newval;
> + ptval_t diff = oldval ^ newval;
>
> /* invalid to valid transition requires no flush */
> if (!(oldval & PTE_VALID))
> diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> index a81cb4aa4738..30cd7f804398 100644
> --- a/arch/arm64/kernel/efi.c
> +++ b/arch/arm64/kernel/efi.c
> @@ -31,7 +31,7 @@ static bool region_is_misaligned(const efi_memory_desc_t *md)
> * executable, everything else can be mapped with the XN bits
> * set. Also take the new (optional) RO/XP bits into account.
> */
> -static __init ptdesc_t create_mapping_protection(efi_memory_desc_t *md)
> +static __init ptval_t create_mapping_protection(efi_memory_desc_t *md)
> {
> u64 attr = md->attribute;
> u32 type = md->type;
> @@ -85,7 +85,7 @@ static __init ptdesc_t create_mapping_protection(efi_memory_desc_t *md)
>
> int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)
> {
> - ptdesc_t prot_val = create_mapping_protection(md);
> + ptval_t prot_val = create_mapping_protection(md);
> bool page_mappings_only = (md->type == EFI_RUNTIME_SERVICES_CODE ||
> md->type == EFI_RUNTIME_SERVICES_DATA);
>
> diff --git a/arch/arm64/kernel/pi/map_kernel.c b/arch/arm64/kernel/pi/map_kernel.c
> index a852264958c3..fb44cbdd2f29 100644
> --- a/arch/arm64/kernel/pi/map_kernel.c
> +++ b/arch/arm64/kernel/pi/map_kernel.c
> @@ -165,7 +165,7 @@ static void noinline __section(".idmap.text") set_ttbr0_for_lpa2(phys_addr_t ttb
> static void __init remap_idmap_for_lpa2(void)
> {
> /* clear the bits that change meaning once LPA2 is turned on */
> - ptdesc_t mask = PTE_SHARED;
> + ptval_t mask = PTE_SHARED;
>
> /*
> * We have to clear bits [9:8] in all block or page descriptors in the
> diff --git a/arch/arm64/kernel/pi/map_range.c b/arch/arm64/kernel/pi/map_range.c
> index de52cd85c691..761b14893f74 100644
> --- a/arch/arm64/kernel/pi/map_range.c
> +++ b/arch/arm64/kernel/pi/map_range.c
> @@ -31,7 +31,7 @@ void __init map_range(phys_addr_t *pte, u64 start, u64 end, phys_addr_t pa,
> u64 va_offset)
> {
> u64 cmask = (level == 3) ? CONT_PTE_SIZE - 1 : U64_MAX;
> - ptdesc_t protval = pgprot_val(prot) & ~PTE_TYPE_MASK;
> + ptval_t protval = pgprot_val(prot) & ~PTE_TYPE_MASK;
> int lshift = (3 - level) * PTDESC_TABLE_SHIFT;
> u64 lmask = (PAGE_SIZE << lshift) - 1;
>
> @@ -88,7 +88,7 @@ void __init map_range(phys_addr_t *pte, u64 start, u64 end, phys_addr_t pa,
> }
> }
>
> -asmlinkage phys_addr_t __init create_init_idmap(pgd_t *pg_dir, ptdesc_t clrmask)
> +asmlinkage phys_addr_t __init create_init_idmap(pgd_t *pg_dir, ptval_t clrmask)
> {
> phys_addr_t ptep = (phys_addr_t)pg_dir + PAGE_SIZE; /* MMU is off */
> pgprot_t text_prot = PAGE_KERNEL_ROX;
> diff --git a/arch/arm64/kernel/pi/pi.h b/arch/arm64/kernel/pi/pi.h
> index aec3172d4003..5dfd8484d200 100644
> --- a/arch/arm64/kernel/pi/pi.h
> +++ b/arch/arm64/kernel/pi/pi.h
> @@ -35,4 +35,4 @@ void map_range(phys_addr_t *pte, u64 start, u64 end, phys_addr_t pa,
>
> asmlinkage void early_map_kernel(u64 boot_status, phys_addr_t fdt);
>
> -asmlinkage phys_addr_t create_init_idmap(pgd_t *pgd, ptdesc_t clrmask);
> +asmlinkage phys_addr_t create_init_idmap(pgd_t *pgd, ptval_t clrmask);
> diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c
> index 92b2f5097a96..32e0771d6477 100644
> --- a/arch/arm64/mm/mmap.c
> +++ b/arch/arm64/mm/mmap.c
> @@ -34,7 +34,7 @@ static pgprot_t protection_map[16] __ro_after_init = {
> [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_EXEC
> };
>
> -static ptdesc_t gcs_page_prot __ro_after_init = _PAGE_GCS_RO;
> +static ptval_t gcs_page_prot __ro_after_init = _PAGE_GCS_RO;
>
> /*
> * You really shouldn't be using read() or write() on /dev/mem. This might go
> @@ -87,7 +87,7 @@ arch_initcall(adjust_protection_map);
>
> pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
> {
> - ptdesc_t prot;
> + ptval_t prot;
>
> /* Short circuit GCS to avoid bloating the table. */
> if (system_supports_gcs() && (vm_flags & VM_SHADOW_STACK)) {
> diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
> index ce035e1b4eaf..bbe98ac9ad8c 100644
> --- a/arch/arm64/mm/pageattr.c
> +++ b/arch/arm64/mm/pageattr.c
> @@ -21,7 +21,7 @@ struct page_change_data {
> pgprot_t clear_mask;
> };
>
> -static ptdesc_t set_pageattr_masks(ptdesc_t val, struct mm_walk *walk)
> +static ptval_t set_pageattr_masks(ptval_t val, struct mm_walk *walk)
> {
> struct page_change_data *masks = walk->private;
>
> diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c
> index ab9899ca1e5f..1c20144700d7 100644
> --- a/arch/arm64/mm/ptdump.c
> +++ b/arch/arm64/mm/ptdump.c
> @@ -194,7 +194,7 @@ void note_page(struct ptdump_state *pt_st, unsigned long addr, int level,
> struct ptdump_pg_state *st = container_of(pt_st, struct ptdump_pg_state, ptdump);
> struct ptdump_pg_level *pg_level = st->pg_level;
> static const char units[] = "KMGTPE";
> - ptdesc_t prot = 0;
> + ptval_t prot = 0;
>
> /* check if the current level has been folded dynamically */
> if (st->mm && ((level == 1 && mm_p4d_folded(st->mm)) ||
Hello Catalin/Will,
Any update on this patch ? Could this be pulled in for the next merge
window so that all D128 patches can be rebased as required. Thank you.
- Anshuman
More information about the linux-arm-kernel
mailing list