Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/65172/?format=api
{ "id": 65172, "url": "http://patches.dpdk.org/api/patches/65172/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200128053506.2173-5-pbhagavatula@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": "<20200128053506.2173-5-pbhagavatula@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200128053506.2173-5-pbhagavatula@marvell.com", "date": "2020-01-28T05:34:58", "name": "[v6,04/11] examples/l3fwd: add ethdev setup based on eventdev", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1498053c57c49a65ae894559faa477c1bf043569", "submitter": { "id": 1183, "url": "http://patches.dpdk.org/api/people/1183/?format=api", "name": "Pavan Nikhilesh Bhagavatula", "email": "pbhagavatula@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200128053506.2173-5-pbhagavatula@marvell.com/mbox/", "series": [ { "id": 8312, "url": "http://patches.dpdk.org/api/series/8312/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8312", "date": "2020-01-28T05:34:54", "name": "example/l3fwd: introduce event device support", "version": 6, "mbox": "http://patches.dpdk.org/series/8312/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/65172/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/65172/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 1E9F8A04B3;\n\tTue, 28 Jan 2020 06:35:55 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D09691C068;\n\tTue, 28 Jan 2020 06:35:36 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 5FAD61C012\n for <dev@dpdk.org>; Tue, 28 Jan 2020 06:35:35 +0100 (CET)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 00S5XOnb031034; Mon, 27 Jan 2020 21:35:34 -0800", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0a-0016f401.pphosted.com with ESMTP id 2xt6bssvdc-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Mon, 27 Jan 2020 21:35:34 -0800", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 27 Jan\n 2020 21:35:32 -0800", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Mon, 27 Jan 2020 21:35:33 -0800", "from BG-LT7430.marvell.com (unknown [10.28.17.49])\n by maili.marvell.com (Postfix) with ESMTP id 465203F703F;\n Mon, 27 Jan 2020 21:35:27 -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=pfpt0818;\n bh=5xCFthr18MiHkhn1IyFyGA8o2VgSEL4MyY/KLNG9a9Y=;\n b=KootyxVcGqP7hAqo30gIftigmqHo0wEQOZHQs4F+bvTfRyuLikJM1uKnSTbzjApxqF7U\n HcTZ2j6l6SQ5eOJGfXWf0U5GjkY+uQ8+SD1JqGyF8lDRDlwZBGOgtufiuOgwo59HPsIc\n EhNg3ooEj98IQH4NAUBLwAovsfQsgUrJODxWkHTFXmuNysWDiZmlKfAwKCD+tSysItEl\n m1ox2nFQiNT5RYCSuSzfooNy9s8dUfx0NZUm2jyebuczt7vy2QLsOopY8rWeND3bDy9i\n l6sw58o0WP2IX2gBef+WgVhtBm+Rwzj3KT1fTveNKJ+J9OMhluXlt2lV/UcjPbz4J6rB 0w==", "From": "<pbhagavatula@marvell.com>", "To": "<jerinj@marvell.com>, <konstantin.ananyev@intel.com>, Marko Kovacevic\n <marko.kovacevic@intel.com>, Ori Kam <orika@mellanox.com>, Bruce Richardson\n <bruce.richardson@intel.com>, Radu Nicolau <radu.nicolau@intel.com>, \"Akhil\n Goyal\" <akhil.goyal@nxp.com>, Tomasz Kantecki <tomasz.kantecki@intel.com>,\n Sunil Kumar Kori <skori@marvell.com>, Pavan Nikhilesh\n <pbhagavatula@marvell.com>", "CC": "<dev@dpdk.org>, Nipun Gupta <nipun.gupta@nxp.com>", "Date": "Tue, 28 Jan 2020 11:04:58 +0530", "Message-ID": "<20200128053506.2173-5-pbhagavatula@marvell.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200128053506.2173-1-pbhagavatula@marvell.com>", "References": "<20200124040542.2360--1-pbhagavatula@marvell.com>\n <20200128053506.2173-1-pbhagavatula@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572\n definitions=2020-01-27_08:2020-01-24,\n 2020-01-27 signatures=0", "Subject": "[dpdk-dev] [PATCH v6 04/11] examples/l3fwd: add ethdev setup based\n\ton eventdev", "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": "From: Sunil Kumar Kori <skori@marvell.com>\n\nAdd ethernet port Rx/Tx queue setup for event device which are later\nused for setting up event eth Rx/Tx adapters.\n\nSigned-off-by: Sunil Kumar Kori <skori@marvell.com>\nSigned-off-by: Nipun Gupta <nipun.gupta@nxp.com>\n---\n examples/l3fwd/l3fwd.h | 10 +++\n examples/l3fwd/l3fwd_event.c | 138 ++++++++++++++++++++++++++++++++++-\n examples/l3fwd/l3fwd_event.h | 2 +-\n examples/l3fwd/main.c | 15 ++--\n 4 files changed, 153 insertions(+), 12 deletions(-)", "diff": "diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h\nindex e2399d76b..ed5ba5f3b 100644\n--- a/examples/l3fwd/l3fwd.h\n+++ b/examples/l3fwd/l3fwd.h\n@@ -16,9 +16,16 @@\n #define NO_HASH_MULTI_LOOKUP 1\n #endif\n \n+/*\n+ * Configurable number of RX/TX ring descriptors\n+ */\n+#define RTE_TEST_RX_DESC_DEFAULT 1024\n+#define RTE_TEST_TX_DESC_DEFAULT 1024\n+\n #define MAX_PKT_BURST 32\n #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */\n \n+#define MEMPOOL_CACHE_SIZE 256\n #define MAX_RX_QUEUE_PER_LCORE 16\n \n /*\n@@ -170,6 +177,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)\n }\n #endif /* DO_RFC_1812_CHECKS */\n \n+int\n+init_mem(uint16_t portid, unsigned int nb_mbuf);\n+\n /* Function pointers for LPM or EM functionality. */\n void\n setup_lpm(const int socketid);\ndiff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c\nindex 9cb46c711..f9491ecc6 100644\n--- a/examples/l3fwd/l3fwd_event.c\n+++ b/examples/l3fwd/l3fwd_event.c\n@@ -10,6 +10,14 @@\n #include \"l3fwd.h\"\n #include \"l3fwd_event.h\"\n \n+static void\n+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)\n+{\n+\tchar buf[RTE_ETHER_ADDR_FMT_SIZE];\n+\trte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);\n+\tprintf(\"%s%s\", name, buf);\n+}\n+\n struct l3fwd_event_resources *\n l3fwd_get_eventdev_rsrc(void)\n {\n@@ -30,6 +38,131 @@ l3fwd_get_eventdev_rsrc(void)\n \treturn NULL;\n }\n \n+static void\n+l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)\n+{\n+\tstruct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();\n+\tuint16_t nb_ports = rte_eth_dev_count_avail();\n+\tuint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;\n+\tuint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;\n+\tunsigned int nb_lcores = rte_lcore_count();\n+\tstruct rte_eth_conf local_port_conf;\n+\tstruct rte_eth_dev_info dev_info;\n+\tstruct rte_eth_txconf txconf;\n+\tstruct rte_eth_rxconf rxconf;\n+\tunsigned int nb_mbuf;\n+\tuint16_t port_id;\n+\tuint8_t eth_qid;\n+\tint32_t ret;\n+\n+\t/* initialize all ports */\n+\tRTE_ETH_FOREACH_DEV(port_id) {\n+\t\tlocal_port_conf = *port_conf;\n+\t\t/* skip ports that are not enabled */\n+\t\tif ((evt_rsrc->port_mask & (1 << port_id)) == 0) {\n+\t\t\tprintf(\"\\nSkipping disabled port %d\\n\", port_id);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* init port */\n+\t\tprintf(\"Initializing port %d ... \", port_id);\n+\t\tfflush(stdout);\n+\t\tprintf(\"Creating queues: nb_rxq=%d nb_txq=1...\\n\",\n+\t\t evt_rsrc->eth_rx_queues);\n+\n+\t\trte_eth_dev_info_get(port_id, &dev_info);\n+\t\tif (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)\n+\t\t\tlocal_port_conf.txmode.offloads |=\n+\t\t\t\t\t\tDEV_TX_OFFLOAD_MBUF_FAST_FREE;\n+\n+\t\tlocal_port_conf.rx_adv_conf.rss_conf.rss_hf &=\n+\t\t\t\t\t\tdev_info.flow_type_rss_offloads;\n+\t\tif (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=\n+\t\t\t\tport_conf->rx_adv_conf.rss_conf.rss_hf) {\n+\t\t\tprintf(\"Port %u modified RSS hash function \"\n+\t\t\t \"based on hardware support,\"\n+\t\t\t \"requested:%#\"PRIx64\" configured:%#\"PRIx64\"\\n\",\n+\t\t\t port_id,\n+\t\t\t port_conf->rx_adv_conf.rss_conf.rss_hf,\n+\t\t\t local_port_conf.rx_adv_conf.rss_conf.rss_hf);\n+\t\t}\n+\n+\t\tret = rte_eth_dev_configure(port_id, evt_rsrc->eth_rx_queues,\n+\t\t\t\t\t 1, &local_port_conf);\n+\t\tif (ret < 0)\n+\t\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\t \"Cannot configure device: err=%d, port=%d\\n\",\n+\t\t\t\t ret, port_id);\n+\n+\t\tret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd,\n+\t\t\t\t\t\t &nb_txd);\n+\t\tif (ret < 0)\n+\t\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\t \"Cannot adjust number of descriptors: err=%d, \"\n+\t\t\t\t \"port=%d\\n\", ret, port_id);\n+\n+\t\trte_eth_macaddr_get(port_id, &ports_eth_addr[port_id]);\n+\t\tprint_ethaddr(\" Address:\", &ports_eth_addr[port_id]);\n+\t\tprintf(\", \");\n+\t\tprint_ethaddr(\"Destination:\",\n+\t\t\t(const struct rte_ether_addr *)&dest_eth_addr[port_id]);\n+\t\tprintf(\", \");\n+\n+\t\t/* prepare source MAC for each port. */\n+\t\trte_ether_addr_copy(&ports_eth_addr[port_id],\n+\t\t\t(struct rte_ether_addr *)(val_eth + port_id) + 1);\n+\n+\t\t/* init memory */\n+\t\tif (!evt_rsrc->per_port_pool) {\n+\t\t\t/* port_id = 0; this is *not* signifying the first port,\n+\t\t\t * rather, it signifies that port_id is ignored.\n+\t\t\t */\n+\t\t\tnb_mbuf = RTE_MAX(nb_ports * nb_rxd +\n+\t\t\t\t\t nb_ports * nb_txd +\n+\t\t\t\t\t nb_ports * nb_lcores *\n+\t\t\t\t\t\t\tMAX_PKT_BURST +\n+\t\t\t\t\t nb_lcores * MEMPOOL_CACHE_SIZE,\n+\t\t\t\t\t 8192u);\n+\t\t\tret = init_mem(0, nb_mbuf);\n+\t\t} else {\n+\t\t\tnb_mbuf = RTE_MAX(nb_rxd + nb_rxd +\n+\t\t\t\t\t nb_lcores * MAX_PKT_BURST +\n+\t\t\t\t\t nb_lcores * MEMPOOL_CACHE_SIZE,\n+\t\t\t\t\t 8192u);\n+\t\t\tret = init_mem(port_id, nb_mbuf);\n+\t\t}\n+\t\t/* init Rx queues per port */\n+\t\trxconf = dev_info.default_rxconf;\n+\t\trxconf.offloads = local_port_conf.rxmode.offloads;\n+\n+\t\tfor (eth_qid = 0; eth_qid < evt_rsrc->eth_rx_queues;\n+\t\t eth_qid++) {\n+\t\t\tif (!evt_rsrc->per_port_pool)\n+\t\t\t\tret = rte_eth_rx_queue_setup(port_id, eth_qid,\n+\t\t\t\t\tnb_rxd, 0, &rxconf,\n+\t\t\t\t\tevt_rsrc->pkt_pool[0][0]);\n+\t\t\telse\n+\t\t\t\tret = rte_eth_rx_queue_setup(port_id, eth_qid,\n+\t\t\t\t\tnb_rxd, 0, &rxconf,\n+\t\t\t\t\tevt_rsrc->pkt_pool[port_id][0]);\n+\t\t\tif (ret < 0)\n+\t\t\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\t\t \"rte_eth_rx_queue_setup: err=%d, \"\n+\t\t\t\t\t \"port=%d, eth_qid: %d\\n\",\n+\t\t\t\t\t ret, port_id, eth_qid);\n+\t\t}\n+\n+\t\t/* init one Tx queue per port */\n+\t\ttxconf = dev_info.default_txconf;\n+\t\ttxconf.offloads = local_port_conf.txmode.offloads;\n+\t\tret = rte_eth_tx_queue_setup(port_id, 0, nb_txd, 0, &txconf);\n+\t\tif (ret < 0)\n+\t\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\t \"rte_eth_tx_queue_setup: err=%d, \"\n+\t\t\t\t \"port=%d\\n\", ret, port_id);\n+\t}\n+}\n+\n static void\n l3fwd_event_capability_setup(void)\n {\n@@ -56,7 +189,7 @@ l3fwd_event_capability_setup(void)\n }\n \n void\n-l3fwd_event_resource_setup(void)\n+l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)\n {\n \tstruct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();\n \n@@ -69,6 +202,9 @@ l3fwd_event_resource_setup(void)\n \t/* Setup eventdev capability callbacks */\n \tl3fwd_event_capability_setup();\n \n+\t/* Ethernet device configuration */\n+\tl3fwd_eth_dev_port_setup(port_conf);\n+\n \t/* Event device configuration */\n \tevt_rsrc->ops.event_device_setup();\n }\ndiff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h\nindex fc3862ec1..53feea069 100644\n--- a/examples/l3fwd/l3fwd_event.h\n+++ b/examples/l3fwd/l3fwd_event.h\n@@ -72,7 +72,7 @@ struct l3fwd_event_resources {\n };\n \n struct l3fwd_event_resources *l3fwd_get_eventdev_rsrc(void);\n-void l3fwd_event_resource_setup(void);\n+void l3fwd_event_resource_setup(struct rte_eth_conf *port_conf);\n void l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops);\n void l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops);\n \ndiff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c\nindex 8a5cdb52e..04526343f 100644\n--- a/examples/l3fwd/main.c\n+++ b/examples/l3fwd/main.c\n@@ -48,12 +48,6 @@\n #include \"l3fwd.h\"\n #include \"l3fwd_event.h\"\n \n-/*\n- * Configurable number of RX/TX ring descriptors\n- */\n-#define RTE_TEST_RX_DESC_DEFAULT 1024\n-#define RTE_TEST_TX_DESC_DEFAULT 1024\n-\n #define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS\n #define MAX_RX_QUEUE_PER_PORT 128\n \n@@ -495,7 +489,6 @@ parse_event_eth_rx_queues(const char *eth_rx_queues)\n }\n \n #define MAX_JUMBO_PKT_LEN 9600\n-#define MEMPOOL_CACHE_SIZE 256\n \n static const char short_options[] =\n \t\"p:\" /* portmask */\n@@ -752,7 +745,7 @@ print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)\n \tprintf(\"%s%s\", name, buf);\n }\n \n-static int\n+int\n init_mem(uint16_t portid, unsigned int nb_mbuf)\n {\n \tstruct lcore_conf *qconf;\n@@ -939,14 +932,16 @@ main(int argc, char **argv)\n \t}\n \n \tevt_rsrc = l3fwd_get_eventdev_rsrc();\n-\tRTE_SET_USED(evt_rsrc);\n \t/* parse application arguments (after the EAL ones) */\n \tret = parse_args(argc, argv);\n \tif (ret < 0)\n \t\trte_exit(EXIT_FAILURE, \"Invalid L3FWD parameters\\n\");\n \n+\tevt_rsrc->per_port_pool = per_port_pool;\n+\tevt_rsrc->pkt_pool = pktmbuf_pool;\n+\tevt_rsrc->port_mask = enabled_port_mask;\n \t/* Configure eventdev parameters if user has requested */\n-\tl3fwd_event_resource_setup();\n+\tl3fwd_event_resource_setup(&port_conf);\n \n \tif (check_lcore_params() < 0)\n \t\trte_exit(EXIT_FAILURE, \"check_lcore_params failed\\n\");\n", "prefixes": [ "v6", "04/11" ] }