mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
939b7cbc00
* Support for the memtest= kernel command-line argument. * Support for building the kernel with FORTIFY_SOURCE. * Support for generic clockevent broadcasts. * Support for the buildtar build target. * Some build system cleanups to pass more LLVM-friendly arguments. * Support for kprobes. * A rearranged kernel memory map, the first part of supporting sv48 systems. * Improvements to kexec, along with support for kdump and crash kernels. * An alternatives-based errata framework, along with support for handling a pair of errata that manifest on some SiFive designs (including the HiFive Unmatched). * Support for XIP. * A device tree for the Microchip PolarFire ICICLE SoC and associated dev board. Along with a bunch of cleanups. There are already a handful of fixes on the list so there will likely be a part 2. -----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEEKzw3R0RoQ7JKlDp6LhMZ81+7GIkFAmCS4lITHHBhbG1lckBk YWJiZWx0LmNvbQAKCRAuExnzX7sYieZqEACSihfcOgZ/oyGWN3chca917/yCWimM DOu37Zlh81TNPgzzJwbT44IY5sg/lSecwktxs665TChiJjr3JlM4jmz+u64KOTA8 mTWhqZNr5zT9kFj/m3x0V9yYOVr9g43QRmIlc14d+8JaQDw0N8WeH/yK85/CXDSS X5gQK/e9q/yPf/NPyPuPm67jDsFnJERINWaAHI8lhA5fvFyy/xRLmSkuexchysss XOGfyxxX590jGLK1vD+5wccX7ZwfwU4jriTaxyah/VBl8QUur/xSPVyspHIdWiMG jrNXI1dg6oI861BdjryUpZI0iYJaRe5FRWUx7uTIqHfIyL/MnvYI7USVYOOPb72M yZgN903R++5NeUUVTzfXwaigTwfXAPB6USFqZpEfRAf204pgNybmznJWThAVBdYG rUixp7GsEMU3aAT2tE/iHR33JQxQfnZq8Tg43/4gB7MoACrzQrYrGcPnj9xssMyV F1hnao3dr+5Xjo3MwfkW9JvLPwvDuE3mdrdj+a0XZ45gbTJeuBhYxo3VOsFeijhQ gf/VYuoNn5iae9fiMzx5rlmFT9NJDYKDhla+BpAel84/6nRryyfCZCaE5FvDynOO CNQynaeJMIMEygPBYR9FVVCwm+EtVsz3NVFKEuo5ilQpgX8ipctxiqy2+moZALLN OWlEH6BKEgXqkw== =PsA8 -----END PGP SIGNATURE----- Merge tag 'riscv-for-linus-5.13-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux Pull RISC-V updates from Palmer Dabbelt: - Support for the memtest= kernel command-line argument. - Support for building the kernel with FORTIFY_SOURCE. - Support for generic clockevent broadcasts. - Support for the buildtar build target. - Some build system cleanups to pass more LLVM-friendly arguments. - Support for kprobes. - A rearranged kernel memory map, the first part of supporting sv48 systems. - Improvements to kexec, along with support for kdump and crash kernels. - An alternatives-based errata framework, along with support for handling a pair of errata that manifest on some SiFive designs (including the HiFive Unmatched). - Support for XIP. - A device tree for the Microchip PolarFire ICICLE SoC and associated dev board. ... along with a bunch of cleanups. There are already a handful of fixes on the list so there will likely be a part 2. * tag 'riscv-for-linus-5.13-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (45 commits) RISC-V: Always define XIP_FIXUP riscv: Remove 32b kernel mapping from page table dump riscv: Fix 32b kernel build with CONFIG_DEBUG_VIRTUAL=y RISC-V: Fix error code returned by riscv_hartid_to_cpuid() RISC-V: Enable Microchip PolarFire ICICLE SoC RISC-V: Initial DTS for Microchip ICICLE board dt-bindings: riscv: microchip: Add YAML documentation for the PolarFire SoC RISC-V: Add Microchip PolarFire SoC kconfig option RISC-V: enable XIP RISC-V: Add crash kernel support RISC-V: Add kdump support RISC-V: Improve init_resources() RISC-V: Add kexec support RISC-V: Add EM_RISCV to kexec UAPI header riscv: vdso: fix and clean-up Makefile riscv/mm: Use BUG_ON instead of if condition followed by BUG. riscv/kprobe: fix kernel panic when invoking sys_read traced by kprobe riscv: Set ARCH_HAS_STRICT_MODULE_RWX if MMU riscv: module: Create module allocations without exec permissions riscv: bpf: Avoid breaking W^X ...
215 lines
6.0 KiB
C
215 lines
6.0 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
// Copyright (C) 2019 Andes Technology Corporation
|
|
|
|
#include <linux/pfn.h>
|
|
#include <linux/init_task.h>
|
|
#include <linux/kasan.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/pgtable.h>
|
|
#include <asm/tlbflush.h>
|
|
#include <asm/fixmap.h>
|
|
#include <asm/pgalloc.h>
|
|
|
|
extern pgd_t early_pg_dir[PTRS_PER_PGD];
|
|
asmlinkage void __init kasan_early_init(void)
|
|
{
|
|
uintptr_t i;
|
|
pgd_t *pgd = early_pg_dir + pgd_index(KASAN_SHADOW_START);
|
|
|
|
for (i = 0; i < PTRS_PER_PTE; ++i)
|
|
set_pte(kasan_early_shadow_pte + i,
|
|
mk_pte(virt_to_page(kasan_early_shadow_page),
|
|
PAGE_KERNEL));
|
|
|
|
for (i = 0; i < PTRS_PER_PMD; ++i)
|
|
set_pmd(kasan_early_shadow_pmd + i,
|
|
pfn_pmd(PFN_DOWN
|
|
(__pa((uintptr_t) kasan_early_shadow_pte)),
|
|
__pgprot(_PAGE_TABLE)));
|
|
|
|
for (i = KASAN_SHADOW_START; i < KASAN_SHADOW_END;
|
|
i += PGDIR_SIZE, ++pgd)
|
|
set_pgd(pgd,
|
|
pfn_pgd(PFN_DOWN
|
|
(__pa(((uintptr_t) kasan_early_shadow_pmd))),
|
|
__pgprot(_PAGE_TABLE)));
|
|
|
|
/* init for swapper_pg_dir */
|
|
pgd = pgd_offset_k(KASAN_SHADOW_START);
|
|
|
|
for (i = KASAN_SHADOW_START; i < KASAN_SHADOW_END;
|
|
i += PGDIR_SIZE, ++pgd)
|
|
set_pgd(pgd,
|
|
pfn_pgd(PFN_DOWN
|
|
(__pa(((uintptr_t) kasan_early_shadow_pmd))),
|
|
__pgprot(_PAGE_TABLE)));
|
|
|
|
local_flush_tlb_all();
|
|
}
|
|
|
|
static void __init kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long end)
|
|
{
|
|
phys_addr_t phys_addr;
|
|
pte_t *ptep, *base_pte;
|
|
|
|
if (pmd_none(*pmd))
|
|
base_pte = memblock_alloc(PTRS_PER_PTE * sizeof(pte_t), PAGE_SIZE);
|
|
else
|
|
base_pte = (pte_t *)pmd_page_vaddr(*pmd);
|
|
|
|
ptep = base_pte + pte_index(vaddr);
|
|
|
|
do {
|
|
if (pte_none(*ptep)) {
|
|
phys_addr = memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);
|
|
set_pte(ptep, pfn_pte(PFN_DOWN(phys_addr), PAGE_KERNEL));
|
|
}
|
|
} while (ptep++, vaddr += PAGE_SIZE, vaddr != end);
|
|
|
|
set_pmd(pmd, pfn_pmd(PFN_DOWN(__pa(base_pte)), PAGE_TABLE));
|
|
}
|
|
|
|
static void __init kasan_populate_pmd(pgd_t *pgd, unsigned long vaddr, unsigned long end)
|
|
{
|
|
phys_addr_t phys_addr;
|
|
pmd_t *pmdp, *base_pmd;
|
|
unsigned long next;
|
|
|
|
base_pmd = (pmd_t *)pgd_page_vaddr(*pgd);
|
|
if (base_pmd == lm_alias(kasan_early_shadow_pmd))
|
|
base_pmd = memblock_alloc(PTRS_PER_PMD * sizeof(pmd_t), PAGE_SIZE);
|
|
|
|
pmdp = base_pmd + pmd_index(vaddr);
|
|
|
|
do {
|
|
next = pmd_addr_end(vaddr, end);
|
|
|
|
if (pmd_none(*pmdp) && IS_ALIGNED(vaddr, PMD_SIZE) && (next - vaddr) >= PMD_SIZE) {
|
|
phys_addr = memblock_phys_alloc(PMD_SIZE, PMD_SIZE);
|
|
if (phys_addr) {
|
|
set_pmd(pmdp, pfn_pmd(PFN_DOWN(phys_addr), PAGE_KERNEL));
|
|
continue;
|
|
}
|
|
}
|
|
|
|
kasan_populate_pte(pmdp, vaddr, next);
|
|
} while (pmdp++, vaddr = next, vaddr != end);
|
|
|
|
/*
|
|
* Wait for the whole PGD to be populated before setting the PGD in
|
|
* the page table, otherwise, if we did set the PGD before populating
|
|
* it entirely, memblock could allocate a page at a physical address
|
|
* where KASAN is not populated yet and then we'd get a page fault.
|
|
*/
|
|
set_pgd(pgd, pfn_pgd(PFN_DOWN(__pa(base_pmd)), PAGE_TABLE));
|
|
}
|
|
|
|
static void __init kasan_populate_pgd(unsigned long vaddr, unsigned long end)
|
|
{
|
|
phys_addr_t phys_addr;
|
|
pgd_t *pgdp = pgd_offset_k(vaddr);
|
|
unsigned long next;
|
|
|
|
do {
|
|
next = pgd_addr_end(vaddr, end);
|
|
|
|
/*
|
|
* pgdp can't be none since kasan_early_init initialized all KASAN
|
|
* shadow region with kasan_early_shadow_pmd: if this is stillthe case,
|
|
* that means we can try to allocate a hugepage as a replacement.
|
|
*/
|
|
if (pgd_page_vaddr(*pgdp) == (unsigned long)lm_alias(kasan_early_shadow_pmd) &&
|
|
IS_ALIGNED(vaddr, PGDIR_SIZE) && (next - vaddr) >= PGDIR_SIZE) {
|
|
phys_addr = memblock_phys_alloc(PGDIR_SIZE, PGDIR_SIZE);
|
|
if (phys_addr) {
|
|
set_pgd(pgdp, pfn_pgd(PFN_DOWN(phys_addr), PAGE_KERNEL));
|
|
continue;
|
|
}
|
|
}
|
|
|
|
kasan_populate_pmd(pgdp, vaddr, next);
|
|
} while (pgdp++, vaddr = next, vaddr != end);
|
|
}
|
|
|
|
static void __init kasan_populate(void *start, void *end)
|
|
{
|
|
unsigned long vaddr = (unsigned long)start & PAGE_MASK;
|
|
unsigned long vend = PAGE_ALIGN((unsigned long)end);
|
|
|
|
kasan_populate_pgd(vaddr, vend);
|
|
|
|
local_flush_tlb_all();
|
|
memset(start, KASAN_SHADOW_INIT, end - start);
|
|
}
|
|
|
|
static void __init kasan_shallow_populate_pgd(unsigned long vaddr, unsigned long end)
|
|
{
|
|
unsigned long next;
|
|
void *p;
|
|
pgd_t *pgd_k = pgd_offset_k(vaddr);
|
|
|
|
do {
|
|
next = pgd_addr_end(vaddr, end);
|
|
if (pgd_page_vaddr(*pgd_k) == (unsigned long)lm_alias(kasan_early_shadow_pmd)) {
|
|
p = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
|
|
set_pgd(pgd_k, pfn_pgd(PFN_DOWN(__pa(p)), PAGE_TABLE));
|
|
}
|
|
} while (pgd_k++, vaddr = next, vaddr != end);
|
|
}
|
|
|
|
static void __init kasan_shallow_populate(void *start, void *end)
|
|
{
|
|
unsigned long vaddr = (unsigned long)start & PAGE_MASK;
|
|
unsigned long vend = PAGE_ALIGN((unsigned long)end);
|
|
|
|
kasan_shallow_populate_pgd(vaddr, vend);
|
|
local_flush_tlb_all();
|
|
}
|
|
|
|
void __init kasan_init(void)
|
|
{
|
|
phys_addr_t _start, _end;
|
|
u64 i;
|
|
|
|
/*
|
|
* Populate all kernel virtual address space with kasan_early_shadow_page
|
|
* except for the linear mapping and the modules/kernel/BPF mapping.
|
|
*/
|
|
kasan_populate_early_shadow((void *)KASAN_SHADOW_START,
|
|
(void *)kasan_mem_to_shadow((void *)
|
|
VMEMMAP_END));
|
|
if (IS_ENABLED(CONFIG_KASAN_VMALLOC))
|
|
kasan_shallow_populate(
|
|
(void *)kasan_mem_to_shadow((void *)VMALLOC_START),
|
|
(void *)kasan_mem_to_shadow((void *)VMALLOC_END));
|
|
else
|
|
kasan_populate_early_shadow(
|
|
(void *)kasan_mem_to_shadow((void *)VMALLOC_START),
|
|
(void *)kasan_mem_to_shadow((void *)VMALLOC_END));
|
|
|
|
/* Populate the linear mapping */
|
|
for_each_mem_range(i, &_start, &_end) {
|
|
void *start = (void *)__va(_start);
|
|
void *end = (void *)__va(_end);
|
|
|
|
if (start >= end)
|
|
break;
|
|
|
|
kasan_populate(kasan_mem_to_shadow(start), kasan_mem_to_shadow(end));
|
|
}
|
|
|
|
/* Populate kernel, BPF, modules mapping */
|
|
kasan_populate(kasan_mem_to_shadow((const void *)MODULES_VADDR),
|
|
kasan_mem_to_shadow((const void *)BPF_JIT_REGION_END));
|
|
|
|
for (i = 0; i < PTRS_PER_PTE; i++)
|
|
set_pte(&kasan_early_shadow_pte[i],
|
|
mk_pte(virt_to_page(kasan_early_shadow_page),
|
|
__pgprot(_PAGE_PRESENT | _PAGE_READ |
|
|
_PAGE_ACCESSED)));
|
|
|
|
memset(kasan_early_shadow_page, KASAN_SHADOW_INIT, PAGE_SIZE);
|
|
init_task.kasan_depth = 0;
|
|
}
|