Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134417/?format=api
{ "id": 134417, "url": "http://patches.dpdk.org/api/patches/134417/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231116104012.1985-2-gmuthukrishn@marvell.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231116104012.1985-2-gmuthukrishn@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231116104012.1985-2-gmuthukrishn@marvell.com", "date": "2023-11-16T10:40:10", "name": "[v5,1/3] test/dma: use unit test framework", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3c0d87660bd2949fca36fae29041ea4a64202183", "submitter": { "id": 2301, "url": "http://patches.dpdk.org/api/people/2301/?format=api", "name": "Gowrishankar Muthukrishnan", "email": "gmuthukrishn@marvell.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231116104012.1985-2-gmuthukrishn@marvell.com/mbox/", "series": [ { "id": 30314, "url": "http://patches.dpdk.org/api/series/30314/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30314", "date": "2023-11-16T10:40:09", "name": "test/dma: add vchan reconfig and SG tests", "version": 5, "mbox": "http://patches.dpdk.org/series/30314/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/134417/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/134417/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8F40643343;\n\tThu, 16 Nov 2023 11:40:42 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7E66E402EE;\n\tThu, 16 Nov 2023 11:40:42 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id C661E40150\n for <dev@dpdk.org>; Thu, 16 Nov 2023 11:40:41 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 3AG9AvXc007353; Thu, 16 Nov 2023 02:40:41 -0800", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3uc5vmu7he-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Thu, 16 Nov 2023 02:40:40 -0800", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Thu, 16 Nov 2023 02:40:37 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Thu, 16 Nov 2023 02:40:37 -0800", "from BG-LT91401.marvell.com (BG-LT91401.marvell.com [10.28.168.34])\n by maili.marvell.com (Postfix) with ESMTP id 3B49A3F7085;\n Thu, 16 Nov 2023 02:40:33 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=oswLE6n5yPa2Cg+RZiwUhYZ6DCggxK21/DVq/3idNZA=;\n b=CL+ItFnQXIesN98fP3s2kdYCJ7eF1JscOpImmAd/aJ/v3dduIL3A/jnnmeMB4xIk5gdW\n AjR/s5xQ+yKTSFKM7Q//ou58iezJ3ONIvAI00zueTyU2NV2X3btuaoBcAqY3NcBy1AVz\n bcC7fKsztZ80bhKWAo9DfPc0NhTVLPzwI60toTfLz0d5SYLY7F3zW+ejnfNw5Zgbkzut\n 6YyLgcZryrNoGMKQyM0lMMGzw9NcHCXTOt1FE/d+vBzlTP8L2Sv4yw3Cmt0fC/srXmJb\n zUrLUYkY6y40OBPHxRP97oHwoyEeozOWwL19CAAVYkLe3xu90HZ4nD3KMS4xLyOO6UZ9 IA==", "From": "Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<anoobj@marvell.com>, Chengwen Feng <fengchengwen@huawei.com>, \"Vamsi\n Attunuru\" <vattunuru@marvell.com>, Amit Prakash Shukla\n <amitprakashs@marvell.com>, Vidya Sagar Velumuri <vvelumuri@marvell.com>,\n Kevin Laatz <kevin.laatz@intel.com>, Bruce Richardson\n <bruce.richardson@intel.com>, Gowrishankar Muthukrishnan\n <gmuthukrishn@marvell.com>", "Subject": "[PATCH v5 1/3] test/dma: use unit test framework", "Date": "Thu, 16 Nov 2023 16:10:10 +0530", "Message-ID": "<20231116104012.1985-2-gmuthukrishn@marvell.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20231116104012.1985-1-gmuthukrishn@marvell.com>", "References": "<cover.1699879558.git.gmuthukrishn@marvell.com>\n <20231116104012.1985-1-gmuthukrishn@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "_a25KBJ-JStn0eXQ548WxcHs_aA8NKsl", "X-Proofpoint-GUID": "_a25KBJ-JStn0eXQ548WxcHs_aA8NKsl", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2023-11-16_09,2023-11-16_01,2023-05-22_02", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Use unit test framework to execute DMA tests.\n\nSigned-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>\nAcked-by: Chengwen Feng <fengchengwen@huawei.com>\n---\n app/test/test_dmadev.c | 236 +++++++++++++++++++++++++------------\n app/test/test_dmadev_api.c | 95 +++++----------\n 2 files changed, 193 insertions(+), 138 deletions(-)", "diff": "diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c\nindex 7581fc2b4c..a1505716d1 100644\n--- a/app/test/test_dmadev.c\n+++ b/app/test/test_dmadev.c\n@@ -21,8 +21,12 @@\n #define TEST_RINGSIZE 512\n #define COPY_LEN 1024\n \n+static struct rte_dma_info info;\n static struct rte_mempool *pool;\n+static bool check_err_stats;\n+static int16_t test_dev_id;\n static uint16_t id_count;\n+static uint16_t vchan;\n \n enum {\n \tTEST_PARAM_REMOTE_ADDR = 0,\n@@ -61,13 +65,28 @@ print_err(const char *func, int lineno, const char *format, ...)\n \tva_end(ap);\n }\n \n+struct runtest_param {\n+\tconst char name[NAME_MAX];\n+\tint (*test_fn)(int16_t dev_id, uint16_t vchan);\n+\tint iterations;\n+};\n+\n static int\n-runtest(const char *printable, int (*test_fn)(int16_t dev_id, uint16_t vchan), int iterations,\n-\t\tint16_t dev_id, uint16_t vchan, bool check_err_stats)\n+runtest(const void *args)\n {\n+\tint (*test_fn)(int16_t dev_id, uint16_t vchan);\n+\tconst struct runtest_param *param = args;\n \tstruct rte_dma_stats stats;\n+\tconst char *printable;\n+\tint iterations;\n+\tint16_t dev_id;\n \tint i;\n \n+\tprintable = param->name;\n+\titerations = param->iterations;\n+\ttest_fn = param->test_fn;\n+\tdev_id = test_dev_id;\n+\n \trte_dma_stats_reset(dev_id, vchan);\n \tprintf(\"DMA Dev %d: Running %s Tests %s\\n\", dev_id, printable,\n \t\t\tcheck_err_stats ? \" \" : \"(errors expected)\");\n@@ -911,26 +930,87 @@ prepare_m2d_auto_free(int16_t dev_id, uint16_t vchan)\n }\n \n static int\n-test_dmadev_instance(int16_t dev_id)\n+test_dmadev_burst_setup(void)\n+{\n+\tif (rte_dma_burst_capacity(test_dev_id, vchan) < 64) {\n+\t\tRTE_LOG(ERR, USER1,\n+\t\t\t\"DMA Dev %u: insufficient burst capacity (64 required), skipping tests\\n\",\n+\t\t\ttest_dev_id);\n+\t\treturn TEST_SKIPPED;\n+\t}\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static int\n+test_dmadev_err_handling_setup(void)\n+{\n+\tint ret = TEST_SKIPPED;\n+\n+\t/* to test error handling we can provide null pointers for source or dest in copies. This\n+\t * requires VA mode in DPDK, since NULL(0) is a valid physical address.\n+\t * We also need hardware that can report errors back.\n+\t */\n+\tif (rte_eal_iova_mode() != RTE_IOVA_VA)\n+\t\tRTE_LOG(ERR, USER1,\n+\t\t\t\"DMA Dev %u: DPDK not in VA mode, skipping error handling tests\\n\",\n+\t\t\ttest_dev_id);\n+\telse if ((info.dev_capa & RTE_DMA_CAPA_HANDLES_ERRORS) == 0)\n+\t\tRTE_LOG(ERR, USER1,\n+\t\t\t\"DMA Dev %u: device does not report errors, skipping error handling tests\\n\",\n+\t\t\ttest_dev_id);\n+\telse\n+\t\tret = TEST_SUCCESS;\n+\n+\treturn ret;\n+}\n+\n+static int\n+test_dmadev_fill_setup(void)\n+{\n+\tint ret = TEST_SUCCESS;\n+\n+\tif ((info.dev_capa & RTE_DMA_CAPA_OPS_FILL) == 0) {\n+\t\tRTE_LOG(ERR, USER1,\n+\t\t\t\"DMA Dev %u: No device fill support, skipping fill tests\\n\", test_dev_id);\n+\t\tret = TEST_SKIPPED;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+test_dmadev_autofree_setup(void)\n+{\n+\tint ret = TEST_SKIPPED;\n+\n+\tif ((info.dev_capa & RTE_DMA_CAPA_M2D_AUTO_FREE) &&\n+\t dma_add_test[TEST_M2D_AUTO_FREE].enabled == true) {\n+\t\tif (prepare_m2d_auto_free(test_dev_id, vchan) != 0)\n+\t\t\treturn ret;\n+\n+\t\tret = TEST_SUCCESS;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+test_dmadev_setup(void)\n {\n-#define CHECK_ERRS true\n+\tint16_t dev_id = test_dev_id;\n \tstruct rte_dma_stats stats;\n-\tstruct rte_dma_info info;\n \tconst struct rte_dma_conf conf = { .nb_vchans = 1};\n \tconst struct rte_dma_vchan_conf qconf = {\n \t\t\t.direction = RTE_DMA_DIR_MEM_TO_MEM,\n \t\t\t.nb_desc = TEST_RINGSIZE,\n \t};\n-\tconst int vchan = 0;\n \tint ret;\n \n \tret = rte_dma_info_get(dev_id, &info);\n \tif (ret != 0)\n \t\tERR_RETURN(\"Error with rte_dma_info_get()\\n\");\n \n-\tprintf(\"\\n### Test dmadev instance %u [%s]\\n\",\n-\t\t\tdev_id, info.dev_name);\n-\n \tif (info.max_vchans < 1)\n \t\tERR_RETURN(\"Error, no channels available on device id %u\\n\", dev_id);\n \n@@ -969,76 +1049,82 @@ test_dmadev_instance(int16_t dev_id)\n \tif (pool == NULL)\n \t\tERR_RETURN(\"Error with mempool creation\\n\");\n \n-\t/* run the test cases, use many iterations to ensure UINT16_MAX id wraparound */\n-\tif (runtest(\"copy\", test_enqueue_copies, 640, dev_id, vchan, CHECK_ERRS) < 0)\n-\t\tgoto err;\n-\n-\t/* run tests stopping/starting devices and check jobs still work after restart */\n-\tif (runtest(\"stop-start\", test_stop_start, 1, dev_id, vchan, CHECK_ERRS) < 0)\n-\t\tgoto err;\n-\n-\t/* run some burst capacity tests */\n-\tif (rte_dma_burst_capacity(dev_id, vchan) < 64)\n-\t\tprintf(\"DMA Dev %u: insufficient burst capacity (64 required), skipping tests\\n\",\n-\t\t\t\tdev_id);\n-\telse if (runtest(\"burst capacity\", test_burst_capacity, 1, dev_id, vchan, CHECK_ERRS) < 0)\n-\t\tgoto err;\n-\n-\t/* to test error handling we can provide null pointers for source or dest in copies. This\n-\t * requires VA mode in DPDK, since NULL(0) is a valid physical address.\n-\t * We also need hardware that can report errors back.\n-\t */\n-\tif (rte_eal_iova_mode() != RTE_IOVA_VA)\n-\t\tprintf(\"DMA Dev %u: DPDK not in VA mode, skipping error handling tests\\n\", dev_id);\n-\telse if ((info.dev_capa & RTE_DMA_CAPA_HANDLES_ERRORS) == 0)\n-\t\tprintf(\"DMA Dev %u: device does not report errors, skipping error handling tests\\n\",\n-\t\t\t\tdev_id);\n-\telse if (runtest(\"error handling\", test_completion_handling, 1,\n-\t\t\tdev_id, vchan, !CHECK_ERRS) < 0)\n-\t\tgoto err;\n-\n-\tif ((info.dev_capa & RTE_DMA_CAPA_OPS_FILL) == 0)\n-\t\tprintf(\"DMA Dev %u: No device fill support, skipping fill tests\\n\", dev_id);\n-\telse if (runtest(\"fill\", test_enqueue_fill, 1, dev_id, vchan, CHECK_ERRS) < 0)\n-\t\tgoto err;\n-\n-\tif ((info.dev_capa & RTE_DMA_CAPA_M2D_AUTO_FREE) &&\n-\t dma_add_test[TEST_M2D_AUTO_FREE].enabled == true) {\n-\t\tif (prepare_m2d_auto_free(dev_id, vchan) != 0)\n-\t\t\tgoto err;\n-\t\tif (runtest(\"m2d_auto_free\", test_m2d_auto_free, 128, dev_id, vchan,\n-\t\t\t CHECK_ERRS) < 0)\n-\t\t\tgoto err;\n-\t}\n-\n-\trte_mempool_free(pool);\n-\n-\tif (rte_dma_stop(dev_id) < 0)\n-\t\tERR_RETURN(\"Error stopping device %u\\n\", dev_id);\n+\tcheck_err_stats = false;\n+\tvchan = 0;\n \n-\trte_dma_stats_reset(dev_id, vchan);\n \treturn 0;\n+}\n \n-err:\n+static void\n+test_dmadev_teardown(void)\n+{\n \trte_mempool_free(pool);\n-\trte_dma_stop(dev_id);\n-\treturn -1;\n+\trte_dma_stop(test_dev_id);\n+\trte_dma_stats_reset(test_dev_id, vchan);\n+\ttest_dev_id = -EINVAL;\n }\n \n static int\n-test_apis(void)\n+test_dmadev_instance(int16_t dev_id)\n {\n-\tconst char *pmd = \"dma_skeleton\";\n-\tint id;\n+\tstruct rte_dma_info dev_info;\n+\tenum {\n+\t\t TEST_COPY = 0,\n+\t\t TEST_START,\n+\t\t TEST_BURST,\n+\t\t TEST_ERR,\n+\t\t TEST_FILL,\n+\t\t TEST_M2D,\n+\t\t TEST_END\n+\t};\n+\n+\tstatic struct runtest_param param[] = {\n+\t\t{\"copy\", test_enqueue_copies, 640},\n+\t\t{\"stop_start\", test_stop_start, 1},\n+\t\t{\"burst_capacity\", test_burst_capacity, 1},\n+\t\t{\"error_handling\", test_completion_handling, 1},\n+\t\t{\"fill\", test_enqueue_fill, 1},\n+\t\t{\"m2d_auto_free\", test_m2d_auto_free, 128},\n+\t};\n+\n+\tstatic struct unit_test_suite ts = {\n+\t\t.suite_name = \"DMA dev instance testsuite\",\n+\t\t.setup = test_dmadev_setup,\n+\t\t.teardown = test_dmadev_teardown,\n+\t\t.unit_test_cases = {\n+\t\t\tTEST_CASE_NAMED_WITH_DATA(param[TEST_COPY].name,\n+\t\t\t\tNULL, NULL,\n+\t\t\t\truntest, ¶m[TEST_COPY]),\n+\t\t\tTEST_CASE_NAMED_WITH_DATA(param[TEST_START].name,\n+\t\t\t\tNULL, NULL,\n+\t\t\t\truntest, ¶m[TEST_START]),\n+\t\t\tTEST_CASE_NAMED_WITH_DATA(param[TEST_BURST].name,\n+\t\t\t\ttest_dmadev_burst_setup, NULL,\n+\t\t\t\truntest, ¶m[TEST_BURST]),\n+\t\t\tTEST_CASE_NAMED_WITH_DATA(param[TEST_ERR].name,\n+\t\t\t\ttest_dmadev_err_handling_setup, NULL,\n+\t\t\t\truntest, ¶m[TEST_ERR]),\n+\t\t\tTEST_CASE_NAMED_WITH_DATA(param[TEST_FILL].name,\n+\t\t\t\ttest_dmadev_fill_setup, NULL,\n+\t\t\t\truntest, ¶m[TEST_FILL]),\n+\t\t\tTEST_CASE_NAMED_WITH_DATA(param[TEST_M2D].name,\n+\t\t\t\ttest_dmadev_autofree_setup, NULL,\n+\t\t\t\truntest, ¶m[TEST_M2D]),\n+\t\t\tTEST_CASES_END()\n+\t\t}\n+\t};\n+\n \tint ret;\n \n-\t/* attempt to create skeleton instance - ignore errors due to one being already present */\n-\trte_vdev_init(pmd, NULL);\n-\tid = rte_dma_get_dev_id_by_name(pmd);\n-\tif (id < 0)\n+\tif (rte_dma_info_get(dev_id, &dev_info) < 0)\n \t\treturn TEST_SKIPPED;\n-\tprintf(\"\\n### Test dmadev infrastructure using skeleton driver\\n\");\n-\tret = test_dma_api(id);\n+\n+\ttest_dev_id = dev_id;\n+\tprintf(\"\\n### Test dmadev instance %u [%s]\\n\",\n+\t\t test_dev_id, dev_info.dev_name);\n+\n+\tret = unit_test_suite_runner(&ts);\n+\ttest_dev_id = -EINVAL;\n \n \treturn ret;\n }\n@@ -1083,22 +1169,26 @@ parse_dma_env_var(void)\n static int\n test_dma(void)\n {\n+\tconst char *pmd = \"dma_skeleton\";\n \tint i;\n \n \tparse_dma_env_var();\n \n-\t/* basic sanity on dmadev infrastructure */\n-\tif (test_apis() < 0)\n-\t\tERR_RETURN(\"Error performing API tests\\n\");\n+\t/* attempt to create skeleton instance - ignore errors due to one being already present*/\n+\trte_vdev_init(pmd, NULL);\n \n \tif (rte_dma_count_avail() == 0)\n \t\treturn TEST_SKIPPED;\n \n-\tRTE_DMA_FOREACH_DEV(i)\n+\tRTE_DMA_FOREACH_DEV(i) {\n+\t\tif (test_dma_api(i) < 0)\n+\t\t\tERR_RETURN(\"Error performing API tests\\n\");\n+\n \t\tif (test_dmadev_instance(i) < 0)\n \t\t\tERR_RETURN(\"Error, test failure for device %d\\n\", i);\n+\t}\n \n \treturn 0;\n }\n \n-REGISTER_DRIVER_TEST(dmadev_autotest, test_dma);\n+REGISTER_TEST_COMMAND(dmadev_autotest, test_dma);\ndiff --git a/app/test/test_dmadev_api.c b/app/test/test_dmadev_api.c\nindex 4a181af90a..73d4db825a 100644\n--- a/app/test/test_dmadev_api.c\n+++ b/app/test/test_dmadev_api.c\n@@ -9,31 +9,22 @@\n #include <rte_test.h>\n #include <rte_dmadev.h>\n \n-extern int test_dma_api(uint16_t dev_id);\n+#include \"test.h\"\n \n-#define DMA_TEST_API_RUN(test) \\\n-\ttestsuite_run_test(test, #test)\n+extern int test_dma_api(uint16_t dev_id);\n \n #define TEST_MEMCPY_SIZE\t1024\n #define TEST_WAIT_US_VAL\t50000\n \n-#define TEST_SUCCESS 0\n-#define TEST_FAILED -1\n-\n static int16_t test_dev_id;\n static int16_t invalid_dev_id;\n \n static char *src;\n static char *dst;\n \n-static int total;\n-static int passed;\n-static int failed;\n-\n static int\n-testsuite_setup(int16_t dev_id)\n+testsuite_setup(void)\n {\n-\ttest_dev_id = dev_id;\n \tinvalid_dev_id = -1;\n \n \tsrc = rte_malloc(\"dmadev_test_src\", TEST_MEMCPY_SIZE, 0);\n@@ -46,10 +37,6 @@ testsuite_setup(int16_t dev_id)\n \t\treturn -ENOMEM;\n \t}\n \n-\ttotal = 0;\n-\tpassed = 0;\n-\tfailed = 0;\n-\n \t/* Set dmadev log level to critical to suppress unnecessary output\n \t * during API tests.\n \t */\n@@ -71,25 +58,6 @@ testsuite_teardown(void)\n \trte_log_set_level_pattern(\"lib.dmadev\", RTE_LOG_INFO);\n }\n \n-static void\n-testsuite_run_test(int (*test)(void), const char *name)\n-{\n-\tint ret = 0;\n-\n-\tif (test) {\n-\t\tret = test();\n-\t\tif (ret < 0) {\n-\t\t\tfailed++;\n-\t\t\tprintf(\"%s Failed\\n\", name);\n-\t\t} else {\n-\t\t\tpassed++;\n-\t\t\tprintf(\"%s Passed\\n\", name);\n-\t\t}\n-\t}\n-\n-\ttotal++;\n-}\n-\n static int\n test_dma_get_dev_id_by_name(void)\n {\n@@ -301,7 +269,7 @@ setup_one_vchan(void)\n \n \tret = rte_dma_info_get(test_dev_id, &dev_info);\n \tRTE_TEST_ASSERT_SUCCESS(ret, \"Failed to obtain device info, %d\", ret);\n-\tdev_conf.nb_vchans = dev_info.max_vchans;\n+\tdev_conf.nb_vchans = 1;\n \tret = rte_dma_configure(test_dev_id, &dev_conf);\n \tRTE_TEST_ASSERT_SUCCESS(ret, \"Failed to configure, %d\", ret);\n \tvchan_conf.direction = RTE_DMA_DIR_MEM_TO_MEM;\n@@ -537,38 +505,35 @@ test_dma_completed_status(void)\n \treturn TEST_SUCCESS;\n }\n \n+static struct unit_test_suite dma_api_testsuite = {\n+\t.suite_name = \"DMA API Test Suite\",\n+\t.setup = testsuite_setup,\n+\t.teardown = testsuite_teardown,\n+\t.unit_test_cases = {\n+\t\tTEST_CASE(test_dma_get_dev_id_by_name),\n+\t\tTEST_CASE(test_dma_is_valid_dev),\n+\t\tTEST_CASE(test_dma_count),\n+\t\tTEST_CASE(test_dma_info_get),\n+\t\tTEST_CASE(test_dma_configure),\n+\t\tTEST_CASE(test_dma_vchan_setup),\n+\t\tTEST_CASE(test_dma_start_stop),\n+\t\tTEST_CASE(test_dma_stats),\n+\t\tTEST_CASE(test_dma_dump),\n+\t\tTEST_CASE(test_dma_completed),\n+\t\tTEST_CASE(test_dma_completed_status),\n+\t\tTEST_CASES_END()\n+\t}\n+};\n+\n int\n test_dma_api(uint16_t dev_id)\n {\n-\tint ret = testsuite_setup(dev_id);\n-\tif (ret) {\n-\t\tprintf(\"testsuite setup fail!\\n\");\n-\t\treturn -1;\n-\t}\n+\tstruct rte_dma_info dev_info;\n \n-\t/* If the testcase exit successfully, ensure that the test dmadev exist\n-\t * and the dmadev is in the stopped state.\n-\t */\n-\tDMA_TEST_API_RUN(test_dma_get_dev_id_by_name);\n-\tDMA_TEST_API_RUN(test_dma_is_valid_dev);\n-\tDMA_TEST_API_RUN(test_dma_count);\n-\tDMA_TEST_API_RUN(test_dma_info_get);\n-\tDMA_TEST_API_RUN(test_dma_configure);\n-\tDMA_TEST_API_RUN(test_dma_vchan_setup);\n-\tDMA_TEST_API_RUN(test_dma_start_stop);\n-\tDMA_TEST_API_RUN(test_dma_stats);\n-\tDMA_TEST_API_RUN(test_dma_dump);\n-\tDMA_TEST_API_RUN(test_dma_completed);\n-\tDMA_TEST_API_RUN(test_dma_completed_status);\n-\n-\ttestsuite_teardown();\n-\n-\tprintf(\"Total tests : %d\\n\", total);\n-\tprintf(\"Passed : %d\\n\", passed);\n-\tprintf(\"Failed : %d\\n\", failed);\n-\n-\tif (failed)\n-\t\treturn -1;\n+\tif (rte_dma_info_get(dev_id, &dev_info) < 0)\n+\t\treturn TEST_SKIPPED;\n \n-\treturn 0;\n+\tprintf(\"\\n### Test dmadev infrastructure using %u [%s]\\n\", dev_id, dev_info.dev_name);\n+\ttest_dev_id = dev_id;\n+\treturn unit_test_suite_runner(&dma_api_testsuite);\n };\n", "prefixes": [ "v5", "1/3" ] }