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

Pull perf updates from Ingo Molnar:
 "The main updates in this cycle were:

   - Lots of perf tooling changes too voluminous to list (big perf trace
     and perf stat improvements, lots of libtraceevent reorganization,
     etc.), so I'll list the authors and refer to the changelog for
     details:

       Benjamin Peterson, Jérémie Galarneau, Kim Phillips, Peter
       Zijlstra, Ravi Bangoria, Sangwon Hong, Sean V Kelley, Steven
       Rostedt, Thomas Gleixner, Ding Xiang, Eduardo Habkost, Thomas
       Richter, Andi Kleen, Sanskriti Sharma, Adrian Hunter, Tzvetomir
       Stoyanov, Arnaldo Carvalho de Melo, Jiri Olsa.

     ... with the bulk of the changes written by Jiri Olsa, Tzvetomir
     Stoyanov and Arnaldo Carvalho de Melo.

   - Continued intel_rdt work with a focus on playing well with perf
     events. This also imported some non-perf RDT work due to
     dependencies. (Reinette Chatre)

   - Implement counter freezing for Arch Perfmon v4 (Skylake and newer).
     This allows to speed up the PMI handler by avoiding unnecessary MSR
     writes and make it more accurate. (Andi Kleen)

   - kprobes cleanups and simplification (Masami Hiramatsu)

   - Intel Goldmont PMU updates (Kan Liang)

   - ... plus misc other fixes and updates"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (155 commits)
  kprobes/x86: Use preempt_enable() in optimized_callback()
  x86/intel_rdt: Prevent pseudo-locking from using stale pointers
  kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack
  perf/x86/intel: Export mem events only if there's PEBS support
  x86/cpu: Drop pointless static qualifier in punit_dev_state_show()
  x86/intel_rdt: Fix initial allocation to consider CDP
  x86/intel_rdt: CBM overlap should also check for overlap with CDP peer
  x86/intel_rdt: Introduce utility to obtain CDP peer
  tools lib traceevent, perf tools: Move struct tep_handler definition in a local header file
  tools lib traceevent: Separate out tep_strerror() for strerror_r() issues
  perf python: More portable way to make CFLAGS work with clang
  perf python: Make clang_has_option() work on Python 3
  perf tools: Free temporary 'sys' string in read_event_files()
  perf tools: Avoid double free in read_event_file()
  perf tools: Free 'printk' string in parse_ftrace_printk()
  perf tools: Cleanup trace-event-info 'tdata' leak
  perf strbuf: Match va_{add,copy} with va_end
  perf test: S390 does not support watchpoints in test 22
  perf auxtrace: Include missing asm/bitsperlong.h to get BITS_PER_LONG
  tools include: Adopt linux/bits.h
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/x86/include/asm/ptrace.h
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc drivers/acpi/acpi_lpss.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc drivers/idle/intel_idle.c
index 791b8a366e6edaf533b0b66af97ced3250689a54,c4bb67ed8da35c947a7d17daf92c2a52412e1f7b..8b5d85c91e9d4b2ed10d07bf98237c9f6b7eff14
--- 1/drivers/idle/intel_idle.c
--- 2/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@@ -1066,43 -1066,46 +1066,43 @@@ static const struct idle_cpu idle_cpu_d
        .disable_promotion_to_c1e = true,
  };
  
 -#define ICPU(model, cpu) \
 -      { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&cpu }
 -
  static const struct x86_cpu_id intel_idle_ids[] __initconst = {
 -      ICPU(INTEL_FAM6_NEHALEM_EP,             idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_NEHALEM,                idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_NEHALEM_G,              idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_WESTMERE,               idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_WESTMERE_EP,            idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_NEHALEM_EX,             idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_ATOM_BONNELL,           idle_cpu_atom),
 -      ICPU(INTEL_FAM6_ATOM_BONNELL_MID,               idle_cpu_lincroft),
 -      ICPU(INTEL_FAM6_WESTMERE_EX,            idle_cpu_nehalem),
 -      ICPU(INTEL_FAM6_SANDYBRIDGE,            idle_cpu_snb),
 -      ICPU(INTEL_FAM6_SANDYBRIDGE_X,          idle_cpu_snb),
 -      ICPU(INTEL_FAM6_ATOM_SALTWELL,          idle_cpu_atom),
 -      ICPU(INTEL_FAM6_ATOM_SILVERMONT,        idle_cpu_byt),
 -      ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,    idle_cpu_tangier),
 -      ICPU(INTEL_FAM6_ATOM_AIRMONT,           idle_cpu_cht),
 -      ICPU(INTEL_FAM6_IVYBRIDGE,              idle_cpu_ivb),
 -      ICPU(INTEL_FAM6_IVYBRIDGE_X,            idle_cpu_ivt),
 -      ICPU(INTEL_FAM6_HASWELL_CORE,           idle_cpu_hsw),
 -      ICPU(INTEL_FAM6_HASWELL_X,              idle_cpu_hsw),
 -      ICPU(INTEL_FAM6_HASWELL_ULT,            idle_cpu_hsw),
 -      ICPU(INTEL_FAM6_HASWELL_GT3E,           idle_cpu_hsw),
 -      ICPU(INTEL_FAM6_ATOM_SILVERMONT_X,      idle_cpu_avn),
 -      ICPU(INTEL_FAM6_BROADWELL_CORE,         idle_cpu_bdw),
 -      ICPU(INTEL_FAM6_BROADWELL_GT3E,         idle_cpu_bdw),
 -      ICPU(INTEL_FAM6_BROADWELL_X,            idle_cpu_bdw),
 -      ICPU(INTEL_FAM6_BROADWELL_XEON_D,       idle_cpu_bdw),
 -      ICPU(INTEL_FAM6_SKYLAKE_MOBILE,         idle_cpu_skl),
 -      ICPU(INTEL_FAM6_SKYLAKE_DESKTOP,        idle_cpu_skl),
 -      ICPU(INTEL_FAM6_KABYLAKE_MOBILE,        idle_cpu_skl),
 -      ICPU(INTEL_FAM6_KABYLAKE_DESKTOP,       idle_cpu_skl),
 -      ICPU(INTEL_FAM6_SKYLAKE_X,              idle_cpu_skx),
 -      ICPU(INTEL_FAM6_XEON_PHI_KNL,           idle_cpu_knl),
 -      ICPU(INTEL_FAM6_XEON_PHI_KNM,           idle_cpu_knl),
 -      ICPU(INTEL_FAM6_ATOM_GOLDMONT,          idle_cpu_bxt),
 -      ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS,     idle_cpu_bxt),
 -      ICPU(INTEL_FAM6_ATOM_GOLDMONT_X,        idle_cpu_dnv),
 +      INTEL_CPU_FAM6(NEHALEM_EP,              idle_cpu_nehalem),
 +      INTEL_CPU_FAM6(NEHALEM,                 idle_cpu_nehalem),
 +      INTEL_CPU_FAM6(NEHALEM_G,               idle_cpu_nehalem),
 +      INTEL_CPU_FAM6(WESTMERE,                idle_cpu_nehalem),
 +      INTEL_CPU_FAM6(WESTMERE_EP,             idle_cpu_nehalem),
 +      INTEL_CPU_FAM6(NEHALEM_EX,              idle_cpu_nehalem),
-       INTEL_CPU_FAM6(ATOM_PINEVIEW,           idle_cpu_atom),
-       INTEL_CPU_FAM6(ATOM_LINCROFT,           idle_cpu_lincroft),
++      INTEL_CPU_FAM6(ATOM_BONNELL,            idle_cpu_atom),
++      INTEL_CPU_FAM6(ATOM_BONNELL_MID,        idle_cpu_lincroft),
 +      INTEL_CPU_FAM6(WESTMERE_EX,             idle_cpu_nehalem),
 +      INTEL_CPU_FAM6(SANDYBRIDGE,             idle_cpu_snb),
 +      INTEL_CPU_FAM6(SANDYBRIDGE_X,           idle_cpu_snb),
-       INTEL_CPU_FAM6(ATOM_CEDARVIEW,          idle_cpu_atom),
-       INTEL_CPU_FAM6(ATOM_SILVERMONT1,        idle_cpu_byt),
-       INTEL_CPU_FAM6(ATOM_MERRIFIELD,         idle_cpu_tangier),
++      INTEL_CPU_FAM6(ATOM_SALTWELL,           idle_cpu_atom),
++      INTEL_CPU_FAM6(ATOM_SILVERMONT,         idle_cpu_byt),
++      INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     idle_cpu_tangier),
 +      INTEL_CPU_FAM6(ATOM_AIRMONT,            idle_cpu_cht),
 +      INTEL_CPU_FAM6(IVYBRIDGE,               idle_cpu_ivb),
 +      INTEL_CPU_FAM6(IVYBRIDGE_X,             idle_cpu_ivt),
 +      INTEL_CPU_FAM6(HASWELL_CORE,            idle_cpu_hsw),
 +      INTEL_CPU_FAM6(HASWELL_X,               idle_cpu_hsw),
 +      INTEL_CPU_FAM6(HASWELL_ULT,             idle_cpu_hsw),
 +      INTEL_CPU_FAM6(HASWELL_GT3E,            idle_cpu_hsw),
-       INTEL_CPU_FAM6(ATOM_SILVERMONT2,        idle_cpu_avn),
++      INTEL_CPU_FAM6(ATOM_SILVERMONT_X,       idle_cpu_avn),
 +      INTEL_CPU_FAM6(BROADWELL_CORE,          idle_cpu_bdw),
 +      INTEL_CPU_FAM6(BROADWELL_GT3E,          idle_cpu_bdw),
 +      INTEL_CPU_FAM6(BROADWELL_X,             idle_cpu_bdw),
 +      INTEL_CPU_FAM6(BROADWELL_XEON_D,        idle_cpu_bdw),
 +      INTEL_CPU_FAM6(SKYLAKE_MOBILE,          idle_cpu_skl),
 +      INTEL_CPU_FAM6(SKYLAKE_DESKTOP,         idle_cpu_skl),
 +      INTEL_CPU_FAM6(KABYLAKE_MOBILE,         idle_cpu_skl),
 +      INTEL_CPU_FAM6(KABYLAKE_DESKTOP,        idle_cpu_skl),
 +      INTEL_CPU_FAM6(SKYLAKE_X,               idle_cpu_skx),
 +      INTEL_CPU_FAM6(XEON_PHI_KNL,            idle_cpu_knl),
 +      INTEL_CPU_FAM6(XEON_PHI_KNM,            idle_cpu_knl),
 +      INTEL_CPU_FAM6(ATOM_GOLDMONT,           idle_cpu_bxt),
-       INTEL_CPU_FAM6(ATOM_GEMINI_LAKE,        idle_cpu_bxt),
-       INTEL_CPU_FAM6(ATOM_DENVERTON,          idle_cpu_dnv),
++      INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS,      idle_cpu_bxt),
++      INTEL_CPU_FAM6(ATOM_GOLDMONT_X,         idle_cpu_dnv),
        {}
  };
  

diff --cc drivers/mmc/host/sdhci-acpi.c
Simple merge

diff --cc drivers/powercap/intel_rapl.c
index bb92874b1175ecc5f129c56c19a911f6d206ef0e,8cbfcce57a0680d078f692a3db5a500b9afd0917..6cdb2c14eee4c33db1ec24e3fcfebe62a03b9a5d
--- 1/drivers/powercap/intel_rapl.c
--- 2/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@@ -1133,40 -1133,47 +1133,40 @@@ static const struct rapl_defaults rapl_
        .compute_time_window = rapl_compute_time_window_atom,
  };
  
 -#define RAPL_CPU(_model, _ops) {                      \
 -              .vendor = X86_VENDOR_INTEL,             \
 -              .family = 6,                            \
 -              .model = _model,                        \
 -              .driver_data = (kernel_ulong_t)&_ops,   \
 -              }
 -
  static const struct x86_cpu_id rapl_ids[] __initconst = {
 -      RAPL_CPU(INTEL_FAM6_SANDYBRIDGE,        rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_SANDYBRIDGE_X,      rapl_defaults_core),
 -
 -      RAPL_CPU(INTEL_FAM6_IVYBRIDGE,          rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_IVYBRIDGE_X,        rapl_defaults_core),
 -
 -      RAPL_CPU(INTEL_FAM6_HASWELL_CORE,       rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_HASWELL_ULT,        rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_HASWELL_GT3E,       rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_HASWELL_X,          rapl_defaults_hsw_server),
 -
 -      RAPL_CPU(INTEL_FAM6_BROADWELL_CORE,     rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_BROADWELL_GT3E,     rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_BROADWELL_XEON_D,   rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_BROADWELL_X,        rapl_defaults_hsw_server),
 -
 -      RAPL_CPU(INTEL_FAM6_SKYLAKE_DESKTOP,    rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_SKYLAKE_MOBILE,     rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_SKYLAKE_X,          rapl_defaults_hsw_server),
 -      RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE,    rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP,   rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_CANNONLAKE_MOBILE,  rapl_defaults_core),
 -
 -      RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT,    rapl_defaults_byt),
 -      RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT,       rapl_defaults_cht),
 -      RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT_MID,        rapl_defaults_tng),
 -      RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT_MID,   rapl_defaults_ann),
 -      RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT,      rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, rapl_defaults_core),
 -      RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT_X,    rapl_defaults_core),
 -
 -      RAPL_CPU(INTEL_FAM6_XEON_PHI_KNL,       rapl_defaults_hsw_server),
 -      RAPL_CPU(INTEL_FAM6_XEON_PHI_KNM,       rapl_defaults_hsw_server),
 +      INTEL_CPU_FAM6(SANDYBRIDGE,             rapl_defaults_core),
 +      INTEL_CPU_FAM6(SANDYBRIDGE_X,           rapl_defaults_core),
 +
 +      INTEL_CPU_FAM6(IVYBRIDGE,               rapl_defaults_core),
 +      INTEL_CPU_FAM6(IVYBRIDGE_X,             rapl_defaults_core),
 +
 +      INTEL_CPU_FAM6(HASWELL_CORE,            rapl_defaults_core),
 +      INTEL_CPU_FAM6(HASWELL_ULT,             rapl_defaults_core),
 +      INTEL_CPU_FAM6(HASWELL_GT3E,            rapl_defaults_core),
 +      INTEL_CPU_FAM6(HASWELL_X,               rapl_defaults_hsw_server),
 +
 +      INTEL_CPU_FAM6(BROADWELL_CORE,          rapl_defaults_core),
 +      INTEL_CPU_FAM6(BROADWELL_GT3E,          rapl_defaults_core),
 +      INTEL_CPU_FAM6(BROADWELL_XEON_D,        rapl_defaults_core),
 +      INTEL_CPU_FAM6(BROADWELL_X,             rapl_defaults_hsw_server),
 +
 +      INTEL_CPU_FAM6(SKYLAKE_DESKTOP,         rapl_defaults_core),
 +      INTEL_CPU_FAM6(SKYLAKE_MOBILE,          rapl_defaults_core),
 +      INTEL_CPU_FAM6(SKYLAKE_X,               rapl_defaults_hsw_server),
 +      INTEL_CPU_FAM6(KABYLAKE_MOBILE,         rapl_defaults_core),
 +      INTEL_CPU_FAM6(KABYLAKE_DESKTOP,        rapl_defaults_core),
 +      INTEL_CPU_FAM6(CANNONLAKE_MOBILE,       rapl_defaults_core),
 +
-       INTEL_CPU_FAM6(ATOM_SILVERMONT1,        rapl_defaults_byt),
++      INTEL_CPU_FAM6(ATOM_SILVERMONT,         rapl_defaults_byt),
 +      INTEL_CPU_FAM6(ATOM_AIRMONT,            rapl_defaults_cht),
-       INTEL_CPU_FAM6(ATOM_MERRIFIELD,         rapl_defaults_tng),
-       INTEL_CPU_FAM6(ATOM_MOOREFIELD,         rapl_defaults_ann),
++      INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     rapl_defaults_tng),
++      INTEL_CPU_FAM6(ATOM_AIRMONT_MID,        rapl_defaults_ann),
 +      INTEL_CPU_FAM6(ATOM_GOLDMONT,           rapl_defaults_core),
-       INTEL_CPU_FAM6(ATOM_GEMINI_LAKE,        rapl_defaults_core),
-       INTEL_CPU_FAM6(ATOM_DENVERTON,          rapl_defaults_core),
++      INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS,      rapl_defaults_core),
++      INTEL_CPU_FAM6(ATOM_GOLDMONT_X,         rapl_defaults_core),
 +
 +      INTEL_CPU_FAM6(XEON_PHI_KNL,            rapl_defaults_hsw_server),
 +      INTEL_CPU_FAM6(XEON_PHI_KNM,            rapl_defaults_hsw_server),
        {}
  };
  MODULE_DEVICE_TABLE(x86cpu, rapl_ids);

diff --cc tools/perf/Makefile.perf
Simple merge

diff --cc tools/perf/builtin-report.c
Simple merge

diff --cc tools/perf/util/evsel.c
Simple merge