History

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 updates from Will Deacon: "There's a reasonable amount here and the juicy details are all below. It's worth noting that the MTE/KASAN changes strayed outside of our usual directories due to core mm changes and some associated changes to some other architectures; Andrew asked for us to carry these [1] rather that take them via the -mm tree. Summary: - Optimise SVE switching for CPUs with 128-bit implementations. - Fix output format from SVE selftest. - Add support for versions v1.2 and 1.3 of the SMC calling convention. - Allow Pointer Authentication to be configured independently for kernel and userspace. - PMU driver cleanups for managing IRQ affinity and exposing event attributes via sysfs. - KASAN optimisations for both hardware tagging (MTE) and out-of-line software tagging implementations. - Relax frame record alignment requirements to facilitate 8-byte alignment with KASAN and Clang. - Cleanup of page-table definitions and removal of unused memory types. - Reduction of ARCH_DMA_MINALIGN back to 64 bytes. - Refactoring of our instruction decoding routines and addition of some missing encodings. - Move entry code moved into C and hardened against harmful compiler instrumentation. - Update booting requirements for the FEAT_HCX feature, added to v8.7 of the architecture. - Fix resume from idle when pNMI is being used. - Additional CPU sanity checks for MTE and preparatory changes for systems where not all of the CPUs support 32-bit EL0. - Update our kernel string routines to the latest Cortex Strings implementation. - Big cleanup of our cache maintenance routines, which were confusingly named and inconsistent in their implementations. - Tweak linker flags so that GDB can understand vmlinux when using RELR relocations. - Boot path cleanups to enable early initialisation of per-cpu operations needed by KCSAN. - Non-critical fixes and miscellaneous cleanup" * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (150 commits) arm64: tlb: fix the TTL value of tlb_get_level arm64: Restrict undef hook for cpufeature registers arm64/mm: Rename ARM64_SWAPPER_USES_SECTION_MAPS arm64: insn: avoid circular include dependency arm64: smp: Bump debugging information print down to KERN_DEBUG drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() perf/arm-cmn: Fix invalid pointer when access dtc object sharing the same IRQ number arm64: suspend: Use cpuidle context helpers in cpu_suspend() PSCI: Use cpuidle context helpers in psci_cpu_suspend_enter() arm64: Convert cpu_do_idle() to using cpuidle context helpers arm64: Add cpuidle context save/restore helpers arm64: head: fix code comments in set_cpu_boot_mode_flag arm64: mm: drop unused __pa(__idmap_text_start) arm64: mm: fix the count comments in compute_indices arm64/mm: Fix ttbr0 values stored in struct thread_info for software-pan arm64: mm: Pass original fault address to handle_mm_fault() arm64/mm: Drop SECTION_[SHIFT|SIZE|MASK] arm64/mm: Use CONT_PMD_SHIFT for ARM64_MEMSTART_SHIFT arm64/mm: Drop SWAPPER_INIT_MAP_SIZE arm64: Conditionally configure PTR_AUTH key of the kernel. ...

Linus Torvalds committed 5 years ago

Commit 9840cfc2 parents 17cfb9d 3d1bf78158 files · +3370 −2563Browse files

Showing the changes to scripts (2 of 158 files). Show all

Unified · Split

2 files
  1. scripts/Makefile.kasan +1 −0
  2. scripts/tools-support-relr.sh +2 −1
scripts/Makefile.kasan+1−0
@@ -50,6 +50,7 @@ endif · 49 unmodified lines
50CFLAGS_KASAN := -fsanitize=kernel-hwaddress \50CFLAGS_KASAN := -fsanitize=kernel-hwaddress \
51 $(call cc-param,hwasan-instrument-stack=$(stack_enable)) \51 $(call cc-param,hwasan-instrument-stack=$(stack_enable)) \
52 $(call cc-param,hwasan-use-short-granules=0) \52 $(call cc-param,hwasan-use-short-granules=0) \
53 $(call cc-param,hwasan-inline-all-checks=0) \
53 $(instrumentation_flags)54 $(instrumentation_flags)
54 55
55endif # CONFIG_KASAN_SW_TAGS56endif # CONFIG_KASAN_SW_TAGS
scripts/tools-support-relr.sh+2−1
@@ -7,7 +7,8 @@ trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT · 6 unmodified lines
7cat << "END" | $CC -c -x c - -o $tmp_file.o >/dev/null 2>&17cat << "END" | $CC -c -x c - -o $tmp_file.o >/dev/null 2>&1
8void *p = &p;8void *p = &p;
9END9END
10$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file10$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr \
11 --use-android-relr-tags -o $tmp_file
11 12
12# Despite printing an error message, GNU nm still exits with exit code 0 if it13# Despite printing an error message, GNU nm still exits with exit code 0 if it
13# sees a relr section. So we need to check that nothing is printed to stderr.14# sees a relr section. So we need to check that nothing is printed to stderr.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t