Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d92da1fb 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 Catalin Marinas:
 "Mostly fixes apart from the kprobe blacklist checking which was
  deferred because of conflicting with a fix merged after I pinned the
  arm64 for-next/core branch (f2b3d856 "arm64: kprobe: Always
  blacklist the KVM world-switch code").

  Summary:

   - Update the kprobe blacklist checking for arm64. This was supposed
     to be queued during the merging window but, due to conflicts, it
     was deferred post -rc1

   - Extend the Fujitsu erratum 010001 workaround to A64FX v1r0

   - Whitelist HiSilicon Taishan v110 CPUs as not susceptible to
     Meltdown

   - Export save_stack_trace_regs()

   - Remove obsolete selection of MULTI_IRQ_HANDLER"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: remove obsolete selection of MULTI_IRQ_HANDLER
  arm64: kpti: Whitelist HiSilicon Taishan v110 CPUs
  arm64: Add MIDR encoding for HiSilicon Taishan CPUs
  arm64/stacktrace: Export save_stack_trace_regs()
  arm64: apply workaround on A64FX v1r0
  arm64: kprobes: Use arch_populate_kprobe_blacklist()
  arm64: kprobes: Move exception_text check in blacklist
  arm64: kprobes: Remove unneeded RODATA check
  arm64: kprobes: Move extable address check into arch_prepare_kprobe()
parents fb549c55 e5a5af77

arch/arm64/Kconfig

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

	select IRQ_FORCED_THREADING

	select MODULES_USE_ELF_RELA

	select MULTI_IRQ_HANDLER

	select NEED_DMA_MAP_STATE

	select NEED_SG_DMA_LENGTH

	select OF

arch/arm64/include/asm/cputype.h

+5 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#define ARM_CPU_IMP_QCOM		0x51

#define ARM_CPU_IMP_NVIDIA		0x4E

#define ARM_CPU_IMP_FUJITSU		0x46

#define ARM_CPU_IMP_HISI		0x48



#define ARM_CPU_PART_AEM_V8		0xD0F

#define ARM_CPU_PART_FOUNDATION		0xD00
@@ -107,6 +108,8 @@ 


#define FUJITSU_CPU_PART_A64FX		0x001



#define HISI_CPU_PART_TSV110		0xD01



#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)

#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)

#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
@@ -126,10 +129,11 @@ 
#define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER)

#define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)

#define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX)

#define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110)



/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */

#define MIDR_FUJITSU_ERRATUM_010001		MIDR_FUJITSU_A64FX

#define MIDR_FUJITSU_ERRATUM_010001_MASK	(~MIDR_VARIANT(1))

#define MIDR_FUJITSU_ERRATUM_010001_MASK	(~MIDR_CPU_VAR_REV(1, 0))

#define TCR_CLEAR_FUJITSU_ERRATUM_010001	(TCR_NFD1 | TCR_NFD0)



#ifndef __ASSEMBLY__

arch/arm64/kernel/cpufeature.c

+1 −0
Original line number Diff line number Diff line
@@ -963,6 +963,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, 
		MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),

		MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),

		{ /* sentinel */ }

	};

	char const *str = "command line option";

arch/arm64/kernel/probes/kprobes.c

+31 −25
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs) 
int __kprobes arch_prepare_kprobe(struct kprobe *p)

{

	unsigned long probe_addr = (unsigned long)p->addr;

	extern char __start_rodata[];

	extern char __end_rodata[];



	if (probe_addr & 0x3)

		return -EINVAL;
@@ -100,10 +98,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	/* copy instruction */

	p->opcode = le32_to_cpu(*p->addr);



	if (in_exception_text(probe_addr))

		return -EINVAL;

	if (probe_addr >= (unsigned long) __start_rodata &&

	    probe_addr <= (unsigned long) __end_rodata)

	if (search_exception_tables(probe_addr))

		return -EINVAL;



	/* decode instruction */
@@ -476,26 +471,37 @@ kprobe_breakpoint_handler(struct pt_regs *regs, unsigned int esr) 
	return DBG_HOOK_HANDLED;

}



bool arch_within_kprobe_blacklist(unsigned long addr)

/*

 * Provide a blacklist of symbols identifying ranges which cannot be kprobed.

 * This blacklist is exposed to userspace via debugfs (kprobes/blacklist).

 */

int __init arch_populate_kprobe_blacklist(void)

{

	if ((addr >= (unsigned long)__kprobes_text_start &&

	    addr < (unsigned long)__kprobes_text_end) ||

	    (addr >= (unsigned long)__entry_text_start &&

	    addr < (unsigned long)__entry_text_end) ||

	    (addr >= (unsigned long)__idmap_text_start &&

	    addr < (unsigned long)__idmap_text_end) ||

	    (addr >= (unsigned long)__hyp_text_start &&

	    addr < (unsigned long)__hyp_text_end) ||

	    !!search_exception_tables(addr))

		return true;



	if (!is_kernel_in_hyp_mode()) {

		if ((addr >= (unsigned long)__hyp_idmap_text_start &&

		    addr < (unsigned long)__hyp_idmap_text_end))

			return true;

	}



	return false;

	int ret;



	ret = kprobe_add_area_blacklist((unsigned long)__entry_text_start,

					(unsigned long)__entry_text_end);

	if (ret)

		return ret;

	ret = kprobe_add_area_blacklist((unsigned long)__irqentry_text_start,

					(unsigned long)__irqentry_text_end);

	if (ret)

		return ret;

	ret = kprobe_add_area_blacklist((unsigned long)__exception_text_start,

					(unsigned long)__exception_text_end);

	if (ret)

		return ret;

	ret = kprobe_add_area_blacklist((unsigned long)__idmap_text_start,

					(unsigned long)__idmap_text_end);

	if (ret)

		return ret;

	ret = kprobe_add_area_blacklist((unsigned long)__hyp_text_start,

					(unsigned long)__hyp_text_end);

	if (ret || is_kernel_in_hyp_mode())

		return ret;

	ret = kprobe_add_area_blacklist((unsigned long)__hyp_idmap_text_start,

					(unsigned long)__hyp_idmap_text_end);

	return ret;

}



void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)

arch/arm64/kernel/stacktrace.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace) 
	if (trace->nr_entries < trace->max_entries)

		trace->entries[trace->nr_entries++] = ULONG_MAX;

}

EXPORT_SYMBOL_GPL(save_stack_trace_regs);



static noinline void __save_stack_trace(struct task_struct *tsk,

	struct stack_trace *trace, unsigned int nosched)