From patchwork Thu Nov 16 17:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gowrishankar Muthukrishnan X-Patchwork-Id: 134432 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id D9E0D43347; Thu, 16 Nov 2023 18:45:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3E4140698; Thu, 16 Nov 2023 18:45:51 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 471F140150 for ; Thu, 16 Nov 2023 18:45:48 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AGFZ8Ac027217; Thu, 16 Nov 2023 09:45:47 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=ybULPBZXxjfp/jBJzBKNZfYI2JDu2hPe75RbxMm0k98=; b=jPCQ0J6J97nLqYKqAxW87VIXUXLLVvhSRhbaczjn1XGXmx3L2wux5PYuB0ZPsDFguQue DWhB/9YtjqOZvXYZSQWTsj8WN6qXDHWQlNELBTomdxqwhGfGzIB5jrjgaQUnEc1QYdBh MifL+CQw9iGLeovhWMt0JW4DGy0rhtcB8iRP3h80dQdpfUQo7j4RfNCaUVpfzeCilWy2 GcWD8e9yfiHHH9uliDy/ChgidHl8tg2vysjMfi6DeXHiRbGPaS6YBzmskzTNGPuBylQK VaOBo8/TjugbIrWYJu2X+kIBdYujfeioM2No3FdS9t1drp/kL/I/JZLcymtRDXiWDt7+ lQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3udgkahq26-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 16 Nov 2023 09:45:46 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 16 Nov 2023 09:45:37 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 16 Nov 2023 09:45:37 -0800 Received: from BG-LT91401.marvell.com (BG-LT91401.marvell.com [10.28.168.34]) by maili.marvell.com (Postfix) with ESMTP id 398123F706D; Thu, 16 Nov 2023 09:45:33 -0800 (PST) From: Gowrishankar Muthukrishnan To: CC: , Chengwen Feng , "Vamsi Attunuru" , Amit Prakash Shukla , Vidya Sagar Velumuri , Kevin Laatz , Bruce Richardson , Gowrishankar Muthukrishnan Subject: [PATCH v8 1/3] test/dma: use unit test framework Date: Thu, 16 Nov 2023 23:15:25 +0530 Message-ID: <1a2e7847f73dc0f8f2b8fff956c9e5709a3c82bb.1700156485.git.gmuthukrishn@marvell.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: oc_VTumLz-486ZxVL8_ZawSEbaIi2a5h X-Proofpoint-GUID: oc_VTumLz-486ZxVL8_ZawSEbaIi2a5h X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_19,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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use unit test framework to execute DMA tests. Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Chengwen Feng --- v8: - Used local macro instead of NAME_MAX, due to compilation issue in Windows. --- app/test/test_dmadev.c | 235 +++++++++++++++++++++++++------------ app/test/test_dmadev_api.c | 95 +++++---------- 2 files changed, 193 insertions(+), 137 deletions(-) diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c index 7581fc2b4c..94673720c4 100644 --- a/app/test/test_dmadev.c +++ b/app/test/test_dmadev.c @@ -18,11 +18,16 @@ #define ERR_RETURN(...) do { print_err(__func__, __LINE__, __VA_ARGS__); return -1; } while (0) +#define TEST_NAME_MAX_LEN 80 #define TEST_RINGSIZE 512 #define COPY_LEN 1024 +static struct rte_dma_info info; static struct rte_mempool *pool; +static bool check_err_stats; +static int16_t test_dev_id; static uint16_t id_count; +static uint16_t vchan; enum { TEST_PARAM_REMOTE_ADDR = 0, @@ -61,13 +66,28 @@ print_err(const char *func, int lineno, const char *format, ...) va_end(ap); } +struct runtest_param { + const char name[TEST_NAME_MAX_LEN]; + int (*test_fn)(int16_t dev_id, uint16_t vchan); + int iterations; +}; + static int -runtest(const char *printable, int (*test_fn)(int16_t dev_id, uint16_t vchan), int iterations, - int16_t dev_id, uint16_t vchan, bool check_err_stats) +runtest(const void *args) { + int (*test_fn)(int16_t dev_id, uint16_t vchan); + const struct runtest_param *param = args; struct rte_dma_stats stats; + const char *printable; + int iterations; + int16_t dev_id; int i; + printable = param->name; + iterations = param->iterations; + test_fn = param->test_fn; + dev_id = test_dev_id; + rte_dma_stats_reset(dev_id, vchan); printf("DMA Dev %d: Running %s Tests %s\n", dev_id, printable, check_err_stats ? " " : "(errors expected)"); @@ -911,26 +931,87 @@ prepare_m2d_auto_free(int16_t dev_id, uint16_t vchan) } static int -test_dmadev_instance(int16_t dev_id) +test_dmadev_burst_setup(void) +{ + if (rte_dma_burst_capacity(test_dev_id, vchan) < 64) { + RTE_LOG(ERR, USER1, + "DMA Dev %u: insufficient burst capacity (64 required), skipping tests\n", + test_dev_id); + return TEST_SKIPPED; + } + + return TEST_SUCCESS; +} + +static int +test_dmadev_err_handling_setup(void) +{ + int ret = TEST_SKIPPED; + + /* to test error handling we can provide null pointers for source or dest in copies. This + * requires VA mode in DPDK, since NULL(0) is a valid physical address. + * We also need hardware that can report errors back. + */ + if (rte_eal_iova_mode() != RTE_IOVA_VA) + RTE_LOG(ERR, USER1, + "DMA Dev %u: DPDK not in VA mode, skipping error handling tests\n", + test_dev_id); + else if ((info.dev_capa & RTE_DMA_CAPA_HANDLES_ERRORS) == 0) + RTE_LOG(ERR, USER1, + "DMA Dev %u: device does not report errors, skipping error handling tests\n", + test_dev_id); + else + ret = TEST_SUCCESS; + + return ret; +} + +static int +test_dmadev_fill_setup(void) +{ + int ret = TEST_SUCCESS; + + if ((info.dev_capa & RTE_DMA_CAPA_OPS_FILL) == 0) { + RTE_LOG(ERR, USER1, + "DMA Dev %u: No device fill support, skipping fill tests\n", test_dev_id); + ret = TEST_SKIPPED; + } + + return ret; +} + +static int +test_dmadev_autofree_setup(void) +{ + int ret = TEST_SKIPPED; + + if ((info.dev_capa & RTE_DMA_CAPA_M2D_AUTO_FREE) && + dma_add_test[TEST_M2D_AUTO_FREE].enabled == true) { + if (prepare_m2d_auto_free(test_dev_id, vchan) != 0) + return ret; + + ret = TEST_SUCCESS; + } + + return ret; +} + +static int +test_dmadev_setup(void) { -#define CHECK_ERRS true + int16_t dev_id = test_dev_id; struct rte_dma_stats stats; - struct rte_dma_info info; const struct rte_dma_conf conf = { .nb_vchans = 1}; const struct rte_dma_vchan_conf qconf = { .direction = RTE_DMA_DIR_MEM_TO_MEM, .nb_desc = TEST_RINGSIZE, }; - const int vchan = 0; int ret; ret = rte_dma_info_get(dev_id, &info); if (ret != 0) ERR_RETURN("Error with rte_dma_info_get()\n"); - printf("\n### Test dmadev instance %u [%s]\n", - dev_id, info.dev_name); - if (info.max_vchans < 1) ERR_RETURN("Error, no channels available on device id %u\n", dev_id); @@ -969,76 +1050,82 @@ test_dmadev_instance(int16_t dev_id) if (pool == NULL) ERR_RETURN("Error with mempool creation\n"); - /* run the test cases, use many iterations to ensure UINT16_MAX id wraparound */ - if (runtest("copy", test_enqueue_copies, 640, dev_id, vchan, CHECK_ERRS) < 0) - goto err; - - /* run tests stopping/starting devices and check jobs still work after restart */ - if (runtest("stop-start", test_stop_start, 1, dev_id, vchan, CHECK_ERRS) < 0) - goto err; - - /* run some burst capacity tests */ - if (rte_dma_burst_capacity(dev_id, vchan) < 64) - printf("DMA Dev %u: insufficient burst capacity (64 required), skipping tests\n", - dev_id); - else if (runtest("burst capacity", test_burst_capacity, 1, dev_id, vchan, CHECK_ERRS) < 0) - goto err; - - /* to test error handling we can provide null pointers for source or dest in copies. This - * requires VA mode in DPDK, since NULL(0) is a valid physical address. - * We also need hardware that can report errors back. - */ - if (rte_eal_iova_mode() != RTE_IOVA_VA) - printf("DMA Dev %u: DPDK not in VA mode, skipping error handling tests\n", dev_id); - else if ((info.dev_capa & RTE_DMA_CAPA_HANDLES_ERRORS) == 0) - printf("DMA Dev %u: device does not report errors, skipping error handling tests\n", - dev_id); - else if (runtest("error handling", test_completion_handling, 1, - dev_id, vchan, !CHECK_ERRS) < 0) - goto err; - - if ((info.dev_capa & RTE_DMA_CAPA_OPS_FILL) == 0) - printf("DMA Dev %u: No device fill support, skipping fill tests\n", dev_id); - else if (runtest("fill", test_enqueue_fill, 1, dev_id, vchan, CHECK_ERRS) < 0) - goto err; - - if ((info.dev_capa & RTE_DMA_CAPA_M2D_AUTO_FREE) && - dma_add_test[TEST_M2D_AUTO_FREE].enabled == true) { - if (prepare_m2d_auto_free(dev_id, vchan) != 0) - goto err; - if (runtest("m2d_auto_free", test_m2d_auto_free, 128, dev_id, vchan, - CHECK_ERRS) < 0) - goto err; - } - - rte_mempool_free(pool); - - if (rte_dma_stop(dev_id) < 0) - ERR_RETURN("Error stopping device %u\n", dev_id); + check_err_stats = false; + vchan = 0; - rte_dma_stats_reset(dev_id, vchan); return 0; +} -err: +static void +test_dmadev_teardown(void) +{ rte_mempool_free(pool); - rte_dma_stop(dev_id); - return -1; + rte_dma_stop(test_dev_id); + rte_dma_stats_reset(test_dev_id, vchan); + test_dev_id = -EINVAL; } static int -test_apis(void) +test_dmadev_instance(int16_t dev_id) { - const char *pmd = "dma_skeleton"; - int id; + struct rte_dma_info dev_info; + enum { + TEST_COPY = 0, + TEST_START, + TEST_BURST, + TEST_ERR, + TEST_FILL, + TEST_M2D, + TEST_END + }; + + static struct runtest_param param[] = { + {"copy", test_enqueue_copies, 640}, + {"stop_start", test_stop_start, 1}, + {"burst_capacity", test_burst_capacity, 1}, + {"error_handling", test_completion_handling, 1}, + {"fill", test_enqueue_fill, 1}, + {"m2d_auto_free", test_m2d_auto_free, 128}, + }; + + static struct unit_test_suite ts = { + .suite_name = "DMA dev instance testsuite", + .setup = test_dmadev_setup, + .teardown = test_dmadev_teardown, + .unit_test_cases = { + TEST_CASE_NAMED_WITH_DATA("copy", + NULL, NULL, + runtest, ¶m[TEST_COPY]), + TEST_CASE_NAMED_WITH_DATA("stop_start", + NULL, NULL, + runtest, ¶m[TEST_START]), + TEST_CASE_NAMED_WITH_DATA("burst_capacity", + test_dmadev_burst_setup, NULL, + runtest, ¶m[TEST_BURST]), + TEST_CASE_NAMED_WITH_DATA("error_handling", + test_dmadev_err_handling_setup, NULL, + runtest, ¶m[TEST_ERR]), + TEST_CASE_NAMED_WITH_DATA("fill", + test_dmadev_fill_setup, NULL, + runtest, ¶m[TEST_FILL]), + TEST_CASE_NAMED_WITH_DATA("m2d_autofree", + test_dmadev_autofree_setup, NULL, + runtest, ¶m[TEST_M2D]), + TEST_CASES_END() + } + }; + int ret; - /* attempt to create skeleton instance - ignore errors due to one being already present */ - rte_vdev_init(pmd, NULL); - id = rte_dma_get_dev_id_by_name(pmd); - if (id < 0) + if (rte_dma_info_get(dev_id, &dev_info) < 0) return TEST_SKIPPED; - printf("\n### Test dmadev infrastructure using skeleton driver\n"); - ret = test_dma_api(id); + + test_dev_id = dev_id; + printf("\n### Test dmadev instance %u [%s]\n", + test_dev_id, dev_info.dev_name); + + ret = unit_test_suite_runner(&ts); + test_dev_id = -EINVAL; return ret; } @@ -1083,20 +1170,24 @@ parse_dma_env_var(void) static int test_dma(void) { + const char *pmd = "dma_skeleton"; int i; parse_dma_env_var(); - /* basic sanity on dmadev infrastructure */ - if (test_apis() < 0) - ERR_RETURN("Error performing API tests\n"); + /* attempt to create skeleton instance - ignore errors due to one being already present*/ + rte_vdev_init(pmd, NULL); if (rte_dma_count_avail() == 0) return TEST_SKIPPED; - RTE_DMA_FOREACH_DEV(i) + RTE_DMA_FOREACH_DEV(i) { + if (test_dma_api(i) < 0) + ERR_RETURN("Error performing API tests\n"); + if (test_dmadev_instance(i) < 0) ERR_RETURN("Error, test failure for device %d\n", i); + } return 0; } diff --git a/app/test/test_dmadev_api.c b/app/test/test_dmadev_api.c index 4a181af90a..73d4db825a 100644 --- a/app/test/test_dmadev_api.c +++ b/app/test/test_dmadev_api.c @@ -9,31 +9,22 @@ #include #include -extern int test_dma_api(uint16_t dev_id); +#include "test.h" -#define DMA_TEST_API_RUN(test) \ - testsuite_run_test(test, #test) +extern int test_dma_api(uint16_t dev_id); #define TEST_MEMCPY_SIZE 1024 #define TEST_WAIT_US_VAL 50000 -#define TEST_SUCCESS 0 -#define TEST_FAILED -1 - static int16_t test_dev_id; static int16_t invalid_dev_id; static char *src; static char *dst; -static int total; -static int passed; -static int failed; - static int -testsuite_setup(int16_t dev_id) +testsuite_setup(void) { - test_dev_id = dev_id; invalid_dev_id = -1; src = rte_malloc("dmadev_test_src", TEST_MEMCPY_SIZE, 0); @@ -46,10 +37,6 @@ testsuite_setup(int16_t dev_id) return -ENOMEM; } - total = 0; - passed = 0; - failed = 0; - /* Set dmadev log level to critical to suppress unnecessary output * during API tests. */ @@ -71,25 +58,6 @@ testsuite_teardown(void) rte_log_set_level_pattern("lib.dmadev", RTE_LOG_INFO); } -static void -testsuite_run_test(int (*test)(void), const char *name) -{ - int ret = 0; - - if (test) { - ret = test(); - if (ret < 0) { - failed++; - printf("%s Failed\n", name); - } else { - passed++; - printf("%s Passed\n", name); - } - } - - total++; -} - static int test_dma_get_dev_id_by_name(void) { @@ -301,7 +269,7 @@ setup_one_vchan(void) ret = rte_dma_info_get(test_dev_id, &dev_info); RTE_TEST_ASSERT_SUCCESS(ret, "Failed to obtain device info, %d", ret); - dev_conf.nb_vchans = dev_info.max_vchans; + dev_conf.nb_vchans = 1; ret = rte_dma_configure(test_dev_id, &dev_conf); RTE_TEST_ASSERT_SUCCESS(ret, "Failed to configure, %d", ret); vchan_conf.direction = RTE_DMA_DIR_MEM_TO_MEM; @@ -537,38 +505,35 @@ test_dma_completed_status(void) return TEST_SUCCESS; } +static struct unit_test_suite dma_api_testsuite = { + .suite_name = "DMA API Test Suite", + .setup = testsuite_setup, + .teardown = testsuite_teardown, + .unit_test_cases = { + TEST_CASE(test_dma_get_dev_id_by_name), + TEST_CASE(test_dma_is_valid_dev), + TEST_CASE(test_dma_count), + TEST_CASE(test_dma_info_get), + TEST_CASE(test_dma_configure), + TEST_CASE(test_dma_vchan_setup), + TEST_CASE(test_dma_start_stop), + TEST_CASE(test_dma_stats), + TEST_CASE(test_dma_dump), + TEST_CASE(test_dma_completed), + TEST_CASE(test_dma_completed_status), + TEST_CASES_END() + } +}; + int test_dma_api(uint16_t dev_id) { - int ret = testsuite_setup(dev_id); - if (ret) { - printf("testsuite setup fail!\n"); - return -1; - } + struct rte_dma_info dev_info; - /* If the testcase exit successfully, ensure that the test dmadev exist - * and the dmadev is in the stopped state. - */ - DMA_TEST_API_RUN(test_dma_get_dev_id_by_name); - DMA_TEST_API_RUN(test_dma_is_valid_dev); - DMA_TEST_API_RUN(test_dma_count); - DMA_TEST_API_RUN(test_dma_info_get); - DMA_TEST_API_RUN(test_dma_configure); - DMA_TEST_API_RUN(test_dma_vchan_setup); - DMA_TEST_API_RUN(test_dma_start_stop); - DMA_TEST_API_RUN(test_dma_stats); - DMA_TEST_API_RUN(test_dma_dump); - DMA_TEST_API_RUN(test_dma_completed); - DMA_TEST_API_RUN(test_dma_completed_status); - - testsuite_teardown(); - - printf("Total tests : %d\n", total); - printf("Passed : %d\n", passed); - printf("Failed : %d\n", failed); - - if (failed) - return -1; + if (rte_dma_info_get(dev_id, &dev_info) < 0) + return TEST_SKIPPED; - return 0; + printf("\n### Test dmadev infrastructure using %u [%s]\n", dev_id, dev_info.dev_name); + test_dev_id = dev_id; + return unit_test_suite_runner(&dma_api_testsuite); };