Commit f79a17bf 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:
 "Mostly tooling fixes, plus a static key fix fixing /sys/devices/cpu/rdpmc"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Really allow to specify custom CC, AR or LD
  perf auxtrace: Fix misplaced check for HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT
  perf hists browser: Take the --comm, --dsos, etc filters into account
  perf symbols: Store if there is a filter in place
  x86, perf: Fix static_key bug in load_mm_cr4()
  tools: Copy lib/hweight.c from the kernel sources
  perf tools: Fix the detached tarball wrt rbtree copy
  perf thread_map: Fix the sizeof() calculation for map entries
  tools lib: Improve clean target
  perf stat: Fix shadow declaration of close
  perf tools: Fix lockup using 32-bit compat vdso
parents 59ee7621 a6acd6a4

arch/x86/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ extern struct static_key rdpmc_always_available; 


static inline void load_mm_cr4(struct mm_struct *mm)

{

	if (static_key_true(&rdpmc_always_available) ||

	if (static_key_false(&rdpmc_always_available) ||

	    atomic_read(&mm->context.perf_rdpmc_allowed))

		cr4_set_bits(X86_CR4_PCE);

	else

tools/lib/api/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ $(LIBFILE): $(API_IN) 


clean:

	$(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \

	find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)

	find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)



FORCE:

tools/lib/hweight.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
#include <linux/bitops.h>

#include <asm/types.h>



/**

 * hweightN - returns the hamming weight of a N-bit word

 * @x: the word to weigh

 *

 * The Hamming Weight of a number is the total number of bits set in it.

 */



unsigned int __sw_hweight32(unsigned int w)

{

#ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER

	w -= (w >> 1) & 0x55555555;

	w =  (w & 0x33333333) + ((w >> 2) & 0x33333333);

	w =  (w + (w >> 4)) & 0x0f0f0f0f;

	return (w * 0x01010101) >> 24;

#else

	unsigned int res = w - ((w >> 1) & 0x55555555);

	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);

	res = (res + (res >> 4)) & 0x0F0F0F0F;

	res = res + (res >> 8);

	return (res + (res >> 16)) & 0x000000FF;

#endif

}



unsigned int __sw_hweight16(unsigned int w)

{

	unsigned int res = w - ((w >> 1) & 0x5555);

	res = (res & 0x3333) + ((res >> 2) & 0x3333);

	res = (res + (res >> 4)) & 0x0F0F;

	return (res + (res >> 8)) & 0x00FF;

}



unsigned int __sw_hweight8(unsigned int w)

{

	unsigned int res = w - ((w >> 1) & 0x55);

	res = (res & 0x33) + ((res >> 2) & 0x33);

	return (res + (res >> 4)) & 0x0F;

}



unsigned long __sw_hweight64(__u64 w)

{

#if BITS_PER_LONG == 32

	return __sw_hweight32((unsigned int)(w >> 32)) +

	       __sw_hweight32((unsigned int)w);

#elif BITS_PER_LONG == 64

#ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER

	w -= (w >> 1) & 0x5555555555555555ul;

	w =  (w & 0x3333333333333333ul) + ((w >> 2) & 0x3333333333333333ul);

	w =  (w + (w >> 4)) & 0x0f0f0f0f0f0f0f0ful;

	return (w * 0x0101010101010101ul) >> 56;

#else

	__u64 res = w - ((w >> 1) & 0x5555555555555555ul);

	res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);

	res = (res + (res >> 4)) & 0x0F0F0F0F0F0F0F0Ful;

	res = res + (res >> 8);

	res = res + (res >> 16);

	return (res + (res >> 32)) & 0x00000000000000FFul;

#endif

#endif

}

tools/lib/traceevent/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ install: install_lib 


clean:

	$(call QUIET_CLEAN, libtraceevent) \

		$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \

		$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \

		$(RM) TRACEEVENT-CFLAGS tags TAGS



PHONY += force plugins

tools/perf/MANIFEST

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ tools/arch/x86/include/asm/atomic.h 
tools/arch/x86/include/asm/rmwcc.h

tools/lib/traceevent

tools/lib/api

tools/lib/hweight.c

tools/lib/rbtree.c

tools/lib/symbol/kallsyms.c

tools/lib/symbol/kallsyms.h
@@ -57,7 +58,6 @@ include/linux/perf_event.h 
include/linux/list.h

include/linux/hash.h

include/linux/stringify.h

lib/hweight.c

include/linux/swab.h

arch/*/include/asm/unistd*.h

arch/*/include/uapi/asm/unistd*.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE