Commit 22a83528 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: Add an NMI column 



Add an NMI column, a proper sub-set of the IRQ column.

It would be preferable if the kernel exported
/sys/kernel/irq/NMI/per_cpu_count.

But since we are already forced to parse /proc/interrupts,
noticing which row is the NMI is simple enough.

Suggested-by: default avatarArtem Bityutskiy <artem.bityutskiy@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 05c14d8f

tools/power/x86/turbostat/turbostat.c

+48 −6
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct msr_counter bic[] = { 
	{ 0x0, "Die%c6", NULL, 0, 0, 0, NULL, 0 },

	{ 0x0, "SysWatt", NULL, 0, 0, 0, NULL, 0 },

	{ 0x0, "Sys_J", NULL, 0, 0, 0, NULL, 0 },

	{ 0x0, "NMI", NULL, 0, 0, 0, NULL, 0 },

};



#define MAX_BIC (sizeof(bic) / sizeof(struct msr_counter))
@@ -266,12 +267,13 @@ struct msr_counter bic[] = { 
#define	BIC_Diec6		(1ULL << 58)

#define	BIC_SysWatt		(1ULL << 59)

#define	BIC_Sys_J		(1ULL << 60)

#define	BIC_NMI			(1ULL << 61)



#define BIC_TOPOLOGY (BIC_Package | BIC_Node | BIC_CoreCnt | BIC_PkgCnt | BIC_Core | BIC_CPU | BIC_Die )

#define BIC_THERMAL_PWR ( BIC_CoreTmp | BIC_PkgTmp | BIC_PkgWatt | BIC_CorWatt | BIC_GFXWatt | BIC_RAMWatt | BIC_PKG__ | BIC_RAM__)

#define BIC_FREQUENCY (BIC_Avg_MHz | BIC_Busy | BIC_Bzy_MHz | BIC_TSC_MHz | BIC_GFXMHz | BIC_GFXACTMHz | BIC_SAMMHz | BIC_SAMACTMHz | BIC_UNCORE_MHZ)

#define BIC_IDLE (BIC_Busy | BIC_sysfs | BIC_CPU_c1 | BIC_CPU_c3 | BIC_CPU_c6 | BIC_CPU_c7 | BIC_GFX_rc6 | BIC_Pkgpc2 | BIC_Pkgpc3 | BIC_Pkgpc6 | BIC_Pkgpc7 | BIC_Pkgpc8 | BIC_Pkgpc9 | BIC_Pkgpc10 | BIC_CPU_LPI | BIC_SYS_LPI | BIC_Mod_c6 | BIC_Totl_c0 | BIC_Any_c0 | BIC_GFX_c0 | BIC_CPUGFX | BIC_SAM_mc6 | BIC_Diec6)

#define BIC_OTHER ( BIC_IRQ | BIC_SMI | BIC_ThreadC | BIC_CoreTmp | BIC_IPC)

#define BIC_OTHER ( BIC_IRQ | BIC_NMI | BIC_SMI | BIC_ThreadC | BIC_CoreTmp | BIC_IPC)



#define BIC_DISABLED_BY_DEFAULT	(BIC_USEC | BIC_TOD | BIC_APIC | BIC_X2APIC | BIC_SysWatt | BIC_Sys_J)
@@ -1628,6 +1630,7 @@ struct thread_data { 
	unsigned long long c1;

	unsigned long long instr_count;

	unsigned long long irq_count;

	unsigned long long nmi_count;

	unsigned int smi_count;

	unsigned int cpu_id;

	unsigned int apic_id;
@@ -1934,6 +1937,7 @@ struct timeval tv_even, tv_odd, tv_delta; 


int *irq_column_2_cpu;		/* /proc/interrupts column numbers */

int *irqs_per_cpu;		/* indexed by cpu_num */

int *nmi_per_cpu;		/* indexed by cpu_num */



void setup_all_buffers(bool startup);
@@ -2319,6 +2323,12 @@ void print_header(char *delim) 
		else

			outp += sprintf(outp, "%sIRQ", (printed++ ? delim : ""));

	}

	if (DO_BIC(BIC_NMI)) {

		if (sums_need_wide_columns)

			outp += sprintf(outp, "%s     NMI", (printed++ ? delim : ""));

		else

			outp += sprintf(outp, "%sNMI", (printed++ ? delim : ""));

	}



	if (DO_BIC(BIC_SMI))

		outp += sprintf(outp, "%sSMI", (printed++ ? delim : ""));
@@ -2605,6 +2615,8 @@ int dump_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p 


		if (DO_BIC(BIC_IRQ))

			outp += sprintf(outp, "IRQ: %lld\n", t->irq_count);

		if (DO_BIC(BIC_NMI))

			outp += sprintf(outp, "IRQ: %lld\n", t->nmi_count);

		if (DO_BIC(BIC_SMI))

			outp += sprintf(outp, "SMI: %d\n", t->smi_count);
@@ -2824,6 +2836,14 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data 
			outp += sprintf(outp, "%s%lld", (printed++ ? delim : ""), t->irq_count);

	}



	/* NMI */

	if (DO_BIC(BIC_NMI)) {

		if (sums_need_wide_columns)

			outp += sprintf(outp, "%s%8lld", (printed++ ? delim : ""), t->nmi_count);

		else

			outp += sprintf(outp, "%s%lld", (printed++ ? delim : ""), t->nmi_count);

	}



	/* SMI */

	if (DO_BIC(BIC_SMI))

		outp += sprintf(outp, "%s%d", (printed++ ? delim : ""), t->smi_count);
@@ -3439,6 +3459,9 @@ int delta_thread(struct thread_data *new, struct thread_data *old, struct core_d 
	if (DO_BIC(BIC_IRQ))

		old->irq_count = new->irq_count - old->irq_count;



	if (DO_BIC(BIC_NMI))

		old->nmi_count = new->nmi_count - old->nmi_count;



	if (DO_BIC(BIC_SMI))

		old->smi_count = new->smi_count - old->smi_count;
@@ -3519,6 +3542,7 @@ void clear_counters(struct thread_data *t, struct core_data *c, struct pkg_data 
	t->instr_count = 0;



	t->irq_count = 0;

	t->nmi_count = 0;

	t->smi_count = 0;



	c->c3 = 0;
@@ -3623,6 +3647,7 @@ int sum_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) 
	average.threads.instr_count += t->instr_count;



	average.threads.irq_count += t->irq_count;

	average.threads.nmi_count += t->nmi_count;

	average.threads.smi_count += t->smi_count;



	for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {
@@ -3764,6 +3789,9 @@ void compute_average(struct thread_data *t, struct core_data *c, struct pkg_data 


	if (average.threads.irq_count > 9999999)

		sums_need_wide_columns = 1;

	if (average.threads.nmi_count > 9999999)

		sums_need_wide_columns = 1;





	average.cores.c3 /= topo.allowed_cores;

	average.cores.c6 /= topo.allowed_cores;
@@ -4620,6 +4648,8 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) 


	if (DO_BIC(BIC_IRQ))

		t->irq_count = irqs_per_cpu[cpu];

	if (DO_BIC(BIC_NMI))

		t->nmi_count = nmi_per_cpu[cpu];



	get_cstate_counters(cpu, t, c, p);
@@ -5365,6 +5395,7 @@ void free_all_buffers(void) 


	free(irq_column_2_cpu);

	free(irqs_per_cpu);

	free(nmi_per_cpu);



	for (i = 0; i <= topo.max_cpu_num; ++i) {

		if (cpus[i].put_ids)
@@ -5821,31 +5852,37 @@ int snapshot_proc_interrupts(void) 


		irq_column_2_cpu[column] = cpu_number;

		irqs_per_cpu[cpu_number] = 0;

		nmi_per_cpu[cpu_number] = 0;

	}



	/* read /proc/interrupt count lines and sum up irqs per cpu */

	while (1) {

		int column;

		char buf[64];

		int this_row_is_nmi = 0;



		retval = fscanf(fp, " %s:", buf);	/* flush irq# "N:" */

		retval = fscanf(fp, " %s:", buf);	/* irq# "N:" */

		if (retval != 1)

			break;



		if (strncmp(buf, "NMI", strlen("NMI")) == 0)

			this_row_is_nmi = 1;



		/* read the count per cpu */

		for (column = 0; column < topo.num_cpus; ++column) {



			int cpu_number, irq_count;



			retval = fscanf(fp, " %d", &irq_count);



			if (retval != 1)

				break;



			cpu_number = irq_column_2_cpu[column];

			irqs_per_cpu[cpu_number] += irq_count;



			if (this_row_is_nmi)

				nmi_per_cpu[cpu_number] += irq_count;

		}



		while (getc(fp) != '\n') ;	/* flush interrupt description */



	}
@@ -5942,7 +5979,7 @@ int snapshot_sys_lpi_us(void) 
 */

int snapshot_proc_sysfs_files(void)

{

	if (DO_BIC(BIC_IRQ))

	if (DO_BIC(BIC_IRQ) || DO_BIC(BIC_NMI))

		if (snapshot_proc_interrupts())

			return 1;
@@ -8263,6 +8300,7 @@ void process_cpuid() 
		aperf_mperf_multiplier = platform->need_perf_multiplier ? 1024 : 1;



	BIC_PRESENT(BIC_IRQ);

	BIC_PRESENT(BIC_NMI);

	BIC_PRESENT(BIC_TSC_MHz);

}
@@ -8613,7 +8651,11 @@ void allocate_irq_buffers(void) 


	irqs_per_cpu = calloc(topo.max_cpu_num + 1, sizeof(int));

	if (irqs_per_cpu == NULL)

		err(-1, "calloc %d", topo.max_cpu_num + 1);

		err(-1, "calloc %d IRQ", topo.max_cpu_num + 1);



	nmi_per_cpu = calloc(topo.max_cpu_num + 1, sizeof(int));

	if (nmi_per_cpu == NULL)

		err(-1, "calloc %d NMI", topo.max_cpu_num + 1);

}



int update_topo(struct thread_data *t, struct core_data *c, struct pkg_data *p)