From 88b00b4658f43043c1819d6ac678a8ed8194bcb2 Mon Sep 17 00:00:00 2001 From: cem Date: Mon, 14 Dec 2015 22:02:01 +0000 Subject: ioatcontrol(8): Add support for interrupt coalescing The new flag, -c , sets the interrupt coalescing period in microseconds through the new ioat(4) API ioat_set_interrupt_coalesce(). Also add a -z flag to zero ioat statistics before tests, to make it easy to measure results. Sponsored by: EMC / Isilon Storage Division --- tools/tools/ioat/ioatcontrol.8 | 14 +++++++++++++- tools/tools/ioat/ioatcontrol.c | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/tools/ioat/ioatcontrol.8 b/tools/tools/ioat/ioatcontrol.8 index 002759f..9e156fd 100644 --- a/tools/tools/ioat/ioatcontrol.8 +++ b/tools/tools/ioat/ioatcontrol.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 9, 2015 +.Dd December 14, 2015 .Dt IOATCONTROL 8 .Os .Sh NAME @@ -33,10 +33,12 @@ .Xr ioat 4 .Sh SYNOPSIS .Nm +.Op Fl c Ar period .Op Fl E .Op Fl f .Op Fl m .Op Fl V +.Op Fl z .Ar channel_number .Ar num_txns .Ar [ bufsize @@ -44,9 +46,11 @@ .Ar [ duration ] ] ] .Nm .Fl r +.Op Fl c Ar period .Op Fl v .Op Fl V .Op Fl w +.Op Fl z .Ar channel_number .Ar address .Ar [ bufsize ] @@ -57,6 +61,8 @@ allows one to issue some number of test operations to the driver on a specific hardware channel. The arguments are as follows: .Bl -tag -width Ds +.It Fl c Ar period +Configure the channel's interrupt coalescing period, in microseconds. .It Fl E Test non-contiguous 8k copy. .It Fl f @@ -67,6 +73,8 @@ tests copy) Test memcpy instead of DMA. .It Fl V Verify copies/fills for accuracy +.It Fl z +Zero device statistics before running test. .El .Pp Alternatively one can use @@ -76,6 +84,8 @@ to issue DMA to or from a specific .Ar address . The arguments in "raw" mode are: .Bl -tag -width Ds +.It Fl c Ar period +As above. .It Fl v .Ar address is a kernel virtual address (by default, @@ -90,6 +100,8 @@ Write to the specified .Nm .Fl r reads) +.It Fl z +As above. .El .Pp .Nm diff --git a/tools/tools/ioat/ioatcontrol.c b/tools/tools/ioat/ioatcontrol.c index d40ae15..32decc7 100644 --- a/tools/tools/ioat/ioatcontrol.c +++ b/tools/tools/ioat/ioatcontrol.c @@ -48,10 +48,14 @@ static void usage(void) { - printf("Usage: %s [-E|-f|-m] [-V] [ " + printf("Usage: %s [-E|-f|-m] OPTIONS [ " "[ [duration]]]\n", getprogname()); - printf(" %s -r [-vV] []\n", + printf(" %s -r [-v] OPTIONS []\n\n", getprogname()); + printf(" OPTIONS:\n"); + printf(" -c - Enable interrupt coalescing (us)\n"); + printf(" -V - Enable verification\n"); + printf(" -z - Zero device stats before test\n"); exit(EX_USAGE); } @@ -103,8 +107,11 @@ main(int argc, char **argv) fflag = rflag = Eflag = mflag = false; modeflags = 0; - while ((ch = getopt(argc, argv, "EfmrvVw")) != -1) { + while ((ch = getopt(argc, argv, "c:EfmrvVwz")) != -1) { switch (ch) { + case 'c': + t.coalesce_period = atoi(optarg); + break; case 'E': Eflag = true; modeflags++; @@ -130,6 +137,9 @@ main(int argc, char **argv) case 'w': t.raw_write = true; break; + case 'z': + t.zero_stats = true; + break; default: usage(); } -- cgit v1.1 From 9663eabafdb2a61f95097a65569590453ab1f5be Mon Sep 17 00:00:00 2001 From: adrian Date: Tue, 15 Dec 2015 04:28:31 +0000 Subject: Flip this over to ncurses. --- tools/tools/ath/athratestats/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/athratestats/Makefile index 938f0cb..b5397be 100644 --- a/tools/tools/ath/athratestats/Makefile +++ b/tools/tools/ath/athratestats/Makefile @@ -7,7 +7,7 @@ PROG= athratestats SRCS= main.c opt_ah.h ah_osdep.h -LIBADD+= curses +LIBADD+= ncurses CLEANFILES+= opt_ah.h ah_osdep.h -- cgit v1.1 From 8be98708bc92132cb693225afeb9c9678d8420fd Mon Sep 17 00:00:00 2001 From: brueffer Date: Tue, 15 Dec 2015 13:04:44 +0000 Subject: Assorted grammar, spelling and punctuation fixes. PR: 203336, 203339 Submitted by: espeyb@rpi.edu, themesta@gmail.com MFC after: 1 week --- tools/debugscripts/README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/debugscripts/README b/tools/debugscripts/README index 2081531..a218368 100644 --- a/tools/debugscripts/README +++ b/tools/debugscripts/README @@ -14,8 +14,8 @@ perform kernel debugging, you would do: (kgdb) -This directory also contains a kgdb script that given a crash dump number -automatically extract the path to the kernel source, run gdb to extract -information about kernel modules loaded, and then rerun gdb loading the +This directory also contains a kgdb script that, given a crash dump number, +automatically extracts the path to the kernel source, runs gdb to extract +information about kernel modules loaded, and then reruns gdb loading the necessary symbols for the modules. You need to make sure you build the modules w/ debugging symbols separately to get things to work. -- cgit v1.1 From 22d96ca1259b1d30fed5b6e4c739bf358d14baec Mon Sep 17 00:00:00 2001 From: bdrewery Date: Tue, 15 Dec 2015 18:42:30 +0000 Subject: Correct comment about MAKEOBJDIRPREFIX in src-env.conf. It may only be used with WITH_AUTO_OBJ, which the WITH_DIRDEPS_BUILD does. We could support this in the normal build as well if we forced creating the directory and setting .OBJDIR. Sponsored by: EMC / Isilon Storage Division --- tools/build/options/makeman | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/build/options/makeman b/tools/build/options/makeman index acc0eb5..52f72ee 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -197,11 +197,14 @@ for the build can be controlled via the variable, which defaults to .Pa /etc/src-env.conf . Some examples that may only be set in this file are -.Va MAKEOBJDIRPREFIX , .Va WITH_DIRDEPS_BUILD , and .Va WITH_META_MODE as they are environment-only variables. +Note that +.Va MAKEOBJDIRPREFIX +may be set here only when using +.Va WITH_DIRDEPS_BUILD . .Pp The values of variables are ignored regardless of their setting; even if they would be set to -- cgit v1.1