From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0060.outbound.protection.outlook.com [104.47.40.60]) by dpdk.org (Postfix) with ESMTP id B634A324B for ; Fri, 1 Dec 2017 16:13:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=51d49Dml/c/MMjVaMYVb4JuYBu/sn75DULf3m7BqVpM=; b=fAYfgvfu+rYgu16gDJkiMnxvmVXgshXuvXLk2Tjeun+OGnI51JDeEB0TNCoXJJmHAQS8oOijhjeZwoDgxnQpOTxOj3zXv/SBPiI6qiPHDs9IyI/wWcJss1NlX1v4KgGCUvnvMiWE1rEOFGqzFhnp4Jeu6IK/Hr6+QaYScQKKgYg= Received: from Pavan-LT.caveonetworks.com (111.93.218.67) by CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Fri, 1 Dec 2017 15:13:33 +0000 From: Pavan Nikhilesh To: harry.van.haaren@intel.com, nikhil.rao@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Fri, 1 Dec 2017 20:43:14 +0530 Message-Id: <20171201151314.18181-1-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: DM5PR13CA0033.namprd13.prod.outlook.com (10.168.240.147) To CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdf70a13-0a71-4466-9773-08d538ce172c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603286); SRVR:CY4PR07MB3463; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 3:g4Al0jZb4C1oN3MAQlmEgqyR5SHSK7YaNkcUbxlIKSl7lR/M5Dh0D93aucOZArlQUft6zbQeYmiosDY4V9bvVwHnvoI9M3LaDE3SFTGeuP6yGP2cmUM6q28Ef+5r7zyAALWlMvfw0u0A9ICrsRcrBXHZ4cTgZ8WqxYK/IA05lxul/hjNdoQBuY2O9ZDG5V6njhsTg1+ZTLQY2BjgdTa31V2S3g1IOmCr3KnmQNefkJXbTEbEPEFSNOoefBSBCqkE; 25:FweXo12HF/mm9temglriIa7USNIWne1x+QlcA9BwHMmAyYLktbzXsANb8pqroGcdIQEOop8UqWXlfhuxgzK7QzdhuWGTMMiLEAPH+Z/vBqmOA3p0pOjNQLJpI4UMa5g/avai1yWxcsOY1mKhsMJxiYIB+ch3pKU49l6Gr56lqTeibii3CXOEqbICcLq8VzvijVUe53wT/SLf3CspTKUO73C6cO3RL+RnEqfybX1csYcyTqkUo08SxOVsPJgUINWSWHG2VEL27YOFz2RWc6eItdtDZG03ZVLeg1IvmNs9gA/fvV2MG0mzCqI8vfZgF7bZRskE7zRwc3upk90BwX6BZA==; 31:zQCJDL/lEd6S7PnDlAJNZD8pp8OQrOcwiLQMM+vbbmlR0ge3S/ruYR1glmcTSYvM2p8Vq6knjdHJoVZk8IqasC7MqKO/4Nq81sNWAUUBbpbpkw2I3V7Ctge10Qti55eWD84zf9uejIPGvL9+01P7iEXLRUfz3fEebu7QLHOZzEH4UAh9bs1jF7fpIXzPq0iM+x1WAm52EeIdcx6Wso9rBkVXIf/purqz4YYTr0Q6z3Q= X-MS-TrafficTypeDiagnostic: CY4PR07MB3463: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 20:eYoHoBIkJV5vdo8cukn7+CT56Sg6vzYrEKcO4NkOEp32bHGwqkC7tpF9QhVa7SodEt390XgOoZqkY899eSlEPW/kt8HnlcP4ZggoSkoHb2a2IDzm1ThT9RuJT18pc11+aRtQdXLPyBwYpNniHiTxWr0u/hGIdiltup8A+OKzW8zqLSvYlxBC8f0f9qo0HZqKGOSQoqnA1jNjAPisHxqMilT0rL2mQDx00ERP8mLbRn5e/XOdxcMUZRkmmlhYuoKof7L1eUCTjS6nnhEWsXTT9lAHHVwlUL3JLH9c1NFTOp48cExcgAanhLIPVCoMQ88erubwcGlqByvZ0kSWUXHr90GpMYnfFaDQpJYDGic8M8oRuA4+zk+Bcn2HNMNjfEzLxrslvik0zKHAjoUIZcLcTGQrU6NbtvfgDKazgGITu2nKXpXpD/qEnDdZqWni1G4cFD1D3JzSdix5WQjVEXu3Uy1pLhHl6+7sbHuPS1IDIxUY9qsehJqWNGUTCrlaYI7w/56IaIRHyC02bZxzkKso5tgOwlAHIl5DZCaUAsiL348gXwC7+G5C5ekIuZ808T/KR1V/QPQFR8TuyqmuqvbO5Xej5h1MODClyUbdTzMJkHo=; 4:iZAGCGSI4pPx/Qf1I6jZlmiLa5KUXu/1Bflc5o5hfLT4kJGPQbh5Z7etr09UyTVSCIvmxXNdyVsG6FYEhLvzrn9FJtLVEsGm0jOuPEZ4gfg7U8i0WCgT59ooiB7pTp0uhamsrBmFh98SxiS2I+0z71WVnbAycr0x9PP+sS1j1sDFsNRYQ/jH76NLZTEg68Ti4jV+NvtftlClOrH8iBeC2zcABdScO2fT1jzj2uFISs2kGkqqBIS8gRsJz2vVI0xUJ+QpaC9wNOVPqzvx0Sh0Mw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(10201501046)(3002001)(93006095)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123564025)(20161123558100)(20161123562025)(6072148)(201708071742011); SRVR:CY4PR07MB3463; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR07MB3463; X-Forefront-PRVS: 05087F0C24 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(366004)(346002)(376002)(199003)(189002)(47776003)(5660300001)(36756003)(6512007)(2906002)(478600001)(575784001)(7736002)(66066001)(305945005)(189998001)(3846002)(6116002)(97736004)(16586007)(53936002)(81156014)(5009440100003)(1076002)(33646002)(107886003)(69596002)(50466002)(316002)(48376002)(8936002)(51416003)(8676002)(16526018)(42882006)(25786009)(52116002)(50226002)(6666003)(6486002)(105586002)(6506006)(53416004)(106356001)(68736007)(101416001)(72206003)(81166006)(4326008)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3463; H:Pavan-LT.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3463; 23:C6kHEkG5/HMIHHMmz3JpSZp5Eiw6djANn8i1I1CPm?= =?us-ascii?Q?/b3oC966ks3GfF3a1KWuz47tCsvnhqq3Y6FO2s2UYflWK5zSRfeWAppY/oHx?= =?us-ascii?Q?4/RAwZq9NX6MUHvr337xk+B2xYI5GXvfjT0s/2dMeX84zpkHLrE5T0MIj9Qa?= =?us-ascii?Q?7YvI5AMTVcO9dg5qajmOsGJT/Mr13U8WE55l0/g0g/4eE44A8/zLJfeo/U40?= =?us-ascii?Q?7FBixCqMikjqDQvj6uSqUBhWOQRGCPqTK7Ry+7A2MLTBUWOcCAJlux0UvdDT?= =?us-ascii?Q?S34ypLHzFR7Re42iWuV4S1hzN8RmiqHE+YIE1yEvJUE/xYy7R20pefq+6LWQ?= =?us-ascii?Q?L+esm4/PHVV3H0+MUsYMeDZl8naOb3fEo1rPgFn458cYwVWKTqbfIqjUn3r7?= =?us-ascii?Q?s9kTlZE5VMEtmJd97eTQwM9K6M91SdLybuCY9N2nvB76DQK9MopaDGfjIhIe?= =?us-ascii?Q?/m+AxjAItb4qlC6QIPA3w2OcwvHTPm60dvLGAo+eo3rmzE8SKd+XGQHbvvTX?= =?us-ascii?Q?oK6zhAQW96u03+acRdVF+HSTe5g5hkgc2K1DpnpIsW04iP8ei9RQOUybT28E?= =?us-ascii?Q?hjOKCQtjaLKaaU1MaKmk3YDGz1VquQi+GvG6AajB8jC4/NIPnYDC9ZhbBZDE?= =?us-ascii?Q?UXn1C/960119wMXurDk8YKG91xEOfcm0Mn8FTEuFnAQY/sTgUXHIqYnKy1MD?= =?us-ascii?Q?Jzw5mb0rptaTnFvofxTpYZTR08spwyKOXHIGqeyV6ujyFvElpoTwGeG9DhF7?= =?us-ascii?Q?87txPvDz/oCpjgQABtARRd7RN7rBXaajVn6FHhw3FZlihkoi5b4PhUtdsgbz?= =?us-ascii?Q?dDf7Tnhhi5T5ZidoNByK3//SYQBiPLre3akxpP3adpQXFiwnlQiGO0F7ZRYc?= =?us-ascii?Q?CWMm1AsNmhhjm9J1PdHwQfy+MrQNUFu/vxH+Oz42Tg7ak77nRpAvLwV93RzW?= =?us-ascii?Q?f8+ZpcQOAwlyPWqlksfQrMOhFbPdjZiclOExIaJzqj4E23Fskx0dY8cHa/wM?= =?us-ascii?Q?BvYbpy+U7CLhVK6g7bzu4A1o4aeLTt013EmdD2w22P3u443X23wEDjg04qEe?= =?us-ascii?Q?niWlHoZ2VL/cznDkT/fNvJxLP4YRjTmjPfp9bcA/rnC1D0k2fNVuAPhJjfS7?= =?us-ascii?Q?JYSo0+ugBiyJVDdznsbKJS36DNhqJS/z62L+Sd4ChJGpD9oQnX8s+2aRF4ss?= =?us-ascii?Q?xK3ssA/F6sJCIg=3D?= X-Microsoft-Antispam-Message-Info: ve/rnE+ocy5EaxLrfiNxe1BDvmojznTCYKJ4TsGoh/F+iStajFIKZPMhDJe66l+IjmOzxcS06y0i8L6Oyky+jg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 6:8eZigm9jEDi61eJCJcMLwWFeLqidji9jrQS+Vw7ALgFCOM8XXMs68+hlr+Fj9t5hCLcZVy/jzRHf7FVkLZOJ47AU0a1ctQR3flUsXnnFaN6h9YVSSBXpphIyTs0bW2GFoT/sf7UAi85QDWlQTiHr4ii3+85qD8Hx0l+id8cm8UluK5CcAvph0Mu+eeTXc90Ewgk0+Wr6gL3pdkDddkrDcCmU7fvevH4EMMprSLUN2zVVuVs71M3a4Er2yqw4IM2GLoYiOrhDHpnAZD4CPVs2sa0V7rq3I786j4a+g4oRrh/MpaWwo4gxnthbOtYLpcsKWM5UaMgOd47Rcl2d+IJ/nd34PzP0EEFqnanJTKRJgFA=; 5:ZZmmiflMT/oovXnGM7kyqUGpB+FW2liWdx2Xn95AASmWtD34jK1PIXloMu56B+Vv3m4pfU2bYJQZ91ClHlibUXlrRi/hiXic0irpMa77vIuRJLHbO1tEXd22scfzIK1ZFcW9AHN0a0ITXPohBgSr2TdU/QSko6JEKFTyua8W6H0=; 24:dJmlWAIHnPA9vgoTCqllqv65nTu1oc+JigZhuZzy6IqfpEYLbwBzGWA+Z0PbngNQXXG3bmnUPvMlc84lj6hCMqa3IKyrP7ZCO17RvDDHRQc=; 7:8Wh7dNllw0KZ5MS0BIi5uRyviNHE3vyXI894vxf9uNNJ76F0ztuqTncnnocngQqWgbIAs2DbqyHP3vpCQKksVMNGBAv0cIpQtInaLHQmX7Uv0aeVxlCwlGA9SRILsVmXXYVvMfDe11DV+4kMpsEwj4XVB9lh5U+s4sYVFNgwDIFp4ROPIc9dmQ1FfT3AYoFtACDUWBHYrB8jy/F50boAVPxPQEAUBrg7EmOe1KeZGbwFzAnsFJ0xQgdcmznG/TNZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2017 15:13:33.0072 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fdf70a13-0a71-4466-9773-08d538ce172c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3463 Subject: [dpdk-dev] [PATCH] examples/eventdev_pipeline: add Rx adapter support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2017 15:13:37 -0000 Use event Rx adapter for packets Rx instead of explicit producer logic. Use service run iter function for granular control instead of using dedicated service lcore. Signed-off-by: Pavan Nikhilesh --- examples/eventdev_pipeline_sw_pmd/main.c | 149 +++++++++++++++++-------------- 1 file changed, 82 insertions(+), 67 deletions(-) diff --git a/examples/eventdev_pipeline_sw_pmd/main.c b/examples/eventdev_pipeline_sw_pmd/main.c index 5f431d87d..59cfea0d8 100644 --- a/examples/eventdev_pipeline_sw_pmd/main.c +++ b/examples/eventdev_pipeline_sw_pmd/main.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #define MAX_NUM_STAGES 8 @@ -78,6 +79,7 @@ struct fastpath_data { uint32_t tx_lock; uint32_t sched_lock; uint32_t evdev_service_id; + uint32_t rxadptr_service_id; bool rx_single; bool tx_single; bool sched_single; @@ -105,6 +107,7 @@ struct config_data { unsigned int worker_cq_depth; int16_t next_qid[MAX_NUM_STAGES+2]; int16_t qid[MAX_NUM_STAGES]; + uint8_t rx_adapter_id; }; static struct config_data cdata = { @@ -193,53 +196,12 @@ consumer(void) return 0; } -static int -producer(void) -{ - static uint8_t eth_port; - struct rte_mbuf *mbufs[BATCH_SIZE+2]; - struct rte_event ev[BATCH_SIZE+2]; - uint32_t i, num_ports = prod_data.num_nic_ports; - int32_t qid = prod_data.qid; - uint8_t dev_id = prod_data.dev_id; - uint8_t port_id = prod_data.port_id; - uint32_t prio_idx = 0; - - const uint16_t nb_rx = rte_eth_rx_burst(eth_port, 0, mbufs, BATCH_SIZE); - if (++eth_port == num_ports) - eth_port = 0; - if (nb_rx == 0) { - rte_pause(); - return 0; - } - - for (i = 0; i < nb_rx; i++) { - ev[i].flow_id = mbufs[i]->hash.rss; - ev[i].op = RTE_EVENT_OP_NEW; - ev[i].sched_type = cdata.queue_type; - ev[i].queue_id = qid; - ev[i].event_type = RTE_EVENT_TYPE_ETHDEV; - ev[i].sub_event_type = 0; - ev[i].priority = RTE_EVENT_DEV_PRIORITY_NORMAL; - ev[i].mbuf = mbufs[i]; - RTE_SET_USED(prio_idx); - } - - const int nb_tx = rte_event_enqueue_burst(dev_id, port_id, ev, nb_rx); - if (nb_tx != nb_rx) { - for (i = nb_tx; i < nb_rx; i++) - rte_pktmbuf_free(mbufs[i]); - } - - return 0; -} - static inline void schedule_devices(unsigned int lcore_id) { if (fdata->rx_core[lcore_id] && (fdata->rx_single || rte_atomic32_cmpset(&(fdata->rx_lock), 0, 1))) { - producer(); + rte_service_run_iter_on_app_lcore(fdata->rxadptr_service_id, 1); rte_atomic32_clear((rte_atomic32_t *)&(fdata->rx_lock)); } @@ -553,6 +515,79 @@ parse_app_args(int argc, char **argv) } } +static inline void +init_rx_adapter(uint16_t nb_ports) +{ + int i; + int ret; + uint8_t evdev_id = 0; + uint8_t port_needed = 0; + struct rte_event_dev_info dev_info; + + ret = rte_event_dev_info_get(evdev_id, &dev_info); + + struct rte_event_port_conf rx_p_conf = { + .dequeue_depth = 8, + .enqueue_depth = 8, + .new_event_threshold = 1200, + }; + + if (rx_p_conf.dequeue_depth > dev_info.max_event_port_dequeue_depth) + rx_p_conf.dequeue_depth = dev_info.max_event_port_dequeue_depth; + if (rx_p_conf.enqueue_depth > dev_info.max_event_port_enqueue_depth) + rx_p_conf.enqueue_depth = dev_info.max_event_port_enqueue_depth; + + ret = rte_event_eth_rx_adapter_create(cdata.rx_adapter_id, evdev_id, + &rx_p_conf); + if (ret) + rte_exit(EXIT_FAILURE, "failed to create rx adapter[%d]", + cdata.rx_adapter_id); + + struct rte_event_eth_rx_adapter_queue_conf queue_conf = { + .ev.sched_type = cdata.queue_type, + .ev.queue_id = cdata.qid[0], + }; + + for (i = 0; i < nb_ports; i++) { + uint32_t cap; + + ret = rte_event_eth_rx_adapter_caps_get(evdev_id, i, &cap); + if (ret) + rte_exit(EXIT_FAILURE, + "failed to get event rx adapter " + "capabilities"); + /* Producer needs port. */ + port_needed |= !(cap & + RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT); + + ret = rte_event_eth_rx_adapter_queue_add(cdata.rx_adapter_id, i, + -1, &queue_conf); + if (ret) + rte_exit(EXIT_FAILURE, + "Failed to add queues to Rx adapter"); + } + + if (port_needed) + prod_data.port_id = cons_data.port_id + 1; + prod_data.dev_id = evdev_id; + prod_data.qid = cdata.qid[0]; + + ret = rte_event_eth_rx_adapter_service_id_get(cdata.rx_adapter_id, + &fdata->rxadptr_service_id); + if (ret != -ESRCH && ret != 0) { + rte_exit(EXIT_FAILURE, + "Error getting the service ID for Rx adapter\n"); + } + rte_service_runstate_set(fdata->rxadptr_service_id, 1); + rte_service_set_runstate_mapped_check(fdata->rxadptr_service_id, 0); + + ret = rte_event_eth_rx_adapter_start(cdata.rx_adapter_id); + if (ret) + rte_exit(EXIT_FAILURE, "Rx adapter[%d] start failed", + cdata.rx_adapter_id); + +} + /* * Initializes a given port using global settings and with the RX buffers * coming from the mbuf_pool passed as a parameter. @@ -663,15 +698,14 @@ struct port_link { }; static int -setup_eventdev(struct prod_data *prod_data, - struct cons_data *cons_data, +setup_eventdev(struct cons_data *cons_data, struct worker_data *worker_data) { const uint8_t dev_id = 0; /* +1 stages is for a SINGLE_LINK TX stage */ const uint8_t nb_queues = cdata.num_stages + 1; - /* + 2 is one port for producer and one for consumer */ - const uint8_t nb_ports = cdata.num_workers + 2; + /* + 1 for consumer */ + const uint8_t nb_ports = cdata.num_workers + 1; struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, @@ -818,26 +852,6 @@ setup_eventdev(struct prod_data *prod_data, __LINE__, i); return -1; } - /* port for producer, no links */ - struct rte_event_port_conf rx_p_conf = { - .dequeue_depth = 8, - .enqueue_depth = 8, - .new_event_threshold = 1200, - }; - - if (rx_p_conf.dequeue_depth > config.nb_event_port_dequeue_depth) - rx_p_conf.dequeue_depth = config.nb_event_port_dequeue_depth; - if (rx_p_conf.enqueue_depth > config.nb_event_port_enqueue_depth) - rx_p_conf.enqueue_depth = config.nb_event_port_enqueue_depth; - - if (rte_event_port_setup(dev_id, i + 1, &rx_p_conf) < 0) { - printf("Error setting up port %d\n", i); - return -1; - } - - *prod_data = (struct prod_data){.dev_id = dev_id, - .port_id = i + 1, - .qid = cdata.qid[0] }; *cons_data = (struct cons_data){.dev_id = dev_id, .port_id = i }; @@ -940,12 +954,13 @@ main(int argc, char **argv) if (worker_data == NULL) rte_panic("rte_calloc failed\n"); - int dev_id = setup_eventdev(&prod_data, &cons_data, worker_data); + int dev_id = setup_eventdev(&cons_data, worker_data); if (dev_id < 0) rte_exit(EXIT_FAILURE, "Error setting up eventdev\n"); prod_data.num_nic_ports = num_ports; init_ports(num_ports); + init_rx_adapter(num_ports); int worker_idx = 0; RTE_LCORE_FOREACH_SLAVE(lcore_id) { -- 2.14.1