Commit db826278 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 updates from Ingo Molnar:
 "Mostly tooling fixes and some late tooling updates, plus two perf
  related printk message fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tests bpf: Use SyS_epoll_wait alias
  perf tests: objdump output can contain multi byte chunks
  perf record: Add --sample-cpu option
  perf hists: Introduce output_resort_cb method
  perf tools: Move config/Makefile into Makefile.config
  perf tests: Add test for bitmap_scnprintf function
  tools lib: Add bitmap_and function
  tools lib: Add bitmap_scnprintf function
  tools lib: Add bitmap_alloc function
  tools lib traceevent: Ignore generated library files
  perf tools: Fix build failure on perl script context
  perf/core: Change log level for duration warning to KERN_INFO
  perf annotate: Plug filename string leak
  perf annotate: Introduce strerror for handling symbol__disassemble() errors
  perf annotate: Rename symbol__annotate() to symbol__disassemble()
  perf/x86: Modify error message in virtualized environment
  perf target: str_error_r() always returns the buffer it receives
  perf annotate: Use pipe + fork instead of popen
  perf evsel: Introduce constructor for cycles event
parents c98f5827 f282f7a0

arch/x86/events/core.c

+7 −4
Original line number Diff line number Diff line
@@ -263,10 +263,13 @@ static bool check_hw_exists(void) 
	return true;



msr_fail:

	if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {

		pr_cont("PMU not available due to virtualization, using software events only.\n");

	} else {

		pr_cont("Broken PMU hardware detected, using software events only.\n");

	printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",

		boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,

		pr_err("Failed to access perfctr msr (MSR %x is %Lx)\n",

		       reg, val_new);

	}



	return false;

}

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static u64 __report_allowed; 


static void perf_duration_warn(struct irq_work *w)

{

	printk_ratelimited(KERN_WARNING

	printk_ratelimited(KERN_INFO

		"perf: interrupt took too long (%lld > %lld), lowering "

		"kernel.perf_event_max_sample_rate to %d\n",

		__report_avg, __report_allowed,

tools/include/linux/bitmap.h

+37 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <string.h>

#include <linux/bitops.h>

#include <stdlib.h>



#define DECLARE_BITMAP(name,bits) \

	unsigned long name[BITS_TO_LONGS(bits)]
@@ -10,6 +11,8 @@ 
int __bitmap_weight(const unsigned long *bitmap, int bits);

void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, int bits);

int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int bits);



#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
@@ -65,4 +68,38 @@ static inline int test_and_set_bit(int nr, unsigned long *addr) 
	return (old & mask) != 0;

}



/**

 * bitmap_alloc - Allocate bitmap

 * @nr: Bit to set

 */

static inline unsigned long *bitmap_alloc(int nbits)

{

	return calloc(1, BITS_TO_LONGS(nbits) * sizeof(unsigned long));

}



/*

 * bitmap_scnprintf - print bitmap list into buffer

 * @bitmap: bitmap

 * @nbits: size of bitmap

 * @buf: buffer to store output

 * @size: size of @buf

 */

size_t bitmap_scnprintf(unsigned long *bitmap, int nbits,

			char *buf, size_t size);



/**

 * bitmap_and - Do logical and on bitmaps

 * @dst: resulting bitmap

 * @src1: operand 1

 * @src2: operand 2

 * @nbits: size of bitmap

 */

static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,

			     const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		return (*dst = *src1 & *src2 & BITMAP_LAST_WORD_MASK(nbits)) != 0;

	return __bitmap_and(dst, src1, src2, nbits);

}



#endif /* _PERF_BITOPS_H */

tools/lib/bitmap.c

+44 −0
Original line number Diff line number Diff line
@@ -29,3 +29,47 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, 
	for (k = 0; k < nr; k++)

		dst[k] = bitmap1[k] | bitmap2[k];

}



size_t bitmap_scnprintf(unsigned long *bitmap, int nbits,

			char *buf, size_t size)

{

	/* current bit is 'cur', most recently seen range is [rbot, rtop] */

	int cur, rbot, rtop;

	bool first = true;

	size_t ret = 0;



	rbot = cur = find_first_bit(bitmap, nbits);

	while (cur < nbits) {

		rtop = cur;

		cur = find_next_bit(bitmap, nbits, cur + 1);

		if (cur < nbits && cur <= rtop + 1)

			continue;



		if (!first)

			ret += scnprintf(buf + ret, size - ret, ",");



		first = false;



		ret += scnprintf(buf + ret, size - ret, "%d", rbot);

		if (rbot < rtop)

			ret += scnprintf(buf + ret, size - ret, "-%d", rtop);



		rbot = cur;

	}

	return ret;

}



int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,

		 const unsigned long *bitmap2, unsigned int bits)

{

	unsigned int k;

	unsigned int lim = bits/BITS_PER_LONG;

	unsigned long result = 0;



	for (k = 0; k < lim; k++)

		result |= (dst[k] = bitmap1[k] & bitmap2[k]);

	if (bits % BITS_PER_LONG)

		result |= (dst[k] = bitmap1[k] & bitmap2[k] &

			   BITMAP_LAST_WORD_MASK(bits));

	return result != 0;

}

tools/lib/traceevent/.gitignore

+1 −0
Original line number Diff line number Diff line 
TRACEEVENT-CFLAGS

libtraceevent-dynamic-list

libtraceevent.so.*

CRA Git | Maintained and supported by SUSTech CRA and CCSE