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

Commit b75d3886 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Four tooling fixes, two kprobes KASAN related fixes and an x86 PMU
  driver fix/cleanup"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf jit: Fix build issue on Ubuntu
  perf jevents: Handle events including .c and .o
  perf/x86/intel: Remove an inconsistent NULL check
  kprobes: Unpoison stack in jprobe_return() for KASAN
  kprobes: Avoid false KASAN reports during stack copy
  perf header: Set nr_numa_nodes only when we parsed all the data
  perf top: Fix refreshing hierarchy entries on TUI
parents e0ed1c22 01306699

arch/arm64/kernel/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ ENTRY(_cpu_resume) 


#ifdef CONFIG_KASAN

	mov	x0, sp

	bl	kasan_unpoison_remaining_stack

	bl	kasan_unpoison_task_stack_below

#endif



	ldp	x19, x20, [x29, #16]

arch/x86/events/intel/lbr.c

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ void intel_pmu_lbr_del(struct perf_event *event) 
	if (!x86_pmu.lbr_nr)

		return;



	if (branch_user_callstack(cpuc->br_sel) && event->ctx &&

	if (branch_user_callstack(cpuc->br_sel) &&

	    event->ctx->task_ctx_data) {

		task_ctx = event->ctx->task_ctx_data;

		task_ctx->lbr_callstack_users--;

arch/x86/kernel/kprobes/core.c

+8 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/kallsyms.h>

#include <linux/ftrace.h>

#include <linux/frame.h>

#include <linux/kasan.h>



#include <asm/text-patching.h>

#include <asm/cacheflush.h>
@@ -1057,9 +1058,10 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) 
	 * tailcall optimization. So, to be absolutely safe

	 * we also save and restore enough stack bytes to cover

	 * the argument area.

	 * Use __memcpy() to avoid KASAN stack out-of-bounds reports as we copy

	 * raw stack chunk with redzones:

	 */

	memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr,

	       MIN_STACK_SIZE(addr));

	__memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr, MIN_STACK_SIZE(addr));

	regs->flags &= ~X86_EFLAGS_IF;

	trace_hardirqs_off();

	regs->ip = (unsigned long)(jp->entry);
@@ -1080,6 +1082,9 @@ void jprobe_return(void) 
{

	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();



	/* Unpoison stack redzones in the frames we are going to jump over. */

	kasan_unpoison_stack_above_sp_to(kcb->jprobe_saved_sp);



	asm volatile (

#ifdef CONFIG_X86_64

			"       xchg   %%rbx,%%rsp	\n"
@@ -1118,7 +1123,7 @@ int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) 
		/* It's OK to start function graph tracing again */

		unpause_graph_tracing();

		*regs = kcb->jprobe_saved_regs;

		memcpy(saved_sp, kcb->jprobes_stack, MIN_STACK_SIZE(saved_sp));

		__memcpy(saved_sp, kcb->jprobes_stack, MIN_STACK_SIZE(saved_sp));

		preempt_enable_no_resched();

		return 1;

	}

include/linux/kasan.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static inline void kasan_disable_current(void) 
void kasan_unpoison_shadow(const void *address, size_t size);



void kasan_unpoison_task_stack(struct task_struct *task);

void kasan_unpoison_stack_above_sp_to(const void *watermark);



void kasan_alloc_pages(struct page *page, unsigned int order);

void kasan_free_pages(struct page *page, unsigned int order);
@@ -85,6 +86,7 @@ size_t kasan_metadata_size(struct kmem_cache *cache); 
static inline void kasan_unpoison_shadow(const void *address, size_t size) {}



static inline void kasan_unpoison_task_stack(struct task_struct *task) {}

static inline void kasan_unpoison_stack_above_sp_to(const void *watermark) {}



static inline void kasan_enable_current(void) {}

static inline void kasan_disable_current(void) {}

mm/kasan/kasan.c

+19 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/string.h>

#include <linux/types.h>

#include <linux/vmalloc.h>

#include <linux/bug.h>



#include "kasan.h"

#include "../slab.h"
@@ -62,7 +63,7 @@ void kasan_unpoison_shadow(const void *address, size_t size) 
	}

}



static void __kasan_unpoison_stack(struct task_struct *task, void *sp)

static void __kasan_unpoison_stack(struct task_struct *task, const void *sp)

{

	void *base = task_stack_page(task);

	size_t size = sp - base;
@@ -77,9 +78,24 @@ void kasan_unpoison_task_stack(struct task_struct *task) 
}



/* Unpoison the stack for the current task beyond a watermark sp value. */

asmlinkage void kasan_unpoison_remaining_stack(void *sp)

asmlinkage void kasan_unpoison_task_stack_below(const void *watermark)

{

	__kasan_unpoison_stack(current, sp);

	__kasan_unpoison_stack(current, watermark);

}



/*

 * Clear all poison for the region between the current SP and a provided

 * watermark value, as is sometimes required prior to hand-crafted asm function

 * returns in the middle of functions.

 */

void kasan_unpoison_stack_above_sp_to(const void *watermark)

{

	const void *sp = __builtin_frame_address(0);

	size_t size = watermark - sp;



	if (WARN_ON(sp > watermark))

		return;

	kasan_unpoison_shadow(sp, size);

}



/*