From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-eopbgr690082.outbound.protection.outlook.com [40.107.69.82]) by dpdk.org (Postfix) with ESMTP id E3341231E for ; Fri, 31 Aug 2018 12:51:42 +0200 (CEST) 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:X-MS-Exchange-SenderADCheck; bh=5TUwa4BQZAyJnrnGb8BKClVBYuhBAZKvK+EbzYvGDhU=; b=TjSIwqLcDMxPWOh/7tcztuxB9EnfOF0VmXGz1Sr8W7VmWn3RVO5IcpsrwhhPlGZZvozOZhUH1Hq02c+wPHFitFO3ydPBA2CjlT0SgpGEwIDdnGleYT5xSBmehszvWlDtm29ZfbQy/rg2SQLVEUy7givmqfvgp6Xqo3q2XS1pdDE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from localhost.localdomain (115.113.156.3) by BL0PR07MB4962.namprd07.prod.outlook.com (2603:10b6:208:49::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 10:41:14 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com, anoob.joseph@caviumnetworks.com, nikhil.rao@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Fri, 31 Aug 2018 16:10:40 +0530 Message-Id: <20180831104040.26678-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180831104040.26678-1-pbhagavatula@caviumnetworks.com> References: <20180831104040.26678-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [115.113.156.3] X-ClientProxiedBy: BM1PR01CA0118.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00::34) To BL0PR07MB4962.namprd07.prod.outlook.com (2603:10b6:208:49::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0de4422d-e85c-4969-f5bf-08d60f2e4821 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BL0PR07MB4962; X-Microsoft-Exchange-Diagnostics: 1; BL0PR07MB4962; 3:x4Dl1BcFofLf62F6OiCAeI1bezzsvXPmk4ldDsuCHOuXBGwXq51uUhDbU4jd0ybBzVpl2LxORaS/SwHWDhCzFzV71HyK2bIVVlGict8kMmIKjdQ3bVd3uUFmsDkSVe4sd4EDevdahM1qiX3P615imqRwQhow/4OaZqHJRwuc12X6vqOTywowktSG4h7H0cKtLwjm3uC3U6MHsDAx6ovb7vi+X5OScto/vLp+sfWViQC244RwexIa0m31TkscBkOP; 25:F2JXdw1IKbkuv4bKT43ErDiRoIvBPA9X6SnJ2aOP7e6Qr0wyIAhZGgPg2VY4qoMhCKhuDm1/oFslBnIfNUCbRU/1lLl3E3+TjJg8NXuBmCGddEn8MLrI+qsq0ElwxCw1fzYeiUDvW40pHVATqrhOM8DPpbj6BpYLMaB1gmWlubtCm9CCn28kz70QLb3Dgd4eo51xs9akiHK3bHTFy7koMKl3UCT3rZgratRW0pfs3j1Ff/FmAEVTG0M6Wx5WURbQijSiCjVRcGFWVK644INMrst9r2oRGwrnFWwh53qH2cQ+VbDxyYGE/1kxGl+6J/4LqR7igF0QytRw0l+p0ly8IA==; 31:5N4HMqIGrXE7fbtsBqbk9pdTEaWZ7wRwg/5pQkBgDr5Vl4yp2i1fHc2Szjt90qDEFAg43yt6HzJjuMkKQY//Yy5hq8aIjEhtUkJmp8OPdX1pCbWByQqXDew6GDgUluClXH7H3dIggy4H/q6xHH5c7Kk5PCIM5AAXQc2VmFjVlxy7YiQQXzX6NjBr2zE28iACXctZA1elXfmqWXVZ53grqXqePBqfcyAlGRWLZS6FyBE= X-MS-TrafficTypeDiagnostic: BL0PR07MB4962: X-Microsoft-Exchange-Diagnostics: 1; BL0PR07MB4962; 20:FQNiD8fVv8RFhxfN12hGo/q8YRUkFFmHPFfDjzzK19lwRExPoBe6dNB8ifk8UTX3f5Jnqwb1FvksNjZeGdByqQcznXvoixwg4KiGDnaSr9onD/7Bl/Cwkd6WE3rFKADhCcH0zNLgKyfEOFftdrCbNvXmTXQsywaEDa0mE+QnKCYcOcbMRB4j64l63zCpSs5POpjv02Ucajm3sgCgzNs1rWcBMXztIlPpayj43FlVDyZAT/54KvtAxGh3xCU0Fx+Tiow53F0RvPmh3m05zEB20dEwhLoqLCPqwszBA9WRwbGp2ChyTBQPAtbl3s1747rAP6bohsniIw1HHEQmnCGLsfKDPQkmGctsnbHPYgmUtX/jfJ1madsmiWOX5NztkogSWUqtsKvWNkvD2muerUl7/n2bw5JKiW43AGEqkRVCRDyO7nHY6Xef3fyuLh/2LT491S3BFsi79YmbltL2bYUL6NuL5Q6MUGrnnnpbwAbch2wZj24DyIUbYuBO4TBjGNcKwD5hq5Zyp79okRbKYWbP+8N6JzcqVhLUJ0F9+v4BXd9hA6UyK7J4cRL6SKZzoeQF65TdE1RJy17qmN/3x8iFJpUBu9Tacnc0/mVBDQ3y3UI=; 4:IvRHYOfRBq29oW1eCX5s22a5F3Leu6X82WJuXXOuSFZcypafas+91alNP24f/BXim/EOqE2ghdeMXJw089JfCcSox8ZtBH5Fy5FMWPU09EOw3rLSkIFFrtfCULBTP3gW43wOaxPD2yvZ9snpezwSNOkkkL/VgQcmOsI/hFChtCQl1OR9Po9xpEbwOw1dB+K3vSxGBieTIBXYQcRBpIJdDl0JZvEQHMvAIYsr/BSN9eFeP0VhP36rGrvE2BWDtQtT5s/7YFsHfJuk+uABHAtiDiLO0IA6B248MabzWtbg+gb0qMLic71/eS3lJ470j3+k X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699016); SRVR:BL0PR07MB4962; BCL:0; PCL:0; RULEID:; SRVR:BL0PR07MB4962; X-Forefront-PRVS: 07817FCC2D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(136003)(366004)(346002)(376002)(396003)(39860400002)(199004)(189003)(66066001)(72206003)(478600001)(6512007)(14444005)(53946003)(2906002)(47776003)(3846002)(1076002)(6116002)(6666003)(5660300001)(575784001)(68736007)(105586002)(50226002)(8936002)(53936002)(106356001)(50466002)(48376002)(486006)(16526019)(6506007)(36756003)(26005)(956004)(42882007)(97736004)(476003)(2616005)(11346002)(446003)(25786009)(107886003)(81166006)(4326008)(6486002)(52116002)(305945005)(7736002)(76176011)(81156014)(8676002)(51416003)(1857600001)(16586007)(316002)(386003)(69590400005)(42262002)(579004); DIR:OUT; SFP:1101; SCL:1; SRVR:BL0PR07MB4962; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL0PR07MB4962; 23:F6xmyiDr0gbh+UBcPQYOfpG5QA9cKsUbae5oxrSSw?= =?us-ascii?Q?IT+C4q4fdylSxsRNvUlm2G+3Q+t8lPhj9dRexOJygQNzQZheW5JNOSAOBMpb?= =?us-ascii?Q?Y06yU1s+NKFoTRROOBnsR3Y8vu7JcLrW7lgZuzA4a3ejP35LBxkBIZsoAzvp?= =?us-ascii?Q?EV+hCLJs0p2tJ36ItNHFYUE6OTfBKj1t/cCH8wMyhtc5M4BMdnzsPnp1vSZJ?= =?us-ascii?Q?fBiUd0cEfu/6r8gGtUiiC6S9I+Q1RXgAbv1ZGPjMJU8/o0BOxZ74H+VbzJwM?= =?us-ascii?Q?H7UgU+oHOpTaPQlbMxN3olWZCDvuG3i9wJQ5mSKoA7IJZ3BGfJQecv/+Kkyg?= =?us-ascii?Q?COX+pLDRerjPt1pKxlpbfmu9BG24jeDxBSLgFroJslzq4QH8LRlruwtyT/9W?= =?us-ascii?Q?teFiVnXmbG/pey8YlBdqdWpfPLcqfXU/c+JtEZasWjDMjarR8TYY/l7sOUG9?= =?us-ascii?Q?fJr4OdR4T4ZUq9Fl0zaUbWj9SxX8X9Ikbm78uyr4RrkMkfQUk7MSWh6BRf+z?= =?us-ascii?Q?zGRkBYdsYb7otwj5L2HVSCofIgantJTAUHIrklq8NlhlFr2qHWII1qZeVSP4?= =?us-ascii?Q?TVw0AKsD8XQajJUhBuDFzcoAjr72AB0H3VcO2zb9Kd9kQrKwTgQpEwZZZ60R?= =?us-ascii?Q?n1p1cTo1hi6GK7YLtMa3zWwHgt/+WXcsiaKcesHwAOuQV3Qug4Pvuf9+5rj8?= =?us-ascii?Q?HA3QIckDf53TwuaYR2j8fAalYFpk05H2xY43eqbPXZBa3mq38ZF5pYXuSEVQ?= =?us-ascii?Q?mQ6BRYRlsohznL1bHcmTLNPVb3EfJdyTD0LchJf+wfn7cAbOvvHcu8VZ7keL?= =?us-ascii?Q?a1MhvvwNERfzLCdA/Ys5PG6/+mWj/CGxhvfDUhP+x2/bJ9wAAvpQ7v3QqNK6?= =?us-ascii?Q?FZIzEJGL3Fh8COQrhesoA5NhaQ7I8Tu070htmgy5v93W01cOXzim1xayDL3C?= =?us-ascii?Q?ShdWzobXEEMC92JNA62rX29vegtqrZi+Fl/YJ/6IAeI7c/jRSyD+9HYZFHXA?= =?us-ascii?Q?uslofbGwINz8EmtZ8mkR5XfwG5Py0XbSIkNgpDWwrFk8UqfUMTI9U1QWSQOS?= =?us-ascii?Q?RgnJPLdNPzbugTrqkPXcMYzoHgWP4WjTLO6ZBz4h8TdDsymj7aCQdndKyVKl?= =?us-ascii?Q?aS3WnczXh59bTnoDRmMLgHq2UStgEMP+z3Ye8jILY7BHwr+hiUu4EhxtVw0o?= =?us-ascii?Q?inCcCihxCadU7g+iKKoMAblkwC9kkER0N2JzRQJq6mU0MwTp+Ff6TF9LTeyj?= =?us-ascii?Q?JACc64YDloWuEmkc8oUzyv38A4vwNfqbp/d1M+AdBG1ar60nfSBJ83b4mXnN?= =?us-ascii?Q?73P+2ofL7C6ltop1A8TOQGWIYsyrMfCa7JfvcSHhlHzXfwya5gJQ0bjKGcoS?= =?us-ascii?Q?/z6iokKdNPtXsqQG+1+8iIitCQ=3D?= X-Microsoft-Antispam-Message-Info: cQT5b220aBcxqf7ytAniayYOIUUvMkPHFXuOkv4hZAcadNx3uQ2B+12PDmC0T9PO72ylr7YigqvjhzRUSbSbcfmxTnRfGM9BvalDDqO6Dx54JFGbDH6GtBlspg8bYUM84slM2yTW/vqDC5IGooo9ECgXYWIHUnZw0xqSOwbd0Ris8W9JLSeLk795OlyboRC9PUDBu9xCn/UMtMYGzmINUDKWgVvEURqRtqpSOJG5eF+BiRPceY5BMzr+V5Nt9nlsEnPv30xJnk88EqNdKFBwZ/NwOyvpX4U5ZojrJooCVKTnIeOtLaSCJQzDCtOmMjT4JvRds44Cqv3j0ZW3p6xInJkpoHcGWztLu8D4aVlLPwI= X-Microsoft-Exchange-Diagnostics: 1; BL0PR07MB4962; 6:0cVbrCGt8IY2lDPRJO2HLx75SUgB5jQQh/Hw8q+2kIlKxvykHTkA5qEKseEmnSsRLqMnB+nR4DEEi2O0IrjVn+sEpQbnkxJvwsK73PxQNAxnmVOF36UHQf9vtI+/6QUPg0OBTIV2FNdWGWHjWQCQclLr4qbTjs7gSwkSd2c4/bTnytl/Hp/pu2eriV6RxkLllNzfvCbl0XnKzqS8Wzliz7LlJ2w+QLcQi/tBdVEl1F49HIDuLg4frli/v7B9DV1+PGgVkTgfsjvgLl77bfBvcbTdn3lThdXiQUSkszNlMrd1+FaxjtpHUGLYZm4isd9Y5KN4mxiXADgxmbLquNTvxsGA+JXYNK53KaI1m+ssuOapNE/NRVl+/Dh917NSoSkEM6jLk4PojZfuvHzHEzyhz27279y0HnQeJC73OLLVLcp+IYfB46moJFWNG5cYaEkhKjc28DqusE+eBmFSYCxiwA==; 5:sQtbqZtlxXD9hNhj32EoJz/yx2uiu1gtztz+Je3+qY+6btb41W8w3D6qPBYYFECQpixxuGohrrQBropSS7z+zT57VVDdZjaQeLux5tFk8kBl+Peivvk/oMbF55kpp8Q6wIRBcRaJhSzifN0gNiuuN4K9pl/zZ/VJenQ6k0bpVHE=; 7:C6zaR1HRVk9as42qqv14+/dRIoGDXAyno3u+vj4zFywpwFec+IF8rBnOvdhuySq7ivVaK+fpmYmHwJk+JbFsBrDpD0hnd/EomCnaeV+5nfTKuA3ybzNhymKvdR4AAtmgbmgARFr0F4yCL/KmCYvOow+imxA6ERSNVnKtKjB0NC66GXkAx9wcuDQsNtvfjvfSMZ4o4iSCinEmXJkg9QTgJl4MpX72pscUpYnEfMv5/57RDSYFCmT9wBajkxkwTPD1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 10:41:14.6252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0de4422d-e85c-4969-f5bf-08d60f2e4821 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR07MB4962 Subject: [dpdk-dev] [PATCH 2/2] app/test-eventdev: add Tx 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, 31 Aug 2018 10:51:43 -0000 Convert existing Tx service based pipeline to Tx adapter based APIs and simplify worker functions. Signed-off-by: Pavan Nikhilesh --- app/test-eventdev/test_pipeline_atq.c | 216 +++++++++++--------- app/test-eventdev/test_pipeline_common.c | 193 ++++++------------ app/test-eventdev/test_pipeline_common.h | 43 ++-- app/test-eventdev/test_pipeline_queue.c | 238 ++++++++++++----------- 4 files changed, 322 insertions(+), 368 deletions(-) diff --git a/app/test-eventdev/test_pipeline_atq.c b/app/test-eventdev/test_pipeline_atq.c index f0b2f9015..54fb9ffd1 100644 --- a/app/test-eventdev/test_pipeline_atq.c +++ b/app/test-eventdev/test_pipeline_atq.c @@ -15,7 +15,7 @@ pipeline_atq_nb_event_queues(struct evt_options *opt) return rte_eth_dev_count_avail(); } -static int +static __rte_noinline int pipeline_atq_worker_single_stage_tx(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_INIT; @@ -28,23 +28,19 @@ pipeline_atq_worker_single_stage_tx(void *arg) continue; } - if (ev.sched_type == RTE_SCHED_TYPE_ATOMIC) { - pipeline_tx_pkt(ev.mbuf); - w->processed_pkts++; - continue; - } - pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); - pipeline_event_enqueue(dev, port, &ev); + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, &ev, 1); + w->processed_pkts++; } return 0; } -static int +static __rte_noinline int pipeline_atq_worker_single_stage_fwd(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_INIT; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); @@ -54,16 +50,16 @@ pipeline_atq_worker_single_stage_fwd(void *arg) continue; } - w->processed_pkts++; - ev.queue_id = tx_queue; + ev.queue_id = tx_queue[ev.mbuf->port]; pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); pipeline_event_enqueue(dev, port, &ev); + w->processed_pkts++; } return 0; } -static int +static __rte_noinline int pipeline_atq_worker_single_stage_burst_tx(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT; @@ -79,27 +75,21 @@ pipeline_atq_worker_single_stage_burst_tx(void *arg) for (i = 0; i < nb_rx; i++) { rte_prefetch0(ev[i + 1].mbuf); - if (ev[i].sched_type == RTE_SCHED_TYPE_ATOMIC) { - - pipeline_tx_pkt(ev[i].mbuf); - ev[i].op = RTE_EVENT_OP_RELEASE; - w->processed_pkts++; - } else - pipeline_fwd_event(&ev[i], - RTE_SCHED_TYPE_ATOMIC); + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); } - pipeline_event_enqueue_burst(dev, port, ev, nb_rx); + rte_event_eth_tx_adapter_enqueue(dev, port, ev, nb_rx); + w->processed_pkts += nb_rx; } return 0; } -static int +static __rte_noinline int pipeline_atq_worker_single_stage_burst_fwd(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, @@ -112,23 +102,22 @@ pipeline_atq_worker_single_stage_burst_fwd(void *arg) for (i = 0; i < nb_rx; i++) { rte_prefetch0(ev[i + 1].mbuf); - ev[i].queue_id = tx_queue; + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); + ev[i].queue_id = tx_queue[ev[i].mbuf->port]; pipeline_fwd_event(&ev[i], RTE_SCHED_TYPE_ATOMIC); - w->processed_pkts++; } pipeline_event_enqueue_burst(dev, port, ev, nb_rx); + w->processed_pkts += nb_rx; } return 0; } -static int +static __rte_noinline int pipeline_atq_worker_multi_stage_tx(void *arg) { PIPELINE_WORKER_MULTI_STAGE_INIT; - const uint8_t nb_stages = t->opt->nb_stages; - while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); @@ -141,13 +130,12 @@ pipeline_atq_worker_multi_stage_tx(void *arg) cq_id = ev.sub_event_type % nb_stages; if (cq_id == last_queue) { - if (ev.sched_type == RTE_SCHED_TYPE_ATOMIC) { - - pipeline_tx_pkt(ev.mbuf); - w->processed_pkts++; - continue; - } - pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); + /* Map to 0th queue. */ + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, + &ev, 1); + w->processed_pkts++; + continue; } else { ev.sub_event_type++; pipeline_fwd_event(&ev, sched_type_list[cq_id]); @@ -158,12 +146,11 @@ pipeline_atq_worker_multi_stage_tx(void *arg) return 0; } -static int +static __rte_noinline int pipeline_atq_worker_multi_stage_fwd(void *arg) { PIPELINE_WORKER_MULTI_STAGE_INIT; - const uint8_t nb_stages = t->opt->nb_stages; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); @@ -176,9 +163,9 @@ pipeline_atq_worker_multi_stage_fwd(void *arg) cq_id = ev.sub_event_type % nb_stages; if (cq_id == last_queue) { - w->processed_pkts++; - ev.queue_id = tx_queue; + ev.queue_id = tx_queue[ev.mbuf->port]; pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); + w->processed_pkts++; } else { ev.sub_event_type++; pipeline_fwd_event(&ev, sched_type_list[cq_id]); @@ -189,11 +176,10 @@ pipeline_atq_worker_multi_stage_fwd(void *arg) return 0; } -static int +static __rte_noinline int pipeline_atq_worker_multi_stage_burst_tx(void *arg) { PIPELINE_WORKER_MULTI_STAGE_BURST_INIT; - const uint8_t nb_stages = t->opt->nb_stages; while (t->done == false) { uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, @@ -209,16 +195,13 @@ pipeline_atq_worker_multi_stage_burst_tx(void *arg) cq_id = ev[i].sub_event_type % nb_stages; if (cq_id == last_queue) { - if (ev[i].sched_type == RTE_SCHED_TYPE_ATOMIC) { - - pipeline_tx_pkt(ev[i].mbuf); - ev[i].op = RTE_EVENT_OP_RELEASE; - w->processed_pkts++; - continue; - } - - pipeline_fwd_event(&ev[i], - RTE_SCHED_TYPE_ATOMIC); + /* Map to 0th queue. */ + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, + &ev[i], 1); + ev[i].op = RTE_EVENT_OP_RELEASE; + w->processed_pkts++; + continue; } else { ev[i].sub_event_type++; pipeline_fwd_event(&ev[i], @@ -231,12 +214,11 @@ pipeline_atq_worker_multi_stage_burst_tx(void *arg) return 0; } -static int +static __rte_noinline int pipeline_atq_worker_multi_stage_burst_fwd(void *arg) { PIPELINE_WORKER_MULTI_STAGE_BURST_INIT; - const uint8_t nb_stages = t->opt->nb_stages; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, @@ -253,9 +235,10 @@ pipeline_atq_worker_multi_stage_burst_fwd(void *arg) if (cq_id == last_queue) { w->processed_pkts++; - ev[i].queue_id = tx_queue; + ev[i].queue_id = tx_queue[ev[i].mbuf->port]; pipeline_fwd_event(&ev[i], RTE_SCHED_TYPE_ATOMIC); + } else { ev[i].sub_event_type++; pipeline_fwd_event(&ev[i], @@ -274,27 +257,27 @@ worker_wrapper(void *arg) struct worker_data *w = arg; struct evt_options *opt = w->t->opt; const bool burst = evt_has_burst_mode(w->dev_id); - const bool mt_safe = !w->t->mt_unsafe; + const bool internal_port = w->t->internal_port; const uint8_t nb_stages = opt->nb_stages; RTE_SET_USED(opt); if (nb_stages == 1) { - if (!burst && mt_safe) + if (!burst && internal_port) return pipeline_atq_worker_single_stage_tx(arg); - else if (!burst && !mt_safe) + else if (!burst && !internal_port) return pipeline_atq_worker_single_stage_fwd(arg); - else if (burst && mt_safe) + else if (burst && internal_port) return pipeline_atq_worker_single_stage_burst_tx(arg); - else if (burst && !mt_safe) + else if (burst && !internal_port) return pipeline_atq_worker_single_stage_burst_fwd(arg); } else { - if (!burst && mt_safe) + if (!burst && internal_port) return pipeline_atq_worker_multi_stage_tx(arg); - else if (!burst && !mt_safe) + else if (!burst && !internal_port) return pipeline_atq_worker_multi_stage_fwd(arg); - if (burst && mt_safe) + if (burst && internal_port) return pipeline_atq_worker_multi_stage_burst_tx(arg); - else if (burst && !mt_safe) + else if (burst && !internal_port) return pipeline_atq_worker_multi_stage_burst_fwd(arg); } rte_panic("invalid worker\n"); @@ -303,10 +286,6 @@ worker_wrapper(void *arg) static int pipeline_atq_launch_lcores(struct evt_test *test, struct evt_options *opt) { - struct test_pipeline *t = evt_test_priv(test); - - if (t->mt_unsafe) - rte_service_component_runstate_set(t->tx_service.service_id, 1); return pipeline_launch_lcores(test, opt, worker_wrapper); } @@ -317,23 +296,25 @@ pipeline_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) int nb_ports; int nb_queues; uint8_t queue; - struct rte_event_dev_info info; - struct test_pipeline *t = evt_test_priv(test); - uint8_t tx_evqueue_id = 0; + uint8_t tx_evqueue_id[RTE_MAX_ETHPORTS] = {0}; uint8_t queue_arr[RTE_EVENT_MAX_QUEUES_PER_DEV]; uint8_t nb_worker_queues = 0; + uint8_t tx_evport_id = 0; + uint16_t prod = 0; + struct rte_event_dev_info info; + struct test_pipeline *t = evt_test_priv(test); nb_ports = evt_nr_active_lcores(opt->wlcores); nb_queues = rte_eth_dev_count_avail(); - /* One extra port and queueu for Tx service */ - if (t->mt_unsafe) { - tx_evqueue_id = nb_queues; - nb_ports++; - nb_queues++; + /* One queue for Tx service */ + if (!t->internal_port) { + RTE_ETH_FOREACH_DEV(prod) { + tx_evqueue_id[prod] = nb_queues; + nb_queues++; + } } - rte_event_dev_info_get(opt->dev_id, &info); const struct rte_event_dev_config config = { @@ -361,13 +342,15 @@ pipeline_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) for (queue = 0; queue < nb_queues; queue++) { q_conf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ALL_TYPES; - if (t->mt_unsafe) { - if (queue == tx_evqueue_id) { - q_conf.event_queue_cfg = - RTE_EVENT_QUEUE_CFG_SINGLE_LINK; - } else { - queue_arr[nb_worker_queues] = queue; - nb_worker_queues++; + if (!t->internal_port) { + RTE_ETH_FOREACH_DEV(prod) { + if (queue == tx_evqueue_id[prod]) { + q_conf.event_queue_cfg = + RTE_EVENT_QUEUE_CFG_SINGLE_LINK; + } else { + queue_arr[nb_worker_queues] = queue; + nb_worker_queues++; + } } } @@ -388,14 +371,11 @@ pipeline_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) .new_event_threshold = info.max_num_events, }; - if (t->mt_unsafe) { + if (!t->internal_port) { ret = pipeline_event_port_setup(test, opt, queue_arr, nb_worker_queues, p_conf); if (ret) return ret; - - ret = pipeline_event_tx_service_setup(test, opt, tx_evqueue_id, - nb_ports - 1, p_conf); } else ret = pipeline_event_port_setup(test, opt, NULL, nb_queues, p_conf); @@ -424,14 +404,17 @@ pipeline_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) * stride = 1 * * event queue pipelines: - * eth0 -> q0 - * } (q3->tx) Tx service - * eth1 -> q1 + * eth0 -> q0 \ + * q3->tx + * eth1 -> q1 / * * q0,q1 are configured as stated above. * q3 configured as SINGLE_LINK|ATOMIC. */ ret = pipeline_event_rx_adapter_setup(opt, 1, p_conf); + if (ret) + return ret; + ret = pipeline_event_tx_adapter_setup(opt, p_conf); if (ret) return ret; @@ -445,12 +428,59 @@ pipeline_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) } } + /* Connect the tx_evqueue_id to the Tx adapter port */ + if (!t->internal_port) { + RTE_ETH_FOREACH_DEV(prod) { + ret = rte_event_eth_tx_adapter_event_port_get(prod, + &tx_evport_id); + if (ret) { + evt_err("Unable to get Tx adapter[%d]", prod); + return ret; + } + + if (rte_event_port_link(opt->dev_id, tx_evport_id, + &tx_evqueue_id[prod], + NULL, 1) != 1) { + evt_err("Unable to link Tx adptr[%d] evprt[%d]", + prod, tx_evport_id); + return ret; + } + } + } + + RTE_ETH_FOREACH_DEV(prod) { + ret = rte_eth_dev_start(prod); + if (ret) { + evt_err("Ethernet dev [%d] failed to start." + " Using synthetic producer", prod); + return ret; + } + + } + ret = rte_event_dev_start(opt->dev_id); if (ret) { evt_err("failed to start eventdev %d", opt->dev_id); return ret; } + RTE_ETH_FOREACH_DEV(prod) { + ret = rte_event_eth_rx_adapter_start(prod); + if (ret) { + evt_err("Rx adapter[%d] start failed", prod); + return ret; + } + + ret = rte_event_eth_tx_adapter_start(prod); + if (ret) { + evt_err("Tx adapter[%d] start failed", prod); + return ret; + } + } + + memcpy(t->tx_evqueue_id, tx_evqueue_id, sizeof(uint8_t) * + RTE_MAX_ETHPORTS); + return 0; } diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c index a54068df3..7f858e23f 100644 --- a/app/test-eventdev/test_pipeline_common.c +++ b/app/test-eventdev/test_pipeline_common.c @@ -5,58 +5,6 @@ #include "test_pipeline_common.h" -static int32_t -pipeline_event_tx_burst_service_func(void *args) -{ - - int i; - struct tx_service_data *tx = args; - const uint8_t dev = tx->dev_id; - const uint8_t port = tx->port_id; - struct rte_event ev[BURST_SIZE + 1]; - - uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, BURST_SIZE, 0); - - if (!nb_rx) { - for (i = 0; i < tx->nb_ethports; i++) - rte_eth_tx_buffer_flush(i, 0, tx->tx_buf[i]); - return 0; - } - - for (i = 0; i < nb_rx; i++) { - struct rte_mbuf *m = ev[i].mbuf; - rte_eth_tx_buffer(m->port, 0, tx->tx_buf[m->port], m); - } - tx->processed_pkts += nb_rx; - - return 0; -} - -static int32_t -pipeline_event_tx_service_func(void *args) -{ - - int i; - struct tx_service_data *tx = args; - const uint8_t dev = tx->dev_id; - const uint8_t port = tx->port_id; - struct rte_event ev; - - uint16_t nb_rx = rte_event_dequeue_burst(dev, port, &ev, 1, 0); - - if (!nb_rx) { - for (i = 0; i < tx->nb_ethports; i++) - rte_eth_tx_buffer_flush(i, 0, tx->tx_buf[i]); - return 0; - } - - struct rte_mbuf *m = ev.mbuf; - rte_eth_tx_buffer(m->port, 0, tx->tx_buf[m->port], m); - tx->processed_pkts++; - - return 0; -} - int pipeline_test_result(struct evt_test *test, struct evt_options *opt) { @@ -97,11 +45,8 @@ processed_pkts(struct test_pipeline *t) uint64_t total = 0; rte_smp_rmb(); - if (t->mt_unsafe) - total = t->tx_service.processed_pkts; - else - for (i = 0; i < t->nb_workers; i++) - total += t->worker[i].processed_pkts; + for (i = 0; i < t->nb_workers; i++) + total += t->worker[i].processed_pkts; return total; } @@ -215,7 +160,6 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt) { uint16_t i; uint8_t nb_queues = 1; - uint8_t mt_state = 0; struct test_pipeline *t = evt_test_priv(test); struct rte_eth_rxconf rx_conf; struct rte_eth_conf port_conf = { @@ -238,13 +182,13 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt) return -ENODEV; } + t->internal_port = 0; RTE_ETH_FOREACH_DEV(i) { struct rte_eth_dev_info dev_info; struct rte_eth_conf local_port_conf = port_conf; + uint32_t caps = 0; rte_eth_dev_info_get(i, &dev_info); - mt_state = !(dev_info.tx_offload_capa & - DEV_TX_OFFLOAD_MT_LOCKFREE); rx_conf = dev_info.default_rxconf; rx_conf.offloads = port_conf.rxmode.offloads; @@ -279,11 +223,9 @@ pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt) return -EINVAL; } - t->mt_unsafe |= mt_state; - t->tx_service.tx_buf[i] = - rte_malloc(NULL, RTE_ETH_TX_BUFFER_SIZE(BURST_SIZE), 0); - if (t->tx_service.tx_buf[i] == NULL) - rte_panic("Unable to allocate Tx buffer memory."); + rte_event_eth_tx_adapter_caps_get(opt->dev_id, i, &caps); + if ((caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT)) + t->internal_port = 1; rte_eth_promiscuous_enable(i); } @@ -295,7 +237,6 @@ pipeline_event_port_setup(struct evt_test *test, struct evt_options *opt, uint8_t *queue_arr, uint8_t nb_queues, const struct rte_event_port_conf p_conf) { - int i; int ret; uint8_t port; struct test_pipeline *t = evt_test_priv(test); @@ -321,10 +262,9 @@ pipeline_event_port_setup(struct evt_test *test, struct evt_options *opt, 0) != nb_queues) goto link_fail; } else { - for (i = 0; i < nb_queues; i++) { - if (rte_event_port_link(opt->dev_id, port, - &queue_arr[i], NULL, 1) != 1) - goto link_fail; + if (rte_event_port_link(opt->dev_id, port, queue_arr, + NULL, nb_queues) != nb_queues) { + goto link_fail; } } } @@ -385,80 +325,64 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride, } } - ret = rte_eth_dev_start(prod); - if (ret) { - evt_err("Ethernet dev [%d] failed to start." - " Using synthetic producer", prod); - return ret; - } - - ret = rte_event_eth_rx_adapter_start(prod); - if (ret) { - evt_err("Rx adapter[%d] start failed", prod); - return ret; - } - printf("%s: Port[%d] using Rx adapter[%d] started\n", __func__, - prod, prod); + printf("%s: Port[%d] using Rx adapter[%d] configured\n", + __func__, prod, prod); } return ret; } int -pipeline_event_tx_service_setup(struct evt_test *test, struct evt_options *opt, - uint8_t tx_queue_id, uint8_t tx_port_id, - const struct rte_event_port_conf p_conf) +pipeline_event_tx_adapter_setup(struct evt_options *opt, + struct rte_event_port_conf port_conf) { - int ret; - struct rte_service_spec serv; - struct test_pipeline *t = evt_test_priv(test); - struct tx_service_data *tx = &t->tx_service; + int ret = 0; + uint16_t consm = 0; - ret = rte_event_port_setup(opt->dev_id, tx_port_id, &p_conf); - if (ret) { - evt_err("failed to setup port %d", tx_port_id); - return ret; - } + RTE_ETH_FOREACH_DEV(consm) { + uint32_t cap; - if (rte_event_port_link(opt->dev_id, tx_port_id, &tx_queue_id, - NULL, 1) != 1) { - evt_err("failed to link queues to port %d", tx_port_id); - return -EINVAL; - } + ret = rte_event_eth_tx_adapter_caps_get(opt->dev_id, + consm, &cap); + if (ret) { + evt_err("failed to get event tx adapter[%d] caps", + consm); + return ret; + } - tx->dev_id = opt->dev_id; - tx->queue_id = tx_queue_id; - tx->port_id = tx_port_id; - tx->nb_ethports = rte_eth_dev_count_avail(); - tx->t = t; - - /* Register Tx service */ - memset(&serv, 0, sizeof(struct rte_service_spec)); - snprintf(serv.name, sizeof(serv.name), "Tx_service"); - - if (evt_has_burst_mode(opt->dev_id)) - serv.callback = pipeline_event_tx_burst_service_func; - else - serv.callback = pipeline_event_tx_service_func; - - serv.callback_userdata = (void *)tx; - ret = rte_service_component_register(&serv, &tx->service_id); - if (ret) { - evt_err("failed to register Tx service"); - return ret; - } + ret = rte_event_eth_tx_adapter_create(consm, opt->dev_id, + &port_conf); + if (ret) { + evt_err("failed to create tx adapter[%d]", consm); + return ret; + } - ret = evt_service_setup(tx->service_id); - if (ret) { - evt_err("Failed to setup service core for Tx service\n"); - return ret; - } + ret = rte_event_eth_tx_adapter_queue_add(consm, consm, -1); + if (ret) { + evt_err("failed to add tx queues to adapter[%d]", + consm); + return ret; + } - rte_service_runstate_set(tx->service_id, 1); + if (!(cap & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT)) { + uint32_t service_id; - return 0; -} + rte_event_eth_tx_adapter_service_id_get(consm, + &service_id); + ret = evt_service_setup(service_id); + if (ret) { + evt_err("Failed to setup service core" + " for Tx adapter\n"); + return ret; + } + } + + printf("%s: Port[%d] using Tx adapter[%d] Configured\n", + __func__, consm, consm); + } + return ret; +} void pipeline_ethdev_destroy(struct evt_test *test, struct evt_options *opt) @@ -466,16 +390,10 @@ pipeline_ethdev_destroy(struct evt_test *test, struct evt_options *opt) uint16_t i; RTE_SET_USED(test); RTE_SET_USED(opt); - struct test_pipeline *t = evt_test_priv(test); - - if (t->mt_unsafe) { - rte_service_component_runstate_set(t->tx_service.service_id, 0); - rte_service_runstate_set(t->tx_service.service_id, 0); - rte_service_component_unregister(t->tx_service.service_id); - } RTE_ETH_FOREACH_DEV(i) { rte_event_eth_rx_adapter_stop(i); + rte_event_eth_tx_adapter_stop(i); rte_eth_dev_stop(i); } } @@ -485,7 +403,6 @@ pipeline_eventdev_destroy(struct evt_test *test, struct evt_options *opt) { RTE_SET_USED(test); - rte_event_dev_stop(opt->dev_id); rte_event_dev_close(opt->dev_id); } diff --git a/app/test-eventdev/test_pipeline_common.h b/app/test-eventdev/test_pipeline_common.h index 9cd6b905b..b8939db81 100644 --- a/app/test-eventdev/test_pipeline_common.h +++ b/app/test-eventdev/test_pipeline_common.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,9 @@ #include "evt_options.h" #include "evt_test.h" +#define PIPELINE_TX_ADPTR_ENQ 0x1 +#define PIPELINE_TX_ADPTR_FWD 0x2 + struct test_pipeline; struct worker_data { @@ -35,30 +39,19 @@ struct worker_data { struct test_pipeline *t; } __rte_cache_aligned; -struct tx_service_data { - uint8_t dev_id; - uint8_t queue_id; - uint8_t port_id; - uint32_t service_id; - uint64_t processed_pkts; - uint16_t nb_ethports; - struct rte_eth_dev_tx_buffer *tx_buf[RTE_MAX_ETHPORTS]; - struct test_pipeline *t; -} __rte_cache_aligned; - struct test_pipeline { /* Don't change the offset of "done". Signal handler use this memory * to terminate all lcores work. */ int done; uint8_t nb_workers; - uint8_t mt_unsafe; + uint8_t internal_port; + uint8_t tx_evqueue_id[RTE_MAX_ETHPORTS]; enum evt_test_result result; uint32_t nb_flows; uint64_t outstand_pkts; struct rte_mempool *pool; struct worker_data worker[EVT_MAX_PORTS]; - struct tx_service_data tx_service; struct evt_options *opt; uint8_t sched_type_list[EVT_MAX_STAGES] __rte_cache_aligned; } __rte_cache_aligned; @@ -70,7 +63,7 @@ struct test_pipeline { struct test_pipeline *t = w->t; \ const uint8_t dev = w->dev_id; \ const uint8_t port = w->port_id; \ - struct rte_event ev + struct rte_event ev __rte_cache_aligned #define PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT \ int i; \ @@ -78,7 +71,7 @@ struct test_pipeline { struct test_pipeline *t = w->t; \ const uint8_t dev = w->dev_id; \ const uint8_t port = w->port_id; \ - struct rte_event ev[BURST_SIZE + 1] + struct rte_event ev[BURST_SIZE + 1] __rte_cache_aligned #define PIPELINE_WORKER_MULTI_STAGE_INIT \ struct worker_data *w = arg; \ @@ -88,10 +81,11 @@ struct test_pipeline { const uint8_t port = w->port_id; \ const uint8_t last_queue = t->opt->nb_stages - 1; \ uint8_t *const sched_type_list = &t->sched_type_list[0]; \ - struct rte_event ev + const uint8_t nb_stages = t->opt->nb_stages + 1; \ + struct rte_event ev __rte_cache_aligned #define PIPELINE_WORKER_MULTI_STAGE_BURST_INIT \ - int i; \ + int i; \ struct worker_data *w = arg; \ struct test_pipeline *t = w->t; \ uint8_t cq_id; \ @@ -99,7 +93,8 @@ struct test_pipeline { const uint8_t port = w->port_id; \ const uint8_t last_queue = t->opt->nb_stages - 1; \ uint8_t *const sched_type_list = &t->sched_type_list[0]; \ - struct rte_event ev[BURST_SIZE + 1] + const uint8_t nb_stages = t->opt->nb_stages + 1; \ + struct rte_event ev[BURST_SIZE + 1] __rte_cache_aligned static __rte_always_inline void pipeline_fwd_event(struct rte_event *ev, uint8_t sched) @@ -130,13 +125,6 @@ pipeline_event_enqueue_burst(const uint8_t dev, const uint8_t port, } } -static __rte_always_inline void -pipeline_tx_pkt(struct rte_mbuf *mbuf) -{ - while (rte_eth_tx_burst(mbuf->port, 0, &mbuf, 1) != 1) - rte_pause(); -} - static inline int pipeline_nb_event_ports(struct evt_options *opt) { @@ -149,9 +137,8 @@ int pipeline_test_setup(struct evt_test *test, struct evt_options *opt); int pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt); int pipeline_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride, struct rte_event_port_conf prod_conf); -int pipeline_event_tx_service_setup(struct evt_test *test, - struct evt_options *opt, uint8_t tx_queue_id, - uint8_t tx_port_id, const struct rte_event_port_conf p_conf); +int pipeline_event_tx_adapter_setup(struct evt_options *opt, + struct rte_event_port_conf prod_conf); int pipeline_mempool_setup(struct evt_test *test, struct evt_options *opt); int pipeline_event_port_setup(struct evt_test *test, struct evt_options *opt, uint8_t *queue_arr, uint8_t nb_queues, diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-eventdev/test_pipeline_queue.c index 2e0d93d99..e1153573b 100644 --- a/app/test-eventdev/test_pipeline_queue.c +++ b/app/test-eventdev/test_pipeline_queue.c @@ -15,7 +15,7 @@ pipeline_queue_nb_event_queues(struct evt_options *opt) return (eth_count * opt->nb_stages) + eth_count; } -static int +static __rte_noinline int pipeline_queue_worker_single_stage_tx(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_INIT; @@ -29,9 +29,12 @@ pipeline_queue_worker_single_stage_tx(void *arg) } if (ev.sched_type == RTE_SCHED_TYPE_ATOMIC) { - pipeline_tx_pkt(ev.mbuf); + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, + &ev, 1); w->processed_pkts++; } else { + ev.queue_id++; pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); pipeline_event_enqueue(dev, port, &ev); @@ -41,11 +44,11 @@ pipeline_queue_worker_single_stage_tx(void *arg) return 0; } -static int +static __rte_noinline int pipeline_queue_worker_single_stage_fwd(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_INIT; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); @@ -55,7 +58,8 @@ pipeline_queue_worker_single_stage_fwd(void *arg) continue; } - ev.queue_id = tx_queue; + ev.queue_id = tx_queue[ev.mbuf->port]; + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); pipeline_event_enqueue(dev, port, &ev); w->processed_pkts++; @@ -64,7 +68,7 @@ pipeline_queue_worker_single_stage_fwd(void *arg) return 0; } -static int +static __rte_noinline int pipeline_queue_worker_single_stage_burst_tx(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT; @@ -81,8 +85,9 @@ pipeline_queue_worker_single_stage_burst_tx(void *arg) for (i = 0; i < nb_rx; i++) { rte_prefetch0(ev[i + 1].mbuf); if (ev[i].sched_type == RTE_SCHED_TYPE_ATOMIC) { - - pipeline_tx_pkt(ev[i].mbuf); + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, + &ev[i], 1); ev[i].op = RTE_EVENT_OP_RELEASE; w->processed_pkts++; } else { @@ -98,11 +103,11 @@ pipeline_queue_worker_single_stage_burst_tx(void *arg) return 0; } -static int +static __rte_noinline int pipeline_queue_worker_single_stage_burst_fwd(void *arg) { PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, @@ -115,23 +120,24 @@ pipeline_queue_worker_single_stage_burst_fwd(void *arg) for (i = 0; i < nb_rx; i++) { rte_prefetch0(ev[i + 1].mbuf); - ev[i].queue_id = tx_queue; + ev[i].queue_id = tx_queue[ev[i].mbuf->port]; + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); pipeline_fwd_event(&ev[i], RTE_SCHED_TYPE_ATOMIC); - w->processed_pkts++; } pipeline_event_enqueue_burst(dev, port, ev, nb_rx); + w->processed_pkts += nb_rx; } return 0; } -static int +static __rte_noinline int pipeline_queue_worker_multi_stage_tx(void *arg) { PIPELINE_WORKER_MULTI_STAGE_INIT; - const uint8_t nb_stages = t->opt->nb_stages + 1; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); @@ -143,18 +149,16 @@ pipeline_queue_worker_multi_stage_tx(void *arg) cq_id = ev.queue_id % nb_stages; - if (cq_id >= last_queue) { - if (ev.sched_type == RTE_SCHED_TYPE_ATOMIC) { - - pipeline_tx_pkt(ev.mbuf); - w->processed_pkts++; - continue; - } - ev.queue_id += (cq_id == last_queue) ? 1 : 0; - pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); + if (ev.queue_id == tx_queue[ev.mbuf->port]) { + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, &ev, 1); + w->processed_pkts++; + continue; } else { ev.queue_id++; - pipeline_fwd_event(&ev, sched_type_list[cq_id]); + pipeline_fwd_event(&ev, cq_id != last_queue ? + sched_type_list[cq_id] : + RTE_SCHED_TYPE_ATOMIC); } pipeline_event_enqueue(dev, port, &ev); @@ -162,12 +166,11 @@ pipeline_queue_worker_multi_stage_tx(void *arg) return 0; } -static int +static __rte_noinline int pipeline_queue_worker_multi_stage_fwd(void *arg) { PIPELINE_WORKER_MULTI_STAGE_INIT; - const uint8_t nb_stages = t->opt->nb_stages + 1; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); @@ -180,7 +183,8 @@ pipeline_queue_worker_multi_stage_fwd(void *arg) cq_id = ev.queue_id % nb_stages; if (cq_id == last_queue) { - ev.queue_id = tx_queue; + ev.queue_id = tx_queue[ev.mbuf->port]; + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); w->processed_pkts++; } else { @@ -193,11 +197,11 @@ pipeline_queue_worker_multi_stage_fwd(void *arg) return 0; } -static int +static __rte_noinline int pipeline_queue_worker_multi_stage_burst_tx(void *arg) { PIPELINE_WORKER_MULTI_STAGE_BURST_INIT; - const uint8_t nb_stages = t->opt->nb_stages + 1; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, @@ -212,22 +216,19 @@ pipeline_queue_worker_multi_stage_burst_tx(void *arg) rte_prefetch0(ev[i + 1].mbuf); cq_id = ev[i].queue_id % nb_stages; - if (cq_id >= last_queue) { - if (ev[i].sched_type == RTE_SCHED_TYPE_ATOMIC) { - - pipeline_tx_pkt(ev[i].mbuf); - ev[i].op = RTE_EVENT_OP_RELEASE; - w->processed_pkts++; - continue; - } + if (ev[i].queue_id == tx_queue[ev[i].mbuf->port]) { + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); + rte_event_eth_tx_adapter_enqueue(dev, port, + &ev[i], 1); + ev[i].op = RTE_EVENT_OP_RELEASE; + w->processed_pkts++; + continue; - ev[i].queue_id += (cq_id == last_queue) ? 1 : 0; - pipeline_fwd_event(&ev[i], - RTE_SCHED_TYPE_ATOMIC); } else { ev[i].queue_id++; - pipeline_fwd_event(&ev[i], - sched_type_list[cq_id]); + pipeline_fwd_event(&ev[i], cq_id != last_queue ? + sched_type_list[cq_id] : + RTE_SCHED_TYPE_ATOMIC); } } @@ -237,12 +238,11 @@ pipeline_queue_worker_multi_stage_burst_tx(void *arg) return 0; } -static int +static __rte_noinline int pipeline_queue_worker_multi_stage_burst_fwd(void *arg) { PIPELINE_WORKER_MULTI_STAGE_BURST_INIT; - const uint8_t nb_stages = t->opt->nb_stages + 1; - const uint8_t tx_queue = t->tx_service.queue_id; + const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, @@ -258,7 +258,8 @@ pipeline_queue_worker_multi_stage_burst_fwd(void *arg) cq_id = ev[i].queue_id % nb_stages; if (cq_id == last_queue) { - ev[i].queue_id = tx_queue; + ev[i].queue_id = tx_queue[ev[i].mbuf->port]; + rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); pipeline_fwd_event(&ev[i], RTE_SCHED_TYPE_ATOMIC); w->processed_pkts++; @@ -280,28 +281,28 @@ worker_wrapper(void *arg) struct worker_data *w = arg; struct evt_options *opt = w->t->opt; const bool burst = evt_has_burst_mode(w->dev_id); - const bool mt_safe = !w->t->mt_unsafe; + const bool internal_port = w->t->internal_port; const uint8_t nb_stages = opt->nb_stages; RTE_SET_USED(opt); if (nb_stages == 1) { - if (!burst && mt_safe) + if (!burst && internal_port) return pipeline_queue_worker_single_stage_tx(arg); - else if (!burst && !mt_safe) + else if (!burst && !internal_port) return pipeline_queue_worker_single_stage_fwd(arg); - else if (burst && mt_safe) + else if (burst && internal_port) return pipeline_queue_worker_single_stage_burst_tx(arg); - else if (burst && !mt_safe) + else if (burst && !internal_port) return pipeline_queue_worker_single_stage_burst_fwd( arg); } else { - if (!burst && mt_safe) + if (!burst && internal_port) return pipeline_queue_worker_multi_stage_tx(arg); - else if (!burst && !mt_safe) + else if (!burst && !internal_port) return pipeline_queue_worker_multi_stage_fwd(arg); - else if (burst && mt_safe) + else if (burst && internal_port) return pipeline_queue_worker_multi_stage_burst_tx(arg); - else if (burst && !mt_safe) + else if (burst && !internal_port) return pipeline_queue_worker_multi_stage_burst_fwd(arg); } @@ -311,10 +312,6 @@ worker_wrapper(void *arg) static int pipeline_queue_launch_lcores(struct evt_test *test, struct evt_options *opt) { - struct test_pipeline *t = evt_test_priv(test); - - if (t->mt_unsafe) - rte_service_component_runstate_set(t->tx_service.service_id, 1); return pipeline_launch_lcores(test, opt, worker_wrapper); } @@ -326,25 +323,21 @@ pipeline_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) int nb_queues; int nb_stages = opt->nb_stages; uint8_t queue; - struct rte_event_dev_info info; - struct test_pipeline *t = evt_test_priv(test); - uint8_t tx_evqueue_id = 0; + uint8_t tx_evport_id = 0; + uint8_t tx_evqueue_id[RTE_MAX_ETHPORTS] = {0}; uint8_t queue_arr[RTE_EVENT_MAX_QUEUES_PER_DEV]; uint8_t nb_worker_queues = 0; + uint16_t prod = 0; + struct rte_event_dev_info info; + struct test_pipeline *t = evt_test_priv(test); nb_ports = evt_nr_active_lcores(opt->wlcores); nb_queues = rte_eth_dev_count_avail() * (nb_stages); - /* Extra port for Tx service. */ - if (t->mt_unsafe) { - tx_evqueue_id = nb_queues; - nb_ports++; - nb_queues++; - } else - nb_queues += rte_eth_dev_count_avail(); + /* Extra queue for Tx service. */ + nb_queues += rte_eth_dev_count_avail(); rte_event_dev_info_get(opt->dev_id, &info); - const struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, @@ -370,24 +363,19 @@ pipeline_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) for (queue = 0; queue < nb_queues; queue++) { uint8_t slot; - if (!t->mt_unsafe) { - slot = queue % (nb_stages + 1); - q_conf.schedule_type = slot == nb_stages ? - RTE_SCHED_TYPE_ATOMIC : - opt->sched_type_list[slot]; - } else { - slot = queue % nb_stages; - - if (queue == tx_evqueue_id) { - q_conf.schedule_type = RTE_SCHED_TYPE_ATOMIC; + q_conf.event_queue_cfg = 0; + slot = queue % (nb_stages + 1); + if (slot == nb_stages) { + q_conf.schedule_type = RTE_SCHED_TYPE_ATOMIC; + if (!t->internal_port) { q_conf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_SINGLE_LINK; - } else { - q_conf.schedule_type = - opt->sched_type_list[slot]; - queue_arr[nb_worker_queues] = queue; - nb_worker_queues++; } + tx_evqueue_id[prod++] = queue; + } else { + q_conf.schedule_type = opt->sched_type_list[slot]; + queue_arr[nb_worker_queues] = queue; + nb_worker_queues++; } ret = rte_event_queue_setup(opt->dev_id, queue, &q_conf); @@ -407,19 +395,11 @@ pipeline_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) .new_event_threshold = info.max_num_events, }; - /* - * If tx is multi thread safe then allow workers to do Tx else use Tx - * service to Tx packets. - */ - if (t->mt_unsafe) { + if (!t->internal_port) { ret = pipeline_event_port_setup(test, opt, queue_arr, nb_worker_queues, p_conf); if (ret) return ret; - - ret = pipeline_event_tx_service_setup(test, opt, tx_evqueue_id, - nb_ports - 1, p_conf); - } else ret = pipeline_event_port_setup(test, opt, NULL, nb_queues, p_conf); @@ -431,7 +411,6 @@ pipeline_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) * * eth_dev_count = 2, nb_stages = 2. * - * Multi thread safe : * queues = 6 * stride = 3 * @@ -439,21 +418,14 @@ pipeline_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) * eth0 -> q0 -> q1 -> (q2->tx) * eth1 -> q3 -> q4 -> (q5->tx) * - * q2, q5 configured as ATOMIC - * - * Multi thread unsafe : - * queues = 5 - * stride = 2 + * q2, q5 configured as ATOMIC | SINGLE_LINK * - * event queue pipelines: - * eth0 -> q0 -> q1 - * } (q4->tx) Tx service - * eth1 -> q2 -> q3 - * - * q4 configured as SINGLE_LINK|ATOMIC */ - ret = pipeline_event_rx_adapter_setup(opt, - t->mt_unsafe ? nb_stages : nb_stages + 1, p_conf); + ret = pipeline_event_rx_adapter_setup(opt, nb_stages + 1, p_conf); + if (ret) + return ret; + + ret = pipeline_event_tx_adapter_setup(opt, p_conf); if (ret) return ret; @@ -467,12 +439,60 @@ pipeline_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) } } + /* Connect the tx_evqueue_id to the Tx adapter port */ + if (!t->internal_port) { + RTE_ETH_FOREACH_DEV(prod) { + ret = rte_event_eth_tx_adapter_event_port_get(prod, + &tx_evport_id); + if (ret) { + evt_err("Unable to get Tx adptr[%d] evprt[%d]", + prod, tx_evport_id); + return ret; + } + + if (rte_event_port_link(opt->dev_id, tx_evport_id, + &tx_evqueue_id[prod], + NULL, 1) != 1) { + evt_err("Unable to link Tx adptr[%d] evprt[%d]", + prod, tx_evport_id); + return ret; + } + } + } + + RTE_ETH_FOREACH_DEV(prod) { + ret = rte_eth_dev_start(prod); + if (ret) { + evt_err("Ethernet dev [%d] failed to start." + " Using synthetic producer", prod); + return ret; + } + + } + ret = rte_event_dev_start(opt->dev_id); if (ret) { evt_err("failed to start eventdev %d", opt->dev_id); return ret; } + RTE_ETH_FOREACH_DEV(prod) { + ret = rte_event_eth_rx_adapter_start(prod); + if (ret) { + evt_err("Rx adapter[%d] start failed", prod); + return ret; + } + + ret = rte_event_eth_tx_adapter_start(prod); + if (ret) { + evt_err("Tx adapter[%d] start failed", prod); + return ret; + } + } + + memcpy(t->tx_evqueue_id, tx_evqueue_id, sizeof(uint8_t) * + RTE_MAX_ETHPORTS); + return 0; } -- 2.18.0