X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=examples%2Fl2fwd-event%2Fl2fwd_event_generic.c;h=c19b6f14117488f145234817fa2e2276a133d898;hb=fcb5717ccfaa19a4f7a74f7bda6c1df6b6eb9ef4;hp=b07306a17b05fe65c90f6b6afefbfa4152e392ab;hpb=345a22d5ec1ab70e9d965ae50558049e6c0f2f8d;p=dpdk.git diff --git a/examples/l2fwd-event/l2fwd_event_generic.c b/examples/l2fwd-event/l2fwd_event_generic.c index b07306a17b..c19b6f1411 100644 --- a/examples/l2fwd-event/l2fwd_event_generic.c +++ b/examples/l2fwd-event/l2fwd_event_generic.c @@ -20,12 +20,14 @@ static uint32_t l2fwd_event_device_setup_generic(struct l2fwd_resources *rsrc) { struct l2fwd_event_resources *evt_rsrc = rsrc->evt_rsrc; + /* Configures event device as per below configuration. 8< */ struct rte_event_dev_config event_d_conf = { .nb_events_limit = 4096, .nb_event_queue_flows = 1024, .nb_event_port_dequeue_depth = 128, .nb_event_port_enqueue_depth = 128 }; + /* >8 End of configuration event device as per below configuration. */ struct rte_event_dev_info dev_info; const uint8_t event_d_id = 0; /* Always use first event device only */ uint32_t event_queue_cfg = 0; @@ -72,7 +74,7 @@ l2fwd_event_device_setup_generic(struct l2fwd_resources *rsrc) event_d_conf.nb_event_port_enqueue_depth = dev_info.max_event_port_enqueue_depth; - /* Ignore Master core and service cores. */ + /* Ignore Main core and service cores. */ num_workers = rte_lcore_count() - 1 - rte_service_lcore_count(); if (dev_info.max_event_ports < num_workers) num_workers = dev_info.max_event_ports; @@ -97,6 +99,7 @@ l2fwd_event_port_setup_generic(struct l2fwd_resources *rsrc) { struct l2fwd_event_resources *evt_rsrc = rsrc->evt_rsrc; uint8_t event_d_id = evt_rsrc->event_d_id; + /* Event port initialization. 8< */ struct rte_event_port_conf event_p_conf = { .dequeue_depth = 32, .enqueue_depth = 32, @@ -112,7 +115,9 @@ l2fwd_event_port_setup_generic(struct l2fwd_resources *rsrc) rte_panic("No space is available\n"); memset(&def_p_conf, 0, sizeof(struct rte_event_port_conf)); - rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf); + ret = rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf); + if (ret < 0) + rte_panic("Error to get default configuration of event port\n"); if (def_p_conf.new_event_threshold < event_p_conf.new_event_threshold) event_p_conf.new_event_threshold = @@ -124,8 +129,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; @@ -144,6 +152,7 @@ l2fwd_event_port_setup_generic(struct l2fwd_resources *rsrc) rte_panic("Error in linking event port %d to queues\n", event_p_id); evt_rsrc->evp.event_p_id[event_p_id] = event_p_id; + /* >8 End of event port initialization. */ } /* init spinlock */ rte_spinlock_init(&evt_rsrc->evp.lock); @@ -157,6 +166,7 @@ l2fwd_event_queue_setup_generic(struct l2fwd_resources *rsrc, { struct l2fwd_event_resources *evt_rsrc = rsrc->evt_rsrc; uint8_t event_d_id = evt_rsrc->event_d_id; + /* Event queue initialization. 8< */ struct rte_event_queue_conf event_q_conf = { .nb_atomic_flows = 1024, .nb_atomic_order_sequences = 1024, @@ -173,7 +183,11 @@ l2fwd_event_queue_setup_generic(struct l2fwd_resources *rsrc, if (!evt_rsrc->evq.event_q_id) rte_panic("Memory allocation failure\n"); - rte_event_queue_default_conf_get(event_d_id, 0, &def_q_conf); + ret = rte_event_queue_default_conf_get(event_d_id, 0, &def_q_conf); + if (ret < 0) + rte_panic("Error to get default config of event queue\n"); + /* >8 End of event queue initialization. */ + if (def_q_conf.nb_atomic_flows < event_q_conf.nb_atomic_flows) event_q_conf.nb_atomic_flows = def_q_conf.nb_atomic_flows; @@ -286,6 +300,7 @@ l2fwd_rx_tx_adapter_setup_generic(struct l2fwd_resources *rsrc) rte_service_set_runstate_mapped_check(service_id, 0); evt_rsrc->tx_adptr.service_id = service_id; + /* Extra port created. 8< */ ret = rte_event_eth_tx_adapter_event_port_get(tx_adptr_id, &tx_port_id); if (ret) rte_panic("Failed to get Tx adapter port id: %d\n", ret); @@ -297,6 +312,7 @@ l2fwd_rx_tx_adapter_setup_generic(struct l2fwd_resources *rsrc) if (ret != 1) rte_panic("Unable to link Tx adapter port to Tx queue:err=%d\n", ret); + /* >8 End of extra port created. */ ret = rte_event_eth_tx_adapter_start(tx_adptr_id); if (ret)