Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/121846/?format=api
{ "id": 121846, "url": "https://patches.dpdk.org/api/patches/121846/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230111205608.87953-5-cristian.dumitrescu@intel.com/", "project": { "id": 1, "url": "https://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": "<20230111205608.87953-5-cristian.dumitrescu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230111205608.87953-5-cristian.dumitrescu@intel.com", "date": "2023-01-11T20:56:01", "name": "[04/11] examples/pipeline: streamline the Ethernet device support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "eb673db2650d248ffe1ecef19a5340427a741696", "submitter": { "id": 19, "url": "https://patches.dpdk.org/api/people/19/?format=api", "name": "Cristian Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230111205608.87953-5-cristian.dumitrescu@intel.com/mbox/", "series": [ { "id": 26482, "url": "https://patches.dpdk.org/api/series/26482/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=26482", "date": "2023-01-11T20:55:57", "name": "pipeline: add IPsec support", "version": 1, "mbox": "https://patches.dpdk.org/series/26482/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/121846/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/121846/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 DD945423AF;\n\tWed, 11 Jan 2023 21:56:42 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4383042D46;\n\tWed, 11 Jan 2023 21:56:19 +0100 (CET)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n by mails.dpdk.org (Postfix) with ESMTP id 10B5B42D3B\n for <dev@dpdk.org>; Wed, 11 Jan 2023 21:56:15 +0100 (CET)", "from orsmga003.jf.intel.com ([10.7.209.27])\n by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 11 Jan 2023 12:56:15 -0800", "from silpixa00400573.ir.intel.com (HELO\n silpixa00400573.ger.corp.intel.com) ([10.237.222.53])\n by orsmga003.jf.intel.com with ESMTP; 11 Jan 2023 12:56:14 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1673470576; x=1705006576;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=ugyVU28+pHoNS9r3m3VT6hS2M1DTfYubW939xagePf0=;\n b=DzG6LQsVnTR3+++3y4yX+My4C+50XuAFruW/QxCOGAqv3MkpHvkP0SvZ\n mQB+5kFMDuV/LSDKtllPXCTP4ayW/ElmvQ1/f/HxZS44njQB+mp758cTL\n i/NbeSfRtd9M3gTFYE68E3ZSaMwBSUzkO4iXiKIi8/Gvd356kdPCYFz5h\n xhduuWlg7W3AnN6GN14WqEFX1s05tpafMHY2lgOXyWP8tYdJGN0qqFXG5\n ZeZfwO0R/3oNNr1mm40bjij4rMiaKOGAfvinG+YRUz5epQHR6i3bxVS4s\n o/OZMK4m+oFpiYfNNFuebJzxjmYqa2zExiMUt8UM8T0E2cj9IiPWRRDOG A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10586\"; a=\"303229781\"", "E=Sophos;i=\"5.96,317,1665471600\"; d=\"scan'208\";a=\"303229781\"", "E=McAfee;i=\"6500,9779,10586\"; a=\"607518855\"", "E=Sophos;i=\"5.96,317,1665471600\"; d=\"scan'208\";a=\"607518855\"" ], "X-ExtLoop1": "1", "From": "Cristian Dumitrescu <cristian.dumitrescu@intel.com>", "To": "dev@dpdk.org", "Cc": "Kamalakannan R <kamalakannan.r@intel.com>", "Subject": "[PATCH 04/11] examples/pipeline: streamline the Ethernet device\n support", "Date": "Wed, 11 Jan 2023 20:56:01 +0000", "Message-Id": "<20230111205608.87953-5-cristian.dumitrescu@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230111205608.87953-1-cristian.dumitrescu@intel.com>", "References": "<20230111205608.87953-1-cristian.dumitrescu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Streamline the Ethernet device support code and remove redundant code.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Kamalakannan R <kamalakannan.r@intel.com>\n---\n examples/pipeline/cli.c | 175 ++++++++++++++++++------------------\n examples/pipeline/main.c | 12 +--\n examples/pipeline/obj.c | 186 +++++++++------------------------------\n examples/pipeline/obj.h | 51 ++---------\n 4 files changed, 136 insertions(+), 288 deletions(-)", "diff": "diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c\nindex 471dfbad38..37fc6f9551 100644\n--- a/examples/pipeline/cli.c\n+++ b/examples/pipeline/cli.c\n@@ -292,16 +292,14 @@ cmd_ethdev(char **tokens,\n \tuint32_t n_tokens,\n \tchar *out,\n \tsize_t out_size,\n-\tvoid *obj)\n+\tvoid *obj __rte_unused)\n {\n-\tstruct link_params p;\n-\tstruct link_params_rss rss;\n-\tstruct link *link;\n+\tstruct ethdev_params p = {0};\n+\tstruct ethdev_params_rss rss = {0};\n \tchar *name;\n+\tint status;\n \n-\tmemset(&p, 0, sizeof(p));\n-\n-\tif ((n_tokens < 11) || (n_tokens > 12 + LINK_RXQ_RSS_MAX)) {\n+\tif (n_tokens < 11 || n_tokens > 12 + ETHDEV_RXQ_RSS_MAX) {\n \t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n \t\treturn;\n \t}\n@@ -377,111 +375,98 @@ cmd_ethdev(char **tokens,\n \t\t}\n \t}\n \n-\tlink = link_create(obj, name, &p);\n-\tif (link == NULL) {\n+\tstatus = ethdev_config(name, &p);\n+\tif (status) {\n \t\tsnprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);\n \t\treturn;\n \t}\n }\n \n-/* Print the link stats and info */\n static void\n-print_link_info(struct link *link, char *out, size_t out_size)\n+ethdev_show(uint16_t port_id, char **out, size_t *out_size)\n {\n-\tstruct rte_eth_stats stats;\n-\tstruct rte_ether_addr mac_addr;\n-\tstruct rte_eth_link eth_link;\n-\tuint16_t mtu;\n-\tint ret;\n-\n-\tmemset(&stats, 0, sizeof(stats));\n-\trte_eth_stats_get(link->port_id, &stats);\n-\n-\tret = rte_eth_macaddr_get(link->port_id, &mac_addr);\n-\tif (ret != 0) {\n-\t\tsnprintf(out, out_size, \"\\n%s: MAC address get failed: %s\",\n-\t\t\t link->name, rte_strerror(-ret));\n-\t\treturn;\n-\t}\n-\n-\tret = rte_eth_link_get(link->port_id, ð_link);\n-\tif (ret < 0) {\n-\t\tsnprintf(out, out_size, \"\\n%s: link get failed: %s\",\n-\t\t\t link->name, rte_strerror(-ret));\n-\t\treturn;\n-\t}\n-\n-\trte_eth_dev_get_mtu(link->port_id, &mtu);\n-\n-\tsnprintf(out, out_size,\n-\t\t\"\\n\"\n-\t\t\"%s: flags=<%s> mtu %u\\n\"\n-\t\t\"\\tether \" RTE_ETHER_ADDR_PRT_FMT \" rxqueues %u txqueues %u\\n\"\n-\t\t\"\\tport# %u speed %s\\n\"\n-\t\t\"\\tRX packets %\" PRIu64\" bytes %\" PRIu64\"\\n\"\n-\t\t\"\\tRX errors %\" PRIu64\" missed %\" PRIu64\" no-mbuf %\" PRIu64\"\\n\"\n-\t\t\"\\tTX packets %\" PRIu64\" bytes %\" PRIu64\"\\n\"\n-\t\t\"\\tTX errors %\" PRIu64\"\\n\",\n-\t\tlink->name,\n-\t\teth_link.link_status == 0 ? \"DOWN\" : \"UP\",\n-\t\tmtu,\n-\t\tRTE_ETHER_ADDR_BYTES(&mac_addr),\n-\t\tlink->n_rxq,\n-\t\tlink->n_txq,\n-\t\tlink->port_id,\n-\t\trte_eth_link_speed_to_str(eth_link.link_speed),\n-\t\tstats.ipackets,\n-\t\tstats.ibytes,\n-\t\tstats.ierrors,\n-\t\tstats.imissed,\n-\t\tstats.rx_nombuf,\n-\t\tstats.opackets,\n-\t\tstats.obytes,\n-\t\tstats.oerrors);\n+\tchar name[RTE_ETH_NAME_MAX_LEN] = {0};\n+\tstruct rte_eth_dev_info info = {0};\n+\tstruct rte_eth_stats stats = {0};\n+\tstruct rte_ether_addr addr = {0};\n+\tstruct rte_eth_link link = {0};\n+\tuint32_t length;\n+\tuint16_t mtu = 0;\n+\n+\tif (!rte_eth_dev_is_valid_port(port_id))\n+\t\treturn;\n+\n+\trte_eth_dev_get_name_by_port(port_id, name);\n+\trte_eth_dev_info_get(port_id, &info);\n+\trte_eth_stats_get(port_id, &stats);\n+\trte_eth_macaddr_get(port_id, &addr);\n+\trte_eth_link_get(port_id, &link);\n+\trte_eth_dev_get_mtu(port_id, &mtu);\n+\n+\tsnprintf(*out, *out_size,\n+\t\t \"%s: flags=<%s> mtu %u\\n\"\n+\t\t \"\\tether \" RTE_ETHER_ADDR_PRT_FMT \" rxqueues %u txqueues %u\\n\"\n+\t\t \"\\tport# %u speed %s\\n\"\n+\t\t \"\\tRX packets %\" PRIu64\" bytes %\" PRIu64\"\\n\"\n+\t\t \"\\tRX errors %\" PRIu64\" missed %\" PRIu64\" no-mbuf %\" PRIu64\"\\n\"\n+\t\t \"\\tTX packets %\" PRIu64\" bytes %\" PRIu64\"\\n\"\n+\t\t \"\\tTX errors %\" PRIu64\"\\n\\n\",\n+\t\t name,\n+\t\t link.link_status ? \"UP\" : \"DOWN\",\n+\t\t mtu,\n+\t\t RTE_ETHER_ADDR_BYTES(&addr),\n+\t\t info.nb_rx_queues,\n+\t\t info.nb_tx_queues,\n+\t\t port_id,\n+\t\t rte_eth_link_speed_to_str(link.link_speed),\n+\t\t stats.ipackets,\n+\t\t stats.ibytes,\n+\t\t stats.ierrors,\n+\t\t stats.imissed,\n+\t\t stats.rx_nombuf,\n+\t\t stats.opackets,\n+\t\t stats.obytes,\n+\t\t stats.oerrors);\n+\n+\tlength = strlen(*out);\n+\t*out_size -= length;\n+\t*out += length;\n }\n \n-/*\n- * ethdev show [<ethdev_name>]\n- */\n+\n+static char cmd_ethdev_show_help[] =\n+\"ethdev show [ <ethdev_name> ]\\n\";\n+\n static void\n cmd_ethdev_show(char **tokens,\n \t uint32_t n_tokens,\n \t char *out,\n \t size_t out_size,\n-\t void *obj)\n+\t void *obj __rte_unused)\n {\n-\tstruct link *link;\n-\tchar *link_name;\n+\tuint16_t port_id;\n \n \tif (n_tokens != 2 && n_tokens != 3) {\n \t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n \t\treturn;\n \t}\n \n-\tif (n_tokens == 2) {\n-\t\tlink = link_next(obj, NULL);\n-\n-\t\twhile (link != NULL) {\n-\t\t\tout_size = out_size - strlen(out);\n-\t\t\tout = &out[strlen(out)];\n-\n-\t\t\tprint_link_info(link, out, out_size);\n-\t\t\tlink = link_next(obj, link);\n-\t\t}\n-\t} else {\n-\t\tout_size = out_size - strlen(out);\n-\t\tout = &out[strlen(out)];\n+\t/* Single device. */\n+\tif (n_tokens == 3) {\n+\t\tint status;\n \n-\t\tlink_name = tokens[2];\n-\t\tlink = link_find(obj, link_name);\n+\t\tstatus = rte_eth_dev_get_port_by_name(tokens[2], &port_id);\n+\t\tif (status)\n+\t\t\tsnprintf(out, out_size, \"Error: Invalid Ethernet device name.\\n\");\n \n-\t\tif (link == NULL) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID,\n-\t\t\t\t\t\"Link does not exist\");\n-\t\t\treturn;\n-\t\t}\n-\t\tprint_link_info(link, out, out_size);\n+\t\tethdev_show(port_id, &out, &out_size);\n+\t\treturn;\n \t}\n+\n+\t/* All devices. */\n+\tfor (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++)\n+\t\tif (rte_eth_dev_is_valid_port(port_id))\n+\t\t\tethdev_show(port_id, &out, &out_size);\n }\n \n static const char cmd_ring_help[] =\n@@ -3003,6 +2988,7 @@ cmd_help(char **tokens,\n \t\t\t\"List of commands:\\n\"\n \t\t\t\"\\tmempool\\n\"\n \t\t\t\"\\tethdev\\n\"\n+\t\t\t\"\\tethdev show\\n\"\n \t\t\t\"\\tring\\n\"\n \t\t\t\"\\tpipeline codegen\\n\"\n \t\t\t\"\\tpipeline libbuild\\n\"\n@@ -3038,9 +3024,16 @@ cmd_help(char **tokens,\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[0], \"ethdev\") == 0) {\n-\t\tsnprintf(out, out_size, \"\\n%s\\n\", cmd_ethdev_help);\n-\t\treturn;\n+\tif (!strcmp(tokens[0], \"ethdev\")) {\n+\t\tif (n_tokens == 1) {\n+\t\t\tsnprintf(out, out_size, \"\\n%s\\n\", cmd_ethdev_help);\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tif (n_tokens == 2 && !strcmp(tokens[1], \"show\")) {\n+\t\t\tsnprintf(out, out_size, \"\\n%s\\n\", cmd_ethdev_show_help);\n+\t\t\treturn;\n+\t\t}\n \t}\n \n \tif (strcmp(tokens[0], \"ring\") == 0) {\ndiff --git a/examples/pipeline/main.c b/examples/pipeline/main.c\nindex 6fb839f4cb..da5dd2b3f6 100644\n--- a/examples/pipeline/main.c\n+++ b/examples/pipeline/main.c\n@@ -135,7 +135,6 @@ int\n main(int argc, char **argv)\n {\n \tstruct conn *conn;\n-\tstruct obj *obj;\n \tint status;\n \n \t/* Parse application arguments */\n@@ -150,13 +149,6 @@ main(int argc, char **argv)\n \t\treturn status;\n \t};\n \n-\t/* Obj */\n-\tobj = obj_init();\n-\tif (!obj) {\n-\t\tprintf(\"Error: Obj initialization failed (%d)\\n\", status);\n-\t\treturn status;\n-\t}\n-\n \t/* Thread */\n \tstatus = thread_init();\n \tif (status) {\n@@ -174,10 +166,10 @@ main(int argc, char **argv)\n \t\tcli_script_process(app.script_name,\n \t\t\tapp.conn.msg_in_len_max,\n \t\t\tapp.conn.msg_out_len_max,\n-\t\t\tobj);\n+\t\t\tNULL);\n \n \t/* Connectivity */\n-\tapp.conn.msg_handle_arg = obj;\n+\tapp.conn.msg_handle_arg = NULL;\n \tconn = conn_init(&app.conn);\n \tif (!conn) {\n \t\tprintf(\"Error: Connectivity initialization failed (%d)\\n\",\ndiff --git a/examples/pipeline/obj.c b/examples/pipeline/obj.c\nindex f1a50133f4..a5c09e7219 100644\n--- a/examples/pipeline/obj.c\n+++ b/examples/pipeline/obj.c\n@@ -4,35 +4,14 @@\n \n #include <stdlib.h>\n #include <string.h>\n-#include <netinet/in.h>\n-#ifdef RTE_EXEC_ENV_LINUX\n-#include <linux/if.h>\n-#include <linux/if_tun.h>\n-#endif\n-#include <sys/ioctl.h>\n-#include <fcntl.h>\n-#include <unistd.h>\n \n #include <rte_mbuf.h>\n #include <rte_ethdev.h>\n-#include <rte_swx_ctl.h>\n \n #include \"obj.h\"\n \n /*\n- * link\n- */\n-TAILQ_HEAD(link_list, link);\n-\n-/*\n- * obj\n- */\n-struct obj {\n-\tstruct link_list link_list;\n-};\n-\n-/*\n- * link\n+ * ethdev\n */\n static struct rte_eth_conf port_conf_default = {\n \t.link_speeds = 0,\n@@ -59,7 +38,7 @@ static struct rte_eth_conf port_conf_default = {\n static int\n rss_setup(uint16_t port_id,\n \tuint16_t reta_size,\n-\tstruct link_params_rss *rss)\n+\tstruct ethdev_params_rss *rss)\n {\n \tstruct rte_eth_rss_reta_entry64 reta_conf[RETA_CONF_SIZE];\n \tuint32_t i;\n@@ -88,69 +67,64 @@ rss_setup(uint16_t port_id,\n \treturn status;\n }\n \n-struct link *\n-link_create(struct obj *obj, const char *name, struct link_params *params)\n+int\n+ethdev_config(const char *name, struct ethdev_params *params)\n {\n \tstruct rte_eth_dev_info port_info;\n \tstruct rte_eth_conf port_conf;\n-\tstruct link *link;\n-\tstruct link_params_rss *rss;\n+\tstruct ethdev_params_rss *rss;\n \tstruct rte_mempool *mempool;\n-\tuint32_t cpu_id, i;\n-\tint status;\n+\tuint32_t i;\n+\tint numa_node, status;\n \tuint16_t port_id = 0;\n \n \t/* Check input params */\n-\tif ((name == NULL) ||\n-\t\tlink_find(obj, name) ||\n-\t\t(params == NULL) ||\n-\t\t(params->rx.n_queues == 0) ||\n-\t\t(params->rx.queue_size == 0) ||\n-\t\t(params->tx.n_queues == 0) ||\n-\t\t(params->tx.queue_size == 0))\n-\t\treturn NULL;\n+\tif (!name ||\n+\t !name[0] ||\n+\t !params ||\n+\t !params->rx.n_queues ||\n+\t !params->rx.queue_size ||\n+\t !params->tx.n_queues ||\n+\t !params->tx.queue_size)\n+\t\treturn -EINVAL;\n \n \tstatus = rte_eth_dev_get_port_by_name(name, &port_id);\n \tif (status)\n-\t\treturn NULL;\n+\t\treturn -EINVAL;\n \n-\tif (rte_eth_dev_info_get(port_id, &port_info) != 0)\n-\t\treturn NULL;\n+\tstatus = rte_eth_dev_info_get(port_id, &port_info);\n+\tif (status)\n+\t\treturn -EINVAL;\n \n \tmempool = rte_mempool_lookup(params->rx.mempool_name);\n \tif (!mempool)\n-\t\treturn NULL;\n+\t\treturn -EINVAL;\n \n \trss = params->rx.rss;\n \tif (rss) {\n-\t\tif ((port_info.reta_size == 0) ||\n-\t\t\t(port_info.reta_size > RTE_ETH_RSS_RETA_SIZE_512))\n-\t\t\treturn NULL;\n+\t\tif (!port_info.reta_size || port_info.reta_size > RTE_ETH_RSS_RETA_SIZE_512)\n+\t\t\treturn -EINVAL;\n \n-\t\tif ((rss->n_queues == 0) ||\n-\t\t\t(rss->n_queues >= LINK_RXQ_RSS_MAX))\n-\t\t\treturn NULL;\n+\t\tif (!rss->n_queues || rss->n_queues >= ETHDEV_RXQ_RSS_MAX)\n+\t\t\treturn -EINVAL;\n \n \t\tfor (i = 0; i < rss->n_queues; i++)\n \t\t\tif (rss->queue_id[i] >= port_info.max_rx_queues)\n-\t\t\t\treturn NULL;\n+\t\t\t\treturn -EINVAL;\n \t}\n \n-\t/**\n-\t * Resource create\n-\t */\n \t/* Port */\n \tmemcpy(&port_conf, &port_conf_default, sizeof(port_conf));\n \tif (rss) {\n+\t\tuint64_t rss_hf = RTE_ETH_RSS_IP | RTE_ETH_RSS_TCP | RTE_ETH_RSS_UDP;\n+\n \t\tport_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_RSS;\n-\t\tport_conf.rx_adv_conf.rss_conf.rss_hf =\n-\t\t\t(RTE_ETH_RSS_IP | RTE_ETH_RSS_TCP | RTE_ETH_RSS_UDP) &\n-\t\t\tport_info.flow_type_rss_offloads;\n+\t\tport_conf.rx_adv_conf.rss_conf.rss_hf = rss_hf & port_info.flow_type_rss_offloads;\n \t}\n \n-\tcpu_id = (uint32_t) rte_eth_dev_socket_id(port_id);\n-\tif (cpu_id == (uint32_t) SOCKET_ID_ANY)\n-\t\tcpu_id = 0;\n+\tnuma_node = rte_eth_dev_socket_id(port_id);\n+\tif (numa_node == SOCKET_ID_ANY)\n+\t\tnuma_node = 0;\n \n \tstatus = rte_eth_dev_configure(\n \t\tport_id,\n@@ -159,12 +133,12 @@ link_create(struct obj *obj, const char *name, struct link_params *params)\n \t\t&port_conf);\n \n \tif (status < 0)\n-\t\treturn NULL;\n+\t\treturn -EINVAL;\n \n \tif (params->promiscuous) {\n \t\tstatus = rte_eth_promiscuous_enable(port_id);\n-\t\tif (status != 0)\n-\t\t\treturn NULL;\n+\t\tif (status)\n+\t\t\treturn -EINVAL;\n \t}\n \n \t/* Port RX */\n@@ -173,12 +147,12 @@ link_create(struct obj *obj, const char *name, struct link_params *params)\n \t\t\tport_id,\n \t\t\ti,\n \t\t\tparams->rx.queue_size,\n-\t\t\tcpu_id,\n+\t\t\tnuma_node,\n \t\t\tNULL,\n \t\t\tmempool);\n \n \t\tif (status < 0)\n-\t\t\treturn NULL;\n+\t\t\treturn -EINVAL;\n \t}\n \n \t/* Port TX */\n@@ -187,24 +161,24 @@ link_create(struct obj *obj, const char *name, struct link_params *params)\n \t\t\tport_id,\n \t\t\ti,\n \t\t\tparams->tx.queue_size,\n-\t\t\tcpu_id,\n+\t\t\tnuma_node,\n \t\t\tNULL);\n \n \t\tif (status < 0)\n-\t\t\treturn NULL;\n+\t\t\treturn -EINVAL;\n \t}\n \n \t/* Port start */\n \tstatus = rte_eth_dev_start(port_id);\n \tif (status < 0)\n-\t\treturn NULL;\n+\t\treturn -EINVAL;\n \n \tif (rss) {\n \t\tstatus = rss_setup(port_id, port_info.reta_size, rss);\n \n \t\tif (status) {\n \t\t\trte_eth_dev_stop(port_id);\n-\t\t\treturn NULL;\n+\t\t\treturn -EINVAL;\n \t\t}\n \t}\n \n@@ -212,84 +186,8 @@ link_create(struct obj *obj, const char *name, struct link_params *params)\n \tstatus = rte_eth_dev_set_link_up(port_id);\n \tif ((status < 0) && (status != -ENOTSUP)) {\n \t\trte_eth_dev_stop(port_id);\n-\t\treturn NULL;\n-\t}\n-\n-\t/* Node allocation */\n-\tlink = calloc(1, sizeof(struct link));\n-\tif (link == NULL) {\n-\t\trte_eth_dev_stop(port_id);\n-\t\treturn NULL;\n+\t\treturn -EINVAL;\n \t}\n \n-\t/* Node fill in */\n-\tstrlcpy(link->name, name, sizeof(link->name));\n-\tlink->port_id = port_id;\n-\tlink->n_rxq = params->rx.n_queues;\n-\tlink->n_txq = params->tx.n_queues;\n-\n-\t/* Node add to list */\n-\tTAILQ_INSERT_TAIL(&obj->link_list, link, node);\n-\n-\treturn link;\n-}\n-\n-int\n-link_is_up(struct obj *obj, const char *name)\n-{\n-\tstruct rte_eth_link link_params;\n-\tstruct link *link;\n-\n-\t/* Check input params */\n-\tif (!obj || !name)\n-\t\treturn 0;\n-\n-\tlink = link_find(obj, name);\n-\tif (link == NULL)\n-\t\treturn 0;\n-\n-\t/* Resource */\n-\tif (rte_eth_link_get(link->port_id, &link_params) < 0)\n-\t\treturn 0;\n-\n-\treturn (link_params.link_status == RTE_ETH_LINK_DOWN) ? 0 : 1;\n-}\n-\n-struct link *\n-link_find(struct obj *obj, const char *name)\n-{\n-\tstruct link *link;\n-\n-\tif (!obj || !name)\n-\t\treturn NULL;\n-\n-\tTAILQ_FOREACH(link, &obj->link_list, node)\n-\t\tif (strcmp(link->name, name) == 0)\n-\t\t\treturn link;\n-\n-\treturn NULL;\n-}\n-\n-struct link *\n-link_next(struct obj *obj, struct link *link)\n-{\n-\treturn (link == NULL) ?\n-\t\tTAILQ_FIRST(&obj->link_list) : TAILQ_NEXT(link, node);\n-}\n-\n-/*\n- * obj\n- */\n-struct obj *\n-obj_init(void)\n-{\n-\tstruct obj *obj;\n-\n-\tobj = calloc(1, sizeof(struct obj));\n-\tif (!obj)\n-\t\treturn NULL;\n-\n-\tTAILQ_INIT(&obj->link_list);\n-\n-\treturn obj;\n+\treturn 0;\n }\ndiff --git a/examples/pipeline/obj.h b/examples/pipeline/obj.h\nindex dbbc6d39a0..fb091f4ba7 100644\n--- a/examples/pipeline/obj.h\n+++ b/examples/pipeline/obj.h\n@@ -6,41 +6,25 @@\n #define _INCLUDE_OBJ_H_\n \n #include <stdint.h>\n-#include <sys/queue.h>\n-\n-#include <rte_swx_pipeline.h>\n-#include <rte_swx_ctl.h>\n-\n-#ifndef NAME_SIZE\n-#define NAME_SIZE 64\n-#endif\n-\n-/*\n- * obj\n- */\n-struct obj;\n-\n-struct obj *\n-obj_init(void);\n \n /*\n- * link\n+ * ethdev\n */\n-#ifndef LINK_RXQ_RSS_MAX\n-#define LINK_RXQ_RSS_MAX 16\n+#ifndef ETHDEV_RXQ_RSS_MAX\n+#define ETHDEV_RXQ_RSS_MAX 16\n #endif\n \n-struct link_params_rss {\n-\tuint32_t queue_id[LINK_RXQ_RSS_MAX];\n+struct ethdev_params_rss {\n+\tuint32_t queue_id[ETHDEV_RXQ_RSS_MAX];\n \tuint32_t n_queues;\n };\n \n-struct link_params {\n+struct ethdev_params {\n \tstruct {\n \t\tuint32_t n_queues;\n \t\tuint32_t queue_size;\n \t\tconst char *mempool_name;\n-\t\tstruct link_params_rss *rss;\n+\t\tstruct ethdev_params_rss *rss;\n \t} rx;\n \n \tstruct {\n@@ -51,26 +35,7 @@ struct link_params {\n \tint promiscuous;\n };\n \n-struct link {\n-\tTAILQ_ENTRY(link) node;\n-\tchar name[NAME_SIZE];\n-\tuint16_t port_id;\n-\tuint32_t n_rxq;\n-\tuint32_t n_txq;\n-};\n-\n-struct link *\n-link_create(struct obj *obj,\n-\t const char *name,\n-\t struct link_params *params);\n-\n int\n-link_is_up(struct obj *obj, const char *name);\n-\n-struct link *\n-link_find(struct obj *obj, const char *name);\n-\n-struct link *\n-link_next(struct obj *obj, struct link *link);\n+ethdev_config(const char *name, struct ethdev_params *params);\n \n #endif /* _INCLUDE_OBJ_H_ */\n", "prefixes": [ "04/11" ] }