From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id E39AE3256 for ; Fri, 29 Mar 2019 08:11:50 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2T7AX14021878 for ; Fri, 29 Mar 2019 00:11:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0818; bh=3z/lo5BH4rw+1MU2pGruFbLtQP1fCSpsWXo+MQVsu94=; b=WoCwcZjyZsXAfzZsv8bxOOjmO5+SYsEJN7wCCOXHhpCSZI5QAzA+QkCg2XE1j7+LBwwg DOFrLuKp+Q2SE9GxOwjgN+q5D8UamM4AZA3wo/gNmXYgbSOyGr+z1kJiDsg0Vh/GVnkp bG2R5zoTYHL+Em+fvg9VeFiRgoRzfsJCeiGMcog6PYJfhXS2PSbR72Ydjln+YFVknaJU BJXabeGFOXbRpFrHnf8SjQwmOnXozItibyqwb6R7uMiHFcYPmkU+pQxYNzt+F8Wamu1j 9eEH9Z+8o/d1KTmmxpTFnhXPiTf04VFFA7fAYSgiQopu3hOpO46+Ht8idy6ms+URkg+H nw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 2rh6fwh883-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 29 Mar 2019 00:11:49 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 29 Mar 2019 00:11:49 -0700 Received: from NAM01-BN3-obe.outbound.protection.outlook.com (104.47.33.53) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Fri, 29 Mar 2019 00:11:49 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3z/lo5BH4rw+1MU2pGruFbLtQP1fCSpsWXo+MQVsu94=; b=SgN9IPDgSbz5QCnfTspf8UsjexJ+U/hff51ij+k65w92sKOk6ZamC2TVEYGnWkt/iJ2vp08ISbQDdQUdhJm2Vgz73vA9lOD0F4gqrLeDhhuRHSxgmtsYm4R+vMMJscZQ8VdQxDTHnkYfzyfrEJdWHs9QGUii6nXX19FyEvfrK1s= Received: from CY4PR1801MB1863.namprd18.prod.outlook.com (10.171.255.14) by CY4PR1801MB1909.namprd18.prod.outlook.com (10.171.255.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 07:11:46 +0000 Received: from CY4PR1801MB1863.namprd18.prod.outlook.com ([fe80::286d:5e93:974e:8bfa]) by CY4PR1801MB1863.namprd18.prod.outlook.com ([fe80::286d:5e93:974e:8bfa%2]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 07:11:46 +0000 From: Pavan Nikhilesh Bhagavatula To: Jerin Jacob Kollanukkaran CC: "dev@dpdk.org" , Pavan Nikhilesh Bhagavatula Thread-Topic: [dpdk-dev] [PATCH v3] app/eventdev: add option to set global dequeue tmo Thread-Index: AQHU5f6rCqrRVD1OrU+jxi5BZf5hPQ== Date: Fri, 29 Mar 2019 07:11:46 +0000 Message-ID: <20190329071106.3448-1-pbhagavatula@marvell.com> References: <20190319061845.12343-1-pbhagavatula@marvell.com> In-Reply-To: <20190319061845.12343-1-pbhagavatula@marvell.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SG2PR03CA0101.apcprd03.prod.outlook.com (2603:1096:4:7c::29) To CY4PR1801MB1863.namprd18.prod.outlook.com (2603:10b6:910:7a::14) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.21.0 x-originating-ip: [122.167.18.62] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cb2cee5a-5531-4139-19d6-08d6b415cdbe x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:CY4PR1801MB1909; x-ms-traffictypediagnostic: CY4PR1801MB1909: x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(346002)(396003)(39850400004)(366004)(199004)(189003)(6486002)(36756003)(476003)(26005)(186003)(81166006)(6436002)(1076003)(76176011)(86362001)(446003)(2616005)(8676002)(6506007)(66066001)(7736002)(52116002)(102836004)(6636002)(305945005)(99286004)(81156014)(30864003)(11346002)(8936002)(14444005)(71190400001)(256004)(25786009)(6512007)(105586002)(106356001)(97736004)(71200400001)(54906003)(2906002)(50226002)(5660300002)(478600001)(78486014)(3846002)(486006)(68736007)(386003)(53946003)(37006003)(6116002)(107886003)(53936002)(14454004)(4326008)(6862004)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR1801MB1909; H:CY4PR1801MB1863.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: marvell.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: bcQbM2Q9swPIFuNyeKSVprSbN8dbom+xdFryBjRiic3RF2T7LuYTaB65IS1J+nOmQgVCg7tu2oualyfPNVvgz7T0vNYlUEaBPZ2pUy/kg4qJ/2joT4aKL5E1ubOowqryTMueMaG6VTN/5QaSLCz6mKFg3//p+Zof03LjWvg7JX4kslj9CFVc4J1XSG4A404zSpdCcNyDD6OgnxEGPU+9Zl8krBEW6D+1ozlMnFUDxJf5Qgk3Xs4n+VpJPFRWIIsliWPNq+8WD1NTYXzBs9XtwZ/U0QyIdys7fzlAuJpu6gNsYDzEIwUtQ8KsZjyrAunA25XiLps7gi+gPQn209/EiZNwP/fkHAibHZmoRCmjC5pXuiG3xMaJINkg37lxmLJKQgAGClAsS/W9gKz9d0X/ioFfaWXdVuPOouDJtbNrn8Q= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: cb2cee5a-5531-4139-19d6-08d6b415cdbe X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 07:11:46.4068 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1801MB1909 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-29_04:, , signatures=0 Subject: [dpdk-dev] [PATCH v3] app/eventdev: add option to set global dequeue tmo 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, 29 Mar 2019 07:11:51 -0000 From: Pavan Nikhilesh Add option to provide a global dequeue timeout that is used to create the eventdev. The dequeue timeout provided will be common across all the worker ports. If the eventdev hardware supports power management through dequeue timeout then this option can be used for verifying power demands at various packet rates. Signed-off-by: Pavan Nikhilesh --- v3 Changes: - Move common changes to evt_common.h. v2 Changes: - Update documentation and fix indentation. - Add check to see if provided dequeue timeout is within range and adjust = as required app/test-eventdev/evt_common.h | 79 +++++++++++++++++++++++++ app/test-eventdev/evt_options.c | 13 ++++ app/test-eventdev/evt_options.h | 36 +---------- app/test-eventdev/test_order_atq.c | 11 +--- app/test-eventdev/test_order_queue.c | 11 +--- app/test-eventdev/test_perf_atq.c | 13 +--- app/test-eventdev/test_perf_queue.c | 15 +---- app/test-eventdev/test_pipeline_atq.c | 12 +--- app/test-eventdev/test_pipeline_queue.c | 12 +--- doc/guides/tools/testeventdev.rst | 41 ++++++++----- 10 files changed, 127 insertions(+), 116 deletions(-) diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.= h index 21d3c103e..1c3522ff4 100644 --- a/app/test-eventdev/evt_common.h +++ b/app/test-eventdev/evt_common.h @@ -34,6 +34,43 @@ #define EVT_MAX_PORTS 256 #define EVT_MAX_QUEUES 256 +enum evt_prod_type { + EVT_PROD_TYPE_NONE, + EVT_PROD_TYPE_SYNT, /* Producer type Synthetic i.e. CPU. */ + EVT_PROD_TYPE_ETH_RX_ADPTR, /* Producer type Eth Rx Adapter. */ + EVT_PROD_TYPE_EVENT_TIMER_ADPTR, /* Producer type Timer Adapter. */ + EVT_PROD_TYPE_MAX, +}; + +struct evt_options { +#define EVT_TEST_NAME_MAX_LEN 32 + char test_name[EVT_TEST_NAME_MAX_LEN]; + bool plcores[RTE_MAX_LCORE]; + bool wlcores[RTE_MAX_LCORE]; + uint8_t sched_type_list[EVT_MAX_STAGES]; + uint32_t nb_flows; + int socket_id; + int pool_sz; + int nb_stages; + int verbose_level; + uint64_t nb_pkts; + uint8_t nb_timer_adptrs; + uint64_t nb_timers; + uint64_t timer_tick_nsec; + uint64_t optm_timer_tick_nsec; + uint64_t max_tmo_nsec; + uint64_t expiry_nsec; + uint16_t wkr_deq_dep; + uint8_t dev_id; + uint32_t tx_first; + uint32_t fwd_latency:1; + uint32_t q_priority:1; + uint32_t deq_tmo_nsec; + enum evt_prod_type prod_type; + uint8_t timdev_use_burst; + uint8_t timdev_cnt; +}; + static inline bool evt_has_distributed_sched(uint8_t dev_id) { @@ -99,4 +136,46 @@ evt_service_setup(uint32_t service_id) return 0; } +static inline int +evt_configure_eventdev(struct evt_options *opt, uint8_t nb_queues, + uint8_t nb_ports) +{ + struct rte_event_dev_info info; + int ret; + + memset(&info, 0, sizeof(struct rte_event_dev_info)); + ret =3D rte_event_dev_info_get(opt->dev_id, &info); + if (ret) { + evt_err("failed to get eventdev info %d", opt->dev_id); + return ret; + } + + if (opt->deq_tmo_nsec) { + if (opt->deq_tmo_nsec < info.min_dequeue_timeout_ns) { + opt->deq_tmo_nsec =3D info.min_dequeue_timeout_ns; + evt_info("dequeue_timeout_ns too low, using %d", + opt->deq_tmo_nsec); + } + if (opt->deq_tmo_nsec > info.max_dequeue_timeout_ns) { + opt->deq_tmo_nsec =3D info.max_dequeue_timeout_ns; + evt_info("dequeue_timeout_ns too high, using %d", + opt->deq_tmo_nsec); + } + } + + const struct rte_event_dev_config config =3D { + .dequeue_timeout_ns =3D opt->deq_tmo_nsec, + .nb_event_queues =3D nb_queues, + .nb_event_ports =3D nb_ports, + .nb_events_limit =3D info.max_num_events, + .nb_event_queue_flows =3D opt->nb_flows, + .nb_event_port_dequeue_depth =3D + info.max_event_port_dequeue_depth, + .nb_event_port_enqueue_depth =3D + info.max_event_port_enqueue_depth, + }; + + return rte_event_dev_configure(opt->dev_id, &config); +} + #endif /* _EVT_COMMON_*/ diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_option= s.c index cfa43a165..af5c08bac 100644 --- a/app/test-eventdev/evt_options.c +++ b/app/test-eventdev/evt_options.c @@ -84,6 +84,16 @@ evt_parse_queue_priority(struct evt_options *opt, const = char *arg __rte_unused) return 0; } +static int +evt_parse_deq_tmo_nsec(struct evt_options *opt, const char *arg) +{ + int ret; + + ret =3D parser_read_uint32(&(opt->deq_tmo_nsec), arg); + + return ret; +} + static int evt_parse_eth_prod_type(struct evt_options *opt, const char *arg __rte_unu= sed) { @@ -240,6 +250,7 @@ usage(char *program) "\t--worker_deq_depth : dequeue depth of the worker\n" "\t--fwd_latency : perform fwd_latency measurement\n" "\t--queue_priority : enable queue priority\n" + "\t--deq_tmo_nsec : global dequeue timeout\n" "\t--prod_type_ethdev : use ethernet device as producer.\n" "\t--prod_type_timerdev : use event timer device as producer.\n" "\t expity_nsec would be the timeout\n" @@ -311,6 +322,7 @@ static struct option lgopts[] =3D { { EVT_SCHED_TYPE_LIST, 1, 0, 0 }, { EVT_FWD_LATENCY, 0, 0, 0 }, { EVT_QUEUE_PRIORITY, 0, 0, 0 }, + { EVT_DEQ_TMO_NSEC, 1, 0, 0 }, { EVT_PROD_ETHDEV, 0, 0, 0 }, { EVT_PROD_TIMERDEV, 0, 0, 0 }, { EVT_PROD_TIMERDEV_BURST, 0, 0, 0 }, @@ -342,6 +354,7 @@ evt_opts_parse_long(int opt_idx, struct evt_options *op= t) { EVT_SCHED_TYPE_LIST, evt_parse_sched_type_list}, { EVT_FWD_LATENCY, evt_parse_fwd_latency}, { EVT_QUEUE_PRIORITY, evt_parse_queue_priority}, + { EVT_DEQ_TMO_NSEC, evt_parse_deq_tmo_nsec}, { EVT_PROD_ETHDEV, evt_parse_eth_prod_type}, { EVT_PROD_TIMERDEV, evt_parse_timer_prod_type}, { EVT_PROD_TIMERDEV_BURST, evt_parse_timer_prod_type_burst}, diff --git a/app/test-eventdev/evt_options.h b/app/test-eventdev/evt_option= s.h index f3de48a17..845d3199a 100644 --- a/app/test-eventdev/evt_options.h +++ b/app/test-eventdev/evt_options.h @@ -31,6 +31,7 @@ #define EVT_SCHED_TYPE_LIST ("stlist") #define EVT_FWD_LATENCY ("fwd_latency") #define EVT_QUEUE_PRIORITY ("queue_priority") +#define EVT_DEQ_TMO_NSEC ("deq_tmo_nsec") #define EVT_PROD_ETHDEV ("prod_type_ethdev") #define EVT_PROD_TIMERDEV ("prod_type_timerdev") #define EVT_PROD_TIMERDEV_BURST ("prod_type_timerdev_burst") @@ -41,41 +42,6 @@ #define EVT_EXPIRY_NSEC ("expiry_nsec") #define EVT_HELP ("help") -enum evt_prod_type { - EVT_PROD_TYPE_NONE, - EVT_PROD_TYPE_SYNT, /* Producer type Synthetic i.e. CPU. */ - EVT_PROD_TYPE_ETH_RX_ADPTR, /* Producer type Eth Rx Adapter. */ - EVT_PROD_TYPE_EVENT_TIMER_ADPTR, /* Producer type Timer Adapter. */ - EVT_PROD_TYPE_MAX, -}; - -struct evt_options { -#define EVT_TEST_NAME_MAX_LEN 32 - char test_name[EVT_TEST_NAME_MAX_LEN]; - bool plcores[RTE_MAX_LCORE]; - bool wlcores[RTE_MAX_LCORE]; - uint8_t sched_type_list[EVT_MAX_STAGES]; - uint32_t nb_flows; - int socket_id; - int pool_sz; - int nb_stages; - int verbose_level; - uint64_t nb_pkts; - uint8_t nb_timer_adptrs; - uint64_t nb_timers; - uint64_t timer_tick_nsec; - uint64_t optm_timer_tick_nsec; - uint64_t max_tmo_nsec; - uint64_t expiry_nsec; - uint16_t wkr_deq_dep; - uint8_t dev_id; - uint32_t fwd_latency:1; - uint32_t q_priority:1; - enum evt_prod_type prod_type; - uint8_t timdev_use_burst; - uint8_t timdev_cnt; -}; - void evt_options_default(struct evt_options *opt); int evt_options_parse(struct evt_options *opt, int argc, char **argv); void evt_options_dump(struct evt_options *opt); diff --git a/app/test-eventdev/test_order_atq.c b/app/test-eventdev/test_or= der_atq.c index 4a8546e7f..abccbccac 100644 --- a/app/test-eventdev/test_order_atq.c +++ b/app/test-eventdev/test_order_atq.c @@ -118,16 +118,7 @@ order_atq_eventdev_setup(struct evt_test *test, struct= evt_options *opt) /* number of active worker cores + 1 producer */ const uint8_t nb_ports =3D nb_workers + 1; - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D NB_QUEUES,/* one all types queue */ - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D 4096, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D 128, - .nb_event_port_enqueue_depth =3D 128, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, NB_QUEUES, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_order_queue.c b/app/test-eventdev/test_= order_queue.c index a272c7a57..7ac570c73 100644 --- a/app/test-eventdev/test_order_queue.c +++ b/app/test-eventdev/test_order_queue.c @@ -118,16 +118,7 @@ order_queue_eventdev_setup(struct evt_test *test, stru= ct evt_options *opt) /* number of active worker cores + 1 producer */ const uint8_t nb_ports =3D nb_workers + 1; - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D NB_QUEUES,/* q0 ordered, q1 atomic */ - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D 4096, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D 128, - .nb_event_port_enqueue_depth =3D 128, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, NB_QUEUES, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_per= f_atq.c index 73f31e564..d0241ec4a 100644 --- a/app/test-eventdev/test_perf_atq.c +++ b/app/test-eventdev/test_perf_atq.c @@ -175,18 +175,7 @@ perf_atq_eventdev_setup(struct evt_test *test, struct = evt_options *opt) return ret; } - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D dev_info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - dev_info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - dev_info.max_event_port_enqueue_depth, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_p= erf_queue.c index d89491364..29098580e 100644 --- a/app/test-eventdev/test_perf_queue.c +++ b/app/test-eventdev/test_perf_queue.c @@ -164,7 +164,7 @@ perf_queue_eventdev_setup(struct evt_test *test, struct= evt_options *opt) nb_ports =3D evt_nr_active_lcores(opt->wlcores); nb_ports +=3D opt->prod_type =3D=3D EVT_PROD_TYPE_ETH_RX_ADPTR || - opt->prod_type =3D=3D EVT_PROD_TYPE_EVENT_TIMER_ADPTR ? 0 : + opt->prod_type =3D=3D EVT_PROD_TYPE_EVENT_TIMER_ADPTR ? 0 : evt_nr_active_lcores(opt->plcores); nb_queues =3D perf_queue_nb_event_queues(opt); @@ -176,18 +176,7 @@ perf_queue_eventdev_setup(struct evt_test *test, struc= t evt_options *opt) return ret; } - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D dev_info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - dev_info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - dev_info.max_event_port_enqueue_depth, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_pipeline_atq.c b/app/test-eventdev/test= _pipeline_atq.c index 998a56cfd..8e8686c14 100644 --- a/app/test-eventdev/test_pipeline_atq.c +++ b/app/test-eventdev/test_pipeline_atq.c @@ -314,17 +314,7 @@ pipeline_atq_eventdev_setup(struct evt_test *test, str= uct evt_options *opt) rte_event_dev_info_get(opt->dev_id, &info); - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - info.max_event_port_enqueue_depth, - }; - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-eventdev/te= st_pipeline_queue.c index 7da89dad5..7bebac34f 100644 --- a/app/test-eventdev/test_pipeline_queue.c +++ b/app/test-eventdev/test_pipeline_queue.c @@ -334,17 +334,7 @@ pipeline_queue_eventdev_setup(struct evt_test *test, s= truct evt_options *opt) memset(queue_arr, 0, sizeof(uint8_t) * RTE_EVENT_MAX_QUEUES_PER_DEV); rte_event_dev_info_get(opt->dev_id, &info); - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - info.max_event_port_enqueue_depth, - }; - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testevent= dev.rst index cddba3be0..db5c4378b 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -129,31 +129,38 @@ The following are the application command-line option= s: Use event timer adapter as producer. - * ``--prod_type_timerdev_burst`` +* ``--prod_type_timerdev_burst`` - Use burst mode event timer adapter as producer. + Use burst mode event timer adapter as producer. - * ``--timer_tick_nsec`` +* ``--timer_tick_nsec`` - Used to dictate number of nano seconds between bucket traversal of= the - event timer adapter. Refer `rte_event_timer_adapter_conf`. + Used to dictate number of nano seconds between bucket traversal of = the + event timer adapter. Refer `rte_event_timer_adapter_conf`. - * ``--max_tmo_nsec`` +* ``--max_tmo_nsec`` - Used to configure event timer adapter max arm timeout in nano seco= nds. + Used to configure event timer adapter max arm timeout in nano secon= ds. - * ``--expiry_nsec`` +* ``--expiry_nsec`` - Dictate the number of nano seconds after which the event timer exp= ires. + Dictate the number of nano seconds after which the event timer expi= res. - * ``--nb_timers`` +* ``--nb_timers`` - Number of event timers each producer core will generate. + Number of event timers each producer core will generate. - * ``--nb_timer_adptrs`` +* ``--nb_timer_adptrs`` + + Number of event timer adapters to be used. Each adapter is used in + round robin manner by the producer cores. + +* ``--deq_tmo_nsec`` + + Global dequeue timeout for all the event ports if the provided dequ= eue + timeout is out of the supported range of event device it will be + adjusted to the highest/lowest supported dequeue timeout supported. - Number of event timer adapters to be used. Each adapter is used in - round robin manner by the producer cores. Eventdev Tests -------------- @@ -225,6 +232,7 @@ Supported application command line options are followin= g:: --nb_flows --nb_pkts --worker_deq_depth + --deq_tmo_nsec Example ^^^^^^^ @@ -287,6 +295,7 @@ Supported application command line options are followin= g:: --nb_flows --nb_pkts --worker_deq_depth + --deq_tmo_nsec Example ^^^^^^^ @@ -386,6 +395,7 @@ Supported application command line options are followin= g:: --expiry_nsec --nb_timers --nb_timer_adptrs + --deq_tmo_nsec Example ^^^^^^^ @@ -485,6 +495,7 @@ Supported application command line options are followin= g:: --expiry_nsec --nb_timers --nb_timer_adptrs + --deq_tmo_nsec Example ^^^^^^^ @@ -598,6 +609,7 @@ Supported application command line options are followin= g:: --stlist --worker_deq_depth --prod_type_ethdev + --deq_tmo_nsec .. Note:: @@ -689,6 +701,7 @@ Supported application command line options are followin= g:: --stlist --worker_deq_depth --prod_type_ethdev + --deq_tmo_nsec .. Note:: -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 79250A0679 for ; Fri, 29 Mar 2019 08:11:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5BBD33572; Fri, 29 Mar 2019 08:11:52 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id E39AE3256 for ; Fri, 29 Mar 2019 08:11:50 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2T7AX14021878 for ; Fri, 29 Mar 2019 00:11:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0818; bh=3z/lo5BH4rw+1MU2pGruFbLtQP1fCSpsWXo+MQVsu94=; b=WoCwcZjyZsXAfzZsv8bxOOjmO5+SYsEJN7wCCOXHhpCSZI5QAzA+QkCg2XE1j7+LBwwg DOFrLuKp+Q2SE9GxOwjgN+q5D8UamM4AZA3wo/gNmXYgbSOyGr+z1kJiDsg0Vh/GVnkp bG2R5zoTYHL+Em+fvg9VeFiRgoRzfsJCeiGMcog6PYJfhXS2PSbR72Ydjln+YFVknaJU BJXabeGFOXbRpFrHnf8SjQwmOnXozItibyqwb6R7uMiHFcYPmkU+pQxYNzt+F8Wamu1j 9eEH9Z+8o/d1KTmmxpTFnhXPiTf04VFFA7fAYSgiQopu3hOpO46+Ht8idy6ms+URkg+H nw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 2rh6fwh883-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 29 Mar 2019 00:11:49 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 29 Mar 2019 00:11:49 -0700 Received: from NAM01-BN3-obe.outbound.protection.outlook.com (104.47.33.53) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Fri, 29 Mar 2019 00:11:49 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3z/lo5BH4rw+1MU2pGruFbLtQP1fCSpsWXo+MQVsu94=; b=SgN9IPDgSbz5QCnfTspf8UsjexJ+U/hff51ij+k65w92sKOk6ZamC2TVEYGnWkt/iJ2vp08ISbQDdQUdhJm2Vgz73vA9lOD0F4gqrLeDhhuRHSxgmtsYm4R+vMMJscZQ8VdQxDTHnkYfzyfrEJdWHs9QGUii6nXX19FyEvfrK1s= Received: from CY4PR1801MB1863.namprd18.prod.outlook.com (10.171.255.14) by CY4PR1801MB1909.namprd18.prod.outlook.com (10.171.255.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 07:11:46 +0000 Received: from CY4PR1801MB1863.namprd18.prod.outlook.com ([fe80::286d:5e93:974e:8bfa]) by CY4PR1801MB1863.namprd18.prod.outlook.com ([fe80::286d:5e93:974e:8bfa%2]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 07:11:46 +0000 From: Pavan Nikhilesh Bhagavatula To: Jerin Jacob Kollanukkaran CC: "dev@dpdk.org" , Pavan Nikhilesh Bhagavatula Thread-Topic: [dpdk-dev] [PATCH v3] app/eventdev: add option to set global dequeue tmo Thread-Index: AQHU5f6rCqrRVD1OrU+jxi5BZf5hPQ== Date: Fri, 29 Mar 2019 07:11:46 +0000 Message-ID: <20190329071106.3448-1-pbhagavatula@marvell.com> References: <20190319061845.12343-1-pbhagavatula@marvell.com> In-Reply-To: <20190319061845.12343-1-pbhagavatula@marvell.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SG2PR03CA0101.apcprd03.prod.outlook.com (2603:1096:4:7c::29) To CY4PR1801MB1863.namprd18.prod.outlook.com (2603:10b6:910:7a::14) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.21.0 x-originating-ip: [122.167.18.62] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cb2cee5a-5531-4139-19d6-08d6b415cdbe x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:CY4PR1801MB1909; x-ms-traffictypediagnostic: CY4PR1801MB1909: x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(346002)(396003)(39850400004)(366004)(199004)(189003)(6486002)(36756003)(476003)(26005)(186003)(81166006)(6436002)(1076003)(76176011)(86362001)(446003)(2616005)(8676002)(6506007)(66066001)(7736002)(52116002)(102836004)(6636002)(305945005)(99286004)(81156014)(30864003)(11346002)(8936002)(14444005)(71190400001)(256004)(25786009)(6512007)(105586002)(106356001)(97736004)(71200400001)(54906003)(2906002)(50226002)(5660300002)(478600001)(78486014)(3846002)(486006)(68736007)(386003)(53946003)(37006003)(6116002)(107886003)(53936002)(14454004)(4326008)(6862004)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR1801MB1909; H:CY4PR1801MB1863.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: marvell.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: bcQbM2Q9swPIFuNyeKSVprSbN8dbom+xdFryBjRiic3RF2T7LuYTaB65IS1J+nOmQgVCg7tu2oualyfPNVvgz7T0vNYlUEaBPZ2pUy/kg4qJ/2joT4aKL5E1ubOowqryTMueMaG6VTN/5QaSLCz6mKFg3//p+Zof03LjWvg7JX4kslj9CFVc4J1XSG4A404zSpdCcNyDD6OgnxEGPU+9Zl8krBEW6D+1ozlMnFUDxJf5Qgk3Xs4n+VpJPFRWIIsliWPNq+8WD1NTYXzBs9XtwZ/U0QyIdys7fzlAuJpu6gNsYDzEIwUtQ8KsZjyrAunA25XiLps7gi+gPQn209/EiZNwP/fkHAibHZmoRCmjC5pXuiG3xMaJINkg37lxmLJKQgAGClAsS/W9gKz9d0X/ioFfaWXdVuPOouDJtbNrn8Q= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: cb2cee5a-5531-4139-19d6-08d6b415cdbe X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 07:11:46.4068 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1801MB1909 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-29_04:, , signatures=0 Subject: [dpdk-dev] [PATCH v3] app/eventdev: add option to set global dequeue tmo 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" Message-ID: <20190329071146.u4_AEdy3pFtOr8F2UZwL2ShykJWQ7huvjKIMwOdMjKY@z> From: Pavan Nikhilesh Add option to provide a global dequeue timeout that is used to create the eventdev. The dequeue timeout provided will be common across all the worker ports. If the eventdev hardware supports power management through dequeue timeout then this option can be used for verifying power demands at various packet rates. Signed-off-by: Pavan Nikhilesh --- v3 Changes: - Move common changes to evt_common.h. v2 Changes: - Update documentation and fix indentation. - Add check to see if provided dequeue timeout is within range and adjust = as required app/test-eventdev/evt_common.h | 79 +++++++++++++++++++++++++ app/test-eventdev/evt_options.c | 13 ++++ app/test-eventdev/evt_options.h | 36 +---------- app/test-eventdev/test_order_atq.c | 11 +--- app/test-eventdev/test_order_queue.c | 11 +--- app/test-eventdev/test_perf_atq.c | 13 +--- app/test-eventdev/test_perf_queue.c | 15 +---- app/test-eventdev/test_pipeline_atq.c | 12 +--- app/test-eventdev/test_pipeline_queue.c | 12 +--- doc/guides/tools/testeventdev.rst | 41 ++++++++----- 10 files changed, 127 insertions(+), 116 deletions(-) diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.= h index 21d3c103e..1c3522ff4 100644 --- a/app/test-eventdev/evt_common.h +++ b/app/test-eventdev/evt_common.h @@ -34,6 +34,43 @@ #define EVT_MAX_PORTS 256 #define EVT_MAX_QUEUES 256 +enum evt_prod_type { + EVT_PROD_TYPE_NONE, + EVT_PROD_TYPE_SYNT, /* Producer type Synthetic i.e. CPU. */ + EVT_PROD_TYPE_ETH_RX_ADPTR, /* Producer type Eth Rx Adapter. */ + EVT_PROD_TYPE_EVENT_TIMER_ADPTR, /* Producer type Timer Adapter. */ + EVT_PROD_TYPE_MAX, +}; + +struct evt_options { +#define EVT_TEST_NAME_MAX_LEN 32 + char test_name[EVT_TEST_NAME_MAX_LEN]; + bool plcores[RTE_MAX_LCORE]; + bool wlcores[RTE_MAX_LCORE]; + uint8_t sched_type_list[EVT_MAX_STAGES]; + uint32_t nb_flows; + int socket_id; + int pool_sz; + int nb_stages; + int verbose_level; + uint64_t nb_pkts; + uint8_t nb_timer_adptrs; + uint64_t nb_timers; + uint64_t timer_tick_nsec; + uint64_t optm_timer_tick_nsec; + uint64_t max_tmo_nsec; + uint64_t expiry_nsec; + uint16_t wkr_deq_dep; + uint8_t dev_id; + uint32_t tx_first; + uint32_t fwd_latency:1; + uint32_t q_priority:1; + uint32_t deq_tmo_nsec; + enum evt_prod_type prod_type; + uint8_t timdev_use_burst; + uint8_t timdev_cnt; +}; + static inline bool evt_has_distributed_sched(uint8_t dev_id) { @@ -99,4 +136,46 @@ evt_service_setup(uint32_t service_id) return 0; } +static inline int +evt_configure_eventdev(struct evt_options *opt, uint8_t nb_queues, + uint8_t nb_ports) +{ + struct rte_event_dev_info info; + int ret; + + memset(&info, 0, sizeof(struct rte_event_dev_info)); + ret =3D rte_event_dev_info_get(opt->dev_id, &info); + if (ret) { + evt_err("failed to get eventdev info %d", opt->dev_id); + return ret; + } + + if (opt->deq_tmo_nsec) { + if (opt->deq_tmo_nsec < info.min_dequeue_timeout_ns) { + opt->deq_tmo_nsec =3D info.min_dequeue_timeout_ns; + evt_info("dequeue_timeout_ns too low, using %d", + opt->deq_tmo_nsec); + } + if (opt->deq_tmo_nsec > info.max_dequeue_timeout_ns) { + opt->deq_tmo_nsec =3D info.max_dequeue_timeout_ns; + evt_info("dequeue_timeout_ns too high, using %d", + opt->deq_tmo_nsec); + } + } + + const struct rte_event_dev_config config =3D { + .dequeue_timeout_ns =3D opt->deq_tmo_nsec, + .nb_event_queues =3D nb_queues, + .nb_event_ports =3D nb_ports, + .nb_events_limit =3D info.max_num_events, + .nb_event_queue_flows =3D opt->nb_flows, + .nb_event_port_dequeue_depth =3D + info.max_event_port_dequeue_depth, + .nb_event_port_enqueue_depth =3D + info.max_event_port_enqueue_depth, + }; + + return rte_event_dev_configure(opt->dev_id, &config); +} + #endif /* _EVT_COMMON_*/ diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_option= s.c index cfa43a165..af5c08bac 100644 --- a/app/test-eventdev/evt_options.c +++ b/app/test-eventdev/evt_options.c @@ -84,6 +84,16 @@ evt_parse_queue_priority(struct evt_options *opt, const = char *arg __rte_unused) return 0; } +static int +evt_parse_deq_tmo_nsec(struct evt_options *opt, const char *arg) +{ + int ret; + + ret =3D parser_read_uint32(&(opt->deq_tmo_nsec), arg); + + return ret; +} + static int evt_parse_eth_prod_type(struct evt_options *opt, const char *arg __rte_unu= sed) { @@ -240,6 +250,7 @@ usage(char *program) "\t--worker_deq_depth : dequeue depth of the worker\n" "\t--fwd_latency : perform fwd_latency measurement\n" "\t--queue_priority : enable queue priority\n" + "\t--deq_tmo_nsec : global dequeue timeout\n" "\t--prod_type_ethdev : use ethernet device as producer.\n" "\t--prod_type_timerdev : use event timer device as producer.\n" "\t expity_nsec would be the timeout\n" @@ -311,6 +322,7 @@ static struct option lgopts[] =3D { { EVT_SCHED_TYPE_LIST, 1, 0, 0 }, { EVT_FWD_LATENCY, 0, 0, 0 }, { EVT_QUEUE_PRIORITY, 0, 0, 0 }, + { EVT_DEQ_TMO_NSEC, 1, 0, 0 }, { EVT_PROD_ETHDEV, 0, 0, 0 }, { EVT_PROD_TIMERDEV, 0, 0, 0 }, { EVT_PROD_TIMERDEV_BURST, 0, 0, 0 }, @@ -342,6 +354,7 @@ evt_opts_parse_long(int opt_idx, struct evt_options *op= t) { EVT_SCHED_TYPE_LIST, evt_parse_sched_type_list}, { EVT_FWD_LATENCY, evt_parse_fwd_latency}, { EVT_QUEUE_PRIORITY, evt_parse_queue_priority}, + { EVT_DEQ_TMO_NSEC, evt_parse_deq_tmo_nsec}, { EVT_PROD_ETHDEV, evt_parse_eth_prod_type}, { EVT_PROD_TIMERDEV, evt_parse_timer_prod_type}, { EVT_PROD_TIMERDEV_BURST, evt_parse_timer_prod_type_burst}, diff --git a/app/test-eventdev/evt_options.h b/app/test-eventdev/evt_option= s.h index f3de48a17..845d3199a 100644 --- a/app/test-eventdev/evt_options.h +++ b/app/test-eventdev/evt_options.h @@ -31,6 +31,7 @@ #define EVT_SCHED_TYPE_LIST ("stlist") #define EVT_FWD_LATENCY ("fwd_latency") #define EVT_QUEUE_PRIORITY ("queue_priority") +#define EVT_DEQ_TMO_NSEC ("deq_tmo_nsec") #define EVT_PROD_ETHDEV ("prod_type_ethdev") #define EVT_PROD_TIMERDEV ("prod_type_timerdev") #define EVT_PROD_TIMERDEV_BURST ("prod_type_timerdev_burst") @@ -41,41 +42,6 @@ #define EVT_EXPIRY_NSEC ("expiry_nsec") #define EVT_HELP ("help") -enum evt_prod_type { - EVT_PROD_TYPE_NONE, - EVT_PROD_TYPE_SYNT, /* Producer type Synthetic i.e. CPU. */ - EVT_PROD_TYPE_ETH_RX_ADPTR, /* Producer type Eth Rx Adapter. */ - EVT_PROD_TYPE_EVENT_TIMER_ADPTR, /* Producer type Timer Adapter. */ - EVT_PROD_TYPE_MAX, -}; - -struct evt_options { -#define EVT_TEST_NAME_MAX_LEN 32 - char test_name[EVT_TEST_NAME_MAX_LEN]; - bool plcores[RTE_MAX_LCORE]; - bool wlcores[RTE_MAX_LCORE]; - uint8_t sched_type_list[EVT_MAX_STAGES]; - uint32_t nb_flows; - int socket_id; - int pool_sz; - int nb_stages; - int verbose_level; - uint64_t nb_pkts; - uint8_t nb_timer_adptrs; - uint64_t nb_timers; - uint64_t timer_tick_nsec; - uint64_t optm_timer_tick_nsec; - uint64_t max_tmo_nsec; - uint64_t expiry_nsec; - uint16_t wkr_deq_dep; - uint8_t dev_id; - uint32_t fwd_latency:1; - uint32_t q_priority:1; - enum evt_prod_type prod_type; - uint8_t timdev_use_burst; - uint8_t timdev_cnt; -}; - void evt_options_default(struct evt_options *opt); int evt_options_parse(struct evt_options *opt, int argc, char **argv); void evt_options_dump(struct evt_options *opt); diff --git a/app/test-eventdev/test_order_atq.c b/app/test-eventdev/test_or= der_atq.c index 4a8546e7f..abccbccac 100644 --- a/app/test-eventdev/test_order_atq.c +++ b/app/test-eventdev/test_order_atq.c @@ -118,16 +118,7 @@ order_atq_eventdev_setup(struct evt_test *test, struct= evt_options *opt) /* number of active worker cores + 1 producer */ const uint8_t nb_ports =3D nb_workers + 1; - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D NB_QUEUES,/* one all types queue */ - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D 4096, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D 128, - .nb_event_port_enqueue_depth =3D 128, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, NB_QUEUES, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_order_queue.c b/app/test-eventdev/test_= order_queue.c index a272c7a57..7ac570c73 100644 --- a/app/test-eventdev/test_order_queue.c +++ b/app/test-eventdev/test_order_queue.c @@ -118,16 +118,7 @@ order_queue_eventdev_setup(struct evt_test *test, stru= ct evt_options *opt) /* number of active worker cores + 1 producer */ const uint8_t nb_ports =3D nb_workers + 1; - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D NB_QUEUES,/* q0 ordered, q1 atomic */ - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D 4096, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D 128, - .nb_event_port_enqueue_depth =3D 128, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, NB_QUEUES, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_per= f_atq.c index 73f31e564..d0241ec4a 100644 --- a/app/test-eventdev/test_perf_atq.c +++ b/app/test-eventdev/test_perf_atq.c @@ -175,18 +175,7 @@ perf_atq_eventdev_setup(struct evt_test *test, struct = evt_options *opt) return ret; } - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D dev_info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - dev_info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - dev_info.max_event_port_enqueue_depth, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_p= erf_queue.c index d89491364..29098580e 100644 --- a/app/test-eventdev/test_perf_queue.c +++ b/app/test-eventdev/test_perf_queue.c @@ -164,7 +164,7 @@ perf_queue_eventdev_setup(struct evt_test *test, struct= evt_options *opt) nb_ports =3D evt_nr_active_lcores(opt->wlcores); nb_ports +=3D opt->prod_type =3D=3D EVT_PROD_TYPE_ETH_RX_ADPTR || - opt->prod_type =3D=3D EVT_PROD_TYPE_EVENT_TIMER_ADPTR ? 0 : + opt->prod_type =3D=3D EVT_PROD_TYPE_EVENT_TIMER_ADPTR ? 0 : evt_nr_active_lcores(opt->plcores); nb_queues =3D perf_queue_nb_event_queues(opt); @@ -176,18 +176,7 @@ perf_queue_eventdev_setup(struct evt_test *test, struc= t evt_options *opt) return ret; } - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D dev_info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - dev_info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - dev_info.max_event_port_enqueue_depth, - }; - - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_pipeline_atq.c b/app/test-eventdev/test= _pipeline_atq.c index 998a56cfd..8e8686c14 100644 --- a/app/test-eventdev/test_pipeline_atq.c +++ b/app/test-eventdev/test_pipeline_atq.c @@ -314,17 +314,7 @@ pipeline_atq_eventdev_setup(struct evt_test *test, str= uct evt_options *opt) rte_event_dev_info_get(opt->dev_id, &info); - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - info.max_event_port_enqueue_depth, - }; - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-eventdev/te= st_pipeline_queue.c index 7da89dad5..7bebac34f 100644 --- a/app/test-eventdev/test_pipeline_queue.c +++ b/app/test-eventdev/test_pipeline_queue.c @@ -334,17 +334,7 @@ pipeline_queue_eventdev_setup(struct evt_test *test, s= truct evt_options *opt) memset(queue_arr, 0, sizeof(uint8_t) * RTE_EVENT_MAX_QUEUES_PER_DEV); rte_event_dev_info_get(opt->dev_id, &info); - const struct rte_event_dev_config config =3D { - .nb_event_queues =3D nb_queues, - .nb_event_ports =3D nb_ports, - .nb_events_limit =3D info.max_num_events, - .nb_event_queue_flows =3D opt->nb_flows, - .nb_event_port_dequeue_depth =3D - info.max_event_port_dequeue_depth, - .nb_event_port_enqueue_depth =3D - info.max_event_port_enqueue_depth, - }; - ret =3D rte_event_dev_configure(opt->dev_id, &config); + ret =3D evt_configure_eventdev(opt, nb_queues, nb_ports); if (ret) { evt_err("failed to configure eventdev %d", opt->dev_id); return ret; diff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testevent= dev.rst index cddba3be0..db5c4378b 100644 --- a/doc/guides/tools/testeventdev.rst +++ b/doc/guides/tools/testeventdev.rst @@ -129,31 +129,38 @@ The following are the application command-line option= s: Use event timer adapter as producer. - * ``--prod_type_timerdev_burst`` +* ``--prod_type_timerdev_burst`` - Use burst mode event timer adapter as producer. + Use burst mode event timer adapter as producer. - * ``--timer_tick_nsec`` +* ``--timer_tick_nsec`` - Used to dictate number of nano seconds between bucket traversal of= the - event timer adapter. Refer `rte_event_timer_adapter_conf`. + Used to dictate number of nano seconds between bucket traversal of = the + event timer adapter. Refer `rte_event_timer_adapter_conf`. - * ``--max_tmo_nsec`` +* ``--max_tmo_nsec`` - Used to configure event timer adapter max arm timeout in nano seco= nds. + Used to configure event timer adapter max arm timeout in nano secon= ds. - * ``--expiry_nsec`` +* ``--expiry_nsec`` - Dictate the number of nano seconds after which the event timer exp= ires. + Dictate the number of nano seconds after which the event timer expi= res. - * ``--nb_timers`` +* ``--nb_timers`` - Number of event timers each producer core will generate. + Number of event timers each producer core will generate. - * ``--nb_timer_adptrs`` +* ``--nb_timer_adptrs`` + + Number of event timer adapters to be used. Each adapter is used in + round robin manner by the producer cores. + +* ``--deq_tmo_nsec`` + + Global dequeue timeout for all the event ports if the provided dequ= eue + timeout is out of the supported range of event device it will be + adjusted to the highest/lowest supported dequeue timeout supported. - Number of event timer adapters to be used. Each adapter is used in - round robin manner by the producer cores. Eventdev Tests -------------- @@ -225,6 +232,7 @@ Supported application command line options are followin= g:: --nb_flows --nb_pkts --worker_deq_depth + --deq_tmo_nsec Example ^^^^^^^ @@ -287,6 +295,7 @@ Supported application command line options are followin= g:: --nb_flows --nb_pkts --worker_deq_depth + --deq_tmo_nsec Example ^^^^^^^ @@ -386,6 +395,7 @@ Supported application command line options are followin= g:: --expiry_nsec --nb_timers --nb_timer_adptrs + --deq_tmo_nsec Example ^^^^^^^ @@ -485,6 +495,7 @@ Supported application command line options are followin= g:: --expiry_nsec --nb_timers --nb_timer_adptrs + --deq_tmo_nsec Example ^^^^^^^ @@ -598,6 +609,7 @@ Supported application command line options are followin= g:: --stlist --worker_deq_depth --prod_type_ethdev + --deq_tmo_nsec .. Note:: @@ -689,6 +701,7 @@ Supported application command line options are followin= g:: --stlist --worker_deq_depth --prod_type_ethdev + --deq_tmo_nsec .. Note:: -- 2.21.0