Eventdev ABI changes for DLB/DLB2
v2 cover Eventdev ABI changes for DLB/DLB2
This series implements the eventdev ABI changes required by the DLB and DLB2 PMDs. This ABI change was announced in the 20.08 release notes [1]. This patch was initially part of the V1 DLB PMD patchset.
The DLB hardware does not conform exactly to the eventdev interface.
1) It has a limit on the number of queues that may be linked to a port.
2) Some ports are further restricted to a maximum of 1 linked queue.
3) It does not (currently) have the ability to carry the flow_id as part of the event (QE) payload.
Due to the above, we would like to propose the following enhancements.
1) Add new fields to the rte_event_dev_info struct. These fields allow the device to advertise its capabilities so that applications can take the appropriate actions based on those capabilities.
2) Add a new field to the rte_event_dev_config struct. This field allows the application to specify how many of its ports are limited to a single link, or will be used in single link mode.
3) Replace the dedicated implicit_release_disabled field with a bit field of explicit port capabilities. The implicit_release_disable functionality is assigned to one bit, and a port-is-single-link-only attribute is assigned to another, with the remaining bits available for future assignment.
Note that it was requested that we split this app/test changes out from the eventdev ABI patch. As a result, neither of these patches will build without the other also being applied.
Major changes since V1:
Reworded commit message, as requested
Fixed errors reported by clang
Testing showed no performance impact due to the flow_id template code added to test app.
[1] http://mails.dpdk.org/archives/dev/2020-August/177261.html
Timothy McDaniel (2):
eventdev: eventdev: express DLB/DLB2 PMD constraints
eventdev: update app and examples for new eventdev ABI
app/test-eventdev/evt_common.h | 11 ++++ app/test-eventdev/test_order_atq.c | 28 ++++++--- app/test-eventdev/test_order_common.c | 1 + app/test-eventdev/test_order_queue.c | 29 +++++++--- app/test/test_eventdev.c | 4 +- drivers/event/dpaa/dpaa_eventdev.c | 3 +- drivers/event/dpaa2/dpaa2_eventdev.c | 5 +- drivers/event/dsw/dsw_evdev.c | 3 +- drivers/event/octeontx/ssovf_evdev.c | 5 +- drivers/event/octeontx2/otx2_evdev.c | 3 +- drivers/event/opdl/opdl_evdev.c | 3 +- drivers/event/skeleton/skeleton_eventdev.c | 5 +- drivers/event/sw/sw_evdev.c | 8 ++- drivers/event/sw/sw_evdev_selftest.c | 6 +- .../eventdev_pipeline/pipeline_worker_generic.c | 6 +- examples/eventdev_pipeline/pipeline_worker_tx.c | 1 + examples/l2fwd-event/l2fwd_event_generic.c | 7 ++- examples/l2fwd-event/l2fwd_event_internal_port.c | 6 +- examples/l3fwd/l3fwd_event_generic.c | 7 ++- examples/l3fwd/l3fwd_event_internal_port.c | 6 +- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 2 +- lib/librte_eventdev/rte_eventdev.c | 66 +++++++++++++++++++--- lib/librte_eventdev/rte_eventdev.h | 51 ++++++++++++++--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 1 - lib/librte_eventdev/rte_eventdev_trace.h | 7 ++- lib/librte_eventdev/rte_eventdev_version.map | 4 +- 26 files changed, 214 insertions(+), 64 deletions(-)
Signature · 1 line
2.6.4
PATCH v2 1/2 eventdev: eventdev: express DLB/DLB2 PMD constraints
This commit implements the eventdev ABI changes required by the DLB PMD.
--- drivers/event/dpaa/dpaa_eventdev.c | 3 +- drivers/event/dpaa2/dpaa2_eventdev.c | 5 +- drivers/event/dsw/dsw_evdev.c | 3 +- drivers/event/octeontx/ssovf_evdev.c | 5 +- drivers/event/octeontx2/otx2_evdev.c | 3 +- drivers/event/opdl/opdl_evdev.c | 3 +- drivers/event/skeleton/skeleton_eventdev.c | 5 +- drivers/event/sw/sw_evdev.c | 8 ++-- drivers/event/sw/sw_evdev_selftest.c | 6 +-- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 2 +- lib/librte_eventdev/rte_eventdev.c | 66 +++++++++++++++++++++++--- lib/librte_eventdev/rte_eventdev.h | 51 ++++++++++++++++---- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 1 - lib/librte_eventdev/rte_eventdev_trace.h | 7 +-- lib/librte_eventdev/rte_eventdev_version.map | 4 +- 15 files changed, 134 insertions(+), 38 deletions(-)
drivers/event/dpaa/dpaa_eventdev.c +2 -1
@@ -355,7 +355,8 @@ dpaa_event_dev_info_get(struct rte_eventdev *dev,RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |RTE_EVENT_DEV_CAP_BURST_MODE |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -RTE_EVENT_DEV_CAP_NONSEQ_MODE ; +RTE_EVENT_DEV_CAP_NONSEQ_MODE | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; } static int
drivers/event/dpaa2/dpaa2_eventdev.c +3 -2
@@ -406,7 +406,8 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |RTE_EVENT_DEV_CAP_NONSEQ_MODE | -RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES ; +RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; }
@@ -536,7 +537,7 @@ dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,DPAA2_EVENT_MAX_PORT_DEQUEUE_DEPTH ; port_conf->enqueue_depth =DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; } static int
drivers/event/dsw/dsw_evdev.c +2 -1
@@ -224,7 +224,8 @@ dsw_info_get(struct rte_eventdev *dev __rte_unused, .event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE|RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |RTE_EVENT_DEV_CAP_NONSEQ_MODE | -RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT +RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID }; }
drivers/event/octeontx/ssovf_evdev.c +3 -2
@@ -152,7 +152,8 @@ ssovf_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *dev_info)RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -RTE_EVENT_DEV_CAP_NONSEQ_MODE ; +RTE_EVENT_DEV_CAP_NONSEQ_MODE | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; }
@@ -218,7 +219,7 @@ ssovf_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, port_conf->new_event_threshold = edev->max_num_events; port_conf->dequeue_depth =1 ; port_conf->enqueue_depth =1 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; } static void
drivers/event/octeontx2/otx2_evdev.c +2 -1
@@ -501,7 +501,8 @@ otx2_sso_info_get(struct rte_eventdev *event_dev,RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -RTE_EVENT_DEV_CAP_NONSEQ_MODE ; +RTE_EVENT_DEV_CAP_NONSEQ_MODE | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; } static void
drivers/event/opdl/opdl_evdev.c +2 -1
@@ -374,7 +374,8 @@ opdl_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info) .max_event_port_dequeue_depth = MAX_OPDL_CONS_Q_DEPTH, .max_event_port_enqueue_depth = MAX_OPDL_CONS_Q_DEPTH, .max_num_events = OPDL_INFLIGHT_EVENTS_TOTAL, - .event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE, + .event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE | + RTE_EVENT_DEV_CAP_CARRY_FLOW_ID, }; *info = evdev_opdl_info;
drivers/event/skeleton/skeleton_eventdev.c +3 -2
@@ -101,7 +101,8 @@ skeleton_eventdev_info_get(struct rte_eventdev *dev, dev_info->max_num_events = (1ULL <<20 ); dev_info->event_dev_cap =RTE_EVENT_DEV_CAP_QUEUE_QOS |RTE_EVENT_DEV_CAP_BURST_MODE | -RTE_EVENT_DEV_CAP_EVENT_QOS ; +RTE_EVENT_DEV_CAP_EVENT_QOS | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; } static int
@@ -209,7 +210,7 @@ skeleton_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, port_conf->new_event_threshold =32 *1024 ; port_conf->dequeue_depth =16 ; port_conf->enqueue_depth =16 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; } static void
drivers/event/sw/sw_evdev.c +5 -3
@@ -175,7 +175,8 @@ sw_port_setup(struct rte_eventdev *dev, uint8_t port_id, } p->inflight_max = conf->new_event_threshold; - p->implicit_release = !conf->disable_implicit_release; + p->implicit_release = !(conf->event_port_cfg & +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL );/* check if ring exists, same as rx_worker above */ snprintf(buf, sizeof(buf), "sw%d_p%u, %s", dev->data->dev_id,
@@ -508,7 +509,7 @@ sw_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, port_conf->new_event_threshold =1024 ; port_conf->dequeue_depth =16 ; port_conf->enqueue_depth =16 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; } static int
@@ -615,7 +616,8 @@ sw_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info)RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE |RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | - RTE_EVENT_DEV_CAP_NONSEQ_MODE), +RTE_EVENT_DEV_CAP_NONSEQ_MODE | + RTE_EVENT_DEV_CAP_CARRY_FLOW_ID), }; *info = evdev_sw_info;
drivers/event/sw/sw_evdev_selftest.c +2 -4
@@ -172,7 +172,6 @@ create_ports(struct test *t, int num_ports) .new_event_threshold = 1024, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (num_ports >MAX_PORTS )return -1 ;
@@ -1227,7 +1226,6 @@ port_reconfig_credits(struct test *t) .new_event_threshold = 128, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (rte_event_port_setup (evdev,0 , &port_conf) <0 ) {printf ("%d Error setting up port\n" , __LINE__);
@@ -1317,7 +1315,6 @@ port_single_lb_reconfig(struct test *t) .new_event_threshold = 128, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (rte_event_port_setup (evdev,0 , &port_conf) <0 ) {printf ("%d Error setting up port\n" , __LINE__);
@@ -3079,7 +3076,8 @@ worker_loopback(struct test *t, uint8_t disable_implicit_release)* only be initialized once - and this needs to be set for multiple runs */ conf.new_event_threshold =512 ; - conf.disable_implicit_release = disable_implicit_release; + conf.event_port_cfg = disable_implicit_release ? +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL :0 ;if (rte_event_port_setup (evdev,0 , &conf) <0 ) {printf ("Error setting up RX port\n" );
lib/librte_eventdev/rte_event_eth_tx_adapter.c +1 -1
@@ -286,7 +286,7 @@ txa_service_conf_cb(uint8_t __rte_unused id, uint8_t dev_id,return ret; } - pc->disable_implicit_release =0 ; + pc->event_port_cfg =0 ; ret =rte_event_port_setup (dev_id, port_id, pc);if (ret) { RTE_EDEV_LOG_ERR("failed to setup event port %u\n",
lib/librte_eventdev/rte_eventdev.c +59 -7
96 lines not on this page · raw message
lib/librte_eventdev/rte_eventdev.h +43 -8
99 lines not on this page · raw message
lib/librte_eventdev/rte_eventdev_pmd_pci.h +0 -1
@@ -88,7 +88,6 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,return -ENXIO ; } -/** * @internal * Wrapper for use by pci drivers as a .remove function to detach a event
lib/librte_eventdev/rte_eventdev_trace.h +4 -3
@@ -34,6 +34,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_u32 (dev_conf->nb_event_port_dequeue_depth);rte_trace_point_emit_u32 (dev_conf->nb_event_port_enqueue_depth);rte_trace_point_emit_u32 (dev_conf->event_dev_cfg); +rte_trace_point_emit_u8 (dev_conf->nb_single_link_event_port_queues);rte_trace_point_emit_int (rc); )
@@ -59,7 +60,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_i32 (port_conf->new_event_threshold);rte_trace_point_emit_u16 (port_conf->dequeue_depth);rte_trace_point_emit_u16 (port_conf->enqueue_depth); -rte_trace_point_emit_u8 (port_conf->disable_implicit_release); +rte_trace_point_emit_u32 (port_conf->event_port_cfg);rte_trace_point_emit_int (rc); )
@@ -165,7 +166,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_i32 (port_conf->new_event_threshold);rte_trace_point_emit_u16 (port_conf->dequeue_depth);rte_trace_point_emit_u16 (port_conf->enqueue_depth); -rte_trace_point_emit_u8 (port_conf->disable_implicit_release); +rte_trace_point_emit_u32 (port_conf->event_port_cfg);rte_trace_point_emit_ptr (conf_cb);rte_trace_point_emit_int (rc); )
@@ -257,7 +258,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_i32 (port_conf->new_event_threshold);rte_trace_point_emit_u16 (port_conf->dequeue_depth);rte_trace_point_emit_u16 (port_conf->enqueue_depth); -rte_trace_point_emit_u8 (port_conf->disable_implicit_release); +rte_trace_point_emit_u32 (port_conf->event_port_cfg); ) RTE_TRACE_POINT(
lib/librte_eventdev/rte_eventdev_version.map +3 -1
@@ -100,7 +100,6 @@ EXPERIMENTAL { # added in 20.05 __rte_eventdev_trace_configure; __rte_eventdev_trace_queue_setup; - __rte_eventdev_trace_port_setup; __rte_eventdev_trace_port_link; __rte_eventdev_trace_port_unlink; __rte_eventdev_trace_start;
@@ -134,4 +133,7 @@ EXPERIMENTAL { __rte_eventdev_trace_crypto_adapter_queue_pair_del; __rte_eventdev_trace_crypto_adapter_start; __rte_eventdev_trace_crypto_adapter_stop; + + # changed in 20.11 + __rte_eventdev_trace_port_setup; };
Signature · 1 line
2.6.4
Re: [dpdk-dev] [PATCH v2 1/2] eventdev: eventdev: express DLB/DLB2 PMD constraints
Quoted 14 lines
-----Original Message-----
From: McDaniel, Timothy <[email protected]>
Sent: Monday, October 5, 2020 9:28 PM
To: Hemant Agrawal <[email protected]>; Nipun Gupta <[email protected]>; Mattias Rönnblom <[email protected]>; Jerin Jacob <[email protected]>; Pavan Nikhilesh <[email protected]>; Ma, Liang J <[email protected]>; Mccarthy, Peter <[email protected]>; Van Haaren, Harry <[email protected]>; Rao, Nikhil <[email protected]>; Ray Kinsella <[email protected]>; Neil Horman <[email protected]>
Cc: [email protected]; Carrillo, Erik G <[email protected]>; Eads, Gage <[email protected]>
Subject: [PATCH v2 1/2] eventdev: eventdev: express DLB/DLB2 PMD constraints
Quoted 5 lines
This commit implements the eventdev ABI changes required by the DLB PMD.
Signed-off-by Timothy McDaniel <[email protected]>---
I think patches 1/2 and 2/2 will have to be merged into a single patch. Reason is that compilation fails after 1/2 because apps/examples access the "disable_implicit_release" field, which is refactored in 1/2.
For review, this split is quite convenient for reviewing - so suggesting we can merge on apply if no changes are required?
<snip>
Quoted 2 lines
drivers/event/sw/sw_evdev.c | 8 ++-- drivers/event/sw/sw_evdev_selftest.c | 6 +--
For SW PMD component and selftests;
Quoted 77 lines
static void
drivers/event/sw/sw_evdev.c +3
-2@@ -175,7 +175,8 @@ sw_port_setup(struct rte_eventdev *dev, uint8_t port_id, } p->inflight_max = conf->new_event_threshold; - p->implicit_release = !conf->disable_implicit_release; + p->implicit_release = !(conf->event_port_cfg & +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL );/* check if ring exists, same as rx_worker above */ snprintf(buf, sizeof(buf), "sw%d_p%u, %s", dev->data->dev_id,@@ -508,7 +509,7 @@ sw_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, port_conf->new_event_threshold =1024 ; port_conf->dequeue_depth =16 ; port_conf->enqueue_depth =16 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; }static int
drivers/event/sw/sw_evdev.c +2
-1@@ -615,7 +616,8 @@ sw_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info) RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE| RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | - RTE_EVENT_DEV_CAP_NONSEQ_MODE), + RTE_EVENT_DEV_CAP_NONSEQ_MODE | + RTE_EVENT_DEV_CAP_CARRY_FLOW_ID), };drivers/event/sw/sw_evdev.c +0
-0*info = evdev_sw_info;drivers/event/sw/sw_evdev_selftest.c +2
-4@@ -172,7 +172,6 @@ create_ports(struct test *t, int num_ports) .new_event_threshold = 1024, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (num_ports >MAX_PORTS )return -1 ;@@ -1227,7 +1226,6 @@ port_reconfig_credits(struct test *t) .new_event_threshold = 128, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (rte_event_port_setup (evdev,0 , &port_conf) <0 ) {printf ("%d Error setting up port\n" , __LINE__);@@ -1317,7 +1315,6 @@ port_single_lb_reconfig(struct test *t) .new_event_threshold = 128, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (rte_event_port_setup (evdev,0 , &port_conf) <0 ) {printf ("%d Error setting up port\n" , __LINE__);@@ -3079,7 +3076,8 @@ worker_loopback(struct test *t, uint8_tdisable_implicit_release) * only be initialized once - and this needs to be set for multiple runs */ conf.new_event_threshold =512 ; - conf.disable_implicit_release = disable_implicit_release; + conf.event_port_cfg = disable_implicit_release ? +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL :0 ;if (rte_event_port_setup (evdev,0 , &conf) <0 ) {
printf("Error setting up RX port\n");
Re: [dpdk-dev] [EXT] [PATCH v2 1/2] eventdev: eventdev: express DLB/DLB2 PMD constraints
In reply to Timothy McDanielQuoted 4 lines
This commit implements the eventdev ABI changes required by the DLB PMD.
Signed-off-by Timothy McDaniel <[email protected]>
For octeontx/octeontx2
Quoted 626 lines
---
drivers/event/dpaa/dpaa_eventdev.c | 3 +- drivers/event/dpaa2/dpaa2_eventdev.c | 5 +- drivers/event/dsw/dsw_evdev.c | 3 +- drivers/event/octeontx/ssovf_evdev.c | 5 +- drivers/event/octeontx2/otx2_evdev.c | 3 +- drivers/event/opdl/opdl_evdev.c | 3 +- drivers/event/skeleton/skeleton_eventdev.c | 5 +- drivers/event/sw/sw_evdev.c | 8 ++-- drivers/event/sw/sw_evdev_selftest.c | 6 +-- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 2 +- lib/librte_eventdev/rte_eventdev.c | 66 +++++++++++++++++++++++--- lib/librte_eventdev/rte_eventdev.h | 51 ++++++++++++++++---- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 1 - lib/librte_eventdev/rte_eventdev_trace.h | 7 +-- lib/librte_eventdev/rte_eventdev_version.map | 4 +- 15 files changed, 134 insertions(+), 38 deletions(-)drivers/event/dpaa/dpaa_eventdev.c +2
-1@@ -355,7 +355,8 @@ dpaa_event_dev_info_get(struct rte_eventdev *dev,RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |RTE_EVENT_DEV_CAP_BURST_MODE |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -RTE_EVENT_DEV_CAP_NONSEQ_MODE ; +RTE_EVENT_DEV_CAP_NONSEQ_MODE | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; }static int
drivers/event/dpaa2/dpaa2_eventdev.c +3
-2@@ -406,7 +406,8 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |RTE_EVENT_DEV_CAP_NONSEQ_MODE | -RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES ; +RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ; }@@ -536,7 +537,7 @@ dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,DPAA2_EVENT_MAX_PORT_DEQUEUE_DEPTH ; port_conf->enqueue_depth =DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; }static int
drivers/event/dsw/dsw_evdev.c +0
-0@@ -224,7 +224,8 @@ dsw_info_get(struct rte_eventdev *dev __rte_unused, .event_dev_cap =RTE_EVENT_DEV_CAP_BURST_MODE|
RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED| RTE_EVENT_DEV_CAP_NONSEQ_MODE|drivers/event/dsw/dsw_evdev.c +2
-1-RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT +RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | +RTE_EVENT_DEV_CAP_CARRY_FLOW_ID }; }drivers/event/octeontx/ssovf_evdev.c +0
-1@@ -152,7 +152,8 @@ ssovf_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *dev_info) RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES| RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -RTE_EVENT_DEV_CAP_NONSEQ_MODE; + RTE_EVENT_DEV_CAP_NONSEQ_MODE | + RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;}
drivers/event/octeontx/ssovf_evdev.c +1
-1@@ -218,7 +219,7 @@ ssovf_port_def_conf(struct rte_eventdev *dev,uint8_t port_id, port_conf->new_event_threshold = edev->max_num_events; port_conf->dequeue_depth =1 ; port_conf->enqueue_depth =1 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; }static void
drivers/event/octeontx2/otx2_evdev.c +0
-1@@ -501,7 +501,8 @@ otx2_sso_info_get(struct rte_eventdev *event_dev,RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -RTE_EVENT_DEV_CAP_NONSEQ_MODE; + RTE_EVENT_DEV_CAP_NONSEQ_MODE | + RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; }static void
drivers/event/opdl/opdl_evdev.c +0
-1@@ -374,7 +374,8 @@ opdl_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info) .max_event_port_dequeue_depth =MAX_OPDL_CONS_Q_DEPTH , .max_event_port_enqueue_depth =MAX_OPDL_CONS_Q_DEPTH , .max_num_events = OPDL_INFLIGHT_EVENTS_TOTAL, - .event_dev_cap =
RTE_EVENT_DEV_CAP_BURST_MODE,drivers/event/opdl/opdl_evdev.c +1
-0+ .event_dev_cap =
RTE_EVENT_DEV_CAP_BURST_MODE|
+RTE_EVENT_DEV_CAP_CARRY_FLOW_ID,}; *info = evdev_opdl_info;drivers/event/skeleton/skeleton_eventdev.c +0
-0@@ -101,7 +101,8 @@ skeleton_eventdev_info_get(struct rte_eventdev *dev, dev_info->max_num_events = (1ULL <<20 ); dev_info->event_dev_cap =
RTE_EVENT_DEV_CAP_QUEUE_QOS|
RTE_EVENT_DEV_CAP_BURST_MODE|
-RTE_EVENT_DEV_CAP_EVENT_QOS; + RTE_EVENT_DEV_CAP_EVENT_QOS | + RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; }static int
drivers/event/skeleton/skeleton_eventdev.c +1
-1@@ -209,7 +210,7 @@ skeleton_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id, port_conf->new_event_threshold = 32 * 1024; port_conf->dequeue_depth =16 ; port_conf->enqueue_depth =16 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; }static void
drivers/event/sw/sw_evdev.c +2
-1@@ -175,7 +175,8 @@ sw_port_setup(struct rte_eventdev *dev, uint8_t port_id, } p->inflight_max = conf->new_event_threshold; - p->implicit_release = !conf->disable_implicit_release; + p->implicit_release = !(conf->event_port_cfg & +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL );/* check if ring exists, same as rx_worker above */ snprintf(buf, sizeof(buf), "sw%d_p%u, %s", dev->data->dev_id,drivers/event/sw/sw_evdev.c +1
-1@@ -508,7 +509,7 @@ sw_port_def_conf(struct rte_eventdev *dev,uint8_t port_id, port_conf->new_event_threshold = 1024; port_conf->dequeue_depth =16 ; port_conf->enqueue_depth =16 ; - port_conf->disable_implicit_release =0 ; + port_conf->event_port_cfg =0 ; }static int
drivers/event/sw/sw_evdev.c +0
-1@@ -615,7 +616,8 @@ sw_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info) RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE| RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -
RTE_EVENT_DEV_CAP_NONSEQ_MODE),drivers/event/sw/sw_evdev.c +1
-0+RTE_EVENT_DEV_CAP_NONSEQ_MODE |
+RTE_EVENT_DEV_CAP_CARRY_FLOW_ID), }; *info = evdev_sw_info;drivers/event/sw/sw_evdev_selftest.c +0
-3@@ -172,7 +172,6 @@ create_ports(struct test *t, int num_ports) .new_event_threshold = 1024, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (num_ports >MAX_PORTS )return -1 ;@@ -1227,7 +1226,6 @@ port_reconfig_credits(struct test *t) .new_event_threshold = 128, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (rte_event_port_setup (evdev,0 , &port_conf) <0 ) {printf ("%d Error setting up port\n" , __LINE__);@@ -1317,7 +1315,6 @@ port_single_lb_reconfig(struct test *t) .new_event_threshold = 128, .dequeue_depth = 32, .enqueue_depth = 64, - .disable_implicit_release = 0, };if (rte_event_port_setup (evdev,0 , &port_conf) <0 ) {printf ("%d Error setting up port\n" , __LINE__);@@ -3079,7 +3076,8 @@ worker_loopback(struct test *t, uint8_t disable_implicit_release) * only be initialized once - and this needs to be set for multipleruns
*/ conf.new_event_threshold = 512;drivers/event/sw/sw_evdev_selftest.c +2
-1- conf.disable_implicit_release = disable_implicit_release; + conf.event_port_cfg = disable_implicit_release ? +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL :0 ;if (rte_event_port_setup(evdev, 0, &conf) < 0) { printf("Error setting up RX port\n");lib/librte_eventdev/rte_event_eth_tx_adapter.c +1
-1@@ -286,7 +286,7 @@ txa_service_conf_cb(uint8_t __rte_unused id,uint8_t dev_id, return ret; } - pc->disable_implicit_release =0 ; + pc->event_port_cfg =0 ; ret =rte_event_port_setup (dev_id, port_id, pc);if (ret) {RTE_EDEV_LOG_ERR("failed to setup event port %u\n",
lib/librte_eventdev/rte_eventdev.c +4
-3@@ -32,6 +32,7 @@#include <rte_ethdev.h> #include <rte_cryptodev.h> #include <rte_cryptodev_pmd.h> +#include <rte_compat.h> #include "rte_eventdev.h" #include "rte_eventdev_pmd.h" @@ -437,9 +438,29 @@ rte_event_dev_configure(uint8_t dev_id, dev_id);return -EINVAL ; } -if (dev_conf->nb_event_queues > info.max_event_queues) { -RTE_EDEV_LOG_ERR ("%d nb_event_queues=%d > max_event_queues=%d", - dev_id, dev_conf->nb_event_queues, info.max_event_queues); +if (dev_conf->nb_event_queues > info.max_event_queues + + info.max_single_link_event_port_queue_pairs) { + RTE_EDEV_LOG_ERR("%d nb_event_queues=%d >max_event_queues=%d +
max_single_link_event_port_queue_pairs=%d",lib/librte_eventdev/rte_eventdev.c +3
-0+ dev_id, dev_conf->nb_event_queues, + info.max_event_queues, +info.max_single_link_event_port_queue_pairs);
lib/librte_eventdev/rte_eventdev.c +6
-0+return -EINVAL ; + } +if (dev_conf->nb_event_queues - + dev_conf->nb_single_link_event_port_queues > + info.max_event_queues) { + RTE_EDEV_LOG_ERR("id%d nb_event_queues=%d -nb_single_link_event_port_queues=%d > max_event_queues=%d",
lib/librte_eventdev/rte_eventdev.c +2
-0+ dev_id, dev_conf->nb_event_queues, + dev_conf-Quoted 1 line
nb_single_link_event_port_queues,lib/librte_eventdev/rte_eventdev.c +6
-0+ info.max_event_queues); +return -EINVAL ; + } +if (dev_conf->nb_single_link_event_port_queues > + dev_conf->nb_event_queues) { + RTE_EDEV_LOG_ERR("dev%dnb_single_link_event_port_queues=%d > nb_event_queues=%d",
lib/librte_eventdev/rte_eventdev.c +2
-0+ dev_id, + dev_conf-Quoted 1 line
nb_single_link_event_port_queues,lib/librte_eventdev/rte_eventdev.c +1
-0+ dev_conf->nb_event_queues);return -EINVAL; }lib/librte_eventdev/rte_eventdev.c +2
-3@@ -448,9 +469,31 @@ rte_event_dev_configure(uint8_t dev_id, RTE_EDEV_LOG_ERR("dev%d nb_event_ports cannot be zero", dev_id); return -EINVAL; } -if (dev_conf->nb_event_ports > info.max_event_ports) { -RTE_EDEV_LOG_ERR ("id%d nb_event_ports=%d > max_event_ports= %d", - dev_id, dev_conf->nb_event_ports, info.max_event_ports); +if (dev_conf->nb_event_ports > info.max_event_ports + + info.max_single_link_event_port_queue_pairs){
lib/librte_eventdev/rte_eventdev.c +1
-0+ RTE_EDEV_LOG_ERR("id%d nb_event_ports=%d >max_event_ports=%d + max_single_link_event_port_queue_pairs=%d",
lib/librte_eventdev/rte_eventdev.c +3
-0+ dev_id, dev_conf->nb_event_ports, + info.max_event_ports, +info.max_single_link_event_port_queue_pairs);
lib/librte_eventdev/rte_eventdev.c +6
-0+return -EINVAL ; + } +if (dev_conf->nb_event_ports - + dev_conf->nb_single_link_event_port_queues + > info.max_event_ports) { + RTE_EDEV_LOG_ERR("id%d nb_event_ports=%d -nb_single_link_event_port_queues=%d > max_event_ports=%d",
lib/librte_eventdev/rte_eventdev.c +2
-0+ dev_id, dev_conf->nb_event_ports, + dev_conf-Quoted 1 line
nb_single_link_event_port_queues,lib/librte_eventdev/rte_eventdev.c +8
-0+ info.max_event_ports); +return -EINVAL ; + } + +if (dev_conf->nb_single_link_event_port_queues > + dev_conf->nb_event_ports) { + RTE_EDEV_LOG_ERR( + "dev%dnb_single_link_event_port_queues=%d > nb_event_ports=%d",
lib/librte_eventdev/rte_eventdev.c +2
-0+ dev_id, + dev_conf-Quoted 1 line
nb_single_link_event_port_queues,lib/librte_eventdev/rte_eventdev.c +1
-0+ dev_conf->nb_event_ports);return -EINVAL; }lib/librte_eventdev/rte_eventdev.c +2
-1@@ -737,7 +780,8 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id, return -EINVAL ; } - if (port_conf && port_conf->disable_implicit_release && + if (port_conf && + (port_conf->event_port_cfg &
RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL) &&!(dev->data->event_dev_cap & RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE)) { RTE_EDEV_LOG_ERR(lib/librte_eventdev/rte_eventdev.c +6
-0@@ -830,6 +874,14 @@ rte_event_port_attr_get(uint8_t dev_id, uint8_t port_id, uint32_t attr_id, case RTE_EVENT_PORT_ATTR_NEW_EVENT_THRESHOLD: *attr_value = dev->data- >ports_cfg[port_id].new_event_threshold;break ; +case RTE_EVENT_PORT_ATTR_IMPLICIT_RELEASE_DISABLE : + { +uint32_t config; + + config = dev->data- >ports_cfg[port_id].event_port_cfg; + *attr_value = !!(config &
RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL);lib/librte_eventdev/rte_eventdev.c +2
-0+break ; + }default: return -EINVAL; };lib/librte_eventdev/rte_eventdev.h +8
-0@@ -291,6 +291,12 @@ struct rte_event;* single queue to each port or map a single queue to many port. */ +#define RTE_EVENT_DEV_CAP_CARRY_FLOW_ID (1ULL << 9) +/**< Event device preserves the flow ID from the enqueued +* event to the dequeued event if the flag is set. Otherwise, +* the content of this field is implementation dependent. +*/ +/* Event device priority levels */ #define RTE_EVENT_DEV_PRIORITY_HIGHEST 0/**< Highest priority expressed across eventdev subsystem @@ -380,6 +386,10 @@ struct rte_event_dev_info {* event port by this device. * A device that does not support bulk enqueue will set this as 1. */ +uint8_t max_event_port_links; +/**< Maximum number of queues that can be linked to a single event
lib/librte_eventdev/rte_eventdev.h +2
-0+* port by this device. +*/ int32_t max_num_events; /**< A *closed system* event dev has a limit on the number ofevents it
* can manage at a time. An *open system* event dev does not
have alib/librte_eventdev/rte_eventdev.h +2
-0@@ -387,6 +397,12 @@ struct rte_event_dev_info {*/ uint32_t event_dev_cap;/**< Event device capabilities(RTE_EVENT_DEV_CAP_)*/ +uint8_t max_single_link_event_port_queue_pairs; +/**< Maximum number of event ports and queues that are optimized for
lib/librte_eventdev/rte_eventdev.h +1
-0+* (and only capable of) single-link configurations supported by this
lib/librte_eventdev/rte_eventdev.h +3
-0+* device. These ports and queues are not accounted for in +* max_event_ports or max_event_queues. +*/ };
/**
lib/librte_eventdev/rte_eventdev.h +2
-0@@ -494,6 +510,14 @@ struct rte_event_dev_config {*/ uint32_t event_dev_cfg;/**< Event device config flags(RTE_EVENT_DEV_CFG_)*/ +uint8_t nb_single_link_event_port_queues; +/**< Number of event ports and queues that will be singly- linked to
lib/librte_eventdev/rte_eventdev.h +3
-0+* each other. These are a subset of the overall event ports and +* queues; this value cannot exceed *nb_event_ports* or +* *nb_event_queues*. If the device has ports and queues that are
lib/librte_eventdev/rte_eventdev.h +1
-0+* optimized for single-link usage, this field is a hint for how many
lib/librte_eventdev/rte_eventdev.h +1
-0+* to allocate; otherwise, regular event ports and queues can be used.
lib/librte_eventdev/rte_eventdev.h +1
-0+*/ };
/**
lib/librte_eventdev/rte_eventdev.h +5
-1@@ -519,7 +543,6 @@ int rte_event_dev_configure(uint8_t dev_id, const struct rte_event_dev_config *dev_conf); -/* Event queue specific APIs */ /* Event queue configuration bitmap flags */ @@ -671,6 +694,20 @@ rte_event_queue_attr_get(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id,/* Event port specific APIs */ +/* Event port configuration bitmap flags */ +#define RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL (1ULL << 0) +/**< Configure the port not to release outstanding events in +* rte_event_dev_dequeue_burst(). If set, all events received through +* the port must be explicitly released with RTE_EVENT_OP_RELEASE or
+ *RTE_EVENT_OP_FORWARD. Must be unset if the device is not
+ *RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLEcapable.
+ */lib/librte_eventdev/rte_eventdev.h +6
-0+#define RTE_EVENT_PORT_CFG_SINGLE_LINK (1ULL << 1) +/**< This event port links only to a single event queue. +* +* @see rte_event_port_setup(), rte_event_port_link() +*/ +/** Event port configuration structure */
struct rte_event_port_conf { int32_t new_event_threshold;lib/librte_eventdev/rte_eventdev.h +0
-0@@ -698,13 +735,7 @@ struct rte_event_port_conf {* which previously supplied to rte_event_dev_configure(). * Ignored when device is not
RTE_EVENT_DEV_CAP_BURST_MODEcapable.*/lib/librte_eventdev/rte_eventdev.h +0
-3-uint8_t disable_implicit_release; -/**< Configure the port not to release outstanding events in -* rte_event_dev_dequeue_burst(). If true, all events received through
lib/librte_eventdev/rte_eventdev.h +0
-1-* the port must be explicitly released with
RTE_EVENT_OP_RELEASEorlib/librte_eventdev/rte_eventdev.h +0
-1-* RTE_EVENT_OP_FORWARD. Must be false when the device is not
lib/librte_eventdev/rte_eventdev.h +1
-2-* RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE capable. -*/ +uint32_t event_port_cfg;/**< Port cfg
flags(EVENT_PORT_CFG_)*/
};/**
lib/librte_eventdev/rte_eventdev.h +4
-0@@ -769,6 +800,10 @@ rte_event_port_setup(uint8_t dev_id, uint8_tport_id, * The new event threshold of the port */ #define RTE_EVENT_PORT_ATTR_NEW_EVENT_THRESHOLD 2 +/** +* The implicit release disable attribute of the port +*/ +#define RTE_EVENT_PORT_ATTR_IMPLICIT_RELEASE_DISABLE 3/** * Get an attribute from a port.
lib/librte_eventdev/rte_eventdev_pmd_pci.h +0
-1@@ -88,7 +88,6 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv, return -ENXIO ; } -/** * @internal * Wrapper for use by pci drivers as a .remove function to detach a
eventlib/librte_eventdev/rte_eventdev_trace.h +1
-0@@ -34,6 +34,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_u32 (dev_conf- >nb_event_port_dequeue_depth);rte_trace_point_emit_u32 (dev_conf- >nb_event_port_enqueue_depth);rte_trace_point_emit_u32 (dev_conf->event_dev_cfg); +rte_trace_point_emit_u8 (dev_conf- >nb_single_link_event_port_queues);rte_trace_point_emit_int(rc);)
lib/librte_eventdev/rte_eventdev_trace.h +3
-3@@ -59,7 +60,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_i32 (port_conf->new_event_threshold);rte_trace_point_emit_u16 (port_conf->dequeue_depth);rte_trace_point_emit_u16 (port_conf->enqueue_depth); -rte_trace_point_emit_u8 (port_conf->disable_implicit_release); +rte_trace_point_emit_u32 (port_conf->event_port_cfg);rte_trace_point_emit_int (rc); )@@ -165,7 +166,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_i32 (port_conf->new_event_threshold);rte_trace_point_emit_u16 (port_conf->dequeue_depth);rte_trace_point_emit_u16 (port_conf->enqueue_depth); -rte_trace_point_emit_u8 (port_conf->disable_implicit_release); +rte_trace_point_emit_u32 (port_conf->event_port_cfg);rte_trace_point_emit_ptr (conf_cb);rte_trace_point_emit_int (rc); )@@ -257,7 +258,7 @@ RTE_TRACE_POINT(rte_trace_point_emit_i32 (port_conf->new_event_threshold);rte_trace_point_emit_u16 (port_conf->dequeue_depth);rte_trace_point_emit_u16 (port_conf->enqueue_depth); -rte_trace_point_emit_u8 (port_conf->disable_implicit_release); +rte_trace_point_emit_u32 (port_conf->event_port_cfg); )RTE_TRACE_POINT(
lib/librte_eventdev/rte_eventdev_version.map +3
-2@@ -100,7 +100,6 @@ EXPERIMENTAL { # added in 20.05 __rte_eventdev_trace_configure; __rte_eventdev_trace_queue_setup; - __rte_eventdev_trace_port_setup; __rte_eventdev_trace_port_link; __rte_eventdev_trace_port_unlink; __rte_eventdev_trace_start;@@ -134,4 +133,7 @@ EXPERIMENTAL { __rte_eventdev_trace_crypto_adapter_queue_pair_del; __rte_eventdev_trace_crypto_adapter_start; __rte_eventdev_trace_crypto_adapter_stop; + + # changed in 20.11 + __rte_eventdev_trace_port_setup; }; --2.6.4
PATCH v2 2/2 eventdev: update app and examples for new eventdev ABI
In reply to Timothy McDanielSeveral data structures and constants changed, or were added, in the previous patch. This commit updates the dependent apps and examples to use the new ABI.
--- app/test-eventdev/evt_common.h | 11 ++++++++ app/test-eventdev/test_order_atq.c | 28 +++++++++++++++------ app/test-eventdev/test_order_common.c | 1 + app/test-eventdev/test_order_queue.c | 29 ++++++++++++++++------ app/test/test_eventdev.c | 4 +-- .../eventdev_pipeline/pipeline_worker_generic.c | 6 +++-- examples/eventdev_pipeline/pipeline_worker_tx.c | 1 + examples/l2fwd-event/l2fwd_event_generic.c | 7 ++++-- examples/l2fwd-event/l2fwd_event_internal_port.c | 6 +++-- examples/l3fwd/l3fwd_event_generic.c | 7 ++++-- examples/l3fwd/l3fwd_event_internal_port.c | 6 +++-- 11 files changed, 80 insertions(+), 26 deletions(-)
app/test-eventdev/evt_common.h +11 -0
@@ -104,6 +104,16 @@ evt_has_all_types_queue(uint8_t dev_id) true : false; } +static inline bool +evt_has_flow_id (uint8_t dev_id) +{ +struct rte_event_dev_info dev_info; + +rte_event_dev_info_get (dev_id, &dev_info); +return (dev_info.event_dev_cap &RTE_EVENT_DEV_CAP_CARRY_FLOW_ID ) ? + true : false; +} +static inline int evt_service_setup (uint32_t service_id) {
@@ -169,6 +179,7 @@ evt_configure_eventdev(struct evt_options *opt, uint8_t nb_queues, .dequeue_timeout_ns = opt->deq_tmo_nsec, .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues = 0, .nb_events_limit = info.max_num_events, .nb_event_queue_flows = opt->nb_flows, .nb_event_port_dequeue_depth =
app/test-eventdev/test_order_atq.c +21 -7
@@ -19,7 +19,7 @@ order_atq_process_stage_0(struct rte_event *const ev) }static int -order_atq_worker (void *arg) +order_atq_worker (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev;
@@ -34,6 +34,9 @@ order_atq_worker(void *arg)continue ; } +if (!flow_id_cap) + ev.flow_id = ev.mbuf->udata64; +if (ev.sub_event_type ==0 ) {/* stage 0 from producer */ order_atq_process_stage_0 (&ev); while (rte_event_enqueue_burst(dev_id, port, &ev, 1)
@@ -50,7 +53,7 @@ order_atq_worker(void *arg) }static int -order_atq_worker_burst (void *arg) +order_atq_worker_burst (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev[BURST_SIZE ];
@@ -68,6 +71,9 @@ order_atq_worker_burst(void *arg) }for (i =0 ; i < nb_rx; i++) { +if (!flow_id_cap) + ev[i].flow_id = ev[i].mbuf->udata64; +if (ev[i].sub_event_type ==0 ) {/*stage 0 */ order_atq_process_stage_0 (&ev[i]); }else if (ev[i].sub_event_type ==1 ) {/* stage 1 */
@@ -95,11 +101,19 @@ worker_wrapper(void *arg) {struct worker_data *w = arg;const bool burst =evt_has_burst_mode (w->dev_id); - -if (burst) -return order_atq_worker_burst (arg); -else -return order_atq_worker (arg); +const bool flow_id_cap =evt_has_flow_id (w->dev_id); + +if (burst) { +if (flow_id_cap) +return order_atq_worker_burst (arg, true); +else +return order_atq_worker_burst (arg, false); + }else { +if (flow_id_cap) +return order_atq_worker (arg, true); +else +return order_atq_worker (arg, false); + } } static int
app/test-eventdev/test_order_common.c +1 -0
@@ -49,6 +49,7 @@ order_producer(void *arg)const uint32_t flow = (uintptr_t )m % nb_flows;/* Maintain seq number per flow */ m->seqn = producer_flow_seq[flow]++; + m->udata64 = flow; ev.flow_id = flow; ev.mbuf = m;
app/test-eventdev/test_order_queue.c +22 -7
@@ -19,7 +19,7 @@ order_queue_process_stage_0(struct rte_event *const ev) }static int -order_queue_worker (void *arg) +order_queue_worker (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev;
@@ -34,6 +34,9 @@ order_queue_worker(void *arg)continue ; } +if (!flow_id_cap) + ev.flow_id = ev.mbuf->udata64; +if (ev.queue_id ==0 ) {/* from ordered queue */ order_queue_process_stage_0 (&ev); while (rte_event_enqueue_burst(dev_id, port, &ev, 1)
@@ -50,7 +53,7 @@ order_queue_worker(void *arg) }static int -order_queue_worker_burst (void *arg) +order_queue_worker_burst (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev[BURST_SIZE ];
@@ -68,6 +71,10 @@ order_queue_worker_burst(void *arg) }for (i =0 ; i < nb_rx; i++) { + +if (!flow_id_cap) + ev[i].flow_id = ev[i].mbuf->udata64; +if (ev[i].queue_id ==0 ) {/* from ordered queue */ order_queue_process_stage_0 (&ev[i]); }else if (ev[i].queue_id ==1 ) {/* from atomic queue */
@@ -95,11 +102,19 @@ worker_wrapper(void *arg) {struct worker_data *w = arg;const bool burst =evt_has_burst_mode (w->dev_id); - -if (burst) -return order_queue_worker_burst (arg); -else -return order_queue_worker (arg); +const bool flow_id_cap =evt_has_flow_id (w->dev_id); + +if (burst) { +if (flow_id_cap) +return order_queue_worker_burst (arg, true); +else +return order_queue_worker_burst (arg, false); + }else { +if (flow_id_cap) +return order_queue_worker (arg, true); +else +return order_queue_worker (arg, false); + } } static int
app/test/test_eventdev.c +2 -2
@@ -559,10 +559,10 @@ test_eventdev_port_setup(void)if (!(info.event_dev_cap &RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE )) { pconf.enqueue_depth = info.max_event_port_enqueue_depth; - pconf.disable_implicit_release =1 ; + pconf.event_port_cfg =RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; ret =rte_event_port_setup (TEST_DEV_ID ,0 , &pconf);TEST_ASSERT (ret == -EINVAL ,"Expected -EINVAL, %d" , ret); - pconf.disable_implicit_release =0 ; + pconf.event_port_cfg =0 ; } ret = rte_event_port_setup(TEST_DEV_ID, info.max_event_ports,
examples/eventdev_pipeline/pipeline_worker_generic.c +4 -2
@@ -129,6 +129,7 @@ setup_eventdev_generic(struct worker_data *worker_data)struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues =1 , .nb_events_limit =4096 , .nb_event_queue_flows =1024 , .nb_event_port_dequeue_depth =128 ,
@@ -143,7 +144,7 @@ setup_eventdev_generic(struct worker_data *worker_data) .schedule_type = cdata.queue_type, .priority = RTE_EVENT_DEV_PRIORITY_NORMAL, .nb_atomic_flows = 1024, - .nb_atomic_order_sequences = 1024, + .nb_atomic_order_sequences = 1024, };struct rte_event_queue_conf tx_q_conf = { .priority =RTE_EVENT_DEV_PRIORITY_HIGHEST ,
@@ -167,7 +168,8 @@ setup_eventdev_generic(struct worker_data *worker_data) disable_implicit_release = (dev_info.event_dev_cap &RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE ); - wkr_p_conf.disable_implicit_release = disable_implicit_release; + wkr_p_conf.event_port_cfg = disable_implicit_release ? +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL :0 ;if (dev_info.max_num_events < config.nb_events_limit) config.nb_events_limit = dev_info.max_num_events;
examples/eventdev_pipeline/pipeline_worker_tx.c +1 -0
@@ -436,6 +436,7 @@ setup_eventdev_worker_tx_enq(struct worker_data *worker_data)struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues =0 , .nb_events_limit =4096 , .nb_event_queue_flows =1024 , .nb_event_port_dequeue_depth =128 ,
examples/l2fwd-event/l2fwd_event_generic.c +5 -2
@@ -126,8 +126,11 @@ l2fwd_event_port_setup_generic(struct l2fwd_resources *rsrc)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; + evt_rsrc->deq_depth = def_p_conf.dequeue_depth; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;
examples/l2fwd-event/l2fwd_event_internal_port.c +4 -2
@@ -123,8 +123,10 @@ l2fwd_event_port_setup_internal_port(struct l2fwd_resources *rsrc)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ;for (event_p_id =0 ; event_p_id < evt_rsrc->evp.nb_ports; event_p_id++) {
examples/l3fwd/l3fwd_event_generic.c +5 -2
@@ -115,8 +115,11 @@ l3fwd_event_port_setup_generic(void)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; + evt_rsrc->deq_depth = def_p_conf.dequeue_depth; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;
examples/l3fwd/l3fwd_event_internal_port.c +4 -2
@@ -113,8 +113,10 @@ l3fwd_event_port_setup_internal_port(void)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ;for (event_p_id =0 ; event_p_id < evt_rsrc->evp.nb_ports; event_p_id++) {
Signature · 1 line
2.6.4
Re: [dpdk-dev] [PATCH v2 2/2] eventdev: update app and examples for new eventdev ABI
Quoted 14 lines
-----Original Message-----
From: McDaniel, Timothy <[email protected]>
Sent: Monday, October 5, 2020 9:28 PM
To: Jerin Jacob <[email protected]>; Van Haaren, Harry <[email protected]>; Kovacevic, Marko <[email protected]>; Ori Kam <[email protected]>; Richardson, Bruce <[email protected]>; Nicolau, Radu <[email protected]>; Akhil Goyal <[email protected]>; Kantecki, Tomasz <[email protected]>; Sunil Kumar Kori <[email protected]>; Pavan Nikhilesh <[email protected]>
Cc: [email protected]; Carrillo, Erik G <[email protected]>; Eads, Gage <[email protected]>; [email protected]
Subject: [PATCH v2 2/2] eventdev: update app and examples for new eventdev ABI
Quoted 6 lines
Several data structures and constants changed, or were added, in the previous patch. This commit updates the dependent apps and examples to use the new ABI.
Signed-off-by Timothy McDaniel <[email protected]>---
With this patch applied, the compilation works fine, however runtime fails. Note that there is a dependency to the following fix which Timothy upstreamed:
http://patches.dpdk.org/patch/79713/
The above linked patch increases the CTF trace size, and fixes the following error:
./dpdk-test
EAL: __rte_trace_point_emit_field():442 CTF field is too long
EAL: __rte_trace_point_register():468 missing rte_trace_emit_header() in register fn
Quoted 336 lines
app/test-eventdev/evt_common.h | 11 ++++++++ app/test-eventdev/test_order_atq.c | 28 +++++++++++++++------ app/test-eventdev/test_order_common.c | 1 + app/test-eventdev/test_order_queue.c | 29 ++++++++++++++++------ app/test/test_eventdev.c | 4 +-- .../eventdev_pipeline/pipeline_worker_generic.c | 6 +++-- examples/eventdev_pipeline/pipeline_worker_tx.c | 1 + examples/l2fwd-event/l2fwd_event_generic.c | 7 ++++-- examples/l2fwd-event/l2fwd_event_internal_port.c | 6 +++-- examples/l3fwd/l3fwd_event_generic.c | 7 ++++-- examples/l3fwd/l3fwd_event_internal_port.c | 6 +++-- 11 files changed, 80 insertions(+), 26 deletions(-)app/test-eventdev/evt_common.h +7
-0@@ -104,6 +104,16 @@ evt_has_all_types_queue(uint8_t dev_id) true : false; } +static inline bool +evt_has_flow_id (uint8_t dev_id) +{ +struct rte_event_dev_info dev_info; + +rte_event_dev_info_get (dev_id, &dev_info); + return (dev_info.event_dev_cap &
RTE_EVENT_DEV_CAP_CARRY_FLOW_ID) ?app/test-eventdev/evt_common.h +4
-0+ true : false; +} +static inline int evt_service_setup (uint32_t service_id) {@@ -169,6 +179,7 @@ evt_configure_eventdev(struct evt_options *opt, uint8_t nb_queues, .dequeue_timeout_ns = opt->deq_tmo_nsec, .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues = 0, .nb_events_limit = info.max_num_events, .nb_event_queue_flows = opt->nb_flows,app/test-eventdev/evt_common.h +0
-0.nb_event_port_dequeue_depth =app/test- renamed from app/test-eventdev/test_order_atq.c +0
-0
eventdev/test_order_atq.c
index 3366cfc..cfcb1dc 100644app/test-eventdev/test_order_atq.c +21
-7@@ -19,7 +19,7 @@ order_atq_process_stage_0(struct rte_event *const ev) }static int -order_atq_worker (void *arg) +order_atq_worker (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev;@@ -34,6 +34,9 @@ order_atq_worker(void *arg)continue ; } +if (!flow_id_cap) + ev.flow_id = ev.mbuf->udata64; +if (ev.sub_event_type ==0 ) {/* stage 0 from producer */ order_atq_process_stage_0 (&ev); while (rte_event_enqueue_burst(dev_id, port, &ev, 1)@@ -50,7 +53,7 @@ order_atq_worker(void *arg) }static int -order_atq_worker_burst (void *arg) +order_atq_worker_burst (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev[BURST_SIZE ];@@ -68,6 +71,9 @@ order_atq_worker_burst(void *arg) }for (i =0 ; i < nb_rx; i++) { +if (!flow_id_cap) + ev[i].flow_id = ev[i].mbuf->udata64; +if (ev[i].sub_event_type ==0 ) {/*stage 0 */ order_atq_process_stage_0 (&ev[i]); }else if (ev[i].sub_event_type ==1 ) {/* stage 1 */ @@ -95,11 +101,19 @@ worker_wrapper(void *arg) {struct worker_data *w = arg;const bool burst =evt_has_burst_mode (w->dev_id); - -if (burst) -return order_atq_worker_burst (arg); -else -return order_atq_worker (arg); +const bool flow_id_cap =evt_has_flow_id (w->dev_id); + +if (burst) { +if (flow_id_cap) +return order_atq_worker_burst (arg, true); +else +return order_atq_worker_burst (arg, false); + }else { +if (flow_id_cap) +return order_atq_worker (arg, true); +else +return order_atq_worker (arg, false); + } } static intapp/test- renamed from app/test-eventdev/test_order_common.c +0
-0
eventdev/test_order_common.c
index 4190f9a..7942390 100644app/test-eventdev/test_order_common.c +1
-0@@ -49,6 +49,7 @@ order_producer(void *arg)const uint32_t flow = (uintptr_t )m % nb_flows;/* Maintain seq number per flow */ m->seqn = producer_flow_seq[flow]++; + m->udata64 = flow; ev.flow_id = flow; ev.mbuf = m;app/test- renamed from app/test-eventdev/test_order_queue.c +0
-0
eventdev/test_order_queue.c
index 495efd9..1511c00 100644app/test-eventdev/test_order_queue.c +22
-7@@ -19,7 +19,7 @@ order_queue_process_stage_0(struct rte_event *const ev) }static int -order_queue_worker (void *arg) +order_queue_worker (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev;@@ -34,6 +34,9 @@ order_queue_worker(void *arg)continue ; } +if (!flow_id_cap) + ev.flow_id = ev.mbuf->udata64; +if (ev.queue_id ==0 ) {/* from ordered queue */ order_queue_process_stage_0 (&ev); while (rte_event_enqueue_burst(dev_id, port, &ev, 1)@@ -50,7 +53,7 @@ order_queue_worker(void *arg) }static int -order_queue_worker_burst (void *arg) +order_queue_worker_burst (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev[BURST_SIZE ];@@ -68,6 +71,10 @@ order_queue_worker_burst(void *arg) }for (i =0 ; i < nb_rx; i++) { + +if (!flow_id_cap) + ev[i].flow_id = ev[i].mbuf->udata64; +if (ev[i].queue_id ==0 ) {/* from ordered queue */ order_queue_process_stage_0 (&ev[i]); }else if (ev[i].queue_id ==1 ) {/* from atomic queue */ @@ -95,11 +102,19 @@ worker_wrapper(void *arg) {struct worker_data *w = arg;const bool burst =evt_has_burst_mode (w->dev_id); - -if (burst) -return order_queue_worker_burst (arg); -else -return order_queue_worker (arg); +const bool flow_id_cap =evt_has_flow_id (w->dev_id); + +if (burst) { +if (flow_id_cap) +return order_queue_worker_burst (arg, true); +else +return order_queue_worker_burst (arg, false); + }else { +if (flow_id_cap) +return order_queue_worker (arg, true); +else +return order_queue_worker (arg, false); + } } static intapp/test/test_eventdev.c +2
-2@@ -559,10 +559,10 @@ test_eventdev_port_setup(void)if (!(info.event_dev_cap &RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE )) { pconf.enqueue_depth = info.max_event_port_enqueue_depth; - pconf.disable_implicit_release =1 ; + pconf.event_port_cfg =RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; ret =rte_event_port_setup (TEST_DEV_ID ,0 , &pconf);TEST_ASSERT (ret == -EINVAL ,"Expected -EINVAL, %d" , ret); - pconf.disable_implicit_release =0 ; + pconf.event_port_cfg =0 ; }app/test/test_eventdev.c +0
-0ret = rte_event_port_setup(TEST_DEV_ID, info.max_event_ports,examples/eventdev_pipeline/pipeline_worker_generic.c +4
-2@@ -129,6 +129,7 @@ setup_eventdev_generic(struct worker_data *worker_data)struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues =1 , .nb_events_limit =4096 , .nb_event_queue_flows =1024 , .nb_event_port_dequeue_depth =128 ,@@ -143,7 +144,7 @@ setup_eventdev_generic(struct worker_data *worker_data) .schedule_type = cdata.queue_type, .priority = RTE_EVENT_DEV_PRIORITY_NORMAL, .nb_atomic_flows = 1024, - .nb_atomic_order_sequences = 1024, + .nb_atomic_order_sequences = 1024, };struct rte_event_queue_conf tx_q_conf = { .priority =RTE_EVENT_DEV_PRIORITY_HIGHEST ,@@ -167,7 +168,8 @@ setup_eventdev_generic(struct worker_data *worker_data) disable_implicit_release = (dev_info.event_dev_cap &RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE ); - wkr_p_conf.disable_implicit_release = disable_implicit_release; + wkr_p_conf.event_port_cfg = disable_implicit_release ? +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL :0 ;if (dev_info.max_num_events < config.nb_events_limit) config.nb_events_limit = dev_info.max_num_events;examples/eventdev_pipeline/pipeline_worker_tx.c +1
-0@@ -436,6 +436,7 @@ setup_eventdev_worker_tx_enq(struct worker_data *worker_data)struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues =0 , .nb_events_limit =4096 , .nb_event_queue_flows =1024 ,examples/eventdev_pipeline/pipeline_worker_tx.c +0
-0.nb_event_port_dequeue_depth = 128,examples/l2fwd- renamed from examples/l2fwd-event/l2fwd_event_generic.c +0
-0
event/l2fwd_event_generic.c
index 2dc95e5..9a3167c 100644examples/l2fwd-event/l2fwd_event_generic.c +5
-2@@ -126,8 +126,11 @@ l2fwd_event_port_setup_generic(struct l2fwd_resources *rsrc)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; + evt_rsrc->deq_depth = def_p_conf.dequeue_depth;examples/l2fwd-event/l2fwd_event_generic.c +0
-0for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;examples/l2fwd- renamed from examples/l2fwd-event/l2fwd_event_internal_port.c +0
-0
event/l2fwd_event_internal_port.c
index 63d57b4..203a14c 100644examples/l2fwd-event/l2fwd_event_internal_port.c +4
-2@@ -123,8 +123,10 @@ l2fwd_event_port_setup_internal_port(struct l2fwd_resources *rsrc)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;examples/l2fwd-event/l2fwd_event_internal_port.c +0
-0event_p_id++) {examples/l3fwd/l3fwd_event_generic.c +5
-2@@ -115,8 +115,11 @@ l3fwd_event_port_setup_generic(void)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; + evt_rsrc->deq_depth = def_p_conf.dequeue_depth; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;examples/l3fwd/l3fwd_event_internal_port.c +4
-3@@ -113,8 +113,10 @@ l3fwd_event_port_setup_internal_port(void)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; - event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ;for (event_p_id =0 ; event_p_id < evt_rsrc->evp.nb_ports; event_p_id++) { --2.6.4
Pavan Nikhilesh Bhagavatula
Acked-byRe: [dpdk-dev] [PATCH v2 2/2] eventdev: update app and examples for new eventdev ABI
Quoted 8 lines
Quoted 1 line
Subject: [PATCH v2 2/2] eventdev: update app and examples for new
eventdev ABI
Quoted 6 lines
Several data structures and constants changed, or were added, in the previous patch. This commit updates the dependent apps and examples to use the new ABI.
Signed-off-by Timothy McDaniel <[email protected]>
With fixes to trace framework
Quoted 389 lines
Quoted 1 line
---
With this patch applied, the compilation works fine, however runtime fails.
Note that there is a dependency to the following fix which Timothy upstreamed:
https://urldefense.proofpoint.com/v2/url?u=http-
3A__patches.dpdk.org_patch_79713_&d=DwIFAg&c=nKjWec2b6R0mO yPaz7xtfQ&r=E3SgYMjtKCMVsB-fmvgGV3o- g_fjLhk5Pupi9ijohpc&m=mRL8gzBSQmAPRQfgNtiP_pu9ptgafRSt- dqHP8c6Q_A&s=84_EoTViUQXiFuIh4- YkcqBHP_PYsL73VmZzbczCTOI&e=The above linked patch increases the CTF trace size, and fixes the following error:
./dpdk-test
EAL: __rte_trace_point_emit_field():442 CTF field is too long
EAL: __rte_trace_point_register():468 missingrte_trace_emit_header()in register fnQuoted 2 lines
app/test-eventdev/evt_common.h | 11 ++++++++ app/test-eventdev/test_order_atq.c | 28 +++++++++++++++------
Quoted 2 lines
app/test-eventdev/test_order_common.c | 1 + app/test-eventdev/test_order_queue.c | 29++++++++++++++++------
app/test-
Quoted 10 lines
app/test/test_eventdev.c | 4 +-- .../eventdev_pipeline/pipeline_worker_generic.c | 6 +++-- examples/eventdev_pipeline/pipeline_worker_tx.c | 1 + examples/l2fwd-event/l2fwd_event_generic.c | 7 ++++-- examples/l2fwd-event/l2fwd_event_internal_port.c | 6 +++-- examples/l3fwd/l3fwd_event_generic.c | 7 ++++-- examples/l3fwd/l3fwd_event_internal_port.c | 6 +++-- 11 files changed, 80 insertions(+), 26 deletions(-)app/test- renamed from app/test-eventdev/evt_common.h +0
-0
eventdev/evt_common.happ/test-eventdev/evt_common.h evt_configure_eventdev(struct evt_options
Quoted 22 lines
index f9d7378..a1da1cf 100644
app/test-eventdev/evt_common.h +7
-0@@ -104,6 +104,16 @@ evt_has_all_types_queue(uint8_t dev_id) true : false; } +static inline bool +evt_has_flow_id (uint8_t dev_id) +{ +struct rte_event_dev_info dev_info; + +rte_event_dev_info_get (dev_id, &dev_info); + return (dev_info.event_dev_cap &
RTE_EVENT_DEV_CAP_CARRY_FLOW_ID) ?app/test-eventdev/evt_common.h +3
-0+ true : false; +} +static inline int evt_service_setup (uint32_t service_id) {@@ -169,6 +179,7 @@ evt_configure_eventdev(struct evt_options*opt,
uint8_tapp/test-eventdev/test_order_atq.c order_atq_process_stage_0(struct rte_event
Quoted 14 lines
app/test-eventdev/evt_common.h +1
-0nb_queues, .dequeue_timeout_ns = opt->deq_tmo_nsec, .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues = 0, .nb_events_limit = info.max_num_events, .nb_event_queue_flows = opt->nb_flows,app/test-eventdev/evt_common.h +0
-0.nb_event_port_dequeue_depth =app/test- renamed from app/test-eventdev/test_order_atq.c +0
-0
eventdev/test_order_atq.c
index 3366cfc..cfcb1dc 100644app/test-eventdev/test_order_atq.c +0
-0@@ -19,7 +19,7 @@ order_atq_process_stage_0(struct rte_event*const ev)
Quoted 9 lines
app/test-eventdev/test_order_atq.c +1
-1}static int -order_atq_worker (void *arg) +order_atq_worker (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev;app/test-eventdev/test_order_atq.c order_atq_worker(void *arg) · line 40
Quoted 7 lines
app/test-eventdev/test_order_atq.c +3
-0@@ -34,6 +34,9 @@ order_atq_worker(void *arg)continue ; } +if (!flow_id_cap) + ev.flow_id = ev.mbuf->udata64; +if (ev.sub_event_type ==0 ) {/* stage 0 from producer */
app/test-eventdev/test_order_atq.c order_atq_worker(void *arg) · line 42
Quoted 2 lines
app/test-eventdev/test_order_atq.c +0
-0order_atq_process_stage_0 (&ev); while (rte_event_enqueue_burst(dev_id, port,&ev, 1)
Quoted 10 lines
app/test-eventdev/test_order_atq.c +1
-1@@ -50,7 +53,7 @@ order_atq_worker(void *arg) }static int -order_atq_worker_burst (void *arg) +order_atq_worker_burst (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev[BURST_SIZE ];app/test-eventdev/test_order_atq.c order_atq_worker_burst(void *arg) · line 79
Quoted 9 lines
app/test-eventdev/test_order_atq.c +3
-0@@ -68,6 +71,9 @@ order_atq_worker_burst(void *arg) }for (i =0 ; i < nb_rx; i++) { +if (!flow_id_cap) + ev[i].flow_id = ev[i].mbuf->udata64; +if (ev[i].sub_event_type ==0 ) {/*stage 0 */ order_atq_process_stage_0 (&ev[i]); }else if (ev[i].sub_event_type ==1 ) {/* stage 1 */
app/test-eventdev/test_order_queue.c order_queue_process_stage_0(struct rte_event
Quoted 44 lines
app/test-eventdev/test_order_atq.c +13
-5@@ -95,11 +101,19 @@ worker_wrapper(void *arg) {struct worker_data *w = arg;const bool burst =evt_has_burst_mode (w->dev_id); - -if (burst) -return order_atq_worker_burst (arg); -else -return order_atq_worker (arg); +const bool flow_id_cap =evt_has_flow_id (w->dev_id); + +if (burst) { +if (flow_id_cap) +return order_atq_worker_burst (arg, true); +else +return order_atq_worker_burst (arg, false); + }else { +if (flow_id_cap) +return order_atq_worker (arg, true); +else +return order_atq_worker (arg, false); + } } static intapp/test- renamed from app/test-eventdev/test_order_common.c +0
-0
eventdev/test_order_common.c
index 4190f9a..7942390 100644app/test-eventdev/test_order_common.c +1
-0@@ -49,6 +49,7 @@ order_producer(void *arg)const uint32_t flow = (uintptr_t )m % nb_flows;/* Maintain seq number per flow */ m->seqn = producer_flow_seq[flow]++; + m->udata64 = flow; ev.flow_id = flow; ev.mbuf = m;app/test- renamed from app/test-eventdev/test_order_queue.c +0
-0
eventdev/test_order_queue.c
index 495efd9..1511c00 100644app/test-eventdev/test_order_queue.c +0
-0@@ -19,7 +19,7 @@ order_queue_process_stage_0(struct rte_event*const ev)
Quoted 9 lines
app/test-eventdev/test_order_queue.c +1
-1}static int -order_queue_worker (void *arg) +order_queue_worker (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev;app/test-eventdev/test_order_queue.c order_queue_worker(void *arg) · line 42
Quoted 9 lines
app/test-eventdev/test_order_queue.c +3
-0@@ -34,6 +34,9 @@ order_queue_worker(void *arg)continue ; } +if (!flow_id_cap) + ev.flow_id = ev.mbuf->udata64; +if (ev.queue_id ==0 ) {/* from ordered queue */ order_queue_process_stage_0 (&ev); while (rte_event_enqueue_burst(dev_id, port,&ev, 1)
Quoted 10 lines
app/test-eventdev/test_order_queue.c +1
-1@@ -50,7 +53,7 @@ order_queue_worker(void *arg) }static int -order_queue_worker_burst (void *arg) +order_queue_worker_burst (void *arg,const bool flow_id_cap) {ORDER_WORKER_INIT ;struct rte_event ev[BURST_SIZE ];app/test-eventdev/test_order_queue.c order_queue_worker_burst(void *arg) · line 78
Quoted 8 lines
app/test-eventdev/test_order_queue.c +4
-0@@ -68,6 +71,10 @@ order_queue_worker_burst(void *arg) }for (i =0 ; i < nb_rx; i++) { + +if (!flow_id_cap) + ev[i].flow_id = ev[i].mbuf->udata64; +if (ev[i].queue_id ==0 ) {/* from ordered queue */
app/test-eventdev/test_order_queue.c order_queue_worker_burst(void *arg) · line 80
Quoted 2 lines
app/test-eventdev/test_order_queue.c +0
-0order_queue_process_stage_0 (&ev[i]); }else if (ev[i].queue_id ==1 ) {/* from atomic queue */
Quoted 30 lines
app/test-eventdev/test_order_queue.c +13
-5@@ -95,11 +102,19 @@ worker_wrapper(void *arg) {struct worker_data *w = arg;const bool burst =evt_has_burst_mode (w->dev_id); - -if (burst) -return order_queue_worker_burst (arg); -else -return order_queue_worker (arg); +const bool flow_id_cap =evt_has_flow_id (w->dev_id); + +if (burst) { +if (flow_id_cap) +return order_queue_worker_burst (arg, true); +else +return order_queue_worker_burst (arg, false); + }else { +if (flow_id_cap) +return order_queue_worker (arg, true); +else +return order_queue_worker (arg, false); + } } static intapp/test/test_eventdev.c +0
-0app/test/test_eventdev.c test_eventdev_port_setup(void) · line 561
Quoted 3 lines
app/test/test_eventdev.c +0
-0@@ -559,10 +559,10 @@ test_eventdev_port_setup(void)if (!(info.event_dev_cap &RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE )) { pconf.enqueue_depth =info.max_event_port_enqueue_depth;
app/test/test_eventdev.c test_eventdev_port_setup(void) · line 565
Quoted 5 lines
app/test/test_eventdev.c +1
-1- pconf.disable_implicit_release =1 ; + pconf.event_port_cfg =RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; ret =rte_event_port_setup (TEST_DEV_ID ,0 , &pconf); TEST_ASSERT(ret == -EINVAL, "Expected -EINVAL, %d",ret);
Quoted 5 lines
app/test/test_eventdev.c +1
-1- pconf.disable_implicit_release =0 ; + pconf.event_port_cfg =0 ; }ret = rte_event_port_setup(TEST_DEV_ID,
info.max_event_ports,
examples/eventdev_pipeline/pipeline_worker_generic.c setup_eventdev_generic(struct worker_data
Quoted 6 lines
examples/eventdev_pipeline/pipeline_worker_generic.c +0
-0@@ -129,6 +129,7 @@ setup_eventdev_generic(struct worker_data
*worker_data)examples/eventdev_pipeline/pipeline_worker_generic.c setup_eventdev_generic(struct worker_data
Quoted 8 lines
examples/eventdev_pipeline/pipeline_worker_generic.c +1
-0struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues =1 , .nb_events_limit =4096 , .nb_event_queue_flows =1024 , .nb_event_port_dequeue_depth =128 ,@@ -143,7 +144,7 @@ setup_eventdev_generic(struct worker_data
*worker_data)examples/eventdev_pipeline/pipeline_worker_generic.c setup_eventdev_generic(struct worker_data · line 145
Quoted 2 lines
examples/eventdev_pipeline/pipeline_worker_generic.c +0
-0.schedule_type = cdata.queue_type, .priority =
RTE_EVENT_DEV_PRIORITY_NORMAL,examples/eventdev_pipeline/pipeline_worker_generic.c setup_eventdev_generic(struct worker_data *worker_data)
Quoted 6 lines
examples/eventdev_pipeline/pipeline_worker_generic.c +1
-1.nb_atomic_flows = 1024, - .nb_atomic_order_sequences = 1024, + .nb_atomic_order_sequences = 1024, }; struct rte_event_queue_conf tx_q_conf = { .priority =
RTE_EVENT_DEV_PRIORITY_HIGHEST,examples/eventdev_pipeline/pipeline_worker_generic.c setup_eventdev_generic(struct worker_data
Quoted 1 line
examples/eventdev_pipeline/pipeline_worker_generic.c +0
-0@@ -167,7 +168,8 @@ setup_eventdev_generic(struct worker_data
*worker_data)examples/eventdev_pipeline/pipeline_worker_generic.c setup_eventdev_generic(struct worker_data *worker_data) · line 170
Quoted 2 lines
examples/eventdev_pipeline/pipeline_worker_generic.c +0
-0disable_implicit_release = (dev_info.event_dev_cap &RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE);examples/eventdev_pipeline/pipeline_worker_tx.c setup_eventdev_worker_tx_enq(struct
Quoted 13 lines
examples/eventdev_pipeline/pipeline_worker_generic.c +2
-1- wkr_p_conf.disable_implicit_release = disable_implicit_release; + wkr_p_conf.event_port_cfg = disable_implicit_release ? +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL :0 ;if (dev_info.max_num_events < config.nb_events_limit) config.nb_events_limit = dev_info.max_num_events;examples/eventdev_pipeline/pipeline_worker_tx.c +0
-0@@ -436,6 +436,7 @@ setup_eventdev_worker_tx_enq(struct
worker_dataReview
Quoted 9 lines
examples/eventdev_pipeline/pipeline_worker_tx.c +1
-0*worker_data)struct rte_event_dev_config config = { .nb_event_queues = nb_queues, .nb_event_ports = nb_ports, + .nb_single_link_event_port_queues =0 , .nb_events_limit =4096 , .nb_event_queue_flows =1024 ,examples/eventdev_pipeline/pipeline_worker_tx.c +0
-0.nb_event_port_dequeue_depth = 128,(quoted diff) +0
-0b/examples/l2fwd-
examples/l2fwd-event/l2fwd_event_generic.c l2fwd_event_port_setup_generic(struct
Quoted 5 lines
event/l2fwd_event_generic.c
index 2dc95e5..9a3167c 100644examples/l2fwd-event/l2fwd_event_generic.c +0
-0@@ -126,8 +126,11 @@ l2fwd_event_port_setup_generic(struct
l2fwd_resourcesexamples/l2fwd-event/l2fwd_event_generic.c l2fwd_event_port_setup_generic(struct · line 128
Quoted 3 lines
examples/l2fwd-event/l2fwd_event_generic.c +0
-0*rsrc)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth =def_p_conf.enqueue_depth;
Review
Quoted 12 lines
examples/l2fwd-event/l2fwd_event_generic.c +5
-2- event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; + evt_rsrc->deq_depth = def_p_conf.dequeue_depth; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;(quoted diff) +0
-0b/examples/l2fwd-
examples/l2fwd-event/l2fwd_event_internal_port.c
Quoted 5 lines
event/l2fwd_event_internal_port.c
index 63d57b4..203a14c 100644examples/l2fwd-event/l2fwd_event_internal_port.c +0
-0@@ -123,8 +123,10 @@l2fwd_event_port_setup_internal_port(struct
examples/l2fwd-event/l2fwd_event_internal_port.c line 125
Quoted 3 lines
examples/l2fwd-event/l2fwd_event_internal_port.c +0
-0l2fwd_resources *rsrc)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth =def_p_conf.enqueue_depth;
examples/l2fwd-event/l2fwd_event_internal_port.c line 132
Quoted 10 lines
examples/l2fwd-event/l2fwd_event_internal_port.c +4
-2- event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;event_p_id++) {examples/l3fwd/l3fwd_event_generic.c l3fwd_event_port_setup_generic(void) · line 116
Quoted 8 lines
examples/l3fwd/l3fwd_event_generic.c +0
-0@@ -115,8 +115,11 @@ l3fwd_event_port_setup_generic(void)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth =def_p_conf.enqueue_depth;
Quoted 17 lines
examples/l3fwd/l3fwd_event_generic.c +5
-2- event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; + evt_rsrc->deq_depth = def_p_conf.dequeue_depth; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;examples/l3fwd/l3fwd_event_internal_port.c +0
-0examples/l3fwd/l3fwd_event_internal_port.c l3fwd_event_port_setup_internal_port(void) · line 114
Quoted 2 lines
examples/l3fwd/l3fwd_event_internal_port.c +0
-0@@ -113,8 +113,10 @@ l3fwd_event_port_setup_internal_port(void)if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) event_p_conf.enqueue_depth =def_p_conf.enqueue_depth;
examples/l3fwd/l3fwd_event_internal_port.c l3fwd_event_port_setup_internal_port(void) · line 121
Quoted 10 lines
examples/l3fwd/l3fwd_event_internal_port.c +4
-2- event_p_conf.disable_implicit_release = - evt_rsrc->disable_implicit_release; + event_p_conf.event_port_cfg =0 ; +if (evt_rsrc->disable_implicit_release) + event_p_conf.event_port_cfg |= +RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL ; for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;event_p_id++) {Quoted 2 lines
examples/l3fwd/l3fwd_event_internal_port.c +0
-1--2.6.4
Re: [dpdk-dev] [PATCH v2 2/2] eventdev: update app and examples for new eventdev ABI
Quoted 4 lines · Pavan Nikhilesh Bhagavatula
Quoted 4 lines
Quoted 2 lines
Subject: [PATCH v2 2/2] eventdev: update app and examples for new
eventdev ABI
Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Several data structures and constants changed, or were added, in the previous patch. This commit updates the dependent apps and examples to use the new ABI.
Signed-off-by Timothy McDaniel <[email protected]>With fixes to trace framework
Acked-by Pavan Nikhilesh <[email protected]>
@McDaniel, Timothy ,
The series has apply issues[1], Could you send the final version with Ack of Harry and Pavan.
I will merge this series for RC1 and Let's move DLB PMD driver updates to RC2.
[1]
[for-main]dell[dpdk-next-eventdev] $ date && /home/jerin/config/scripts/build_each_patch.sh /tmp/r/ && date Wed Oct 14 12:41:19 AM IST 2020
HEAD is now at b7a8eea2c app/eventdev: enable fast free offload meson build test
Applying: eventdev: eventdev: express DLB/DLB2 PMD constraints Using index info to reconstruct a base tree...
M drivers/event/dpaa2/dpaa2_eventdev.c M drivers/event/octeontx/ssovf_evdev.c M drivers/event/octeontx2/otx2_evdev.c M lib/librte_eventdev/rte_event_eth_tx_adapter.c M lib/librte_eventdev/rte_eventdev.c
Falling back to patching base and 3-way merge...
Auto-merging lib/librte_eventdev/rte_eventdev.c
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev.c Auto-merging lib/librte_eventdev/rte_event_eth_tx_adapter.c Auto-merging drivers/event/octeontx2/otx2_evdev.c
Auto-merging drivers/event/octeontx/ssovf_evdev.c
Auto-merging drivers/event/dpaa2/dpaa2_eventdev.c
Recorded preimage for 'lib/librte_eventdev/rte_eventdev.c'
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: eventdev: express DLB/DLB2 PMD constraints
hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort". git am failed /tmp/r//v2-1-2-eventdev-eventdev-express-DLB-DLB2-PMD-constraints HEAD is now at b7a8eea2c app/eventdev: enable fast free offload Wed Oct 14 12:41:19 AM IST 2020