The kpkeys_hardened_pgtables feature aims to protect all page table pages (PTPs) by mapping them with a privileged pkey. This is primarily handled by kpkeys_pgtable_alloc(), called from pagetable_alloc(). However, this does not cover PTPs allocated early, before the buddy allocator is available. These PTPs are allocated by architecture code, either 1. from static pools or 2. using the memblock allocator, and should also be protected.
This patch addresses the second category: PTPs allocated via memblock. Such PTPs are notably used to create the linear map. Protecting them as soon as they are allocated would require modifying the linear map while it is being created, which seems at best difficult. Instead, a simple allocator is introduced, refilling a cache with memblock and keeping track of all allocated ranges to set their pkey once it is safe to do so. PTPs allocated at that stage are not freed, so there is no need to manage a free list. The refill size/alignment is the same as for the pkeys block allocator. For systems that use large block mappings, the same rationale applies (reducing fragmentation of the linear map). This is also used for other systems, as this reduces the number of calls to memblock, without much downside. The number of PTPs required to create the linear map is proportional to the amount of available memory, which means it may be large. At that stage the memblock allocator may however only track a limited number of regions, and we size our own tracking array (full_ranges) accordingly. The array may be quite large as a result (16KB on arm64), but it is discarded once boot has completed (__initdata). Signed-off-by: Kevin Brodsky <[email protected]> --- The full_ranges array will end up mostly empty on most systems, but relying on INIT_MEMBLOCK_MEMORY_REGIONS seemed to be the only way to guarantee that we can track all ranges regardless of the size and layout of physical memory. An alternative would be to rebuild the ranges by walking the kernel page tables in init_late(), but that's arguably at least as complex (requiring stop_machine()). --- include/linux/kpkeys.h | 7 ++ mm/kpkeys_hardened_pgtables.c | 165 ++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) diff --git a/include/linux/kpkeys.h b/include/linux/kpkeys.h index 8cfeb6e5af56..73b456ecec65 100644 --- a/include/linux/kpkeys.h +++ b/include/linux/kpkeys.h @@ -139,6 +139,8 @@ void kpkeys_hardened_pgtables_init(void); */ void kpkeys_hardened_pgtables_init_late(void); +phys_addr_t kpkeys_physmem_pgtable_alloc(void); + #else /* CONFIG_KPKEYS_HARDENED_PGTABLES */ static inline bool kpkeys_hardened_pgtables_enabled(void) @@ -167,6 +169,11 @@ static inline void kpkeys_hardened_pgtables_init(void) {} static inline void kpkeys_hardened_pgtables_init_late(void) {} +static inline phys_addr_t kpkeys_physmem_pgtable_alloc(void) +{ + return 0; +} + #endif /* CONFIG_KPKEYS_HARDENED_PGTABLES */ #endif /* _LINUX_KPKEYS_H */ diff --git a/mm/kpkeys_hardened_pgtables.c b/mm/kpkeys_hardened_pgtables.c index dcc5e6da7c85..1b649812f474 100644 --- a/mm/kpkeys_hardened_pgtables.c +++ b/mm/kpkeys_hardened_pgtables.c @@ -3,6 +3,7 @@ #include <linux/list.h> #include <linux/highmem.h> #include <linux/kpkeys.h> +#include <linux/memblock.h> #include <linux/memcontrol.h> #include <linux/mm.h> #include <linux/mutex.h> @@ -41,6 +42,9 @@ static bool pba_ready_for_direct_map_split(void); static void pba_init(void); static void pba_init_late(void); +/* pkeys physmem allocator (PPA) - implemented below */ +static void ppa_finalize(void); + /* Trivial allocator in case the linear map is PTE-mapped (no block mapping) */ static struct page *noblock_pgtable_alloc(gfp_t gfp) { @@ -113,8 +117,14 @@ void __init kpkeys_hardened_pgtables_init_late(void) if (!arch_kpkeys_enabled()) return; + /* + * Called first to avoid relying on pba_early_region for splitting + * the linear map in the subsequent calls. + */ if (pba_enabled()) pba_init_late(); + + ppa_finalize(); } /* @@ -751,3 +761,158 @@ static int __init pba_init_shrinker(void) return 0; } late_initcall(pba_init_shrinker); + +/* + * pkeys physmem allocator (PPA): block-based allocator for very early page + * tables (especially for creating the linear map), based on memblock. Blocks + * are tracked so that their pkey can be set once it is safe to do so. + */ + +/* + * We may have to track many ranges when allocating page tables for the linear + * map, as their number grows with the amount of available memory. Assuming that + * memblock returns contiguous blocks whenever possible, the number of ranges + * to track cannot however exceed the number of regions that memblock itself + * tracks. memblock_allow_resize() hasn't been called yet at that point, so + * that limit is the size of the statically allocated array. + */ +#define PHYSMEM_MAX_RANGES INIT_MEMBLOCK_MEMORY_REGIONS + +/* + * We allocate ranges with the same size and alignment as the maximum refill + * size for the regular block allocator, with the same rationale (minimising + * spliting and optimising TLB usage). + */ +#define PHYSMEM_REFILL_SIZE (PAGE_SIZE << refill_orders[0]) + +struct physmem_range { + phys_addr_t addr; + phys_addr_t size; +}; + +struct pkeys_physmem_allocator { + struct physmem_range free_range; + + struct physmem_range full_ranges[PHYSMEM_MAX_RANGES]; + unsigned int nr_full_ranges; +}; + +static struct pkeys_physmem_allocator pkeys_physmem_allocator __initdata; + +static int __init set_pkey_pgtable_phys(phys_addr_t pa, phys_addr_t size) +{ + unsigned long addr = (unsigned long)__va(pa); + int ret; + + ret = set_memory_pkey(addr, size / PAGE_SIZE, KPKEYS_PKEY_PGTABLES); + pr_debug("%s: addr=%pa, size=%pa\n", __func__, &addr, &size); + + WARN_ON(ret); + return ret; +} + +static bool __init ppa_try_extend_last_range(phys_addr_t addr, phys_addr_t size) +{ + struct pkeys_physmem_allocator *ppa = &pkeys_physmem_allocator; + struct physmem_range *range; + + if (!ppa->nr_full_ranges) + return false; + + range = &ppa->full_ranges[ppa->nr_full_ranges - 1]; + + /* Merge the new range into the last range if they are contiguous */ + if (addr == range->addr + range->size) { + range->size += size; + return true; + } else if (addr + size == range->addr) { + range->addr -= size; + range->size += size; + return true; + } + + return false; +} + +static void __init ppa_register_full_range(phys_addr_t addr) +{ + struct pkeys_physmem_allocator *ppa = &pkeys_physmem_allocator; + struct physmem_range *range; + + if (!addr) + return; + + if (ppa_try_extend_last_range(addr, PHYSMEM_REFILL_SIZE)) + return; + + /* Could not extend the last range, create a new one */ + if (WARN_ON(ppa->nr_full_ranges >= PHYSMEM_MAX_RANGES)) + return; + + range = &ppa->full_ranges[ppa->nr_full_ranges++]; + range->addr = addr; + range->size = PHYSMEM_REFILL_SIZE; +} + +static void __init ppa_refill(void) +{ + struct pkeys_physmem_allocator *ppa = &pkeys_physmem_allocator; + phys_addr_t size = PHYSMEM_REFILL_SIZE; + phys_addr_t addr; + + /* + * There should be plenty of contiguous physical memory available so + * early during boot so there should be no need for fallback sizes. + */ + addr = memblock_phys_alloc_range(size, size, 0, + MEMBLOCK_ALLOC_NOLEAKTRACE); + WARN_ON(!addr); + + pr_debug("%s: addr=%pa\n", __func__, &addr); + + ppa->free_range.addr = addr; + ppa->free_range.size = (addr ? size : 0); +} + +static void __init ppa_finalize(void) +{ + struct pkeys_physmem_allocator *ppa = &pkeys_physmem_allocator; + + if (ppa->free_range.addr) { + struct physmem_range *free_range = &ppa->free_range; + + /* Protect the range that was allocated, and free the rest */ + set_pkey_pgtable_phys(free_range->addr + free_range->size, + PHYSMEM_REFILL_SIZE - free_range->size); + + if (free_range->size) + memblock_free_late(free_range->addr, free_range->size); + + free_range->addr = 0; + free_range->size = 0; + } + + for (unsigned int i = 0; i < ppa->nr_full_ranges; i++) { + struct physmem_range *range = &ppa->full_ranges[i]; + + set_pkey_pgtable_phys(range->addr, range->size); + } +} + +phys_addr_t __init kpkeys_physmem_pgtable_alloc(void) +{ + struct pkeys_physmem_allocator *ppa = &pkeys_physmem_allocator; + + if (!ppa->free_range.size) { + ppa_register_full_range(ppa->free_range.addr); + ppa_refill(); + } + + if (!ppa->free_range.addr) + /* Refilling failed - allocate untracked memory */ + return memblock_phys_alloc_range(PAGE_SIZE, PAGE_SIZE, 0, + MEMBLOCK_ALLOC_NOLEAKTRACE); + + ppa->free_range.size -= PAGE_SIZE; + return ppa->free_range.addr + ppa->free_range.size; +} -- 2.51.2
