git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/txgbe: add Rx and Tx start and stop
[dpdk.git]
/
examples
/
ipsec-secgw
/
event_helper.c
diff --git
a/examples/ipsec-secgw/event_helper.c
b/examples/ipsec-secgw/event_helper.c
index
076f1f2
..
8475d54
100644
(file)
--- a/
examples/ipsec-secgw/event_helper.c
+++ b/
examples/ipsec-secgw/event_helper.c
@@
-100,12
+100,15
@@
static inline bool
eh_dev_has_rx_internal_port(uint8_t eventdev_id)
{
bool flag = true;
eh_dev_has_rx_internal_port(uint8_t eventdev_id)
{
bool flag = true;
- int j;
+ int j
, ret
;
RTE_ETH_FOREACH_DEV(j) {
uint32_t caps = 0;
RTE_ETH_FOREACH_DEV(j) {
uint32_t caps = 0;
- rte_event_eth_rx_adapter_caps_get(eventdev_id, j, &caps);
+ ret = rte_event_eth_rx_adapter_caps_get(eventdev_id, j, &caps);
+ if (ret < 0)
+ return false;
+
if (!(caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT))
flag = false;
}
if (!(caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT))
flag = false;
}
@@
-116,12
+119,15
@@
static inline bool
eh_dev_has_tx_internal_port(uint8_t eventdev_id)
{
bool flag = true;
eh_dev_has_tx_internal_port(uint8_t eventdev_id)
{
bool flag = true;
- int j;
+ int j
, ret
;
RTE_ETH_FOREACH_DEV(j) {
uint32_t caps = 0;
RTE_ETH_FOREACH_DEV(j) {
uint32_t caps = 0;
- rte_event_eth_tx_adapter_caps_get(eventdev_id, j, &caps);
+ ret = rte_event_eth_tx_adapter_caps_get(eventdev_id, j, &caps);
+ if (ret < 0)
+ return false;
+
if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
flag = false;
}
if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
flag = false;
}
@@
-323,6
+329,7
@@
eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)
int nb_eth_dev;
int adapter_id;
int conn_id;
int nb_eth_dev;
int adapter_id;
int conn_id;
+ int ret;
int i;
/* Create one adapter with eth queues mapped to event queue(s) */
int i;
/* Create one adapter with eth queues mapped to event queue(s) */
@@
-385,7
+392,12
@@
eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)
conn->ethdev_rx_qid = -1;
/* Get Rx adapter capabilities */
conn->ethdev_rx_qid = -1;
/* Get Rx adapter capabilities */
- rte_event_eth_rx_adapter_caps_get(eventdev_id, i, &caps);
+ ret = rte_event_eth_rx_adapter_caps_get(eventdev_id, i, &caps);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to get event device %d eth rx adapter"
+ " capabilities for port %d", eventdev_id, i);
+ return ret;
+ }
if (!(caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT))
rx_internal_port = false;
if (!(caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT))
rx_internal_port = false;
@@
-420,6
+432,7
@@
eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)
int adapter_id;
int nb_eth_dev;
int conn_id;
int adapter_id;
int nb_eth_dev;
int conn_id;
+ int ret;
int i;
/*
int i;
/*
@@
-479,7
+492,12
@@
eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)
conn->ethdev_tx_qid = -1;
/* Get Tx adapter capabilities */
conn->ethdev_tx_qid = -1;
/* Get Tx adapter capabilities */
- rte_event_eth_tx_adapter_caps_get(eventdev_id, i, &caps);
+ ret = rte_event_eth_tx_adapter_caps_get(eventdev_id, i, &caps);
+ if (ret < 0) {
+ EH_LOG_ERR("Failed to get event device %d eth tx adapter"
+ " capabilities for port %d", eventdev_id, i);
+ return ret;
+ }
if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
tx_internal_port = false;
if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
tx_internal_port = false;
@@
-1443,16
+1461,16
@@
eh_conf_init(void)
/* Set two cores as eth cores for Rx & Tx */
/* Set two cores as eth cores for Rx & Tx */
- /* Use first core other than ma
ster
core as Rx core */
+ /* Use first core other than ma
in
core as Rx core */
eth_core_id = rte_get_next_lcore(0, /* curr core */
eth_core_id = rte_get_next_lcore(0, /* curr core */
- 1, /* skip ma
ster
core */
+ 1, /* skip ma
in
core */
0 /* wrap */);
rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
/* Use next core as Tx core */
eth_core_id = rte_get_next_lcore(eth_core_id, /* curr core */
0 /* wrap */);
rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
/* Use next core as Tx core */
eth_core_id = rte_get_next_lcore(eth_core_id, /* curr core */
- 1, /* skip ma
ster
core */
+ 1, /* skip ma
in
core */
0 /* wrap */);
rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
0 /* wrap */);
rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
@@
-1565,7
+1583,12
@@
eh_devs_init(struct eh_conf *conf)
if ((conf->eth_portmask & (1 << port_id)) == 0)
continue;
if ((conf->eth_portmask & (1 << port_id)) == 0)
continue;
- rte_eth_dev_stop(port_id);
+ ret = rte_eth_dev_stop(port_id);
+ if (ret != 0) {
+ EH_LOG_ERR("Failed to stop port %u, err: %d",
+ port_id, ret);
+ return ret;
+ }
}
/* Setup eventdev */
}
/* Setup eventdev */