mirror of
https://github.com/torvalds/linux.git
synced 2026-05-29 17:43:52 +02:00
- Add Kunit correctness testing and microbenchmarks for strlen(),
strnlen(), and strrchr()
- Add RISC-V-specific strnlen(), strchr(), strrchr() implementations
- Add hardware error exception handling
- Clean up and optimize our unaligned access probe code
- Enable HAVE_IOREMAP_PROT to be able to use generic_access_phys()
- Remove XIP kernel support
- Warn when addresses outside the vmemmap range are passed to
vmemmap_populate()
- Update the ACPI FADT revision check to warn if it's not at least
ACPI v6.6, which is when key RISC-V-specific tables were added to the
specification
- Increase COMMAND_LINE_SIZE to 2048 to match ARM64, x86, PowerPC, etc.
- Make kaslr_offset() a static inline function, since there's no need
for it to show up in the symbol table
- Add KASLR offset and SATP to the VMCOREINFO ELF notes to improve
kdump support
- Add Makefile cleanup rule for vdso_cfi copied source files, and add
a .gitignore for the build artifacts in that directory
- Remove some redundant ifdefs that check Kconfig macros
- Add missing SPDX license tag to the CFI selftest
- Simplify UTS_MACHINE assignment in the RISC-V Makefile
- Clarify some unclear comments and remove some superfluous comments
- Fix various English typos across the RISC-V codebase
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEElRDoIDdEz9/svf2Kx4+xDQu9KksFAmnqoPQACgkQx4+xDQu9
KksBGw/+K4cZ5+m2hnS8RVZmreDHPkpLuRmIxqPe1JG/cS0KHwWBX+IX9uYdrmqP
Ex+hZyt+pqFAdbEcV0t4445RR8Lz7D4SxzFFk6q36OuWkrFahOnQQm0prdO+CSok
Ch4AqbH0WNbgoU5xGpCbfsBeNeDOJWc+sNKmoMGF1mlZyy7s7m5jwu2vxdpuc7Ut
pkzqA87JR2Pn2C0EitlJv2mYiKLrnl+ma+yRLjLC3mtubs1HjIUoPTtS4iEuZt41
SabT0SWKPhKXvjxnVxqxKGizH77eciIz+fjecFGB2lO07Lc3z2asT8sJ1bnCspMI
e0Thbohs5Z2q2vGg49UqfDCm47BUWkSjhtgOi1E/JcWPahgCGGP4mYLD6AVZ9biK
gQofXZq5XGxLWjKOoNqh5nPIYIWDtgQgQkXkLiCNYcp1CZ0RaCkkER64UKeRuhoS
tSZuLIbjNzqQMhD9tKWnPueQS3tz3CdNvSMWiDgy+2HoKYIxcaDJ5zPPCMVTWEHn
ohoTLG63oRglV2x5ol27FQKip4SUpxXaDtnuPBytsgys88m0TIOkXvWpzU5si5jQ
O3n43ZiHsnA7jRl4MVlFKDwzHFnm8eOMxpThU34oHJku8AyYQS9zTc05KfbjJEsp
p7YDuh8bH7FHyxLQXHFNor4dCDRY7xU67urz3wjaGRopKA4UE4g=
=hG4G
-----END PGP SIGNATURE-----
Merge tag 'riscv-for-linus-7.1-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V updates from Paul Walmsley:
"There is one significant change outside arch/riscv in this pull
request: the addition of a set of KUnit tests for strlen(), strnlen(),
and strrchr().
Otherwise, the most notable changes are to add some RISC-V-specific
string function implementations, to remove XIP kernel support, to add
hardware error exception handling, and to optimize our runtime
unaligned access speed testing.
A few comments on the motivation for removing XIP support. It's been
broken in the RISC-V kernel for months. The code is not easy to
maintain. Furthermore, for XIP support to truly be useful for RISC-V,
we think that compile-time feature switches would need to be added for
many of the RISC-V ISA features and microarchitectural properties that
are currently implemented with runtime patching. No one has stepped
forward to take responsibility for that work, so many of us think it's
best to remove it until clear use cases and champions emerge.
Summary:
- Add Kunit correctness testing and microbenchmarks for strlen(),
strnlen(), and strrchr()
- Add RISC-V-specific strnlen(), strchr(), strrchr() implementations
- Add hardware error exception handling
- Clean up and optimize our unaligned access probe code
- Enable HAVE_IOREMAP_PROT to be able to use generic_access_phys()
- Remove XIP kernel support
- Warn when addresses outside the vmemmap range are passed to
vmemmap_populate()
- Update the ACPI FADT revision check to warn if it's not at least
ACPI v6.6, which is when key RISC-V-specific tables were added to
the specification
- Increase COMMAND_LINE_SIZE to 2048 to match ARM64, x86, PowerPC,
etc.
- Make kaslr_offset() a static inline function, since there's no need
for it to show up in the symbol table
- Add KASLR offset and SATP to the VMCOREINFO ELF notes to improve
kdump support
- Add Makefile cleanup rule for vdso_cfi copied source files, and add
a .gitignore for the build artifacts in that directory
- Remove some redundant ifdefs that check Kconfig macros
- Add missing SPDX license tag to the CFI selftest
- Simplify UTS_MACHINE assignment in the RISC-V Makefile
- Clarify some unclear comments and remove some superfluous comments
- Fix various English typos across the RISC-V codebase"
* tag 'riscv-for-linus-7.1-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (31 commits)
riscv: Remove support for XIP kernel
riscv: Reuse compare_unaligned_access() in check_vector_unaligned_access()
riscv: Split out compare_unaligned_access()
riscv: Reuse measure_cycles() in check_vector_unaligned_access()
riscv: Split out measure_cycles() for reuse
riscv: Clean up & optimize unaligned scalar access probe
riscv: lib: add strrchr() implementation
riscv: lib: add strchr() implementation
riscv: lib: add strnlen() implementation
lib/string_kunit: extend benchmarks to strnlen() and chr searches
lib/string_kunit: add performance benchmark for strlen()
lib/string_kunit: add correctness test for strrchr()
lib/string_kunit: add correctness test for strnlen()
lib/string_kunit: add correctness test for strlen()
riscv: vdso_cfi: Add .gitignore for build artifacts
riscv: vdso_cfi: Add clean rule for copied sources
riscv: enable HAVE_IOREMAP_PROT
riscv: mm: WARN_ON() for bad addresses in vmemmap_populate()
riscv: acpi: update FADT revision check to 6.6
riscv: add hardware error trap handler support
...
187 lines
5.1 KiB
C
187 lines
5.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2009 Chen Liqin <liqin.chen@sunplusct.com>
|
|
* Copyright (C) 2012 Regents of the University of California
|
|
* Copyright (C) 2017 SiFive
|
|
* Copyright (C) 2017 XiaojingZhu <zhuxiaoj@ict.ac.cn>
|
|
*/
|
|
|
|
#ifndef _ASM_RISCV_PAGE_H
|
|
#define _ASM_RISCV_PAGE_H
|
|
|
|
#include <linux/pfn.h>
|
|
#include <linux/const.h>
|
|
|
|
#include <vdso/page.h>
|
|
|
|
#define HPAGE_SHIFT PMD_SHIFT
|
|
#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT)
|
|
#define HPAGE_MASK (~(HPAGE_SIZE - 1))
|
|
#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
|
|
|
|
/*
|
|
* PAGE_OFFSET -- the first address of the first page of memory.
|
|
* When not using MMU this corresponds to the first free page in
|
|
* physical memory (aligned on a page boundary).
|
|
*/
|
|
#ifdef CONFIG_MMU
|
|
#ifdef CONFIG_64BIT
|
|
#define PAGE_OFFSET_L5 _AC(0xff60000000000000, UL)
|
|
#define PAGE_OFFSET_L4 _AC(0xffffaf8000000000, UL)
|
|
#define PAGE_OFFSET_L3 _AC(0xffffffd600000000, UL)
|
|
#define PAGE_OFFSET kernel_map.page_offset
|
|
#else
|
|
#define PAGE_OFFSET _AC(0xc0000000, UL)
|
|
#endif /* CONFIG_64BIT */
|
|
#else
|
|
#define PAGE_OFFSET ((unsigned long)phys_ram_base)
|
|
#endif /* CONFIG_MMU */
|
|
|
|
#ifndef __ASSEMBLER__
|
|
|
|
#ifdef CONFIG_RISCV_ISA_ZICBOZ
|
|
void clear_page(void *page);
|
|
#else
|
|
#define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE)
|
|
#endif
|
|
#define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
|
|
|
|
#define copy_user_page(vto, vfrom, vaddr, topg) copy_page(vto, vfrom)
|
|
|
|
/*
|
|
* Use struct definitions to apply C type checking
|
|
*/
|
|
|
|
/* Page Global Directory entry */
|
|
typedef struct {
|
|
unsigned long pgd;
|
|
} pgd_t;
|
|
|
|
/* Page Table entry */
|
|
typedef struct {
|
|
unsigned long pte;
|
|
} pte_t;
|
|
|
|
typedef struct {
|
|
unsigned long pgprot;
|
|
} pgprot_t;
|
|
|
|
typedef struct page *pgtable_t;
|
|
|
|
#define pte_val(x) ((x).pte)
|
|
#define pgd_val(x) ((x).pgd)
|
|
#define pgprot_val(x) ((x).pgprot)
|
|
|
|
#define __pte(x) ((pte_t) { (x) })
|
|
#define __pgd(x) ((pgd_t) { (x) })
|
|
#define __pgprot(x) ((pgprot_t) { (x) })
|
|
|
|
#ifdef CONFIG_64BIT
|
|
#define PTE_FMT "%016lx"
|
|
#else
|
|
#define PTE_FMT "%08lx"
|
|
#endif
|
|
|
|
#if defined(CONFIG_64BIT) && defined(CONFIG_MMU)
|
|
/*
|
|
* We override this value as its generic definition uses __pa too early in
|
|
* the boot process (before kernel_map.va_pa_offset is set).
|
|
*/
|
|
#define MIN_MEMBLOCK_ADDR 0
|
|
#endif
|
|
|
|
#define ARCH_PFN_OFFSET (PFN_DOWN((unsigned long)phys_ram_base))
|
|
|
|
struct kernel_mapping {
|
|
unsigned long virt_addr;
|
|
unsigned long virt_offset;
|
|
uintptr_t phys_addr;
|
|
uintptr_t size;
|
|
/* Offset between linear mapping virtual address and kernel load address */
|
|
unsigned long va_pa_offset;
|
|
/* Offset between kernel mapping virtual address and kernel load address */
|
|
unsigned long page_offset;
|
|
unsigned long va_kernel_pa_offset;
|
|
};
|
|
|
|
extern struct kernel_mapping kernel_map;
|
|
extern phys_addr_t phys_ram_base;
|
|
extern unsigned long vmemmap_start_pfn;
|
|
|
|
#define is_kernel_mapping(x) \
|
|
((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))
|
|
|
|
#define is_linear_mapping(x) \
|
|
((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < PAGE_OFFSET + KERN_VIRT_SIZE))
|
|
|
|
#ifndef CONFIG_DEBUG_VIRTUAL
|
|
#define linear_mapping_pa_to_va(x) ((void *)((unsigned long)(x) + kernel_map.va_pa_offset))
|
|
#else
|
|
void *linear_mapping_pa_to_va(unsigned long x);
|
|
#endif
|
|
|
|
#define kernel_mapping_pa_to_va(y) ((void *)((unsigned long)(y) + kernel_map.va_kernel_pa_offset))
|
|
|
|
#define __pa_to_va_nodebug(x) linear_mapping_pa_to_va(x)
|
|
|
|
#ifndef CONFIG_DEBUG_VIRTUAL
|
|
#define linear_mapping_va_to_pa(x) ((unsigned long)(x) - kernel_map.va_pa_offset)
|
|
#else
|
|
phys_addr_t linear_mapping_va_to_pa(unsigned long x);
|
|
#endif
|
|
|
|
#define kernel_mapping_va_to_pa(y) ((unsigned long)(y) - kernel_map.va_kernel_pa_offset)
|
|
|
|
#define __va_to_pa_nodebug(x) ({ \
|
|
unsigned long _x = x; \
|
|
is_linear_mapping(_x) ? \
|
|
linear_mapping_va_to_pa(_x) : kernel_mapping_va_to_pa(_x); \
|
|
})
|
|
|
|
#ifdef CONFIG_DEBUG_VIRTUAL
|
|
extern phys_addr_t __virt_to_phys(unsigned long x);
|
|
extern phys_addr_t __phys_addr_symbol(unsigned long x);
|
|
#else
|
|
#define __virt_to_phys(x) __va_to_pa_nodebug(x)
|
|
#define __phys_addr_symbol(x) __va_to_pa_nodebug(x)
|
|
#endif /* CONFIG_DEBUG_VIRTUAL */
|
|
|
|
#define __pa_symbol(x) __phys_addr_symbol(RELOC_HIDE((unsigned long)(x), 0))
|
|
#define __pa(x) __virt_to_phys((unsigned long)(x))
|
|
#define __va(x) ((void *)__pa_to_va_nodebug((phys_addr_t)(x)))
|
|
|
|
#define phys_to_pfn(phys) (PFN_DOWN(phys))
|
|
#define pfn_to_phys(pfn) (PFN_PHYS(pfn))
|
|
|
|
#define virt_to_pfn(vaddr) (phys_to_pfn(__pa(vaddr)))
|
|
#define pfn_to_virt(pfn) (__va(pfn_to_phys(pfn)))
|
|
|
|
#define virt_to_page(vaddr) (pfn_to_page(virt_to_pfn(vaddr)))
|
|
#define page_to_virt(page) (pfn_to_virt(page_to_pfn(page)))
|
|
|
|
#define sym_to_pfn(x) __phys_to_pfn(__pa_symbol(x))
|
|
|
|
static inline unsigned long kaslr_offset(void)
|
|
{
|
|
return kernel_map.virt_offset;
|
|
}
|
|
|
|
static __always_inline void *pfn_to_kaddr(unsigned long pfn)
|
|
{
|
|
return __va(pfn << PAGE_SHIFT);
|
|
}
|
|
|
|
#endif /* __ASSEMBLER__ */
|
|
|
|
#define virt_addr_valid(vaddr) ({ \
|
|
unsigned long _addr = (unsigned long)vaddr; \
|
|
(unsigned long)(_addr) >= PAGE_OFFSET && pfn_valid(virt_to_pfn(_addr)); \
|
|
})
|
|
|
|
#define VMA_DATA_DEFAULT_FLAGS VMA_DATA_FLAGS_NON_EXEC
|
|
|
|
#include <asm-generic/memory_model.h>
|
|
#include <asm-generic/getorder.h>
|
|
|
|
#endif /* _ASM_RISCV_PAGE_H */
|