Commit d29e4723 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 fixes from Will Deacon:
 "The main thing here is reviving hugetlb support using contiguous ptes,
  which we ended up reverting at the last minute in 4.5 pending a fix
  which went into the core mm/ code during the recent merge window.

   - Revert a previous revert and get hugetlb going with contiguous hints
   - Wire up missing compat syscalls
   - Enable CONFIG_SET_MODULE_RONX by default
   - Add missing line to our compat /proc/cpuinfo output
   - Clarify levels in our page table dumps
   - Fix booting with RANDOMIZE_TEXT_OFFSET enabled
   - Misc fixes to the ARM CPU PMU driver (refcounting, probe failure)
   - Remove some dead code and update a comment"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix alignment when RANDOMIZE_TEXT_OFFSET is enabled
  arm64: move {PAGE,CONT}_SHIFT into Kconfig
  arm64: mm: dump: log span level
  arm64: update stale PAGE_OFFSET comment
  drivers/perf: arm_pmu: Avoid leaking pmu->irq_affinity on error
  drivers/perf: arm_pmu: Defer the setting of __oprofile_cpu_pmu
  drivers/perf: arm_pmu: Fix reference count of a device_node in of_pmu_irq_cfg
  arm64: report CPU number in bad_mode
  arm64: unistd32.h: wire up missing syscalls for compat tasks
  arm64: Provide "model name" in /proc/cpuinfo for PER_LINUX32 tasks
  arm64: enable CONFIG_SET_MODULE_RONX by default
  arm64: Remove orphaned __addr_ok() definition
  Revert "arm64: hugetlb: partial revert of 66b3923a"
parents 5306d766 aed7eb83

arch/arm64/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -113,6 +113,18 @@ config ARCH_PHYS_ADDR_T_64BIT 
config MMU

	def_bool y



config ARM64_PAGE_SHIFT

	int

	default 16 if ARM64_64K_PAGES

	default 14 if ARM64_16K_PAGES

	default 12



config ARM64_CONT_SHIFT

	int

	default 5 if ARM64_64K_PAGES

	default 7 if ARM64_16K_PAGES

	default 4



config ARCH_MMAP_RND_BITS_MIN

       default 14 if ARM64_64K_PAGES

       default 16 if ARM64_16K_PAGES

arch/arm64/Kconfig.debug

+13 −12
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ config ARM64_PTDUMP 
	  who are working in architecture specific areas of the kernel.

	  It is probably not a good idea to enable this feature in a production

	  kernel.

	  If in doubt, say "N"



	  If in doubt, say N.



config PID_IN_CONTEXTIDR

	bool "Write the current PID to the CONTEXTIDR register"
@@ -40,13 +41,13 @@ config ARM64_RANDOMIZE_TEXT_OFFSET 
config DEBUG_SET_MODULE_RONX

	bool "Set loadable kernel module data as NX and text as RO"

	depends on MODULES

	default y

	help

          This option helps catch unintended modifications to loadable

          kernel module's text and read-only data. It also prevents execution

          of module data. Such protection may interfere with run-time code

          patching and dynamic kernel tracing - and they might also protect

          against certain classes of kernel exploits.

          If in doubt, say "N".

	  Is this is set, kernel module text and rodata will be made read-only.

	  This is to help catch accidental or malicious attempts to change the

	  kernel's executable code.



	  If in doubt, say Y.



config DEBUG_RODATA

	bool "Make kernel text and rodata read-only"
@@ -56,7 +57,7 @@ config DEBUG_RODATA 
	  is to help catch accidental or malicious attempts to change the

	  kernel's executable code.



	  If in doubt, say Y

	  If in doubt, say Y.



config DEBUG_ALIGN_RODATA

	depends on DEBUG_RODATA
@@ -69,7 +70,7 @@ config DEBUG_ALIGN_RODATA 
	  alignment and potentially wasted space. Turn on this option if

	  performance is more important than memory pressure.



	  If in doubt, say N

	  If in doubt, say N.



source "drivers/hwtracing/coresight/Kconfig"

arch/arm64/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ head-y := arch/arm64/kernel/head.o 


# The byte offset of the kernel image in RAM from the start of RAM.

ifeq ($(CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET), y)

TEXT_OFFSET := $(shell awk 'BEGIN {srand(); printf "0x%03x000\n", int(512 * rand())}')

TEXT_OFFSET := $(shell awk "BEGIN {srand(); printf \"0x%06x\n\", \

		 int(2 * 1024 * 1024 / (2 ^ $(CONFIG_ARM64_PAGE_SHIFT)) * \

		 rand()) * (2 ^ $(CONFIG_ARM64_PAGE_SHIFT))}")

else

TEXT_OFFSET := 0x00080000

endif

arch/arm64/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -160,14 +160,14 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))

#endif



#ifdef CONFIG_COMPAT



#ifdef __AARCH64EB__

#define COMPAT_ELF_PLATFORM		("v8b")

#else

#define COMPAT_ELF_PLATFORM		("v8l")

#endif



#ifdef CONFIG_COMPAT



#define COMPAT_ELF_ET_DYN_BASE		(2 * TASK_SIZE_32 / 3)



/* AArch32 registers. */

arch/arm64/include/asm/memory.h

+2 −1
Original line number Diff line number Diff line
@@ -55,8 +55,9 @@ 
#define VMEMMAP_SIZE (UL(1) << (VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT))



/*

 * PAGE_OFFSET - the virtual address of the start of the kernel image (top

 * PAGE_OFFSET - the virtual address of the start of the linear map (top

 *		 (VA_BITS - 1))

 * KIMAGE_VADDR - the virtual address of the start of the kernel image

 * VA_BITS - the maximum number of bits for virtual addresses.

 * VA_START - the first kernel virtual address.

 * TASK_SIZE - the maximum size of a user space task.

CRA Git | Maintained and supported by SUSTech CRA and CCSE