 @@ -1,40 +1,40 @@
-.\" $NetBSD: intrctl.8,v 1.3 2016/10/12 21:47:37 jdolecek Exp $
+.\" $NetBSD: intrctl.8,v 1.4 2016/10/15 12:06:27 jdolecek Exp $
 .\"
 .\" Copyright (c) 2015 Internet Initiative Japan Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 12, 2016
+.Dd October 15, 2016
 .Dt INTRCTL 8
 .Os
 .Sh NAME
 .Nm intrctl
 .Nd program to control interrupts
 .Sh SYNOPSIS
 .Nm intrctl
 .Ar command
 .Op Ar options
 .Sh DESCRIPTION
 The
 .Nm
 command can be used to control and inspect the state of interrupts
 @@ -46,29 +46,34 @@ specifies the action to take.
 Valid commands are:
 .Bl -tag -width XofflineXcpunoX
 .It affinity Fl c Ar cpu_index Fl i Ar intrid
 set an
 .Ar intrid
 interrupt's affinity to
 .Ar cpu_index .
 .It intr Fl c Ar cpu_index
 enable to set an interrupt's affinity to
 .Ar cpu_index .
 If
 .Ar cpu_index
 is already enabled, this command has no effect.
-.It list
+.It list Op Fl c
 for each intrid in the system, display interrupt counts per CPU.
 The intrid is an interrupt name such as "ioapic0 pin 22" for x86.
 .Pp
 If
 .Fl c
 is specified, display compact list with total counts per interrupt,
 and CPU affinity as comma separated list of CPU indexes.
 .It nointr Fl c Ar cpu_index
 disable to set an interrupt's affinity to
 .Ar cpu_index .
 If
 .Ar cpu_index
 is already disabled, this command has no effect.
 .El
 .Sh SEE ALSO
 .Xr cpuctl 8
 .Sh HISTORY
 .Nm
 first appeared in
 .Nx 8.0 .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intrctl.c,v 1.3 2016/09/19 18:46:39 ryo Exp $	*/
+/*	$NetBSD: intrctl.c,v 1.4 2016/10/15 12:06:27 jdolecek Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: intrctl.c,v 1.3 2016/09/19 18:46:39 ryo Exp $");
+__RCSID("$NetBSD: intrctl.c,v 1.4 2016/10/15 12:06:27 jdolecek Exp $");
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/intrio.h>
 #include <sys/types.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <sched.h>
 #include <stdint.h>
 @@ -89,44 +89,56 @@ main(int argc, char **argv)
 	if (ct->label == NULL)
 		errx(EXIT_FAILURE, "unknown command ``%s''", cmdname);
 	(*ct->func)(argc, argv);
 	exit(EXIT_SUCCESS);
 	/* NOTREACHED */
+}
 static void
 usage(void)
+{
 	const char *progname = getprogname();
-	fprintf(stderr, "usage: %s list\n", progname);
+	fprintf(stderr, "usage: %s list [-c]\n", progname);
 	fprintf(stderr, "       %s affinity -i interrupt_name -c cpu_index\n", progname);
 	fprintf(stderr, "       %s intr -c cpu_index\n", progname);
 	fprintf(stderr, "       %s nointr -c cpu_index\n", progname);
 	exit(EXIT_FAILURE);
 	/* NOTREACHED */
+}
 static int intrctl_io_alloc_retry_count = 4;
 static void
 intrctl_list(int argc, char **argv)
+{
 	char buf[64];
 	struct intrio_list_line *illine;
 	int i, ncpus, *cpucol;
 	void *handle;
 	size_t intridlen;
 	int compact = 0;
 	char ch;
 	while ((ch = getopt(argc, argv, "c")) != -1) {
 		switch (ch) {
 		case 'c':
 			compact = 1;
 			break;
 		default:
 			usage();
+		}
+	}
 	handle = intrctl_io_alloc(intrctl_io_alloc_retry_count);
 	if (handle == NULL)
 		err(EXIT_FAILURE, "intrctl_io_alloc");
 	/* calc columns */
 	ncpus = intrctl_io_ncpus(handle);
 	intridlen = strlen("interrupt id");
 	for (illine = intrctl_io_firstline(handle); illine != NULL;
 	    illine = intrctl_io_nextline(handle, illine)) {
 		size_t len = strlen(illine->ill_intrid);
 		if (intridlen < len)
 			intridlen = len;
 @@ -142,41 +154,69 @@ intrctl_list(int argc, char **argv)
 	for (illine = intrctl_io_firstline(handle); illine != NULL;
 	    illine = intrctl_io_nextline(handle, illine)) {
 		for (i = 0; i < ncpus; i++) {
 			int len;
 			snprintf(buf, sizeof(buf), "%" PRIu64,
 			    illine->ill_cpu[i].illc_count);
 			len = (int)strlen(buf);
 			if (cpucol[i] < len)
 				cpucol[i] = len;
+		}
+	}
 	/* header */
-	printf("%-*s  ", (int)intridlen, "interrupt id");
+	printf("%-*s", (int)intridlen, "interrupt id");
-	for (i = 0; i < ncpus; i++) {
+	if (compact) {
-		snprintf(buf, sizeof(buf), "CPU%u", i);
+		printf(" %20s ", "total");
-		printf("%*s  ", cpucol[i], buf);
+		printf(" %20s ", "affinity");
 	} else {
 		for (i = 0; i < ncpus; i++) {
 			snprintf(buf, sizeof(buf), "CPU%u", i);
 			printf("%*s  ", cpucol[i], buf);
+		}
+	}
 	printf("device name(s)\n");
 	/* body */
 	for (illine = intrctl_io_firstline(handle); illine != NULL;
 	    illine = intrctl_io_nextline(handle, illine)) {
-		printf("%-*s  ", (int)intridlen, illine->ill_intrid);
+		struct intrio_list_line_cpu *illc;
 		for (i = 0; i < ncpus; i++) {
-			struct intrio_list_line_cpu *illc = &illine->ill_cpu[i];
+		printf("%-*s ", (int)intridlen, illine->ill_intrid);
-			printf("%*" PRIu64 "%c ", cpucol[i], illc->illc_count,
+		if (compact) {
-			    illc->illc_assigned ? '*' : ' ');
+			uint64_t total = 0;
 			char *affinity, *oaffinity = NULL;
 			for (i = 0; i < ncpus; i++) {
 				illc = &illine->ill_cpu[i];
 				total += illc->illc_count;
 				if (illc->illc_assigned) {
 					asprintf(&affinity, "%s%s%d",
 					    oaffinity ? oaffinity : "",
 					    oaffinity ? ", " : "",
 					    i);
 					if (oaffinity)
 						free(oaffinity);
 					oaffinity = affinity;
+				}
+			}
 			printf("%20" PRIu64 " ", total);
 			printf("%20s ", affinity ? affinity : "none");
 			free(affinity);
 		} else {
 			for (i = 0; i < ncpus; i++) {
 				illc = &illine->ill_cpu[i];
 				printf("%*" PRIu64 "%c ", cpucol[i], illc->illc_count,
 				    illc->illc_assigned ? '*' : ' ');
+			}
+		}
 		printf("%s\n", illine->ill_xname);
+	}
 	free(cpucol);
 	intrctl_io_free(handle);
+}
 static void
 intrctl_affinity(int argc, char **argv)
+{
 	struct intrio_set iset;
 	cpuset_t *cpuset;