Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6454368a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

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: 4076e755 ("dmatest: convert to dmaengine_unmap_data")
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6d66c8d1

drivers/dma/dmatest.c

+14 −18
Original line number Diff line number Diff line
@@ -711,11 +711,9 @@ static int dmatest_func(void *data) 
			srcs[i] = um->addr[i] + src_off;

			ret = dma_mapping_error(dev->dev, um->addr[i]);

			if (ret) {

				dmaengine_unmap_put(um);

				result("src mapping error", total_tests,

				       src_off, dst_off, len, ret);

				failed_tests++;

				continue;

				goto error_unmap_continue;

			}

			um->to_cnt++;

		}
@@ -730,11 +728,9 @@ static int dmatest_func(void *data) 
					       DMA_BIDIRECTIONAL);

			ret = dma_mapping_error(dev->dev, dsts[i]);

			if (ret) {

				dmaengine_unmap_put(um);

				result("dst mapping error", total_tests,

				       src_off, dst_off, len, ret);

				failed_tests++;

				continue;

				goto error_unmap_continue;

			}

			um->bidi_cnt++;

		}
@@ -762,12 +758,10 @@ static int dmatest_func(void *data) 
		}



		if (!tx) {

			dmaengine_unmap_put(um);

			result("prep error", total_tests, src_off,

			       dst_off, len, ret);

			msleep(100);

			failed_tests++;

			continue;

			goto error_unmap_continue;

		}



		done->done = false;
@@ -776,12 +770,10 @@ static int dmatest_func(void *data) 
		cookie = tx->tx_submit(tx);



		if (dma_submit_error(cookie)) {

			dmaengine_unmap_put(um);

			result("submit error", total_tests, src_off,

			       dst_off, len, ret);

			msleep(100);

			failed_tests++;

			continue;

			goto error_unmap_continue;

		}

		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);



		dmaengine_unmap_put(um);



		if (!done->done) {

			result("test timed out", total_tests, src_off, dst_off,

			       len, 0);

			failed_tests++;

			continue;

			goto error_unmap_continue;

		} else if (status != DMA_COMPLETE) {

			result(status == DMA_ERROR ?

			       "completion error status" :

			       "completion busy status", total_tests, src_off,

			       dst_off, len, ret);

			failed_tests++;

			continue;

			goto error_unmap_continue;

		}



		dmaengine_unmap_put(um);



		if (params->noverify) {

			verbose_result("test passed", total_tests, src_off,

				       dst_off, len, 0);
@@ -846,6 +836,12 @@ static int dmatest_func(void *data) 
			verbose_result("test passed", total_tests, src_off,

				       dst_off, len, 0);

		}



		continue;



error_unmap_continue:

		dmaengine_unmap_put(um);

		failed_tests++;

	}

	ktime = ktime_sub(ktime_get(), ktime);

	ktime = ktime_sub(ktime, comparetime);