From patchwork Mon Dec 11 11:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 32067 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 70C0A7D30; Mon, 11 Dec 2017 12:13:11 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0087.outbound.protection.outlook.com [104.47.38.87]) by dpdk.org (Postfix) with ESMTP id C8C1014E8 for ; Mon, 11 Dec 2017 12:13:09 +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=LSZQ5eljRYFCV9qNOZ37LllgEHvhrAwvqxoWUSH3zd4=; b=IAw3hkVqwb83Gfq392q3VrOp50jM5Z275XN0jEkSPBUKjyX9V9n0sxSwY/nxZIfjjHvJMSCSMNemg3Dx3z9t1tZCop5JKtzuSx0pFhaF3BoTtw7uRNgUAgLkYDOn3KUlk9H80r1+6WJjvKl/Oj9T4UTJTWic59pg4u9zO2bVlYk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from Pavan-LT.caveonetworks.com (111.93.218.67) by BN6PR07MB3458.namprd07.prod.outlook.com (10.161.153.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Mon, 11 Dec 2017 11:13:04 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, harry.van.haaren@intel.com, gage.eads@intel.com, hemant.agrawal@nxp.com, nipun.gupta@nxp.com, nikhil.rao@intel.com, santosh.shukla@caviumnetworks.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Mon, 11 Dec 2017 16:42:30 +0530 Message-Id: <20171211111236.1331-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171211111236.1331-1-pbhagavatula@caviumnetworks.com> References: <1508330348-30060-1-git-send-email-pbhagavatula@caviumnetworks.com> <20171211111236.1331-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: BN6PR1301CA0010.namprd13.prod.outlook.com (10.174.84.151) To BN6PR07MB3458.namprd07.prod.outlook.com (10.161.153.21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ecd3a92-49aa-4378-1103-08d54088284f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603307); SRVR:BN6PR07MB3458; X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 3:V4vLi59ZBnpSOdDEHkdM2/o7i/qOAReIBm/yWdmQhyKz2XopUHO0LgKbZcseowudU0J5w1SzIK2oWHq5INRWs5EYaMyf8BEeKbWlaEDhHjienRzd6aPxKdArRk3gLsIYG0GT8GG7AL8xq9wdEhDXYPrs0QsplLo7joZqVvaqSFR7Wwz8zcnwMnMSWIuO73dvfqRuMd8VDhE13GWKetSxThPgDbYGu7Pxr+qTzTihM4GuqQG/P8Ad38dulS2Xv+yK; 25:o7PxzX0/Giu0qwleG+GxvqYwkoH+zb5OQ0fcH/j0LtaIC8Wr4gcobunFzE5syZWKU1lpVYREe7q6VpJ142TkH3WnYJ81pWTz6pJGENtpOKa1Sofqp7g7NMtb9BgtUVhum5rEBxIr+7JXhUvFgVy4wwvVNbaWAgfnGTlbjEldwd2u7zMOegBtm8Uls9xV1Ya2eAK+uHOxkODjPH3wcVlrcTmu3jM1O+21S3XG8v7oZM82r9ksRXv7LXI5A20RfQiWxboNb+tziTyIeBVBQPHVxUjFeBtZZ+y8s7vuL1qfERyamH4TIJmAR8fmgXfkSL8jP07+6chC9O1Ug9JByl0Rxl9rwUnQTxZiLqklNnbccrw=; 31:rhZtIl868sQr7XIA/eBkQc8vfbJL12KYJvxLt9g7zHQPVVdCagynWIqhmOqgzKMKEGTrDJESGN5WcxLHnfeur82e/Sg12Gs7V3rSCUpVb4AkL6vbje1vQuAUQa9EQr2kX2BPY4V8UPw9uLMx3qCqX9kuMAca7ZKtNCGwclTCr7LbDFvXlZM7p9myc+Cf79VhvM8nnVTyV9FbmtWIBeV+sHlpLtdjbXWYNm3QEWUOEN8= X-MS-TrafficTypeDiagnostic: BN6PR07MB3458: X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 20:/4WawL6R6E4rU3+6xDXzVk0s+5v6tYnIzOmkGzkS4hnXmuvZboRBqWZx7p6tLCoMvIjZ7niUAv61XWZ7r+ZDkoeEXUnZkpbyTqUwpPb5lHC4X0eKGBWt3YDlltXEMvdVEqHqskWsoNMjFpTvsqzKDf6EbwRwUAdeENVS1IR3fgzk0GsMnYJk8j2WF+JMqY4Ek+8x3/8CgX0Sx0SYrhpZ8qjPPVqlT3C2H8Snah8Exqo9MYCqHrS/e9BhTosrYER4I8exy1FrYFu3ZAdo2qtHCOmmHxOkZ9xh+p9ZUVqeCRTHoUHT6aX+nwnFDup5jRN4X0oPPzF3APtJ7QsdrSZKJZqPK0rQWCG5m+yaAW3SUNga3fw89/K+wRQ02+zhvdgkViPfHfqi3GWi+JM2IY2gMLhFD9WP9I2B46E9EIgYQIzT+K31pFSYJVADM8wn9D4TiJuVkYD7Ge9mkLxfSCGuIaPy0O3boNSeENgnripMGXYLjNmp0xyFttwnKo+cBH4tkfqThXim60ZdVr6SMfX4MCePz/9pxMRu7cpW3P//5z77lPTRCfufEzzO/8eyUQNiqjSI7bUWugjjoJtQMmWjSSEYS5qfZgqNUIY9swXsNJU=; 4:fYzxzcVS0OJT28tO6ZlPtjDBa3lans/gydOkTXZEuLUkMsPpaKP96V6Ms2U2ZP3IG6LlnM0RZuvnHG6aPG14sHhpcV6sBJ7HL7YHmHx/ApYFNwggtAIaZTSPkppIVK3sUce04Z/SB8qy+cht5bzSpEJpnrrYUCxJo3emPyEUwR5kXUv4UMfqVaT91ZSeH3VxFeA1V0JlCxviqtfi78c2R2H3xWNyRjuGlb5mzF2EzXeN+APGyCjmzQ6oTFZSPUeA2NE56FtZcr61Hl4+eQWbLg== 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)(93006095)(3231022)(10201501046)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6072148)(201708071742011); SRVR:BN6PR07MB3458; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN6PR07MB3458; X-Forefront-PRVS: 0518EEFB48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(376002)(189003)(199004)(76176011)(51416003)(105586002)(48376002)(59450400001)(5660300001)(52116002)(6506006)(3846002)(2906002)(50466002)(106356001)(97736004)(66066001)(316002)(25786009)(305945005)(2950100002)(8656006)(478600001)(4326008)(16586007)(16526018)(42882006)(81166006)(6636002)(8676002)(81156014)(72206003)(8936002)(33646002)(107886003)(36756003)(68736007)(69596002)(6486002)(6666003)(50226002)(575784001)(53936002)(47776003)(6116002)(53416004)(5009440100003)(1076002)(6512007)(7736002)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR07MB3458; H:Pavan-LT.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR07MB3458; 23:z8sRbDE13wrQEKdazSKtqFvoxssWM6easOH6V0nzA?= 3NJpeegrfwCAQEfZBvMFoNGpaoXGjhyME0JogXvx67chD2O/MEYGKPgS6k7TMHpGKbhzBQtyiLTfcc6r8CqzQ/fidxqKFNA4g9HGoA+MdwnfHUcc28/plRnr/urCXZq9CGKObSqx3WunO/BVUlp4DXWu2an7SgyYWXmi1JDEwYNsrQOfAQbcJB03UI8lkbjCxJxm3GkzNEDwN8sj3kxlb9H4PRhh7qTKWb19BUdZ9EMnDUchkcHsOl6SFBB7IEf3pZmIs990g9gxd3q7OVLF5sZrL+XeK1FiF02HU3MtraRku+r3IRIV0uLTZYEoA0p+7OEnoJiVHPGioavFzYQjRrFgxBJy62ahrmeENJ6OORKjcU14nGLXbkIe74lhEh2zBhPcf1qQgfT5KFg77XGP196pbOCWxl7U/WM5UaiiOdj0fz+/gKeYwmBGTPiBfEPalNYIhUNr2KF1DgfxEb9blu3vHOKyYmN08ZqDWM6NTi9WFRXaNLbtsT8zMDIz6CUyGSAqz/GUbyh4q8crRrwD46VG5YVaJ32a0MWh2CaUOV8wY5EdNZcCoQ9OblL/e4SPBYEZc8l2p32rn7nA2tx7rWLR7eRs/srqgVph3Jp0GM1X3rPOexN4OkE17OHPnzah5z3U5UKQva60TS8suzYXLRVEJtTTVkjnLSmbAfz4RFBtQf/r8gUMQsKZlnB14HxVvuSgKd579zjRuTxzVWzzKEL0UZo0+oLGdG38HO25Pd4UuWMaxJPXLYkm0sBzCRJYlgC2c3Dp9VsDYxV7pUqr54X1TGeODc+k2smgDBJmC0uzcuVFyy1GUZ2mMBmrrFqMGPzkrJfkmFNf8pSpCcnJdnP0ziAnoU/OYCTdChO2OjqU7bx26vetA7WGPqc4OH68rqEiWu4d9LXw624m7akZMfIzIW8ZdpgkxAFSaIgypHfHUODPlisLpQYU+7wvqB0b+Rva2naYlOZlSYHGN/9u+TaXUBenFcUODFbEyiYHfP7Wl1YNQgN1NwRAzfkFvnoE0CcA6uU0FH+n7pW+c1LJJpGIwLNR5RSqmdbqulOfobWwU6XH4AnbBSYKZuVcuPHUGAFtCaoMEpQR2cEAp5/5n/NDkFBuEvyi65jLqpZw4quWfvwoTBgHXw2WpP2SiRBNpKrRe3slcKnaHKyX1j8Mb5DOX4B2QqikWx7ukUcRiPROA== X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 6:EPFb+Pm/bqgBkqIgfVbxnN5yChQ77eDwPha1N0fgfne17o/SEExW2idLAhuJINvUyGIVrUzlwEuNy6qeH1VdSoDK+OdkS9rgEwUiNhDZbCH0IQzazLANrZ9mk/l7G2jxkuK2zeb0D0R8az0VnkO9PiaJu8OLgI5mQH9VRtZRoAodG/cQBsc+shQFsiTc7kRPSDWev9ickDPA7dnvRJM0ySAoDPzeOwTx6lDG7AZ66Pe1VQwxTtod+YTpK76HR1l5Kf+oqu061iiaBmYdqZiZlbVS7HcjzMC8L32YPP4defSVbFaaCHrKOhJ11n1v/bugOHiLvbOvi5aO05mwq7Ykyyw3PcGBHc7DaFbV1xIFLlI=; 5:ukQE+WB6pCaq+LXCzSBYd2n4dm0694Mdb8z9s2TR3nb+dgegn0m/A+J8jXOHwxVKEnWamhCXeHhfU4Xdh/0tMAmJg+X24HWAuvYHaZDAdUe9aXpJ3Ac5gn1qBdlRPtaX3BTia4rcs9j5MvOdIWxNqLCBGmyW2PCfah5EbIoeIOA=; 24:K9jjaKr6fO9z4O+ukulfB1xQkFYqC9fW3qmveORcgyy2h8jDWTCTHXWu426mgl5nNt+z37ZI5nF9kj+W0gNht9uXDjeCYqLyX5VaQe82MYQ=; 7:tdMHfLTkpW5pke+wuFFKCrQS4n6U6kYtwhvos9TzFrNRRcvaTfz8FIUCWbI7obuf6Aj2AGwR9VX04OeiKy89Of/Q5v8L9Ik0nrW6AvoF4O9jK1uKMNZRJjrfvR8b+6JKlFqVsYAFOtn+TNIjojX9o1Z0JCx/Q9ENAK2O7bouk7eSrY337JvV8T2LxV+z4JLPr6baZ36XJ2BAl400L9a/8vq32Su4fY4r4WiipBSMU7XrUp2JRxcUqoqMuw3KjRnU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2017 11:13:04.8011 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ecd3a92-49aa-4378-1103-08d54088284f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR07MB3458 Subject: [dpdk-dev] [PATCH v2 2/8] app/eventdev: modify app setup to support ethdev 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Modify app setup to accommodate event port and queue setup based on the number of ethernet ports. Signed-off-by: Pavan Nikhilesh Acked-by: Jerin Jacob --- v2 Changes: - Removed unnecessary RTE_SET_USED() macros. app/test-eventdev/test_perf_atq.c | 17 +++++++++++++---- app/test-eventdev/test_perf_common.c | 26 ++++++++++++++++++++------ app/test-eventdev/test_perf_common.h | 1 + app/test-eventdev/test_perf_queue.c | 16 +++++++++++++--- 4 files changed, 47 insertions(+), 13 deletions(-) -- 2.14.1 diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_perf_atq.c index 0e9f2db0e..6082d4ff3 100644 --- a/app/test-eventdev/test_perf_atq.c +++ b/app/test-eventdev/test_perf_atq.c @@ -185,10 +185,19 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) { int ret; uint8_t queue; + uint8_t nb_queues; + uint8_t nb_ports; + + nb_ports = evt_nr_active_lcores(opt->wlcores); + nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? 0 : + evt_nr_active_lcores(opt->plcores); + + nb_queues = opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? + rte_eth_dev_count() : atq_nb_event_queues(opt); const struct rte_event_dev_config config = { - .nb_event_queues = atq_nb_event_queues(opt), - .nb_event_ports = perf_nb_event_ports(opt), + .nb_event_queues = nb_queues, + .nb_event_ports = nb_ports, .nb_events_limit = 4096, .nb_event_queue_flows = opt->nb_flows, .nb_event_port_dequeue_depth = 128, @@ -208,7 +217,7 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) .nb_atomic_order_sequences = opt->nb_flows, }; /* queue configurations */ - for (queue = 0; queue < atq_nb_event_queues(opt); queue++) { + for (queue = 0; queue < nb_queues; queue++) { ret = rte_event_queue_setup(opt->dev_id, queue, &q_conf); if (ret) { evt_err("failed to setup queue=%d", queue); @@ -217,7 +226,7 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) } ret = perf_event_dev_port_setup(test, opt, 1 /* stride */, - atq_nb_event_queues(opt)); + nb_queues); if (ret) return ret; diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c index 9d2865ed5..114210ea6 100644 --- a/app/test-eventdev/test_perf_common.c +++ b/app/test-eventdev/test_perf_common.c @@ -88,6 +88,17 @@ perf_producer(void *arg) return 0; } +static int +perf_producer_wrapper(void *arg) +{ + struct prod_data *p = arg; + struct test_perf *t = p->t; + /* Launch the producer function only in case of synthetic producer. */ + if (t->opt->prod_type == EVT_PROD_TYPE_SYNT) + return perf_producer(arg); + return 0; +} + static inline uint64_t processed_pkts(struct test_perf *t) { @@ -142,8 +153,8 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt, if (!(opt->plcores[lcore_id])) continue; - ret = rte_eal_remote_launch(perf_producer, &t->prod[port_idx], - lcore_id); + ret = rte_eal_remote_launch(perf_producer_wrapper, + &t->prod[port_idx], lcore_id); if (ret) { evt_err("failed to launch perf_producer %d", lcore_id); return ret; @@ -193,14 +204,17 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt, fflush(stdout); if (remaining <= 0) { - t->done = true; t->result = EVT_TEST_SUCCESS; - rte_smp_wmb(); - break; + if (opt->prod_type == EVT_PROD_TYPE_SYNT) { + t->done = true; + rte_smp_wmb(); + break; + } } } - if (new_cycles - dead_lock_cycles > dead_lock_sample) { + if (new_cycles - dead_lock_cycles > dead_lock_sample && + opt->prod_type == EVT_PROD_TYPE_SYNT) { remaining = t->outstand_pkts - processed_pkts(t); if (dead_lock_remaining == remaining) { rte_event_dev_dump(opt->dev_id, stdout); diff --git a/app/test-eventdev/test_perf_common.h b/app/test-eventdev/test_perf_common.h index c6fc70cd7..ab2e59988 100644 --- a/app/test-eventdev/test_perf_common.h +++ b/app/test-eventdev/test_perf_common.h @@ -38,6 +38,7 @@ #include #include +#include #include #include #include diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c index d843eea17..0caf5757c 100644 --- a/app/test-eventdev/test_perf_queue.c +++ b/app/test-eventdev/test_perf_queue.c @@ -182,10 +182,20 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) uint8_t queue; int nb_stages = opt->nb_stages; int ret; + int nb_ports; + int nb_queues; + + nb_ports = evt_nr_active_lcores(opt->wlcores); + nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? 0 : + evt_nr_active_lcores(opt->plcores); + + nb_queues = opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? + rte_eth_dev_count() * nb_stages : + perf_queue_nb_event_queues(opt); const struct rte_event_dev_config config = { - .nb_event_queues = perf_queue_nb_event_queues(opt), - .nb_event_ports = perf_nb_event_ports(opt), + .nb_event_queues = nb_queues, + .nb_event_ports = nb_ports, .nb_events_limit = 4096, .nb_event_queue_flows = opt->nb_flows, .nb_event_port_dequeue_depth = 128, @@ -228,7 +238,7 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) } ret = perf_event_dev_port_setup(test, opt, nb_stages /* stride */, - perf_queue_nb_event_queues(opt)); + nb_queues); if (ret) return ret;