Commit e0c4a5fc 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/fixes from Ingo Molnar:
 "Mostly tooling updates, but also two kernel fixes: a call chain
  handling robustness fix and an x86 PMU driver event definition fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/callchain: Force USER_DS when invoking perf_callchain_user()
  tools build: Fixup sched_getcpu feature test
  perf tests kmod-path: Don't fail if compressed modules aren't supported
  perf annotate: Fix AArch64 comment char
  perf tools: Fix spelling mistakes
  perf/x86: Fix Broadwell-EP DRAM RAPL events
  perf config: Refactor a duplicated code for obtaining config file name
  perf symbols: Allow user probes on versioned symbols
  perf symbols: Accept symbols starting at address 0
  tools lib string: Adopt prefixcmp() from perf and subcmd
  perf units: Move parse_tag_value() to units.[ch]
  perf ui gtk: Move gtk .so name to the only place where it is used
  perf tools: Move HAS_BOOL define to where perl headers are used
  perf memswap: Split the byteswap memory range wrappers from util.[ch]
  perf tools: Move event prototypes from util.h to event.h
  perf buildid: Move prototypes from util.h to build-id.h
parents dfcb7b23 88b0193d

arch/x86/events/intel/rapl.c

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { 


	X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_CORE,   hsw_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E,   hsw_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X,	  hsw_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X,	  hsx_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, hsw_rapl_init),



	X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_rapl_init),

kernel/events/callchain.c

+6 −0
Original line number Diff line number Diff line
@@ -229,12 +229,18 @@ get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user, 
		}



		if (regs) {

			mm_segment_t fs;



			if (crosstask)

				goto exit_put;



			if (add_mark)

				perf_callchain_store_context(&ctx, PERF_CONTEXT_USER);



			fs = get_fs();

			set_fs(USER_DS);

			perf_callchain_user(&ctx, regs);

			set_fs(fs);

		}

	}

tools/build/feature/test-sched_getcpu.c

+2 −0
Original line number Diff line number Diff line 
#ifndef _GNU_SOURCE

#define _GNU_SOURCE

#endif

#include <sched.h>



int main(void)

tools/include/linux/string.h

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ extern size_t strlcpy(char *dest, const char *src, size_t size); 


char *str_error_r(int errnum, char *buf, size_t buflen);



int prefixcmp(const char *str, const char *prefix);



#endif /* _LINUX_STRING_H_ */

tools/lib/string.c

+9 −0
Original line number Diff line number Diff line
@@ -87,3 +87,12 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size) 
	}

	return ret;

}



int prefixcmp(const char *str, const char *prefix)

{

	for (; ; str++, prefix++)

		if (!*prefix)

			return 0;

		else if (*str != *prefix)

			return (unsigned char)*prefix - (unsigned char)*str;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE