Commit 032c7ed9 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 more arm64 updates from Will Deacon:
 "A small selection of further arm64 fixes and updates. Most of these
  are fixes that came in during the merge window, with the exception of
  the HAVE_MOVE_PMD mremap() speed-up which we discussed back in 2018
  and somehow forgot to enable upstream.

   - Improve performance of Spectre-v2 mitigation on Falkor CPUs (if
     you're lucky enough to have one)

   - Select HAVE_MOVE_PMD. This has been shown to improve mremap()
     performance, which is used heavily by the Android runtime GC, and
     it seems we forgot to enable this upstream back in 2018.

   - Ensure linker flags are consistent between LLVM and BFD

   - Fix stale comment in Spectre mitigation rework

   - Fix broken copyright header

   - Fix KASLR randomisation of the linear map

   - Prevent arm64-specific prctl()s from compat tasks (return -EINVAL)"

Link: https://lore.kernel.org/kvmarm/20181108181201.88826-3-joelaf@google.com/

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: proton-pack: Update comment to reflect new function name
  arm64: spectre-v2: Favour CPU-specific mitigation at EL2
  arm64: link with -z norelro regardless of CONFIG_RELOCATABLE
  arm64: Fix a broken copyright header in gen_vdso_offsets.sh
  arm64: mremap speedup - Enable HAVE_MOVE_PMD
  arm64: mm: use single quantity to represent the PA to VA translation
  arm64: reject prctl(PR_PAC_RESET_KEYS) on compat tasks
parents f9893351 66dd3474

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ config ARM64 
	select GENERIC_VDSO_TIME_NS

	select HANDLE_DOMAIN_IRQ

	select HARDIRQS_SW_RESEND

	select HAVE_MOVE_PMD

	select HAVE_PCI

	select HAVE_ACPI_APEI if (ACPI && EFI)

	select HAVE_ALIGNED_STRUCT_PAGE if SLUB

arch/arm64/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
#

# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=--no-undefined -X

LDFLAGS_vmlinux	:=--no-undefined -X -z norelro



ifeq ($(CONFIG_RELOCATABLE), y)

# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour

# for relative relocs, since this leads to better Image compression

# with the relocation offsets always being zero.

LDFLAGS_vmlinux		+= -shared -Bsymbolic -z notext -z norelro \

LDFLAGS_vmlinux		+= -shared -Bsymbolic -z notext \

			$(call ld-option, --no-apply-dynamic-relocs)

endif

arch/arm64/include/asm/memory.h

+2 −3
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ 
extern u64			vabits_actual;

#define PAGE_END		(_PAGE_END(vabits_actual))



extern s64			physvirt_offset;

extern s64			memstart_addr;

/* PHYS_OFFSET - the physical address of the start of memory. */

#define PHYS_OFFSET		({ VM_BUG_ON(memstart_addr & 1); memstart_addr; })
@@ -245,7 +244,7 @@ static inline const void *__tag_set(const void *addr, u8 tag) 
 */

#define __is_lm_address(addr)	(!(((u64)addr) & BIT(vabits_actual - 1)))



#define __lm_to_phys(addr)	(((addr) + physvirt_offset))

#define __lm_to_phys(addr)	(((addr) & ~PAGE_OFFSET) + PHYS_OFFSET)

#define __kimg_to_phys(addr)	((addr) - kimage_voffset)



#define __virt_to_phys_nodebug(x) ({					\
@@ -263,7 +262,7 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x); 
#define __phys_addr_symbol(x)	__pa_symbol_nodebug(x)

#endif /* CONFIG_DEBUG_VIRTUAL */



#define __phys_to_virt(x)	((unsigned long)((x) - physvirt_offset))

#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET) | PAGE_OFFSET)

#define __phys_to_kimg(x)	((unsigned long)((x) + kimage_voffset))



/*

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#define VMALLOC_START		(MODULES_END)

#define VMALLOC_END		(- PUD_SIZE - VMEMMAP_SIZE - SZ_64K)



#define vmemmap			((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT))



#define FIRST_USER_ADDRESS	0UL



#ifndef __ASSEMBLY__
@@ -34,8 +36,6 @@ 
#include <linux/mm_types.h>

#include <linux/sched.h>



extern struct page *vmemmap;



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE

arch/arm64/kernel/fpsimd.c

+2 −2
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ int sve_set_current_vl(unsigned long arg) 
	vl = arg & PR_SVE_VL_LEN_MASK;

	flags = arg & ~vl;



	if (!system_supports_sve())

	if (!system_supports_sve() || is_compat_task())

		return -EINVAL;



	ret = sve_set_vector_length(current, vl, flags);
@@ -691,7 +691,7 @@ int sve_set_current_vl(unsigned long arg) 
/* PR_SVE_GET_VL */

int sve_get_current_vl(void)

{

	if (!system_supports_sve())

	if (!system_supports_sve() || is_compat_task())

		return -EINVAL;



	return sve_prctl_status(0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE