Commit 89fa0be0 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:

 - Fix double-evaluation of 'pte' macro argument when using 52-bit PAs

 - Fix signedness of some MTE prctl PR_* constants

 - Fix kmemleak memory usage by skipping early pgtable allocations

 - Fix printing of CPU feature register strings

 - Remove redundant -nostdlib linker flag for vDSO binaries

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions
  arm64: Track no early_pgtable_alloc() for kmemleak
  arm64: mte: change PR_MTE_TCF_NONE back into an unsigned long
  arm64: vdso: remove -nostdlib compiler flag
  arm64: arm64_ftr_reg->name may not be a human-readable string
parents 3f55f177 c7c386fb

arch/arm/mm/kasan_init.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ pmd_t tmp_pmd_table[PTRS_PER_PMD] __page_aligned_bss; 
static __init void *kasan_alloc_block(size_t size)

{

	return memblock_alloc_try_nid(size, size, __pa(MAX_DMA_ADDRESS),

				      MEMBLOCK_ALLOC_KASAN, NUMA_NO_NODE);

				      MEMBLOCK_ALLOC_NOLEAKTRACE, NUMA_NO_NODE);

}



static void __init kasan_pte_populate(pmd_t *pmdp, unsigned long addr,

arch/arm64/include/asm/pgtable.h

+9 −3
Original line number Diff line number Diff line
@@ -67,9 +67,15 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
 * page table entry, taking care of 52-bit addresses.

 */

#ifdef CONFIG_ARM64_PA_BITS_52

#define __pte_to_phys(pte)	\

	((pte_val(pte) & PTE_ADDR_LOW) | ((pte_val(pte) & PTE_ADDR_HIGH) << 36))

#define __phys_to_pte_val(phys)	(((phys) | ((phys) >> 36)) & PTE_ADDR_MASK)

static inline phys_addr_t __pte_to_phys(pte_t pte)

{

	return (pte_val(pte) & PTE_ADDR_LOW) |

		((pte_val(pte) & PTE_ADDR_HIGH) << 36);

}

static inline pteval_t __phys_to_pte_val(phys_addr_t phys)

{

	return (phys | (phys >> 36)) & PTE_ADDR_MASK;

}

#else

#define __pte_to_phys(pte)	(pte_val(pte) & PTE_ADDR_MASK)

#define __phys_to_pte_val(phys)	(phys)

arch/arm64/kernel/cpufeature.c

+7 −3
Original line number Diff line number Diff line
@@ -573,15 +573,19 @@ static const struct arm64_ftr_bits ftr_raz[] = { 
	ARM64_FTR_END,

};



#define ARM64_FTR_REG_OVERRIDE(id, table, ovr) {		\

#define __ARM64_FTR_REG_OVERRIDE(id_str, id, table, ovr) {	\

		.sys_id = id,					\

		.reg = 	&(struct arm64_ftr_reg){		\

			.name = #id,				\

			.name = id_str,				\

			.override = (ovr),			\

			.ftr_bits = &((table)[0]),		\

	}}



#define ARM64_FTR_REG(id, table) ARM64_FTR_REG_OVERRIDE(id, table, &no_override)

#define ARM64_FTR_REG_OVERRIDE(id, table, ovr)	\

	__ARM64_FTR_REG_OVERRIDE(#id, id, table, ovr)



#define ARM64_FTR_REG(id, table)		\

	__ARM64_FTR_REG_OVERRIDE(#id, id, table, &no_override)



struct arm64_ftr_override __ro_after_init id_aa64mmfr1_override;

struct arm64_ftr_override __ro_after_init id_aa64pfr1_override;

arch/arm64/kernel/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ btildflags-$(CONFIG_ARM64_BTI_KERNEL) += -z force-bti 
# potential future proofing if we end up with internal calls to the exported

# routines, as x86 does (see 6f121e548f83 ("x86, vdso: Reimplement vdso.so

# preparation in build-time C")).

ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 --hash-style=sysv	\

ldflags-y := -shared -soname=linux-vdso.so.1 --hash-style=sysv	\

	     -Bsymbolic --build-id=sha1 -n $(btildflags-y) -T



ccflags-y := -fno-common -fno-builtin -fno-stack-protector -ffixed-x18

arch/arm64/kernel/vdso32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ VDSO_AFLAGS += -D__ASSEMBLY__ 
# From arm vDSO Makefile

VDSO_LDFLAGS += -Bsymbolic --no-undefined -soname=linux-vdso.so.1

VDSO_LDFLAGS += -z max-page-size=4096 -z common-page-size=4096

VDSO_LDFLAGS += -nostdlib -shared --hash-style=sysv --build-id=sha1

VDSO_LDFLAGS += -shared --hash-style=sysv --build-id=sha1





# Borrow vdsomunge.c from the arm vDSO