Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62317/?format=api
{ "id": 62317, "url": "http://patches.dpdk.org/api/patches/62317/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/8b829507599c5a814d4325c658133fdff84d4cd9.1572621163.git.vladimir.medvedkin@intel.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": "<8b829507599c5a814d4325c658133fdff84d4cd9.1572621163.git.vladimir.medvedkin@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/8b829507599c5a814d4325c658133fdff84d4cd9.1572621163.git.vladimir.medvedkin@intel.com", "date": "2019-11-01T15:21:35", "name": "[v6,02/12] test/rib: add RIB library autotests", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "519dbbfa3bf4c36e0e2c914ac9e3ba513a44a0da", "submitter": { "id": 1216, "url": "http://patches.dpdk.org/api/people/1216/?format=api", "name": "Vladimir Medvedkin", "email": "vladimir.medvedkin@intel.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/8b829507599c5a814d4325c658133fdff84d4cd9.1572621163.git.vladimir.medvedkin@intel.com/mbox/", "series": [ { "id": 7198, "url": "http://patches.dpdk.org/api/series/7198/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7198", "date": "2019-11-01T15:21:33", "name": "lib: add RIB and FIB liraries", "version": 6, "mbox": "http://patches.dpdk.org/series/7198/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62317/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/62317/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 40F36A00BE;\n\tFri, 1 Nov 2019 16:22:17 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D7E661DFE9;\n\tFri, 1 Nov 2019 16:21:56 +0100 (CET)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n by dpdk.org (Postfix) with ESMTP id 964F21C036\n for <dev@dpdk.org>; Fri, 1 Nov 2019 16:21:54 +0100 (CET)", "from orsmga004.jf.intel.com ([10.7.209.38])\n by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 01 Nov 2019 08:21:54 -0700", "from silpixa00400072.ir.intel.com ([10.237.222.213])\n by orsmga004.jf.intel.com with ESMTP; 01 Nov 2019 08:21:52 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,256,1569308400\"; d=\"scan'208\";a=\"351979071\"", "From": "Vladimir Medvedkin <vladimir.medvedkin@intel.com>", "To": "dev@dpdk.org", "Cc": "bruce.richardson@intel.com, konstantin.ananyev@intel.com,\n thomas@monjalon.net, aconole@redhat.com", "Date": "Fri, 1 Nov 2019 15:21:35 +0000", "Message-Id": "\n <8b829507599c5a814d4325c658133fdff84d4cd9.1572621163.git.vladimir.medvedkin@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": [ "<cover.1572621162.git.vladimir.medvedkin@intel.com>", "<cover.1572621162.git.vladimir.medvedkin@intel.com>" ], "References": [ "<cover.1572621162.git.vladimir.medvedkin@intel.com>", "<cover.1568221361.git.vladimir.medvedkin@intel.com>\n <cover.1572621162.git.vladimir.medvedkin@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v6 02/12] test/rib: add RIB library autotests", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Functional tests for the new RIB library.\n\nSigned-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>\n---\n app/test/Makefile | 2 +\n app/test/autotest_data.py | 6 +\n app/test/meson.build | 3 +\n app/test/test_rib.c | 351 ++++++++++++++++++++++++++++++++++++++++++++++\n 4 files changed, 362 insertions(+)\n create mode 100644 app/test/test_rib.c", "diff": "diff --git a/app/test/Makefile b/app/test/Makefile\nindex 26ba6fe..5bd8487 100644\n--- a/app/test/Makefile\n+++ b/app/test/Makefile\n@@ -124,6 +124,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c\n SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c\n SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf.c\n \n+SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c\n+\n SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c\n SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c\n SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c\ndiff --git a/app/test/autotest_data.py b/app/test/autotest_data.py\nindex 7405149..3c3b806 100644\n--- a/app/test/autotest_data.py\n+++ b/app/test/autotest_data.py\n@@ -111,6 +111,12 @@\n \"Report\": None,\n },\n {\n+ \"Name\": \"RIB autotest\",\n+ \"Command\": \"rib_autotest\",\n+ \"Func\": default_autotest,\n+ \"Report\": None,\n+ },\n+ {\n \"Name\": \"Memcpy autotest\",\n \"Command\": \"memcpy_autotest\",\n \"Func\": default_autotest,\ndiff --git a/app/test/meson.build b/app/test/meson.build\nindex ec40943..98524e1 100644\n--- a/app/test/meson.build\n+++ b/app/test/meson.build\n@@ -99,6 +99,7 @@ test_sources = files('commands.c',\n \t'test_reciprocal_division_perf.c',\n \t'test_red.c',\n \t'test_reorder.c',\n+\t'test_rib.c',\n \t'test_ring.c',\n \t'test_ring_perf.c',\n \t'test_rwlock.c',\n@@ -147,6 +148,7 @@ test_deps = ['acl',\n \t'rawdev',\n \t'rcu',\n \t'reorder',\n+\t'rib',\n \t'ring',\n \t'stack',\n \t'timer'\n@@ -197,6 +199,7 @@ fast_test_names = [\n 'prefetch_autotest',\n 'rcu_qsbr_autotest',\n 'red_autotest',\n+ 'rib_autotest',\n 'ring_autotest',\n 'ring_pmd_autotest',\n 'rwlock_test1_autotest',\ndiff --git a/app/test/test_rib.c b/app/test/test_rib.c\nnew file mode 100644\nindex 0000000..c95957a\n--- /dev/null\n+++ b/app/test/test_rib.c\n@@ -0,0 +1,351 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com>\n+ * Copyright(c) 2019 Intel Corporation\n+ */\n+\n+#include <stdio.h>\n+#include <stdint.h>\n+#include <stdlib.h>\n+\n+#include <rte_ip.h>\n+#include <rte_rib.h>\n+\n+#include \"test.h\"\n+\n+typedef int32_t (*rte_rib_test)(void);\n+\n+static int32_t test_create_invalid(void);\n+static int32_t test_multiple_create(void);\n+static int32_t test_free_null(void);\n+static int32_t test_insert_invalid(void);\n+static int32_t test_get_fn(void);\n+static int32_t test_basic(void);\n+static int32_t test_tree_traversal(void);\n+\n+#define MAX_DEPTH 32\n+#define MAX_RULES (1 << 22)\n+\n+/*\n+ * Check that rte_rib_create fails gracefully for incorrect user input\n+ * arguments\n+ */\n+int32_t\n+test_create_invalid(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_conf config;\n+\n+\tconfig.max_nodes = MAX_RULES;\n+\tconfig.ext_sz = 0;\n+\n+\t/* rte_rib_create: rib name == NULL */\n+\trib = rte_rib_create(NULL, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* rte_rib_create: config == NULL */\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, NULL);\n+\tRTE_TEST_ASSERT(rib == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* socket_id < -1 is invalid */\n+\trib = rte_rib_create(__func__, -2, &config);\n+\tRTE_TEST_ASSERT(rib == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* rte_rib_create: max_nodes = 0 */\n+\tconfig.max_nodes = 0;\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\tconfig.max_nodes = MAX_RULES;\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+/*\n+ * Create rib table then delete rib table 10 times\n+ * Use a slightly different rules size each time\n+ */\n+int32_t\n+test_multiple_create(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_conf config;\n+\tint32_t i;\n+\n+\tconfig.ext_sz = 0;\n+\n+\tfor (i = 0; i < 10; i++) {\n+\t\tconfig.max_nodes = MAX_RULES - i;\n+\t\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\t\tRTE_TEST_ASSERT(rib != NULL, \"Failed to create RIB\\n\");\n+\t\trte_rib_free(rib);\n+\t}\n+\t/* Can not test free so return success */\n+\treturn TEST_SUCCESS;\n+}\n+\n+/*\n+ * Call rte_rib_free for NULL pointer user input. Note: free has no return and\n+ * therefore it is impossible to check for failure but this test is added to\n+ * increase function coverage metrics and to validate that freeing null does\n+ * not crash.\n+ */\n+int32_t\n+test_free_null(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_conf config;\n+\n+\tconfig.max_nodes = MAX_RULES;\n+\tconfig.ext_sz = 0;\n+\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib != NULL, \"Failed to create RIB\\n\");\n+\n+\trte_rib_free(rib);\n+\trte_rib_free(NULL);\n+\treturn TEST_SUCCESS;\n+}\n+\n+/*\n+ * Check that rte_rib_insert fails gracefully for incorrect user input arguments\n+ */\n+int32_t\n+test_insert_invalid(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_node *node, *node1;\n+\tstruct rte_rib_conf config;\n+\tuint32_t ip = RTE_IPV4(0, 0, 0, 0);\n+\tuint8_t depth = 24;\n+\n+\tconfig.max_nodes = MAX_RULES;\n+\tconfig.ext_sz = 0;\n+\n+\t/* rte_rib_insert: rib == NULL */\n+\tnode = rte_rib_insert(NULL, ip, depth);\n+\tRTE_TEST_ASSERT(node == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/*Create valid rib to use in rest of test. */\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib != NULL, \"Failed to create RIB\\n\");\n+\n+\t/* rte_rib_insert: depth > MAX_DEPTH */\n+\tnode = rte_rib_insert(rib, ip, MAX_DEPTH + 1);\n+\tRTE_TEST_ASSERT(node == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* insert the same ip/depth twice*/\n+\tnode = rte_rib_insert(rib, ip, depth);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to insert rule\\n\");\n+\tnode1 = rte_rib_insert(rib, ip, depth);\n+\tRTE_TEST_ASSERT(node1 == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\trte_rib_free(rib);\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+/*\n+ * Call rte_rib_node access functions with incorrect input.\n+ * After call rte_rib_node access functions with correct args\n+ * and check the return values for correctness\n+ */\n+int32_t\n+test_get_fn(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_node *node;\n+\tstruct rte_rib_conf config;\n+\tvoid *ext;\n+\tuint32_t ip = RTE_IPV4(192, 0, 2, 0);\n+\tuint32_t ip_ret;\n+\tuint64_t nh_set = 10;\n+\tuint64_t nh_ret;\n+\tuint8_t depth = 24;\n+\tuint8_t depth_ret;\n+\tint ret;\n+\n+\tconfig.max_nodes = MAX_RULES;\n+\tconfig.ext_sz = 0;\n+\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib != NULL, \"Failed to create RIB\\n\");\n+\n+\tnode = rte_rib_insert(rib, ip, depth);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to insert rule\\n\");\n+\n+\t/* test rte_rib_get_ip() with incorrect args */\n+\tret = rte_rib_get_ip(NULL, &ip_ret);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\tret = rte_rib_get_ip(node, NULL);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* test rte_rib_get_depth() with incorrect args */\n+\tret = rte_rib_get_depth(NULL, &depth_ret);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\tret = rte_rib_get_depth(node, NULL);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* test rte_rib_set_nh() with incorrect args */\n+\tret = rte_rib_set_nh(NULL, nh_set);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* test rte_rib_get_nh() with incorrect args */\n+\tret = rte_rib_get_nh(NULL, &nh_ret);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\tret = rte_rib_get_nh(node, NULL);\n+\tRTE_TEST_ASSERT(ret < 0,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* test rte_rib_get_ext() with incorrect args */\n+\text = rte_rib_get_ext(NULL);\n+\tRTE_TEST_ASSERT(ext == NULL,\n+\t\t\"Call succeeded with invalid parameters\\n\");\n+\n+\t/* check the return values */\n+\tret = rte_rib_get_ip(node, &ip_ret);\n+\tRTE_TEST_ASSERT((ret == 0) && (ip_ret == ip),\n+\t\t\"Failed to get proper node ip\\n\");\n+\tret = rte_rib_get_depth(node, &depth_ret);\n+\tRTE_TEST_ASSERT((ret == 0) && (depth_ret == depth),\n+\t\t\"Failed to get proper node depth\\n\");\n+\tret = rte_rib_set_nh(node, nh_set);\n+\tRTE_TEST_ASSERT(ret == 0,\n+\t\t\"Failed to set rte_rib_node nexthop\\n\");\n+\tret = rte_rib_get_nh(node, &nh_ret);\n+\tRTE_TEST_ASSERT((ret == 0) && (nh_ret == nh_set),\n+\t\t\"Failed to get proper nexthop\\n\");\n+\n+\trte_rib_free(rib);\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+/*\n+ * Call insert, lookup/lookup_exact and delete for a single rule\n+ */\n+int32_t\n+test_basic(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_node *node;\n+\tstruct rte_rib_conf config;\n+\n+\tuint32_t ip = RTE_IPV4(192, 0, 2, 0);\n+\tuint64_t next_hop_add = 10;\n+\tuint64_t next_hop_return;\n+\tuint8_t depth = 24;\n+\tint ret;\n+\n+\tconfig.max_nodes = MAX_RULES;\n+\tconfig.ext_sz = 0;\n+\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib != NULL, \"Failed to create RIB\\n\");\n+\n+\tnode = rte_rib_insert(rib, ip, depth);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to insert rule\\n\");\n+\n+\tret = rte_rib_set_nh(node, next_hop_add);\n+\tRTE_TEST_ASSERT(ret == 0,\n+\t\t\"Failed to set rte_rib_node field\\n\");\n+\n+\tnode = rte_rib_lookup(rib, ip);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to lookup\\n\");\n+\n+\tret = rte_rib_get_nh(node, &next_hop_return);\n+\tRTE_TEST_ASSERT((ret == 0) && (next_hop_add == next_hop_return),\n+\t\t\"Failed to get proper nexthop\\n\");\n+\n+\tnode = rte_rib_lookup_exact(rib, ip, depth);\n+\tRTE_TEST_ASSERT(node != NULL,\n+\t\t\"Failed to lookup\\n\");\n+\n+\tret = rte_rib_get_nh(node, &next_hop_return);\n+\tRTE_TEST_ASSERT((ret == 0) && (next_hop_add == next_hop_return),\n+\t\t\"Failed to get proper nexthop\\n\");\n+\n+\trte_rib_remove(rib, ip, depth);\n+\n+\tnode = rte_rib_lookup(rib, ip);\n+\tRTE_TEST_ASSERT(node == NULL,\n+\t\t\"Lookup returns non existent rule\\n\");\n+\tnode = rte_rib_lookup_exact(rib, ip, depth);\n+\tRTE_TEST_ASSERT(node == NULL,\n+\t\t\"Lookup returns non existent rule\\n\");\n+\n+\trte_rib_free(rib);\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+int32_t\n+test_tree_traversal(void)\n+{\n+\tstruct rte_rib *rib = NULL;\n+\tstruct rte_rib_node *node;\n+\tstruct rte_rib_conf config;\n+\n+\tuint32_t ip1 = RTE_IPV4(10, 10, 10, 0);\n+\tuint32_t ip2 = RTE_IPV4(10, 10, 130, 80);\n+\tuint8_t depth = 30;\n+\n+\tconfig.max_nodes = MAX_RULES;\n+\tconfig.ext_sz = 0;\n+\n+\trib = rte_rib_create(__func__, SOCKET_ID_ANY, &config);\n+\tRTE_TEST_ASSERT(rib != NULL, \"Failed to create RIB\\n\");\n+\n+\tnode = rte_rib_insert(rib, ip1, depth);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to insert rule\\n\");\n+\n+\tnode = rte_rib_insert(rib, ip2, depth);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to insert rule\\n\");\n+\n+\tnode = NULL;\n+\tnode = rte_rib_get_nxt(rib, RTE_IPV4(10, 10, 130, 0), 24, node,\n+\t\t\tRTE_RIB_GET_NXT_ALL);\n+\tRTE_TEST_ASSERT(node != NULL, \"Failed to get rib_node\\n\");\n+\n+\trte_rib_free(rib);\n+\n+\treturn TEST_SUCCESS;\n+}\n+\n+static struct unit_test_suite rib_tests = {\n+\t.suite_name = \"rib autotest\",\n+\t.setup = NULL,\n+\t.teardown = NULL,\n+\t.unit_test_cases = {\n+\t\tTEST_CASE(test_create_invalid),\n+\t\tTEST_CASE(test_multiple_create),\n+\t\tTEST_CASE(test_free_null),\n+\t\tTEST_CASE(test_insert_invalid),\n+\t\tTEST_CASE(test_get_fn),\n+\t\tTEST_CASE(test_basic),\n+\t\tTEST_CASE(test_tree_traversal),\n+\t\tTEST_CASES_END()\n+\t}\n+};\n+\n+/*\n+ * Do all unit tests.\n+ */\n+static int\n+test_rib(void)\n+{\n+\treturn unit_test_suite_runner(&rib_tests);\n+}\n+\n+REGISTER_TEST_COMMAND(rib_autotest, test_rib);\n", "prefixes": [ "v6", "02/12" ] }