Commit 0ca2ce81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 updates from Catalin Marinas:

 - Expose tag address bits in siginfo. The original arm64 ABI did not
   expose any of the bits 63:56 of a tagged address in siginfo. In the
   presence of user ASAN or MTE, this information may be useful. The
   implementation is generic to other architectures supporting tags
   (like SPARC ADI, subject to wiring up the arch code). The user will
   have to opt in via sigaction(SA_EXPOSE_TAGBITS) so that the extra
   bits, if available, become visible in si_addr.

 - Default to 32-bit wide ZONE_DMA. Previously, ZONE_DMA was set to the
   lowest 1GB to cope with the Raspberry Pi 4 limitations, to the
   detriment of other platforms. With these changes, the kernel scans
   the Device Tree dma-ranges and the ACPI IORT information before
   deciding on a smaller ZONE_DMA.

 - Strengthen READ_ONCE() to acquire when CONFIG_LTO=y. When building
   with LTO, there is an increased risk of the compiler converting an
   address dependency headed by a READ_ONCE() invocation into a control
   dependency and consequently allowing for harmful reordering by the
   CPU.

 - Add CPPC FFH support using arm64 AMU counters.

 - set_fs() removal on arm64. This renders the User Access Override
   (UAO) ARMv8 feature unnecessary.

 - Perf updates: PMU driver for the ARM DMC-620 memory controller, sysfs
   identifier file for SMMUv3, stop event counters support for i.MX8MP,
   enable the perf events-based hard lockup detector.

 - Reorganise the kernel VA space slightly so that 52-bit VA
   configurations can use more virtual address space.

 - Improve the robustness of the arm64 memory offline event notifier.

 - Pad the Image header to 64K following the EFI header definition
   updated recently to increase the section alignment to 64K.

 - Support CONFIG_CMDLINE_EXTEND on arm64.

 - Do not use tagged PC in the kernel (TCR_EL1.TBID1==1), freeing up 8
   bits for PtrAuth.

 - Switch to vmapped shadow call stacks.

 - Miscellaneous clean-ups.

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (78 commits)
  perf/imx_ddr: Add system PMU identifier for userspace
  bindings: perf: imx-ddr: add compatible string
  arm64: Fix build failure when HARDLOCKUP_DETECTOR_PERF is enabled
  arm64: mte: fix prctl(PR_GET_TAGGED_ADDR_CTRL) if TCF0=NONE
  arm64: mark __system_matches_cap as __maybe_unused
  arm64: uaccess: remove vestigal UAO support
  arm64: uaccess: remove redundant PAN toggling
  arm64: uaccess: remove addr_limit_user_check()
  arm64: uaccess: remove set_fs()
  arm64: uaccess cleanup macro naming
  arm64: uaccess: split user/kernel routines
  arm64: uaccess: refactor __{get,put}_user
  arm64: uaccess: simplify __copy_user_flushcache()
  arm64: uaccess: rename privileged uaccess routines
  arm64: sdei: explicitly simulate PAN/UAO entry
  arm64: sdei: move uaccess logic to arch/arm64/
  arm64: head.S: always initialize PSTATE
  arm64: head.S: cleanup SCTLR_ELx initialization
  arm64: head.S: rename el2_setup -> init_kernel_el
  arm64: add C wrappers for SET_PSTATE_*()
  ...
parents 58659247 d8897975

Documentation/arm64/kasan-offsets.sh

+1 −2
Original line number Diff line number Diff line 
#!/bin/sh



# Print out the KASAN_SHADOW_OFFSETS required to place the KASAN SHADOW

# start address at the mid-point of the kernel VA space

# start address at the top of the linear region



print_kasan_offset () {

	printf "%02d\t" $1

	printf "0x%08x00000000\n" $(( (0xffffffff & (-1 << ($1 - 1 - 32))) \

			+ (1 << ($1 - 32 - $2)) \

			- (1 << (64 - 32 - $2)) ))

}

Documentation/arm64/memory.rst

+21 −24
Original line number Diff line number Diff line
@@ -32,17 +32,16 @@ AArch64 Linux memory layout with 4KB pages + 4 levels (48-bit):: 
  -----------------------------------------------------------------------

  0000000000000000	0000ffffffffffff	 256TB		user

  ffff000000000000	ffff7fffffffffff	 128TB		kernel logical memory map

  ffff800000000000	ffff9fffffffffff	  32TB		kasan shadow region

  ffffa00000000000	ffffa00007ffffff	 128MB		bpf jit region

  ffffa00008000000	ffffa0000fffffff	 128MB		modules

  ffffa00010000000	fffffdffbffeffff	 ~93TB		vmalloc

  fffffdffbfff0000	fffffdfffe5f8fff	~998MB		[guard region]

  fffffdfffe5f9000	fffffdfffe9fffff	4124KB		fixed mappings

  fffffdfffea00000	fffffdfffebfffff	   2MB		[guard region]

  fffffdfffec00000	fffffdffffbfffff	  16MB		PCI I/O space

  fffffdffffc00000	fffffdffffdfffff	   2MB		[guard region]

  fffffdffffe00000	ffffffffffdfffff	   2TB		vmemmap

  ffffffffffe00000	ffffffffffffffff	   2MB		[guard region]

 [ffff600000000000	ffff7fffffffffff]	  32TB		[kasan shadow region]

  ffff800000000000	ffff800007ffffff	 128MB		bpf jit region

  ffff800008000000	ffff80000fffffff	 128MB		modules

  ffff800010000000	fffffbffefffffff	 124TB		vmalloc

  fffffbfff0000000	fffffbfffdffffff	 224MB		fixed mappings (top down)

  fffffbfffe000000	fffffbfffe7fffff	   8MB		[guard region]

  fffffbfffe800000	fffffbffff7fffff	  16MB		PCI I/O space

  fffffbffff800000	fffffbffffffffff	   8MB		[guard region]

  fffffc0000000000	fffffdffffffffff	   2TB		vmemmap

  fffffe0000000000	ffffffffffffffff	   2TB		[guard region]





AArch64 Linux memory layout with 64KB pages + 3 levels (52-bit with HW support)::
@@ -50,19 +49,17 @@ AArch64 Linux memory layout with 64KB pages + 3 levels (52-bit with HW support): 
  Start			End			Size		Use

  -----------------------------------------------------------------------

  0000000000000000	000fffffffffffff	   4PB		user

  fff0000000000000	fff7ffffffffffff	   2PB		kernel logical memory map

  fff8000000000000	fffd9fffffffffff	1440TB		[gap]

  fffda00000000000	ffff9fffffffffff	 512TB		kasan shadow region

  ffffa00000000000	ffffa00007ffffff	 128MB		bpf jit region

  ffffa00008000000	ffffa0000fffffff	 128MB		modules

  ffffa00010000000	fffff81ffffeffff	 ~88TB		vmalloc

  fffff81fffff0000	fffffc1ffe58ffff	  ~3TB		[guard region]

  fffffc1ffe590000	fffffc1ffe9fffff	4544KB		fixed mappings

  fffffc1ffea00000	fffffc1ffebfffff	   2MB		[guard region]

  fffffc1ffec00000	fffffc1fffbfffff	  16MB		PCI I/O space

  fffffc1fffc00000	fffffc1fffdfffff	   2MB		[guard region]

  fffffc1fffe00000	ffffffffffdfffff	3968GB		vmemmap

  ffffffffffe00000	ffffffffffffffff	   2MB		[guard region]

  fff0000000000000	ffff7fffffffffff	  ~4PB		kernel logical memory map

 [fffd800000000000	ffff7fffffffffff]	 512TB		[kasan shadow region]

  ffff800000000000	ffff800007ffffff	 128MB		bpf jit region

  ffff800008000000	ffff80000fffffff	 128MB		modules

  ffff800010000000	fffffbffefffffff	 124TB		vmalloc

  fffffbfff0000000	fffffbfffdffffff	 224MB		fixed mappings (top down)

  fffffbfffe000000	fffffbfffe7fffff	   8MB		[guard region]

  fffffbfffe800000	fffffbffff7fffff	  16MB		PCI I/O space

  fffffbffff800000	fffffbffffffffff	   8MB		[guard region]

  fffffc0000000000	ffffffdfffffffff	  ~4TB		vmemmap

  ffffffe000000000	ffffffffffffffff	 128GB		[guard region]





Translation table lookup with 4KB pages::

Documentation/arm64/tagged-pointers.rst

+19 −6
Original line number Diff line number Diff line
@@ -53,12 +53,25 @@ visibility. 
Preserving tags

---------------



Non-zero tags are not preserved when delivering signals. This means that

signal handlers in applications making use of tags cannot rely on the

tag information for user virtual addresses being maintained for fields

inside siginfo_t. One exception to this rule is for signals raised in

response to watchpoint debug exceptions, where the tag information will

be preserved.

When delivering signals, non-zero tags are not preserved in

siginfo.si_addr unless the flag SA_EXPOSE_TAGBITS was set in

sigaction.sa_flags when the signal handler was installed. This means

that signal handlers in applications making use of tags cannot rely

on the tag information for user virtual addresses being maintained

in these fields unless the flag was set.



Due to architecture limitations, bits 63:60 of the fault address

are not preserved in response to synchronous tag check faults

(SEGV_MTESERR) even if SA_EXPOSE_TAGBITS was set. Applications should

treat the values of these bits as undefined in order to accommodate

future architecture revisions which may preserve the bits.



For signals raised in response to watchpoint debug exceptions, the

tag information will be preserved regardless of the SA_EXPOSE_TAGBITS

flag setting.



Non-zero tags are never preserved in sigcontext.fault_address

regardless of the SA_EXPOSE_TAGBITS flag setting.



The architecture prevents the use of a tagged PC, so the upper byte will

be set to a sign-extension of bit 55 on exception return.

Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ properties: 
      - enum:

          - fsl,imx8-ddr-pmu

          - fsl,imx8m-ddr-pmu

          - fsl,imx8mq-ddr-pmu

          - fsl,imx8mm-ddr-pmu

          - fsl,imx8mn-ddr-pmu

          - fsl,imx8mp-ddr-pmu

      - items:

          - enum:

arch/alpha/include/uapi/asm/signal.h

+0 −14
Original line number Diff line number Diff line
@@ -60,20 +60,6 @@ typedef unsigned long sigset_t; 
#define SIGRTMIN	32

#define SIGRTMAX	_NSIG



/*

 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * SA_RESTART flag to get restarting signals (which were the default long ago)

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.

 * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.

 * SA_NODEFER prevents the current signal from being masked in the handler.

 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 */



#define SA_ONSTACK	0x00000001

#define SA_RESTART	0x00000002

#define SA_NOCLDSTOP	0x00000004