commit numatop for openSUSE:Factory

Hello community, here is the log from the commit of package numatop for openSUSE:Factory checked in at 2016-03-31 13:03:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/numatop (Old) and /work/SRC/openSUSE:Factory/.numatop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "numatop" Changes: -------- --- /work/SRC/openSUSE:Factory/numatop/numatop.changes 2015-03-09 10:10:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.numatop.new/numatop.changes 2016-03-31 13:03:09.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Mar 26 19:31:38 UTC 2016 - mpluskal@suse.com + +- Update to version 1.0.4 + * Add BDW-EP/EX support + +------------------------------------------------------------------- Old: ---- numatop_linux_1.0.3.tar.gz New: ---- numatop_linux_1.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numatop.spec ++++++ --- /var/tmp/diff_new_pack.Mjc8ZM/_old 2016-03-31 13:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Mjc8ZM/_new 2016-03-31 13:03:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package numatop # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ Name: numatop -Version: 1.0.3 +Version: 1.0.4 Release: 0 Summary: A top-like tool for runtime memory locality monitoring on NUMA systems License: BSD-3-Clause Group: System/Monitoring Url: https://01.org/numatop Source0: https://01.org/sites/default/files/%{name}_linux_%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnuma-devel BuildRequires: ncurses-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 %description @@ -43,16 +43,20 @@ %setup -q -n %{name} %build -make CFLAGS="%optflags" %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%{optflags}" %install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man8 -make PREFIXDIR=%{buildroot}/usr/ MANDIR=%{buildroot}/%{_mandir}/man8 install +make \ + %{?_smp_mflags} \ + PREFIXDIR=%{buildroot}%{_prefix} \ + MANDIR=%{buildroot}/%{_mandir}/man8 \ + install %files %defattr(-,root,root) %{_bindir}/%{name} -%{_mandir}/man8/* +%{_mandir}/man8/%{name}.8%{ext_man} %changelog ++++++ numatop_linux_1.0.3.tar.gz -> numatop_linux_1.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/README new/numatop/README --- old/numatop/README 2014-08-07 07:27:36.000000000 +0200 +++ new/numatop/README 2014-08-08 03:30:15.000000000 +0200 @@ -21,9 +21,12 @@ Kernel Requirement: ------------------ -Kernel: 3.13+ +Recommended kernel: 3.16 -For Haswell supporting, please also apply the following perf patch in kernel. +For Haswell supporting, please also apply a perf patch on 3.16. The patch +is numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch. + +The patch can also be found at following link: http://www.gossamer-threads.com/lists/linux/kernel/1964864 Directories @@ -36,6 +39,8 @@ generate memory access with runtime latency value among CPUs. Note that this application is only used for numatop testing! +kernel_patches: the required kernel patches. + Note: ----- numatop is supported on Intel Xeon processors: 5500-series, 6500/7500-series, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/disp.c new/numatop/common/disp.c --- old/numatop/common/disp.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/common/disp.c 2015-07-30 03:18:39.000000000 +0200 @@ -614,35 +614,35 @@ if (select(s_cons_ctl.pipe[0] + 1, &s_cons_ctl.fds, NULL, NULL, NULL) > 0) { if (FD_ISSET(s_cons_ctl.pipe[0], &s_cons_ctl.fds)) { - (void) read(s_cons_ctl.pipe[0], &ch, 1); - - /* - * Character is from pipe. - */ - if (ch == PIPE_CHAR_QUIT) { + if (read(s_cons_ctl.pipe[0], &ch, 1) == 1) { /* - * Received a QUIT notification, - * "console thread" will be quit + * Character is from pipe. */ - debug_print(NULL, 2, "cons: " - "received PIPE_CHAR_QUIT\n"); - break; - } + if (ch == PIPE_CHAR_QUIT) { + /* + * Received a QUIT notification, + * "console thread" will be quit + */ + debug_print(NULL, 2, "cons: " + "received PIPE_CHAR_QUIT\n"); + break; + } - if (ch == PIPE_CHAR_RESIZE) { - /* - * Send the "RESIZE" command - * to "display thread". - */ - (void) pthread_mutex_lock( - &s_disp_ctl.mutex); + if (ch == PIPE_CHAR_RESIZE) { + /* + * Send the "RESIZE" command + * to "display thread". + */ + (void) pthread_mutex_lock( + &s_disp_ctl.mutex); - CMD_ID_SET(&s_disp_ctl.cmd, - CMD_RESIZE_ID); + CMD_ID_SET(&s_disp_ctl.cmd, + CMD_RESIZE_ID); dispthr_flagset_nolock(DISP_FLAG_CMD); (void) pthread_mutex_unlock( &s_disp_ctl.mutex); + } } } else { /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/include/types.h new/numatop/common/include/types.h --- old/numatop/common/include/types.h 2014-08-05 08:00:32.000000000 +0200 +++ new/numatop/common/include/types.h 2015-07-30 06:26:20.000000000 +0200 @@ -51,10 +51,11 @@ CPU_NHM_EP, CPU_WSM_EP, CPU_IVB_EX, - CPU_HSX + CPU_HSX, + CPU_BDX } cpu_type_t; -#define CPU_TYPE_NUM 8 +#define CPU_TYPE_NUM 9 typedef enum { SORT_KEY_INVALID = -1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/os/os_util.c new/numatop/common/os/os_util.c --- old/numatop/common/os/os_util.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/common/os/os_util.c 2015-07-30 03:18:39.000000000 +0200 @@ -196,7 +196,7 @@ calibrate_cpuinfo(double *nsofclk, uint64_t *clkofsec) { FILE *f; - char *line = NULL, unit[10]; + char *line = NULL, unit[11]; size_t len = 0; double freq = 0.0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/os/plat.c new/numatop/common/os/plat.c --- old/numatop/common/os/plat.c 2014-08-05 08:00:56.000000000 +0200 +++ new/numatop/common/os/plat.c 2015-07-30 06:27:20.000000000 +0200 @@ -51,6 +51,7 @@ nhmep_profiling_config, wsmep_profiling_config, snbep_profiling_config, + snbep_profiling_config, snbep_profiling_config }; @@ -63,6 +64,7 @@ nhmep_ll_config, wsmep_ll_config, snbep_ll_config, + snbep_ll_config, snbep_ll_config }; @@ -75,6 +77,7 @@ nhm_offcore_num, wsm_offcore_num, snb_offcore_num, + snb_offcore_num, snb_offcore_num }; @@ -105,6 +108,8 @@ case CPU_IVB_EX: /* fall through */ case CPU_HSX: + /* fall through */ + case CPU_BDX: return (0); default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/reg.c new/numatop/common/reg.c --- old/numatop/common/reg.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/common/reg.c 2015-07-30 03:18:39.000000000 +0200 @@ -402,6 +402,7 @@ { (void) initscr(); (void) refresh(); + (void) use_default_colors(); (void) start_color(); (void) keypad(stdscr, TRUE); (void) nonl(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/util.c new/numatop/common/util.c --- old/numatop/common/util.c 2014-08-05 08:46:31.000000000 +0200 +++ new/numatop/common/util.c 2015-07-30 06:28:31.000000000 +0200 @@ -396,6 +396,9 @@ case 63: type = CPU_HSX; break; + case 79: + type = CPU_BDX; + break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch new/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch --- old/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/numatop/kernel_patches/0001-perf-x86-Widen-Haswell-OFFCORE-mask.patch 2014-08-08 03:32:00.000000000 +0200 @@ -0,0 +1,54 @@ +From 1124c7b559c86dd9fadee30e635909f19d6b62e6 Mon Sep 17 00:00:00 2001 +From: Andi Kleen +Date: Tue, 5 Aug 2014 10:24:18 +0800 +Subject: [PATCH] perf, x86: Widen Haswell OFFCORE mask + +Haswell supports more bits in the offcore_rsp_* MSRs than Sandy +Bridge. Previously the Haswell code was using the Sandy Bridge +extra register definitions, which prevented users from setting +all of these bits. This in term did not allow to set some valid +SNOOP_* bits, among others. + +I allowed all bits the CPU does not #GP on. This is ok because +it's protected by a model check. + +Add a new extra_regs table for Haswell and use. Except for the +widened mask it is identical to Sandy Bridge. + +Signed-off-by: Andi Kleen +Signed-off-by: Jin Yao +--- + arch/x86/kernel/cpu/perf_event_intel.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c +index 2502d0d..4f69013 100644 +--- a/arch/x86/kernel/cpu/perf_event_intel.c ++++ b/arch/x86/kernel/cpu/perf_event_intel.c +@@ -189,6 +189,14 @@ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = { + EVENT_EXTRA_END + }; + ++static struct extra_reg intel_hsw_extra_regs[] __read_mostly = { ++ /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ ++ INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0), ++ INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1), ++ INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd), ++ EVENT_EXTRA_END ++}; ++ + EVENT_ATTR_STR(mem-loads, mem_ld_nhm, "event=0x0b,umask=0x10,ldlat=3"); + EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3"); + EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2"); +@@ -2552,7 +2560,7 @@ __init int intel_pmu_init(void) + + x86_pmu.event_constraints = intel_hsw_event_constraints; + x86_pmu.pebs_constraints = intel_hsw_pebs_event_constraints; +- x86_pmu.extra_regs = intel_snb_extra_regs; ++ x86_pmu.extra_regs = intel_hsw_extra_regs; + x86_pmu.pebs_aliases = intel_pebs_aliases_snb; + /* all extra regs are per-cpu when HT is on */ + x86_pmu.er_flags |= ERF_HAS_RSP_1; +-- +1.9.1 + Files old/numatop/test/mgen/mgen and new/numatop/test/mgen/mgen differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/test/mgen/mgen.c new/numatop/test/mgen/mgen.c --- old/numatop/test/mgen/mgen.c 2014-07-01 02:40:53.000000000 +0200 +++ new/numatop/test/mgen/mgen.c 2015-07-30 03:18:39.000000000 +0200 @@ -203,7 +203,7 @@ calibrate_cpuinfo(double *nsofclk, double *clkofns, uint64_t *clkofsec) { FILE *f; - char *line = NULL, unit[10]; + char *line = NULL, unit[11]; size_t len = 0; double freq = 0.0; Files old/numatop/test/mgen/mgen.o and new/numatop/test/mgen/mgen.o differ