Commit ba4259a6 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge branch 'for-next/misc' into for-next/core 

* for-next/misc:
  : Miscellaneous patches
  arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
  kasan: arm64: set TCR_EL1.TBID1 when enabled
  arm64: mte: optimize asynchronous tag check fault flag check
  arm64/mm: add fallback option to allocate virtually contiguous memory
  arm64/smp: Drop the macro S(x,s)
  arm64: consistently use reserved_pg_dir
  arm64: kprobes: Remove redundant kprobe_step_ctx

# Conflicts:
#	arch/arm64/kernel/vmlinux.lds.S
parents e0f7a8d5 344f2db2

arch/arm64/include/asm/asm-uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
	.macro	__uaccess_ttbr0_disable, tmp1

	mrs	\tmp1, ttbr1_el1			// swapper_pg_dir

	bic	\tmp1, \tmp1, #TTBR_ASID_MASK

	sub	\tmp1, \tmp1, #RESERVED_TTBR0_SIZE	// reserved_ttbr0 just before swapper_pg_dir

	sub	\tmp1, \tmp1, #PAGE_SIZE		// reserved_pg_dir just before swapper_pg_dir

	msr	ttbr0_el1, \tmp1			// set reserved TTBR0_EL1

	isb

	add	\tmp1, \tmp1, #RESERVED_TTBR0_SIZE

	add	\tmp1, \tmp1, #PAGE_SIZE

	msr	ttbr1_el1, \tmp1		// set reserved ASID

	isb

	.endm

arch/arm64/include/asm/kernel-pgtable.h

+0 −6
Original line number Diff line number Diff line
@@ -89,12 +89,6 @@ 
#define INIT_DIR_SIZE (PAGE_SIZE * EARLY_PAGES(KIMAGE_VADDR, _end))

#define IDMAP_DIR_SIZE		(IDMAP_PGTABLE_LEVELS * PAGE_SIZE)



#ifdef CONFIG_ARM64_SW_TTBR0_PAN

#define RESERVED_TTBR0_SIZE	(PAGE_SIZE)

#else

#define RESERVED_TTBR0_SIZE	(0)

#endif



/* Initial memory map size */

#if ARM64_SWAPPER_USES_SECTION_MAPS

#define SWAPPER_BLOCK_SHIFT	SECTION_SHIFT

arch/arm64/include/asm/kprobes.h

+0 −7
Original line number Diff line number Diff line
@@ -28,18 +28,11 @@ struct prev_kprobe { 
	unsigned int status;

};



/* Single step context for kprobe */

struct kprobe_step_ctx {

	unsigned long ss_pending;

	unsigned long match_addr;

};



/* per-cpu kprobe control block */

struct kprobe_ctlblk {

	unsigned int kprobe_status;

	unsigned long saved_irqflag;

	struct prev_kprobe prev_kprobe;

	struct kprobe_step_ctx ss_ctx;

};



void arch_remove_kprobe(struct kprobe *);

arch/arm64/include/asm/mmu_context.h

+3 −3
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ static inline void contextidr_thread_switch(struct task_struct *next) 
}



/*

 * Set TTBR0 to empty_zero_page. No translations will be possible via TTBR0.

 * Set TTBR0 to reserved_pg_dir. No translations will be possible via TTBR0.

 */

static inline void cpu_set_reserved_ttbr0(void)

{

	unsigned long ttbr = phys_to_ttbr(__pa_symbol(empty_zero_page));

	unsigned long ttbr = phys_to_ttbr(__pa_symbol(reserved_pg_dir));



	write_sysreg(ttbr, ttbr0_el1);

	isb();
@@ -195,7 +195,7 @@ static inline void update_saved_ttbr0(struct task_struct *tsk, 
		return;



	if (mm == &init_mm)

		ttbr = __pa_symbol(empty_zero_page);

		ttbr = __pa_symbol(reserved_pg_dir);

	else

		ttbr = virt_to_phys(mm->pgd) | ASID(mm) << 48;

arch/arm64/include/asm/pgtable-hwdef.h

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ 
#define TCR_TBI1		(UL(1) << 38)

#define TCR_HA			(UL(1) << 39)

#define TCR_HD			(UL(1) << 40)

#define TCR_TBID1		(UL(1) << 52)

#define TCR_NFD0		(UL(1) << 53)

#define TCR_NFD1		(UL(1) << 54)

#define TCR_E0PD0		(UL(1) << 55)