Validate copied memory to ensure DMA copy did not fail.
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukri...@marvell.com>
---
app/test-dma-perf/benchmark.c | 23 +++++++++++++++++++++--
app/test-dma-perf/main.c | 16 +++++++++++-----
app/test-dma-perf/main.h | 2 +-
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/app/test-dma-perf/benchmark.c b/app/test-dma-perf/benchmark.c
index 523f2fbb5a..c31f1aba93 100644
--- a/app/test-dma-perf/benchmark.c
+++ b/app/test-dma-perf/benchmark.c
@@ -12,6 +12,7 @@
#include <rte_dmadev.h>
#include <rte_malloc.h>
#include <rte_lcore.h>
+#include <rte_random.h>
#include "main.h"
@@ -397,6 +398,11 @@ setup_memory_env(struct test_configure *cfg, struct
rte_mbuf ***srcs,
return -1;
}
+ for (i = 0; i < nr_buf; i++) {
+ memset(rte_pktmbuf_mtod((*srcs)[i], void *), rte_rand(),
buf_size);
+ memset(rte_pktmbuf_mtod((*dsts)[i], void *), 0, buf_size);
+ }
+
if (cfg->transfer_dir == RTE_DMA_DIR_DEV_TO_MEM) {
for (i = 0; i < nr_buf; i++) {
/* Using mbuf structure to hold remote iova address. */
@@ -416,10 +422,10 @@ setup_memory_env(struct test_configure *cfg, struct
rte_mbuf ***srcs,
return 0;
}
-void
+int
mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
{
- uint16_t i;
+ uint32_t i;
uint32_t offset;
unsigned int lcore_id = 0;
struct rte_mbuf **srcs = NULL, **dsts = NULL;
@@ -434,6 +440,7 @@ mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
uint32_t avg_cycles_total;
float mops, mops_total;
float bandwidth, bandwidth_total;
+ int ret = 0;
if (setup_memory_env(cfg, &srcs, &dsts) < 0)
goto out;
@@ -507,6 +514,16 @@ mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
rte_eal_mp_wait_lcore();
+ for (i = 0; i < (nr_buf / nb_workers) * nb_workers; i++) {
+ if (memcmp(rte_pktmbuf_mtod(srcs[i], void *),
+ rte_pktmbuf_mtod(dsts[i], void *),
+ cfg->buf_size.cur) != 0) {
+ printf("Copy validation fails for buffer number %d\n",
i);
+ ret = -1;
+ goto out;
+ }
+ }
+
mops_total = 0;
bandwidth_total = 0;
avg_cycles_total = 0;
@@ -558,4 +575,6 @@ mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
rte_dma_stop(ldm->dma_ids[i]);
}
}
+
+ return ret;
}
diff --git a/app/test-dma-perf/main.c b/app/test-dma-perf/main.c
index 9640356592..3b79694137 100644
--- a/app/test-dma-perf/main.c
+++ b/app/test-dma-perf/main.c
@@ -87,20 +87,24 @@ output_header(uint32_t case_id, struct test_configure
*case_cfg)
output_csv(true);
}
-static void
+static int
run_test_case(struct test_configure *case_cfg)
{
+ int ret = 0;
+
switch (case_cfg->test_type) {
case TEST_TYPE_DMA_MEM_COPY:
- mem_copy_benchmark(case_cfg, true);
+ ret = mem_copy_benchmark(case_cfg, true);
break;
case TEST_TYPE_CPU_MEM_COPY:
- mem_copy_benchmark(case_cfg, false);
+ ret = mem_copy_benchmark(case_cfg, false);
break;
default:
printf("Unknown test type. %s\n", case_cfg->test_type_str);
break;
}
+
+ return ret;
}
static void
@@ -145,8 +149,10 @@ run_test(uint32_t case_id, struct test_configure *case_cfg)
case_cfg->scenario_id++;
printf("\nRunning scenario %d\n", case_cfg->scenario_id);
- run_test_case(case_cfg);
- output_csv(false);
+ if (run_test_case(case_cfg) < 0)
+ printf("\nTest fails! skipping this scenario.\n");
+ else
+ output_csv(false);
if (var_entry->op == OP_ADD)
var_entry->cur += var_entry->incr;
diff --git a/app/test-dma-perf/main.h b/app/test-dma-perf/main.h
index 617f62f085..3d75edd1de 100644
--- a/app/test-dma-perf/main.h
+++ b/app/test-dma-perf/main.h
@@ -66,6 +66,6 @@ struct test_configure {
uint64_t raddr;
};
-void mem_copy_benchmark(struct test_configure *cfg, bool is_dma);
+int mem_copy_benchmark(struct test_configure *cfg, bool is_dma);
#endif /* MAIN_H */
--
2.25.1
