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

Merge branch 'perf-urgent-for-linus' of... 

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

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
  perf: Fix SIGIO handling
  perf top: Don't stop if no kernel symtab is found
  perf top: Handle kptr_restrict
  perf top: Remove unused macro
  perf events: initialize fd array to -1 instead of 0
  perf tools: Make sure kptr_restrict warnings fit 80 col terms
  perf tools: Fix build on older systems
  perf symbols: Handle /proc/sys/kernel/kptr_restrict
  perf: Remove duplicate headers
  ftrace: Add internal recursive checks
  tracing: Update btrfs's tracepoints to use u64 interface
  tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine
  ftrace: Set ops->flag to enabled even on static function tracing
  tracing: Have event with function tracer check error return
  ftrace: Have ftrace_startup() return failure code
  jump_label: Check entries limit in __jump_label_update
  ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM
  scripts/tags.sh: Add magic for trace-events for etags too
  scripts/tags.sh: Fix ctags for DEFINE_EVENT()
  x86/ftrace: Fix compiler warning in ftrace.c
  ...
parents 87367a0b f506b3dc

arch/blackfin/mm/maccess.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size) 
	return bfin_mem_access_type(addr, size);

}



long probe_kernel_read(void *dst, void *src, size_t size)

long probe_kernel_read(void *dst, const void *src, size_t size)

{

	unsigned long lsrc = (unsigned long)src;

	int mem_type;
@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size) 
	return -EFAULT;

}



long probe_kernel_write(void *dst, void *src, size_t size)

long probe_kernel_write(void *dst, const void *src, size_t size)

{

	unsigned long ldst = (unsigned long)dst;

	int mem_type;

arch/s390/mm/maccess.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * using the stura instruction.

 * Returns the number of bytes copied or -EFAULT.

 */

static long probe_kernel_write_odd(void *dst, void *src, size_t size)

static long probe_kernel_write_odd(void *dst, const void *src, size_t size)

{

	unsigned long count, aligned;

	int offset, mask;
@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size) 
	return rc ? rc : count;

}



long probe_kernel_write(void *dst, void *src, size_t size)

long probe_kernel_write(void *dst, const void *src, size_t size)

{

	long copied = 0;

arch/x86/kernel/ftrace.c

+6 −6
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) 
static atomic_t nmi_running = ATOMIC_INIT(0);

static int mod_code_status;		/* holds return value of text write */

static void *mod_code_ip;		/* holds the IP to write to */

static void *mod_code_newcode;		/* holds the text to write to the IP */

static const void *mod_code_newcode;	/* holds the text to write to the IP */



static unsigned nmi_wait_count;

static atomic_t nmi_update_count = ATOMIC_INIT(0);
@@ -225,7 +225,7 @@ within(unsigned long addr, unsigned long start, unsigned long end) 
}



static int

do_ftrace_mod_code(unsigned long ip, void *new_code)

do_ftrace_mod_code(unsigned long ip, const void *new_code)

{

	/*

	 * On x86_64, kernel text mappings are mapped read-only with
@@ -266,8 +266,8 @@ static const unsigned char *ftrace_nop_replace(void) 
}



static int

ftrace_modify_code(unsigned long ip, unsigned char *old_code,

		   unsigned char *new_code)

ftrace_modify_code(unsigned long ip, unsigned const char *old_code,

		   unsigned const char *new_code)

{

	unsigned char replaced[MCOUNT_INSN_SIZE];
@@ -301,7 +301,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, 
int ftrace_make_nop(struct module *mod,

		    struct dyn_ftrace *rec, unsigned long addr)

{

	unsigned char *new, *old;

	unsigned const char *new, *old;

	unsigned long ip = rec->ip;



	old = ftrace_call_replace(ip, addr);
@@ -312,7 +312,7 @@ int ftrace_make_nop(struct module *mod, 


int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)

{

	unsigned char *new, *old;

	unsigned const char *new, *old;

	unsigned long ip = rec->ip;



	old = ftrace_nop_replace();

arch/x86/oprofile/op_model_amd.c

+54 −41
Original line number Diff line number Diff line
@@ -316,16 +316,23 @@ static void op_amd_stop_ibs(void) 
		wrmsrl(MSR_AMD64_IBSOPCTL, 0);

}



static inline int eilvt_is_available(int offset)

static inline int get_eilvt(int offset)

{

	/* check if we may assign a vector */

	return !setup_APIC_eilvt(offset, 0, APIC_EILVT_MSG_NMI, 1);

}



static inline int put_eilvt(int offset)

{

	return !setup_APIC_eilvt(offset, 0, 0, 1);

}



static inline int ibs_eilvt_valid(void)

{

	int offset;

	u64 val;

	int valid = 0;



	preempt_disable();



	rdmsrl(MSR_AMD64_IBSCTL, val);

	offset = val & IBSCTL_LVT_OFFSET_MASK;
@@ -333,16 +340,20 @@ static inline int ibs_eilvt_valid(void) 
	if (!(val & IBSCTL_LVT_OFFSET_VALID)) {

		pr_err(FW_BUG "cpu %d, invalid IBS interrupt offset %d (MSR%08X=0x%016llx)\n",

		       smp_processor_id(), offset, MSR_AMD64_IBSCTL, val);

		return 0;

		goto out;

	}



	if (!eilvt_is_available(offset)) {

	if (!get_eilvt(offset)) {

		pr_err(FW_BUG "cpu %d, IBS interrupt offset %d not available (MSR%08X=0x%016llx)\n",

		       smp_processor_id(), offset, MSR_AMD64_IBSCTL, val);

		return 0;

		goto out;

	}



	return 1;

	valid = 1;

out:

	preempt_enable();



	return valid;

}



static inline int get_ibs_offset(void)
@@ -600,67 +611,69 @@ static int setup_ibs_ctl(int ibs_eilvt_off) 


static int force_ibs_eilvt_setup(void)

{

	int i;

	int offset;

	int ret;



	/* find the next free available EILVT entry */

	for (i = 1; i < 4; i++) {

		if (!eilvt_is_available(i))

			continue;

		ret = setup_ibs_ctl(i);

		if (ret)

			return ret;

		pr_err(FW_BUG "using offset %d for IBS interrupts\n", i);

		return 0;

	/*

	 * find the next free available EILVT entry, skip offset 0,

	 * pin search to this cpu

	 */

	preempt_disable();

	for (offset = 1; offset < APIC_EILVT_NR_MAX; offset++) {

		if (get_eilvt(offset))

			break;

	}

	preempt_enable();



	if (offset == APIC_EILVT_NR_MAX) {

		printk(KERN_DEBUG "No EILVT entry available\n");



		return -EBUSY;

	}



static int __init_ibs_nmi(void)

{

	int ret;



	if (ibs_eilvt_valid())

		return 0;



	ret = force_ibs_eilvt_setup();

	ret = setup_ibs_ctl(offset);

	if (ret)

		return ret;

		goto out;



	if (!ibs_eilvt_valid())

		return -EFAULT;

	if (!ibs_eilvt_valid()) {

		ret = -EFAULT;

		goto out;

	}



	pr_err(FW_BUG "using offset %d for IBS interrupts\n", offset);

	pr_err(FW_BUG "workaround enabled for IBS LVT offset\n");



	return 0;

out:

	preempt_disable();

	put_eilvt(offset);

	preempt_enable();

	return ret;

}



/*

 * check and reserve APIC extended interrupt LVT offset for IBS if

 * available

 *

 * init_ibs() preforms implicitly cpu-local operations, so pin this

 * thread to its current CPU

 */



static void init_ibs(void)

{

	preempt_disable();



	ibs_caps = get_ibs_caps();



	if (!ibs_caps)

		return;



	if (ibs_eilvt_valid())

		goto out;



	if (__init_ibs_nmi() < 0)

	if (!force_ibs_eilvt_setup())

		goto out;



	/* Failed to setup ibs */

	ibs_caps = 0;

	else

		printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);

	return;



out:

	preempt_enable();

	printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);

}



static int (*create_arch_files)(struct super_block *sb, struct dentry *root);

drivers/oprofile/event_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#define EVENT_BUFFER_H



#include <linux/types.h>

#include <asm/mutex.h>

#include <linux/mutex.h>



int alloc_event_buffer(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE