d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ioatcontrol(8) could exercise 8k-aligned copy with page-break, crc and

Browse Source 
crc-copy modes.

Reviewed by:	cem
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D19780
This commit is contained in:
Tycho Nightingale 2019-04-02 19:06:25 +00:00
parent 9708c3a2b8
commit a8d9ee9c50
4 changed files with 60 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/ioat/ioat_test.c
View File

@ -65,6 +65,7 @@ struct test_transaction {
void *buf[IOAT_MAX_BUFS];
uint32_t length;
uint32_t depth;
uint32_t crc[IOAT_MAX_BUFS];
struct ioat_test *test;
TAILQ_ENTRY(test_transaction) entry;
};
@ -312,6 +313,28 @@ ioat_test_submit_1_tx(struct ioat_test *test, bus_dmaengine_t dma)
desc = ioat_copy_8k_aligned(dma, dest, dst2, src, src2,
cb, tx, flags);
} else if (test->testkind == IOAT_TEST_DMA_8K_PB) {
bus_addr_t src2, dst2;
src2 = vtophys((vm_offset_t)tx->buf[2*i+1] + PAGE_SIZE);
dst2 = vtophys((vm_offset_t)tx->buf[2*i] + PAGE_SIZE);
desc = ioat_copy_8k_aligned(dma, dest, dst2, src, src2,
cb, tx, flags);
} else if (test->testkind == IOAT_TEST_DMA_CRC) {
bus_addr_t crc;
tx->crc[i] = 0;
crc = vtophys((vm_offset_t)&tx->crc[i]);
desc = ioat_crc(dma, src, tx->length,
NULL, crc, cb, tx, flags | DMA_CRC_STORE);
} else if (test->testkind == IOAT_TEST_DMA_CRC_COPY) {
bus_addr_t crc;
tx->crc[i] = 0;
crc = vtophys((vm_offset_t)&tx->crc[i]);
desc = ioat_copy_crc(dma, dest, src, tx->length,
NULL, crc, cb, tx, flags | DMA_CRC_STORE);
}
if (desc == NULL)
break;
@ -346,7 +369,8 @@ ioat_dma_test(void *arg)
test = arg;
memset(__DEVOLATILE(void *, test->status), 0, sizeof(test->status));
if (test->testkind == IOAT_TEST_DMA_8K &&
if ((test->testkind == IOAT_TEST_DMA_8K ||
test->testkind == IOAT_TEST_DMA_8K_PB) &&
test->buffer_size != 2 * PAGE_SIZE) {
ioat_test_log(0, "Asked for 8k test and buffer size isn't 8k\n");
test->status[IOAT_TEST_INVALID_INPUT]++;

3
sys/dev/ioat/ioat_test.h
View File

@ -44,6 +44,9 @@ enum ioat_test_kind {
IOAT_TEST_RAW_DMA,
IOAT_TEST_DMA_8K,
IOAT_TEST_MEMCPY,
IOAT_TEST_DMA_8K_PB,
IOAT_TEST_DMA_CRC,
IOAT_TEST_DMA_CRC_COPY,
IOAT_NUM_TESTKINDS
};

9
tools/tools/ioat/ioatcontrol.8
View File

@ -35,9 +35,12 @@
.Nm
.Op Fl c Ar period
.Op Fl E
.Op Fl e
.Op Fl f
.Op Fl m
.Op Fl V
.Op Fl x
.Op Fl X
.Op Fl z
.Ar channel_number
.Ar num_txns
@ -65,6 +68,8 @@ The arguments are as follows:
Configure the channel's interrupt coalescing period, in microseconds
(defaults to 0).
.It Fl E
Test contiguous 8k copy.
.It Fl e
Test non-contiguous 8k copy.
.It Fl f
Test block fill (by default,
@ -74,6 +79,10 @@ tests copy)
Test memcpy instead of DMA.
.It Fl V
Verify copies/fills for accuracy
.It Fl x
Test DMA CRC.
.It Fl X
Test DMA copy with CRC.
.It Fl z
Zero device statistics before running test.
.El

29
tools/tools/ioat/ioatcontrol.c
View File

@ -54,13 +54,16 @@ usage(void)
printf(" %s -r [-c period] [-vVwz] channel-number address [<bufsize>]\n\n",
getprogname());
printf(" -c period - Enable interrupt coalescing (us) (default: 0)\n");
printf(" -E - Test non-contiguous 8k copy.\n");
printf(" -f - Test block fill (default: DMA copy).\n");
printf(" -E - Test contiguous 8k copy.\n");
printf(" -e - Test non-contiguous 8k copy.\n");
printf(" -f - Test block fill.\n");
printf(" -m - Test memcpy instead of DMA.\n");
printf(" -r - Issue DMA to or from a specific address.\n");
printf(" -V - Enable verification\n");
printf(" -v - <address> is a kernel virtual address\n");
printf(" -w - Write to the specified address\n");
printf(" -x - Test DMA CRC.\n");
printf(" -X - Test DMA CRC copy.\n");
printf(" -z - Zero device stats before test\n");
exit(EX_USAGE);
}
@ -107,15 +110,15 @@ main(int argc, char **argv)
{
struct ioat_test t;
int fd, ch;
bool fflag, rflag, Eflag, mflag;
bool fflag, rflag, Eflag, eflag, mflag, xflag, Xflag;
unsigned modeflags;
memset(&t, 0, sizeof(t));
fflag = rflag = Eflag = mflag = false;
fflag = rflag = Eflag = eflag = mflag = xflag = Xflag = false;
modeflags = 0;
while ((ch = getopt(argc, argv, "c:EfmrvVwz")) != -1) {
while ((ch = getopt(argc, argv, "c:EefmrvVwxXz")) != -1) {
switch (ch) {
case 'c':
t.coalesce_period = atoi(optarg);
@ -124,6 +127,10 @@ main(int argc, char **argv)
Eflag = true;
modeflags++;
break;
case 'e':
eflag = true;
modeflags++;
break;
case 'f':
fflag = true;
modeflags++;
@ -145,6 +152,12 @@ main(int argc, char **argv)
case 'w':
t.raw_write = true;
break;
case 'x':
xflag = true;
break;
case 'X':
Xflag = true;
break;
case 'z':
t.zero_stats = true;
break;
@ -171,11 +184,15 @@ main(int argc, char **argv)
if (fflag)
t.testkind = IOAT_TEST_FILL;
else if (Eflag) {
else if (Eflag || eflag) {
t.testkind = IOAT_TEST_DMA_8K;
t.buffer_size = 8 * 1024;
} else if (mflag)
t.testkind = IOAT_TEST_MEMCPY;
else if (xflag)
t.testkind = IOAT_TEST_DMA_CRC;
else if (xflag)
t.testkind = IOAT_TEST_DMA_CRC_COPY;
t.channel_index = atoi(argv[0]);
if (t.channel_index > 8) {