p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmaengine: dmatest: Abort test in case of mapping error 

In case of mapping error the DMA addresses are invalid and continuing
will screw system memory or potentially something else.

[  222.480310] dmatest: dma0chan7-copy0: summary 1 tests, 3 failures 6 iops 349 KB/s (0)
...
[  240.912725] check: Corrupted low memory at 00000000c7c75ac9 (2940 phys) = 5656000000000000
[  240.921998] check: Corrupted low memory at 000000005715a1cd (2948 phys) = 279f2aca5595ab2b
[  240.931280] check: Corrupted low memory at 000000002f4024c0 (2950 phys) = 5e5624f349e793cf
...

Abort any test if mapping failed.

Fixes: 4076e755db ("dmatest: convert to dmaengine_unmap_data")
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Andy Shevchenko 2019-01-30 21:48:44 +02:00 committed by Vinod Koul
parent 6d66c8d1a0
commit 6454368a80
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/dma/dmatest.c
View File

@ -711,11 +711,9 @@ static int dmatest_func(void *data)
srcs[i] = um->addr[i] + src_off; srcs[i] = um->addr[i] + src_off;
ret = dma_mapping_error(dev->dev, um->addr[i]); ret = dma_mapping_error(dev->dev, um->addr[i]);
if (ret) { if (ret) {
dmaengine_unmap_put(um);
result("src mapping error", total_tests, result("src mapping error", total_tests,
src_off, dst_off, len, ret); src_off, dst_off, len, ret);
failed_tests++; goto error_unmap_continue;
continue;
} }
um->to_cnt++; um->to_cnt++;
} }
@ -730,11 +728,9 @@ static int dmatest_func(void *data)
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
ret = dma_mapping_error(dev->dev, dsts[i]); ret = dma_mapping_error(dev->dev, dsts[i]);
if (ret) { if (ret) {
dmaengine_unmap_put(um);
result("dst mapping error", total_tests, result("dst mapping error", total_tests,
src_off, dst_off, len, ret); src_off, dst_off, len, ret);
failed_tests++; goto error_unmap_continue;
continue;
} }
um->bidi_cnt++; um->bidi_cnt++;
} }
@ -762,12 +758,10 @@ static int dmatest_func(void *data)
} }
if (!tx) { if (!tx) {
dmaengine_unmap_put(um);
result("prep error", total_tests, src_off, result("prep error", total_tests, src_off,
dst_off, len, ret); dst_off, len, ret);
msleep(100); msleep(100);
failed_tests++; goto error_unmap_continue;
continue;
} }
done->done = false; done->done = false;
@ -776,12 +770,10 @@ static int dmatest_func(void *data)
cookie = tx->tx_submit(tx); cookie = tx->tx_submit(tx);
if (dma_submit_error(cookie)) { if (dma_submit_error(cookie)) {
dmaengine_unmap_put(um);
result("submit error", total_tests, src_off, result("submit error", total_tests, src_off,
dst_off, len, ret); dst_off, len, ret);
msleep(100); msleep(100);
failed_tests++; goto error_unmap_continue;
continue;
} }
dma_async_issue_pending(chan); dma_async_issue_pending(chan);
@ -790,22 +782,20 @@ static int dmatest_func(void *data)
status = dma_async_is_tx_complete(chan, cookie, NULL, NULL); status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
dmaengine_unmap_put(um);
if (!done->done) { if (!done->done) {
result("test timed out", total_tests, src_off, dst_off, result("test timed out", total_tests, src_off, dst_off,
len, 0); len, 0);
failed_tests++; goto error_unmap_continue;
continue;
} else if (status != DMA_COMPLETE) { } else if (status != DMA_COMPLETE) {
result(status == DMA_ERROR ? result(status == DMA_ERROR ?
"completion error status" : "completion error status" :
"completion busy status", total_tests, src_off, "completion busy status", total_tests, src_off,
dst_off, len, ret); dst_off, len, ret);
failed_tests++; goto error_unmap_continue;
continue;
} }
dmaengine_unmap_put(um);
if (params->noverify) { if (params->noverify) {
verbose_result("test passed", total_tests, src_off, verbose_result("test passed", total_tests, src_off,
dst_off, len, 0); dst_off, len, 0);
@ -846,6 +836,12 @@ static int dmatest_func(void *data)
verbose_result("test passed", total_tests, src_off, verbose_result("test passed", total_tests, src_off,
dst_off, len, 0); dst_off, len, 0);
} }
continue;
error_unmap_continue:
dmaengine_unmap_put(um);
failed_tests++;
} }
ktime = ktime_sub(ktime_get(), ktime); ktime = ktime_sub(ktime_get(), ktime);
ktime = ktime_sub(ktime, comparetime); ktime = ktime_sub(ktime, comparetime);