mirror of
https://github.com/torvalds/linux
synced 2024-10-08 12:22:38 +00:00
ca15ca406f
Patch series "mm: cleanup usage of <asm/pgalloc.h>"
Most architectures have very similar versions of pXd_alloc_one() and
pXd_free_one() for intermediate levels of page table. These patches add
generic versions of these functions in <asm-generic/pgalloc.h> and enable
use of the generic functions where appropriate.
In addition, functions declared and defined in <asm/pgalloc.h> headers are
used mostly by core mm and early mm initialization in arch and there is no
actual reason to have the <asm/pgalloc.h> included all over the place.
The first patch in this series removes unneeded includes of
<asm/pgalloc.h>
In the end it didn't work out as neatly as I hoped and moving
pXd_alloc_track() definitions to <asm-generic/pgalloc.h> would require
unnecessary changes to arches that have custom page table allocations, so
I've decided to move lib/ioremap.c to mm/ and make pgalloc-track.h local
to mm/.
This patch (of 8):
In most cases <asm/pgalloc.h> header is required only for allocations of
page table memory. Most of the .c files that include that header do not
use symbols declared in <asm/pgalloc.h> and do not require that header.
As for the other header files that used to include <asm/pgalloc.h>, it is
possible to move that include into the .c file that actually uses symbols
from <asm/pgalloc.h> and drop the include from the header file.
The process was somewhat automated using
sed -i -E '/[<"]asm\/pgalloc\.h/d' \
$(grep -L -w -f /tmp/xx \
$(git grep -E -l '[<"]asm/pgalloc\.h'))
where /tmp/xx contains all the symbols defined in
arch/*/include/asm/pgalloc.h.
[rppt@linux.ibm.com: fix powerpc warning]
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> [m68k]
Cc: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Matthew Wilcox <willy@infradead.org>
Link: http://lkml.kernel.org/r/20200627143453.31835-1-rppt@kernel.org
Link: http://lkml.kernel.org/r/20200627143453.31835-2-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
74 lines
1.8 KiB
C
74 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#define DISABLE_BRANCH_PROFILING
|
|
|
|
#include <linux/kasan.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/hugetlb.h>
|
|
|
|
static int __init
|
|
kasan_init_shadow_8M(unsigned long k_start, unsigned long k_end, void *block)
|
|
{
|
|
pmd_t *pmd = pmd_off_k(k_start);
|
|
unsigned long k_cur, k_next;
|
|
|
|
for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd += 2, block += SZ_8M) {
|
|
pte_basic_t *new;
|
|
|
|
k_next = pgd_addr_end(k_cur, k_end);
|
|
k_next = pgd_addr_end(k_next, k_end);
|
|
if ((void *)pmd_page_vaddr(*pmd) != kasan_early_shadow_pte)
|
|
continue;
|
|
|
|
new = memblock_alloc(sizeof(pte_basic_t), SZ_4K);
|
|
if (!new)
|
|
return -ENOMEM;
|
|
|
|
*new = pte_val(pte_mkhuge(pfn_pte(PHYS_PFN(__pa(block)), PAGE_KERNEL)));
|
|
|
|
hugepd_populate_kernel((hugepd_t *)pmd, (pte_t *)new, PAGE_SHIFT_8M);
|
|
hugepd_populate_kernel((hugepd_t *)pmd + 1, (pte_t *)new, PAGE_SHIFT_8M);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int __init kasan_init_region(void *start, size_t size)
|
|
{
|
|
unsigned long k_start = (unsigned long)kasan_mem_to_shadow(start);
|
|
unsigned long k_end = (unsigned long)kasan_mem_to_shadow(start + size);
|
|
unsigned long k_cur;
|
|
int ret;
|
|
void *block;
|
|
|
|
block = memblock_alloc(k_end - k_start, SZ_8M);
|
|
if (!block)
|
|
return -ENOMEM;
|
|
|
|
if (IS_ALIGNED(k_start, SZ_8M)) {
|
|
kasan_init_shadow_8M(k_start, ALIGN_DOWN(k_end, SZ_8M), block);
|
|
k_cur = ALIGN_DOWN(k_end, SZ_8M);
|
|
if (k_cur == k_end)
|
|
goto finish;
|
|
} else {
|
|
k_cur = k_start;
|
|
}
|
|
|
|
ret = kasan_init_shadow_page_tables(k_start, k_end);
|
|
if (ret)
|
|
return ret;
|
|
|
|
for (; k_cur < k_end; k_cur += PAGE_SIZE) {
|
|
pmd_t *pmd = pmd_off_k(k_cur);
|
|
void *va = block + k_cur - k_start;
|
|
pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL);
|
|
|
|
if (k_cur < ALIGN_DOWN(k_end, SZ_512K))
|
|
pte = pte_mkhuge(pte);
|
|
|
|
__set_pte_at(&init_mm, k_cur, pte_offset_kernel(pmd, k_cur), pte, 0);
|
|
}
|
|
finish:
|
|
flush_tlb_kernel_range(k_start, k_end);
|
|
return 0;
|
|
}
|