add eventmode to ipsec-secgw
PATCH v2 6/12 examples/ipsec-secgw: add routines to display config
In reply to Anoob JosephAdd routines to display the eventmode configuration and provide an overview of the devices used.
--- examples/ipsec-secgw/event_helper.c | 207 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 14 +++ 2 files changed, 221 insertions(+)
examples/ipsec-secgw/event_helper.c +207 -0
@@ -822,6 +822,210 @@ eh_initialize_tx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static void +eh_display_operating_mode (struct eventmode_conf *em_conf) +{ +char sched_types[][32 ] = { +"RTE_SCHED_TYPE_ORDERED" , +"RTE_SCHED_TYPE_ATOMIC" , +"RTE_SCHED_TYPE_PARALLEL" , + }; +EH_LOG_INFO ("Operating mode:" ); + +EH_LOG_INFO ("\tScheduling type: \t%s" , + sched_types[em_conf->ext_params.sched_type]); + +EH_LOG_INFO ("" ); +} + +static void +eh_display_event_dev_conf (struct eventmode_conf *em_conf) +{ +char queue_mode[][32 ] = { +"" , +"ATQ (ALL TYPE QUEUE)" , +"SINGLE LINK" , + }; +char print_buf[256 ] = {0 }; +int i; + +EH_LOG_INFO ("Event Device Configuration:" ); + +for (i =0 ; i < em_conf->nb_eventdev; i++) { +sprintf (print_buf, +"\tDev ID: %-2d \tQueues: %-2d \tPorts: %-2d" , + em_conf->eventdev_config[i].eventdev_id, + em_conf->eventdev_config[i].nb_eventqueue, + em_conf->eventdev_config[i].nb_eventport); +sprintf (print_buf +strlen (print_buf), +"\tQueue mode: %s" , + queue_mode[em_conf->eventdev_config[i].ev_queue_mode]); +EH_LOG_INFO ("%s" , print_buf); + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_rx_adapter_conf (struct eventmode_conf *em_conf) +{ +int nb_rx_adapter = em_conf->nb_rx_adapter; +struct rx_adapter_connection_info *conn; +struct rx_adapter_conf *adapter; +char print_buf[256 ] = {0 }; +int i, j; + +EH_LOG_INFO ("Rx adapters configured: %d" , nb_rx_adapter); + +for (i =0 ; i < nb_rx_adapter; i++) { + adapter = &(em_conf->rx_adapter[i]); +EH_LOG_INFO ( +"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" +"\tRx core: %-2d" , + adapter->adapter_id, + adapter->nb_connections, + adapter->eventdev_id, + adapter->rx_core_id); + +for (j =0 ; j < adapter->nb_connections; j++) { + conn = &(adapter->conn[j]); + +sprintf (print_buf, +"\t\tEthdev ID: %-2d" , conn->ethdev_id); + +if (conn->ethdev_rx_qid ==-1 ) +sprintf (print_buf +strlen (print_buf), +"\tEth rx queue: %-2s" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"\tEth rx queue: %-2d" , + conn->ethdev_rx_qid); + +sprintf (print_buf +strlen (print_buf), +"\tEvent queue: %-2d" , conn->eventq_id); +EH_LOG_INFO ("%s" , print_buf); + } + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_tx_adapter_conf (struct eventmode_conf *em_conf) +{ +int nb_tx_adapter = em_conf->nb_tx_adapter; +struct tx_adapter_connection_info *conn; +struct tx_adapter_conf *adapter; +char print_buf[256 ] = {0 }; +int i, j; + +EH_LOG_INFO ("Tx adapters configured: %d" , nb_tx_adapter); + +for (i =0 ; i < nb_tx_adapter; i++) { + adapter = &(em_conf->tx_adapter[i]); +sprintf (print_buf, +"\tTx adapter ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" , + adapter->adapter_id, + adapter->nb_connections, + adapter->eventdev_id); +if (adapter->tx_core_id == (uint32_t )-1 ) +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2s" ,"[INTERNAL PORT]" ); +else if (adapter->tx_core_id ==RTE_MAX_LCORE ) +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2s" ,"[NONE]" ); +else +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2d,\tInput event queue: %-2d" , + adapter->tx_core_id, adapter->tx_ev_queue); + +EH_LOG_INFO ("%s" , print_buf); + +for (j =0 ; j < adapter->nb_connections; j++) { + conn = &(adapter->conn[j]); + +sprintf (print_buf, +"\t\tEthdev ID: %-2d" , conn->ethdev_id); + +if (conn->ethdev_tx_qid ==-1 ) +sprintf (print_buf +strlen (print_buf), +"\tEth tx queue: %-2s" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"\tEth tx queue: %-2d" , + conn->ethdev_tx_qid); +EH_LOG_INFO ("%s" , print_buf); + } + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_link_conf (struct eventmode_conf *em_conf) +{ +struct eh_event_link_info *link; +char print_buf[256 ] = {0 }; +int i; + +EH_LOG_INFO ("Links configured: %d" , em_conf->nb_link); + +for (i =0 ; i < em_conf->nb_link; i++) { + link = &(em_conf->link[i]); + +sprintf (print_buf, +"\tEvent dev ID: %-2d\tEvent port: %-2d" , + link->eventdev_id, + link->event_port_id); + +if (em_conf->ext_params.all_ev_queue_to_ev_port) +sprintf (print_buf +strlen (print_buf), +"Event queue: %-2s\t" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"Event queue: %-2d\t" , link->eventq_id); + +sprintf (print_buf +strlen (print_buf), +"Lcore: %-2d" , link->lcore_id); +EH_LOG_INFO ("%s" , print_buf); + } +EH_LOG_INFO ("" ); +} + +void +eh_display_conf (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return ; + } + +if (conf->mode !=EH_PKT_TRANSFER_MODE_EVENT ) +return ; + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return ; + } + +/* Get eventmode conf */ + em_conf = (struct eventmode_conf *)(conf->mode_params); + +/* Display user exposed operating modes */ +eh_display_operating_mode (em_conf); + +/* Display event device conf */ +eh_display_event_dev_conf (em_conf); + +/* Display Rx adapter conf */ +eh_display_rx_adapter_conf (em_conf); + +/* Display Tx adapter conf */ +eh_display_tx_adapter_conf (em_conf); + +/* Display event-lcore link */ +eh_display_link_conf (em_conf); +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -855,6 +1059,9 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Display the current configuration */ +eh_display_conf (conf); +/* Stop eth devices before setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
examples/ipsec-secgw/event_helper.h +14 -0
@@ -17,6 +17,11 @@ extern "C" { RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) +#define EH_LOG_INFO (...) \ + RTE_LOG(INFO, EH, \ + RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ + __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) +/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS
@@ -218,6 +223,15 @@ eh_devs_uninit(struct eh_conf *conf);uint8_t eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id); +/** +* Display event mode configuration +* +* @param conf +* Event helper configuration +*/ +void +eh_display_conf (struct eh_conf *conf); + #ifdef __cplusplus }#endif
Signature · 1 line
2.7.4
PATCH v2 7/12 examples/ipsec-secgw: add routines to launch workers
In reply to Anoob JosephFrom: Lukasz Bartosik <[email protected]>
In eventmode workers can be drafted differently according to the capabilities of the underlying event device. The added functions will receive an array of such workers and probe the eventmode properties to choose the worker.
--- examples/ipsec-secgw/event_helper.c | 336 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 48 ++++++ 2 files changed, 384 insertions(+)
examples/ipsec-secgw/event_helper.c +336 -0
@@ -11,6 +11,8 @@#include "event_helper.h" +static volatile bool eth_core_running; +static int eh_get_enabled_cores (struct rte_bitmap *eth_core_mask) {
@@ -93,6 +95,16 @@ eh_get_eventdev_params(struct eventmode_conf *em_conf, uint8_t eventdev_id)return &(em_conf->eventdev_config[i]); } +static inline bool +eh_dev_has_burst_mode (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_BURST_MODE ) ? + true : false; +} +static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -695,6 +707,257 @@ eh_initialize_rx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static int32_t +eh_start_worker_eth_core (struct eventmode_conf *conf,uint32_t lcore_id) +{ +uint32_t service_id[EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE ]; +struct rx_adapter_conf *rx_adapter; +struct tx_adapter_conf *tx_adapter; +int service_count =0 ; +int adapter_id; +int32_t ret; +int i; + +EH_LOG_INFO ("Entering eth_core processing on lcore %u" , lcore_id); + +/* +* Parse adapter config to check which of all Rx adapters need +* to be handled by this core. +*/ +for (i =0 ; i < conf->nb_rx_adapter; i++) { +/* Check if we have exceeded the max allowed */ +if (service_count >EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE ) { +EH_LOG_ERR ( +"Exceeded the max allowed adapters per rx core" ); +break ; + } + + rx_adapter = &(conf->rx_adapter[i]); +if (rx_adapter->rx_core_id != lcore_id) +continue ; + +/* Adapter is handled by this core */ + adapter_id = rx_adapter->adapter_id; + +/* Get the service ID for the adapters */ + ret =rte_event_eth_rx_adapter_service_id_get (adapter_id, + &(service_id[service_count])); + +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ( +"Failed to get service id used by rx adapter" ); +return ret; + } + +/* Update service count */ + service_count++; + } + +/* +* Parse adapter config to see which of all Tx adapters need +* to be handled by this core. +*/ +for (i =0 ; i < conf->nb_tx_adapter; i++) { +/* Check if we have exceeded the max allowed */ +if (service_count >EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE ) { +EH_LOG_ERR ( +"Exceeded the max allowed adapters per tx core" ); +break ; + } + + tx_adapter = &conf->tx_adapter[i]; +if (tx_adapter->tx_core_id != lcore_id) +continue ; + +/* Adapter is handled by this core */ + adapter_id = tx_adapter->adapter_id; + +/* Get the service ID for the adapters */ + ret =rte_event_eth_tx_adapter_service_id_get (adapter_id, + &(service_id[service_count])); + +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ( +"Failed to get service id used by tx adapter" ); +return ret; + } + +/* Update service count */ + service_count++; + } + + eth_core_running = true; + +while (eth_core_running) { +for (i =0 ; i < service_count; i++) { +/* Initiate adapter service */ +rte_service_run_iter_on_app_lcore (service_id[i],0 ); + } + } + +return 0 ; +} + +static int32_t +eh_stop_worker_eth_core (void ) +{ +if (eth_core_running) { +EH_LOG_INFO ("Stopping eth cores" ); + eth_core_running = false; + } +return 0 ; +} + +static struct eh_app_worker_params * +eh_find_worker (uint32_t lcore_id,struct eh_conf *conf, +struct eh_app_worker_params *app_wrkrs,uint8_t nb_wrkr_param) +{ +struct eh_app_worker_params curr_conf = { {{0 } },NULL }; +struct eh_event_link_info *link =NULL ; +struct eh_app_worker_params *tmp_wrkr; +struct eventmode_conf *em_conf; +uint8_t eventdev_id; +int i; + +/* Get eventmode config */ + em_conf = conf->mode_params; + +/* +* Use event device from the first lcore-event link. +* +* Assumption: All lcore-event links tied to a core are using the +* same event device. In other words, one core would be polling on +* queues of a single event device only. +*/ + +/* Get a link for this lcore */ +for (i =0 ; i < em_conf->nb_link; i++) { + link = &(em_conf->link[i]); +if (link->lcore_id == lcore_id) +break ; + } + +if (link ==NULL ) { +EH_LOG_ERR ("No valid link found for lcore %d" , lcore_id); +return NULL ; + } + +/* Get event dev ID */ + eventdev_id = link->eventdev_id; + +/* Populate the curr_conf with the capabilities */ + +/* Check for burst mode */ +if (eh_dev_has_burst_mode (eventdev_id)) + curr_conf.cap.burst =EH_RX_TYPE_BURST ; +else + curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + +/* Parse the passed list and see if we have matching capabilities */ + +/* Initialize the pointer used to traverse the list */ + tmp_wrkr = app_wrkrs; + +for (i =0 ; i < nb_wrkr_param; i++, tmp_wrkr++) { + +/* Skip this if capabilities are not matching */ +if (tmp_wrkr->cap.u64 != curr_conf.cap.u64) +continue ; + +/* If the checks pass, we have a match */ +return tmp_wrkr; + } + +return NULL ; +} + +static int +eh_verify_match_worker (struct eh_app_worker_params *match_wrkr) +{ +/* Verify registered worker */ +if (match_wrkr->worker_thread ==NULL ) { +EH_LOG_ERR ("No worker registered" ); +return 0 ; + } + +/* Success */ +return 1 ; +} + +static uint8_t +eh_get_event_lcore_links (uint32_t lcore_id,struct eh_conf *conf, +struct eh_event_link_info **links) +{ +struct eh_event_link_info *link_cache; +struct eventmode_conf *em_conf =NULL ; +struct eh_event_link_info *link; +uint8_t lcore_nb_link =0 ; +size_t single_link_size; +size_t cache_size; +int index =0 ; +int i; + +if (conf ==NULL || links ==NULL ) { +EH_LOG_ERR ("Invalid args" ); +return -EINVAL ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +if (em_conf ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return -EINVAL ; + } + +/* Get the number of links registered */ +for (i =0 ; i < em_conf->nb_link; i++) { + +/* Get link */ + link = &(em_conf->link[i]); + +/* Check if we have link intended for this lcore */ +if (link->lcore_id == lcore_id) { + +/* Update the number of links for this core */ + lcore_nb_link++; + + } + } + +/* Compute size of one entry to be copied */ + single_link_size =sizeof (struct eh_event_link_info ); + +/* Compute size of the buffer required */ + cache_size = lcore_nb_link *sizeof (struct eh_event_link_info ); + +/* Compute size of the buffer required */ + link_cache =calloc (1 , cache_size); + +/* Get the number of links registered */ +for (i =0 ; i < em_conf->nb_link; i++) { + +/* Get link */ + link = &(em_conf->link[i]); + +/* Check if we have link intended for this lcore */ +if (link->lcore_id == lcore_id) { + +/* Cache the link */ +memcpy (&link_cache[index], link, single_link_size); + +/* Update index */ + index++; + } + } + +/* Update the links for application to use the cached links */ + *links = link_cache; + +/* Return the number of cached links */ +return lcore_nb_link; +} +static int eh_tx_adapter_configure (struct eventmode_conf *em_conf,struct tx_adapter_conf *adapter)
@@ -1208,6 +1471,79 @@ eh_devs_uninit(struct eh_conf *conf)return 0 ; } +void +eh_launch_worker (struct eh_conf *conf,struct eh_app_worker_params *app_wrkr, +uint8_t nb_wrkr_param) +{ +struct eh_app_worker_params *match_wrkr; +struct eh_event_link_info *links =NULL ; +struct eventmode_conf *em_conf; +uint32_t lcore_id; +uint8_t nb_links; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return ; + } + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return ; + } + +/* Get eventmode conf */ + em_conf = (struct eventmode_conf *)(conf->mode_params); + +/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Check if this is eth core */ +if (rte_bitmap_get (em_conf->eth_core_mask, lcore_id)) { +eh_start_worker_eth_core (em_conf, lcore_id); +return ; + } + +if (app_wrkr ==NULL || nb_wrkr_param ==0 ) { +EH_LOG_ERR ("Invalid args" ); +return ; + } + +/* +* This is a regular worker thread. The application registers +* multiple workers with various capabilities. Run worker +* based on the selected capabilities of the event +* device configured. +*/ + +/* Get the first matching worker for the event device */ + match_wrkr =eh_find_worker (lcore_id, conf, app_wrkr, nb_wrkr_param); +if (match_wrkr ==NULL ) { +EH_LOG_ERR ("Failed to match worker registered for lcore %d" , + lcore_id); + goto clean_and_exit; + } + +/* Verify sanity of the matched worker */ +if (eh_verify_match_worker (match_wrkr) !=1 ) { +EH_LOG_ERR ("Failed to validate the matched worker" ); + goto clean_and_exit; + } + +/* Get worker links */ + nb_links =eh_get_event_lcore_links (lcore_id, conf, &links); + +/* Launch the worker thread */ + match_wrkr->worker_thread (links, nb_links); + +/* Free links info memory */ +free (links); + +clean_and_exit: + +/* Flag eth_cores to stop, if started */ +eh_stop_worker_eth_core (); +} +uint8_t eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id) {
examples/ipsec-secgw/event_helper.h +48 -0
72 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 8/12 examples/ipsec-secgw: add support for internal ports
In reply to Anoob JosephFrom: Lukasz Bartosik <[email protected]>
Add support for Rx and Tx internal ports. When internal ports are available then a packet can be received from eth port and forwarded to event queue by HW without any software intervention. The same applies to Tx side where a packet sent to an event queue can by forwarded by HW to eth port without any software intervention.
--- examples/ipsec-secgw/event_helper.c | 179 +++++++++++++++++++++++++++++++----- examples/ipsec-secgw/event_helper.h | 11 +++ 2 files changed, 167 insertions(+), 23 deletions(-)
examples/ipsec-secgw/event_helper.c +156 -23
@@ -95,6 +95,39 @@ eh_get_eventdev_params(struct eventmode_conf *em_conf, uint8_t eventdev_id)return &(em_conf->eventdev_config[i]); } + +static inline bool +eh_dev_has_rx_internal_port (uint8_t eventdev_id) +{ +int j; +bool flag = true; + +RTE_ETH_FOREACH_DEV (j) { +uint32_t caps =0 ; + +rte_event_eth_rx_adapter_caps_get (eventdev_id, j, &caps); +if (!(caps &RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT )) + flag = false; + } +return flag; +} + +static inline bool +eh_dev_has_tx_internal_port (uint8_t eventdev_id) +{ +int j; +bool flag = true; + +RTE_ETH_FOREACH_DEV (j) { +uint32_t caps =0 ; + +rte_event_eth_tx_adapter_caps_get (eventdev_id, j, &caps); +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + flag = false; + } +return flag; +} +static inline bool eh_dev_has_burst_mode (uint8_t dev_id) {
@@ -179,6 +212,42 @@ eh_set_default_conf_eventdev(struct eventmode_conf *em_conf)return 0 ; } +static void +eh_do_capability_check (struct eventmode_conf *em_conf) +{ +struct eventdev_params *eventdev_config; +int all_internal_ports =1 ; +uint32_t eventdev_id; +int i; + +for (i =0 ; i < em_conf->nb_eventdev; i++) { + +/* Get the event dev conf */ + eventdev_config = &(em_conf->eventdev_config[i]); + eventdev_id = eventdev_config->eventdev_id; + +/* Check if event device has internal port for Rx & Tx */ +if (eh_dev_has_rx_internal_port (eventdev_id) && +eh_dev_has_tx_internal_port (eventdev_id)) { + eventdev_config->all_internal_ports =1 ; + }else { + all_internal_ports =0 ; + } + } + +/* +* If Rx & Tx internal ports are supported by all event devices then +* eth cores won't be required. Override the eth core mask requested +* and decrement number of event queues by one as it won't be needed +* for Tx. +*/ +if (all_internal_ports) { +rte_bitmap_reset (em_conf->eth_core_mask); +for (i =0 ; i < em_conf->nb_eventdev; i++) + em_conf->eventdev_config[i].nb_eventqueue--; + } +} +static int eh_set_default_conf_link (struct eventmode_conf *em_conf) {
@@ -250,7 +319,10 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)struct rx_adapter_connection_info *conn;struct eventdev_params *eventdev_config;struct rx_adapter_conf *adapter; +bool rx_internal_port = true;bool single_ev_queue = false; +int nb_eventqueue; +uint32_t caps =0 ;int eventdev_id;int nb_eth_dev;int adapter_id;
@@ -280,14 +352,21 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)/* Set adapter conf */ adapter->eventdev_id = eventdev_id; adapter->adapter_id = adapter_id; - adapter->rx_core_id =eh_get_next_eth_core (em_conf); + +/* +* If event device does not have internal ports for passing +* packets then reserved one queue for Tx path +*/ + nb_eventqueue = eventdev_config->all_internal_ports ? + eventdev_config->nb_eventqueue : + eventdev_config->nb_eventqueue -1 ;/* * Map all queues of eth device (port) to an event queue. If there * are more event queues than eth ports then create 1:1 mapping. * Otherwise map all eth ports to a single event queue. */ -if (nb_eth_dev > eventdev_config->nb_eventqueue) +if (nb_eth_dev > nb_eventqueue) single_ev_queue = true;for (i =0 ; i < nb_eth_dev; i++) {
@@ -309,11 +388,24 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)/* Add all eth queues eth port to event queue */ conn->ethdev_rx_qid =-1 ; +/* Get Rx adapter capabilities */ +rte_event_eth_rx_adapter_caps_get (eventdev_id, i, &caps); +if (!(caps &RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT )) + rx_internal_port = false; +/* Update no of connections */ adapter->nb_connections++; } +if (rx_internal_port) { +/* Rx core is not required */ + adapter->rx_core_id =-1 ; + }else { +/* Rx core is required */ + adapter->rx_core_id =eh_get_next_eth_core (em_conf); + } +/* We have setup one adapter */ em_conf->nb_rx_adapter =1 ;
@@ -326,6 +418,8 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)struct tx_adapter_connection_info *conn;struct eventdev_params *eventdev_config;struct tx_adapter_conf *tx_adapter; +bool tx_internal_port = true; +uint32_t caps =0 ;int eventdev_id;int adapter_id;int nb_eth_dev;
@@ -359,18 +453,6 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf) tx_adapter->eventdev_id = eventdev_id; tx_adapter->adapter_id = adapter_id; -/* TODO: Tx core is required only when internal port is not present */ - tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); - -/* -* Application uses one event queue per adapter for submitting -* packets for Tx. Reserve the last queue available and decrement -* the total available event queues for this -*/ - -/* Queue numbers start at 0 */ - tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; -/* * Map all Tx queues of the eth device (port) to the event device. */
@@ -400,10 +482,30 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)/* Add all eth tx queues to adapter */ conn->ethdev_tx_qid =-1 ; +/* Get Tx adapter capabilities */ +rte_event_eth_tx_adapter_caps_get (eventdev_id, i, &caps); +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + tx_internal_port = false; +/* Update no of connections */ tx_adapter->nb_connections++; } +if (tx_internal_port) { +/* Tx core is not required */ + tx_adapter->tx_core_id =-1 ; + }else { +/* Tx core is required */ + tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Use one event queue per adapter for submitting packets +* for Tx. Reserving the last queue available +*/ +/* Queue numbers start at 0 */ + tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; + } +/* We have setup one adapter */ em_conf->nb_tx_adapter =1 ;return 0 ;
@@ -424,6 +526,9 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* Perform capability check for the selected event devices */ +eh_do_capability_check (em_conf); +/* * Check if links are specified. Else generate a default config for * the event ports used.
@@ -529,11 +634,13 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf) eventdev_config->ev_queue_mode;/* * All queues need to be set with sched_type as -* schedule type for the application stage. One queue -* would be reserved for the final eth tx stage. This -* will be an atomic queue. +* schedule type for the application stage. One +* queue would be reserved for the final eth tx +* stage if event device does not have internal +* ports. This will be an atomic queue. */ -if (j == nb_eventqueue-1 ) { +if (!eventdev_config->all_internal_ports && + j == nb_eventqueue-1 ) { eventq_conf.schedule_type =RTE_SCHED_TYPE_ATOMIC ; }else {
@@ -847,6 +954,12 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,/* Populate the curr_conf with the capabilities */ +/* Check for Tx internal port */ +if (eh_dev_has_tx_internal_port (eventdev_id)) + curr_conf.cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; +else + curr_conf.cap.tx_internal_port =EH_TX_TYPE_NO_INTERNAL_PORT ; +/* Check for burst mode */ if (eh_dev_has_burst_mode (eventdev_id)) curr_conf.cap.burst =EH_RX_TYPE_BURST ;
@@ -1018,6 +1131,16 @@ eh_tx_adapter_configure(struct eventmode_conf *em_conf, } } +/* +* Check if Tx core is assigned. If Tx core is not assigned then +* the adapter has internal port for submitting Tx packets and +* Tx event queue & port setup is not required +*/ +if (adapter->tx_core_id == (uint32_t ) (-1 )) { +/* Internal port is present */ + goto skip_tx_queue_port_setup; + } +/* Setup Tx queue & port */ /* Get event port used by the adapter */
@@ -1057,6 +1180,7 @@ eh_tx_adapter_configure(struct eventmode_conf *em_conf,rte_service_set_runstate_mapped_check (service_id,0 ); +skip_tx_queue_port_setup:/* Start adapter */ ret =rte_event_eth_tx_adapter_start (adapter->adapter_id);if (ret <0 ) {
@@ -1141,13 +1265,22 @@ eh_display_rx_adapter_conf(struct eventmode_conf *em_conf)for (i =0 ; i < nb_rx_adapter; i++) { adapter = &(em_conf->rx_adapter[i]); -EH_LOG_INFO ( -"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" -"\tRx core: %-2d" , +sprintf (print_buf, +"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" , adapter->adapter_id, adapter->nb_connections, - adapter->eventdev_id, - adapter->rx_core_id); + adapter->eventdev_id); +if (adapter->rx_core_id == (uint32_t )-1 ) +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2s" ,"[INTERNAL PORT]" ); +else if (adapter->rx_core_id ==RTE_MAX_LCORE ) +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2s" ,"[NONE]" ); +else +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2d" , adapter->rx_core_id); + +EH_LOG_INFO ("%s" , print_buf);for (j =0 ; j < adapter->nb_connections; j++) { conn = &(adapter->conn[j]);
examples/ipsec-secgw/event_helper.h +11 -0
@@ -66,12 +66,21 @@ enum eh_rx_types { EH_RX_TYPE_BURST }; +/** +* Event mode packet tx types +*/ +enum eh_tx_types { +EH_TX_TYPE_INTERNAL_PORT =0 , +EH_TX_TYPE_NO_INTERNAL_PORT +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;uint8_t nb_eventqueue;uint8_t nb_eventport;uint8_t ev_queue_mode; +uint8_t all_internal_ports; };/**
@@ -183,6 +192,8 @@ struct eh_app_worker_params {struct {uint64_t burst :1 ;/**< Specify status of rx type burst */ +uint64_t tx_internal_port :1 ; +/**< Specify whether tx internal port is available */ };uint64_t u64; } cap;
Signature · 1 line
2.7.4
PATCH v2 9/12 examples/ipsec-secgw: add eventmode to ipsec-secgw
In reply to Anoob JosephFrom: Lukasz Bartosik <[email protected]>
Add eventmode support to ipsec-secgw. With the aid of event helper configure and use the eventmode capabilities.
--- examples/ipsec-secgw/event_helper.c | 4 +- examples/ipsec-secgw/event_helper.h | 14 ++ examples/ipsec-secgw/ipsec-secgw.c | 341 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/sa.c | 11 -- 5 files changed, 365 insertions(+), 16 deletions(-)
examples/ipsec-secgw/event_helper.c +3 -1
@@ -966,6 +966,8 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,else curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + curr_conf.cap.ipsec_mode = conf->ipsec_mode; +/* Parse the passed list and see if we have matching capabilities */ /* Initialize the pointer used to traverse the list */
@@ -1625,7 +1627,7 @@ eh_launch_worker(struct eh_conf *conf, struct eh_app_worker_params *app_wrkr, }/* Get eventmode conf */ - em_conf = (struct eventmode_conf *)(conf->mode_params); + em_conf = conf->mode_params;/* Get core ID */ lcore_id =rte_lcore_id ();
examples/ipsec-secgw/event_helper.h +14 -0
@@ -74,6 +74,14 @@ enum eh_tx_types {EH_TX_TYPE_NO_INTERNAL_PORT }; +/** +* Event mode ipsec mode types +*/ +enum eh_ipsec_mode_types { +EH_IPSEC_MODE_TYPE_APP =0 , +EH_IPSEC_MODE_TYPE_DRIVER +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;
@@ -183,6 +191,10 @@ struct eh_conf {*/ void *mode_params;/**< Mode specific parameters */ + +/** Application specific params */ +enum eh_ipsec_mode_types ipsec_mode; +/**< Mode of ipsec run */ };/* Workers registered by the application */
@@ -194,6 +206,8 @@ struct eh_app_worker_params {/**< Specify status of rx type burst */ uint64_t tx_internal_port : 1;/**< Specify whether tx internal port is available */ + uint64_t ipsec_mode : 1; +/**< Specify ipsec processing level */ };uint64_t u64; } cap;
examples/ipsec-secgw/ipsec-secgw.c +337 -4
489 lines not on this page · raw message
examples/ipsec-secgw/ipsec.h +11 -0
@@ -153,6 +153,17 @@ struct ipsec_sa {struct rte_security_session_conf sess_conf; } __rte_cache_aligned; +struct sa_ctx { +void *satbl;/* pointer to array of rte_ipsec_sa objects*/ +struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; +union { +struct { +struct rte_crypto_sym_xform a; +struct rte_crypto_sym_xform b; + }; + } xf[IPSEC_SA_MAX_ENTRIES ]; +}; +struct ipsec_mbuf_metadata {struct ipsec_sa *sa;struct rte_crypto_op cop;
examples/ipsec-secgw/sa.c +0 -11
@@ -781,17 +781,6 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound)printf ("\n" ); } -struct sa_ctx { -void *satbl;/* pointer to array of rte_ipsec_sa objects*/ -struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; -union { -struct { -struct rte_crypto_sym_xform a; -struct rte_crypto_sym_xform b; - }; - } xf[IPSEC_SA_MAX_ENTRIES ]; -}; -static struct sa_ctx *sa_create (const char *name,int32_t socket_id) {
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Quoted 169 lines
Add eventmode support to ipsec-secgw. With the aid of event helper configure and use the eventmode capabilities.
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/event_helper.c | 4 +- examples/ipsec-secgw/event_helper.h | 14 ++ examples/ipsec-secgw/ipsec-secgw.c | 341 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/sa.c | 11 -- 5 files changed, 365 insertions(+), 16 deletions(-)examples/ipsec-secgw/event_helper.c +3
-1@@ -966,6 +966,8 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,else curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + curr_conf.cap.ipsec_mode = conf->ipsec_mode; +/* Parse the passed list and see if we have matching capabilities */ /* Initialize the pointer used to traverse the list */ @@ -1625,7 +1627,7 @@ eh_launch_worker(struct eh_conf *conf, struct eh_app_worker_params *app_wrkr, }/* Get eventmode conf */ - em_conf = (struct eventmode_conf *)(conf->mode_params); + em_conf = conf->mode_params;/* Get core ID */ lcore_id =rte_lcore_id ();examples/ipsec-secgw/event_helper.h +14
-0@@ -74,6 +74,14 @@ enum eh_tx_types {EH_TX_TYPE_NO_INTERNAL_PORT }; +/** +* Event mode ipsec mode types +*/ +enum eh_ipsec_mode_types { +EH_IPSEC_MODE_TYPE_APP =0 , +EH_IPSEC_MODE_TYPE_DRIVER +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;@@ -183,6 +191,10 @@ struct eh_conf {*/ void *mode_params;/**< Mode specific parameters */ + +/** Application specific params */ +enum eh_ipsec_mode_types ipsec_mode; +/**< Mode of ipsec run */ };/* Workers registered by the application */ @@ -194,6 +206,8 @@ struct eh_app_worker_params {/**< Specify status of rx type burst */ uint64_t tx_internal_port : 1;/**< Specify whether tx internal port is available */ + uint64_t ipsec_mode : 1; +/**< Specify ipsec processing level */ };uint64_t u64; } cap;examples/ipsec-secgw/ipsec-secgw.c +21
-1@@ -2,6 +2,7 @@* Copyright(c) 2016 Intel Corporation */ +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <stdint.h> @@ -14,6 +15,7 @@#include <sys/queue.h> #include <stdarg.h> #include <errno.h> +#include <signal.h> #include <getopt.h> #include <rte_common.h> @@ -41,12 +43,17 @@#include <rte_jhash.h> #include <rte_cryptodev.h> #include <rte_security.h> +#include <rte_bitmap.h> +#include <rte_eventdev.h> #include <rte_ip.h> #include <rte_ip_frag.h> +#include "event_helper.h" #include "ipsec.h" #include "parser.h" +volatile bool force_quit; +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define MAX_JUMBO_PKT_LEN 9600@@ -133,12 +140,20 @@ struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS];#define CMD_LINE_OPT_CONFIG "config"#define CMD_LINE_OPT_SINGLE_SA "single-sa"#define CMD_LINE_OPT_CRYPTODEV_MASK "cryptodev_mask" +#define CMD_LINE_OPT_TRANSFER_MODE "transfer-mode" +#define CMD_LINE_OPT_SCHEDULE_TYPE "schedule-type"#define CMD_LINE_OPT_RX_OFFLOAD "rxoffload"#define CMD_LINE_OPT_TX_OFFLOAD "txoffload"#define CMD_LINE_OPT_REASSEMBLE "reassemble"#define CMD_LINE_OPT_MTU "mtu"#define CMD_LINE_OPT_FRAG_TTL "frag-ttl" +#define CMD_LINE_ARG_EVENT "event" +#define CMD_LINE_ARG_POLL "poll" +#define CMD_LINE_ARG_ORDERED "ordered" +#define CMD_LINE_ARG_ATOMIC "atomic" +#define CMD_LINE_ARG_PARALLEL "parallel" +enum {/* long options mapped to a short option */ @@ -149,6 +164,8 @@ enum {CMD_LINE_OPT_CONFIG_NUM ,CMD_LINE_OPT_SINGLE_SA_NUM ,CMD_LINE_OPT_CRYPTODEV_MASK_NUM , +CMD_LINE_OPT_TRANSFER_MODE_NUM , +CMD_LINE_OPT_SCHEDULE_TYPE_NUM ,CMD_LINE_OPT_RX_OFFLOAD_NUM ,CMD_LINE_OPT_TX_OFFLOAD_NUM , CMD_LINE_OPT_REASSEMBLE_NUM,@@ -160,6 +177,8 @@ static const struct option lgopts[] = { {CMD_LINE_OPT_CONFIG, 1, 0, CMD_LINE_OPT_CONFIG_NUM}, {CMD_LINE_OPT_SINGLE_SA, 1, 0, CMD_LINE_OPT_SINGLE_SA_NUM}, {CMD_LINE_OPT_CRYPTODEV_MASK, 1, 0, CMD_LINE_OPT_CRYPTODEV_MASK_NUM}, + {CMD_LINE_OPT_TRANSFER_MODE, 1, 0, CMD_LINE_OPT_TRANSFER_MODE_NUM}, + {CMD_LINE_OPT_SCHEDULE_TYPE, 1, 0, CMD_LINE_OPT_SCHEDULE_TYPE_NUM}, {CMD_LINE_OPT_RX_OFFLOAD, 1, 0, CMD_LINE_OPT_RX_OFFLOAD_NUM}, {CMD_LINE_OPT_TX_OFFLOAD, 1, 0, CMD_LINE_OPT_TX_OFFLOAD_NUM}, {CMD_LINE_OPT_REASSEMBLE, 1, 0, CMD_LINE_OPT_REASSEMBLE_NUM},@@ -177,6 +196,7 @@ static int32_t numa_on = 1; /**< NUMA is enabled by default. */static uint32_t nb_lcores;static uint32_t single_sa;static uint32_t single_sa_idx; +static uint32_t schedule_type;/* * RX/TX HW offload capabilities to enable/use on ethernet ports. @@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) }static int32_t -check_params (void ) +check_params (struct eh_conf *eh_conf) {uint8_t lcore;uint16_t portid;
examples/ipsec-secgw/ipsec-secgw.c check_params(void) · line 1249
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +7
-0@@ -1220,6 +1240,14 @@ check_params(void)return -1 ; } } + +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_POLL ) { +if (schedule_type) { +printf ("error: option --schedule-type applies only to event mode\n" ); +return -1 ; + } + }
As a nit - might be better to keep check_params() intact,
and put this new check above into a separate function?check_eh_conf() or so?
Another thing it seems a bit clumsy construction to have global var (scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initially em_conf->ext_params.sched_type to some invalid value (-1 or so). Then after parse args you can check did its value change or not.
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.
Quoted 111 lines
examples/ipsec-secgw/ipsec-secgw.c +70
-1+return 0 ; }@@ -1277,6 +1305,8 @@ print_usage(const char *prgname)" --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]" " [--cryptodev_mask MASK]" +" [--transfer-mode MODE]" +" [--schedule-type TYPE]" " [--" CMD_LINE_OPT_RX_OFFLOAD " RX_OFFLOAD_MASK]" " [--" CMD_LINE_OPT_TX_OFFLOAD " TX_OFFLOAD_MASK]" " [--" CMD_LINE_OPT_REASSEMBLE " REASSEMBLE_TABLE_SIZE]" @@ -1298,6 +1328,14 @@ print_usage(const char *prgname)" bypassing the SP\n" " --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n" " devices to configure\n" +" --transfer-mode MODE\n" +" \"poll\" : Packet transfer via polling (default)\n" +" \"event\" : Packet transfer via event device\n" +" --schedule-type TYPE queue schedule type, used only when\n" +" transfer mode is set to event\n" +" \"ordered\" : Ordered (default)\n" +" \"atomic\" : Atomic\n" +" \"parallel\" : Parallel\n" " --" CMD_LINE_OPT_RX_OFFLOAD ": bitmask of the RX HW offload capabilities to enable/use\n" " (DEV_RX_OFFLOAD_*)\n" @@ -1432,8 +1470,45 @@ print_app_sa_prm(const struct app_sa_prm *prm)printf ("Frag TTL: %" PRIu64" ns\n" , frag_ttl_ns); } +static int +parse_transfer_mode (struct eh_conf *conf,const char *optarg) +{ +if (!strcmp (CMD_LINE_ARG_POLL , optarg)) + conf->mode =EH_PKT_TRANSFER_MODE_POLL ; +else if (!strcmp (CMD_LINE_ARG_EVENT , optarg)) + conf->mode =EH_PKT_TRANSFER_MODE_EVENT ; +else { +printf ("Unsupported packet transfer mode\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int +parse_schedule_type (struct eh_conf *conf,const char *optarg) +{ +struct eventmode_conf *em_conf =NULL ; + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +if (!strcmp (CMD_LINE_ARG_ORDERED , optarg)) + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_ORDERED ; +else if (!strcmp (CMD_LINE_ARG_ATOMIC , optarg)) + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_ATOMIC ; +else if (!strcmp (CMD_LINE_ARG_PARALLEL , optarg)) + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_PARALLEL ; +else { +printf ("Unsupported queue schedule type\n" ); +return -EINVAL ; + } + +return 0 ; +} +static int32_t -parse_args (int32_t argc,char **argv) +parse_args (int32_t argc,char **argv,struct eh_conf *eh_conf) {int opt;int64_t ret;@@ -1522,6 +1597,7 @@ parse_args(int32_t argc, char **argv)/* else */ single_sa =1 ; single_sa_idx = ret; + eh_conf->ipsec_mode =EH_IPSEC_MODE_TYPE_DRIVER ;printf ("Configured with single SA index %u\n" , single_sa_idx);break ;@@ -1536,6 +1612,26 @@ parse_args(int32_t argc, char **argv)/* else */ enabled_cryptodev_mask = ret;break ; + +case CMD_LINE_OPT_TRANSFER_MODE_NUM : + ret =parse_transfer_mode (eh_conf, optarg); +if (ret <0 ) { +printf ("Invalid packet transfer mode\n" ); +print_usage (prgname); +return -1 ; + } +break ; + +case CMD_LINE_OPT_SCHEDULE_TYPE_NUM : + ret =parse_schedule_type (eh_conf, optarg); +if (ret <0 ) { +printf ("Invalid queue schedule type\n" ); +print_usage (prgname); +return -1 ; + } + schedule_type =1 ; +break ; +case CMD_LINE_OPT_RX_OFFLOAD_NUM : ret =parse_mask (optarg, &dev_rx_offload);if (ret !=0 ) {
examples/ipsec-secgw/ipsec-secgw.c create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads) · line 2548
Quoted 3 lines
examples/ipsec-secgw/ipsec-secgw.c +0
-0@@ -2450,16 +2546,176 @@ create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads) port_id); }
Wouldn't it be more natural to have these 2 functions below (eh_conf_init(), eh_conf_uninit()) defined inside event_helper.c?
Quoted 144 lines
examples/ipsec-secgw/ipsec-secgw.c +144
-0+static struct eh_conf * +eh_conf_init (void ) +{ +struct eventmode_conf *em_conf =NULL ; +struct eh_conf *conf =NULL ; +unsigned int eth_core_id; +uint32_t nb_bytes; +void *mem =NULL ; + +/* Allocate memory for config */ + conf =calloc (1 ,sizeof (struct eh_conf )); +if (conf ==NULL ) { +printf ("Failed to allocate memory for eventmode helper conf" ); + goto err; + } + +/* Set default conf */ + +/* Packet transfer mode: poll */ + conf->mode =EH_PKT_TRANSFER_MODE_POLL ; + conf->ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + +/* Keep all ethernet ports enabled by default */ + conf->eth_portmask =-1 ; + +/* Allocate memory for event mode params */ + conf->mode_params =calloc (1 ,sizeof (struct eventmode_conf )); +if (conf->mode_params ==NULL ) { +printf ("Failed to allocate memory for event mode params" ); + goto err; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Allocate and initialize bitmap for eth cores */ + nb_bytes =rte_bitmap_get_memory_footprint (RTE_MAX_LCORE ); +if (!nb_bytes) { +printf ("Failed to get bitmap footprint" ); + goto err; + } + + mem =rte_zmalloc ("event-helper-ethcore-bitmap" , nb_bytes, +RTE_CACHE_LINE_SIZE ); +if (!mem) { +printf ("Failed to allocate memory for eth cores bitmap\n" ); + goto err; + } + + em_conf->eth_core_mask =rte_bitmap_init (RTE_MAX_LCORE , mem, nb_bytes); +if (!em_conf->eth_core_mask) { +printf ("Failed to initialize bitmap" ); + goto err; + } + +/* Schedule type: ordered */ + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_ORDERED ; + +/* Set two cores as eth cores for Rx & Tx */ + +/* Use first core other than master core as Rx core */ + eth_core_id =rte_get_next_lcore (0 ,/* curr core */ +1 ,/* skip master 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 master core */ +0 /* wrap */ ); + +rte_bitmap_set (em_conf->eth_core_mask, eth_core_id); + +return conf; +err: +rte_free (mem); +free (em_conf); +free (conf); +return NULL ; +} + +static void +eh_conf_uninit (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf =NULL ; + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Free evenmode configuration memory */ +rte_free (em_conf->eth_core_mask); +free (em_conf); +free (conf); +} + +static void +signal_handler (int signum) +{ +if (signum ==SIGINT || signum ==SIGTERM ) { +printf ("\n\nSignal %d received, preparing to exit...\n" , + signum); + force_quit = true; + } +} + +static void +inline_sessions_free (struct sa_ctx *sa_ctx) +{ +struct rte_ipsec_session *ips; +struct ipsec_sa *sa; +int32_t i, ret; + +for (i =0 ; i <IPSEC_SA_MAX_ENTRIES ; i++) { + + sa = &sa_ctx->sa[i]; +if (!sa->spi) +continue ; + + ips =ipsec_get_primary_session (sa); +if (ips->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL && + ips->type !=RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO ) +continue ; + + ret =rte_security_session_destroy ( +rte_eth_dev_get_sec_ctx (sa->portid), + ips->security.ses); +if (ret) +RTE_LOG (ERR ,IPSEC ,"Failed to destroy security " +"session type %d, spi %d\n" , + ips->type, sa->spi); + } +} + +static void +ev_mode_sess_verify (struct sa_ctx *sa_ctx) +{ +struct rte_ipsec_session *ips; +struct ipsec_sa *sa; +int32_t i; + +if (!sa_ctx) +return ; +
examples/ipsec-secgw/ipsec-secgw.c create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads) · line 2702
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +10
-0+for (i =0 ; i <IPSEC_SA_MAX_ENTRIES ; i++) { + + sa = &sa_ctx->sa[i]; +if (!sa->spi) +continue ; + + ips =ipsec_get_primary_session (sa); +if (ips->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ) +rte_exit (EXIT_FAILURE ,"Event mode supports only " +"inline protocol sessions\n" );
As I understand at that moment inline sessions already created on devices? For consistency wouldn't it be better to do this check at parsing cfg file, or straight after it?
Quoted 97 lines
examples/ipsec-secgw/ipsec-secgw.c +44
-2+ } + +} +int32_t main (int32_t argc,char **argv) {int32_t ret;uint32_t lcore_id; +uint32_t cdev_id;uint32_t i;uint8_t socket_id;uint16_t portid;uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ];uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ]; +struct eh_conf *eh_conf =NULL ;size_t sess_sz;/* init EAL */ @@ -2469,8 +2725,17 @@ main(int32_t argc, char **argv) argc -= ret; argv += ret; + force_quit = false; +signal (SIGINT , signal_handler); +signal (SIGTERM , signal_handler); + +/* initialize event helper configuration */ + eh_conf =eh_conf_init (); +if (eh_conf ==NULL ) +rte_exit (EXIT_FAILURE ,"Failed to init event helper config" ); +/* parse application arguments (after the EAL ones) */ - ret =parse_args (argc, argv); + ret =parse_args (argc, argv, eh_conf);if (ret <0 )rte_exit (EXIT_FAILURE ,"Invalid parameters\n" );@@ -2487,7 +2752,7 @@ main(int32_t argc, char **argv)rte_exit (EXIT_FAILURE ,"Invalid unprotected portmask 0x%x\n" , unprotected_port_mask); -if (check_params () <0 ) +if (check_params (eh_conf) <0 )rte_exit (EXIT_FAILURE ,"check_params failed\n" ); ret =init_lcore_rx_queues ();@@ -2529,6 +2794,18 @@ main(int32_t argc, char **argv)cryptodevs_init (); +/* +* Set the enabled port mask in helper config for use by helper +* sub-system. This will be used while initializing devices using +* helper sub-system. +*/ + eh_conf->eth_portmask = enabled_port_mask; + +/* Initialize eventmode components */ + ret =eh_devs_init (eh_conf); +if (ret <0 ) +rte_exit (EXIT_FAILURE ,"eh_devs_init failed, err=%d\n" , ret); +/* start ports */ RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 )@@ -2576,6 +2853,18 @@ main(int32_t argc, char **argv)sp4_init (&socket_ctx[socket_id], socket_id);sp6_init (&socket_ctx[socket_id], socket_id);rt_init (&socket_ctx[socket_id], socket_id); + +/* +* Event mode currently supports only inline protocol +* sessions. If there are other types of sessions +* configured then exit with error. +*/ +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_EVENT ) { +ev_mode_sess_verify ( + socket_ctx[socket_id].sa_in); +ev_mode_sess_verify ( + socket_ctx[socket_id].sa_out); + } } }@@ -2583,10 +2872,54 @@ main(int32_t argc, char **argv)/* launch per-lcore init on every lcore */ rte_eal_mp_remote_launch (main_loop,NULL ,CALL_MASTER ); +RTE_LCORE_FOREACH_SLAVE (lcore_id) {if (rte_eal_wait_lcore (lcore_id) <0 )return -1 ; } +/* Uninitialize eventmode components */ + ret =eh_devs_uninit (eh_conf);
examples/ipsec-secgw/ipsec-secgw.c main(int32_t argc, char **argv) · line 2892
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +10
-0+if (ret <0 ) +rte_exit (EXIT_FAILURE ,"eh_devs_uninit failed, err=%d\n" , ret); + +/* Free eventmode configuration memory */ +eh_conf_uninit (eh_conf); + +/* Destroy inline inbound and outbound sessions */ +for (i =0 ; i <NB_SOCKETS && i <rte_socket_count (); i++) { + socket_id =rte_socket_id_by_idx (i); +inline_sessions_free (socket_ctx[socket_id].sa_in);
That causes a crash on 2 socket system with the config that uses lcores only from the first socket.
Quoted 79 lines
examples/ipsec-secgw/ipsec-secgw.c +31
-0+inline_sessions_free (socket_ctx[socket_id].sa_out); + } + +for (cdev_id =0 ; cdev_id <rte_cryptodev_count (); cdev_id++) { +printf ("Closing cryptodev %d..." , cdev_id); +rte_cryptodev_stop (cdev_id); +rte_cryptodev_close (cdev_id); +printf (" Done\n" ); + } + +RTE_ETH_FOREACH_DEV (portid) { +if ((enabled_port_mask & (1 << portid)) ==0 ) +continue ; + +printf ("Closing port %d..." , portid); +if (flow_info_tbl[portid].rx_def_flow) { +struct rte_flow_error err; + + ret =rte_flow_destroy (portid, + flow_info_tbl[portid].rx_def_flow, &err); +if (ret) +RTE_LOG (ERR ,IPSEC ,"Failed to destroy flow " +" for port %u, err msg: %s\n" , portid, + err.message); + } +rte_eth_dev_stop (portid); +rte_eth_dev_close (portid); +printf (" Done\n" ); + } +printf ("Bye...\n" ); +return 0 ; }examples/ipsec-secgw/ipsec.h +11
-0@@ -153,6 +153,17 @@ struct ipsec_sa {struct rte_security_session_conf sess_conf; } __rte_cache_aligned; +struct sa_ctx { +void *satbl;/* pointer to array of rte_ipsec_sa objects*/ +struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; +union { +struct { +struct rte_crypto_sym_xform a; +struct rte_crypto_sym_xform b; + }; + } xf[IPSEC_SA_MAX_ENTRIES ]; +}; +struct ipsec_mbuf_metadata {struct ipsec_sa *sa;struct rte_crypto_op cop;examples/ipsec-secgw/sa.c +0
-12@@ -781,17 +781,6 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound)printf ("\n" ); } -struct sa_ctx { -void *satbl;/* pointer to array of rte_ipsec_sa objects*/ -struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; -union { -struct { -struct rte_crypto_sym_xform a; -struct rte_crypto_sym_xform b; - }; - } xf[IPSEC_SA_MAX_ENTRIES ]; -}; -static struct sa_ctx *sa_create (const char *name,int32_t socket_id) { --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Hi Konstantin,
Please see inline.
Thanks,
Lukasz
Quoted 178 lines · Konstantin
External Email
----------------------------------------------------------------------
Quoted 175 lines
Add eventmode support to ipsec-secgw. With the aid of event helper configure and use the eventmode capabilities.
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/event_helper.c | 4 +- examples/ipsec-secgw/event_helper.h | 14 ++ examples/ipsec-secgw/ipsec-secgw.c | 341 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/sa.c | 11 -- 5 files changed, 365 insertions(+), 16 deletions(-)examples/ipsec-secgw/event_helper.c +3
-1@@ -966,6 +966,8 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,else curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + curr_conf.cap.ipsec_mode = conf->ipsec_mode; +/* Parse the passed list and see if we have matching capabilities */ /* Initialize the pointer used to traverse the list */ @@ -1625,7 +1627,7 @@ eh_launch_worker(struct eh_conf *conf, struct eh_app_worker_params *app_wrkr, }/* Get eventmode conf */ - em_conf = (struct eventmode_conf *)(conf->mode_params); + em_conf = conf->mode_params;/* Get core ID */ lcore_id =rte_lcore_id ();examples/ipsec-secgw/event_helper.h +14
-0@@ -74,6 +74,14 @@ enum eh_tx_types {EH_TX_TYPE_NO_INTERNAL_PORT }; +/** +* Event mode ipsec mode types +*/ +enum eh_ipsec_mode_types { +EH_IPSEC_MODE_TYPE_APP =0 , +EH_IPSEC_MODE_TYPE_DRIVER +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;@@ -183,6 +191,10 @@ struct eh_conf {*/ void *mode_params;/**< Mode specific parameters */ + +/** Application specific params */ +enum eh_ipsec_mode_types ipsec_mode; +/**< Mode of ipsec run */ };/* Workers registered by the application */ @@ -194,6 +206,8 @@ struct eh_app_worker_params {/**< Specify status of rx type burst */ uint64_t tx_internal_port : 1;/**< Specify whether tx internal port is available */ + uint64_t ipsec_mode : 1; +/**< Specify ipsec processing level */ };uint64_t u64; } cap;examples/ipsec-secgw/ipsec-secgw.c +24
-1@@ -2,6 +2,7 @@* Copyright(c) 2016 Intel Corporation */ +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <stdint.h> @@ -14,6 +15,7 @@#include <sys/queue.h> #include <stdarg.h> #include <errno.h> +#include <signal.h> #include <getopt.h> #include <rte_common.h> @@ -41,12 +43,17 @@#include <rte_jhash.h> #include <rte_cryptodev.h> #include <rte_security.h> +#include <rte_bitmap.h> +#include <rte_eventdev.h> #include <rte_ip.h> #include <rte_ip_frag.h> +#include "event_helper.h" #include "ipsec.h" #include "parser.h" +volatile bool force_quit; +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define MAX_JUMBO_PKT_LEN 9600@@ -133,12 +140,20 @@ struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS];#define CMD_LINE_OPT_CONFIG "config"#define CMD_LINE_OPT_SINGLE_SA "single-sa"#define CMD_LINE_OPT_CRYPTODEV_MASK "cryptodev_mask" +#define CMD_LINE_OPT_TRANSFER_MODE "transfer-mode" +#define CMD_LINE_OPT_SCHEDULE_TYPE "schedule-type"#define CMD_LINE_OPT_RX_OFFLOAD "rxoffload"#define CMD_LINE_OPT_TX_OFFLOAD "txoffload"#define CMD_LINE_OPT_REASSEMBLE "reassemble"#define CMD_LINE_OPT_MTU "mtu"#define CMD_LINE_OPT_FRAG_TTL "frag-ttl" +#define CMD_LINE_ARG_EVENT "event" +#define CMD_LINE_ARG_POLL "poll" +#define CMD_LINE_ARG_ORDERED "ordered" +#define CMD_LINE_ARG_ATOMIC "atomic" +#define CMD_LINE_ARG_PARALLEL "parallel" +enum {/* long options mapped to a short option */ @@ -149,6 +164,8 @@ enum {CMD_LINE_OPT_CONFIG_NUM ,CMD_LINE_OPT_SINGLE_SA_NUM ,CMD_LINE_OPT_CRYPTODEV_MASK_NUM , +CMD_LINE_OPT_TRANSFER_MODE_NUM , +CMD_LINE_OPT_SCHEDULE_TYPE_NUM ,CMD_LINE_OPT_RX_OFFLOAD_NUM ,CMD_LINE_OPT_TX_OFFLOAD_NUM , CMD_LINE_OPT_REASSEMBLE_NUM,@@ -160,6 +177,8 @@ static const struct option lgopts[] = { {CMD_LINE_OPT_CONFIG, 1, 0, CMD_LINE_OPT_CONFIG_NUM}, {CMD_LINE_OPT_SINGLE_SA, 1, 0, CMD_LINE_OPT_SINGLE_SA_NUM}, {CMD_LINE_OPT_CRYPTODEV_MASK, 1, 0, CMD_LINE_OPT_CRYPTODEV_MASK_NUM}, + {CMD_LINE_OPT_TRANSFER_MODE, 1, 0, CMD_LINE_OPT_TRANSFER_MODE_NUM}, + {CMD_LINE_OPT_SCHEDULE_TYPE, 1, 0, CMD_LINE_OPT_SCHEDULE_TYPE_NUM}, {CMD_LINE_OPT_RX_OFFLOAD, 1, 0, CMD_LINE_OPT_RX_OFFLOAD_NUM}, {CMD_LINE_OPT_TX_OFFLOAD, 1, 0, CMD_LINE_OPT_TX_OFFLOAD_NUM}, {CMD_LINE_OPT_REASSEMBLE, 1, 0, CMD_LINE_OPT_REASSEMBLE_NUM},@@ -177,6 +196,7 @@ static int32_t numa_on = 1; /**< NUMA is enabled by default. */static uint32_t nb_lcores;static uint32_t single_sa;static uint32_t single_sa_idx; +static uint32_t schedule_type;/* * RX/TX HW offload capabilities to enable/use on ethernet ports. @@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) }static int32_t -check_params (void ) +check_params (struct eh_conf *eh_conf) {uint8_t lcore;uint16_t portid;@@ -1220,6 +1240,14 @@ check_params(void)return -1 ; } } + +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_POLL ) { +if (schedule_type) {
Quoted 8 lines
examples/ipsec-secgw/ipsec-secgw.c check_params(void) · line 1249
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +4
-0+printf ("error: option --schedule-type applies only to event mode\n" ); +return -1 ; + } + }As a nit - might be better to keep
check_params()intact, and put this new check above into a separate function?check_eh_conf()or so?
[Lukasz] I will put the check into new check_eh_conf() function.
Quoted 5 lines
Another thing it seems a bit clumsy construction to have global var (
scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initiallyem_conf->ext_params.sched_typeto some invalid value (-1 or so). Then after parse args you can check did its value change or not.
[Lukasz] I will change it in V3.
Quoted 10 lines
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.
[Lukasz] I would rather not combine event mode parameters into one for two reason:
- to be consistent with poll where one configuration item is controlled with one option,
- if we come up with a need to add a new event mode parameter in future then we we will need to split event-ordered back to --transfer-mode and --schedule-type to be consistent with how with provide event mode command line options.
Quoted 110 lines
Quoted 110 lines
examples/ipsec-secgw/ipsec-secgw.c +70
-1+return 0 ; }@@ -1277,6 +1305,8 @@ print_usage(const char *prgname)" --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]" " [--cryptodev_mask MASK]" +" [--transfer-mode MODE]" +" [--schedule-type TYPE]" " [--" CMD_LINE_OPT_RX_OFFLOAD " RX_OFFLOAD_MASK]" " [--" CMD_LINE_OPT_TX_OFFLOAD " TX_OFFLOAD_MASK]" " [--" CMD_LINE_OPT_REASSEMBLE " REASSEMBLE_TABLE_SIZE]" @@ -1298,6 +1328,14 @@ print_usage(const char *prgname)" bypassing the SP\n" " --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n" " devices to configure\n" +" --transfer-mode MODE\n" +" \"poll\" : Packet transfer via polling (default)\n" +" \"event\" : Packet transfer via event device\n" +" --schedule-type TYPE queue schedule type, used only when\n" +" transfer mode is set to event\n" +" \"ordered\" : Ordered (default)\n" +" \"atomic\" : Atomic\n" +" \"parallel\" : Parallel\n" " --" CMD_LINE_OPT_RX_OFFLOAD ": bitmask of the RX HW offload capabilities to enable/use\n" " (DEV_RX_OFFLOAD_*)\n" @@ -1432,8 +1470,45 @@ print_app_sa_prm(const struct app_sa_prm *prm)printf ("Frag TTL: %" PRIu64" ns\n" , frag_ttl_ns); } +static int +parse_transfer_mode (struct eh_conf *conf,const char *optarg) +{ +if (!strcmp (CMD_LINE_ARG_POLL , optarg)) + conf->mode =EH_PKT_TRANSFER_MODE_POLL ; +else if (!strcmp (CMD_LINE_ARG_EVENT , optarg)) + conf->mode =EH_PKT_TRANSFER_MODE_EVENT ; +else { +printf ("Unsupported packet transfer mode\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int +parse_schedule_type (struct eh_conf *conf,const char *optarg) +{ +struct eventmode_conf *em_conf =NULL ; + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +if (!strcmp (CMD_LINE_ARG_ORDERED , optarg)) + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_ORDERED ; +else if (!strcmp (CMD_LINE_ARG_ATOMIC , optarg)) + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_ATOMIC ; +else if (!strcmp (CMD_LINE_ARG_PARALLEL , optarg)) + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_PARALLEL ; +else { +printf ("Unsupported queue schedule type\n" ); +return -EINVAL ; + } + +return 0 ; +} +static int32_t -parse_args (int32_t argc,char **argv) +parse_args (int32_t argc,char **argv,struct eh_conf *eh_conf) {int opt;int64_t ret;@@ -1522,6 +1597,7 @@ parse_args(int32_t argc, char **argv)/* else */ single_sa =1 ; single_sa_idx = ret; + eh_conf->ipsec_mode =EH_IPSEC_MODE_TYPE_DRIVER ;printf ("Configured with single SA index %u\n" , single_sa_idx);break ;@@ -1536,6 +1612,26 @@ parse_args(int32_t argc, char **argv)/* else */ enabled_cryptodev_mask = ret;break ; + +case CMD_LINE_OPT_TRANSFER_MODE_NUM : + ret =parse_transfer_mode (eh_conf, optarg); +if (ret <0 ) { +printf ("Invalid packet transfer mode\n" ); +print_usage (prgname); +return -1 ; + } +break ; + +case CMD_LINE_OPT_SCHEDULE_TYPE_NUM : + ret =parse_schedule_type (eh_conf, optarg); +if (ret <0 ) { +printf ("Invalid queue schedule type\n" ); +print_usage (prgname); +return -1 ; + } + schedule_type =1 ; +break ; +case CMD_LINE_OPT_RX_OFFLOAD_NUM : ret =parse_mask (optarg, &dev_rx_offload);
Quoted 9 lines
examples/ipsec-secgw/ipsec-secgw.c create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads) · line 2548
Quoted 5 lines
examples/ipsec-secgw/ipsec-secgw.c +0
-0if (ret !=0 ) {@@ -2450,16 +2546,176 @@ create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads) port_id); }Wouldn't it be more natural to have these 2 functions below (
eh_conf_init(),eh_conf_uninit()) defined insideevent_helper.c?
[Lukasz] I will move these functions to event_helper.c.
Quoted 150 lines
Quoted 150 lines
examples/ipsec-secgw/ipsec-secgw.c +150
-0+static struct eh_conf * +eh_conf_init (void ) +{ +struct eventmode_conf *em_conf =NULL ; +struct eh_conf *conf =NULL ; +unsigned int eth_core_id; +uint32_t nb_bytes; +void *mem =NULL ; + +/* Allocate memory for config */ + conf =calloc (1 ,sizeof (struct eh_conf )); +if (conf ==NULL ) { +printf ("Failed to allocate memory for eventmode helper conf" ); + goto err; + } + +/* Set default conf */ + +/* Packet transfer mode: poll */ + conf->mode =EH_PKT_TRANSFER_MODE_POLL ; + conf->ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + +/* Keep all ethernet ports enabled by default */ + conf->eth_portmask =-1 ; + +/* Allocate memory for event mode params */ + conf->mode_params =calloc (1 ,sizeof (struct eventmode_conf )); +if (conf->mode_params ==NULL ) { +printf ("Failed to allocate memory for event mode params" ); + goto err; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Allocate and initialize bitmap for eth cores */ + nb_bytes =rte_bitmap_get_memory_footprint (RTE_MAX_LCORE ); +if (!nb_bytes) { +printf ("Failed to get bitmap footprint" ); + goto err; + } + + mem =rte_zmalloc ("event-helper-ethcore-bitmap" , nb_bytes, +RTE_CACHE_LINE_SIZE ); +if (!mem) { +printf ("Failed to allocate memory for eth cores bitmap\n" ); + goto err; + } + + em_conf->eth_core_mask =rte_bitmap_init (RTE_MAX_LCORE , mem, nb_bytes); +if (!em_conf->eth_core_mask) { +printf ("Failed to initialize bitmap" ); + goto err; + } + +/* Schedule type: ordered */ + em_conf->ext_params.sched_type =RTE_SCHED_TYPE_ORDERED ; + +/* Set two cores as eth cores for Rx & Tx */ + +/* Use first core other than master core as Rx core */ + eth_core_id =rte_get_next_lcore (0 ,/* curr core */ +1 ,/* skip master 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 master core */ +0 /* wrap */ ); + +rte_bitmap_set (em_conf->eth_core_mask, eth_core_id); + +return conf; +err: +rte_free (mem); +free (em_conf); +free (conf); +return NULL ; +} + +static void +eh_conf_uninit (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf =NULL ; + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Free evenmode configuration memory */ +rte_free (em_conf->eth_core_mask); +free (em_conf); +free (conf); +} + +static void +signal_handler (int signum) +{ +if (signum ==SIGINT || signum ==SIGTERM ) { +printf ("\n\nSignal %d received, preparing to exit...\n" , + signum); + force_quit = true; + } +} + +static void +inline_sessions_free (struct sa_ctx *sa_ctx) +{ +struct rte_ipsec_session *ips; +struct ipsec_sa *sa; +int32_t i, ret; + +for (i =0 ; i <IPSEC_SA_MAX_ENTRIES ; i++) { + + sa = &sa_ctx->sa[i]; +if (!sa->spi) +continue ; + + ips =ipsec_get_primary_session (sa); +if (ips->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL && + ips->type !=RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO ) +continue ; + + ret =rte_security_session_destroy ( +rte_eth_dev_get_sec_ctx (sa->portid), + ips->security.ses); +if (ret) +RTE_LOG (ERR ,IPSEC ,"Failed to destroy security " +"session type %d, spi %d\n" , + ips->type, sa->spi); + } +} + +static void +ev_mode_sess_verify (struct sa_ctx *sa_ctx) +{ +struct rte_ipsec_session *ips; +struct ipsec_sa *sa; +int32_t i; + +if (!sa_ctx) +return ; + +for (i =0 ; i <IPSEC_SA_MAX_ENTRIES ; i++) { + + sa = &sa_ctx->sa[i]; +if (!sa->spi) +continue ; +
Quoted 9 lines
examples/ipsec-secgw/ipsec-secgw.c create_default_ipsec_flow(uint16_t port_id, uint64_t rx_offloads) · line 2702
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +4
-0+ ips =ipsec_get_primary_session (sa); +if (ips->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ) +rte_exit (EXIT_FAILURE ,"Event mode supports only " +"inline protocol sessions\n" );As I understand at that moment inline sessions already created on devices? For consistency wouldn't it be better to do this check at parsing cfg file, or straight after it?
[Lukasz] I will move this check to be done after parsing cfg file into check_eh_conf() function.
Quoted 95 lines
Quoted 95 lines
examples/ipsec-secgw/ipsec-secgw.c +42
-2+ } + +} +int32_t main (int32_t argc,char **argv) {int32_t ret;uint32_t lcore_id; +uint32_t cdev_id;uint32_t i;uint8_t socket_id;uint16_t portid;uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ];uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ]; +struct eh_conf *eh_conf =NULL ;size_t sess_sz;/* init EAL */ @@ -2469,8 +2725,17 @@ main(int32_t argc, char **argv) argc -= ret; argv += ret; + force_quit = false; +signal (SIGINT , signal_handler); +signal (SIGTERM , signal_handler); + +/* initialize event helper configuration */ + eh_conf =eh_conf_init (); +if (eh_conf ==NULL ) +rte_exit (EXIT_FAILURE ,"Failed to init event helper config" ); +/* parse application arguments (after the EAL ones) */ - ret =parse_args (argc, argv); + ret =parse_args (argc, argv, eh_conf);if (ret <0 )rte_exit (EXIT_FAILURE ,"Invalid parameters\n" );@@ -2487,7 +2752,7 @@ main(int32_t argc, char **argv)rte_exit (EXIT_FAILURE ,"Invalid unprotected portmask 0x%x\n" , unprotected_port_mask); -if (check_params () <0 ) +if (check_params (eh_conf) <0 )rte_exit (EXIT_FAILURE ,"check_params failed\n" ); ret =init_lcore_rx_queues ();@@ -2529,6 +2794,18 @@ main(int32_t argc, char **argv)cryptodevs_init (); +/* +* Set the enabled port mask in helper config for use by helper +* sub-system. This will be used while initializing devices using +* helper sub-system. +*/ + eh_conf->eth_portmask = enabled_port_mask; + +/* Initialize eventmode components */ + ret =eh_devs_init (eh_conf); +if (ret <0 ) +rte_exit (EXIT_FAILURE ,"eh_devs_init failed, err=%d\n" , ret); +/* start ports */ RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 )@@ -2576,6 +2853,18 @@ main(int32_t argc, char **argv)sp4_init (&socket_ctx[socket_id], socket_id);sp6_init (&socket_ctx[socket_id], socket_id);rt_init (&socket_ctx[socket_id], socket_id); + +/* +* Event mode currently supports only inline protocol +* sessions. If there are other types of sessions +* configured then exit with error. +*/ +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_EVENT ) { +ev_mode_sess_verify ( + socket_ctx[socket_id].sa_in); +ev_mode_sess_verify ( + socket_ctx[socket_id].sa_out); + } } }@@ -2583,10 +2872,54 @@ main(int32_t argc, char **argv)/* launch per-lcore init on every lcore */ rte_eal_mp_remote_launch (main_loop,NULL ,CALL_MASTER ); +RTE_LCORE_FOREACH_SLAVE (lcore_id) {if (rte_eal_wait_lcore (lcore_id) <0 )return -1 ; }
Quoted 16 lines
examples/ipsec-secgw/ipsec-secgw.c main(int32_t argc, char **argv) · line 2892
Quoted 12 lines
examples/ipsec-secgw/ipsec-secgw.c +12
-0+/* Uninitialize eventmode components */ + ret =eh_devs_uninit (eh_conf); +if (ret <0 ) +rte_exit (EXIT_FAILURE ,"eh_devs_uninit failed, err=%d\n" , ret); + +/* Free eventmode configuration memory */ +eh_conf_uninit (eh_conf); + +/* Destroy inline inbound and outbound sessions */ +for (i =0 ; i <NB_SOCKETS && i <rte_socket_count (); i++) { + socket_id =rte_socket_id_by_idx (i); +inline_sessions_free (socket_ctx[socket_id].sa_in);That causes a crash on 2 socket system with the config that uses lcores only from the first socket.
[Lukasz] I will fix it in V3. Thanks
Quoted 80 lines
Quoted 79 lines
examples/ipsec-secgw/ipsec-secgw.c +31
-0+inline_sessions_free (socket_ctx[socket_id].sa_out); + } + +for (cdev_id =0 ; cdev_id <rte_cryptodev_count (); cdev_id++) { +printf ("Closing cryptodev %d..." , cdev_id); +rte_cryptodev_stop (cdev_id); +rte_cryptodev_close (cdev_id); +printf (" Done\n" ); + } + +RTE_ETH_FOREACH_DEV (portid) { +if ((enabled_port_mask & (1 << portid)) ==0 ) +continue ; + +printf ("Closing port %d..." , portid); +if (flow_info_tbl[portid].rx_def_flow) { +struct rte_flow_error err; + + ret =rte_flow_destroy (portid, + flow_info_tbl[portid].rx_def_flow, &err); +if (ret) +RTE_LOG (ERR ,IPSEC ,"Failed to destroy flow " +" for port %u, err msg: %s\n" , portid, + err.message); + } +rte_eth_dev_stop (portid); +rte_eth_dev_close (portid); +printf (" Done\n" ); + } +printf ("Bye...\n" ); +return 0 ; }examples/ipsec-secgw/ipsec.h +11
-0@@ -153,6 +153,17 @@ struct ipsec_sa {struct rte_security_session_conf sess_conf; } __rte_cache_aligned; +struct sa_ctx { +void *satbl;/* pointer to array of rte_ipsec_sa objects*/ +struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; +union { +struct { +struct rte_crypto_sym_xform a; +struct rte_crypto_sym_xform b; + }; + } xf[IPSEC_SA_MAX_ENTRIES ]; +}; +struct ipsec_mbuf_metadata {struct ipsec_sa *sa;struct rte_crypto_op cop;examples/ipsec-secgw/sa.c +0
-12@@ -781,17 +781,6 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound)printf ("\n" ); } -struct sa_ctx { -void *satbl;/* pointer to array of rte_ipsec_sa objects*/ -struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; -union { -struct { -struct rte_crypto_sym_xform a; -struct rte_crypto_sym_xform b; - }; - } xf[IPSEC_SA_MAX_ENTRIES ]; -}; -static struct sa_ctx *sa_create (const char *name,int32_t socket_id) { --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Hi Lukasz,
Quoted 49 lines
Quoted 19 lines
Quoted 19 lines
/*
* RX/TX HW offload capabilities to enable/use on ethernet ports.examples/ipsec-secgw/ipsec-secgw.c +4
-1@@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) }static int32_t -check_params (void ) +check_params (struct eh_conf *eh_conf) {uint8_t lcore;uint16_t portid;@@ -1220,6 +1240,14 @@ check_params(void)return -1 ; } } + +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_POLL ) { +if (schedule_type) {Quoted 8 lines
examples/ipsec-secgw/ipsec-secgw.c check_params(void) · line 1249
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +4
-0+printf ("error: option --schedule-type applies only to event mode\n" ); +return -1 ; + } + }As a nit - might be better to keep
check_params()intact, and put this new check above into a separate function?check_eh_conf()or so?[Lukasz] I will put the check into new
check_eh_conf()function.Quoted 5 lines
Another thing it seems a bit clumsy construction to have global var (
scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initiallyem_conf->ext_params.sched_typeto some invalid value (-1 or so). Then after parse args you can check did its value change or not.[Lukasz] I will change it in V3.
Quoted 10 lines
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.
Quoted 5 lines
[Lukasz] I would rather not combine event mode parameters into one for two reason:
- to be consistent with poll where one configuration item is controlled with one option,
- if we come up with a need to add a new event mode parameter in future then we we will need to split event-ordered back to --transfer-mode and --schedule-type to be consistent with how with provide event mode command line options.
I thought for future mods we can just keep adding new types here:
"event-xxx", "poll-yyy", etc.
But if you think separate ones is a better approach - I am fine. Konstantin
Re: [dpdk-dev] [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Quoted 69 lines
-----Original Message-----
From: Ananyev, Konstantin
Sent: Thursday, January 30, 2020 11:13 AM
To: Lukas Bartosik <[email protected]>; Anoob Joseph <[email protected]>; Akhil Goyal <[email protected]>; Nicolau, Radu <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; [email protected]
Subject: RE: [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgwHi Lukasz,
Quoted 49 lines
Quoted 19 lines
Quoted 19 lines
/*
* RX/TX HW offload capabilities to enable/use on ethernet ports.examples/ipsec-secgw/ipsec-secgw.c +4
-1@@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) }static int32_t -check_params (void ) +check_params (struct eh_conf *eh_conf) {uint8_t lcore;uint16_t portid;@@ -1220,6 +1240,14 @@ check_params(void)return -1 ; } } + +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_POLL ) { +if (schedule_type) {Quoted 8 lines
examples/ipsec-secgw/ipsec-secgw.c check_params(void) · line 1249
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +4
-0+printf ("error: option --schedule-type applies only to event mode\n" ); +return -1 ; + } + }As a nit - might be better to keep
check_params()intact, and put this new check above into a separate function?check_eh_conf()or so?[Lukasz] I will put the check into new
check_eh_conf()function.Quoted 5 lines
Another thing it seems a bit clumsy construction to have global var (
scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initiallyem_conf->ext_params.sched_typeto some invalid value (-1 or so). Then after parse args you can check did its value change or not.[Lukasz] I will change it in V3.
Quoted 10 lines
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.Quoted 5 lines
[Lukasz] I would rather not combine event mode parameters into one for two reason:
- to be consistent with poll where one configuration item is controlled with one option,
- if we come up with a need to add a new event mode parameter in future then we we will need to split event-ordered back to --transfer-mode and --schedule-type to be consistent with how with provide event mode command line options.
Quoted 3 lines
I thought for future mods we can just keep adding new types here:
"event-xxx", "poll-yyy", etc.
But if you think separate ones is a better approach - I am fine.
Probably one extra suggestion - would it make sense to change name for that option to have 'event' inside?
'--event-scheduler' or so.
Will probably make things a bit more clear.
Re: [dpdk-dev] [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Hi Konstantin,
Quoted 69 lines · Konstantin
Quoted 69 lines
-----Original Message-----
From: Ananyev, Konstantin
Sent: Thursday, January 30, 2020 11:13 AM
To: Lukas Bartosik <[email protected]>; Anoob Joseph <[email protected]>; Akhil Goyal <[email protected]>; Nicolau, Radu <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; [email protected]
Subject: RE: [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgwHi Lukasz,
Quoted 54 lines
Quoted 19 lines
Quoted 19 lines
/*
* RX/TX HW offload capabilities to enable/use on ethernet ports.examples/ipsec-secgw/ipsec-secgw.c +4
-1@@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) }static int32_t -check_params (void ) +check_params (struct eh_conf *eh_conf) {uint8_t lcore;uint16_t portid;@@ -1220,6 +1240,14 @@ check_params(void)return -1 ; } } + +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_POLL ) { +if (schedule_type) {Quoted 8 lines
examples/ipsec-secgw/ipsec-secgw.c check_params(void) · line 1249
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +4
-0+printf ("error: option --schedule-type applies only to event mode\n" ); +return -1 ; + } + }As a nit - might be better to keep
check_params()intact, and put this new check above into a separate function?check_eh_conf()or so?[Lukasz] I will put the check into new
check_eh_conf()function.Quoted 5 lines
Another thing it seems a bit clumsy construction to have global var (
scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initiallyem_conf->ext_params.sched_typeto some invalid value (-1 or so). Then after parse args you can check did its value change or not.[Lukasz] I will change it in V3.
Quoted 10 lines
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.[Lukasz] I would rather not combine event mode parameters into one for two reason:
- to be consistent with poll where one configuration item is controlled with one option,
- if we come up with a need to add a new event mode parameter in future then we we will need to split event-ordered back to --transfer-mode and --schedule-type to be consistent with how with provide event mode command line options.
Quoted 8 lines
Quoted 3 lines
I thought for future mods we can just keep adding new types here:
"event-xxx", "poll-yyy", etc.
But if you think separate ones is a better approach - I am fine.Probably one extra suggestion - would it make sense to change name for that option to have 'event' inside?
'--event-scheduler' or so.
Will probably make things a bit more clear.
[Lukasz] I will rename option --schedule-type to --event-scheduler
Re: [dpdk-dev] [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Hi Konstantin,
Quoted 76 lines · Lukasz Bartosik
Hi Konstantin,
Quoted 73 lines · Konstantin
Quoted 72 lines
-----Original Message-----
From: Ananyev, Konstantin
Sent: Thursday, January 30, 2020 11:13 AM
To: Lukas Bartosik <[email protected]>; Anoob Joseph <[email protected]>; Akhil Goyal <[email protected]>; Nicolau, Radu <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; [email protected]
Subject: RE: [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgwHi Lukasz,
Quoted 49 lines
Quoted 19 lines
Quoted 19 lines
/*
* RX/TX HW offload capabilities to enable/use on ethernet ports.examples/ipsec-secgw/ipsec-secgw.c +4
-1@@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) }static int32_t -check_params (void ) +check_params (struct eh_conf *eh_conf) {uint8_t lcore;uint16_t portid;@@ -1220,6 +1240,14 @@ check_params(void)return -1 ; } } + +if (eh_conf->mode ==EH_PKT_TRANSFER_MODE_POLL ) { +if (schedule_type) {Quoted 8 lines
examples/ipsec-secgw/ipsec-secgw.c check_params(void) · line 1249
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +4
-0+printf ("error: option --schedule-type applies only to event mode\n" ); +return -1 ; + } + }As a nit - might be better to keep
check_params()intact, and put this new check above into a separate function?check_eh_conf()or so?[Lukasz] I will put the check into new
check_eh_conf()function.Quoted 5 lines
Another thing it seems a bit clumsy construction to have global var (
scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initiallyem_conf->ext_params.sched_typeto some invalid value (-1 or so). Then after parse args you can check did its value change or not.[Lukasz] I will change it in V3.
Quoted 10 lines
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.Quoted 5 lines
[Lukasz] I would rather not combine event mode parameters into one for two reason:
- to be consistent with poll where one configuration item is controlled with one option,
- if we come up with a need to add a new event mode parameter in future then we we will need to split event-ordered back to --transfer-mode and --schedule-type to be consistent with how with provide event mode command line options.I thought for future mods we can just keep adding new types here:
"event-xxx", "poll-yyy", etc.
But if you think separate ones is a better approach - I am fine.
Quoted 6 lines
Quoted 4 lines
Probably one extra suggestion - would it make sense to change name for that option to have 'event' inside?
'--event-scheduler' or so.
Will probably make things a bit more clear.[Lukasz] I will rename option --schedule-type to --event-scheduler
[Lukasz] After reconsideration my proposal is to change option --schedule-type to --event-schedule-type. Are you ok with that ?
Re: [dpdk-dev] [EXT] RE: [PATCH v2 09/12] examples/ipsec-secgw: add eventmode to ipsec-secgw
Hi Lukasz,
Quoted 58 lines
Quoted 58 lines
Quoted 58 lines
Quoted 57 lines
Quoted 48 lines
Quoted 18 lines
Quoted 18 lines
/*
* RX/TX HW offload capabilities to enable/use on ethernet ports.(quoted diff) +4
-1@@ -1185,7 +1205,7 @@ main_loop(__attribute__((unused)) void *dummy) } static int32_t -check_params(void) +check_params(struct eh_conf *eh_conf) { uint8_t lcore; uint16_t portid;@@ -1220,6 +1240,14 @@ check_params(void) return -1; } } + + if (eh_conf->mode == EH_PKT_TRANSFER_MODE_POLL) { + if (schedule_type) {Quoted 8 lines
Review check_params(void) · line 1249
Quoted 4 lines
(quoted diff) +4
-0+ printf("error: option --schedule-type applies only to event mode\n"); + return -1; + } + }As a nit - might be better to keep
check_params()intact, and put this new check above into a separate function?check_eh_conf()or so?[Lukasz] I will put the check into new
check_eh_conf()function.Quoted 5 lines
Another thing it seems a bit clumsy construction to have global var (
scheduler_type) just to figure out was particular option present on command line or not. Probably simler way to avoid it - set initiallyem_conf->ext_params.sched_typeto some invalid value (-1 or so). Then after parse args you can check did its value change or not.[Lukasz] I will change it in V3.
Quoted 10 lines
As alternative thought: wouldn't it be better to unite both --transfer-mode and --schedule-type options into one?
Then possible values for this unite option would be:
"poll"
"event" (expands to "event-ordered")
"event-ordered"
"event-atomic"
"event-parallel"
And this situation you are checking above simply wouldn't be possible. Again probably would be easier/simpler for users.Quoted 5 lines
[Lukasz] I would rather not combine event mode parameters into one for two reason:
- to be consistent with poll where one configuration item is controlled with one option,
- if we come up with a need to add a new event mode parameter in future then we we will need to split event-ordered back to --transfer-mode and --schedule-type to be consistent with how with provide event mode command line options.I thought for future mods we can just keep adding new types here:
"event-xxx", "poll-yyy", etc.
But if you think separate ones is a better approach - I am fine.
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
Probably one extra suggestion - would it make sense to change name for that option to have 'event' inside?
'--event-scheduler' or so.
Will probably make things a bit more clear.[Lukasz] I will rename option --schedule-type to --event-scheduler
[Lukasz] After reconsideration my proposal is to change option --schedule-type to --event-schedule-type. Are you ok with that ?
Yes, sounds ok to me.
PATCH v2 10/12 examples/ipsec-secgw: add driver mode worker
In reply to Anoob JosephFrom: Lukasz Bartosik <[email protected]>
Add driver inbound and outbound worker thread for ipsec-secgw. In driver mode application does as little as possible. It simply forwards packets back to port from which traffic was received instructing HW to apply inline security processing using first outbound SA configured for a given port. If a port does not have SA configured outbound traffic on that port will be silently dropped. The aim of this mode is to measure HW capabilities. Driver mode is selected with single-sa option. The single-sa option accepts SA index however in event mode the SA index is ignored.
Example command to run ipsec-secgw in driver mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128
-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --schedule-type parallel --single-sa 0
--- examples/ipsec-secgw/Makefile | 1 + examples/ipsec-secgw/ipsec-secgw.c | 36 +++--- examples/ipsec-secgw/ipsec-secgw.h | 17 +++ examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/ipsec_worker.c | 240 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/meson.build | 2 +- 6 files changed, 291 insertions(+), 16 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c
examples/ipsec-secgw/Makefile +1 -0
@@ -15,6 +15,7 @@ SRCS-y += sa.c SRCS-y += rt.c SRCS-y += ipsec_process.c SRCS-y += ipsec-secgw.c +SRCS-y += ipsec_worker.c SRCS-y += event_helper.c CFLAGS += -gdwarf-2
examples/ipsec-secgw/ipsec-secgw.c +21 -15
@@ -70,8 +70,6 @@ volatile bool force_quit;#define BURST_TX_DRAIN_US 100/* TX drain every ~100us */ -#define NB_SOCKETS 4 -/* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3
@@ -79,8 +77,6 @@ volatile bool force_quit;#define MAX_LCORE_PARAMS 1024 -#define UNPROTECTED_PORT (port) (unprotected_port_mask & (1 << portid)) -/* * Configurable number of RX/TX ring descriptors */
@@ -190,12 +186,10 @@ static const struct option lgopts[] = {/* mask of enabled ports */ static uint32_t enabled_port_mask;static uint64_t enabled_cryptodev_mask =UINT64_MAX ; -static uint32_t unprotected_port_mask;static int32_t promiscuous_on =1 ;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; -static uint32_t single_sa_idx;static uint32_t schedule_type;/*
@@ -279,8 +273,6 @@ static struct rte_eth_conf port_conf = { }, }; -static struct socket_ctx socket_ctx[NB_SOCKETS ]; -/* * Determine is multi-segment support required: * - either frame buffer size is smaller then mtu
@@ -1114,8 +1106,8 @@ drain_outbound_crypto_queues(const struct lcore_conf *qconf, }/* main processing loop */ -static int32_t -main_loop (__attribute__((unused))void *dummy) +void +ipsec_poll_mode_worker (void ) {struct rte_mbuf *pkts[MAX_PKT_BURST ];uint32_t lcore_id;
@@ -1157,7 +1149,7 @@ main_loop(__attribute__((unused)) void *dummy)if (qconf->nb_rx_queue ==0 ) {RTE_LOG (DEBUG ,IPSEC ,"lcore %u has nothing to do\n" , lcore_id); -return 0 ; +return ; }RTE_LOG (INFO ,IPSEC ,"entering main loop on lcore %u\n" , lcore_id);
@@ -1170,7 +1162,7 @@ main_loop(__attribute__((unused)) void *dummy) lcore_id, portid, queueid); } -while (1 ) { +while (!force_quit) { cur_tsc =rte_rdtsc ();/* TX queue buffer drain */
@@ -1324,8 +1316,10 @@ print_usage(const char *prgname)" -a enables SA SQN atomic behaviour\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" -" --single-sa SAIDX: Use single SA index for outbound traffic,\n" -" bypassing the SP\n" +" --single-sa SAIDX: In poll mode use single SA index for\n" +" outbound traffic, bypassing the SP\n" +" In event mode selects driver mode,\n" +" SA index value is ignored\n" " --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n" " devices to configure\n" " --transfer-mode MODE\n"
@@ -1980,6 +1974,18 @@ cryptodevs_init(void) i++; } +/* +* Set the queue pair to at least the number of ethernet +* devices for inline outbound. +*/ + qp =RTE_MAX (rte_eth_dev_count_avail (), qp); + +/* +* The requested number of queues should never exceed +* the max available +*/ + qp =RTE_MIN (qp, max_nb_qps); +if (qp ==0 )continue ;
@@ -2871,7 +2877,7 @@ main(int32_t argc, char **argv)check_all_ports_link_status (enabled_port_mask);/* launch per-lcore init on every lcore */ -rte_eal_mp_remote_launch (main_loop,NULL ,CALL_MASTER ); +rte_eal_mp_remote_launch (ipsec_launch_one_lcore, eh_conf,CALL_MASTER );RTE_LCORE_FOREACH_SLAVE (lcore_id) {if (rte_eal_wait_lcore (lcore_id) <0 )
examples/ipsec-secgw/ipsec-secgw.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_SECGW_H_ +#define _IPSEC_SECGW_H_ + +#define NB_SOCKETS 4 + +#define UNPROTECTED_PORT (portid) (unprotected_port_mask & (1 << portid)) + +/* Port mask to identify the unprotected ports */ +uint32_t unprotected_port_mask; + +/* Index of SA in single mode */ +uint32_t single_sa_idx; + +#endif /* _IPSEC_SECGW_H_ */
examples/ipsec-secgw/ipsec.h +11 -0
@@ -13,6 +13,8 @@#include <rte_flow.h> #include <rte_ipsec.h> +#include "ipsec-secgw.h" +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3
@@ -258,6 +260,15 @@ struct ipsec_traffic {struct traffic_type ip6; }; +/* Socket ctx */ +struct socket_ctx socket_ctx[NB_SOCKETS ]; + +void +ipsec_poll_mode_worker (void ); + +int +ipsec_launch_one_lcore (void *args); +uint16_t ipsec_inbound (struct ipsec_ctx *ctx,struct rte_mbuf *pkts[],uint16_t nb_pkts,uint16_t len);
examples/ipsec-secgw/ipsec_worker.c new file +240 -0
240 lines not on this page · raw message
examples/ipsec-secgw/meson.build +1 -1
@@ -10,5 +10,5 @@ deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev'] allow_experimental_apis = true sources = files( 'esp.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c', - 'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c', 'event_helper.c' + 'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c', 'event_helper.c', 'ipsec_worker.c' )
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v2 10/12] examples/ipsec-secgw: add driver mode worker
Quoted 137 lines
Add driver inbound and outbound worker thread for ipsec-secgw. In driver mode application does as little as possible. It simply forwards packets back to port from which traffic was received instructing HW to apply inline security processing using first outbound SA configured for a given port. If a port does not have SA configured outbound traffic on that port will be silently dropped. The aim of this mode is to measure HW capabilities. Driver mode is selected with single-sa option. The single-sa option accepts SA index however in event mode the SA index is ignored.
Example command to run ipsec-secgw in driver mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128(quoted diff) +0
-4-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --schedule-type parallel --single-sa 0Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/Makefile | 1 + examples/ipsec-secgw/ipsec-secgw.c | 36 +++--- examples/ipsec-secgw/ipsec-secgw.h | 17 +++ examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/ipsec_worker.c | 240 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/meson.build | 2 +- 6 files changed, 291 insertions(+), 16 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.cexamples/ipsec-secgw/Makefile +1
-0@@ -15,6 +15,7 @@ SRCS-y += sa.c SRCS-y += rt.c SRCS-y += ipsec_process.c SRCS-y += ipsec-secgw.c +SRCS-y += ipsec_worker.c SRCS-y += event_helper.c CFLAGS += -gdwarf-2examples/ipsec-secgw/ipsec-secgw.c +10
-14@@ -70,8 +70,6 @@ volatile bool force_quit;#define BURST_TX_DRAIN_US 100/* TX drain every ~100us */ -#define NB_SOCKETS 4 -/* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3@@ -79,8 +77,6 @@ volatile bool force_quit;#define MAX_LCORE_PARAMS 1024 -#define UNPROTECTED_PORT (port) (unprotected_port_mask & (1 << portid)) -/* * Configurable number of RX/TX ring descriptors */ @@ -190,12 +186,10 @@ static const struct option lgopts[] = {/* mask of enabled ports */ static uint32_t enabled_port_mask;static uint64_t enabled_cryptodev_mask =UINT64_MAX ; -static uint32_t unprotected_port_mask;static int32_t promiscuous_on =1 ;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; -static uint32_t single_sa_idx;static uint32_t schedule_type;/* @@ -279,8 +273,6 @@ static struct rte_eth_conf port_conf = { }, }; -static struct socket_ctx socket_ctx[NB_SOCKETS ]; -/* * Determine is multi-segment support required: * - either frame buffer size is smaller then mtu @@ -1114,8 +1106,8 @@ drain_outbound_crypto_queues(const struct lcore_conf *qconf, }/* main processing loop */ -static int32_t -main_loop (__attribute__((unused))void *dummy) +void +ipsec_poll_mode_worker (void ) {struct rte_mbuf *pkts[MAX_PKT_BURST ];uint32_t lcore_id;@@ -1157,7 +1149,7 @@ main_loop(__attribute__((unused)) void *dummy)if (qconf->nb_rx_queue ==0 ) {RTE_LOG (DEBUG ,IPSEC ,"lcore %u has nothing to do\n" , lcore_id); -return 0 ; +return ; }RTE_LOG (INFO ,IPSEC ,"entering main loop on lcore %u\n" , lcore_id);@@ -1170,7 +1162,7 @@ main_loop(__attribute__((unused)) void *dummy) lcore_id, portid, queueid); } -while (1 ) { +while (!force_quit) { cur_tsc =rte_rdtsc ();/* TX queue buffer drain */ @@ -1324,8 +1316,10 @@ print_usage(const char *prgname)" -a enables SA SQN atomic behaviour\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" -" --single-sa SAIDX: Use single SA index for outbound traffic,\n" -" bypassing the SP\n" +" --single-sa SAIDX: In poll mode use single SA index for\n" +" outbound traffic, bypassing the SP\n" +" In event mode selects driver mode,\n" +" SA index value is ignored\n" " --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n" " devices to configure\n" " --transfer-mode MODE\n" @@ -1980,6 +1974,18 @@ cryptodevs_init(void) i++; } +/* +* Set the queue pair to at least the number of ethernet
examples/ipsec-secgw/ipsec-secgw.c cryptodevs_init(void) · line 1988
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +10
-0+* devices for inline outbound. +*/ + qp =RTE_MAX (rte_eth_dev_count_avail (), qp); + +/* +* The requested number of queues should never exceed +* the max available +*/ + qp =RTE_MIN (qp, max_nb_qps); +
Same comment as for v1:
I still don't understand why we have to do it for unconditionally. For poll mode it seems to bring nothing but waste of resources. Konstantin
Quoted 64 lines
examples/ipsec-secgw/ipsec-secgw.c +1
-1if (qp ==0 )continue ;@@ -2871,7 +2877,7 @@ main(int32_t argc, char **argv)check_all_ports_link_status (enabled_port_mask);/* launch per-lcore init on every lcore */ -rte_eal_mp_remote_launch (main_loop,NULL ,CALL_MASTER ); +rte_eal_mp_remote_launch (ipsec_launch_one_lcore, eh_conf,CALL_MASTER );RTE_LCORE_FOREACH_SLAVE (lcore_id) {if (rte_eal_wait_lcore (lcore_id) <0 )examples/ipsec-secgw/ipsec-secgw.h new file +17
-0@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_SECGW_H_ +#define _IPSEC_SECGW_H_ + +#define NB_SOCKETS 4 + +#define UNPROTECTED_PORT (portid) (unprotected_port_mask & (1 << portid)) + +/* Port mask to identify the unprotected ports */ +uint32_t unprotected_port_mask; + +/* Index of SA in single mode */ +uint32_t single_sa_idx; + +#endif /* _IPSEC_SECGW_H_ */ examples/ipsec-secgw/ipsec.h +11
-0@@ -13,6 +13,8 @@#include <rte_flow.h> #include <rte_ipsec.h> +#include "ipsec-secgw.h" +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3@@ -258,6 +260,15 @@ struct ipsec_traffic {struct traffic_type ip6; }; +/* Socket ctx */ +struct socket_ctx socket_ctx[NB_SOCKETS ]; + +void +ipsec_poll_mode_worker (void ); + +int +ipsec_launch_one_lcore (void *args); +uint16_t ipsec_inbound (struct ipsec_ctx *ctx,struct rte_mbuf *pkts[],uint16_t nb_pkts,uint16_t len);
PATCH v2 11/12 examples/ipsec-secgw: add app mode worker
In reply to Anoob JosephFrom: Lukasz Bartosik <[email protected]>
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Exampple ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128
-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --schedule-type parallel
--- examples/ipsec-secgw/ipsec-secgw.c | 45 +--- examples/ipsec-secgw/ipsec-secgw.h | 69 ++++++ examples/ipsec-secgw/ipsec.h | 22 -- examples/ipsec-secgw/ipsec_worker.c | 418 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec_worker.h | 39 ++++ 5 files changed, 533 insertions(+), 60 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec_worker.h
examples/ipsec-secgw/ipsec-secgw.c +8 -37
@@ -50,12 +50,11 @@#include "event_helper.h" #include "ipsec.h" +#include "ipsec_worker.h" #include "parser.h" volatile bool force_quit; -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 -#define MAX_JUMBO_PKT_LEN 9600#define MEMPOOL_CACHE_SIZE 256
@@ -85,29 +84,6 @@ volatile bool force_quit;static uint16_t nb_rxd =IPSEC_SECGW_RX_DESC_DEFAULT ;static uint16_t nb_txd =IPSEC_SECGW_TX_DESC_DEFAULT ; -#if RTE_BYTE_ORDER !=RTE_LITTLE_ENDIAN -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((a) & 0xff) << 56) | \ - ((uint64_t)((b) & 0xff) << 48) | \ - ((uint64_t)((c) & 0xff) << 40) | \ - ((uint64_t)((d) & 0xff) << 32) | \ - ((uint64_t)((e) & 0xff) << 24) | \ - ((uint64_t)((f) & 0xff) << 16) | \ - ((uint64_t)((g) & 0xff) << 8) | \ - ((uint64_t)(h) & 0xff)) -#else -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((h) & 0xff) << 56) | \ - ((uint64_t)((g) & 0xff) << 48) | \ - ((uint64_t)((f) & 0xff) << 40) | \ - ((uint64_t)((e) & 0xff) << 32) | \ - ((uint64_t)((d) & 0xff) << 24) | \ - ((uint64_t)((c) & 0xff) << 16) | \ - ((uint64_t)((b) & 0xff) << 8) | \ - ((uint64_t)(a) & 0xff)) -#endif -#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e, f, 0, 0)) -#define ETHADDR_TO_UINT64 (addr) __BYTES_TO_UINT64( \ (addr)->addr_bytes[0], (addr)->addr_bytes[1], \ (addr)->addr_bytes[2], (addr)->addr_bytes[3], \
@@ -119,18 +95,6 @@ static uint16_t nb_txd = IPSEC_SECGW_TX_DESC_DEFAULT;#define MTU_TO_FRAMELEN (x) ((x) + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) -/* port/source ethernet addr and destination ethernet addr */ -struct ethaddr_info { -uint64_t src, dst; -}; - -struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x08 ,0x69 ,0x26 ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x49 ,0x9e ,0xdd ) } -}; -struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ];#define CMD_LINE_OPT_CONFIG "config"
@@ -183,6 +147,13 @@ static const struct option lgopts[] = { {NULL, 0, 0, 0} }; +struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x08 ,0x69 ,0x26 ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x49 ,0x9e ,0xdd ) } +}; +/* mask of enabled ports */ static uint32_t enabled_port_mask;static uint64_t enabled_cryptodev_mask =UINT64_MAX ;
examples/ipsec-secgw/ipsec-secgw.h +69 -0
79 lines not on this page · raw message
examples/ipsec-secgw/ipsec.h +0 -22
@@ -15,11 +15,9 @@#include "ipsec-secgw.h" -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3 -#define MAX_PKT_BURST 32#define MAX_INFLIGHT 128#define MAX_QP_PER_LCORE 256
@@ -246,29 +244,9 @@ struct cnt_blk {uint32_t cnt; } __attribute__((packed)); -struct traffic_type { -const uint8_t *data[MAX_PKT_BURST *2 ]; -struct rte_mbuf *pkts[MAX_PKT_BURST *2 ]; -void *saptr[MAX_PKT_BURST *2 ]; -uint32_t res[MAX_PKT_BURST *2 ]; -uint32_t num; -}; - -struct ipsec_traffic { -struct traffic_type ipsec; -struct traffic_type ip4; -struct traffic_type ip6; -}; -/* Socket ctx */ struct socket_ctx socket_ctx[NB_SOCKETS ]; -void -ipsec_poll_mode_worker (void ); - -int -ipsec_launch_one_lcore (void *args); -uint16_t ipsec_inbound (struct ipsec_ctx *ctx,struct rte_mbuf *pkts[],uint16_t nb_pkts,uint16_t len);
examples/ipsec-secgw/ipsec_worker.c +417 -1
461 lines not on this page · raw message
examples/ipsec-secgw/ipsec_worker.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port +*/ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +/* TODO +* +* Move this function to ipsec_worker.c +*/ +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v2 11/12] examples/ipsec-secgw: add app mode worker
Quoted 109 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Exampple ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128(quoted diff) +0
-3-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/ipsec-secgw.c | 45 +--- examples/ipsec-secgw/ipsec-secgw.h | 69 ++++++ examples/ipsec-secgw/ipsec.h | 22 -- examples/ipsec-secgw/ipsec_worker.c | 418 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec_worker.h | 39 ++++ 5 files changed, 533 insertions(+), 60 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec_worker.hexamples/ipsec-secgw/ipsec-secgw.c +8
-37@@ -50,12 +50,11 @@#include "event_helper.h" #include "ipsec.h" +#include "ipsec_worker.h" #include "parser.h" volatile bool force_quit; -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 -#define MAX_JUMBO_PKT_LEN 9600#define MEMPOOL_CACHE_SIZE 256@@ -85,29 +84,6 @@ volatile bool force_quit;static uint16_t nb_rxd =IPSEC_SECGW_RX_DESC_DEFAULT ;static uint16_t nb_txd =IPSEC_SECGW_TX_DESC_DEFAULT ; -#if RTE_BYTE_ORDER !=RTE_LITTLE_ENDIAN -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((a) & 0xff) << 56) | \ - ((uint64_t)((b) & 0xff) << 48) | \ - ((uint64_t)((c) & 0xff) << 40) | \ - ((uint64_t)((d) & 0xff) << 32) | \ - ((uint64_t)((e) & 0xff) << 24) | \ - ((uint64_t)((f) & 0xff) << 16) | \ - ((uint64_t)((g) & 0xff) << 8) | \ - ((uint64_t)(h) & 0xff)) -#else -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((h) & 0xff) << 56) | \ - ((uint64_t)((g) & 0xff) << 48) | \ - ((uint64_t)((f) & 0xff) << 40) | \ - ((uint64_t)((e) & 0xff) << 32) | \ - ((uint64_t)((d) & 0xff) << 24) | \ - ((uint64_t)((c) & 0xff) << 16) | \ - ((uint64_t)((b) & 0xff) << 8) | \ - ((uint64_t)(a) & 0xff)) -#endif -#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e, f, 0, 0)) -#define ETHADDR_TO_UINT64 (addr) __BYTES_TO_UINT64( \ (addr)->addr_bytes[0], (addr)->addr_bytes[1], \ (addr)->addr_bytes[2], (addr)->addr_bytes[3], \@@ -119,18 +95,6 @@ static uint16_t nb_txd = IPSEC_SECGW_TX_DESC_DEFAULT;#define MTU_TO_FRAMELEN (x) ((x) + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) -/* port/source ethernet addr and destination ethernet addr */ -struct ethaddr_info { -uint64_t src, dst; -}; - -struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x08 ,0x69 ,0x26 ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x49 ,0x9e ,0xdd ) } -}; -struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ];#define CMD_LINE_OPT_CONFIG "config"@@ -183,6 +147,13 @@ static const struct option lgopts[] = { {NULL, 0, 0, 0} }; +struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x08 ,0x69 ,0x26 ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x49 ,0x9e ,0xdd ) } +}; +/* mask of enabled ports */ static uint32_t enabled_port_mask;static uint64_t enabled_cryptodev_mask =UINT64_MAX ;examples/ipsec-secgw/ipsec-secgw.h +0
-0@@ -4,10 +4,79 @@#ifndef _IPSEC_SECGW_H_#define _IPSEC_SECGW_H_
examples/ipsec-secgw/ipsec-secgw.h line 15
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.h +8
-0+#include <rte_hash.h> + +#define NB_SOCKETS 4 + +#define MAX_PKT_BURST 32 + +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 +#define NB_SOCKETS 4
Duplicate, NB_SOCKETS already defined, see above.
examples/ipsec-secgw/ipsec-secgw.h line 17
Quoted 2 lines
examples/ipsec-secgw/ipsec-secgw.h +0
-0#define UNPROTECTED_PORT (portid) (unprotected_port_mask & (1 << portid))
As you are moving it anyway probably a good time to put portid param in (), or even make it a static inline function.
Quoted 51 lines
examples/ipsec-secgw/ipsec-secgw.h +50
-0+#if RTE_BYTE_ORDER !=RTE_LITTLE_ENDIAN +#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ + (((uint64_t)((a) & 0xff) << 56) | \ + ((uint64_t)((b) & 0xff) << 48) | \ + ((uint64_t)((c) & 0xff) << 40) | \ + ((uint64_t)((d) & 0xff) << 32) | \ + ((uint64_t)((e) & 0xff) << 24) | \ + ((uint64_t)((f) & 0xff) << 16) | \ + ((uint64_t)((g) & 0xff) << 8) | \ + ((uint64_t)(h) & 0xff)) +#else +#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ + (((uint64_t)((h) & 0xff) << 56) | \ + ((uint64_t)((g) & 0xff) << 48) | \ + ((uint64_t)((f) & 0xff) << 40) | \ + ((uint64_t)((e) & 0xff) << 32) | \ + ((uint64_t)((d) & 0xff) << 24) | \ + ((uint64_t)((c) & 0xff) << 16) | \ + ((uint64_t)((b) & 0xff) << 8) | \ + ((uint64_t)(a) & 0xff)) +#endif + +#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e, f, 0, 0)) + +struct traffic_type { +const uint8_t *data[MAX_PKT_BURST *2 ]; +struct rte_mbuf *pkts[MAX_PKT_BURST *2 ]; +void *saptr[MAX_PKT_BURST *2 ]; +uint32_t res[MAX_PKT_BURST *2 ]; +uint32_t num; +}; + +struct ipsec_traffic { +struct traffic_type ipsec; +struct traffic_type ip4; +struct traffic_type ip6; +}; + +/* Fields optimized for devices without burst */ +struct traffic_type_nb { +const uint8_t *data; +struct rte_mbuf *pkt; +uint32_t res; +uint32_t num; +}; + +struct ipsec_traffic_nb { +struct traffic_type_nb ipsec; +struct traffic_type_nb ip4; +struct traffic_type_nb ip6;
examples/ipsec-secgw/ipsec-secgw.h line 78
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.h +10
-0+}; + +/* port/source ethernet addr and destination ethernet addr */ +struct ethaddr_info { +uint64_t src, dst; +}; + +struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ]; + +/* TODO: All var definitions need to be part of a .c file */
Seems like that TODO wasn't done :)
Probably a good thing to add extern for all global vars declarations here, and keep actual definitions in ipsec-secgw.c.
Same story for:
+struct socket_ctx socket_ctx[NB_SOCKETS];
in ipsec.h
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.h +1
-0+/* Port mask to identify the unprotected ports */ uint32_t unprotected_port_mask;
Re: [dpdk-dev] [PATCH v2 11/12] examples/ipsec-secgw: add app mode worker
Hi Konstantin,
Please see inline.
Thanks,
Anoob
Quoted 134 lines
-----Original Message-----
From: Ananyev, Konstantin <[email protected]>
Sent: Wednesday, January 29, 2020 9:05 PM
To: Anoob Joseph <[email protected]>; Akhil Goyal <[email protected]>; Nicolau, Radu <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Lukas Bartosik <[email protected]>; Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; [email protected]
Subject: [EXT] RE: [PATCH v2 11/12] examples/ipsec-secgw: add app mode workerExternal Email
----------------------------------------------------------------------
Quoted 45 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Exampple ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/ipsec-secgw.c | 45 +--- examples/ipsec-secgw/ipsec-secgw.h | 69 ++++++ examples/ipsec-secgw/ipsec.h | 22 -- examples/ipsec-secgw/ipsec_worker.c | 418 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec_worker.h | 39 ++++ 5 files changed, 533 insertions(+), 60 deletions(-) create mode100644
examples/ipsec-secgw/ipsec_worker.hexamples/ipsec-secgw/ipsec-secgw.c +1
-2@@ -50,12 +50,11 @@#include "event_helper.h" #include "ipsec.h" +#include "ipsec_worker.h" #include "parser.h" volatile bool force_quit; -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 -#define MAX_JUMBO_PKT_LEN 9600#define MEMPOOL_CACHE_SIZE 256@@ -85,29 +84,6 @@ volatile bool force_quit; static uint16_t nb_rxd =
IPSEC_SECGW_RX_DESC_DEFAULT; staticuint16_tnb_txd=IPSEC_SECGW_TX_DESC_DEFAULT;Quoted 1 line
-#if
RTE_BYTE_ORDER!=RTE_LITTLE_ENDIAN-#define__BYTES_TO_UINT64(a,
Quoted 22 lines
b, c, d, e, f, g, h) \
examples/ipsec-secgw/ipsec-secgw.c +0
-20- (((uint64_t )((a) &0xff ) <<56 ) | \ - ((uint64_t )((b) &0xff ) <<48 ) | \ - ((uint64_t )((c) &0xff ) <<40 ) | \ - ((uint64_t )((d) &0xff ) <<32 ) | \ - ((uint64_t )((e) &0xff ) <<24 ) | \ - ((uint64_t )((f) &0xff ) <<16 ) | \ - ((uint64_t )((g) &0xff ) <<8 ) | \ - ((uint64_t)(h) & 0xff)) -#else -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((h) & 0xff) << 56) | \ - ((uint64_t)((g) & 0xff) << 48) | \ - ((uint64_t)((f) & 0xff) << 40) | \ - ((uint64_t)((e) & 0xff) << 32) | \ - ((uint64_t)((d) & 0xff) << 24) | \ - ((uint64_t)((c) & 0xff) << 16) | \ - ((uint64_t)((b) & 0xff) << 8) | \ - ((uint64_t)(a) & 0xff)) -#endif -#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e,f, 0, 0))
examples/ipsec-secgw/ipsec-secgw.c volatile bool force_quit;
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +0
-1-#define ETHADDR_TO_UINT64 (addr) __BYTES_TO_UINT64( \ (addr)->addr_bytes[0], (addr)->addr_bytes[1], \ (addr)->addr_bytes[2], (addr)->addr_bytes[3], \ @@ -119,18+95,6 @@
Quoted 3 lines
static
uint16_tnb_txd=IPSEC_SECGW_TX_DESC_DEFAULT;#define
MTU_TO_FRAMELEN(x)((x) +RTE_ETHER_HDR_LEN+
RTE_ETHER_CRC_LEN)Quoted 38 lines
-/* port/source ethernet addr and destination ethernet addr */ -struct
ethaddr_info{examples/ipsec-secgw/ipsec-secgw.c +6
-10-uint64_t src, dst; -}; - -struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x08 ,0x69 ,0x26 ) }, - {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x49 ,0x9e ,0xdd ) } -}; -struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ];#define CMD_LINE_OPT_CONFIG "config"@@ -183,6 +147,13 @@ static const struct option lgopts[] = { {NULL, 0, 0, 0} }; +struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x08 ,0x69 ,0x26 ) }, + {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x49 ,0x9e ,0xdd ) } }; +/* mask of enabled ports */ static uint32_t enabled_port_mask; static uint64_t enabled_cryptodev_mask = UINT64_MAX; diff --git
a/examples/ipsec-secgw/ipsec-secgw.hb/examples/ipsec-secgw/ipsec-secgw.h
index 5b19e29..926ce5d 100644examples/ipsec-secgw/ipsec-secgw.h +0
-0@@ -4,10 +4,79 @@#ifndef _IPSEC_SECGW_H_#define _IPSEC_SECGW_H_
Quoted 11 lines
examples/ipsec-secgw/ipsec-secgw.h line 15
Quoted 9 lines
examples/ipsec-secgw/ipsec-secgw.h +8
-0+#include <rte_hash.h> + +#define NB_SOCKETS 4 + +#define MAX_PKT_BURST 32 + +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 +#define NB_SOCKETS 4Duplicate,
NB_SOCKETSalready defined, see above.
[Anoob] Good catch. Will fix in v3.
Quoted 7 lines
examples/ipsec-secgw/ipsec-secgw.h line 17
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.h +0
-0#define UNPROTECTED_PORT (portid) (unprotected_port_mask & (1 << portid))As you are moving it anyway probably a good time to put portid param in (), or even make it a static inline function.
[Anoob] I would prefer a static inline function. Shall I make this change in v3?
Quoted 63 lines
examples/ipsec-secgw/ipsec-secgw.h line 18
Quoted 3 lines
examples/ipsec-secgw/ipsec-secgw.h +1
-0+#if RTE_BYTE_ORDER != RTE_LITTLE_ENDIAN #define__BYTES_TO_UINT64(a,
Quoted 59 lines
examples/ipsec-secgw/ipsec-secgw.h +59
-0+b, c, d, e, f, g, h) \ + (((uint64_t )((a) &0xff ) <<56 ) | \ + ((uint64_t )((b) &0xff ) <<48 ) | \ + ((uint64_t )((c) &0xff ) <<40 ) | \ + ((uint64_t )((d) &0xff ) <<32 ) | \ + ((uint64_t )((e) &0xff ) <<24 ) | \ + ((uint64_t )((f) &0xff ) <<16 ) | \ + ((uint64_t )((g) &0xff ) <<8 ) | \ + ((uint64_t)(h) & 0xff)) +#else +#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ + (((uint64_t)((h) & 0xff) << 56) | \ + ((uint64_t)((g) & 0xff) << 48) | \ + ((uint64_t)((f) & 0xff) << 40) | \ + ((uint64_t)((e) & 0xff) << 32) | \ + ((uint64_t)((d) & 0xff) << 24) | \ + ((uint64_t)((c) & 0xff) << 16) | \ + ((uint64_t)((b) & 0xff) << 8) | \ + ((uint64_t)(a) & 0xff)) +#endif + +#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e, +f, 0, 0)) + +struct traffic_type { +const uint8_t *data[MAX_PKT_BURST *2 ]; +struct rte_mbuf *pkts[MAX_PKT_BURST *2 ]; +void *saptr[MAX_PKT_BURST *2 ]; +uint32_t res[MAX_PKT_BURST *2 ]; +uint32_t num; +}; + +struct ipsec_traffic { +struct traffic_type ipsec; +struct traffic_type ip4; +struct traffic_type ip6; +}; + +/* Fields optimized for devices without burst */ struct +traffic_type_nb { +const uint8_t *data; +struct rte_mbuf *pkt; +uint32_t res; +uint32_t num; +}; + +struct ipsec_traffic_nb { +struct traffic_type_nb ipsec; +struct traffic_type_nb ip4; +struct traffic_type_nb ip6; +}; + +/* port/source ethernet addr and destination ethernet addr */ struct +ethaddr_info { +uint64_t src, dst; +}; + +struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ]; +
Quoted 8 lines
examples/ipsec-secgw/ipsec-secgw.h line 78
Quoted 1 line
examples/ipsec-secgw/ipsec-secgw.h +1
-0+/* TODO: All var definitions need to be part of a .c file */ Seems like that TODO wasn't done :)
Probably a good thing to add extern for all global vars declarations here, and keep actual definitions inipsec-secgw.c.
Same story for:
+structsocket_ctxsocket_ctx[NB_SOCKETS];
inipsec.h
[Anoob] Will do in v3.
Quoted 5 lines
Quoted 5 lines
examples/ipsec-secgw/ipsec-secgw.h +1
-0+/* Port mask to identify the unprotected ports */ uint32_t unprotected_port_mask;
PATCH v2 12/12 examples/ipsec-secgw: add cmd line option for bufs
In reply to Anoob JosephFrom: Lukasz Bartosik <[email protected]>
Add command line option -s which can be used to configure number of buffers in a pool. Default number of buffers is 8192.
--- examples/ipsec-secgw/ipsec-secgw.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
examples/ipsec-secgw/ipsec-secgw.c +19 -4
@@ -59,8 +59,6 @@ volatile bool force_quit;#define MEMPOOL_CACHE_SIZE 256 -#define NB_MBUF (32000) -#define CDEV_QUEUE_DESC 2048#define CDEV_MAP_ENTRIES 16384#define CDEV_MP_NB_OBJS 1024
@@ -162,6 +160,7 @@ static int32_t numa_on = 1; /**< NUMA is enabled by default. */static uint32_t nb_lcores;static uint32_t single_sa;static uint32_t schedule_type; +static uint32_t nb_bufs_in_pool =8192 ;/* * RX/TX HW offload capabilities to enable/use on ethernet ports.
@@ -1264,6 +1263,7 @@ print_usage(const char *prgname)" [-w REPLAY_WINDOW_SIZE]" " [-e]" " [-a]" +" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]" " -f CONFIG_FILE" " --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]"
@@ -1285,6 +1285,7 @@ print_usage(const char *prgname)" size for each SA\n" " -e enables ESN\n" " -a enables SA SQN atomic behaviour\n" +" -s number of mbufs in packet pool (default 8192)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" " --single-sa SAIDX: In poll mode use single SA index for\n"
@@ -1484,7 +1485,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) argvopt = argv; -while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:" , +while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:s:" , lgopts, &option_index)) !=EOF ) {switch (opt) {
@@ -1518,6 +1519,19 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) cfgfile = optarg; f_present =1 ;break ; + +case 's' : + ret =parse_decimal (optarg); +if (ret <0 ) { +printf ("Invalid number of buffers in a pool: " +"%s\n" , optarg); +print_usage (prgname); +return -1 ; + } + + nb_bufs_in_pool = ret; +break ; +case 'j' : ret =parse_decimal (optarg); if (ret < RTE_MBUF_DEFAULT_BUF_SIZE ||
@@ -2753,11 +2767,12 @@ main(int32_t argc, char **argv)if (socket_ctx[socket_id].mbuf_pool)continue ; -pool_init (&socket_ctx[socket_id], socket_id,NB_MBUF ); +pool_init (&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);session_pool_init (&socket_ctx[socket_id], socket_id, sess_sz);session_priv_pool_init (&socket_ctx[socket_id], socket_id, sess_sz); } +printf ("Number of mbufs in packet pool %d\n" , nb_bufs_in_pool);RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 )
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v2 12/12] examples/ipsec-secgw: add cmd line option for bufs
Quoted 27 lines
From: Lukasz Bartosik <[email protected]>
Add command line option -s which can be used to configure number of buffers in a pool. Default number of buffers is 8192.
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/ipsec-secgw.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)examples/ipsec-secgw/ipsec-secgw.c +0
-2@@ -59,8 +59,6 @@ volatile bool force_quit;#define MEMPOOL_CACHE_SIZE 256 -#define NB_MBUF (32000) -#define CDEV_QUEUE_DESC 2048#define CDEV_MAP_ENTRIES 16384#define CDEV_MP_NB_OBJS 1024
examples/ipsec-secgw/ipsec-secgw.c static int32_t numa_on = 1; /**< NUMA is enabled by default. */ · line 163
Quoted 4 lines
examples/ipsec-secgw/ipsec-secgw.c +1
-0@@ -162,6 +160,7 @@ static int32_t numa_on = 1; /**< NUMA is enabled by default. */static uint32_t nb_lcores;static uint32_t single_sa;static uint32_t schedule_type; +static uint32_t nb_bufs_in_pool =8192 ;
I still think it is not a good idea to change default number of mbufs. 8K is not that much: 1 core with 4 ports, or 1 port over 4 cores, and user might start to see unexpected failures.
Now you added an option to allow user define number of mbufs in the app, which is a good thing, but default one I think should remain the same (to avoid any unexpected failures).
Konstantin
Quoted 64 lines
examples/ipsec-secgw/ipsec-secgw.c +18
-3/* * RX/TX HW offload capabilities to enable/use on ethernet ports. @@ -1264,6 +1263,7 @@ print_usage(const char *prgname)" [-w REPLAY_WINDOW_SIZE]" " [-e]" " [-a]" +" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]" " -f CONFIG_FILE" " --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]" @@ -1285,6 +1285,7 @@ print_usage(const char *prgname)" size for each SA\n" " -e enables ESN\n" " -a enables SA SQN atomic behaviour\n" +" -s number of mbufs in packet pool (default 8192)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" " --single-sa SAIDX: In poll mode use single SA index for\n" @@ -1484,7 +1485,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) argvopt = argv; -while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:" , +while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:s:" , lgopts, &option_index)) !=EOF ) {switch (opt) {@@ -1518,6 +1519,19 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) cfgfile = optarg; f_present =1 ;break ; + +case 's' : + ret =parse_decimal (optarg); +if (ret <0 ) { +printf ("Invalid number of buffers in a pool: " +"%s\n" , optarg); +print_usage (prgname); +return -1 ; + } + + nb_bufs_in_pool = ret; +break ; +case 'j' : ret =parse_decimal (optarg); if (ret < RTE_MBUF_DEFAULT_BUF_SIZE ||@@ -2753,11 +2767,12 @@ main(int32_t argc, char **argv)if (socket_ctx[socket_id].mbuf_pool)continue ; -pool_init (&socket_ctx[socket_id], socket_id,NB_MBUF ); +pool_init (&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);session_pool_init (&socket_ctx[socket_id], socket_id, sess_sz);session_priv_pool_init (&socket_ctx[socket_id], socket_id, sess_sz); } +printf ("Number of mbufs in packet pool %d\n" , nb_bufs_in_pool);RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 ) --2.7.4
Re: [dpdk-dev] [PATCH v2 12/12] examples/ipsec-secgw: add cmd line option for bufs
Hi Konstantin,
Please see inline.
Thanks,
Anoob
Quoted 50 lines
-----Original Message-----
From: Ananyev, Konstantin <[email protected]>
Sent: Wednesday, January 29, 2020 8:11 PM
To: Anoob Joseph <[email protected]>; Akhil Goyal <[email protected]>; Nicolau, Radu <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Lukas Bartosik <[email protected]>; Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; [email protected]
Subject: [EXT] RE: [PATCH v2 12/12] examples/ipsec-secgw: add cmd line option for bufsExternal Email
----------------------------------------------------------------------
Quoted 27 lines
From: Lukasz Bartosik <[email protected]>
Add command line option -s which can be used to configure number of buffers in a pool. Default number of buffers is 8192.
Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/ipsec-secgw.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)examples/ipsec-secgw/ipsec-secgw.c +0
-2@@ -59,8 +59,6 @@ volatile bool force_quit;#define MEMPOOL_CACHE_SIZE 256 -#define NB_MBUF (32000) -#define CDEV_QUEUE_DESC 2048#define CDEV_MAP_ENTRIES 16384#define CDEV_MP_NB_OBJS 1024examples/ipsec-secgw/ipsec-secgw.c static int32_t numa_on = 1; /**< NUMA is enabled · line 162
Quoted 3 lines
examples/ipsec-secgw/ipsec-secgw.c +1
-0@@ -162,6 +160,7 @@ static int32_t numa_on = 1; /**< NUMA is enabledby default. */ static uint32_t nb_lcores;static uint32_t single_sa;static uint32_t schedule_type; +static uint32_t nb_bufs_in_pool =8192 ;
Quoted 7 lines
I still think it is not a good idea to change default number of mbufs. 8K is not that much: 1 core with 4 ports, or 1 port over 4 cores, and user might start to see unexpected failures.
Now you added an option to allow user define number of mbufs in the app, which is a good thing, but default one I think should remain the same (to avoid any unexpected failures).
Konstantin
[Anoob] No disagreement. I had submitted this patch as is since I had some other ideas which could solve this better. I had mentioned this in the cover-letter.
Deferred to v3:
* The final patch updates the hardcoded number of buffers in a pool. Also, there was a discussion on the update of number of qp. Both the above can be handled properly, if we can remove the logic which limits one core to only use one crypto qp. If we can allow one qp per lcore_param, every eth queue can have it's own crypto qp and that would solve the requirements with OCTEON TX2 inline ipsec support as well.
http://patches.dpdk.org/patch/64408/
The above patch requires a minor rework and I would be submitting a v2 soon. But the idea would be same. Please take a look at it and share your thoughts. Please do wait for v2 before running on h/w, though 😊.
Quoted 69 lines
examples/ipsec-secgw/ipsec-secgw.c parse_args(int32_t argc, char **argv, struct
Quoted 32 lines
examples/ipsec-secgw/ipsec-secgw.c +3
-1/* * RX/TX HW offload capabilities to enable/use on ethernet ports. @@ -1264,6 +1263,7 @@ print_usage(const char *prgname)" [-w REPLAY_WINDOW_SIZE]" " [-e]" " [-a]" +" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]" " -f CONFIG_FILE" " --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]" @@ -1285,6 +1285,7 @@ print_usage(const char *prgname)" size for each SA\n" " -e enables ESN\n" " -a enables SA SQN atomic behaviour\n" +" -s number of mbufs in packet pool (default 8192)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" " --single-sa SAIDX: In poll mode use single SA index for\n" @@ -1484,7 +1485,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) argvopt = argv; -while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:" , +while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:s:" , lgopts, &option_index)) !=EOF ) {examples/ipsec-secgw/ipsec-secgw.c +0
-0switch (opt) {@@ -1518,6 +1519,19 @@ parse_args(int32_t argc, char **argv, struct
eh_conf*eh_conf)Quoted 9 lines
examples/ipsec-secgw/ipsec-secgw.c +6
-0cfgfile = optarg; f_present =1 ;break ; + +case 's' : + ret =parse_decimal (optarg); +if (ret <0 ) { +printf ("Invalid number of buffers in a pool: " +"%s\n" , optarg);examples/ipsec-secgw/ipsec-secgw.c parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf)
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +7
-0+print_usage (prgname); +return -1 ; + } + + nb_bufs_in_pool = ret; +break ; +case 'j' : ret =parse_decimal (optarg); if (ret < RTE_MBUF_DEFAULT_BUF_SIZE || @@ -2753,11 +2767,12 @@
Quoted 16 lines
main(int32_t argc, char **argv)examples/ipsec-secgw/ipsec-secgw.c +2
-2if (socket_ctx[socket_id].mbuf_pool)continue ; -pool_init (&socket_ctx[socket_id], socket_id,NB_MBUF ); +pool_init (&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);session_pool_init (&socket_ctx[socket_id], socket_id, sess_sz);session_priv_pool_init (&socket_ctx[socket_id], socket_id, sess_sz); } +printf ("Number of mbufs in packet pool %d\n" , nb_bufs_in_pool);RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 ) --2.7.4
Hi Akhil, Konstantin,
Do you have any further comments?
Thanks,
Anoob
Quoted 195 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Anoob Joseph
Sent: Monday, January 20, 2020 7:15 PM
To: Akhil Goyal <[email protected]>; Radu Nicolau <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Anoob Joseph <[email protected]>; Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; Lukas Bartosik <[email protected]>; Konstantin Ananyev <[email protected]>; [email protected]
Subject: [dpdk-dev] [PATCH v2 00/12] add eventmode to ipsec-secgwThis series introduces event-mode additions to ipsec-secgw. This effort is parallel to the similar changes in l2fwd (l2fwd-event app) & l3fwd.
With this series, ipsec-secgw would be able to run in eventmode. The worker thread (executing loop) would be receiving events and would be submitting it back to the eventdev after the processing. This way, multicore scaling and h/w assisted scheduling is achieved by making use of the eventdev capabilities.
Since the underlying event device would be having varying capabilities, the worker thread could be drafted differently to maximize performance. This series introduces usage of multiple worker threads, among which the one to be used will be determined by the operating conditions and the underlying device capabilities.
For example, if an event device - eth device pair has Tx internal port, then application can do
tx_adapter_enqueue()instead of regularevent_enqueue(). So a thread making an assumption that the device pair has internal port will not be the right solution for another pair. The infrastructure added with these patches aims to help application to have multiple worker threads, there by extracting maximum performance from every device without affecting existing paths/use cases.The eventmode configuration is predefined. All packets reaching one eth port will hit one event queue. All event queues will be mapped to all event ports. So all cores will be able to receive traffic from all ports. When
schedule_typeis set as RTE_SCHED_TYPE_ORDERED/ATOMIC, event device will ensure the ordering. Ordering would be lost when tried in PARALLEL.Following command line options are introduced,
--transfer-mode: to choose between poll mode & event mode --schedule-type: to specify the scheduling type
(RTE_SCHED_TYPE_ORDERED/
RTE_SCHED_TYPE_ATOMIC/RTE_SCHED_TYPE_PARALLEL)Additionally the event mode introduces two modes of processing packets:
Driver-mode: This mode will have bare minimum changes in the application
to support ipsec. There woudn't be any lookup etc done in the application. And for inline-protocol use case, the thread would resemble l2fwd as the ipsec processing would be done entirely in the h/w. This mode can be used to benchmark the raw performance of the h/w. All the application side steps (like lookup) can be redone based on the requirement of the end user. Hence the need for a mode which would report the raw performance.App-mode: This mode will have all the features currently implemented with
ipsec-secgw (nonlibrte_ipsecmode). All the lookups etc would follow the existing methods and would report numbers that can be compared against regular ipsec-secgw benchmark numbers.The driver mode is selected with existing --single-sa option (used also by poll mode). When --single-sa option is used in conjution with event mode then index passed to --single-sa is ignored.
Example commands to execute ipsec-secgw in various modes on OCTEON TX2 platform,
#Inbound and outbound app mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log- level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg -- transfer-mode event --schedule-type parallel#Inbound and outbound driver mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log- level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg -- transfer-mode event --schedule-type parallel --single-sa 0This series adds non burst tx internal port workers only. It provides infrastructure for non internal port workers, however does not define any. Also, only inline ipsec protocol mode is supported by the worker threads added.
Following are planned features,
1. Add burst mode workers.
2. Add non internal port workers.
3. Verify support for Rx core (the support is added but lack of h/w to verify).
4. Add lookaside protocol support.Following are features that Marvell won't be attempting.
1. Inline crypto support.
2. Lookaside crypto support.For the features that Marvell won't be attempting, new workers can be introduced by the respective stake holders.
This series is tested on Marvell OCTEON TX2.
Changes in v2:
* Remove --process-dir option. Instead use existing unprotected port mask option (-u) to decide wheter port handles inbound or outbound traffic.
* Remove --process-mode option. Instead use existing --single-sa option to select between app and driver modes.
* Add handling ofPKT_RX_SEC_OFFLOAD_FAILresult in app worker thread.
* Fix passing ofreq_rx_offloadflags tocreate_default_ipsec_flow().
* Move destruction of flows to a location where eth ports are stopped and closed.
* Print error and exit when event mode --schedule-type option is used in poll mode.
* Reduce number of goto statements replacing them with loop constructs.
* Removesec_session_fixedtable and replace it with locally build table in driver worker thread. Table is indexed by port identifier and holds first inline session pointer found for a given port.
* Print error and exit when sessions other than inline are configured in event mode.
* When number of event queues is less than number of eth ports then map all eth ports to one event queue.
* Cleanup and minor improvements in code as suggested by KonstantinDeferred to v3:
* The final patch updates the hardcoded number of buffers in a pool. Also, there was a discussion on the update of number of qp. Both the above can be handled properly, if we can remove the logic which limits one core to only use one crypto qp. If we can allow one qp perlcore_param, every eth queue can have it's own crypto qp and that would solve the requirements with OCTEON TX2 inline ipsec support as well.Patch with the mentioned change,
https://urldefense.proofpoint.com/v2/url?u=http-
3A__patches.dpdk.org_patch_64408_&d=DwIDAg&c=nKjWec2b6R0mOyPaz 7xtfQ&r=BPcGOOudUMrTDQ9YbgKcOkO5ChYiUPPlPNIEvTOhjNE&m=rg71UQ 1CwRYPFy30QuJQZd1Lam_kwYg15N2h5GN2iD4&s=yHzfRBRuunl4JWV97vufk 7aycUc472ahPVnQ9Tt6SeY&e=* Update ipsec-secgw documentation to describe the new options as well as event mode support.
This series depends on the PMD changes submitted in the following set,
https://urldefense.proofpoint.com/v2/url?u=http-
3A__patches.dpdk.org_project_dpdk_list_-3Fseries- 3D8203&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=BPcGOOudUMrTDQ9Y bgKcOkO5ChYiUPPlPNIEvTOhjNE&m=rg71UQ1CwRYPFy30QuJQZd1Lam_kwY g15N2h5GN2iD4&s=g2wtO9tOQTYHa9os1ECz5uwgpz9JmjTlGbEl- Cp6WAw&e=Ankur Dwivedi (1):
examples/ipsec-secgw: add defaultrte_flowfor inline RxAnoob Joseph (5):
examples/ipsec-secgw: add framework for eventmode helper examples/ipsec-secgw: add eventdev port-lcore link examples/ipsec-secgw: add Rx adapter support examples/ipsec-secgw: add Tx adapter support examples/ipsec-secgw: add routines to display configLukasz Bartosik (6):
examples/ipsec-secgw: add routines to launch workers examples/ipsec-secgw: add support for internal ports examples/ipsec-secgw: add eventmode to ipsec-secgw examples/ipsec-secgw: add driver mode worker examples/ipsec-secgw: add app mode worker examples/ipsec-secgw: add cmd line option for bufsexamples/ipsec-secgw/Makefile | 2 + examples/ipsec-secgw/event_helper.c | 1714 +++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 312 +++++++ examples/ipsec- secgw/ipsec-secgw.c | 502 ++++++++-- examples/ipsec-secgw/ipsec-secgw.h | 86 ++ examples/ipsec-secgw/ipsec.c | 7 + examples/ipsec-secgw/ipsec.h | 36 +- examples/ipsec-secgw/ipsec_worker.c | 656 ++++++++++++++ examples/ipsec-secgw/ipsec_worker.h | 39 + examples/ipsec-secgw/meson.build | 4 +- examples/ipsec-secgw/sa.c | 11 - 11 files changed, 3275 insertions(+), 94 deletions(-) create mode 100644 examples/ipsec-secgw/event_helper.c create mode 100644 examples/ipsec-secgw/event_helper.h create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c create mode 100644 examples/ipsec-secgw/ipsec_worker.h--
2.7.4
Quoted 5 lines
Hi Akhil, Konstantin,
Do you have any further comments?
Will try to have a proper look today/tomorrow.
Sorry for delay.
Konstantin
Quoted 199 lines
Thanks,
AnoobQuoted 195 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Anoob Joseph
Sent: Monday, January 20, 2020 7:15 PM
To: Akhil Goyal <[email protected]>; Radu Nicolau <[email protected]>; Thomas Monjalon <[email protected]>
Cc: Anoob Joseph <[email protected]>; Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; Lukas Bartosik <[email protected]>; Konstantin Ananyev <[email protected]>; [email protected]
Subject: [dpdk-dev] [PATCH v2 00/12] add eventmode to ipsec-secgwThis series introduces event-mode additions to ipsec-secgw. This effort is parallel to the similar changes in l2fwd (l2fwd-event app) & l3fwd.
With this series, ipsec-secgw would be able to run in eventmode. The worker thread (executing loop) would be receiving events and would be submitting it back to the eventdev after the processing. This way, multicore scaling and h/w assisted scheduling is achieved by making use of the eventdev capabilities.
Since the underlying event device would be having varying capabilities, the worker thread could be drafted differently to maximize performance. This series introduces usage of multiple worker threads, among which the one to be used will be determined by the operating conditions and the underlying device capabilities.
For example, if an event device - eth device pair has Tx internal port, then application can do
tx_adapter_enqueue()instead of regularevent_enqueue(). So a thread making an assumption that the device pair has internal port will not be the right solution for another pair. The infrastructure added with these patches aims to help application to have multiple worker threads, there by extracting maximum performance from every device without affecting existing paths/use cases.The eventmode configuration is predefined. All packets reaching one eth port will hit one event queue. All event queues will be mapped to all event ports. So all cores will be able to receive traffic from all ports. When
schedule_typeis set as RTE_SCHED_TYPE_ORDERED/ATOMIC, event device will ensure the ordering. Ordering would be lost when tried in PARALLEL.Following command line options are introduced,
--transfer-mode: to choose between poll mode & event mode --schedule-type: to specify the scheduling type
(RTE_SCHED_TYPE_ORDERED/
RTE_SCHED_TYPE_ATOMIC/RTE_SCHED_TYPE_PARALLEL)Additionally the event mode introduces two modes of processing packets:
Driver-mode: This mode will have bare minimum changes in the application
to support ipsec. There woudn't be any lookup etc done in the application. And for inline-protocol use case, the thread would resemble l2fwd as the ipsec processing would be done entirely in the h/w. This mode can be used to benchmark the raw performance of the h/w. All the application side steps (like lookup) can be redone based on the requirement of the end user. Hence the need for a mode which would report the raw performance.App-mode: This mode will have all the features currently implemented with
ipsec-secgw (nonlibrte_ipsecmode). All the lookups etc would follow the existing methods and would report numbers that can be compared against regular ipsec-secgw benchmark numbers.The driver mode is selected with existing --single-sa option (used also by poll mode). When --single-sa option is used in conjution with event mode then index passed to --single-sa is ignored.
Example commands to execute ipsec-secgw in various modes on OCTEON TX2 platform,
#Inbound and outbound app mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log- level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg -- transfer-mode event --schedule-type parallel#Inbound and outbound driver mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log- level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg -- transfer-mode event --schedule-type parallel --single-sa 0This series adds non burst tx internal port workers only. It provides infrastructure for non internal port workers, however does not define any. Also, only inline ipsec protocol mode is supported by the worker threads added.
Following are planned features,
1. Add burst mode workers.
2. Add non internal port workers.
3. Verify support for Rx core (the support is added but lack of h/w to verify).
4. Add lookaside protocol support.Following are features that Marvell won't be attempting.
1. Inline crypto support.
2. Lookaside crypto support.For the features that Marvell won't be attempting, new workers can be introduced by the respective stake holders.
This series is tested on Marvell OCTEON TX2.
Changes in v2:
* Remove --process-dir option. Instead use existing unprotected port mask option (-u) to decide wheter port handles inbound or outbound traffic.
* Remove --process-mode option. Instead use existing --single-sa option to select between app and driver modes.
* Add handling ofPKT_RX_SEC_OFFLOAD_FAILresult in app worker thread.
* Fix passing ofreq_rx_offloadflags tocreate_default_ipsec_flow().
* Move destruction of flows to a location where eth ports are stopped and closed.
* Print error and exit when event mode --schedule-type option is used in poll mode.
* Reduce number of goto statements replacing them with loop constructs.
* Removesec_session_fixedtable and replace it with locally build table in driver worker thread. Table is indexed by port identifier and holds first inline session pointer found for a given port.
* Print error and exit when sessions other than inline are configured in event mode.
* When number of event queues is less than number of eth ports then map all eth ports to one event queue.
* Cleanup and minor improvements in code as suggested by KonstantinDeferred to v3:
* The final patch updates the hardcoded number of buffers in a pool. Also, there was a discussion on the update of number of qp. Both the above can be handled properly, if we can remove the logic which limits one core to only use one crypto qp. If we can allow one qp perlcore_param, every eth queue can have it's own crypto qp and that would solve the requirements with OCTEON TX2 inline ipsec support as well.Patch with the mentioned change,
https://urldefense.proofpoint.com/v2/url?u=http-
3A__patches.dpdk.org_patch_64408_&d=DwIDAg&c=nKjWec2b6R0mOyPaz 7xtfQ&r=BPcGOOudUMrTDQ9YbgKcOkO5ChYiUPPlPNIEvTOhjNE&m=rg71UQ 1CwRYPFy30QuJQZd1Lam_kwYg15N2h5GN2iD4&s=yHzfRBRuunl4JWV97vufk 7aycUc472ahPVnQ9Tt6SeY&e=* Update ipsec-secgw documentation to describe the new options as well as event mode support.
This series depends on the PMD changes submitted in the following set,
https://urldefense.proofpoint.com/v2/url?u=http-
3A__patches.dpdk.org_project_dpdk_list_-3Fseries- 3D8203&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=BPcGOOudUMrTDQ9Y bgKcOkO5ChYiUPPlPNIEvTOhjNE&m=rg71UQ1CwRYPFy30QuJQZd1Lam_kwY g15N2h5GN2iD4&s=g2wtO9tOQTYHa9os1ECz5uwgpz9JmjTlGbEl- Cp6WAw&e=Ankur Dwivedi (1):
examples/ipsec-secgw: add defaultrte_flowfor inline RxAnoob Joseph (5):
examples/ipsec-secgw: add framework for eventmode helper examples/ipsec-secgw: add eventdev port-lcore link examples/ipsec-secgw: add Rx adapter support examples/ipsec-secgw: add Tx adapter support examples/ipsec-secgw: add routines to display configLukasz Bartosik (6):
examples/ipsec-secgw: add routines to launch workers examples/ipsec-secgw: add support for internal ports examples/ipsec-secgw: add eventmode to ipsec-secgw examples/ipsec-secgw: add driver mode worker examples/ipsec-secgw: add app mode worker examples/ipsec-secgw: add cmd line option for bufsexamples/ipsec-secgw/Makefile | 2 + examples/ipsec-secgw/event_helper.c | 1714 +++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 312 +++++++ examples/ipsec- secgw/ipsec-secgw.c | 502 ++++++++-- examples/ipsec-secgw/ipsec-secgw.h | 86 ++ examples/ipsec-secgw/ipsec.c | 7 + examples/ipsec-secgw/ipsec.h | 36 +- examples/ipsec-secgw/ipsec_worker.c | 656 ++++++++++++++ examples/ipsec-secgw/ipsec_worker.h | 39 + examples/ipsec-secgw/meson.build | 4 +- examples/ipsec-secgw/sa.c | 11 - 11 files changed, 3275 insertions(+), 94 deletions(-) create mode 100644 examples/ipsec-secgw/event_helper.c create mode 100644 examples/ipsec-secgw/event_helper.h create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c create mode 100644 examples/ipsec-secgw/ipsec_worker.h--
2.7.4
v3 cover add eventmode to ipsec-secgw
In reply to Anoob JosephThis series introduces event-mode additions to ipsec-secgw.
With this series, ipsec-secgw would be able to run in eventmode. The worker thread (executing loop) would be receiving events and would be submitting it back to the eventdev after the processing. This way, multicore scaling and h/w assisted scheduling is achieved by making use of the eventdev capabilities.
Since the underlying event device would be having varying capabilities, the worker thread could be drafted differently to maximize performance. This series introduces usage of multiple worker threads, among which the one to be used will be determined by the operating conditions and the underlying device capabilities.
For example, if an event device - eth device pair has Tx internal port, then application can do tx_adapter_enqueue() instead of regular event_enqueue(). So a thread making an assumption that the device pair has internal port will not be the right solution for another pair. The infrastructure added with these patches aims to help application to have multiple worker threads, there by extracting maximum performance from every device without affecting existing paths/use cases.
The eventmode configuration is predefined. All packets reaching one eth port will hit one event queue. All event queues will be mapped to all event ports. So all cores will be able to receive traffic from all ports. When schedule_type is set as RTE_SCHED_TYPE_ORDERED/ATOMIC, event device will ensure the ordering. Ordering would be lost when tried in PARALLEL.
Following command line options are introduced,
--transfer-mode: to choose between poll mode & event mode --event-schedule-type: to specify the scheduling type
(RTE_SCHED_TYPE_ORDERED/
RTE_SCHED_TYPE_ATOMIC/ RTE_SCHED_TYPE_PARALLEL)
Additionally the event mode introduces two modes of processing packets:
Driver-mode: This mode will have bare minimum changes in the application
to support ipsec. There woudn't be any lookup etc done in the application. And for inline-protocol use case, the thread would resemble l2fwd as the ipsec processing would be done entirely in the h/w. This mode can be used to benchmark the raw performance of the h/w. All the application side steps (like lookup) can be redone based on the requirement of the end user. Hence the need for a mode which would report the raw performance.
App-mode: This mode will have all the features currently implemented with
ipsec-secgw (non librte_ipsec mode). All the lookups etc would follow the existing methods and would report numbers that can be compared against regular ipsec-secgw benchmark numbers.
The driver mode is selected with existing --single-sa option (used also by poll mode). When --single-sa option is used in conjution with event mode then index passed to --single-sa is ignored.
Example commands to execute ipsec-secgw in various modes on OCTEON TX2 platform,
#Inbound and outbound app mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel
#Inbound and outbound driver mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel --single-sa 0
This series adds non burst tx internal port workers only. It provides infrastructure for non internal port workers, however does not define any. Also, only inline ipsec protocol mode is supported by the worker threads added.
Following are planned features,
1. Add burst mode workers.
2. Add non internal port workers.
3. Verify support for Rx core (the support is added but lack of h/w to verify).
4. Add lookaside protocol support.
Following are features that Marvell won't be attempting.
1. Inline crypto support.
2. Lookaside crypto support.
For the features that Marvell won't be attempting, new workers can be introduced by the respective stake holders.
This series is tested on Marvell OCTEON TX2.
Deferred to v4:
* Update ipsec-secgw documentation to describe the new options as well as event mode support.
Changes in v3:
* Move eh_conf_init() and eh_conf_uninit() functions to event_helper.c including minor rework.
* Rename --schedule-type option to --event-schedule-type.
* Replace macro UNPROTECTED_PORT with static inline function is_unprotected_port().
* Move definitions of global variables used by multiple modules to .c files and add externs in .h headers.
* Add eh_check_conf() which validates ipsec-secgw configuration for event mode.
* Add dynamic calculation of number of buffers in a pool based on number of cores, ports and crypto queues.
* Fix segmentation fault in event mode driver worker which happens when there are no inline outbound sessions configured.
* Remove change related to updating number of crypto queues in cryptodevs_init(). The update of crypto queues will be handled in a separate patch.
* Fix compilation error on 32-bit platforms by using userdata instead of udata64 from rte_mbuf.
Changes in v2:
* Remove --process-dir option. Instead use existing unprotected port mask option (-u) to decide wheter port handles inbound or outbound traffic.
* Remove --process-mode option. Instead use existing --single-sa option to select between app and driver modes.
* Add handling of PKT_RX_SEC_OFFLOAD_FAIL result in app worker thread.
* Fix passing of req_rx_offload flags to create_default_ipsec_flow().
* Move destruction of flows to a location where eth ports are stopped and closed.
* Print error and exit when event mode --schedule-type option is used in poll mode.
* Reduce number of goto statements replacing them with loop constructs.
* Remove sec_session_fixed table and replace it with locally build table in driver worker thread. Table is indexed by port identifier and holds first inline session pointer found for a given port.
* Print error and exit when sessions other than inline are configured in event mode.
* When number of event queues is less than number of eth ports then map all eth ports to one event queue.
* Cleanup and minor improvements in code as suggested by Konstantin
This series depends on the PMD changes submitted in the following set,
http://patches.dpdk.org/project/dpdk/list/?series=8411
Ankur Dwivedi (1):
examples/ipsec-secgw: add default rte flow for inline Rx
Anoob Joseph (5):
examples/ipsec-secgw: add framework for eventmode helper examples/ipsec-secgw: add eventdev port-lcore link examples/ipsec-secgw: add Rx adapter support examples/ipsec-secgw: add Tx adapter support examples/ipsec-secgw: add routines to display config
Lukasz Bartosik (7):
examples/ipsec-secgw: add routines to launch workers examples/ipsec-secgw: add support for internal ports examples/ipsec-secgw: add event helper config init/uninit examples/ipsec-secgw: add eventmode to ipsec-secgw examples/ipsec-secgw: add driver mode worker examples/ipsec-secgw: add app mode worker examples/ipsec-secgw: make number of buffers dynamic
examples/ipsec-secgw/Makefile | 2 + examples/ipsec-secgw/event_helper.c | 1818 +++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 335 +++++++ examples/ipsec-secgw/ipsec-secgw.c | 437 +++++++-- examples/ipsec-secgw/ipsec-secgw.h | 86 ++ examples/ipsec-secgw/ipsec.c | 7 + examples/ipsec-secgw/ipsec.h | 40 +- examples/ipsec-secgw/ipsec_worker.c | 659 +++++++++++++ examples/ipsec-secgw/ipsec_worker.h | 39 + examples/ipsec-secgw/meson.build | 4 +- examples/ipsec-secgw/sa.c | 19 +- 11 files changed, 3349 insertions(+), 97 deletions(-) create mode 100644 examples/ipsec-secgw/event_helper.c create mode 100644 examples/ipsec-secgw/event_helper.h create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c create mode 100644 examples/ipsec-secgw/ipsec_worker.h
Signature · 1 line
2.7.4
PATCH v3 1/13 examples/ipsec-secgw: add default rte flow for inline Rx
From: Ankur Dwivedi <[email protected]>
The default flow created would enable security processing on all ESP packets. If the default flow is created, SA based rte_flow creation would be skipped.
--- examples/ipsec-secgw/ipsec-secgw.c | 61 +++++++++++++++++++++++++++++++++----- examples/ipsec-secgw/ipsec.c | 7 +++++ examples/ipsec-secgw/ipsec.h | 6 ++++ 3 files changed, 66 insertions(+), 8 deletions(-)
examples/ipsec-secgw/ipsec-secgw.c +53 -8
@@ -128,6 +128,8 @@ struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS] = { { 0, ETHADDR(0x00, 0x16, 0x3e, 0x49, 0x9e, 0xdd) } }; +struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ]; +#define CMD_LINE_OPT_CONFIG "config"#define CMD_LINE_OPT_SINGLE_SA "single-sa"#define CMD_LINE_OPT_CRYPTODEV_MASK "cryptodev_mask"
@@ -2406,6 +2408,48 @@ reassemble_init(void)return rc; } +static void +create_default_ipsec_flow (uint16_t port_id,uint64_t rx_offloads) +{ +struct rte_flow_action action[2 ]; +struct rte_flow_item pattern[2 ]; +struct rte_flow_attr attr = {0 }; +struct rte_flow_error err; +struct rte_flow *flow; +int ret; + +if (!(rx_offloads &DEV_RX_OFFLOAD_SECURITY )) +return ; + +/* Add the default rte_flow to enable SECURITY for all ESP packets */ + + pattern[0 ].type =RTE_FLOW_ITEM_TYPE_ESP ; + pattern[0 ].spec =NULL ; + pattern[0 ].mask =NULL ; + pattern[0 ].last =NULL ; + pattern[1 ].type =RTE_FLOW_ITEM_TYPE_END ; + + action[0 ].type =RTE_FLOW_ACTION_TYPE_SECURITY ; + action[0 ].conf =NULL ; + action[1 ].type =RTE_FLOW_ACTION_TYPE_END ; + action[1 ].conf =NULL ; + + attr.ingress =1 ; + + ret =rte_flow_validate (port_id, &attr, pattern, action, &err); +if (ret) +return ; + + flow =rte_flow_create (port_id, &attr, pattern, action, &err); +if (flow ==NULL ) +return ; + + flow_info_tbl[port_id].rx_def_flow = flow; +RTE_LOG (INFO ,IPSEC , +"Created default flow enabling SECURITY for all ESP traffic on port %d\n" , + port_id); +} +int32_t main (int32_t argc,char **argv) {
@@ -2414,7 +2458,8 @@ main(int32_t argc, char **argv)uint32_t i;uint8_t socket_id;uint16_t portid; -uint64_t req_rx_offloads, req_tx_offloads; +uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ]; +uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ];size_t sess_sz;/* init EAL */
@@ -2476,8 +2521,10 @@ main(int32_t argc, char **argv)if ((enabled_port_mask & (1 << portid)) ==0 )continue ; -sa_check_offloads (portid, &req_rx_offloads, &req_tx_offloads); -port_init (portid, req_rx_offloads, req_tx_offloads); +sa_check_offloads (portid, &req_rx_offloads[portid], + &req_tx_offloads[portid]); +port_init (portid, req_rx_offloads[portid], + req_tx_offloads[portid]); }cryptodevs_init ();
@@ -2487,11 +2534,9 @@ main(int32_t argc, char **argv)if ((enabled_port_mask & (1 << portid)) ==0 )continue ; -/* -* Start device -* note: device must be started before a flow rule -* can be installed. -*/ +/* Create flow before starting the device */ +create_default_ipsec_flow (portid, req_rx_offloads[portid]); + ret =rte_eth_dev_start (portid);if (ret <0 ) rte_exit(EXIT_FAILURE, "rte_eth_dev_start: "
examples/ipsec-secgw/ipsec.c +7 -0
@@ -261,6 +261,12 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa,unsigned int i;unsigned int j; +/* Don't create flow if default flow is created */ +if (flow_info_tbl[sa->portid].rx_def_flow) { + sa->cdev_id_qp =0 ; +return 0 ; + } + ret =rte_eth_dev_info_get (sa->portid, &dev_info);if (ret !=0 ) { RTE_LOG(ERR, IPSEC,
@@ -396,6 +402,7 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa, ips->security.ol_flags = sec_cap->ol_flags; ips->security.ctx = sec_ctx; } + sa->cdev_id_qp =0 ;return 0 ;
examples/ipsec-secgw/ipsec.h +6 -0
@@ -81,6 +81,12 @@ struct app_sa_prm {extern struct app_sa_prm app_sa_prm; +struct flow_info { +struct rte_flow *rx_def_flow; +}; + +extern struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ]; +enum {IPSEC_SESSION_PRIMARY =0 ,IPSEC_SESSION_FALLBACK =1 ,
Signature · 1 line
2.7.4
PATCH v3 2/13 examples/ipsec-secgw: add framework for eventmode helper
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add framework for eventmode helper. Event mode involves initialization of multiple devices like eventdev, ethdev and etc. Add routines to initialize and uninitialize event device. Generate a default config for event device if it is not specified in the configuration. Currently event helper supports single event device only.
--- examples/ipsec-secgw/Makefile | 1 + examples/ipsec-secgw/event_helper.c | 326 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 115 +++++++++++++ examples/ipsec-secgw/meson.build | 4 +- 4 files changed, 444 insertions(+), 2 deletions(-) create mode 100644 examples/ipsec-secgw/event_helper.c create mode 100644 examples/ipsec-secgw/event_helper.h
examples/ipsec-secgw/Makefile +1 -0
@@ -15,6 +15,7 @@ SRCS-y += sa.c SRCS-y += rt.c SRCS-y += ipsec_process.c SRCS-y += ipsec-secgw.c +SRCS-y += event_helper.c CFLAGS += -gdwarf-2
examples/ipsec-secgw/event_helper.c new file +326 -0
326 lines not on this page · raw message
examples/ipsec-secgw/event_helper.h new file +115 -0
115 lines not on this page · raw message
examples/ipsec-secgw/meson.build +2 -2
@@ -6,9 +6,9 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec'] +deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev'] allow_experimental_apis = true sources = files( 'esp.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c', - 'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c' + 'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c', 'event_helper.c' )
Signature · 1 line
2.7.4
PATCH v3 3/13 examples/ipsec-secgw: add eventdev port-lcore link
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add event device port-lcore link and specify which event queues should be connected to the event port. Generate a default config for event port-lcore links if it is not specified in the configuration. This routine will check the number of available ports and then create links according to the number of cores available. This patch also adds a new entry in the eventmode conf to denote that all queues are to be linked with every port. This enables one core to receive packets from all ethernet ports.
--- examples/ipsec-secgw/event_helper.c | 126 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 33 ++++++++++ 2 files changed, 159 insertions(+)
examples/ipsec-secgw/event_helper.c +126 -0
@@ -1,11 +1,33 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright (C) 2020 Marvell International Ltd. */ +#include <rte_bitmap.h> #include <rte_ethdev.h> #include <rte_eventdev.h> +#include <rte_malloc.h> #include "event_helper.h" +static inline unsigned int +eh_get_next_active_core (struct eventmode_conf *em_conf,unsigned int prev_core) +{ +unsigned int next_core; + +/* Get next active core skipping cores reserved as eth cores */ +do { +/* Get the next core */ + next_core =rte_get_next_lcore (prev_core,0 ,0 ); + +/* Check if we have reached max lcores */ +if (next_core ==RTE_MAX_LCORE ) +return next_core; + + prev_core = next_core; + }while (rte_bitmap_get (em_conf->eth_core_mask, next_core)); + +return next_core; +} +static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -81,6 +103,71 @@ eh_set_default_conf_eventdev(struct eventmode_conf *em_conf) }static int +eh_set_default_conf_link (struct eventmode_conf *em_conf) +{ +struct eventdev_params *eventdev_config; +struct eh_event_link_info *link; +unsigned int lcore_id =-1 ; +int i, link_index; + +/* +* Create a 1:1 mapping from event ports to cores. If the number +* of event ports is lesser than the cores, some cores won't +* execute worker. If there are more event ports, then some ports +* won't be used. +* +*/ + +/* +* The event queue-port mapping is done according to the link. Since +* we are falling back to the default link config, enabling +* "all_ev_queue_to_ev_port" mode flag. This will map all queues +* to the port. +*/ + em_conf->ext_params.all_ev_queue_to_ev_port =1 ; + +/* Get first event dev conf */ + eventdev_config = &(em_conf->eventdev_config[0 ]); + +/* Loop through the ports */ +for (i =0 ; i < eventdev_config->nb_eventport; i++) { + +/* Get next active core id */ + lcore_id =eh_get_next_active_core (em_conf, + lcore_id); + +if (lcore_id ==RTE_MAX_LCORE ) { +/* Reached max cores */ +return 0 ; + } + +/* Save the current combination as one link */ + +/* Get the index */ + link_index = em_conf->nb_link; + +/* Get the corresponding link */ + link = &(em_conf->link[link_index]); + +/* Save link */ + link->eventdev_id = eventdev_config->eventdev_id; + link->event_port_id = i; + link->lcore_id = lcore_id; + +/* +* Don't set eventq_id as by default all queues +* need to be mapped to the port, which is controlled +* by the operating mode. +*/ + +/* Update number of links */ + em_conf->nb_link++; + } + +return 0 ; +} + +static int eh_validate_conf (struct eventmode_conf *em_conf) {int ret;
@@ -95,6 +182,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* +* Check if links are specified. Else generate a default config for +* the event ports used. +*/ +if (em_conf->nb_link ==0 ) { + ret =eh_set_default_conf_link (em_conf); +if (ret !=0 ) +return ret; + } +return 0 ; }
@@ -106,6 +203,8 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf)struct rte_event_dev_config eventdev_conf;struct eventdev_params *eventdev_config;int nb_eventdev = em_conf->nb_eventdev; +struct eh_event_link_info *link; +uint8_t *queue =NULL ;uint8_t eventdev_id;int nb_eventqueue;uint8_t i, j;
@@ -205,6 +304,33 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf) } } +/* Make event queue - event port link */ +for (j =0 ; j < em_conf->nb_link; j++) { + +/* Get link info */ + link = &(em_conf->link[j]); + +/* Get event dev ID */ + eventdev_id = link->eventdev_id; + +/* +* If "all_ev_queue_to_ev_port" params flag is selected, all +* queues need to be mapped to the port. +*/ +if (em_conf->ext_params.all_ev_queue_to_ev_port) + queue =NULL ; +else + queue = &(link->eventq_id); + +/* Link queue to port */ + ret =rte_event_port_link (eventdev_id, link->event_port_id, + queue,NULL ,1 ); +if (ret <0 ) { +EH_LOG_ERR ("Failed to link event port %d" , ret); +return ret; + } + } +/* Start event devices */ for (i =0 ; i < nb_eventdev; i++) {
examples/ipsec-secgw/event_helper.h +33 -0
@@ -20,6 +20,13 @@ extern "C" {/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS +/* Max event queues supported per event device */ +#define EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV RTE_EVENT_MAX_QUEUES_PER_DEV + +/* Max event-lcore links */ +#define EVENT_MODE_MAX_LCORE_LINKS \ + (EVENT_MODE_MAX_EVENT_DEVS * EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV) +/** * Packet transfer mode of the application */
@@ -36,17 +43,43 @@ struct eventdev_params {uint8_t ev_queue_mode; }; +/** +* Event-lcore link configuration +*/ +struct eh_event_link_info { +uint8_t eventdev_id; +/**< Event device ID */ +uint8_t event_port_id; +/**< Event port ID */ +uint8_t eventq_id; +/**< Event queue to be linked to the port */ +uint8_t lcore_id; +/**< Lcore to be polling on this port */ +}; +/* Eventmode conf data */ struct eventmode_conf {int nb_eventdev;/**< No of event devs */ struct eventdev_params eventdev_config[EVENT_MODE_MAX_EVENT_DEVS ];/**< Per event dev conf */ +uint8_t nb_link; +/**< No of links */ +struct eh_event_link_info + link[EVENT_MODE_MAX_LCORE_LINKS ]; +/**< Per link conf */ +struct rte_bitmap *eth_core_mask; +/**< Core mask of cores to be used for software Rx and Tx */ union {RTE_STD_C11 struct { uint64_t sched_type : 2;/**< Schedule type */ +uint64_t all_ev_queue_to_ev_port :1 ; +/**< +* When enabled, all event queues need to be mapped to +* each event port +*/ };uint64_t u64; } ext_params;
Signature · 1 line
2.7.4
PATCH v3 4/13 examples/ipsec-secgw: add Rx adapter support
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add Rx adapter support. The event helper init routine will initialize the Rx adapter according to the configuration. If Rx adapter config is not present it will generate a default config. If there are enough event queues available it will map eth ports and event queues 1:1 (one eth port will be connected to one event queue). Otherwise it will map all eth ports to one event queue.
--- examples/ipsec-secgw/event_helper.c | 273 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/event_helper.h | 29 ++++ 2 files changed, 301 insertions(+), 1 deletion(-)
examples/ipsec-secgw/event_helper.c +272 -1
@@ -4,10 +4,58 @@#include <rte_bitmap.h> #include <rte_ethdev.h> #include <rte_eventdev.h> +#include <rte_event_eth_rx_adapter.h> #include <rte_malloc.h> +#include <stdbool.h> #include "event_helper.h" +static int +eh_get_enabled_cores (struct rte_bitmap *eth_core_mask) +{ +int i, count =0 ; + +RTE_LCORE_FOREACH (i) { +/* Check if this core is enabled in core mask*/ +if (rte_bitmap_get (eth_core_mask, i)) { +/* Found enabled core */ + count++; + } + } +return count; +} + +static inline unsigned int +eh_get_next_eth_core (struct eventmode_conf *em_conf) +{ +static unsigned int prev_core =-1 ; +unsigned int next_core; + +/* +* Make sure we have at least one eth core running, else the following +* logic would lead to an infinite loop. +*/ +if (eh_get_enabled_cores (em_conf->eth_core_mask) ==0 ) { +EH_LOG_ERR ("No enabled eth core found" ); +return RTE_MAX_LCORE ; + } + +/* Only some cores are marked as eth cores, skip others */ +do { +/* Get the next core */ + next_core =rte_get_next_lcore (prev_core,0 ,1 ); + +/* Check if we have reached max lcores */ +if (next_core ==RTE_MAX_LCORE ) +return next_core; + +/* Update prev_core */ + prev_core = next_core; + }while (!(rte_bitmap_get (em_conf->eth_core_mask, next_core))); + +return next_core; +} +static inline unsigned int eh_get_next_active_core (struct eventmode_conf *em_conf,unsigned int prev_core) {
@@ -168,6 +216,82 @@ eh_set_default_conf_link(struct eventmode_conf *em_conf) }static int +eh_set_default_conf_rx_adapter (struct eventmode_conf *em_conf) +{ +struct rx_adapter_connection_info *conn; +struct eventdev_params *eventdev_config; +struct rx_adapter_conf *adapter; +bool single_ev_queue = false; +int eventdev_id; +int nb_eth_dev; +int adapter_id; +int conn_id; +int i; + +/* Create one adapter with eth queues mapped to event queue(s) */ + +if (em_conf->nb_eventdev ==0 ) { +EH_LOG_ERR ("No event devs registered" ); +return -EINVAL ; + } + +/* Get the number of eth devs */ + nb_eth_dev =rte_eth_dev_count_avail (); + +/* Use the first event dev */ + eventdev_config = &(em_conf->eventdev_config[0 ]); + +/* Get eventdev ID */ + eventdev_id = eventdev_config->eventdev_id; + adapter_id =0 ; + +/* Get adapter conf */ + adapter = &(em_conf->rx_adapter[adapter_id]); + +/* Set adapter conf */ + adapter->eventdev_id = eventdev_id; + adapter->adapter_id = adapter_id; + adapter->rx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Map all queues of eth device (port) to an event queue. If there +* are more event queues than eth ports then create 1:1 mapping. +* Otherwise map all eth ports to a single event queue. +*/ +if (nb_eth_dev > eventdev_config->nb_eventqueue) + single_ev_queue = true; + +for (i =0 ; i < nb_eth_dev; i++) { + +/* Use only the ports enabled */ +if ((em_conf->eth_portmask & (1 << i)) ==0 ) +continue ; + +/* Get the connection id */ + conn_id = adapter->nb_connections; + +/* Get the connection */ + conn = &(adapter->conn[conn_id]); + +/* Set mapping between eth ports & event queues*/ + conn->ethdev_id = i; + conn->eventq_id = single_ev_queue ?0 : i; + +/* Add all eth queues eth port to event queue */ + conn->ethdev_rx_qid =-1 ; + +/* Update no of connections */ + adapter->nb_connections++; + + } + +/* We have setup one adapter */ + em_conf->nb_rx_adapter =1 ; + +return 0 ; +} + +static int eh_validate_conf (struct eventmode_conf *em_conf) {int ret;
@@ -192,6 +316,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* +* Check if rx adapters are specified. Else generate a default config +* with one rx adapter and all eth queues - event queue mapped. +*/ +if (em_conf->nb_rx_adapter ==0 ) { + ret =eh_set_default_conf_rx_adapter (em_conf); +if (ret !=0 ) +return ret; + } +return 0 ; }
@@ -347,6 +481,104 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf)return 0 ; } +static int +eh_rx_adapter_configure (struct eventmode_conf *em_conf, +struct rx_adapter_conf *adapter) +{ +struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0 }; +struct rte_event_dev_info evdev_default_conf = {0 }; +struct rte_event_port_conf port_conf = {0 }; +struct rx_adapter_connection_info *conn; +uint8_t eventdev_id; +uint32_t service_id; +int ret; +int j; + +/* Get event dev ID */ + eventdev_id = adapter->eventdev_id; + +/* Get default configuration of event dev */ + ret =rte_event_dev_info_get (eventdev_id, &evdev_default_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to get event dev info %d" , ret); +return ret; + } + +/* Setup port conf */ + port_conf.new_event_threshold =1200 ; + port_conf.dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + port_conf.enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + +/* Create Rx adapter */ + ret =rte_event_eth_rx_adapter_create (adapter->adapter_id, + adapter->eventdev_id, &port_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to create rx adapter %d" , ret); +return ret; + } + +/* Setup various connections in the adapter */ +for (j =0 ; j < adapter->nb_connections; j++) { +/* Get connection */ + conn = &(adapter->conn[j]); + +/* Setup queue conf */ + queue_conf.ev.queue_id = conn->eventq_id; + queue_conf.ev.sched_type = em_conf->ext_params.sched_type; + queue_conf.ev.event_type =RTE_EVENT_TYPE_ETHDEV ; + +/* Add queue to the adapter */ + ret =rte_event_eth_rx_adapter_queue_add (adapter->adapter_id, + conn->ethdev_id, conn->ethdev_rx_qid, + &queue_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to add eth queue to rx adapter %d" , + ret); +return ret; + } + } + +/* Get the service ID used by rx adapter */ + ret =rte_event_eth_rx_adapter_service_id_get (adapter->adapter_id, + &service_id); +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ("Failed to get service id used by rx adapter %d" , + ret); +return ret; + } + +rte_service_set_runstate_mapped_check (service_id,0 ); + +/* Start adapter */ + ret =rte_event_eth_rx_adapter_start (adapter->adapter_id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to start rx adapter %d" , ret); +return ret; + } + +return 0 ; +} + +static int +eh_initialize_rx_adapter (struct eventmode_conf *em_conf) +{ +struct rx_adapter_conf *adapter; +int i, ret; + +/* Configure rx adapters */ +for (i =0 ; i < em_conf->nb_rx_adapter; i++) { + adapter = &(em_conf->rx_adapter[i]); + ret =eh_rx_adapter_configure (em_conf, adapter); +if (ret <0 ) { +EH_LOG_ERR ("Failed to configure rx adapter %d" , ret); +return ret; + } + } +return 0 ; +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -370,6 +602,9 @@ eh_devs_init(struct eh_conf *conf)/* Get eventmode conf */ em_conf = conf->mode_params; +/* Eventmode conf would need eth portmask */ + em_conf->eth_portmask = conf->eth_portmask; +/* Validate the requested config */ ret =eh_validate_conf (em_conf);if (ret <0 ) {
@@ -394,6 +629,13 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Setup Rx adapter */ + ret =eh_initialize_rx_adapter (em_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to initialize rx adapter %d" , ret); +return ret; + } +/* Start eth devices after setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
@@ -416,8 +658,8 @@ int32_t eh_devs_uninit(struct eh_conf *conf) {struct eventmode_conf *em_conf; +int ret, i, j;uint16_t id; -int ret, i;if (conf ==NULL ) {EH_LOG_ERR ("Invalid event helper configuration" );
@@ -435,6 +677,35 @@ eh_devs_uninit(struct eh_conf *conf)/* Get eventmode conf */ em_conf = conf->mode_params; +/* Stop and release rx adapters */ +for (i =0 ; i < em_conf->nb_rx_adapter; i++) { + + id = em_conf->rx_adapter[i].adapter_id; + ret =rte_event_eth_rx_adapter_stop (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to stop rx adapter %d" , ret); +return ret; + } + +for (j =0 ; j < em_conf->rx_adapter[i].nb_connections; j++) { + + ret =rte_event_eth_rx_adapter_queue_del (id, + em_conf->rx_adapter[i].conn[j].ethdev_id,-1 ); +if (ret <0 ) { +EH_LOG_ERR ( +"Failed to remove rx adapter queues %d" , + ret); +return ret; + } + } + + ret =rte_event_eth_rx_adapter_free (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to free rx adapter %d" , ret); +return ret; + } + } +/* Stop and release event devices */ for (i =0 ; i < em_conf->nb_eventdev; i++) {
examples/ipsec-secgw/event_helper.h +29 -0
@@ -20,6 +20,12 @@ extern "C" {/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS +/* Max Rx adapters supported */ +#define EVENT_MODE_MAX_RX_ADAPTERS RTE_EVENT_MAX_DEVS + +/* Max Rx adapter connections */ +#define EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER 16 +/* Max event queues supported per event device */ #define EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV RTE_EVENT_MAX_QUEUES_PER_DEV
@@ -57,12 +63,33 @@ struct eh_event_link_info {/**< Lcore to be polling on this port */ }; +/* Rx adapter connection info */ +struct rx_adapter_connection_info { +uint8_t ethdev_id; +uint8_t eventq_id; +int32_t ethdev_rx_qid; +}; + +/* Rx adapter conf */ +struct rx_adapter_conf { +int32_t eventdev_id; +int32_t adapter_id; +uint32_t rx_core_id; +uint8_t nb_connections; +struct rx_adapter_connection_info + conn[EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER ]; +}; +/* Eventmode conf data */ struct eventmode_conf {int nb_eventdev;/**< No of event devs */ struct eventdev_params eventdev_config[EVENT_MODE_MAX_EVENT_DEVS ];/**< Per event dev conf */ +uint8_t nb_rx_adapter; +/**< No of Rx adapters */ +struct rx_adapter_conf rx_adapter[EVENT_MODE_MAX_RX_ADAPTERS ]; +/**< Rx adapter conf */ uint8_t nb_link;/**< No of links */ struct eh_event_link_info
@@ -70,6 +97,8 @@ struct eventmode_conf {/**< Per link conf */ struct rte_bitmap *eth_core_mask;/**< Core mask of cores to be used for software Rx and Tx */ +uint32_t eth_portmask; +/**< Mask of the eth ports to be used */ union { RTE_STD_C11 struct {
Signature · 1 line
2.7.4
PATCH v3 5/13 examples/ipsec-secgw: add Tx adapter support
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add Tx adapter support. The event helper init routine will initialize the Tx adapter according to the configuration. If Tx adapter config is not present it will generate a default config.
--- examples/ipsec-secgw/event_helper.c | 313 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 48 ++++++ 2 files changed, 361 insertions(+)
examples/ipsec-secgw/event_helper.c +313 -0
@@ -5,6 +5,7 @@#include <rte_ethdev.h> #include <rte_eventdev.h> #include <rte_event_eth_rx_adapter.h> +#include <rte_event_eth_tx_adapter.h> #include <rte_malloc.h> #include <stdbool.h>
@@ -76,6 +77,22 @@ eh_get_next_active_core(struct eventmode_conf *em_conf, unsigned int prev_core)return next_core; } +static struct eventdev_params * +eh_get_eventdev_params (struct eventmode_conf *em_conf,uint8_t eventdev_id) +{ +int i; + +for (i =0 ; i < em_conf->nb_eventdev; i++) { +if (em_conf->eventdev_config[i].eventdev_id == eventdev_id) +break ; + } + +/* No match */ +if (i == em_conf->nb_eventdev) +return NULL ; + +return &(em_conf->eventdev_config[i]); +}static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -292,6 +309,95 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf) }static int +eh_set_default_conf_tx_adapter (struct eventmode_conf *em_conf) +{ +struct tx_adapter_connection_info *conn; +struct eventdev_params *eventdev_config; +struct tx_adapter_conf *tx_adapter; +int eventdev_id; +int adapter_id; +int nb_eth_dev; +int conn_id; +int i; + +/* +* Create one Tx adapter with all eth queues mapped to event queues +* 1:1. +*/ + +if (em_conf->nb_eventdev ==0 ) { +EH_LOG_ERR ("No event devs registered" ); +return -EINVAL ; + } + +/* Get the number of eth devs */ + nb_eth_dev =rte_eth_dev_count_avail (); + +/* Use the first event dev */ + eventdev_config = &(em_conf->eventdev_config[0 ]); + +/* Get eventdev ID */ + eventdev_id = eventdev_config->eventdev_id; + adapter_id =0 ; + +/* Get adapter conf */ + tx_adapter = &(em_conf->tx_adapter[adapter_id]); + +/* Set adapter conf */ + tx_adapter->eventdev_id = eventdev_id; + tx_adapter->adapter_id = adapter_id; + +/* TODO: Tx core is required only when internal port is not present */ + tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Application uses one event queue per adapter for submitting +* packets for Tx. Reserve the last queue available and decrement +* the total available event queues for this +*/ + +/* Queue numbers start at 0 */ + tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; + +/* +* Map all Tx queues of the eth device (port) to the event device. +*/ + +/* Set defaults for connections */ + +/* +* One eth device (port) is one connection. Map all Tx queues +* of the device to the Tx adapter. +*/ + +for (i =0 ; i < nb_eth_dev; i++) { + +/* Use only the ports enabled */ +if ((em_conf->eth_portmask & (1 << i)) ==0 ) +continue ; + +/* Get the connection id */ + conn_id = tx_adapter->nb_connections; + +/* Get the connection */ + conn = &(tx_adapter->conn[conn_id]); + +/* Add ethdev to connections */ + conn->ethdev_id = i; + +/* Add all eth tx queues to adapter */ + conn->ethdev_tx_qid =-1 ; + +/* Update no of connections */ + tx_adapter->nb_connections++; + } + +/* We have setup one adapter */ + em_conf->nb_tx_adapter =1 ; +return 0 ; +} + +static int eh_validate_conf (struct eventmode_conf *em_conf) {int ret;
@@ -326,6 +432,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* +* Check if tx adapters are specified. Else generate a default config +* with one tx adapter. +*/ +if (em_conf->nb_tx_adapter ==0 ) { + ret =eh_set_default_conf_tx_adapter (em_conf); +if (ret !=0 ) +return ret; + } +return 0 ; }
@@ -579,6 +695,133 @@ eh_initialize_rx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static int +eh_tx_adapter_configure (struct eventmode_conf *em_conf, +struct tx_adapter_conf *adapter) +{ +struct rte_event_dev_info evdev_default_conf = {0 }; +struct rte_event_port_conf port_conf = {0 }; +struct tx_adapter_connection_info *conn; +struct eventdev_params *eventdev_config; +uint8_t tx_port_id =0 ; +uint8_t eventdev_id; +uint32_t service_id; +int ret, j; + +/* Get event dev ID */ + eventdev_id = adapter->eventdev_id; + +/* Get event device conf */ + eventdev_config =eh_get_eventdev_params (em_conf, eventdev_id); + +/* Create Tx adapter */ + +/* Get default configuration of event dev */ + ret =rte_event_dev_info_get (eventdev_id, &evdev_default_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to get event dev info %d" , ret); +return ret; + } + +/* Setup port conf */ + port_conf.new_event_threshold = + evdev_default_conf.max_num_events; + port_conf.dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + port_conf.enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + +/* Create adapter */ + ret =rte_event_eth_tx_adapter_create (adapter->adapter_id, + adapter->eventdev_id, &port_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to create tx adapter %d" , ret); +return ret; + } + +/* Setup various connections in the adapter */ +for (j =0 ; j < adapter->nb_connections; j++) { + +/* Get connection */ + conn = &(adapter->conn[j]); + +/* Add queue to the adapter */ + ret =rte_event_eth_tx_adapter_queue_add (adapter->adapter_id, + conn->ethdev_id, conn->ethdev_tx_qid); +if (ret <0 ) { +EH_LOG_ERR ("Failed to add eth queue to tx adapter %d" , + ret); +return ret; + } + } + +/* Setup Tx queue & port */ + +/* Get event port used by the adapter */ + ret =rte_event_eth_tx_adapter_event_port_get ( + adapter->adapter_id, &tx_port_id); +if (ret) { +EH_LOG_ERR ("Failed to get tx adapter port id %d" , ret); +return ret; + } + +/* +* Tx event queue is reserved for Tx adapter. Unlink this queue +* from all other ports +* +*/ +for (j =0 ; j < eventdev_config->nb_eventport; j++) { +rte_event_port_unlink (eventdev_id, j, + &(adapter->tx_ev_queue),1 ); + } + +/* Link Tx event queue to Tx port */ + ret =rte_event_port_link (eventdev_id, tx_port_id, + &(adapter->tx_ev_queue),NULL ,1 ); +if (ret !=1 ) { +EH_LOG_ERR ("Failed to link event queue to port" ); +return ret; + } + +/* Get the service ID used by Tx adapter */ + ret =rte_event_eth_tx_adapter_service_id_get (adapter->adapter_id, + &service_id); +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ("Failed to get service id used by tx adapter %d" , + ret); +return ret; + } + +rte_service_set_runstate_mapped_check (service_id,0 ); + +/* Start adapter */ + ret =rte_event_eth_tx_adapter_start (adapter->adapter_id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to start tx adapter %d" , ret); +return ret; + } + +return 0 ; +} + +static int +eh_initialize_tx_adapter (struct eventmode_conf *em_conf) +{ +struct tx_adapter_conf *adapter; +int i, ret; + +/* Configure Tx adapters */ +for (i =0 ; i < em_conf->nb_tx_adapter; i++) { + adapter = &(em_conf->tx_adapter[i]); + ret =eh_tx_adapter_configure (em_conf, adapter); +if (ret <0 ) { +EH_LOG_ERR ("Failed to configure tx adapter %d" , ret); +return ret; + } + } +return 0 ; +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -636,6 +879,13 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Setup Tx adapter */ + ret =eh_initialize_tx_adapter (em_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to initialize tx adapter %d" , ret); +return ret; + } +/* Start eth devices after setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
@@ -719,5 +969,68 @@ eh_devs_uninit(struct eh_conf *conf) } } +/* Stop and release tx adapters */ +for (i =0 ; i < em_conf->nb_tx_adapter; i++) { + + id = em_conf->tx_adapter[i].adapter_id; + ret =rte_event_eth_tx_adapter_stop (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to stop tx adapter %d" , ret); +return ret; + } + +for (j =0 ; j < em_conf->tx_adapter[i].nb_connections; j++) { + + ret =rte_event_eth_tx_adapter_queue_del (id, + em_conf->tx_adapter[i].conn[j].ethdev_id,-1 ); +if (ret <0 ) { +EH_LOG_ERR ( +"Failed to remove tx adapter queues %d" , + ret); +return ret; + } + } + + ret =rte_event_eth_tx_adapter_free (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to free tx adapter %d" , ret); +return ret; + } + } +return 0 ; } + +uint8_t +eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id) +{ +struct eventdev_params *eventdev_config; +struct eventmode_conf *em_conf; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return -EINVAL ; + } + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return -EINVAL ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Get event device conf */ + eventdev_config =eh_get_eventdev_params (em_conf, eventdev_id); + +if (eventdev_config ==NULL ) { +EH_LOG_ERR ("Failed to read eventdev config" ); +return -EINVAL ; + } + +/* +* The last queue is reserved to be used as atomic queue for the +* last stage (eth packet tx stage) +*/ +return eventdev_config->nb_eventqueue -1 ; +}
examples/ipsec-secgw/event_helper.h +48 -0
81 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 6/13 examples/ipsec-secgw: add routines to display config
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add routines to display the eventmode configuration and provide an overview of the devices used.
--- examples/ipsec-secgw/event_helper.c | 207 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 14 +++ 2 files changed, 221 insertions(+)
examples/ipsec-secgw/event_helper.c +207 -0
@@ -822,6 +822,210 @@ eh_initialize_tx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static void +eh_display_operating_mode (struct eventmode_conf *em_conf) +{ +char sched_types[][32 ] = { +"RTE_SCHED_TYPE_ORDERED" , +"RTE_SCHED_TYPE_ATOMIC" , +"RTE_SCHED_TYPE_PARALLEL" , + }; +EH_LOG_INFO ("Operating mode:" ); + +EH_LOG_INFO ("\tScheduling type: \t%s" , + sched_types[em_conf->ext_params.sched_type]); + +EH_LOG_INFO ("" ); +} + +static void +eh_display_event_dev_conf (struct eventmode_conf *em_conf) +{ +char queue_mode[][32 ] = { +"" , +"ATQ (ALL TYPE QUEUE)" , +"SINGLE LINK" , + }; +char print_buf[256 ] = {0 }; +int i; + +EH_LOG_INFO ("Event Device Configuration:" ); + +for (i =0 ; i < em_conf->nb_eventdev; i++) { +sprintf (print_buf, +"\tDev ID: %-2d \tQueues: %-2d \tPorts: %-2d" , + em_conf->eventdev_config[i].eventdev_id, + em_conf->eventdev_config[i].nb_eventqueue, + em_conf->eventdev_config[i].nb_eventport); +sprintf (print_buf +strlen (print_buf), +"\tQueue mode: %s" , + queue_mode[em_conf->eventdev_config[i].ev_queue_mode]); +EH_LOG_INFO ("%s" , print_buf); + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_rx_adapter_conf (struct eventmode_conf *em_conf) +{ +int nb_rx_adapter = em_conf->nb_rx_adapter; +struct rx_adapter_connection_info *conn; +struct rx_adapter_conf *adapter; +char print_buf[256 ] = {0 }; +int i, j; + +EH_LOG_INFO ("Rx adapters configured: %d" , nb_rx_adapter); + +for (i =0 ; i < nb_rx_adapter; i++) { + adapter = &(em_conf->rx_adapter[i]); +EH_LOG_INFO ( +"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" +"\tRx core: %-2d" , + adapter->adapter_id, + adapter->nb_connections, + adapter->eventdev_id, + adapter->rx_core_id); + +for (j =0 ; j < adapter->nb_connections; j++) { + conn = &(adapter->conn[j]); + +sprintf (print_buf, +"\t\tEthdev ID: %-2d" , conn->ethdev_id); + +if (conn->ethdev_rx_qid ==-1 ) +sprintf (print_buf +strlen (print_buf), +"\tEth rx queue: %-2s" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"\tEth rx queue: %-2d" , + conn->ethdev_rx_qid); + +sprintf (print_buf +strlen (print_buf), +"\tEvent queue: %-2d" , conn->eventq_id); +EH_LOG_INFO ("%s" , print_buf); + } + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_tx_adapter_conf (struct eventmode_conf *em_conf) +{ +int nb_tx_adapter = em_conf->nb_tx_adapter; +struct tx_adapter_connection_info *conn; +struct tx_adapter_conf *adapter; +char print_buf[256 ] = {0 }; +int i, j; + +EH_LOG_INFO ("Tx adapters configured: %d" , nb_tx_adapter); + +for (i =0 ; i < nb_tx_adapter; i++) { + adapter = &(em_conf->tx_adapter[i]); +sprintf (print_buf, +"\tTx adapter ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" , + adapter->adapter_id, + adapter->nb_connections, + adapter->eventdev_id); +if (adapter->tx_core_id == (uint32_t )-1 ) +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2s" ,"[INTERNAL PORT]" ); +else if (adapter->tx_core_id ==RTE_MAX_LCORE ) +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2s" ,"[NONE]" ); +else +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2d,\tInput event queue: %-2d" , + adapter->tx_core_id, adapter->tx_ev_queue); + +EH_LOG_INFO ("%s" , print_buf); + +for (j =0 ; j < adapter->nb_connections; j++) { + conn = &(adapter->conn[j]); + +sprintf (print_buf, +"\t\tEthdev ID: %-2d" , conn->ethdev_id); + +if (conn->ethdev_tx_qid ==-1 ) +sprintf (print_buf +strlen (print_buf), +"\tEth tx queue: %-2s" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"\tEth tx queue: %-2d" , + conn->ethdev_tx_qid); +EH_LOG_INFO ("%s" , print_buf); + } + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_link_conf (struct eventmode_conf *em_conf) +{ +struct eh_event_link_info *link; +char print_buf[256 ] = {0 }; +int i; + +EH_LOG_INFO ("Links configured: %d" , em_conf->nb_link); + +for (i =0 ; i < em_conf->nb_link; i++) { + link = &(em_conf->link[i]); + +sprintf (print_buf, +"\tEvent dev ID: %-2d\tEvent port: %-2d" , + link->eventdev_id, + link->event_port_id); + +if (em_conf->ext_params.all_ev_queue_to_ev_port) +sprintf (print_buf +strlen (print_buf), +"Event queue: %-2s\t" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"Event queue: %-2d\t" , link->eventq_id); + +sprintf (print_buf +strlen (print_buf), +"Lcore: %-2d" , link->lcore_id); +EH_LOG_INFO ("%s" , print_buf); + } +EH_LOG_INFO ("" ); +} + +void +eh_display_conf (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return ; + } + +if (conf->mode !=EH_PKT_TRANSFER_MODE_EVENT ) +return ; + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return ; + } + +/* Get eventmode conf */ + em_conf = (struct eventmode_conf *)(conf->mode_params); + +/* Display user exposed operating modes */ +eh_display_operating_mode (em_conf); + +/* Display event device conf */ +eh_display_event_dev_conf (em_conf); + +/* Display Rx adapter conf */ +eh_display_rx_adapter_conf (em_conf); + +/* Display Tx adapter conf */ +eh_display_tx_adapter_conf (em_conf); + +/* Display event-lcore link */ +eh_display_link_conf (em_conf); +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -855,6 +1059,9 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Display the current configuration */ +eh_display_conf (conf); +/* Stop eth devices before setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
examples/ipsec-secgw/event_helper.h +14 -0
@@ -17,6 +17,11 @@ extern "C" { RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) +#define EH_LOG_INFO (...) \ + RTE_LOG(INFO, EH, \ + RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ + __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) +/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS
@@ -218,6 +223,15 @@ eh_devs_uninit(struct eh_conf *conf);uint8_t eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id); +/** +* Display event mode configuration +* +* @param conf +* Event helper configuration +*/ +void +eh_display_conf (struct eh_conf *conf); + #ifdef __cplusplus }#endif
Signature · 1 line
2.7.4
PATCH v3 7/13 examples/ipsec-secgw: add routines to launch workers
In reply to Lukasz BartosikIn eventmode workers can be drafted differently according to the capabilities of the underlying event device. The added functions will receive an array of such workers and probe the eventmode properties to choose the worker.
--- examples/ipsec-secgw/event_helper.c | 336 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 48 ++++++ 2 files changed, 384 insertions(+)
examples/ipsec-secgw/event_helper.c +336 -0
@@ -11,6 +11,8 @@#include "event_helper.h" +static volatile bool eth_core_running; +static int eh_get_enabled_cores (struct rte_bitmap *eth_core_mask) {
@@ -93,6 +95,16 @@ eh_get_eventdev_params(struct eventmode_conf *em_conf, uint8_t eventdev_id)return &(em_conf->eventdev_config[i]); } +static inline bool +eh_dev_has_burst_mode (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_BURST_MODE ) ? + true : false; +} +static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -695,6 +707,257 @@ eh_initialize_rx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static int32_t +eh_start_worker_eth_core (struct eventmode_conf *conf,uint32_t lcore_id) +{ +uint32_t service_id[EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE ]; +struct rx_adapter_conf *rx_adapter; +struct tx_adapter_conf *tx_adapter; +int service_count =0 ; +int adapter_id; +int32_t ret; +int i; + +EH_LOG_INFO ("Entering eth_core processing on lcore %u" , lcore_id); + +/* +* Parse adapter config to check which of all Rx adapters need +* to be handled by this core. +*/ +for (i =0 ; i < conf->nb_rx_adapter; i++) { +/* Check if we have exceeded the max allowed */ +if (service_count >EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE ) { +EH_LOG_ERR ( +"Exceeded the max allowed adapters per rx core" ); +break ; + } + + rx_adapter = &(conf->rx_adapter[i]); +if (rx_adapter->rx_core_id != lcore_id) +continue ; + +/* Adapter is handled by this core */ + adapter_id = rx_adapter->adapter_id; + +/* Get the service ID for the adapters */ + ret =rte_event_eth_rx_adapter_service_id_get (adapter_id, + &(service_id[service_count])); + +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ( +"Failed to get service id used by rx adapter" ); +return ret; + } + +/* Update service count */ + service_count++; + } + +/* +* Parse adapter config to see which of all Tx adapters need +* to be handled by this core. +*/ +for (i =0 ; i < conf->nb_tx_adapter; i++) { +/* Check if we have exceeded the max allowed */ +if (service_count >EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE ) { +EH_LOG_ERR ( +"Exceeded the max allowed adapters per tx core" ); +break ; + } + + tx_adapter = &conf->tx_adapter[i]; +if (tx_adapter->tx_core_id != lcore_id) +continue ; + +/* Adapter is handled by this core */ + adapter_id = tx_adapter->adapter_id; + +/* Get the service ID for the adapters */ + ret =rte_event_eth_tx_adapter_service_id_get (adapter_id, + &(service_id[service_count])); + +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ( +"Failed to get service id used by tx adapter" ); +return ret; + } + +/* Update service count */ + service_count++; + } + + eth_core_running = true; + +while (eth_core_running) { +for (i =0 ; i < service_count; i++) { +/* Initiate adapter service */ +rte_service_run_iter_on_app_lcore (service_id[i],0 ); + } + } + +return 0 ; +} + +static int32_t +eh_stop_worker_eth_core (void ) +{ +if (eth_core_running) { +EH_LOG_INFO ("Stopping eth cores" ); + eth_core_running = false; + } +return 0 ; +} + +static struct eh_app_worker_params * +eh_find_worker (uint32_t lcore_id,struct eh_conf *conf, +struct eh_app_worker_params *app_wrkrs,uint8_t nb_wrkr_param) +{ +struct eh_app_worker_params curr_conf = { {{0 } },NULL }; +struct eh_event_link_info *link =NULL ; +struct eh_app_worker_params *tmp_wrkr; +struct eventmode_conf *em_conf; +uint8_t eventdev_id; +int i; + +/* Get eventmode config */ + em_conf = conf->mode_params; + +/* +* Use event device from the first lcore-event link. +* +* Assumption: All lcore-event links tied to a core are using the +* same event device. In other words, one core would be polling on +* queues of a single event device only. +*/ + +/* Get a link for this lcore */ +for (i =0 ; i < em_conf->nb_link; i++) { + link = &(em_conf->link[i]); +if (link->lcore_id == lcore_id) +break ; + } + +if (link ==NULL ) { +EH_LOG_ERR ("No valid link found for lcore %d" , lcore_id); +return NULL ; + } + +/* Get event dev ID */ + eventdev_id = link->eventdev_id; + +/* Populate the curr_conf with the capabilities */ + +/* Check for burst mode */ +if (eh_dev_has_burst_mode (eventdev_id)) + curr_conf.cap.burst =EH_RX_TYPE_BURST ; +else + curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + +/* Parse the passed list and see if we have matching capabilities */ + +/* Initialize the pointer used to traverse the list */ + tmp_wrkr = app_wrkrs; + +for (i =0 ; i < nb_wrkr_param; i++, tmp_wrkr++) { + +/* Skip this if capabilities are not matching */ +if (tmp_wrkr->cap.u64 != curr_conf.cap.u64) +continue ; + +/* If the checks pass, we have a match */ +return tmp_wrkr; + } + +return NULL ; +} + +static int +eh_verify_match_worker (struct eh_app_worker_params *match_wrkr) +{ +/* Verify registered worker */ +if (match_wrkr->worker_thread ==NULL ) { +EH_LOG_ERR ("No worker registered" ); +return 0 ; + } + +/* Success */ +return 1 ; +} + +static uint8_t +eh_get_event_lcore_links (uint32_t lcore_id,struct eh_conf *conf, +struct eh_event_link_info **links) +{ +struct eh_event_link_info *link_cache; +struct eventmode_conf *em_conf =NULL ; +struct eh_event_link_info *link; +uint8_t lcore_nb_link =0 ; +size_t single_link_size; +size_t cache_size; +int index =0 ; +int i; + +if (conf ==NULL || links ==NULL ) { +EH_LOG_ERR ("Invalid args" ); +return -EINVAL ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +if (em_conf ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return -EINVAL ; + } + +/* Get the number of links registered */ +for (i =0 ; i < em_conf->nb_link; i++) { + +/* Get link */ + link = &(em_conf->link[i]); + +/* Check if we have link intended for this lcore */ +if (link->lcore_id == lcore_id) { + +/* Update the number of links for this core */ + lcore_nb_link++; + + } + } + +/* Compute size of one entry to be copied */ + single_link_size =sizeof (struct eh_event_link_info ); + +/* Compute size of the buffer required */ + cache_size = lcore_nb_link *sizeof (struct eh_event_link_info ); + +/* Compute size of the buffer required */ + link_cache =calloc (1 , cache_size); + +/* Get the number of links registered */ +for (i =0 ; i < em_conf->nb_link; i++) { + +/* Get link */ + link = &(em_conf->link[i]); + +/* Check if we have link intended for this lcore */ +if (link->lcore_id == lcore_id) { + +/* Cache the link */ +memcpy (&link_cache[index], link, single_link_size); + +/* Update index */ + index++; + } + } + +/* Update the links for application to use the cached links */ + *links = link_cache; + +/* Return the number of cached links */ +return lcore_nb_link; +} +static int eh_tx_adapter_configure (struct eventmode_conf *em_conf,struct tx_adapter_conf *adapter)
@@ -1208,6 +1471,79 @@ eh_devs_uninit(struct eh_conf *conf)return 0 ; } +void +eh_launch_worker (struct eh_conf *conf,struct eh_app_worker_params *app_wrkr, +uint8_t nb_wrkr_param) +{ +struct eh_app_worker_params *match_wrkr; +struct eh_event_link_info *links =NULL ; +struct eventmode_conf *em_conf; +uint32_t lcore_id; +uint8_t nb_links; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return ; + } + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Check if this is eth core */ +if (rte_bitmap_get (em_conf->eth_core_mask, lcore_id)) { +eh_start_worker_eth_core (em_conf, lcore_id); +return ; + } + +if (app_wrkr ==NULL || nb_wrkr_param ==0 ) { +EH_LOG_ERR ("Invalid args" ); +return ; + } + +/* +* This is a regular worker thread. The application registers +* multiple workers with various capabilities. Run worker +* based on the selected capabilities of the event +* device configured. +*/ + +/* Get the first matching worker for the event device */ + match_wrkr =eh_find_worker (lcore_id, conf, app_wrkr, nb_wrkr_param); +if (match_wrkr ==NULL ) { +EH_LOG_ERR ("Failed to match worker registered for lcore %d" , + lcore_id); + goto clean_and_exit; + } + +/* Verify sanity of the matched worker */ +if (eh_verify_match_worker (match_wrkr) !=1 ) { +EH_LOG_ERR ("Failed to validate the matched worker" ); + goto clean_and_exit; + } + +/* Get worker links */ + nb_links =eh_get_event_lcore_links (lcore_id, conf, &links); + +/* Launch the worker thread */ + match_wrkr->worker_thread (links, nb_links); + +/* Free links info memory */ +free (links); + +clean_and_exit: + +/* Flag eth_cores to stop, if started */ +eh_stop_worker_eth_core (); +} +uint8_t eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id) {
examples/ipsec-secgw/event_helper.h +48 -0
72 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 8/13 examples/ipsec-secgw: add support for internal ports
In reply to Lukasz BartosikAdd support for Rx and Tx internal ports. When internal ports are available then a packet can be received from eth port and forwarded to event queue by HW without any software intervention. The same applies to Tx side where a packet sent to an event queue can by forwarded by HW to eth port without any software intervention.
--- examples/ipsec-secgw/event_helper.c | 179 +++++++++++++++++++++++++++++++----- examples/ipsec-secgw/event_helper.h | 11 +++ 2 files changed, 167 insertions(+), 23 deletions(-)
examples/ipsec-secgw/event_helper.c +156 -23
@@ -95,6 +95,39 @@ eh_get_eventdev_params(struct eventmode_conf *em_conf, uint8_t eventdev_id)return &(em_conf->eventdev_config[i]); } + +static inline bool +eh_dev_has_rx_internal_port (uint8_t eventdev_id) +{ +int j; +bool flag = true; + +RTE_ETH_FOREACH_DEV (j) { +uint32_t caps =0 ; + +rte_event_eth_rx_adapter_caps_get (eventdev_id, j, &caps); +if (!(caps &RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT )) + flag = false; + } +return flag; +} + +static inline bool +eh_dev_has_tx_internal_port (uint8_t eventdev_id) +{ +int j; +bool flag = true; + +RTE_ETH_FOREACH_DEV (j) { +uint32_t caps =0 ; + +rte_event_eth_tx_adapter_caps_get (eventdev_id, j, &caps); +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + flag = false; + } +return flag; +} +static inline bool eh_dev_has_burst_mode (uint8_t dev_id) {
@@ -179,6 +212,42 @@ eh_set_default_conf_eventdev(struct eventmode_conf *em_conf)return 0 ; } +static void +eh_do_capability_check (struct eventmode_conf *em_conf) +{ +struct eventdev_params *eventdev_config; +int all_internal_ports =1 ; +uint32_t eventdev_id; +int i; + +for (i =0 ; i < em_conf->nb_eventdev; i++) { + +/* Get the event dev conf */ + eventdev_config = &(em_conf->eventdev_config[i]); + eventdev_id = eventdev_config->eventdev_id; + +/* Check if event device has internal port for Rx & Tx */ +if (eh_dev_has_rx_internal_port (eventdev_id) && +eh_dev_has_tx_internal_port (eventdev_id)) { + eventdev_config->all_internal_ports =1 ; + }else { + all_internal_ports =0 ; + } + } + +/* +* If Rx & Tx internal ports are supported by all event devices then +* eth cores won't be required. Override the eth core mask requested +* and decrement number of event queues by one as it won't be needed +* for Tx. +*/ +if (all_internal_ports) { +rte_bitmap_reset (em_conf->eth_core_mask); +for (i =0 ; i < em_conf->nb_eventdev; i++) + em_conf->eventdev_config[i].nb_eventqueue--; + } +} +static int eh_set_default_conf_link (struct eventmode_conf *em_conf) {
@@ -250,7 +319,10 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)struct rx_adapter_connection_info *conn;struct eventdev_params *eventdev_config;struct rx_adapter_conf *adapter; +bool rx_internal_port = true;bool single_ev_queue = false; +int nb_eventqueue; +uint32_t caps =0 ;int eventdev_id;int nb_eth_dev;int adapter_id;
@@ -280,14 +352,21 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)/* Set adapter conf */ adapter->eventdev_id = eventdev_id; adapter->adapter_id = adapter_id; - adapter->rx_core_id =eh_get_next_eth_core (em_conf); + +/* +* If event device does not have internal ports for passing +* packets then reserved one queue for Tx path +*/ + nb_eventqueue = eventdev_config->all_internal_ports ? + eventdev_config->nb_eventqueue : + eventdev_config->nb_eventqueue -1 ;/* * Map all queues of eth device (port) to an event queue. If there * are more event queues than eth ports then create 1:1 mapping. * Otherwise map all eth ports to a single event queue. */ -if (nb_eth_dev > eventdev_config->nb_eventqueue) +if (nb_eth_dev > nb_eventqueue) single_ev_queue = true;for (i =0 ; i < nb_eth_dev; i++) {
@@ -309,11 +388,24 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)/* Add all eth queues eth port to event queue */ conn->ethdev_rx_qid =-1 ; +/* Get Rx adapter capabilities */ +rte_event_eth_rx_adapter_caps_get (eventdev_id, i, &caps); +if (!(caps &RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT )) + rx_internal_port = false; +/* Update no of connections */ adapter->nb_connections++; } +if (rx_internal_port) { +/* Rx core is not required */ + adapter->rx_core_id =-1 ; + }else { +/* Rx core is required */ + adapter->rx_core_id =eh_get_next_eth_core (em_conf); + } +/* We have setup one adapter */ em_conf->nb_rx_adapter =1 ;
@@ -326,6 +418,8 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)struct tx_adapter_connection_info *conn;struct eventdev_params *eventdev_config;struct tx_adapter_conf *tx_adapter; +bool tx_internal_port = true; +uint32_t caps =0 ;int eventdev_id;int adapter_id;int nb_eth_dev;
@@ -359,18 +453,6 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf) tx_adapter->eventdev_id = eventdev_id; tx_adapter->adapter_id = adapter_id; -/* TODO: Tx core is required only when internal port is not present */ - tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); - -/* -* Application uses one event queue per adapter for submitting -* packets for Tx. Reserve the last queue available and decrement -* the total available event queues for this -*/ - -/* Queue numbers start at 0 */ - tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; -/* * Map all Tx queues of the eth device (port) to the event device. */
@@ -400,10 +482,30 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)/* Add all eth tx queues to adapter */ conn->ethdev_tx_qid =-1 ; +/* Get Tx adapter capabilities */ +rte_event_eth_tx_adapter_caps_get (eventdev_id, i, &caps); +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + tx_internal_port = false; +/* Update no of connections */ tx_adapter->nb_connections++; } +if (tx_internal_port) { +/* Tx core is not required */ + tx_adapter->tx_core_id =-1 ; + }else { +/* Tx core is required */ + tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Use one event queue per adapter for submitting packets +* for Tx. Reserving the last queue available +*/ +/* Queue numbers start at 0 */ + tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; + } +/* We have setup one adapter */ em_conf->nb_tx_adapter =1 ;return 0 ;
@@ -424,6 +526,9 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* Perform capability check for the selected event devices */ +eh_do_capability_check (em_conf); +/* * Check if links are specified. Else generate a default config for * the event ports used.
@@ -529,11 +634,13 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf) eventdev_config->ev_queue_mode;/* * All queues need to be set with sched_type as -* schedule type for the application stage. One queue -* would be reserved for the final eth tx stage. This -* will be an atomic queue. +* schedule type for the application stage. One +* queue would be reserved for the final eth tx +* stage if event device does not have internal +* ports. This will be an atomic queue. */ -if (j == nb_eventqueue-1 ) { +if (!eventdev_config->all_internal_ports && + j == nb_eventqueue-1 ) { eventq_conf.schedule_type =RTE_SCHED_TYPE_ATOMIC ; }else {
@@ -847,6 +954,12 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,/* Populate the curr_conf with the capabilities */ +/* Check for Tx internal port */ +if (eh_dev_has_tx_internal_port (eventdev_id)) + curr_conf.cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; +else + curr_conf.cap.tx_internal_port =EH_TX_TYPE_NO_INTERNAL_PORT ; +/* Check for burst mode */ if (eh_dev_has_burst_mode (eventdev_id)) curr_conf.cap.burst =EH_RX_TYPE_BURST ;
@@ -1018,6 +1131,16 @@ eh_tx_adapter_configure(struct eventmode_conf *em_conf, } } +/* +* Check if Tx core is assigned. If Tx core is not assigned then +* the adapter has internal port for submitting Tx packets and +* Tx event queue & port setup is not required +*/ +if (adapter->tx_core_id == (uint32_t ) (-1 )) { +/* Internal port is present */ + goto skip_tx_queue_port_setup; + } +/* Setup Tx queue & port */ /* Get event port used by the adapter */
@@ -1057,6 +1180,7 @@ eh_tx_adapter_configure(struct eventmode_conf *em_conf,rte_service_set_runstate_mapped_check (service_id,0 ); +skip_tx_queue_port_setup:/* Start adapter */ ret =rte_event_eth_tx_adapter_start (adapter->adapter_id);if (ret <0 ) {
@@ -1141,13 +1265,22 @@ eh_display_rx_adapter_conf(struct eventmode_conf *em_conf)for (i =0 ; i < nb_rx_adapter; i++) { adapter = &(em_conf->rx_adapter[i]); -EH_LOG_INFO ( -"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" -"\tRx core: %-2d" , +sprintf (print_buf, +"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" , adapter->adapter_id, adapter->nb_connections, - adapter->eventdev_id, - adapter->rx_core_id); + adapter->eventdev_id); +if (adapter->rx_core_id == (uint32_t )-1 ) +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2s" ,"[INTERNAL PORT]" ); +else if (adapter->rx_core_id ==RTE_MAX_LCORE ) +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2s" ,"[NONE]" ); +else +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2d" , adapter->rx_core_id); + +EH_LOG_INFO ("%s" , print_buf);for (j =0 ; j < adapter->nb_connections; j++) { conn = &(adapter->conn[j]);
examples/ipsec-secgw/event_helper.h +11 -0
@@ -66,12 +66,21 @@ enum eh_rx_types { EH_RX_TYPE_BURST }; +/** +* Event mode packet tx types +*/ +enum eh_tx_types { +EH_TX_TYPE_INTERNAL_PORT =0 , +EH_TX_TYPE_NO_INTERNAL_PORT +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;uint8_t nb_eventqueue;uint8_t nb_eventport;uint8_t ev_queue_mode; +uint8_t all_internal_ports; };/**
@@ -183,6 +192,8 @@ struct eh_app_worker_params {struct {uint64_t burst :1 ;/**< Specify status of rx type burst */ +uint64_t tx_internal_port :1 ; +/**< Specify whether tx internal port is available */ };uint64_t u64; } cap;
Signature · 1 line
2.7.4
PATCH v3 9/13 examples/ipsec-secgw: add event helper config init/uninit
In reply to Lukasz BartosikAdd eventmode helper eh_conf_init and eh_conf_uninit functions which purpose is to initialize and unitialize eventmode helper configuration.
--- examples/ipsec-secgw/event_helper.c | 103 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 23 ++++++++ 2 files changed, 126 insertions(+)
examples/ipsec-secgw/event_helper.c +103 -0
@@ -1385,6 +1385,109 @@ eh_display_link_conf(struct eventmode_conf *em_conf)EH_LOG_INFO ("" ); } +struct eh_conf * +eh_conf_init (void ) +{ +struct eventmode_conf *em_conf =NULL ; +struct eh_conf *conf =NULL ; +unsigned int eth_core_id; +void *bitmap =NULL ; +uint32_t nb_bytes; + +/* Allocate memory for config */ + conf =calloc (1 ,sizeof (struct eh_conf )); +if (conf ==NULL ) { +EH_LOG_ERR ("Failed to allocate memory for eventmode helper " +"config" ); +return NULL ; + } + +/* Set default conf */ + +/* Packet transfer mode: poll */ + conf->mode =EH_PKT_TRANSFER_MODE_POLL ; + +/* Keep all ethernet ports enabled by default */ + conf->eth_portmask =-1 ; + +/* Allocate memory for event mode params */ + conf->mode_params =calloc (1 ,sizeof (struct eventmode_conf )); +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Failed to allocate memory for event mode params" ); + goto free_conf; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Allocate and initialize bitmap for eth cores */ + nb_bytes =rte_bitmap_get_memory_footprint (RTE_MAX_LCORE ); +if (!nb_bytes) { +EH_LOG_ERR ("Failed to get bitmap footprint" ); + goto free_em_conf; + } + + bitmap =rte_zmalloc ("event-helper-ethcore-bitmap" , nb_bytes, +RTE_CACHE_LINE_SIZE ); +if (!bitmap) { +EH_LOG_ERR ("Failed to allocate memory for eth cores bitmap\n" ); + goto free_em_conf; + } + + em_conf->eth_core_mask =rte_bitmap_init (RTE_MAX_LCORE , bitmap, + nb_bytes); +if (!em_conf->eth_core_mask) { +EH_LOG_ERR ("Failed to initialize bitmap" ); + goto free_bitmap; + } + +/* Set schedule type as not set */ + em_conf->ext_params.sched_type =SCHED_TYPE_NOT_SET ; + +/* Set two cores as eth cores for Rx & Tx */ + +/* Use first core other than master core as Rx core */ + eth_core_id =rte_get_next_lcore (0 ,/* curr core */ +1 ,/* skip master 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 master core */ +0 /* wrap */ ); + +rte_bitmap_set (em_conf->eth_core_mask, eth_core_id); + +return conf; + +free_bitmap: +rte_free (bitmap); +free_em_conf: +free (em_conf); +free_conf: +free (conf); +return NULL ; +} + +void +eh_conf_uninit (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf =NULL ; + +if (!conf || !conf->mode_params) +return ; + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Free evenmode configuration memory */ +rte_free (em_conf->eth_core_mask); +free (em_conf); +free (conf); +} +void eh_display_conf (struct eh_conf *conf) {
examples/ipsec-secgw/event_helper.h +23 -0
@@ -50,6 +50,9 @@ extern "C" {/* Max adapters that one Tx core can handle */ #define EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE EVENT_MODE_MAX_TX_ADAPTERS +/* Used to indicate that queue schedule type is not set */ +#define SCHED_TYPE_NOT_SET 3 +/** * Packet transfer mode of the application */
@@ -204,6 +207,26 @@ struct eh_app_worker_params { };/** +* Allocate memory for event helper configuration and initialize +* it with default values. +* +* @return +* - pointer to event helper configuration structure on success. +* - NULL on failure. +*/ +struct eh_conf * +eh_conf_init (void ); + +/** +* Uninitialize event helper configuration and release its memory +. * +* @param conf +* Event helper configuration +*/ +void +eh_conf_uninit (struct eh_conf *conf); + +/** * Initialize event mode devices * * Application can call this function to get the event devices, eth devices
Signature · 1 line
2.7.4
PATCH v3 10/13 examples/ipsec-secgw: add eventmode to ipsec-secgw
In reply to Lukasz BartosikAdd eventmode support to ipsec-secgw. With the aid of event helper configure and use the eventmode capabilities.
--- examples/ipsec-secgw/event_helper.c | 3 + examples/ipsec-secgw/event_helper.h | 14 ++ examples/ipsec-secgw/ipsec-secgw.c | 258 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec.h | 17 +++ examples/ipsec-secgw/sa.c | 19 +-- 5 files changed, 294 insertions(+), 17 deletions(-)
examples/ipsec-secgw/event_helper.c +3 -0
@@ -966,6 +966,8 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,else curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + curr_conf.cap.ipsec_mode = conf->ipsec_mode; +/* Parse the passed list and see if we have matching capabilities */ /* Initialize the pointer used to traverse the list */
@@ -1406,6 +1408,7 @@ eh_conf_init(void)/* Packet transfer mode: poll */ conf->mode =EH_PKT_TRANSFER_MODE_POLL ; + conf->ipsec_mode =EH_IPSEC_MODE_TYPE_APP ;/* Keep all ethernet ports enabled by default */ conf->eth_portmask =-1 ;
examples/ipsec-secgw/event_helper.h +14 -0
@@ -77,6 +77,14 @@ enum eh_tx_types {EH_TX_TYPE_NO_INTERNAL_PORT }; +/** +* Event mode ipsec mode types +*/ +enum eh_ipsec_mode_types { +EH_IPSEC_MODE_TYPE_APP =0 , +EH_IPSEC_MODE_TYPE_DRIVER +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;
@@ -186,6 +194,10 @@ struct eh_conf {*/ void *mode_params;/**< Mode specific parameters */ + +/** Application specific params */ +enum eh_ipsec_mode_types ipsec_mode; +/**< Mode of ipsec run */ };/* Workers registered by the application */
@@ -197,6 +209,8 @@ struct eh_app_worker_params {/**< Specify status of rx type burst */ uint64_t tx_internal_port : 1;/**< Specify whether tx internal port is available */ + uint64_t ipsec_mode : 1; +/**< Specify ipsec processing level */ };uint64_t u64; } cap;
examples/ipsec-secgw/ipsec-secgw.c +256 -2
382 lines not on this page · raw message
examples/ipsec-secgw/ipsec.h +17 -0
@@ -153,6 +153,17 @@ struct ipsec_sa {struct rte_security_session_conf sess_conf; } __rte_cache_aligned; +struct sa_ctx { +void *satbl;/* pointer to array of rte_ipsec_sa objects*/ +struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; +union { +struct { +struct rte_crypto_sym_xform a; +struct rte_crypto_sym_xform b; + }; + } xf[IPSEC_SA_MAX_ENTRIES ]; +}; +struct ipsec_mbuf_metadata {struct ipsec_sa *sa;struct rte_crypto_op cop;
@@ -247,6 +258,12 @@ struct ipsec_traffic {struct traffic_type ip6; }; +extern struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES ]; +extern uint32_t nb_sa_out; + +extern struct ipsec_sa sa_in[IPSEC_SA_MAX_ENTRIES ]; +extern uint32_t nb_sa_in; +uint16_t ipsec_inbound (struct ipsec_ctx *ctx,struct rte_mbuf *pkts[],uint16_t nb_pkts,uint16_t len);
examples/ipsec-secgw/sa.c +4 -15
@@ -132,11 +132,11 @@ const struct supported_aead_algo aead_algos[] = { } }; -static struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES ]; -static uint32_t nb_sa_out; +struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES ]; +uint32_t nb_sa_out; -static struct ipsec_sa sa_in[IPSEC_SA_MAX_ENTRIES ]; -static uint32_t nb_sa_in; +struct ipsec_sa sa_in[IPSEC_SA_MAX_ENTRIES ]; +uint32_t nb_sa_in;static const struct supported_cipher_algo *find_match_cipher_algo (const char *cipher_keyword)
@@ -781,17 +781,6 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound)printf ("\n" ); } -struct sa_ctx { -void *satbl;/* pointer to array of rte_ipsec_sa objects*/ -struct ipsec_sa sa[IPSEC_SA_MAX_ENTRIES ]; -union { -struct { -struct rte_crypto_sym_xform a; -struct rte_crypto_sym_xform b; - }; - } xf[IPSEC_SA_MAX_ENTRIES ]; -}; -static struct sa_ctx *sa_create (const char *name,int32_t socket_id) {
Signature · 1 line
2.7.4
PATCH v3 11/13 examples/ipsec-secgw: add driver mode worker
In reply to Lukasz BartosikAdd driver inbound and outbound worker thread for ipsec-secgw. In driver mode application does as little as possible. It simply forwards packets back to port from which traffic was received instructing HW to apply inline security processing using first outbound SA configured for a given port. If a port does not have SA configured outbound traffic on that port will be silently dropped. The aim of this mode is to measure HW capabilities. Driver mode is selected with single-sa option. The single-sa option accepts SA index however in event mode the SA index is ignored.
Example command to run ipsec-secgw in driver mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128
-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel --single-sa 0
--- examples/ipsec-secgw/Makefile | 1 + examples/ipsec-secgw/ipsec-secgw.c | 32 +++-- examples/ipsec-secgw/ipsec-secgw.h | 21 ++++ examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/ipsec_worker.c | 243 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/meson.build | 2 +- 6 files changed, 292 insertions(+), 18 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c
examples/ipsec-secgw/Makefile +1 -0
@@ -15,6 +15,7 @@ SRCS-y += sa.c SRCS-y += rt.c SRCS-y += ipsec_process.c SRCS-y += ipsec-secgw.c +SRCS-y += ipsec_worker.c SRCS-y += event_helper.c CFLAGS += -gdwarf-2
examples/ipsec-secgw/ipsec-secgw.c +15 -17
@@ -70,8 +70,6 @@ volatile bool force_quit;#define BURST_TX_DRAIN_US 100/* TX drain every ~100us */ -#define NB_SOCKETS 4 -/* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3
@@ -79,8 +77,6 @@ volatile bool force_quit;#define MAX_LCORE_PARAMS 1024 -#define UNPROTECTED_PORT (port) (unprotected_port_mask & (1 << portid)) -/* * Configurable number of RX/TX ring descriptors */
@@ -187,15 +183,15 @@ static const struct option lgopts[] = { {NULL, 0, 0, 0} }; +uint32_t unprotected_port_mask; +uint32_t single_sa_idx;/* mask of enabled ports */ static uint32_t enabled_port_mask;static uint64_t enabled_cryptodev_mask =UINT64_MAX ; -static uint32_t unprotected_port_mask;static int32_t promiscuous_on =1 ;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; -static uint32_t single_sa_idx;/* * RX/TX HW offload capabilities to enable/use on ethernet ports.
@@ -278,7 +274,7 @@ static struct rte_eth_conf port_conf = { }, }; -static struct socket_ctx socket_ctx[NB_SOCKETS ]; +struct socket_ctx socket_ctx[NB_SOCKETS ];/* * Determine is multi-segment support required:
@@ -997,12 +993,12 @@ process_pkts(struct lcore_conf *qconf, struct rte_mbuf **pkts,prepare_traffic (pkts, &traffic, nb_pkts);if (unlikely (single_sa)) { -if (UNPROTECTED_PORT (portid)) +if (is_unprotected_port (portid))process_pkts_inbound_nosp (&qconf->inbound, &traffic);else process_pkts_outbound_nosp (&qconf->outbound, &traffic); }else { -if (UNPROTECTED_PORT (portid)) +if (is_unprotected_port (portid))process_pkts_inbound (&qconf->inbound, &traffic);else process_pkts_outbound (&qconf->outbound, &traffic);
@@ -1113,8 +1109,8 @@ drain_outbound_crypto_queues(const struct lcore_conf *qconf, }/* main processing loop */ -static int32_t -main_loop (__attribute__((unused))void *dummy) +void +ipsec_poll_mode_worker (void ) {struct rte_mbuf *pkts[MAX_PKT_BURST ];uint32_t lcore_id;
@@ -1156,7 +1152,7 @@ main_loop(__attribute__((unused)) void *dummy)if (qconf->nb_rx_queue ==0 ) {RTE_LOG (DEBUG ,IPSEC ,"lcore %u has nothing to do\n" , lcore_id); -return 0 ; +return ; }RTE_LOG (INFO ,IPSEC ,"entering main loop on lcore %u\n" , lcore_id);
@@ -1169,7 +1165,7 @@ main_loop(__attribute__((unused)) void *dummy) lcore_id, portid, queueid); } -while (1 ) { +while (!force_quit) { cur_tsc =rte_rdtsc ();/* TX queue buffer drain */
@@ -1193,7 +1189,7 @@ main_loop(__attribute__((unused)) void *dummy)process_pkts (qconf, pkts, nb_rx, portid);/* dequeue and process completed crypto-ops */ -if (UNPROTECTED_PORT (portid)) +if (is_unprotected_port (portid))drain_inbound_crypto_queues (qconf, &qconf->inbound);else
@@ -1315,8 +1311,10 @@ print_usage(const char *prgname)" -a enables SA SQN atomic behaviour\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" -" --single-sa SAIDX: Use single SA index for outbound traffic,\n" -" bypassing the SP\n" +" --single-sa SAIDX: In poll mode use single SA index for\n" +" outbound traffic, bypassing the SP\n" +" In event mode selects driver mode,\n" +" SA index value is ignored\n" " --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n" " devices to configure\n" " --transfer-mode MODE\n"
@@ -2792,7 +2790,7 @@ main(int32_t argc, char **argv)check_all_ports_link_status (enabled_port_mask);/* launch per-lcore init on every lcore */ -rte_eal_mp_remote_launch (main_loop,NULL ,CALL_MASTER ); +rte_eal_mp_remote_launch (ipsec_launch_one_lcore, eh_conf,CALL_MASTER );RTE_LCORE_FOREACH_SLAVE (lcore_id) {if (rte_eal_wait_lcore (lcore_id) <0 )
examples/ipsec-secgw/ipsec-secgw.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_SECGW_H_ +#define _IPSEC_SECGW_H_ + +#define NB_SOCKETS 4 + +/* Port mask to identify the unprotected ports */ +extern uint32_t unprotected_port_mask; + +/* Index of SA in single mode */ +extern uint32_t single_sa_idx; + +static inline uint8_t +is_unprotected_port (uint16_t port_id) +{ +return unprotected_port_mask & (1 << port_id); +} + +#endif /* _IPSEC_SECGW_H_ */
examples/ipsec-secgw/ipsec.h +11 -0
@@ -13,6 +13,8 @@#include <rte_flow.h> #include <rte_ipsec.h> +#include "ipsec-secgw.h" +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3
@@ -258,6 +260,15 @@ struct ipsec_traffic {struct traffic_type ip6; }; +/* Socket ctx */ +extern struct socket_ctx socket_ctx[NB_SOCKETS ]; + +void +ipsec_poll_mode_worker (void ); + +int +ipsec_launch_one_lcore (void *args); +extern struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES ];extern uint32_t nb_sa_out;
examples/ipsec-secgw/ipsec_worker.c new file +243 -0
243 lines not on this page · raw message
examples/ipsec-secgw/meson.build +1 -1
@@ -10,5 +10,5 @@ deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev'] allow_experimental_apis = true sources = files( 'esp.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c', - 'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c', 'event_helper.c' + 'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c', 'event_helper.c', 'ipsec_worker.c' )
Signature · 1 line
2.7.4
PATCH v3 12/13 examples/ipsec-secgw: add app mode worker
In reply to Lukasz BartosikAdd application inbound/outbound worker thread and IPsec application processing code for event mode.
Exampple ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128
-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel
--- examples/ipsec-secgw/ipsec-secgw.c | 31 +-- examples/ipsec-secgw/ipsec-secgw.h | 65 ++++++ examples/ipsec-secgw/ipsec.h | 22 -- examples/ipsec-secgw/ipsec_worker.c | 420 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec_worker.h | 39 ++++ 5 files changed, 523 insertions(+), 54 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec_worker.h
examples/ipsec-secgw/ipsec-secgw.c +1 -30
@@ -50,12 +50,11 @@#include "event_helper.h" #include "ipsec.h" +#include "ipsec_worker.h" #include "parser.h" volatile bool force_quit; -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 -#define MAX_JUMBO_PKT_LEN 9600#define MEMPOOL_CACHE_SIZE 256
@@ -85,29 +84,6 @@ volatile bool force_quit;static uint16_t nb_rxd =IPSEC_SECGW_RX_DESC_DEFAULT ;static uint16_t nb_txd =IPSEC_SECGW_TX_DESC_DEFAULT ; -#if RTE_BYTE_ORDER !=RTE_LITTLE_ENDIAN -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((a) & 0xff) << 56) | \ - ((uint64_t)((b) & 0xff) << 48) | \ - ((uint64_t)((c) & 0xff) << 40) | \ - ((uint64_t)((d) & 0xff) << 32) | \ - ((uint64_t)((e) & 0xff) << 24) | \ - ((uint64_t)((f) & 0xff) << 16) | \ - ((uint64_t)((g) & 0xff) << 8) | \ - ((uint64_t)(h) & 0xff)) -#else -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((h) & 0xff) << 56) | \ - ((uint64_t)((g) & 0xff) << 48) | \ - ((uint64_t)((f) & 0xff) << 40) | \ - ((uint64_t)((e) & 0xff) << 32) | \ - ((uint64_t)((d) & 0xff) << 24) | \ - ((uint64_t)((c) & 0xff) << 16) | \ - ((uint64_t)((b) & 0xff) << 8) | \ - ((uint64_t)(a) & 0xff)) -#endif -#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e, f, 0, 0)) -#define ETHADDR_TO_UINT64 (addr) __BYTES_TO_UINT64( \ (addr)->addr_bytes[0], (addr)->addr_bytes[1], \ (addr)->addr_bytes[2], (addr)->addr_bytes[3], \
@@ -119,11 +95,6 @@ static uint16_t nb_txd = IPSEC_SECGW_TX_DESC_DEFAULT;#define MTU_TO_FRAMELEN (x) ((x) + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) -/* port/source ethernet addr and destination ethernet addr */ -struct ethaddr_info { -uint64_t src, dst; -}; -struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) },
examples/ipsec-secgw/ipsec-secgw.h +65 -0
73 lines not on this page · raw message
examples/ipsec-secgw/ipsec.h +0 -22
@@ -15,11 +15,9 @@#include "ipsec-secgw.h" -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3 -#define MAX_PKT_BURST 32#define MAX_INFLIGHT 128#define MAX_QP_PER_LCORE 256
@@ -246,29 +244,9 @@ struct cnt_blk {uint32_t cnt; } __attribute__((packed)); -struct traffic_type { -const uint8_t *data[MAX_PKT_BURST *2 ]; -struct rte_mbuf *pkts[MAX_PKT_BURST *2 ]; -void *saptr[MAX_PKT_BURST *2 ]; -uint32_t res[MAX_PKT_BURST *2 ]; -uint32_t num; -}; - -struct ipsec_traffic { -struct traffic_type ipsec; -struct traffic_type ip4; -struct traffic_type ip6; -}; -/* Socket ctx */ extern struct socket_ctx socket_ctx[NB_SOCKETS ]; -void -ipsec_poll_mode_worker (void ); - -int -ipsec_launch_one_lcore (void *args); -extern struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES ];extern uint32_t nb_sa_out;
examples/ipsec-secgw/ipsec_worker.c +418 -2
469 lines not on this page · raw message
examples/ipsec-secgw/ipsec_worker.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port +*/ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +/* TODO +* +* Move this function to ipsec_worker.c +*/ +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */
Signature · 1 line
2.7.4
PATCH v3 13/13 examples/ipsec-secgw: make number of buffers dynamic
In reply to Lukasz BartosikMake number of buffers in a pool nb_mbuf_in_pool dependent on number of ports, cores and crypto queues. Add command line option -s which when used overrides dynamic calculation of number of buffers in a pool.
--- examples/ipsec-secgw/ipsec-secgw.c | 59 +++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 11 deletions(-)
examples/ipsec-secgw/ipsec-secgw.c +48 -11
@@ -59,8 +59,6 @@ volatile bool force_quit;#define MEMPOOL_CACHE_SIZE 256 -#define NB_MBUF (32000) -#define CDEV_QUEUE_DESC 2048#define CDEV_MAP_ENTRIES 16384#define CDEV_MP_NB_OBJS 1024
@@ -163,6 +161,7 @@ static int32_t promiscuous_on = 1;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; +static uint32_t nb_bufs_in_pool;/* * RX/TX HW offload capabilities to enable/use on ethernet ports.
@@ -1259,6 +1258,7 @@ print_usage(const char *prgname)" [-w REPLAY_WINDOW_SIZE]" " [-e]" " [-a]" +" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]" " -f CONFIG_FILE" " --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]"
@@ -1280,6 +1280,7 @@ print_usage(const char *prgname)" size for each SA\n" " -e enables ESN\n" " -a enables SA SQN atomic behaviour\n" +" -s number of mbufs in packet pool (default 8192)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" " --single-sa SAIDX: In poll mode use single SA index for\n"
@@ -1479,7 +1480,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) argvopt = argv; -while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:" , +while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:s:" , lgopts, &option_index)) !=EOF ) {switch (opt) {
@@ -1513,6 +1514,19 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) cfgfile = optarg; f_present =1 ;break ; + +case 's' : + ret =parse_decimal (optarg); +if (ret <0 ) { +printf ("Invalid number of buffers in a pool: " +"%s\n" , optarg); +print_usage (prgname); +return -1 ; + } + + nb_bufs_in_pool = ret; +break ; +case 'j' : ret =parse_decimal (optarg); if (ret < RTE_MBUF_DEFAULT_BUF_SIZE ||
@@ -1876,12 +1890,12 @@ check_cryptodev_mask(uint8_t cdev_id)return -1 ; } -static int32_t +static uint16_t cryptodevs_init (void ) {struct rte_cryptodev_config dev_conf;struct rte_cryptodev_qp_conf qp_conf; -uint16_t idx, max_nb_qps, qp, i; +uint16_t idx, max_nb_qps, qp, total_nb_qps, i;int16_t cdev_id;struct rte_hash_parameters params = {0 };
@@ -1909,6 +1923,7 @@ cryptodevs_init(void)printf ("lcore/cryptodev/qp mappings:\n" ); idx =0 ; + total_nb_qps =0 ;for (cdev_id =0 ; cdev_id <rte_cryptodev_count (); cdev_id++) {struct rte_cryptodev_info cdev_info;
@@ -1942,6 +1957,7 @@ cryptodevs_init(void)if (qp ==0 )continue ; + total_nb_qps += qp; dev_conf.socket_id =rte_cryptodev_socket_id (cdev_id); dev_conf.nb_queue_pairs = qp; dev_conf.ff_disable =RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO ;
@@ -1974,7 +1990,7 @@ cryptodevs_init(void)printf ("\n" ); -return 0 ; +return total_nb_qps; } static void
@@ -2607,16 +2623,18 @@ int32_t main(int32_t argc, char **argv) { int32_t ret; -uint32_t lcore_id; +uint32_t lcore_id, nb_txq, nb_rxq =0 ;uint32_t cdev_id;uint32_t i;uint8_t socket_id; -uint16_t portid; +uint16_t portid, nb_crypto_qp, nb_ports =0 ;uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ];uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ];struct eh_conf *eh_conf =NULL ;size_t sess_sz; + nb_bufs_in_pool =0 ; +/* init EAL */ ret =rte_eal_init (argc, argv);if (ret <0 )
@@ -2665,6 +2683,26 @@ main(int32_t argc, char **argv) sess_sz =max_session_size (); + nb_crypto_qp =cryptodevs_init (); + +if (nb_bufs_in_pool ==0 ) { +RTE_ETH_FOREACH_DEV (portid) { +if ((enabled_port_mask & (1 << portid)) ==0 ) +continue ; + nb_ports++; + nb_rxq +=get_port_nb_rx_queues (portid); + } + + nb_txq = nb_lcores; + + nb_bufs_in_pool =RTE_MAX ((nb_rxq*nb_rxd + + nb_ports*nb_lcores*MAX_PKT_BURST + + nb_ports*nb_txq*nb_txd + + nb_lcores*MEMPOOL_CACHE_SIZE + + nb_crypto_qp*CDEV_QUEUE_DESC ), +8192U ); + } +for (lcore_id =0 ; lcore_id <RTE_MAX_LCORE ; lcore_id++) {if (rte_lcore_is_enabled (lcore_id) ==0 )continue ;
@@ -2678,11 +2716,12 @@ main(int32_t argc, char **argv)if (socket_ctx[socket_id].mbuf_pool)continue ; -pool_init (&socket_ctx[socket_id], socket_id,NB_MBUF ); +pool_init (&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);session_pool_init (&socket_ctx[socket_id], socket_id, sess_sz);session_priv_pool_init (&socket_ctx[socket_id], socket_id, sess_sz); } +printf ("Number of mbufs in packet pool %d\n" , nb_bufs_in_pool);RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 )
@@ -2694,8 +2733,6 @@ main(int32_t argc, char **argv) req_tx_offloads[portid]); } -cryptodevs_init (); -/* * Set the enabled port mask in helper config for use by helper * sub-system. This will be used while initializing devices using
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v3 13/13] examples/ipsec-secgw: make number of buffers dynamic
Hi Lukasz,
Quoted 148 lines
Make number of buffers in a pool
nb_mbuf_in_pooldependent on number of ports, cores and crypto queues. Add command line option -s which when used overrides dynamic calculation of number of buffers in a pool.Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/ipsec-secgw.c | 59 +++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 11 deletions(-)examples/ipsec-secgw/ipsec-secgw.c +33
-8@@ -59,8 +59,6 @@ volatile bool force_quit;#define MEMPOOL_CACHE_SIZE 256 -#define NB_MBUF (32000) -#define CDEV_QUEUE_DESC 2048#define CDEV_MAP_ENTRIES 16384#define CDEV_MP_NB_OBJS 1024@@ -163,6 +161,7 @@ static int32_t promiscuous_on = 1;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; +static uint32_t nb_bufs_in_pool;/* * RX/TX HW offload capabilities to enable/use on ethernet ports. @@ -1259,6 +1258,7 @@ print_usage(const char *prgname)" [-w REPLAY_WINDOW_SIZE]" " [-e]" " [-a]" +" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]" " -f CONFIG_FILE" " --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]" @@ -1280,6 +1280,7 @@ print_usage(const char *prgname)" size for each SA\n" " -e enables ESN\n" " -a enables SA SQN atomic behaviour\n" +" -s number of mbufs in packet pool (default 8192)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" " --single-sa SAIDX: In poll mode use single SA index for\n" @@ -1479,7 +1480,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) argvopt = argv; -while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:" , +while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:s:" , lgopts, &option_index)) !=EOF ) {switch (opt) {@@ -1513,6 +1514,19 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) cfgfile = optarg; f_present =1 ;break ; + +case 's' : + ret =parse_decimal (optarg); +if (ret <0 ) { +printf ("Invalid number of buffers in a pool: " +"%s\n" , optarg); +print_usage (prgname); +return -1 ; + } + + nb_bufs_in_pool = ret; +break ; +case 'j' : ret =parse_decimal (optarg); if (ret < RTE_MBUF_DEFAULT_BUF_SIZE ||@@ -1876,12 +1890,12 @@ check_cryptodev_mask(uint8_t cdev_id)return -1 ; } -static int32_t +static uint16_t cryptodevs_init (void ) {struct rte_cryptodev_config dev_conf;struct rte_cryptodev_qp_conf qp_conf; -uint16_t idx, max_nb_qps, qp, i; +uint16_t idx, max_nb_qps, qp, total_nb_qps, i;int16_t cdev_id;struct rte_hash_parameters params = {0 };@@ -1909,6 +1923,7 @@ cryptodevs_init(void)printf ("lcore/cryptodev/qp mappings:\n" ); idx =0 ; + total_nb_qps =0 ;for (cdev_id =0 ; cdev_id <rte_cryptodev_count (); cdev_id++) {struct rte_cryptodev_info cdev_info;@@ -1942,6 +1957,7 @@ cryptodevs_init(void)if (qp ==0 )continue ; + total_nb_qps += qp; dev_conf.socket_id =rte_cryptodev_socket_id (cdev_id); dev_conf.nb_queue_pairs = qp; dev_conf.ff_disable =RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO ;@@ -1974,7 +1990,7 @@ cryptodevs_init(void)printf ("\n" ); -return 0 ; +return total_nb_qps; } static void@@ -2607,16 +2623,18 @@ int32_t main(int32_t argc, char **argv) { int32_t ret; -uint32_t lcore_id; +uint32_t lcore_id, nb_txq, nb_rxq =0 ;uint32_t cdev_id;uint32_t i;uint8_t socket_id; -uint16_t portid; +uint16_t portid, nb_crypto_qp, nb_ports =0 ;uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ];uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ];struct eh_conf *eh_conf =NULL ;size_t sess_sz; + nb_bufs_in_pool =0 ; +/* init EAL */ ret =rte_eal_init (argc, argv);if (ret <0 )@@ -2665,6 +2683,26 @@ main(int32_t argc, char **argv) sess_sz =max_session_size (); + nb_crypto_qp =cryptodevs_init (); + +if (nb_bufs_in_pool ==0 ) { +RTE_ETH_FOREACH_DEV (portid) { +if ((enabled_port_mask & (1 << portid)) ==0 ) +continue ; + nb_ports++;
examples/ipsec-secgw/ipsec-secgw.c main(int32_t argc, char **argv) · line 2702
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +10
-0+ nb_rxq +=get_port_nb_rx_queues (portid); + } + + nb_txq = nb_lcores; + + nb_bufs_in_pool = RTE_MAX((nb_rxq*nb_rxd + + nb_ports*nb_lcores*MAX_PKT_BURST + + nb_ports*nb_txq*nb_txd + + nb_lcores*MEMPOOL_CACHE_SIZE + + nb_crypto_qp*CDEV_QUEUE_DESC),
I think you forgot to take into account possible reassemble table:
@@ -2699,7 +2699,9 @@ main(int32_t argc, char **argv)
nb_ports*nb_lcores*MAX_PKT_BURST + nb_ports*nb_txq*nb_txd + nb_lcores*MEMPOOL_CACHE_SIZE +
- nb_crypto_qp*CDEV_QUEUE_DESC),
+ nb_crypto_qp*CDEV_QUEUE_DESC +
+ nb_lcores * frag_tbl_sz *
+ FRAG_TBL_BUCKET_ENTRIES),
8192U);Also it might be worth for better readability to put code for nb_bufs_in_pool calculation in a separate function (and add spaces between '*' and its' operands). Apart from that - whole series LGTM.
Konstantin
Quoted 31 lines
examples/ipsec-secgw/ipsec-secgw.c +5
-4+ 8192U); + } +for (lcore_id =0 ; lcore_id <RTE_MAX_LCORE ; lcore_id++) {if (rte_lcore_is_enabled (lcore_id) ==0 )continue ;@@ -2678,11 +2716,12 @@ main(int32_t argc, char **argv)if (socket_ctx[socket_id].mbuf_pool)continue ; -pool_init (&socket_ctx[socket_id], socket_id,NB_MBUF ); +pool_init (&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);session_pool_init (&socket_ctx[socket_id], socket_id, sess_sz);session_priv_pool_init (&socket_ctx[socket_id], socket_id, sess_sz); } +printf ("Number of mbufs in packet pool %d\n" , nb_bufs_in_pool);RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 )@@ -2694,8 +2733,6 @@ main(int32_t argc, char **argv) req_tx_offloads[portid]); } -cryptodevs_init (); -/* * Set the enabled port mask in helper config for use by helper * sub-system. This will be used while initializing devices using -- 2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v3 13/13] examples/ipsec-secgw: make number of buffers dynamic
Hi Konstantin,
Please see inline.
Thanks,
Lukasz
Quoted 167 lines · Konstantin
External Email
----------------------------------------------------------------------
Hi Lukasz,
Quoted 148 lines
Make number of buffers in a pool
nb_mbuf_in_pooldependent on number of ports, cores and crypto queues. Add command line option -s which when used overrides dynamic calculation of number of buffers in a pool.Signed-off-by Anoob Joseph <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>--- examples/ipsec-secgw/ipsec-secgw.c | 59 +++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 11 deletions(-)examples/ipsec-secgw/ipsec-secgw.c +33
-8@@ -59,8 +59,6 @@ volatile bool force_quit;#define MEMPOOL_CACHE_SIZE 256 -#define NB_MBUF (32000) -#define CDEV_QUEUE_DESC 2048#define CDEV_MAP_ENTRIES 16384#define CDEV_MP_NB_OBJS 1024@@ -163,6 +161,7 @@ static int32_t promiscuous_on = 1;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; +static uint32_t nb_bufs_in_pool;/* * RX/TX HW offload capabilities to enable/use on ethernet ports. @@ -1259,6 +1258,7 @@ print_usage(const char *prgname)" [-w REPLAY_WINDOW_SIZE]" " [-e]" " [-a]" +" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]" " -f CONFIG_FILE" " --config (port,queue,lcore)[,(port,queue,lcore)]" " [--single-sa SAIDX]" @@ -1280,6 +1280,7 @@ print_usage(const char *prgname)" size for each SA\n" " -e enables ESN\n" " -a enables SA SQN atomic behaviour\n" +" -s number of mbufs in packet pool (default 8192)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" " --single-sa SAIDX: In poll mode use single SA index for\n" @@ -1479,7 +1480,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) argvopt = argv; -while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:" , +while ((opt =getopt_long (argc, argvopt,"aelp:Pu:f:j:w:s:" , lgopts, &option_index)) !=EOF ) {switch (opt) {@@ -1513,6 +1514,19 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf) cfgfile = optarg; f_present =1 ;break ; + +case 's' : + ret =parse_decimal (optarg); +if (ret <0 ) { +printf ("Invalid number of buffers in a pool: " +"%s\n" , optarg); +print_usage (prgname); +return -1 ; + } + + nb_bufs_in_pool = ret; +break ; +case 'j' : ret =parse_decimal (optarg); if (ret < RTE_MBUF_DEFAULT_BUF_SIZE ||@@ -1876,12 +1890,12 @@ check_cryptodev_mask(uint8_t cdev_id)return -1 ; } -static int32_t +static uint16_t cryptodevs_init (void ) {struct rte_cryptodev_config dev_conf;struct rte_cryptodev_qp_conf qp_conf; -uint16_t idx, max_nb_qps, qp, i; +uint16_t idx, max_nb_qps, qp, total_nb_qps, i;int16_t cdev_id;struct rte_hash_parameters params = {0 };@@ -1909,6 +1923,7 @@ cryptodevs_init(void)printf ("lcore/cryptodev/qp mappings:\n" ); idx =0 ; + total_nb_qps =0 ;for (cdev_id =0 ; cdev_id <rte_cryptodev_count (); cdev_id++) {struct rte_cryptodev_info cdev_info;@@ -1942,6 +1957,7 @@ cryptodevs_init(void)if (qp ==0 )continue ; + total_nb_qps += qp; dev_conf.socket_id =rte_cryptodev_socket_id (cdev_id); dev_conf.nb_queue_pairs = qp; dev_conf.ff_disable =RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO ;@@ -1974,7 +1990,7 @@ cryptodevs_init(void)printf ("\n" ); -return 0 ; +return total_nb_qps; } static void@@ -2607,16 +2623,18 @@ int32_t main(int32_t argc, char **argv) { int32_t ret; -uint32_t lcore_id; +uint32_t lcore_id, nb_txq, nb_rxq =0 ;uint32_t cdev_id;uint32_t i;uint8_t socket_id; -uint16_t portid; +uint16_t portid, nb_crypto_qp, nb_ports =0 ;uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ];uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ];struct eh_conf *eh_conf =NULL ;size_t sess_sz; + nb_bufs_in_pool =0 ; +/* init EAL */ ret =rte_eal_init (argc, argv);if (ret <0 )@@ -2665,6 +2683,26 @@ main(int32_t argc, char **argv) sess_sz =max_session_size (); + nb_crypto_qp =cryptodevs_init (); + +if (nb_bufs_in_pool ==0 ) { +RTE_ETH_FOREACH_DEV (portid) { +if ((enabled_port_mask & (1 << portid)) ==0 ) +continue ; + nb_ports++;examples/ipsec-secgw/ipsec-secgw.c main(int32_t argc, char **argv) · line 2702
Quoted 10 lines
examples/ipsec-secgw/ipsec-secgw.c +10
-0+ nb_rxq +=get_port_nb_rx_queues (portid); + } + + nb_txq = nb_lcores; + + nb_bufs_in_pool = RTE_MAX((nb_rxq*nb_rxd + + nb_ports*nb_lcores*MAX_PKT_BURST + + nb_ports*nb_txq*nb_txd + + nb_lcores*MEMPOOL_CACHE_SIZE + + nb_crypto_qp*CDEV_QUEUE_DESC),I think you forgot to take into account possible reassemble table:
Review main(int32_t argc, char **argv) · line 2705
Quoted 8 lines
(quoted diff) +3
-1@@ -2699,7 +2699,9 @@ main(int32_t argc, char **argv) nb_ports*nb_lcores*MAX_PKT_BURST + nb_ports*nb_txq*nb_txd + nb_lcores*MEMPOOL_CACHE_SIZE + - nb_crypto_qp*CDEV_QUEUE_DESC), + nb_crypto_qp*CDEV_QUEUE_DESC + + nb_lcores * frag_tbl_sz * + FRAG_TBL_BUCKET_ENTRIES), 8192U);
[Lukasz] I will add it in V4.
Quoted 6 lines
Also it might be worth for better readability to put code for
nb_bufs_in_poolcalculation in a separate function (and add spaces between '*' and its' operands). Apart from that - whole series LGTM.
Konstantin
[Lukasz] Thank you for reviewing the changes. I will resolve your comment in V4.
Quoted 34 lines
Quoted 33 lines
examples/ipsec-secgw/ipsec-secgw.c +5
-4+ 8192U); + } +for (lcore_id =0 ; lcore_id <RTE_MAX_LCORE ; lcore_id++) {if (rte_lcore_is_enabled (lcore_id) ==0 )continue ;@@ -2678,11 +2716,12 @@ main(int32_t argc, char **argv)if (socket_ctx[socket_id].mbuf_pool)continue ; -pool_init (&socket_ctx[socket_id], socket_id,NB_MBUF ); +pool_init (&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);session_pool_init (&socket_ctx[socket_id], socket_id, sess_sz);session_priv_pool_init (&socket_ctx[socket_id], socket_id, sess_sz); } +printf ("Number of mbufs in packet pool %d\n" , nb_bufs_in_pool);RTE_ETH_FOREACH_DEV (portid) {if ((enabled_port_mask & (1 << portid)) ==0 )@@ -2694,8 +2733,6 @@ main(int32_t argc, char **argv) req_tx_offloads[portid]); } -cryptodevs_init (); -/* * Set the enabled port mask in helper config for use by helper * sub-system. This will be used while initializing devices using -- 2.7.4
v4 cover add eventmode to ipsec-secgw
In reply to Lukasz BartosikThis series introduces event-mode additions to ipsec-secgw.
With this series, ipsec-secgw would be able to run in eventmode. The worker thread (executing loop) would be receiving events and would be submitting it back to the eventdev after the processing. This way, multicore scaling and h/w assisted scheduling is achieved by making use of the eventdev capabilities.
Since the underlying event device would be having varying capabilities, the worker thread could be drafted differently to maximize performance. This series introduces usage of multiple worker threads, among which the one to be used will be determined by the operating conditions and the underlying device capabilities.
For example, if an event device - eth device pair has Tx internal port, then application can do tx_adapter_enqueue() instead of regular event_enqueue(). So a thread making an assumption that the device pair has internal port will not be the right solution for another pair. The infrastructure added with these patches aims to help application to have multiple worker threads, there by extracting maximum performance from every device without affecting existing paths/use cases.
The eventmode configuration is predefined. All packets reaching one eth port will hit one event queue. All event queues will be mapped to all event ports. So all cores will be able to receive traffic from all ports. When schedule_type is set as RTE_SCHED_TYPE_ORDERED/ATOMIC, event device will ensure the ordering. Ordering would be lost when tried in PARALLEL.
Following command line options are introduced,
--transfer-mode: to choose between poll mode & event mode --event-schedule-type: to specify the scheduling type
(RTE_SCHED_TYPE_ORDERED/
RTE_SCHED_TYPE_ATOMIC/ RTE_SCHED_TYPE_PARALLEL)
Additionally the event mode introduces two modes of processing packets:
Driver-mode: This mode will have bare minimum changes in the application
to support ipsec. There woudn't be any lookup etc done in the application. And for inline-protocol use case, the thread would resemble l2fwd as the ipsec processing would be done entirely in the h/w. This mode can be used to benchmark the raw performance of the h/w. All the application side steps (like lookup) can be redone based on the requirement of the end user. Hence the need for a mode which would report the raw performance.
App-mode: This mode will have all the features currently implemented with
ipsec-secgw (non librte_ipsec mode). All the lookups etc would follow the existing methods and would report numbers that can be compared against regular ipsec-secgw benchmark numbers.
The driver mode is selected with existing --single-sa option (used also by poll mode). When --single-sa option is used in conjution with event mode then index passed to --single-sa is ignored.
Example commands to execute ipsec-secgw in various modes on OCTEON TX2 platform,
#Inbound and outbound app mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel
#Inbound and outbound driver mode
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel --single-sa 0
This series adds non burst tx internal port workers only. It provides infrastructure for non internal port workers, however does not define any. Also, only inline ipsec protocol mode is supported by the worker threads added.
Following are planned features,
1. Add burst mode workers.
2. Add non internal port workers.
3. Verify support for Rx core (the support is added but lack of h/w to verify).
4. Add lookaside protocol support.
Following are features that Marvell won't be attempting.
1. Inline crypto support.
2. Lookaside crypto support.
For the features that Marvell won't be attempting, new workers can be introduced by the respective stake holders.
This series is tested on Marvell OCTEON TX2.
This series is targeted for 20.05 release.
Changes in v4:
* Update ipsec-secgw documentation to describe the new options as well as event mode support.
* In event mode reserve number of crypto queues equal to number of eth ports in order to meet inline protocol offload requirements.
* Add calculate_nb_mbufs() function to calculate number of mbufs in a pool and include fragments table size into the calculation.
* Move structures ipsec_xf and ipsec_sad to ipsec.h and remove static keyword from sa_out, nb_sa_out, sa_in and nb_sa_in in sa.c.
* Update process_ipsec_ev_inbound(), process_ipsec_ev_outbound(), check_sp() and prepare_out_sessions_tbl() functions as a result of changes introduced by SAD feature.
* Remove setting sa->cdev_id_qp to 0 in create_inline_session as sa_ctx is created with rte_zmalloc.
* Minor cleanup enhancements:
- In eh_set_default_conf_eventdev() function in event_helper.c put definition of int local vars in one line, remove invalid comment, put "eventdev_config->ev_queue_mode = RTE_EVENT_QUEUE_CFG_ALL_TYPES" in one line instead of two.
- Remove extern "C" from event_helper.h.
- Put local vars in reverse xmas tree order in eh_dev_has_rx_internal_port() and eh_dev_has_tx_internal_port() functions in event_helper.c.
- Put #include <rte_bitmap.h> in alphabetical order in ipsec-secgw.c.
- Move "extern volatile bool force_quit" and "#include <stdbool.h>" to ipsec-secgw.h, remove #include <rte_hash.h>.
- Remove not needed includes in ipsec_worker.c.
- Remove expired todo from ipsec_worker.h.
Changes in v3:
* Move eh_conf_init() and eh_conf_uninit() functions to event_helper.c including minor rework.
* Rename --schedule-type option to --event-schedule-type.
* Replace macro UNPROTECTED_PORT with static inline function is_unprotected_port().
* Move definitions of global variables used by multiple modules to .c files and add externs in .h headers.
* Add eh_check_conf() which validates ipsec-secgw configuration for event mode.
* Add dynamic calculation of number of buffers in a pool based on number of cores, ports and crypto queues.
* Fix segmentation fault in event mode driver worker which happens when there are no inline outbound sessions configured.
* Remove change related to updating number of crypto queues in cryptodevs_init(). The update of crypto queues will be handled in a separate patch.
* Fix compilation error on 32-bit platforms by using userdata instead of udata64 from rte_mbuf.
Changes in v2:
* Remove --process-dir option. Instead use existing unprotected port mask option (-u) to decide wheter port handles inbound or outbound traffic.
* Remove --process-mode option. Instead use existing --single-sa option to select between app and driver modes.
* Add handling of PKT_RX_SEC_OFFLOAD_FAIL result in app worker thread.
* Fix passing of req_rx_offload flags to create_default_ipsec_flow().
* Move destruction of flows to a location where eth ports are stopped and closed.
* Print error and exit when event mode --schedule-type option is used in poll mode.
* Reduce number of goto statements replacing them with loop constructs.
* Remove sec_session_fixed table and replace it with locally build table in driver worker thread. Table is indexed by port identifier and holds first inline session pointer found for a given port.
* Print error and exit when sessions other than inline are configured in event mode.
* When number of event queues is less than number of eth ports then map all eth ports to one event queue.
* Cleanup and minor improvements in code as suggested by Konstantin
Ankur Dwivedi (1):
examples/ipsec-secgw: add default rte flow for inline Rx
Anoob Joseph (5):
examples/ipsec-secgw: add framework for eventmode helper examples/ipsec-secgw: add eventdev port-lcore link examples/ipsec-secgw: add Rx adapter support examples/ipsec-secgw: add Tx adapter support examples/ipsec-secgw: add routines to display config
Lukasz Bartosik (9):
examples/ipsec-secgw: add routines to launch workers examples/ipsec-secgw: add support for internal ports examples/ipsec-secgw: add event helper config init/uninit examples/ipsec-secgw: add eventmode to ipsec-secgw examples/ipsec-secgw: add driver mode worker examples/ipsec-secgw: add app mode worker examples/ipsec-secgw: make number of buffers dynamic
doc: add event mode support to ipsec-secgw examples/ipsec-secgw: reserve crypto queues in event mode
doc/guides/sample_app_ug/ipsec_secgw.rst | 138 ++- examples/ipsec-secgw/Makefile | 2 + examples/ipsec-secgw/event_helper.c | 1812 ++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 327 ++++++ examples/ipsec-secgw/ipsec-secgw.c | 463 ++++++-- examples/ipsec-secgw/ipsec-secgw.h | 88 ++ examples/ipsec-secgw/ipsec.c | 5 +- examples/ipsec-secgw/ipsec.h | 53 +- examples/ipsec-secgw/ipsec_worker.c | 638 +++++++++++ examples/ipsec-secgw/ipsec_worker.h | 35 + examples/ipsec-secgw/meson.build | 6 +- examples/ipsec-secgw/sa.c | 21 +- examples/ipsec-secgw/sad.h | 5 - 13 files changed, 3464 insertions(+), 129 deletions(-) create mode 100644 examples/ipsec-secgw/event_helper.c create mode 100644 examples/ipsec-secgw/event_helper.h create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c create mode 100644 examples/ipsec-secgw/ipsec_worker.h
Signature · 1 line
2.7.4
PATCH v4 1/15 examples/ipsec-secgw: add default rte flow for inline Rx
From: Ankur Dwivedi <[email protected]>
The default flow created would enable security processing on all ESP packets. If the default flow is created, SA based rte_flow creation would be skipped.
--- examples/ipsec-secgw/ipsec-secgw.c | 61 +++++++++++++++++++++++++++++++++----- examples/ipsec-secgw/ipsec.c | 5 +++- examples/ipsec-secgw/ipsec.h | 6 ++++ 3 files changed, 63 insertions(+), 9 deletions(-)
examples/ipsec-secgw/ipsec-secgw.c +53 -8
@@ -129,6 +129,8 @@ struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS] = { { 0, ETHADDR(0x00, 0x16, 0x3e, 0x49, 0x9e, 0xdd) } }; +struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ]; +#define CMD_LINE_OPT_CONFIG "config"#define CMD_LINE_OPT_SINGLE_SA "single-sa"#define CMD_LINE_OPT_CRYPTODEV_MASK "cryptodev_mask"
@@ -2432,6 +2434,48 @@ reassemble_init(void)return rc; } +static void +create_default_ipsec_flow (uint16_t port_id,uint64_t rx_offloads) +{ +struct rte_flow_action action[2 ]; +struct rte_flow_item pattern[2 ]; +struct rte_flow_attr attr = {0 }; +struct rte_flow_error err; +struct rte_flow *flow; +int ret; + +if (!(rx_offloads &DEV_RX_OFFLOAD_SECURITY )) +return ; + +/* Add the default rte_flow to enable SECURITY for all ESP packets */ + + pattern[0 ].type =RTE_FLOW_ITEM_TYPE_ESP ; + pattern[0 ].spec =NULL ; + pattern[0 ].mask =NULL ; + pattern[0 ].last =NULL ; + pattern[1 ].type =RTE_FLOW_ITEM_TYPE_END ; + + action[0 ].type =RTE_FLOW_ACTION_TYPE_SECURITY ; + action[0 ].conf =NULL ; + action[1 ].type =RTE_FLOW_ACTION_TYPE_END ; + action[1 ].conf =NULL ; + + attr.ingress =1 ; + + ret =rte_flow_validate (port_id, &attr, pattern, action, &err); +if (ret) +return ; + + flow =rte_flow_create (port_id, &attr, pattern, action, &err); +if (flow ==NULL ) +return ; + + flow_info_tbl[port_id].rx_def_flow = flow; +RTE_LOG (INFO ,IPSEC , +"Created default flow enabling SECURITY for all ESP traffic on port %d\n" , + port_id); +} +int32_t main (int32_t argc,char **argv) {
@@ -2440,7 +2484,8 @@ main(int32_t argc, char **argv)uint32_t i;uint8_t socket_id;uint16_t portid; -uint64_t req_rx_offloads, req_tx_offloads; +uint64_t req_rx_offloads[RTE_MAX_ETHPORTS ]; +uint64_t req_tx_offloads[RTE_MAX_ETHPORTS ];size_t sess_sz;/* init EAL */
@@ -2502,8 +2547,10 @@ main(int32_t argc, char **argv)if ((enabled_port_mask & (1 << portid)) ==0 )continue ; -sa_check_offloads (portid, &req_rx_offloads, &req_tx_offloads); -port_init (portid, req_rx_offloads, req_tx_offloads); +sa_check_offloads (portid, &req_rx_offloads[portid], + &req_tx_offloads[portid]); +port_init (portid, req_rx_offloads[portid], + req_tx_offloads[portid]); }cryptodevs_init ();
@@ -2513,11 +2560,9 @@ main(int32_t argc, char **argv)if ((enabled_port_mask & (1 << portid)) ==0 )continue ; -/* -* Start device -* note: device must be started before a flow rule -* can be installed. -*/ +/* Create flow before starting the device */ +create_default_ipsec_flow (portid, req_rx_offloads[portid]); + ret =rte_eth_dev_start (portid);if (ret <0 ) rte_exit(EXIT_FAILURE, "rte_eth_dev_start: "
examples/ipsec-secgw/ipsec.c +4 -1
@@ -275,6 +275,10 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa,unsigned int i;unsigned int j; +/* Don't create flow if default flow is created */ +if (flow_info_tbl[sa->portid].rx_def_flow) +return 0 ; + ret =rte_eth_dev_info_get (sa->portid, &dev_info);if (ret !=0 ) { RTE_LOG(ERR, IPSEC,
@@ -410,7 +414,6 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa, ips->security.ol_flags = sec_cap->ol_flags; ips->security.ctx = sec_ctx; } - sa->cdev_id_qp =0 ;return 0 ; }
examples/ipsec-secgw/ipsec.h +6 -0
@@ -87,6 +87,12 @@ struct app_sa_prm {extern struct app_sa_prm app_sa_prm; +struct flow_info { +struct rte_flow *rx_def_flow; +}; + +extern struct flow_info flow_info_tbl[RTE_MAX_ETHPORTS ]; +enum {IPSEC_SESSION_PRIMARY =0 ,IPSEC_SESSION_FALLBACK =1 ,
Signature · 1 line
2.7.4
PATCH v4 2/15 examples/ipsec-secgw: add framework for eventmode helper
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add framework for eventmode helper. Event mode involves initialization of multiple devices like eventdev, ethdev and etc. Add routines to initialize and uninitialize event device. Generate a default config for event device if it is not specified in the configuration. Currently event helper supports single event device only.
--- examples/ipsec-secgw/Makefile | 1 + examples/ipsec-secgw/event_helper.c | 320 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 107 ++++++++++++ examples/ipsec-secgw/meson.build | 4 +- 4 files changed, 430 insertions(+), 2 deletions(-) create mode 100644 examples/ipsec-secgw/event_helper.c create mode 100644 examples/ipsec-secgw/event_helper.h
examples/ipsec-secgw/Makefile +1 -0
@@ -16,6 +16,7 @@ SRCS-y += sad.c SRCS-y += rt.c SRCS-y += ipsec_process.c SRCS-y += ipsec-secgw.c +SRCS-y += event_helper.c CFLAGS += -gdwarf-2
examples/ipsec-secgw/event_helper.c new file +320 -0
320 lines not on this page · raw message
examples/ipsec-secgw/event_helper.h new file +107 -0
107 lines not on this page · raw message
examples/ipsec-secgw/meson.build +2 -2
@@ -6,9 +6,9 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec'] +deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev'] allow_experimental_apis = true sources = files( - 'esp.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c', + 'esp.c', 'event_helper.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c', 'parser.c', 'rt.c', 'sa.c', 'sad.c', 'sp4.c', 'sp6.c' )
Signature · 1 line
2.7.4
PATCH v4 3/15 examples/ipsec-secgw: add eventdev port-lcore link
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add event device port-lcore link and specify which event queues should be connected to the event port. Generate a default config for event port-lcore links if it is not specified in the configuration. This routine will check the number of available ports and then create links according to the number of cores available. This patch also adds a new entry in the eventmode conf to denote that all queues are to be linked with every port. This enables one core to receive packets from all ethernet ports.
--- examples/ipsec-secgw/event_helper.c | 126 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 33 ++++++++++ 2 files changed, 159 insertions(+)
examples/ipsec-secgw/event_helper.c +126 -0
@@ -1,11 +1,33 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright (C) 2020 Marvell International Ltd. */ +#include <rte_bitmap.h> #include <rte_ethdev.h> #include <rte_eventdev.h> +#include <rte_malloc.h> #include "event_helper.h" +static inline unsigned int +eh_get_next_active_core (struct eventmode_conf *em_conf,unsigned int prev_core) +{ +unsigned int next_core; + +/* Get next active core skipping cores reserved as eth cores */ +do { +/* Get the next core */ + next_core =rte_get_next_lcore (prev_core,0 ,0 ); + +/* Check if we have reached max lcores */ +if (next_core ==RTE_MAX_LCORE ) +return next_core; + + prev_core = next_core; + }while (rte_bitmap_get (em_conf->eth_core_mask, next_core)); + +return next_core; +} +static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -77,6 +99,71 @@ eh_set_default_conf_eventdev(struct eventmode_conf *em_conf) }static int +eh_set_default_conf_link (struct eventmode_conf *em_conf) +{ +struct eventdev_params *eventdev_config; +struct eh_event_link_info *link; +unsigned int lcore_id =-1 ; +int i, link_index; + +/* +* Create a 1:1 mapping from event ports to cores. If the number +* of event ports is lesser than the cores, some cores won't +* execute worker. If there are more event ports, then some ports +* won't be used. +* +*/ + +/* +* The event queue-port mapping is done according to the link. Since +* we are falling back to the default link config, enabling +* "all_ev_queue_to_ev_port" mode flag. This will map all queues +* to the port. +*/ + em_conf->ext_params.all_ev_queue_to_ev_port =1 ; + +/* Get first event dev conf */ + eventdev_config = &(em_conf->eventdev_config[0 ]); + +/* Loop through the ports */ +for (i =0 ; i < eventdev_config->nb_eventport; i++) { + +/* Get next active core id */ + lcore_id =eh_get_next_active_core (em_conf, + lcore_id); + +if (lcore_id ==RTE_MAX_LCORE ) { +/* Reached max cores */ +return 0 ; + } + +/* Save the current combination as one link */ + +/* Get the index */ + link_index = em_conf->nb_link; + +/* Get the corresponding link */ + link = &(em_conf->link[link_index]); + +/* Save link */ + link->eventdev_id = eventdev_config->eventdev_id; + link->event_port_id = i; + link->lcore_id = lcore_id; + +/* +* Don't set eventq_id as by default all queues +* need to be mapped to the port, which is controlled +* by the operating mode. +*/ + +/* Update number of links */ + em_conf->nb_link++; + } + +return 0 ; +} + +static int eh_validate_conf (struct eventmode_conf *em_conf) {int ret;
@@ -91,6 +178,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* +* Check if links are specified. Else generate a default config for +* the event ports used. +*/ +if (em_conf->nb_link ==0 ) { + ret =eh_set_default_conf_link (em_conf); +if (ret !=0 ) +return ret; + } +return 0 ; }
@@ -102,6 +199,8 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf)struct rte_event_dev_config eventdev_conf;struct eventdev_params *eventdev_config;int nb_eventdev = em_conf->nb_eventdev; +struct eh_event_link_info *link; +uint8_t *queue =NULL ;uint8_t eventdev_id;int nb_eventqueue;uint8_t i, j;
@@ -199,6 +298,33 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf) } } +/* Make event queue - event port link */ +for (j =0 ; j < em_conf->nb_link; j++) { + +/* Get link info */ + link = &(em_conf->link[j]); + +/* Get event dev ID */ + eventdev_id = link->eventdev_id; + +/* +* If "all_ev_queue_to_ev_port" params flag is selected, all +* queues need to be mapped to the port. +*/ +if (em_conf->ext_params.all_ev_queue_to_ev_port) + queue =NULL ; +else + queue = &(link->eventq_id); + +/* Link queue to port */ + ret =rte_event_port_link (eventdev_id, link->event_port_id, + queue,NULL ,1 ); +if (ret <0 ) { +EH_LOG_ERR ("Failed to link event port %d" , ret); +return ret; + } + } +/* Start event devices */ for (i =0 ; i < nb_eventdev; i++) {
examples/ipsec-secgw/event_helper.h +33 -0
@@ -16,6 +16,13 @@/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS +/* Max event queues supported per event device */ +#define EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV RTE_EVENT_MAX_QUEUES_PER_DEV + +/* Max event-lcore links */ +#define EVENT_MODE_MAX_LCORE_LINKS \ + (EVENT_MODE_MAX_EVENT_DEVS * EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV) +/** * Packet transfer mode of the application */
@@ -32,17 +39,43 @@ struct eventdev_params {uint8_t ev_queue_mode; }; +/** +* Event-lcore link configuration +*/ +struct eh_event_link_info { +uint8_t eventdev_id; +/**< Event device ID */ +uint8_t event_port_id; +/**< Event port ID */ +uint8_t eventq_id; +/**< Event queue to be linked to the port */ +uint8_t lcore_id; +/**< Lcore to be polling on this port */ +}; +/* Eventmode conf data */ struct eventmode_conf {int nb_eventdev;/**< No of event devs */ struct eventdev_params eventdev_config[EVENT_MODE_MAX_EVENT_DEVS ];/**< Per event dev conf */ +uint8_t nb_link; +/**< No of links */ +struct eh_event_link_info + link[EVENT_MODE_MAX_LCORE_LINKS ]; +/**< Per link conf */ +struct rte_bitmap *eth_core_mask; +/**< Core mask of cores to be used for software Rx and Tx */ union {RTE_STD_C11 struct { uint64_t sched_type : 2;/**< Schedule type */ +uint64_t all_ev_queue_to_ev_port :1 ; +/**< +* When enabled, all event queues need to be mapped to +* each event port +*/ };uint64_t u64; } ext_params;
Signature · 1 line
2.7.4
PATCH v4 4/15 examples/ipsec-secgw: add Rx adapter support
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add Rx adapter support. The event helper init routine will initialize the Rx adapter according to the configuration. If Rx adapter config is not present it will generate a default config. If there are enough event queues available it will map eth ports and event queues 1:1 (one eth port will be connected to one event queue). Otherwise it will map all eth ports to one event queue.
--- examples/ipsec-secgw/event_helper.c | 273 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/event_helper.h | 29 ++++ 2 files changed, 301 insertions(+), 1 deletion(-)
examples/ipsec-secgw/event_helper.c +272 -1
@@ -4,10 +4,58 @@#include <rte_bitmap.h> #include <rte_ethdev.h> #include <rte_eventdev.h> +#include <rte_event_eth_rx_adapter.h> #include <rte_malloc.h> +#include <stdbool.h> #include "event_helper.h" +static int +eh_get_enabled_cores (struct rte_bitmap *eth_core_mask) +{ +int i, count =0 ; + +RTE_LCORE_FOREACH (i) { +/* Check if this core is enabled in core mask*/ +if (rte_bitmap_get (eth_core_mask, i)) { +/* Found enabled core */ + count++; + } + } +return count; +} + +static inline unsigned int +eh_get_next_eth_core (struct eventmode_conf *em_conf) +{ +static unsigned int prev_core =-1 ; +unsigned int next_core; + +/* +* Make sure we have at least one eth core running, else the following +* logic would lead to an infinite loop. +*/ +if (eh_get_enabled_cores (em_conf->eth_core_mask) ==0 ) { +EH_LOG_ERR ("No enabled eth core found" ); +return RTE_MAX_LCORE ; + } + +/* Only some cores are marked as eth cores, skip others */ +do { +/* Get the next core */ + next_core =rte_get_next_lcore (prev_core,0 ,1 ); + +/* Check if we have reached max lcores */ +if (next_core ==RTE_MAX_LCORE ) +return next_core; + +/* Update prev_core */ + prev_core = next_core; + }while (!(rte_bitmap_get (em_conf->eth_core_mask, next_core))); + +return next_core; +} +static inline unsigned int eh_get_next_active_core (struct eventmode_conf *em_conf,unsigned int prev_core) {
@@ -164,6 +212,82 @@ eh_set_default_conf_link(struct eventmode_conf *em_conf) }static int +eh_set_default_conf_rx_adapter (struct eventmode_conf *em_conf) +{ +struct rx_adapter_connection_info *conn; +struct eventdev_params *eventdev_config; +struct rx_adapter_conf *adapter; +bool single_ev_queue = false; +int eventdev_id; +int nb_eth_dev; +int adapter_id; +int conn_id; +int i; + +/* Create one adapter with eth queues mapped to event queue(s) */ + +if (em_conf->nb_eventdev ==0 ) { +EH_LOG_ERR ("No event devs registered" ); +return -EINVAL ; + } + +/* Get the number of eth devs */ + nb_eth_dev =rte_eth_dev_count_avail (); + +/* Use the first event dev */ + eventdev_config = &(em_conf->eventdev_config[0 ]); + +/* Get eventdev ID */ + eventdev_id = eventdev_config->eventdev_id; + adapter_id =0 ; + +/* Get adapter conf */ + adapter = &(em_conf->rx_adapter[adapter_id]); + +/* Set adapter conf */ + adapter->eventdev_id = eventdev_id; + adapter->adapter_id = adapter_id; + adapter->rx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Map all queues of eth device (port) to an event queue. If there +* are more event queues than eth ports then create 1:1 mapping. +* Otherwise map all eth ports to a single event queue. +*/ +if (nb_eth_dev > eventdev_config->nb_eventqueue) + single_ev_queue = true; + +for (i =0 ; i < nb_eth_dev; i++) { + +/* Use only the ports enabled */ +if ((em_conf->eth_portmask & (1 << i)) ==0 ) +continue ; + +/* Get the connection id */ + conn_id = adapter->nb_connections; + +/* Get the connection */ + conn = &(adapter->conn[conn_id]); + +/* Set mapping between eth ports & event queues*/ + conn->ethdev_id = i; + conn->eventq_id = single_ev_queue ?0 : i; + +/* Add all eth queues eth port to event queue */ + conn->ethdev_rx_qid =-1 ; + +/* Update no of connections */ + adapter->nb_connections++; + + } + +/* We have setup one adapter */ + em_conf->nb_rx_adapter =1 ; + +return 0 ; +} + +static int eh_validate_conf (struct eventmode_conf *em_conf) {int ret;
@@ -188,6 +312,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* +* Check if rx adapters are specified. Else generate a default config +* with one rx adapter and all eth queues - event queue mapped. +*/ +if (em_conf->nb_rx_adapter ==0 ) { + ret =eh_set_default_conf_rx_adapter (em_conf); +if (ret !=0 ) +return ret; + } +return 0 ; }
@@ -341,6 +475,104 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf)return 0 ; } +static int +eh_rx_adapter_configure (struct eventmode_conf *em_conf, +struct rx_adapter_conf *adapter) +{ +struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0 }; +struct rte_event_dev_info evdev_default_conf = {0 }; +struct rte_event_port_conf port_conf = {0 }; +struct rx_adapter_connection_info *conn; +uint8_t eventdev_id; +uint32_t service_id; +int ret; +int j; + +/* Get event dev ID */ + eventdev_id = adapter->eventdev_id; + +/* Get default configuration of event dev */ + ret =rte_event_dev_info_get (eventdev_id, &evdev_default_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to get event dev info %d" , ret); +return ret; + } + +/* Setup port conf */ + port_conf.new_event_threshold =1200 ; + port_conf.dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + port_conf.enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + +/* Create Rx adapter */ + ret =rte_event_eth_rx_adapter_create (adapter->adapter_id, + adapter->eventdev_id, &port_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to create rx adapter %d" , ret); +return ret; + } + +/* Setup various connections in the adapter */ +for (j =0 ; j < adapter->nb_connections; j++) { +/* Get connection */ + conn = &(adapter->conn[j]); + +/* Setup queue conf */ + queue_conf.ev.queue_id = conn->eventq_id; + queue_conf.ev.sched_type = em_conf->ext_params.sched_type; + queue_conf.ev.event_type =RTE_EVENT_TYPE_ETHDEV ; + +/* Add queue to the adapter */ + ret =rte_event_eth_rx_adapter_queue_add (adapter->adapter_id, + conn->ethdev_id, conn->ethdev_rx_qid, + &queue_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to add eth queue to rx adapter %d" , + ret); +return ret; + } + } + +/* Get the service ID used by rx adapter */ + ret =rte_event_eth_rx_adapter_service_id_get (adapter->adapter_id, + &service_id); +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ("Failed to get service id used by rx adapter %d" , + ret); +return ret; + } + +rte_service_set_runstate_mapped_check (service_id,0 ); + +/* Start adapter */ + ret =rte_event_eth_rx_adapter_start (adapter->adapter_id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to start rx adapter %d" , ret); +return ret; + } + +return 0 ; +} + +static int +eh_initialize_rx_adapter (struct eventmode_conf *em_conf) +{ +struct rx_adapter_conf *adapter; +int i, ret; + +/* Configure rx adapters */ +for (i =0 ; i < em_conf->nb_rx_adapter; i++) { + adapter = &(em_conf->rx_adapter[i]); + ret =eh_rx_adapter_configure (em_conf, adapter); +if (ret <0 ) { +EH_LOG_ERR ("Failed to configure rx adapter %d" , ret); +return ret; + } + } +return 0 ; +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -364,6 +596,9 @@ eh_devs_init(struct eh_conf *conf)/* Get eventmode conf */ em_conf = conf->mode_params; +/* Eventmode conf would need eth portmask */ + em_conf->eth_portmask = conf->eth_portmask; +/* Validate the requested config */ ret =eh_validate_conf (em_conf);if (ret <0 ) {
@@ -388,6 +623,13 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Setup Rx adapter */ + ret =eh_initialize_rx_adapter (em_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to initialize rx adapter %d" , ret); +return ret; + } +/* Start eth devices after setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
@@ -410,8 +652,8 @@ int32_t eh_devs_uninit(struct eh_conf *conf) {struct eventmode_conf *em_conf; +int ret, i, j;uint16_t id; -int ret, i;if (conf ==NULL ) {EH_LOG_ERR ("Invalid event helper configuration" );
@@ -429,6 +671,35 @@ eh_devs_uninit(struct eh_conf *conf)/* Get eventmode conf */ em_conf = conf->mode_params; +/* Stop and release rx adapters */ +for (i =0 ; i < em_conf->nb_rx_adapter; i++) { + + id = em_conf->rx_adapter[i].adapter_id; + ret =rte_event_eth_rx_adapter_stop (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to stop rx adapter %d" , ret); +return ret; + } + +for (j =0 ; j < em_conf->rx_adapter[i].nb_connections; j++) { + + ret =rte_event_eth_rx_adapter_queue_del (id, + em_conf->rx_adapter[i].conn[j].ethdev_id,-1 ); +if (ret <0 ) { +EH_LOG_ERR ( +"Failed to remove rx adapter queues %d" , + ret); +return ret; + } + } + + ret =rte_event_eth_rx_adapter_free (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to free rx adapter %d" , ret); +return ret; + } + } +/* Stop and release event devices */ for (i =0 ; i < em_conf->nb_eventdev; i++) {
examples/ipsec-secgw/event_helper.h +29 -0
@@ -16,6 +16,12 @@/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS +/* Max Rx adapters supported */ +#define EVENT_MODE_MAX_RX_ADAPTERS RTE_EVENT_MAX_DEVS + +/* Max Rx adapter connections */ +#define EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER 16 +/* Max event queues supported per event device */ #define EVENT_MODE_MAX_EVENT_QUEUES_PER_DEV RTE_EVENT_MAX_QUEUES_PER_DEV
@@ -53,12 +59,33 @@ struct eh_event_link_info {/**< Lcore to be polling on this port */ }; +/* Rx adapter connection info */ +struct rx_adapter_connection_info { +uint8_t ethdev_id; +uint8_t eventq_id; +int32_t ethdev_rx_qid; +}; + +/* Rx adapter conf */ +struct rx_adapter_conf { +int32_t eventdev_id; +int32_t adapter_id; +uint32_t rx_core_id; +uint8_t nb_connections; +struct rx_adapter_connection_info + conn[EVENT_MODE_MAX_CONNECTIONS_PER_ADAPTER ]; +}; +/* Eventmode conf data */ struct eventmode_conf {int nb_eventdev;/**< No of event devs */ struct eventdev_params eventdev_config[EVENT_MODE_MAX_EVENT_DEVS ];/**< Per event dev conf */ +uint8_t nb_rx_adapter; +/**< No of Rx adapters */ +struct rx_adapter_conf rx_adapter[EVENT_MODE_MAX_RX_ADAPTERS ]; +/**< Rx adapter conf */ uint8_t nb_link;/**< No of links */ struct eh_event_link_info
@@ -66,6 +93,8 @@ struct eventmode_conf {/**< Per link conf */ struct rte_bitmap *eth_core_mask;/**< Core mask of cores to be used for software Rx and Tx */ +uint32_t eth_portmask; +/**< Mask of the eth ports to be used */ union { RTE_STD_C11 struct {
Signature · 1 line
2.7.4
PATCH v4 5/15 examples/ipsec-secgw: add Tx adapter support
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add Tx adapter support. The event helper init routine will initialize the Tx adapter according to the configuration. If Tx adapter config is not present it will generate a default config.
--- examples/ipsec-secgw/event_helper.c | 313 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 48 ++++++ 2 files changed, 361 insertions(+)
examples/ipsec-secgw/event_helper.c +313 -0
@@ -5,6 +5,7 @@#include <rte_ethdev.h> #include <rte_eventdev.h> #include <rte_event_eth_rx_adapter.h> +#include <rte_event_eth_tx_adapter.h> #include <rte_malloc.h> #include <stdbool.h>
@@ -76,6 +77,22 @@ eh_get_next_active_core(struct eventmode_conf *em_conf, unsigned int prev_core)return next_core; } +static struct eventdev_params * +eh_get_eventdev_params (struct eventmode_conf *em_conf,uint8_t eventdev_id) +{ +int i; + +for (i =0 ; i < em_conf->nb_eventdev; i++) { +if (em_conf->eventdev_config[i].eventdev_id == eventdev_id) +break ; + } + +/* No match */ +if (i == em_conf->nb_eventdev) +return NULL ; + +return &(em_conf->eventdev_config[i]); +}static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -288,6 +305,95 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf) }static int +eh_set_default_conf_tx_adapter (struct eventmode_conf *em_conf) +{ +struct tx_adapter_connection_info *conn; +struct eventdev_params *eventdev_config; +struct tx_adapter_conf *tx_adapter; +int eventdev_id; +int adapter_id; +int nb_eth_dev; +int conn_id; +int i; + +/* +* Create one Tx adapter with all eth queues mapped to event queues +* 1:1. +*/ + +if (em_conf->nb_eventdev ==0 ) { +EH_LOG_ERR ("No event devs registered" ); +return -EINVAL ; + } + +/* Get the number of eth devs */ + nb_eth_dev =rte_eth_dev_count_avail (); + +/* Use the first event dev */ + eventdev_config = &(em_conf->eventdev_config[0 ]); + +/* Get eventdev ID */ + eventdev_id = eventdev_config->eventdev_id; + adapter_id =0 ; + +/* Get adapter conf */ + tx_adapter = &(em_conf->tx_adapter[adapter_id]); + +/* Set adapter conf */ + tx_adapter->eventdev_id = eventdev_id; + tx_adapter->adapter_id = adapter_id; + +/* TODO: Tx core is required only when internal port is not present */ + tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Application uses one event queue per adapter for submitting +* packets for Tx. Reserve the last queue available and decrement +* the total available event queues for this +*/ + +/* Queue numbers start at 0 */ + tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; + +/* +* Map all Tx queues of the eth device (port) to the event device. +*/ + +/* Set defaults for connections */ + +/* +* One eth device (port) is one connection. Map all Tx queues +* of the device to the Tx adapter. +*/ + +for (i =0 ; i < nb_eth_dev; i++) { + +/* Use only the ports enabled */ +if ((em_conf->eth_portmask & (1 << i)) ==0 ) +continue ; + +/* Get the connection id */ + conn_id = tx_adapter->nb_connections; + +/* Get the connection */ + conn = &(tx_adapter->conn[conn_id]); + +/* Add ethdev to connections */ + conn->ethdev_id = i; + +/* Add all eth tx queues to adapter */ + conn->ethdev_tx_qid =-1 ; + +/* Update no of connections */ + tx_adapter->nb_connections++; + } + +/* We have setup one adapter */ + em_conf->nb_tx_adapter =1 ; +return 0 ; +} + +static int eh_validate_conf (struct eventmode_conf *em_conf) {int ret;
@@ -322,6 +428,16 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* +* Check if tx adapters are specified. Else generate a default config +* with one tx adapter. +*/ +if (em_conf->nb_tx_adapter ==0 ) { + ret =eh_set_default_conf_tx_adapter (em_conf); +if (ret !=0 ) +return ret; + } +return 0 ; }
@@ -573,6 +689,133 @@ eh_initialize_rx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static int +eh_tx_adapter_configure (struct eventmode_conf *em_conf, +struct tx_adapter_conf *adapter) +{ +struct rte_event_dev_info evdev_default_conf = {0 }; +struct rte_event_port_conf port_conf = {0 }; +struct tx_adapter_connection_info *conn; +struct eventdev_params *eventdev_config; +uint8_t tx_port_id =0 ; +uint8_t eventdev_id; +uint32_t service_id; +int ret, j; + +/* Get event dev ID */ + eventdev_id = adapter->eventdev_id; + +/* Get event device conf */ + eventdev_config =eh_get_eventdev_params (em_conf, eventdev_id); + +/* Create Tx adapter */ + +/* Get default configuration of event dev */ + ret =rte_event_dev_info_get (eventdev_id, &evdev_default_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to get event dev info %d" , ret); +return ret; + } + +/* Setup port conf */ + port_conf.new_event_threshold = + evdev_default_conf.max_num_events; + port_conf.dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + port_conf.enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + +/* Create adapter */ + ret =rte_event_eth_tx_adapter_create (adapter->adapter_id, + adapter->eventdev_id, &port_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to create tx adapter %d" , ret); +return ret; + } + +/* Setup various connections in the adapter */ +for (j =0 ; j < adapter->nb_connections; j++) { + +/* Get connection */ + conn = &(adapter->conn[j]); + +/* Add queue to the adapter */ + ret =rte_event_eth_tx_adapter_queue_add (adapter->adapter_id, + conn->ethdev_id, conn->ethdev_tx_qid); +if (ret <0 ) { +EH_LOG_ERR ("Failed to add eth queue to tx adapter %d" , + ret); +return ret; + } + } + +/* Setup Tx queue & port */ + +/* Get event port used by the adapter */ + ret =rte_event_eth_tx_adapter_event_port_get ( + adapter->adapter_id, &tx_port_id); +if (ret) { +EH_LOG_ERR ("Failed to get tx adapter port id %d" , ret); +return ret; + } + +/* +* Tx event queue is reserved for Tx adapter. Unlink this queue +* from all other ports +* +*/ +for (j =0 ; j < eventdev_config->nb_eventport; j++) { +rte_event_port_unlink (eventdev_id, j, + &(adapter->tx_ev_queue),1 ); + } + +/* Link Tx event queue to Tx port */ + ret =rte_event_port_link (eventdev_id, tx_port_id, + &(adapter->tx_ev_queue),NULL ,1 ); +if (ret !=1 ) { +EH_LOG_ERR ("Failed to link event queue to port" ); +return ret; + } + +/* Get the service ID used by Tx adapter */ + ret =rte_event_eth_tx_adapter_service_id_get (adapter->adapter_id, + &service_id); +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ("Failed to get service id used by tx adapter %d" , + ret); +return ret; + } + +rte_service_set_runstate_mapped_check (service_id,0 ); + +/* Start adapter */ + ret =rte_event_eth_tx_adapter_start (adapter->adapter_id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to start tx adapter %d" , ret); +return ret; + } + +return 0 ; +} + +static int +eh_initialize_tx_adapter (struct eventmode_conf *em_conf) +{ +struct tx_adapter_conf *adapter; +int i, ret; + +/* Configure Tx adapters */ +for (i =0 ; i < em_conf->nb_tx_adapter; i++) { + adapter = &(em_conf->tx_adapter[i]); + ret =eh_tx_adapter_configure (em_conf, adapter); +if (ret <0 ) { +EH_LOG_ERR ("Failed to configure tx adapter %d" , ret); +return ret; + } + } +return 0 ; +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -630,6 +873,13 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Setup Tx adapter */ + ret =eh_initialize_tx_adapter (em_conf); +if (ret <0 ) { +EH_LOG_ERR ("Failed to initialize tx adapter %d" , ret); +return ret; + } +/* Start eth devices after setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
@@ -713,5 +963,68 @@ eh_devs_uninit(struct eh_conf *conf) } } +/* Stop and release tx adapters */ +for (i =0 ; i < em_conf->nb_tx_adapter; i++) { + + id = em_conf->tx_adapter[i].adapter_id; + ret =rte_event_eth_tx_adapter_stop (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to stop tx adapter %d" , ret); +return ret; + } + +for (j =0 ; j < em_conf->tx_adapter[i].nb_connections; j++) { + + ret =rte_event_eth_tx_adapter_queue_del (id, + em_conf->tx_adapter[i].conn[j].ethdev_id,-1 ); +if (ret <0 ) { +EH_LOG_ERR ( +"Failed to remove tx adapter queues %d" , + ret); +return ret; + } + } + + ret =rte_event_eth_tx_adapter_free (id); +if (ret <0 ) { +EH_LOG_ERR ("Failed to free tx adapter %d" , ret); +return ret; + } + } +return 0 ; } + +uint8_t +eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id) +{ +struct eventdev_params *eventdev_config; +struct eventmode_conf *em_conf; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return -EINVAL ; + } + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return -EINVAL ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Get event device conf */ + eventdev_config =eh_get_eventdev_params (em_conf, eventdev_id); + +if (eventdev_config ==NULL ) { +EH_LOG_ERR ("Failed to read eventdev config" ); +return -EINVAL ; + } + +/* +* The last queue is reserved to be used as atomic queue for the +* last stage (eth packet tx stage) +*/ +return eventdev_config->nb_eventqueue -1 ; +}
examples/ipsec-secgw/event_helper.h +48 -0
79 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 6/15 examples/ipsec-secgw: add routines to display config
In reply to Lukasz BartosikFrom: Anoob Joseph <[email protected]>
Add routines to display the eventmode configuration and provide an overview of the devices used.
--- examples/ipsec-secgw/event_helper.c | 207 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 14 +++ 2 files changed, 221 insertions(+)
examples/ipsec-secgw/event_helper.c +207 -0
@@ -816,6 +816,210 @@ eh_initialize_tx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static void +eh_display_operating_mode (struct eventmode_conf *em_conf) +{ +char sched_types[][32 ] = { +"RTE_SCHED_TYPE_ORDERED" , +"RTE_SCHED_TYPE_ATOMIC" , +"RTE_SCHED_TYPE_PARALLEL" , + }; +EH_LOG_INFO ("Operating mode:" ); + +EH_LOG_INFO ("\tScheduling type: \t%s" , + sched_types[em_conf->ext_params.sched_type]); + +EH_LOG_INFO ("" ); +} + +static void +eh_display_event_dev_conf (struct eventmode_conf *em_conf) +{ +char queue_mode[][32 ] = { +"" , +"ATQ (ALL TYPE QUEUE)" , +"SINGLE LINK" , + }; +char print_buf[256 ] = {0 }; +int i; + +EH_LOG_INFO ("Event Device Configuration:" ); + +for (i =0 ; i < em_conf->nb_eventdev; i++) { +sprintf (print_buf, +"\tDev ID: %-2d \tQueues: %-2d \tPorts: %-2d" , + em_conf->eventdev_config[i].eventdev_id, + em_conf->eventdev_config[i].nb_eventqueue, + em_conf->eventdev_config[i].nb_eventport); +sprintf (print_buf +strlen (print_buf), +"\tQueue mode: %s" , + queue_mode[em_conf->eventdev_config[i].ev_queue_mode]); +EH_LOG_INFO ("%s" , print_buf); + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_rx_adapter_conf (struct eventmode_conf *em_conf) +{ +int nb_rx_adapter = em_conf->nb_rx_adapter; +struct rx_adapter_connection_info *conn; +struct rx_adapter_conf *adapter; +char print_buf[256 ] = {0 }; +int i, j; + +EH_LOG_INFO ("Rx adapters configured: %d" , nb_rx_adapter); + +for (i =0 ; i < nb_rx_adapter; i++) { + adapter = &(em_conf->rx_adapter[i]); +EH_LOG_INFO ( +"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" +"\tRx core: %-2d" , + adapter->adapter_id, + adapter->nb_connections, + adapter->eventdev_id, + adapter->rx_core_id); + +for (j =0 ; j < adapter->nb_connections; j++) { + conn = &(adapter->conn[j]); + +sprintf (print_buf, +"\t\tEthdev ID: %-2d" , conn->ethdev_id); + +if (conn->ethdev_rx_qid ==-1 ) +sprintf (print_buf +strlen (print_buf), +"\tEth rx queue: %-2s" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"\tEth rx queue: %-2d" , + conn->ethdev_rx_qid); + +sprintf (print_buf +strlen (print_buf), +"\tEvent queue: %-2d" , conn->eventq_id); +EH_LOG_INFO ("%s" , print_buf); + } + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_tx_adapter_conf (struct eventmode_conf *em_conf) +{ +int nb_tx_adapter = em_conf->nb_tx_adapter; +struct tx_adapter_connection_info *conn; +struct tx_adapter_conf *adapter; +char print_buf[256 ] = {0 }; +int i, j; + +EH_LOG_INFO ("Tx adapters configured: %d" , nb_tx_adapter); + +for (i =0 ; i < nb_tx_adapter; i++) { + adapter = &(em_conf->tx_adapter[i]); +sprintf (print_buf, +"\tTx adapter ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" , + adapter->adapter_id, + adapter->nb_connections, + adapter->eventdev_id); +if (adapter->tx_core_id == (uint32_t )-1 ) +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2s" ,"[INTERNAL PORT]" ); +else if (adapter->tx_core_id ==RTE_MAX_LCORE ) +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2s" ,"[NONE]" ); +else +sprintf (print_buf +strlen (print_buf), +"\tTx core: %-2d,\tInput event queue: %-2d" , + adapter->tx_core_id, adapter->tx_ev_queue); + +EH_LOG_INFO ("%s" , print_buf); + +for (j =0 ; j < adapter->nb_connections; j++) { + conn = &(adapter->conn[j]); + +sprintf (print_buf, +"\t\tEthdev ID: %-2d" , conn->ethdev_id); + +if (conn->ethdev_tx_qid ==-1 ) +sprintf (print_buf +strlen (print_buf), +"\tEth tx queue: %-2s" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"\tEth tx queue: %-2d" , + conn->ethdev_tx_qid); +EH_LOG_INFO ("%s" , print_buf); + } + } +EH_LOG_INFO ("" ); +} + +static void +eh_display_link_conf (struct eventmode_conf *em_conf) +{ +struct eh_event_link_info *link; +char print_buf[256 ] = {0 }; +int i; + +EH_LOG_INFO ("Links configured: %d" , em_conf->nb_link); + +for (i =0 ; i < em_conf->nb_link; i++) { + link = &(em_conf->link[i]); + +sprintf (print_buf, +"\tEvent dev ID: %-2d\tEvent port: %-2d" , + link->eventdev_id, + link->event_port_id); + +if (em_conf->ext_params.all_ev_queue_to_ev_port) +sprintf (print_buf +strlen (print_buf), +"Event queue: %-2s\t" ,"ALL" ); +else +sprintf (print_buf +strlen (print_buf), +"Event queue: %-2d\t" , link->eventq_id); + +sprintf (print_buf +strlen (print_buf), +"Lcore: %-2d" , link->lcore_id); +EH_LOG_INFO ("%s" , print_buf); + } +EH_LOG_INFO ("" ); +} + +void +eh_display_conf (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return ; + } + +if (conf->mode !=EH_PKT_TRANSFER_MODE_EVENT ) +return ; + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return ; + } + +/* Get eventmode conf */ + em_conf = (struct eventmode_conf *)(conf->mode_params); + +/* Display user exposed operating modes */ +eh_display_operating_mode (em_conf); + +/* Display event device conf */ +eh_display_event_dev_conf (em_conf); + +/* Display Rx adapter conf */ +eh_display_rx_adapter_conf (em_conf); + +/* Display Tx adapter conf */ +eh_display_tx_adapter_conf (em_conf); + +/* Display event-lcore link */ +eh_display_link_conf (em_conf); +} +int32_t eh_devs_init (struct eh_conf *conf) {
@@ -849,6 +1053,9 @@ eh_devs_init(struct eh_conf *conf)return ret; } +/* Display the current configuration */ +eh_display_conf (conf); +/* Stop eth devices before setting up adapter */ RTE_ETH_FOREACH_DEV (port_id) {
examples/ipsec-secgw/event_helper.h +14 -0
@@ -13,6 +13,11 @@ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) +#define EH_LOG_INFO (...) \ + RTE_LOG(INFO, EH, \ + RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ + __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) +/* Max event devices supported */ #define EVENT_MODE_MAX_EVENT_DEVS RTE_EVENT_MAX_DEVS
@@ -214,4 +219,13 @@ eh_devs_uninit(struct eh_conf *conf);uint8_t eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id); +/** +* Display event mode configuration +* +* @param conf +* Event helper configuration +*/ +void +eh_display_conf (struct eh_conf *conf); +#endif /* _EVENT_HELPER_H_ */
Signature · 1 line
2.7.4
PATCH v4 7/15 examples/ipsec-secgw: add routines to launch workers
In reply to Lukasz BartosikIn eventmode workers can be drafted differently according to the capabilities of the underlying event device. The added functions will receive an array of such workers and probe the eventmode properties to choose the worker.
--- examples/ipsec-secgw/event_helper.c | 336 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 48 ++++++ 2 files changed, 384 insertions(+)
examples/ipsec-secgw/event_helper.c +336 -0
@@ -11,6 +11,8 @@#include "event_helper.h" +static volatile bool eth_core_running; +static int eh_get_enabled_cores (struct rte_bitmap *eth_core_mask) {
@@ -93,6 +95,16 @@ eh_get_eventdev_params(struct eventmode_conf *em_conf, uint8_t eventdev_id)return &(em_conf->eventdev_config[i]); } +static inline bool +eh_dev_has_burst_mode (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_BURST_MODE ) ? + true : false; +} +static int eh_set_default_conf_eventdev (struct eventmode_conf *em_conf) {
@@ -689,6 +701,257 @@ eh_initialize_rx_adapter(struct eventmode_conf *em_conf)return 0 ; } +static int32_t +eh_start_worker_eth_core (struct eventmode_conf *conf,uint32_t lcore_id) +{ +uint32_t service_id[EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE ]; +struct rx_adapter_conf *rx_adapter; +struct tx_adapter_conf *tx_adapter; +int service_count =0 ; +int adapter_id; +int32_t ret; +int i; + +EH_LOG_INFO ("Entering eth_core processing on lcore %u" , lcore_id); + +/* +* Parse adapter config to check which of all Rx adapters need +* to be handled by this core. +*/ +for (i =0 ; i < conf->nb_rx_adapter; i++) { +/* Check if we have exceeded the max allowed */ +if (service_count >EVENT_MODE_MAX_ADAPTERS_PER_RX_CORE ) { +EH_LOG_ERR ( +"Exceeded the max allowed adapters per rx core" ); +break ; + } + + rx_adapter = &(conf->rx_adapter[i]); +if (rx_adapter->rx_core_id != lcore_id) +continue ; + +/* Adapter is handled by this core */ + adapter_id = rx_adapter->adapter_id; + +/* Get the service ID for the adapters */ + ret =rte_event_eth_rx_adapter_service_id_get (adapter_id, + &(service_id[service_count])); + +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ( +"Failed to get service id used by rx adapter" ); +return ret; + } + +/* Update service count */ + service_count++; + } + +/* +* Parse adapter config to see which of all Tx adapters need +* to be handled by this core. +*/ +for (i =0 ; i < conf->nb_tx_adapter; i++) { +/* Check if we have exceeded the max allowed */ +if (service_count >EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE ) { +EH_LOG_ERR ( +"Exceeded the max allowed adapters per tx core" ); +break ; + } + + tx_adapter = &conf->tx_adapter[i]; +if (tx_adapter->tx_core_id != lcore_id) +continue ; + +/* Adapter is handled by this core */ + adapter_id = tx_adapter->adapter_id; + +/* Get the service ID for the adapters */ + ret =rte_event_eth_tx_adapter_service_id_get (adapter_id, + &(service_id[service_count])); + +if (ret != -ESRCH && ret <0 ) { +EH_LOG_ERR ( +"Failed to get service id used by tx adapter" ); +return ret; + } + +/* Update service count */ + service_count++; + } + + eth_core_running = true; + +while (eth_core_running) { +for (i =0 ; i < service_count; i++) { +/* Initiate adapter service */ +rte_service_run_iter_on_app_lcore (service_id[i],0 ); + } + } + +return 0 ; +} + +static int32_t +eh_stop_worker_eth_core (void ) +{ +if (eth_core_running) { +EH_LOG_INFO ("Stopping eth cores" ); + eth_core_running = false; + } +return 0 ; +} + +static struct eh_app_worker_params * +eh_find_worker (uint32_t lcore_id,struct eh_conf *conf, +struct eh_app_worker_params *app_wrkrs,uint8_t nb_wrkr_param) +{ +struct eh_app_worker_params curr_conf = { {{0 } },NULL }; +struct eh_event_link_info *link =NULL ; +struct eh_app_worker_params *tmp_wrkr; +struct eventmode_conf *em_conf; +uint8_t eventdev_id; +int i; + +/* Get eventmode config */ + em_conf = conf->mode_params; + +/* +* Use event device from the first lcore-event link. +* +* Assumption: All lcore-event links tied to a core are using the +* same event device. In other words, one core would be polling on +* queues of a single event device only. +*/ + +/* Get a link for this lcore */ +for (i =0 ; i < em_conf->nb_link; i++) { + link = &(em_conf->link[i]); +if (link->lcore_id == lcore_id) +break ; + } + +if (link ==NULL ) { +EH_LOG_ERR ("No valid link found for lcore %d" , lcore_id); +return NULL ; + } + +/* Get event dev ID */ + eventdev_id = link->eventdev_id; + +/* Populate the curr_conf with the capabilities */ + +/* Check for burst mode */ +if (eh_dev_has_burst_mode (eventdev_id)) + curr_conf.cap.burst =EH_RX_TYPE_BURST ; +else + curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + +/* Parse the passed list and see if we have matching capabilities */ + +/* Initialize the pointer used to traverse the list */ + tmp_wrkr = app_wrkrs; + +for (i =0 ; i < nb_wrkr_param; i++, tmp_wrkr++) { + +/* Skip this if capabilities are not matching */ +if (tmp_wrkr->cap.u64 != curr_conf.cap.u64) +continue ; + +/* If the checks pass, we have a match */ +return tmp_wrkr; + } + +return NULL ; +} + +static int +eh_verify_match_worker (struct eh_app_worker_params *match_wrkr) +{ +/* Verify registered worker */ +if (match_wrkr->worker_thread ==NULL ) { +EH_LOG_ERR ("No worker registered" ); +return 0 ; + } + +/* Success */ +return 1 ; +} + +static uint8_t +eh_get_event_lcore_links (uint32_t lcore_id,struct eh_conf *conf, +struct eh_event_link_info **links) +{ +struct eh_event_link_info *link_cache; +struct eventmode_conf *em_conf =NULL ; +struct eh_event_link_info *link; +uint8_t lcore_nb_link =0 ; +size_t single_link_size; +size_t cache_size; +int index =0 ; +int i; + +if (conf ==NULL || links ==NULL ) { +EH_LOG_ERR ("Invalid args" ); +return -EINVAL ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +if (em_conf ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return -EINVAL ; + } + +/* Get the number of links registered */ +for (i =0 ; i < em_conf->nb_link; i++) { + +/* Get link */ + link = &(em_conf->link[i]); + +/* Check if we have link intended for this lcore */ +if (link->lcore_id == lcore_id) { + +/* Update the number of links for this core */ + lcore_nb_link++; + + } + } + +/* Compute size of one entry to be copied */ + single_link_size =sizeof (struct eh_event_link_info ); + +/* Compute size of the buffer required */ + cache_size = lcore_nb_link *sizeof (struct eh_event_link_info ); + +/* Compute size of the buffer required */ + link_cache =calloc (1 , cache_size); + +/* Get the number of links registered */ +for (i =0 ; i < em_conf->nb_link; i++) { + +/* Get link */ + link = &(em_conf->link[i]); + +/* Check if we have link intended for this lcore */ +if (link->lcore_id == lcore_id) { + +/* Cache the link */ +memcpy (&link_cache[index], link, single_link_size); + +/* Update index */ + index++; + } + } + +/* Update the links for application to use the cached links */ + *links = link_cache; + +/* Return the number of cached links */ +return lcore_nb_link; +} +static int eh_tx_adapter_configure (struct eventmode_conf *em_conf,struct tx_adapter_conf *adapter)
@@ -1202,6 +1465,79 @@ eh_devs_uninit(struct eh_conf *conf)return 0 ; } +void +eh_launch_worker (struct eh_conf *conf,struct eh_app_worker_params *app_wrkr, +uint8_t nb_wrkr_param) +{ +struct eh_app_worker_params *match_wrkr; +struct eh_event_link_info *links =NULL ; +struct eventmode_conf *em_conf; +uint32_t lcore_id; +uint8_t nb_links; + +if (conf ==NULL ) { +EH_LOG_ERR ("Invalid event helper configuration" ); +return ; + } + +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Invalid event mode parameters" ); +return ; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Check if this is eth core */ +if (rte_bitmap_get (em_conf->eth_core_mask, lcore_id)) { +eh_start_worker_eth_core (em_conf, lcore_id); +return ; + } + +if (app_wrkr ==NULL || nb_wrkr_param ==0 ) { +EH_LOG_ERR ("Invalid args" ); +return ; + } + +/* +* This is a regular worker thread. The application registers +* multiple workers with various capabilities. Run worker +* based on the selected capabilities of the event +* device configured. +*/ + +/* Get the first matching worker for the event device */ + match_wrkr =eh_find_worker (lcore_id, conf, app_wrkr, nb_wrkr_param); +if (match_wrkr ==NULL ) { +EH_LOG_ERR ("Failed to match worker registered for lcore %d" , + lcore_id); + goto clean_and_exit; + } + +/* Verify sanity of the matched worker */ +if (eh_verify_match_worker (match_wrkr) !=1 ) { +EH_LOG_ERR ("Failed to validate the matched worker" ); + goto clean_and_exit; + } + +/* Get worker links */ + nb_links =eh_get_event_lcore_links (lcore_id, conf, &links); + +/* Launch the worker thread */ + match_wrkr->worker_thread (links, nb_links); + +/* Free links info memory */ +free (links); + +clean_and_exit: + +/* Flag eth_cores to stop, if started */ +eh_stop_worker_eth_core (); +} +uint8_t eh_get_tx_queue (struct eh_conf *conf,uint8_t eventdev_id) {
examples/ipsec-secgw/event_helper.h +48 -0
70 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 8/15 examples/ipsec-secgw: add support for internal ports
In reply to Lukasz BartosikAdd support for Rx and Tx internal ports. When internal ports are available then a packet can be received from eth port and forwarded to event queue by HW without any software intervention. The same applies to Tx side where a packet sent to an event queue can by forwarded by HW to eth port without any software intervention.
--- examples/ipsec-secgw/event_helper.c | 179 +++++++++++++++++++++++++++++++----- examples/ipsec-secgw/event_helper.h | 11 +++ 2 files changed, 167 insertions(+), 23 deletions(-)
examples/ipsec-secgw/event_helper.c +156 -23
@@ -95,6 +95,39 @@ eh_get_eventdev_params(struct eventmode_conf *em_conf, uint8_t eventdev_id)return &(em_conf->eventdev_config[i]); } + +static inline bool +eh_dev_has_rx_internal_port (uint8_t eventdev_id) +{ +bool flag = true; +int j; + +RTE_ETH_FOREACH_DEV (j) { +uint32_t caps =0 ; + +rte_event_eth_rx_adapter_caps_get (eventdev_id, j, &caps); +if (!(caps &RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT )) + flag = false; + } +return flag; +} + +static inline bool +eh_dev_has_tx_internal_port (uint8_t eventdev_id) +{ +bool flag = true; +int j; + +RTE_ETH_FOREACH_DEV (j) { +uint32_t caps =0 ; + +rte_event_eth_tx_adapter_caps_get (eventdev_id, j, &caps); +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + flag = false; + } +return flag; +} +static inline bool eh_dev_has_burst_mode (uint8_t dev_id) {
@@ -175,6 +208,42 @@ eh_set_default_conf_eventdev(struct eventmode_conf *em_conf)return 0 ; } +static void +eh_do_capability_check (struct eventmode_conf *em_conf) +{ +struct eventdev_params *eventdev_config; +int all_internal_ports =1 ; +uint32_t eventdev_id; +int i; + +for (i =0 ; i < em_conf->nb_eventdev; i++) { + +/* Get the event dev conf */ + eventdev_config = &(em_conf->eventdev_config[i]); + eventdev_id = eventdev_config->eventdev_id; + +/* Check if event device has internal port for Rx & Tx */ +if (eh_dev_has_rx_internal_port (eventdev_id) && +eh_dev_has_tx_internal_port (eventdev_id)) { + eventdev_config->all_internal_ports =1 ; + }else { + all_internal_ports =0 ; + } + } + +/* +* If Rx & Tx internal ports are supported by all event devices then +* eth cores won't be required. Override the eth core mask requested +* and decrement number of event queues by one as it won't be needed +* for Tx. +*/ +if (all_internal_ports) { +rte_bitmap_reset (em_conf->eth_core_mask); +for (i =0 ; i < em_conf->nb_eventdev; i++) + em_conf->eventdev_config[i].nb_eventqueue--; + } +} +static int eh_set_default_conf_link (struct eventmode_conf *em_conf) {
@@ -246,7 +315,10 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)struct rx_adapter_connection_info *conn;struct eventdev_params *eventdev_config;struct rx_adapter_conf *adapter; +bool rx_internal_port = true;bool single_ev_queue = false; +int nb_eventqueue; +uint32_t caps =0 ;int eventdev_id;int nb_eth_dev;int adapter_id;
@@ -276,14 +348,21 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)/* Set adapter conf */ adapter->eventdev_id = eventdev_id; adapter->adapter_id = adapter_id; - adapter->rx_core_id =eh_get_next_eth_core (em_conf); + +/* +* If event device does not have internal ports for passing +* packets then reserved one queue for Tx path +*/ + nb_eventqueue = eventdev_config->all_internal_ports ? + eventdev_config->nb_eventqueue : + eventdev_config->nb_eventqueue -1 ;/* * Map all queues of eth device (port) to an event queue. If there * are more event queues than eth ports then create 1:1 mapping. * Otherwise map all eth ports to a single event queue. */ -if (nb_eth_dev > eventdev_config->nb_eventqueue) +if (nb_eth_dev > nb_eventqueue) single_ev_queue = true;for (i =0 ; i < nb_eth_dev; i++) {
@@ -305,11 +384,24 @@ eh_set_default_conf_rx_adapter(struct eventmode_conf *em_conf)/* Add all eth queues eth port to event queue */ conn->ethdev_rx_qid =-1 ; +/* Get Rx adapter capabilities */ +rte_event_eth_rx_adapter_caps_get (eventdev_id, i, &caps); +if (!(caps &RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT )) + rx_internal_port = false; +/* Update no of connections */ adapter->nb_connections++; } +if (rx_internal_port) { +/* Rx core is not required */ + adapter->rx_core_id =-1 ; + }else { +/* Rx core is required */ + adapter->rx_core_id =eh_get_next_eth_core (em_conf); + } +/* We have setup one adapter */ em_conf->nb_rx_adapter =1 ;
@@ -322,6 +414,8 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)struct tx_adapter_connection_info *conn;struct eventdev_params *eventdev_config;struct tx_adapter_conf *tx_adapter; +bool tx_internal_port = true; +uint32_t caps =0 ;int eventdev_id;int adapter_id;int nb_eth_dev;
@@ -355,18 +449,6 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf) tx_adapter->eventdev_id = eventdev_id; tx_adapter->adapter_id = adapter_id; -/* TODO: Tx core is required only when internal port is not present */ - tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); - -/* -* Application uses one event queue per adapter for submitting -* packets for Tx. Reserve the last queue available and decrement -* the total available event queues for this -*/ - -/* Queue numbers start at 0 */ - tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; -/* * Map all Tx queues of the eth device (port) to the event device. */
@@ -396,10 +478,30 @@ eh_set_default_conf_tx_adapter(struct eventmode_conf *em_conf)/* Add all eth tx queues to adapter */ conn->ethdev_tx_qid =-1 ; +/* Get Tx adapter capabilities */ +rte_event_eth_tx_adapter_caps_get (eventdev_id, i, &caps); +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + tx_internal_port = false; +/* Update no of connections */ tx_adapter->nb_connections++; } +if (tx_internal_port) { +/* Tx core is not required */ + tx_adapter->tx_core_id =-1 ; + }else { +/* Tx core is required */ + tx_adapter->tx_core_id =eh_get_next_eth_core (em_conf); + +/* +* Use one event queue per adapter for submitting packets +* for Tx. Reserving the last queue available +*/ +/* Queue numbers start at 0 */ + tx_adapter->tx_ev_queue = eventdev_config->nb_eventqueue -1 ; + } +/* We have setup one adapter */ em_conf->nb_tx_adapter =1 ;return 0 ;
@@ -420,6 +522,9 @@ eh_validate_conf(struct eventmode_conf *em_conf)return ret; } +/* Perform capability check for the selected event devices */ +eh_do_capability_check (em_conf); +/* * Check if links are specified. Else generate a default config for * the event ports used.
@@ -523,11 +628,13 @@ eh_initialize_eventdev(struct eventmode_conf *em_conf) eventdev_config->ev_queue_mode;/* * All queues need to be set with sched_type as -* schedule type for the application stage. One queue -* would be reserved for the final eth tx stage. This -* will be an atomic queue. +* schedule type for the application stage. One +* queue would be reserved for the final eth tx +* stage if event device does not have internal +* ports. This will be an atomic queue. */ -if (j == nb_eventqueue-1 ) { +if (!eventdev_config->all_internal_ports && + j == nb_eventqueue-1 ) { eventq_conf.schedule_type =RTE_SCHED_TYPE_ATOMIC ; }else {
@@ -841,6 +948,12 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,/* Populate the curr_conf with the capabilities */ +/* Check for Tx internal port */ +if (eh_dev_has_tx_internal_port (eventdev_id)) + curr_conf.cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; +else + curr_conf.cap.tx_internal_port =EH_TX_TYPE_NO_INTERNAL_PORT ; +/* Check for burst mode */ if (eh_dev_has_burst_mode (eventdev_id)) curr_conf.cap.burst =EH_RX_TYPE_BURST ;
@@ -1012,6 +1125,16 @@ eh_tx_adapter_configure(struct eventmode_conf *em_conf, } } +/* +* Check if Tx core is assigned. If Tx core is not assigned then +* the adapter has internal port for submitting Tx packets and +* Tx event queue & port setup is not required +*/ +if (adapter->tx_core_id == (uint32_t ) (-1 )) { +/* Internal port is present */ + goto skip_tx_queue_port_setup; + } +/* Setup Tx queue & port */ /* Get event port used by the adapter */
@@ -1051,6 +1174,7 @@ eh_tx_adapter_configure(struct eventmode_conf *em_conf,rte_service_set_runstate_mapped_check (service_id,0 ); +skip_tx_queue_port_setup:/* Start adapter */ ret =rte_event_eth_tx_adapter_start (adapter->adapter_id);if (ret <0 ) {
@@ -1135,13 +1259,22 @@ eh_display_rx_adapter_conf(struct eventmode_conf *em_conf)for (i =0 ; i < nb_rx_adapter; i++) { adapter = &(em_conf->rx_adapter[i]); -EH_LOG_INFO ( -"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" -"\tRx core: %-2d" , +sprintf (print_buf, +"\tRx adaper ID: %-2d\tConnections: %-2d\tEvent dev ID: %-2d" , adapter->adapter_id, adapter->nb_connections, - adapter->eventdev_id, - adapter->rx_core_id); + adapter->eventdev_id); +if (adapter->rx_core_id == (uint32_t )-1 ) +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2s" ,"[INTERNAL PORT]" ); +else if (adapter->rx_core_id ==RTE_MAX_LCORE ) +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2s" ,"[NONE]" ); +else +sprintf (print_buf +strlen (print_buf), +"\tRx core: %-2d" , adapter->rx_core_id); + +EH_LOG_INFO ("%s" , print_buf);for (j =0 ; j < adapter->nb_connections; j++) { conn = &(adapter->conn[j]);
examples/ipsec-secgw/event_helper.h +11 -0
@@ -62,12 +62,21 @@ enum eh_rx_types { EH_RX_TYPE_BURST }; +/** +* Event mode packet tx types +*/ +enum eh_tx_types { +EH_TX_TYPE_INTERNAL_PORT =0 , +EH_TX_TYPE_NO_INTERNAL_PORT +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;uint8_t nb_eventqueue;uint8_t nb_eventport;uint8_t ev_queue_mode; +uint8_t all_internal_ports; };/**
@@ -179,6 +188,8 @@ struct eh_app_worker_params {struct {uint64_t burst :1 ;/**< Specify status of rx type burst */ +uint64_t tx_internal_port :1 ; +/**< Specify whether tx internal port is available */ };uint64_t u64; } cap;
Signature · 1 line
2.7.4
PATCH v4 9/15 examples/ipsec-secgw: add event helper config init/uninit
In reply to Lukasz BartosikAdd eventmode helper eh_conf_init and eh_conf_uninit functions which purpose is to initialize and unitialize eventmode helper configuration.
--- examples/ipsec-secgw/event_helper.c | 103 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/event_helper.h | 23 ++++++++ 2 files changed, 126 insertions(+)
examples/ipsec-secgw/event_helper.c +103 -0
@@ -1379,6 +1379,109 @@ eh_display_link_conf(struct eventmode_conf *em_conf)EH_LOG_INFO ("" ); } +struct eh_conf * +eh_conf_init (void ) +{ +struct eventmode_conf *em_conf =NULL ; +struct eh_conf *conf =NULL ; +unsigned int eth_core_id; +void *bitmap =NULL ; +uint32_t nb_bytes; + +/* Allocate memory for config */ + conf =calloc (1 ,sizeof (struct eh_conf )); +if (conf ==NULL ) { +EH_LOG_ERR ("Failed to allocate memory for eventmode helper " +"config" ); +return NULL ; + } + +/* Set default conf */ + +/* Packet transfer mode: poll */ + conf->mode =EH_PKT_TRANSFER_MODE_POLL ; + +/* Keep all ethernet ports enabled by default */ + conf->eth_portmask =-1 ; + +/* Allocate memory for event mode params */ + conf->mode_params =calloc (1 ,sizeof (struct eventmode_conf )); +if (conf->mode_params ==NULL ) { +EH_LOG_ERR ("Failed to allocate memory for event mode params" ); + goto free_conf; + } + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Allocate and initialize bitmap for eth cores */ + nb_bytes =rte_bitmap_get_memory_footprint (RTE_MAX_LCORE ); +if (!nb_bytes) { +EH_LOG_ERR ("Failed to get bitmap footprint" ); + goto free_em_conf; + } + + bitmap =rte_zmalloc ("event-helper-ethcore-bitmap" , nb_bytes, +RTE_CACHE_LINE_SIZE ); +if (!bitmap) { +EH_LOG_ERR ("Failed to allocate memory for eth cores bitmap\n" ); + goto free_em_conf; + } + + em_conf->eth_core_mask =rte_bitmap_init (RTE_MAX_LCORE , bitmap, + nb_bytes); +if (!em_conf->eth_core_mask) { +EH_LOG_ERR ("Failed to initialize bitmap" ); + goto free_bitmap; + } + +/* Set schedule type as not set */ + em_conf->ext_params.sched_type =SCHED_TYPE_NOT_SET ; + +/* Set two cores as eth cores for Rx & Tx */ + +/* Use first core other than master core as Rx core */ + eth_core_id =rte_get_next_lcore (0 ,/* curr core */ +1 ,/* skip master 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 master core */ +0 /* wrap */ ); + +rte_bitmap_set (em_conf->eth_core_mask, eth_core_id); + +return conf; + +free_bitmap: +rte_free (bitmap); +free_em_conf: +free (em_conf); +free_conf: +free (conf); +return NULL ; +} + +void +eh_conf_uninit (struct eh_conf *conf) +{ +struct eventmode_conf *em_conf =NULL ; + +if (!conf || !conf->mode_params) +return ; + +/* Get eventmode conf */ + em_conf = conf->mode_params; + +/* Free evenmode configuration memory */ +rte_free (em_conf->eth_core_mask); +free (em_conf); +free (conf); +} +void eh_display_conf (struct eh_conf *conf) {
examples/ipsec-secgw/event_helper.h +23 -0
@@ -46,6 +46,9 @@/* Max adapters that one Tx core can handle */ #define EVENT_MODE_MAX_ADAPTERS_PER_TX_CORE EVENT_MODE_MAX_TX_ADAPTERS +/* Used to indicate that queue schedule type is not set */ +#define SCHED_TYPE_NOT_SET 3 +/** * Packet transfer mode of the application */
@@ -200,6 +203,26 @@ struct eh_app_worker_params { };/** +* Allocate memory for event helper configuration and initialize +* it with default values. +* +* @return +* - pointer to event helper configuration structure on success. +* - NULL on failure. +*/ +struct eh_conf * +eh_conf_init (void ); + +/** +* Uninitialize event helper configuration and release its memory +. * +* @param conf +* Event helper configuration +*/ +void +eh_conf_uninit (struct eh_conf *conf); + +/** * Initialize event mode devices * * Application can call this function to get the event devices, eth devices
Signature · 1 line
2.7.4
PATCH v4 10/15 examples/ipsec-secgw: add eventmode to ipsec-secgw
In reply to Lukasz BartosikAdd eventmode support to ipsec-secgw. With the aid of event helper configure and use the eventmode capabilities.
--- examples/ipsec-secgw/event_helper.c | 3 + examples/ipsec-secgw/event_helper.h | 14 ++ examples/ipsec-secgw/ipsec-secgw.c | 258 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec.h | 24 ++++ examples/ipsec-secgw/sa.c | 21 +-- examples/ipsec-secgw/sad.h | 5 - 6 files changed, 301 insertions(+), 24 deletions(-)
examples/ipsec-secgw/event_helper.c +3 -0
@@ -960,6 +960,8 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,else curr_conf.cap.burst =EH_RX_TYPE_NON_BURST ; + curr_conf.cap.ipsec_mode = conf->ipsec_mode; +/* Parse the passed list and see if we have matching capabilities */ /* Initialize the pointer used to traverse the list */
@@ -1400,6 +1402,7 @@ eh_conf_init(void)/* Packet transfer mode: poll */ conf->mode =EH_PKT_TRANSFER_MODE_POLL ; + conf->ipsec_mode =EH_IPSEC_MODE_TYPE_APP ;/* Keep all ethernet ports enabled by default */ conf->eth_portmask =-1 ;
examples/ipsec-secgw/event_helper.h +14 -0
@@ -73,6 +73,14 @@ enum eh_tx_types {EH_TX_TYPE_NO_INTERNAL_PORT }; +/** +* Event mode ipsec mode types +*/ +enum eh_ipsec_mode_types { +EH_IPSEC_MODE_TYPE_APP =0 , +EH_IPSEC_MODE_TYPE_DRIVER +}; +/* Event dev params */ struct eventdev_params {uint8_t eventdev_id;
@@ -182,6 +190,10 @@ struct eh_conf {*/ void *mode_params;/**< Mode specific parameters */ + +/** Application specific params */ +enum eh_ipsec_mode_types ipsec_mode; +/**< Mode of ipsec run */ };/* Workers registered by the application */
@@ -193,6 +205,8 @@ struct eh_app_worker_params {/**< Specify status of rx type burst */ uint64_t tx_internal_port : 1;/**< Specify whether tx internal port is available */ + uint64_t ipsec_mode : 1; +/**< Specify ipsec processing level */ };uint64_t u64; } cap;
examples/ipsec-secgw/ipsec-secgw.c +256 -2
381 lines not on this page · raw message
examples/ipsec-secgw/ipsec.h +24 -0
@@ -159,6 +159,24 @@ struct ipsec_sa {struct rte_security_session_conf sess_conf; } __rte_cache_aligned; +struct ipsec_xf { +struct rte_crypto_sym_xform a; +struct rte_crypto_sym_xform b; +}; + +struct ipsec_sad { +struct rte_ipsec_sad *sad_v4; +struct rte_ipsec_sad *sad_v6; +}; + +struct sa_ctx { +void *satbl;/* pointer to array of rte_ipsec_sa objects*/ +struct ipsec_sad sad; +struct ipsec_xf *xf; +uint32_t nb_sa; +struct ipsec_sa sa[]; +}; +struct ipsec_mbuf_metadata {struct ipsec_sa *sa;struct rte_crypto_op cop;
@@ -253,6 +271,12 @@ struct ipsec_traffic {struct traffic_type ip6; }; +extern struct ipsec_sa *sa_out; +extern uint32_t nb_sa_out; + +extern struct ipsec_sa *sa_in; +extern uint32_t nb_sa_in; +uint16_t ipsec_inbound (struct ipsec_ctx *ctx,struct rte_mbuf *pkts[],uint16_t nb_pkts,uint16_t len);
examples/ipsec-secgw/sa.c +4 -17
@@ -135,14 +135,14 @@ const struct supported_aead_algo aead_algos[] = {#define SA_INIT_NB 128 -static struct ipsec_sa *sa_out; +struct ipsec_sa *sa_out; +uint32_t nb_sa_out;static uint32_t sa_out_sz; -static uint32_t nb_sa_out;static struct ipsec_sa_cnt sa_out_cnt; -static struct ipsec_sa *sa_in; +struct ipsec_sa *sa_in; +uint32_t nb_sa_in;static uint32_t sa_in_sz; -static uint32_t nb_sa_in;static struct ipsec_sa_cnt sa_in_cnt; static const struct supported_cipher_algo *
@@ -826,19 +826,6 @@ print_one_sa_rule(const struct ipsec_sa *sa, int inbound)printf ("\n" ); } -struct ipsec_xf { -struct rte_crypto_sym_xform a; -struct rte_crypto_sym_xform b; -}; - -struct sa_ctx { -void *satbl;/* pointer to array of rte_ipsec_sa objects*/ -struct ipsec_sad sad; -struct ipsec_xf *xf; -uint32_t nb_sa; -struct ipsec_sa sa[]; -}; -static struct sa_ctx *sa_create (const char *name,int32_t socket_id,uint32_t nb_sa) {
examples/ipsec-secgw/sad.h +0 -5
@@ -18,11 +18,6 @@ struct ipsec_sad_cache { RTE_DECLARE_PER_LCORE(struct ipsec_sad_cache, sad_cache); -struct ipsec_sad { -struct rte_ipsec_sad *sad_v4; -struct rte_ipsec_sad *sad_v6; -}; -int ipsec_sad_create (const char *name,struct ipsec_sad *sad,int socket_id,struct ipsec_sa_cnt *sa_cnt);
Signature · 1 line
2.7.4
PATCH v4 11/15 examples/ipsec-secgw: add driver mode worker
In reply to Lukasz BartosikAdd driver inbound and outbound worker thread for ipsec-secgw. In driver mode application does as little as possible. It simply forwards packets back to port from which traffic was received instructing HW to apply inline security processing using first outbound SA configured for a given port. If a port does not have SA configured outbound traffic on that port will be silently dropped. The aim of this mode is to measure HW capabilities. Driver mode is selected with single-sa option. The single-sa option accepts SA index however in event mode the SA index is ignored.
Example command to run ipsec-secgw in driver mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128
-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel --single-sa 0
--- examples/ipsec-secgw/Makefile | 1 + examples/ipsec-secgw/ipsec-secgw.c | 34 +++--- examples/ipsec-secgw/ipsec-secgw.h | 25 +++++ examples/ipsec-secgw/ipsec.h | 11 ++ examples/ipsec-secgw/ipsec_worker.c | 218 ++++++++++++++++++++++++++++++++++++ examples/ipsec-secgw/meson.build | 2 +- 6 files changed, 272 insertions(+), 19 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec-secgw.h create mode 100644 examples/ipsec-secgw/ipsec_worker.c
examples/ipsec-secgw/Makefile +1 -0
@@ -16,6 +16,7 @@ SRCS-y += sad.c SRCS-y += rt.c SRCS-y += ipsec_process.c SRCS-y += ipsec-secgw.c +SRCS-y += ipsec_worker.c SRCS-y += event_helper.c CFLAGS += -gdwarf-2
examples/ipsec-secgw/ipsec-secgw.c +16 -18
@@ -71,8 +71,6 @@ volatile bool force_quit;#define BURST_TX_DRAIN_US 100/* TX drain every ~100us */ -#define NB_SOCKETS 4 -/* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3
@@ -80,8 +78,6 @@ volatile bool force_quit;#define MAX_LCORE_PARAMS 1024 -#define UNPROTECTED_PORT (port) (unprotected_port_mask & (1 << portid)) -/* * Configurable number of RX/TX ring descriptors */
@@ -188,15 +184,15 @@ static const struct option lgopts[] = { {NULL, 0, 0, 0} }; +uint32_t unprotected_port_mask; +uint32_t single_sa_idx;/* mask of enabled ports */ static uint32_t enabled_port_mask;static uint64_t enabled_cryptodev_mask =UINT64_MAX ; -static uint32_t unprotected_port_mask;static int32_t promiscuous_on =1 ;static int32_t numa_on =1 ;/**< NUMA is enabled by default. */ static uint32_t nb_lcores;static uint32_t single_sa; -static uint32_t single_sa_idx;/* * RX/TX HW offload capabilities to enable/use on ethernet ports.
@@ -282,7 +278,7 @@ static struct rte_eth_conf port_conf = { }, }; -static struct socket_ctx socket_ctx[NB_SOCKETS ]; +struct socket_ctx socket_ctx[NB_SOCKETS ];/* * Determine is multi-segment support required:
@@ -1003,12 +999,12 @@ process_pkts(struct lcore_conf *qconf, struct rte_mbuf **pkts,prepare_traffic (pkts, &traffic, nb_pkts);if (unlikely (single_sa)) { -if (UNPROTECTED_PORT (portid)) +if (is_unprotected_port (portid))process_pkts_inbound_nosp (&qconf->inbound, &traffic);else process_pkts_outbound_nosp (&qconf->outbound, &traffic); }else { -if (UNPROTECTED_PORT (portid)) +if (is_unprotected_port (portid))process_pkts_inbound (&qconf->inbound, &traffic);else process_pkts_outbound (&qconf->outbound, &traffic);
@@ -1119,8 +1115,8 @@ drain_outbound_crypto_queues(const struct lcore_conf *qconf, }/* main processing loop */ -static int32_t -main_loop (__attribute__((unused))void *dummy) +void +ipsec_poll_mode_worker (void ) {struct rte_mbuf *pkts[MAX_PKT_BURST ];uint32_t lcore_id;
@@ -1164,13 +1160,13 @@ main_loop(__attribute__((unused)) void *dummy)RTE_LOG (ERR ,IPSEC ,"SAD cache init on lcore %u, failed with code: %d\n" , lcore_id, rc); -return rc; +return ; }if (qconf->nb_rx_queue ==0 ) {RTE_LOG (DEBUG ,IPSEC ,"lcore %u has nothing to do\n" , lcore_id); -return 0 ; +return ; }RTE_LOG (INFO ,IPSEC ,"entering main loop on lcore %u\n" , lcore_id);
@@ -1183,7 +1179,7 @@ main_loop(__attribute__((unused)) void *dummy) lcore_id, portid, queueid); } -while (1 ) { +while (!force_quit) { cur_tsc =rte_rdtsc ();/* TX queue buffer drain */
@@ -1207,7 +1203,7 @@ main_loop(__attribute__((unused)) void *dummy)process_pkts (qconf, pkts, nb_rx, portid);/* dequeue and process completed crypto-ops */ -if (UNPROTECTED_PORT (portid)) +if (is_unprotected_port (portid))drain_inbound_crypto_queues (qconf, &qconf->inbound);else
@@ -1332,8 +1328,10 @@ print_usage(const char *prgname)" zero value disables the cache (default value: 128)\n" " -f CONFIG_FILE: Configuration file\n" " --config (port,queue,lcore): Rx queue configuration\n" -" --single-sa SAIDX: Use single SA index for outbound traffic,\n" -" bypassing the SP\n" +" --single-sa SAIDX: In poll mode use single SA index for\n" +" outbound traffic, bypassing the SP\n" +" In event mode selects driver submode,\n" +" SA index value is ignored\n" " --cryptodev_mask MASK: Hexadecimal bitmask of the crypto\n" " devices to configure\n" " --transfer-mode MODE\n"
@@ -2819,7 +2817,7 @@ main(int32_t argc, char **argv)check_all_ports_link_status (enabled_port_mask);/* launch per-lcore init on every lcore */ -rte_eal_mp_remote_launch (main_loop,NULL ,CALL_MASTER ); +rte_eal_mp_remote_launch (ipsec_launch_one_lcore, eh_conf,CALL_MASTER );RTE_LCORE_FOREACH_SLAVE (lcore_id) {if (rte_eal_wait_lcore (lcore_id) <0 )return -1 ;
examples/ipsec-secgw/ipsec-secgw.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_SECGW_H_ +#define _IPSEC_SECGW_H_ + +#include <stdbool.h> + +#define NB_SOCKETS 4 + +/* Port mask to identify the unprotected ports */ +extern uint32_t unprotected_port_mask; + +/* Index of SA in single mode */ +extern uint32_t single_sa_idx; + +extern volatile bool force_quit; + +static inline uint8_t +is_unprotected_port (uint16_t port_id) +{ +return unprotected_port_mask & (1 << port_id); +} + +#endif /* _IPSEC_SECGW_H_ */
examples/ipsec-secgw/ipsec.h +11 -0
@@ -13,6 +13,8 @@#include <rte_flow.h> #include <rte_ipsec.h> +#include "ipsec-secgw.h" +#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3
@@ -271,6 +273,15 @@ struct ipsec_traffic {struct traffic_type ip6; }; +/* Socket ctx */ +extern struct socket_ctx socket_ctx[NB_SOCKETS ]; + +void +ipsec_poll_mode_worker (void ); + +int +ipsec_launch_one_lcore (void *args); +extern struct ipsec_sa *sa_out;extern uint32_t nb_sa_out;
examples/ipsec-secgw/ipsec_worker.c new file +218 -0
218 lines not on this page · raw message
examples/ipsec-secgw/meson.build +1 -1
@@ -10,5 +10,5 @@ deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev'] allow_experimental_apis = true sources = files( 'esp.c', 'event_helper.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c', - 'parser.c', 'rt.c', 'sa.c', 'sad.c', 'sp4.c', 'sp6.c' + 'ipsec_worker.c', 'parser.c', 'rt.c', 'sa.c', 'sad.c', 'sp4.c', 'sp6.c' )
Signature · 1 line
2.7.4
PATCH v4 12/15 examples/ipsec-secgw: add app mode worker
In reply to Lukasz BartosikAdd application inbound/outbound worker thread and IPsec application processing code for event mode.
Example ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128
-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallel
--- examples/ipsec-secgw/ipsec-secgw.c | 31 +-- examples/ipsec-secgw/ipsec-secgw.h | 63 ++++++ examples/ipsec-secgw/ipsec.h | 16 -- examples/ipsec-secgw/ipsec_worker.c | 424 +++++++++++++++++++++++++++++++++++- examples/ipsec-secgw/ipsec_worker.h | 35 +++ 5 files changed, 521 insertions(+), 48 deletions(-) create mode 100644 examples/ipsec-secgw/ipsec_worker.h
examples/ipsec-secgw/ipsec-secgw.c +1 -30
@@ -50,13 +50,12 @@#include "event_helper.h" #include "ipsec.h" +#include "ipsec_worker.h" #include "parser.h" #include "sad.h" volatile bool force_quit; -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1 -#define MAX_JUMBO_PKT_LEN 9600#define MEMPOOL_CACHE_SIZE 256
@@ -86,29 +85,6 @@ volatile bool force_quit;static uint16_t nb_rxd =IPSEC_SECGW_RX_DESC_DEFAULT ;static uint16_t nb_txd =IPSEC_SECGW_TX_DESC_DEFAULT ; -#if RTE_BYTE_ORDER !=RTE_LITTLE_ENDIAN -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((a) & 0xff) << 56) | \ - ((uint64_t)((b) & 0xff) << 48) | \ - ((uint64_t)((c) & 0xff) << 40) | \ - ((uint64_t)((d) & 0xff) << 32) | \ - ((uint64_t)((e) & 0xff) << 24) | \ - ((uint64_t)((f) & 0xff) << 16) | \ - ((uint64_t)((g) & 0xff) << 8) | \ - ((uint64_t)(h) & 0xff)) -#else -#define __BYTES_TO_UINT64 (a, b, c, d, e, f, g, h) \ - (((uint64_t)((h) & 0xff) << 56) | \ - ((uint64_t)((g) & 0xff) << 48) | \ - ((uint64_t)((f) & 0xff) << 40) | \ - ((uint64_t)((e) & 0xff) << 32) | \ - ((uint64_t)((d) & 0xff) << 24) | \ - ((uint64_t)((c) & 0xff) << 16) | \ - ((uint64_t)((b) & 0xff) << 8) | \ - ((uint64_t)(a) & 0xff)) -#endif -#define ETHADDR (a, b, c, d, e, f) (__BYTES_TO_UINT64(a, b, c, d, e, f, 0, 0)) -#define ETHADDR_TO_UINT64 (addr) __BYTES_TO_UINT64( \ (addr)->addr_bytes[0], (addr)->addr_bytes[1], \ (addr)->addr_bytes[2], (addr)->addr_bytes[3], \
@@ -120,11 +96,6 @@ static uint16_t nb_txd = IPSEC_SECGW_TX_DESC_DEFAULT;#define MTU_TO_FRAMELEN (x) ((x) + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) -/* port/source ethernet addr and destination ethernet addr */ -struct ethaddr_info { -uint64_t src, dst; -}; -struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS ] = { {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x7e ,0x94 ,0x9a ) }, {0 ,ETHADDR (0x00 ,0x16 ,0x3e ,0x22 ,0xa1 ,0xd9 ) },
examples/ipsec-secgw/ipsec-secgw.h +63 -0
69 lines not on this page · raw message
examples/ipsec-secgw/ipsec.h +0 -16
@@ -15,11 +15,9 @@#include "ipsec-secgw.h" -#define RTE_LOGTYPE_IPSEC RTE_LOGTYPE_USER1#define RTE_LOGTYPE_IPSEC_ESP RTE_LOGTYPE_USER2#define RTE_LOGTYPE_IPSEC_IPIP RTE_LOGTYPE_USER3 -#define MAX_PKT_BURST 32#define MAX_INFLIGHT 128#define MAX_QP_PER_LCORE 256
@@ -259,20 +257,6 @@ struct cnt_blk {uint32_t cnt; } __attribute__((packed)); -struct traffic_type { -const uint8_t *data[MAX_PKT_BURST *2 ]; -struct rte_mbuf *pkts[MAX_PKT_BURST *2 ]; -void *saptr[MAX_PKT_BURST *2 ]; -uint32_t res[MAX_PKT_BURST *2 ]; -uint32_t num; -}; - -struct ipsec_traffic { -struct traffic_type ipsec; -struct traffic_type ip4; -struct traffic_type ip6; -}; -/* Socket ctx */ extern struct socket_ctx socket_ctx[NB_SOCKETS ];
examples/ipsec-secgw/ipsec_worker.c +422 -2
465 lines not on this page · raw message
examples/ipsec-secgw/ipsec_worker.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port +*/ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Hi Lukasz/Anoob,
Quoted 14 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Example ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128(quoted diff) +0
-3-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>---
...
Quoted 120 lines
examples/ipsec-secgw/ipsec_worker.c +14
-0+static inline enum pkt_type +process_ipsec_get_pkt_type (struct rte_mbuf *pkt,uint8_t **nlp) +{ +struct rte_ether_hdr *eth; + + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); +if (eth->ether_type ==rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV4 )) { + *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip , ip_p)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV4 ; +else +return PKT_TYPE_PLAIN_IPV4 ; + }else if (eth->ether_type ==rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV6 )){
examples/ipsec-secgw/ipsec_worker.c +19
-0+ *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip6_hdr , ip6_nxt)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV6 ; +else +return PKT_TYPE_PLAIN_IPV6 ; + } + +/* Unknown/Unsupported type */ +return PKT_TYPE_INVALID ; +} + +static inline void +update_mac_addrs (struct rte_mbuf *pkt,uint16_t portid) +{ +struct rte_ether_hdr *ethhdr; + + ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src,
RTE_ETHER_ADDR_LEN);(quoted diff) +1
-0+ memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst,
RTE_ETHER_ADDR_LEN);examples/ipsec-secgw/ipsec_worker.c +76
-0+}static inline void ipsec_event_pre_forward (struct rte_mbuf *m,unsigned int port_id)@@ -61,6 +101,290 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, } } +static inline int +check_sp (struct sp_ctx *sp,const uint8_t *nlp,uint32_t *sa_idx) +{ +uint32_t res; + +if (unlikely (sp ==NULL )) +return 0 ; + +rte_acl_classify ((struct rte_acl_ctx *)sp, &nlp, &res,1 , +DEFAULT_MAX_CATEGORIES ); + +if (unlikely (res ==0 )) { +/* No match */ +return 0 ; + } + +if (res ==DISCARD ) +return 0 ; +else if (res ==BYPASS ) { + *sa_idx =-1 ; +return 1 ; + } + + *sa_idx = res -1 ; +return 1 ; +} + +static inline uint16_t +route4_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) +{ +uint32_t dst_ip; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip , ip_dst); + dst_ip = *rte_pktmbuf_mtod_offset(pkt, uint32_t *, offset); + dst_ip =rte_be_to_cpu_32 (dst_ip); + + ret =rte_lpm_lookup ((struct rte_lpm *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +/* TODO: To be tested */ +static inline uint16_t +route6_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) +{ +uint8_t dst_ip[16 ]; +uint8_t *ip6_dst; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip6_hdr , ip6_dst); + ip6_dst = rte_pktmbuf_mtod_offset(pkt, uint8_t *, offset); +memcpy (&dst_ip[0 ], ip6_dst,16 ); + + ret =rte_lpm6_lookup ((struct rte_lpm6 *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} +
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 188
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+static inline uint16_t +get_route (struct rte_mbuf *pkt,struct route_table *rt,enum pkt_type type) +{ +if (type ==PKT_TYPE_PLAIN_IPV4 || type ==PKT_TYPE_IPSEC_IPV4 ) +return route4_pkt (pkt, rt->rt4_ctx); +else if (type ==PKT_TYPE_PLAIN_IPV6 || type ==PKT_TYPE_IPSEC_IPV6 ) +return route6_pkt (pkt, rt->rt6_ctx); + +return RTE_MAX_ETHPORTS ; +}
Is it not possible to use the existing functions for finding routes, checking packet types and checking security policies. It will be very difficult to manage two separate functions for same work. I can see that the pkt->data_offs Are not required to be updated in the inline case, but can we split the existing functions in two so that they can be Called in the appropriate cases.
As you have said in the cover note as well to add lookaside protocol support. I also tried adding it, and it will get very Difficult to manage separate functions for separate code paths.
Quoted 180 lines
examples/ipsec-secgw/ipsec_worker.c +180
-0+ +static inline int +process_ipsec_ev_inbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct ipsec_sa *sa =NULL ; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +case PKT_TYPE_PLAIN_IPV6 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +default : +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) + goto route_and_send_pkt; + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected with SA */ + +/* If the packet was IPsec processed, then SA pointer should be set */ +if (sa ==NULL ) + goto drop_pkt_and_exit; + +/* SPI on the packet should match with the one in SA */ +if (unlikely (sa->spi != ctx->sa_ctx->sa[sa_idx].spi)) + goto drop_pkt_and_exit; + +route_and_send_pkt: + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + +/* Update mac addresses */ +update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id); +return 1 ; + +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Inbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} + +static inline int +process_ipsec_ev_outbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct rte_ipsec_session *sess; +struct sa_ctx *sa_ctx; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +struct ipsec_sa *sa; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +case PKT_TYPE_PLAIN_IPV6 : +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +default : +/* +* Only plain IPv4 & IPv6 packets are allowed +* on protected port. Drop the rest. +*/ +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) { + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + goto send_pkt; + } + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected */ + +/* Get SA ctx*/ + sa_ctx = ctx->sa_ctx; + +/* Get SA */ + sa = &(sa_ctx->sa[sa_idx]); + +/* Get IPsec session */ + sess =ipsec_get_primary_session (sa); + +/* Allow only inline protocol for now */ +if (sess->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ) { +RTE_LOG (ERR ,IPSEC ,"SA type not supported\n" ); + goto drop_pkt_and_exit; + } + +if (sess->security.ol_flags &RTE_SECURITY_TX_OLOAD_NEED_MDATA ) + pkt->userdata = sess->security.ses; + +/* Mark the packet for Tx security offload */ + pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ;
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 378
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+ +/* Get the port to which this pkt need to be submitted */ + port_id = sa->portid; + +send_pkt: +/* Update mac addresses */ +update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id);
How is IP checksum getting updated for the processed packet.
If the hardware is not updating it, should we add a fallback mechanism for SW based Checksum update.
Review prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 379
Quoted 1 line
(quoted diff) +1
-0+ return 1;
It will be better to use some MACROS while returning Like
#define PKT_FORWARD 1
#define PKT_DROPPED 0
#define PKT_POSTED 2 /*may be for lookaside cases */
Quoted 61 lines
examples/ipsec-secgw/ipsec_worker.c +10
-2+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +/* * Event mode exposes various operating modes depending on the * capabilities of the event device and the operating mode @@ -68,7 +392,7 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out,*/ /* Workers registered */ -#define IPSEC_EVENTMODE_WORKERS 1 +#define IPSEC_EVENTMODE_WORKERS 2/* * Event mode worker @@ -146,7 +470,7 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, }/* Save security session */ - pkt->udata64 = (uint64_t ) sess_tbl[port_id]; + pkt->userdata = sess_tbl[port_id];/* Mark the packet for Tx security offload */ examples/ipsec-secgw/ipsec_worker.c +26
-0pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ;@@ -165,6 +489,94 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, } } +/* +* Event mode worker +* Operating parameters : non-burst - Tx internal port - app mode +*/ +static void +ipsec_wrkr_non_burst_int_port_app_mode (struct eh_event_link_info *links, +uint8_t nb_links) +{ +struct lcore_conf_ev_tx_int_port_wrkr lconf; +unsigned int nb_rx =0 ; +struct rte_event ev; +uint32_t lcore_id; +int32_t socket_id; +int ret; + +/* Check if we have links registered for this lcore */ +if (nb_links ==0 ) { +/* No links registered - exit */ +return ; + } + +/* We have valid links */ + +/* Get core ID */ + lcore_id =rte_lcore_id (); +
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct · line 528
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+/* Get socket ID */ + socket_id =rte_lcore_to_socket_id (lcore_id); + +/* Save routing table */ + lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6; + lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = socket_ctx[socket_id].session_pool;
Session_priv_pool should also be added for both inbound and outbound
Quoted 19 lines
examples/ipsec-secgw/ipsec_worker.c +19
-0+ lconf.outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out; + lconf.outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out; + lconf.outbound.sa_ctx = socket_ctx[socket_id].sa_out; + lconf.outbound.session_pool = socket_ctx[socket_id].session_pool; + +RTE_LOG (INFO ,IPSEC , +"Launching event mode worker (non-burst - Tx internal port - " +"app mode) on lcore %d\n" , lcore_id); + +/* Check if it's single link */ +if (nb_links !=1 ) { +RTE_LOG (INFO ,IPSEC , +"Multiple links not supported. Using first link\n" ); + } + +RTE_LOG (INFO ,IPSEC ," -- lcoreid=%u event_port_id=%u\n" , lcore_id, + links[0 ].event_port_id); + +while (!force_quit) {
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 556
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+/* Read packet from event queues */ + nb_rx =rte_event_dequeue_burst (links[0 ].eventdev_id, + links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ +0 /* timeout_ticks */ ); + +if (nb_rx ==0 ) +continue ; +
Event type should be checked here before dereferencing it.
Quoted 87 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+if (is_unprotected_port (ev.mbuf->port)) + ret =process_ipsec_ev_inbound (&lconf.inbound, + &lconf.rt, &ev); +else + ret =process_ipsec_ev_outbound (&lconf.outbound, + &lconf.rt, &ev); +if (ret !=1 ) +/* The pkt has been dropped */ +continue ; + +/* +* Since tx internal port is available, events can be +* directly enqueued to the adapter and it would be +* internally submitted to the eth device. +*/ +rte_event_eth_tx_adapter_enqueue (links[0 ].eventdev_id, + links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ +0 /* flags */ ); + } +} +static uint8_t ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params*wrkrs)
{examples/ipsec-secgw/ipsec_worker.c +8
-0@@ -180,6 +592,14 @@ ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params *wrkrs) wrkr->cap.ipsec_mode = EH_IPSEC_MODE_TYPE_DRIVER; wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_drv_mode; wrkr++; + nb_wrkr_param++; + +/* Non-burst - Tx internal port - app mode */ + wrkr->cap.burst =EH_RX_TYPE_NON_BURST ; + wrkr->cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; + wrkr->cap.ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_app_mode; + nb_wrkr_param++;return nb_wrkr_param;}
examples/ipsec- renamed from examples/ipsec-secgw/ipsec_worker.h +0
-0
secgw/ipsec_worker.h
new file mode 100644
index 0000000..87b4f22examples/ipsec-secgw/ipsec_worker.h new file +35
-1@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port +*/ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */ --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Hi Akhil,
Please see my answers below.
Thanks,
Lukasz
Quoted 158 lines · Akhil Goyal
External Email
----------------------------------------------------------------------
Hi Lukasz/Anoob,Quoted 14 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Example ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128(quoted diff) +0
-3-w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c 0x1 -- -P -p 0x3 -u 0x1 --config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>---
...
Quoted 120 lines
examples/ipsec-secgw/ipsec_worker.c +14
-0+static inline enum pkt_type +process_ipsec_get_pkt_type (struct rte_mbuf *pkt,uint8_t **nlp) +{ +struct rte_ether_hdr *eth; + + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); +if (eth->ether_type ==rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV4 )) { + *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip , ip_p)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV4 ; +else +return PKT_TYPE_PLAIN_IPV4 ; + }else if (eth->ether_type ==rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV6 )){
examples/ipsec-secgw/ipsec_worker.c +19
-0+ *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip6_hdr , ip6_nxt)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV6 ; +else +return PKT_TYPE_PLAIN_IPV6 ; + } + +/* Unknown/Unsupported type */ +return PKT_TYPE_INVALID ; +} + +static inline void +update_mac_addrs (struct rte_mbuf *pkt,uint16_t portid) +{ +struct rte_ether_hdr *ethhdr; + + ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src,
RTE_ETHER_ADDR_LEN);(quoted diff) +1
-0+ memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst,
RTE_ETHER_ADDR_LEN);examples/ipsec-secgw/ipsec_worker.c +76
-0+}static inline void ipsec_event_pre_forward (struct rte_mbuf *m,unsigned int port_id)@@ -61,6 +101,290 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, } } +static inline int +check_sp (struct sp_ctx *sp,const uint8_t *nlp,uint32_t *sa_idx) +{ +uint32_t res; + +if (unlikely (sp ==NULL )) +return 0 ; + +rte_acl_classify ((struct rte_acl_ctx *)sp, &nlp, &res,1 , +DEFAULT_MAX_CATEGORIES ); + +if (unlikely (res ==0 )) { +/* No match */ +return 0 ; + } + +if (res ==DISCARD ) +return 0 ; +else if (res ==BYPASS ) { + *sa_idx =-1 ; +return 1 ; + } + + *sa_idx = res -1 ; +return 1 ; +} + +static inline uint16_t +route4_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) +{ +uint32_t dst_ip; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip , ip_dst); + dst_ip = *rte_pktmbuf_mtod_offset(pkt, uint32_t *, offset); + dst_ip =rte_be_to_cpu_32 (dst_ip); + + ret =rte_lpm_lookup ((struct rte_lpm *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +/* TODO: To be tested */ +static inline uint16_t +route6_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) +{ +uint8_t dst_ip[16 ]; +uint8_t *ip6_dst; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip6_hdr , ip6_dst); + ip6_dst = rte_pktmbuf_mtod_offset(pkt, uint8_t *, offset); +memcpy (&dst_ip[0 ], ip6_dst,16 ); + + ret =rte_lpm6_lookup ((struct rte_lpm6 *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} +examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 188
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+static inline uint16_t +get_route (struct rte_mbuf *pkt,struct route_table *rt,enum pkt_type type) +{ +if (type ==PKT_TYPE_PLAIN_IPV4 || type ==PKT_TYPE_IPSEC_IPV4 ) +return route4_pkt (pkt, rt->rt4_ctx); +else if (type ==PKT_TYPE_PLAIN_IPV6 || type ==PKT_TYPE_IPSEC_IPV6 ) +return route6_pkt (pkt, rt->rt6_ctx); + +return RTE_MAX_ETHPORTS ; +}Is it not possible to use the existing functions for finding routes, checking packet types and checking security policies. It will be very difficult to manage two separate functions for same work. I can see that the
pkt->data_offsAre not required to be updated in the inline case, but can we split the existing functions in two so that they can be Called in the appropriate cases.
Quoted 3 lines
As you have said in the cover note as well to add lookaside protocol support. I also tried adding it, and it will get very Difficult to manage separate functions for separate code paths.
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
The prepare_one_packet() and prepare_tx_pkt() do much more than we need and for performance reasons we crafted new functions. For example, process_ipsec_get_pkt_type function returns nlp and whether packet type is plain or IPsec. That's all. Prepare_one_packet() process packets in chunks and does much more - it adjusts mbuf and packet length then it demultiplex packets into plain and IPsec flows and finally does inline checks. This is similar for update_mac_addrs() vs prepare_tx_pkt() and check_sp() vs inbound_sp_sa() that prepare_tx_pkt() and inbound_sp_sa() do more that we need in event mode.
I understand your concern from the perspective of code maintenance but on the other hand we are concerned with performance. The current code is not optimized to support multiple mode processing introduced with rte_security. We can work on a common routines once we have other modes also added, so that we can come up with a better solution than what we have today.
Quoted 186 lines
Quoted 186 lines
examples/ipsec-secgw/ipsec_worker.c +186
-0+ +static inline int +process_ipsec_ev_inbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct ipsec_sa *sa =NULL ; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +case PKT_TYPE_PLAIN_IPV6 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +default : +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) + goto route_and_send_pkt; + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected with SA */ + +/* If the packet was IPsec processed, then SA pointer should be set */ +if (sa ==NULL ) + goto drop_pkt_and_exit; + +/* SPI on the packet should match with the one in SA */ +if (unlikely (sa->spi != ctx->sa_ctx->sa[sa_idx].spi)) + goto drop_pkt_and_exit; + +route_and_send_pkt: + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + +/* Update mac addresses */ +update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id); +return 1 ; + +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Inbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} + +static inline int +process_ipsec_ev_outbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct rte_ipsec_session *sess; +struct sa_ctx *sa_ctx; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +struct ipsec_sa *sa; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +case PKT_TYPE_PLAIN_IPV6 : +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +default : +/* +* Only plain IPv4 & IPv6 packets are allowed +* on protected port. Drop the rest. +*/ +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) { + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + goto send_pkt; + } + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected */ + +/* Get SA ctx*/ + sa_ctx = ctx->sa_ctx; + +/* Get SA */ + sa = &(sa_ctx->sa[sa_idx]); + +/* Get IPsec session */ + sess =ipsec_get_primary_session (sa); + +/* Allow only inline protocol for now */ +if (sess->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ) { +RTE_LOG (ERR ,IPSEC ,"SA type not supported\n" ); + goto drop_pkt_and_exit; + } + +if (sess->security.ol_flags &RTE_SECURITY_TX_OLOAD_NEED_MDATA ) + pkt->userdata = sess->security.ses; + +/* Mark the packet for Tx security offload */ + pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ; + +/* Get the port to which this pkt need to be submitted */ + port_id = sa->portid; + +send_pkt: +/* Update mac addresses */
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 279
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c +4
-0+update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id);How is IP checksum getting updated for the processed packet.
If the hardware is not updating it, should we add a fallback mechanism for SW based Checksum update.
[Lukasz] In case of outbound inline protocol checksum has to be calculated by HW as final packet is formed by crypto device. There is no need to calculate it in SW.
Quoted 73 lines
Review prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 379
Quoted 1 line
(quoted diff) +1
-0+ return 1;It will be better to use some MACROS while returning Like
#definePKT_FORWARD1
#definePKT_DROPPED0
#definePKT_POSTED2 /*may be for lookaside cases */Quoted 65 lines
examples/ipsec-secgw/ipsec_worker.c +10
-2+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +/* * Event mode exposes various operating modes depending on the * capabilities of the event device and the operating mode @@ -68,7 +392,7 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out,*/ /* Workers registered */ -#define IPSEC_EVENTMODE_WORKERS 1 +#define IPSEC_EVENTMODE_WORKERS 2/* * Event mode worker @@ -146,7 +470,7 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, }/* Save security session */ - pkt->udata64 = (uint64_t ) sess_tbl[port_id]; + pkt->userdata = sess_tbl[port_id];/* Mark the packet for Tx security offload */ examples/ipsec-secgw/ipsec_worker.c +30
-0pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ;@@ -165,6 +489,94 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, } } +/* +* Event mode worker +* Operating parameters : non-burst - Tx internal port - app mode +*/ +static void +ipsec_wrkr_non_burst_int_port_app_mode (struct eh_event_link_info *links, +uint8_t nb_links) +{ +struct lcore_conf_ev_tx_int_port_wrkr lconf; +unsigned int nb_rx =0 ; +struct rte_event ev; +uint32_t lcore_id; +int32_t socket_id; +int ret; + +/* Check if we have links registered for this lcore */ +if (nb_links ==0 ) { +/* No links registered - exit */ +return ; + } + +/* We have valid links */ + +/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Get socket ID */ + socket_id =rte_lcore_to_socket_id (lcore_id); + +/* Save routing table */
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 527
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+ lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6; + lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = socket_ctx[socket_id].session_pool;
Session_priv_poolshould also be added for both inbound and outbound
[Lukasz] I will add it in V5.
Quoted 23 lines
Quoted 23 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+ lconf.outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out; + lconf.outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out; + lconf.outbound.sa_ctx = socket_ctx[socket_id].sa_out; + lconf.outbound.session_pool = socket_ctx[socket_id].session_pool; + +RTE_LOG (INFO ,IPSEC , +"Launching event mode worker (non-burst - Tx internal port - " +"app mode) on lcore %d\n" , lcore_id); + +/* Check if it's single link */ +if (nb_links !=1 ) { +RTE_LOG (INFO ,IPSEC , +"Multiple links not supported. Using first link\n" ); + } + +RTE_LOG (INFO ,IPSEC ," -- lcoreid=%u event_port_id=%u\n" , lcore_id, + links[0 ].event_port_id); + +while (!force_quit) { +/* Read packet from event queues */ + nb_rx = rte_event_dequeue_burst(links[0].eventdev_id, + links[0].event_port_id, + &ev, /* events */
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 556
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+1 ,/* nb_events */ + 0 /* timeout_ticks */); + +if (nb_rx ==0 ) +continue ; +Event type should be checked here before dereferencing it.
[Lukasz] I will add event type check in V5.
Quoted 88 lines
Quoted 87 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+if (is_unprotected_port (ev.mbuf->port)) + ret =process_ipsec_ev_inbound (&lconf.inbound, + &lconf.rt, &ev); +else + ret =process_ipsec_ev_outbound (&lconf.outbound, + &lconf.rt, &ev); +if (ret !=1 ) +/* The pkt has been dropped */ +continue ; + +/* +* Since tx internal port is available, events can be +* directly enqueued to the adapter and it would be +* internally submitted to the eth device. +*/ +rte_event_eth_tx_adapter_enqueue (links[0 ].eventdev_id, + links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ +0 /* flags */ ); + } +} +static uint8_t ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params*wrkrs)
{examples/ipsec-secgw/ipsec_worker.c +8
-0@@ -180,6 +592,14 @@ ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params *wrkrs) wrkr->cap.ipsec_mode = EH_IPSEC_MODE_TYPE_DRIVER; wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_drv_mode; wrkr++; + nb_wrkr_param++; + +/* Non-burst - Tx internal port - app mode */ + wrkr->cap.burst =EH_RX_TYPE_NON_BURST ; + wrkr->cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; + wrkr->cap.ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_app_mode; + nb_wrkr_param++;return nb_wrkr_param;}
examples/ipsec- renamed from examples/ipsec-secgw/ipsec_worker.h +0
-0
secgw/ipsec_worker.h
new file mode 100644
index 0000000..87b4f22examples/ipsec-secgw/ipsec_worker.h new file +35
-1@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port +*/ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */ --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Hi Akhil, Konstantin,
One question below.
Thanks,
Anoob
Quoted 482 lines
-----Original Message-----
From: Lukas Bartosik <[email protected]>
Sent: Tuesday, February 25, 2020 5:21 PM
To: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; Konstantin Ananyev <[email protected]>; [email protected]; Thomas Monjalon <[email protected]>; Radu Nicolau <[email protected]>
Subject: Re: [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode workerHi Akhil,
Please see my answers below.
Thanks,
LukaszQuoted 142 lines · Akhil Goyal
External Email
----------------------------------------------------------------------
Hi Lukasz/Anoob,Quoted 14 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Example ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>---
...
Quoted 120 lines
examples/ipsec-secgw/ipsec_worker.c +14
-0+static inline enum pkt_type +process_ipsec_get_pkt_type (struct rte_mbuf *pkt,uint8_t **nlp) { +struct rte_ether_hdr *eth; + + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); +if (eth->ether_type ==rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV4 )) { + *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip , ip_p)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV4 ; +else +return PKT_TYPE_PLAIN_IPV4 ; + }else if (eth->ether_type == +rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV6 )){
examples/ipsec-secgw/ipsec_worker.c +18
-0+ *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip6_hdr , ip6_nxt)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV6 ; +else +return PKT_TYPE_PLAIN_IPV6 ; + } + +/* Unknown/Unsupported type */ +return PKT_TYPE_INVALID ; +} + +static inline void +update_mac_addrs (struct rte_mbuf *pkt,uint16_t portid) { +struct rte_ether_hdr *ethhdr; + + ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src,
RTE_ETHER_ADDR_LEN);(quoted diff) +1
-0+ memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst,
RTE_ETHER_ADDR_LEN);examples/ipsec-secgw/ipsec_worker.c +77
-1+} static inline void ipsec_event_pre_forward(struct rte_mbuf *m, unsigned int port_id) @@ -61,6 +101,290 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, } } +static inline int +check_sp (struct sp_ctx *sp,const uint8_t *nlp,uint32_t *sa_idx) { +uint32_t res; + +if (unlikely (sp ==NULL )) +return 0 ; + +rte_acl_classify ((struct rte_acl_ctx *)sp, &nlp, &res,1 , +DEFAULT_MAX_CATEGORIES ); + +if (unlikely (res ==0 )) { +/* No match */ +return 0 ; + } + +if (res ==DISCARD ) +return 0 ; +else if (res ==BYPASS ) { + *sa_idx =-1 ; +return 1 ; + } + + *sa_idx = res -1 ; +return 1 ; +} + +static inline uint16_t +route4_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) { +uint32_t dst_ip; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip , ip_dst); + dst_ip = *rte_pktmbuf_mtod_offset(pkt, uint32_t *, offset); + dst_ip =rte_be_to_cpu_32 (dst_ip); + + ret =rte_lpm_lookup ((struct rte_lpm *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +/* TODO: To be tested */ +static inline uint16_t +route6_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) { +uint8_t dst_ip[16 ]; +uint8_t *ip6_dst; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip6_hdr , ip6_dst); + ip6_dst = rte_pktmbuf_mtod_offset(pkt, uint8_t *, offset); +memcpy (&dst_ip[0 ], ip6_dst,16 ); + + ret =rte_lpm6_lookup ((struct rte_lpm6 *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +static inline uint16_t +get_route (struct rte_mbuf *pkt,struct route_table *rt,enum +pkt_type type) { +if (type ==PKT_TYPE_PLAIN_IPV4 || type ==PKT_TYPE_IPSEC_IPV4 )Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 188
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+return route4_pkt (pkt, rt->rt4_ctx); + else if (type == PKT_TYPE_PLAIN_IPV6 || type == PKT_TYPE_IPSEC_IPV6) + return route6_pkt(pkt, rt->rt6_ctx); + +return RTE_MAX_ETHPORTS ; +}Is it not possible to use the existing functions for finding routes, checking
packet types and checking security policies.
Quoted 3 lines
It will be very difficult to manage two separate functions for same work. I can see that the
pkt->data_offsAre not required to be updated in the inline case, but can we split the existing functions in two so that they canbe Called in the appropriate cases.
Quoted 3 lines
As you have said in the cover note as well to add lookaside protocol support. I also tried adding it, and it will get very Difficult to manage separate
functions for separate code paths.
Quoted 1 line
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
Theprepare_one_packet()andprepare_tx_pkt()do much more than we need and for performance reasons we crafted new functions. For example,process_ipsec_get_pkt_typefunction returns nlp and whether packet type is plain or IPsec. That's all.Prepare_one_packet()process packets in chunks and does much more - it adjusts mbuf and packet length then it demultiplex packets into plain and IPsec flows and finally does inline checks. This is similar forupdate_mac_addrs()vsprepare_tx_pkt()andcheck_sp()vsinbound_sp_sa()thatprepare_tx_pkt()andinbound_sp_sa()do more that we need in event mode.I understand your concern from the perspective of code maintenance but on the other hand we are concerned with performance.
The current code is not optimized to support multiple mode processing introduced withrte_security. We can work on a common routines once we have other modes also added, so that we can come up with a better solution than what we have today.Quoted 186 lines
Quoted 186 lines
examples/ipsec-secgw/ipsec_worker.c +186
-0+ +static inline int +process_ipsec_ev_inbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct ipsec_sa *sa =NULL ; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +case PKT_TYPE_PLAIN_IPV6 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +default : +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) + goto route_and_send_pkt; + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected with SA */ + +/* If the packet was IPsec processed, then SA pointer should be set */ +if (sa ==NULL ) + goto drop_pkt_and_exit; + +/* SPI on the packet should match with the one in SA */ +if (unlikely (sa->spi != ctx->sa_ctx->sa[sa_idx].spi)) + goto drop_pkt_and_exit; + +route_and_send_pkt: + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + +/* Update mac addresses */ +update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id); +return 1 ; + +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Inbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} + +static inline int +process_ipsec_ev_outbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct rte_ipsec_session *sess; +struct sa_ctx *sa_ctx; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +struct ipsec_sa *sa; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +case PKT_TYPE_PLAIN_IPV6 : +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +default : +/* +* Only plain IPv4 & IPv6 packets are allowed +* on protected port. Drop the rest. +*/ +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) { + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + goto send_pkt; + } + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected */ + +/* Get SA ctx*/ + sa_ctx = ctx->sa_ctx; + +/* Get SA */ + sa = &(sa_ctx->sa[sa_idx]); + +/* Get IPsec session */ + sess =ipsec_get_primary_session (sa); + +/* Allow only inline protocol for now */ +if (sess->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ) { +RTE_LOG (ERR ,IPSEC ,"SA type not supported\n" ); + goto drop_pkt_and_exit; + } + +if (sess->security.ol_flags &RTE_SECURITY_TX_OLOAD_NEED_MDATA ) + pkt->userdata = sess->security.ses; + +/* Mark the packet for Tx security offload */ + pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ; + +/* Get the port to which this pkt need to be submitted */ + port_id = sa->portid; + +send_pkt: +/* Update mac addresses */ Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 279
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c +4
-0+update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id);How is IP checksum getting updated for the processed packet. If the hardware is not updating it, should we add a fallback mechanism for SW based Checksum update.
[Lukasz] In case of outbound inline protocol checksum has to be calculated by HW as final packet is formed by crypto device. There is no need to calculate it in SW.
Quoted 31 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ return 1;It will be better to use some MACROS while returning Like
#definePKT_FORWARD1
#definePKT_DROPPED0
#definePKT_POSTED2 /*may be for lookaside cases */Quoted 24 lines
examples/ipsec-secgw/ipsec_worker.c +10
-1+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +/* * Event mode exposes various operating modes depending on the * capabilities of the event device and the operating mode @@ -68,7 +392,7 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, */ /* Workers registered */ -#define IPSEC_EVENTMODE_WORKERS 1 +#define IPSEC_EVENTMODE_WORKERS 2/* * Event mode worker @@ -146,7 +470,7 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, }Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +1
-1/* Save security session */ - pkt->udata64 = (uint64_t ) sess_tbl[port_id]; + pkt->userdata = sess_tbl[port_id];/* Mark the packet for Tx security offload */
pkt->ol_flags|=PKT_TX_SEC_OFFLOAD; @@ -165,6+489,94 @@
Quoted 34 lines
Quoted 34 lines
ipsec_wrkr_non_burst_int_port_drv_mode(struct
eh_event_link_info*links,examples/ipsec-secgw/ipsec_worker.c +29
-0} } +/* +* Event mode worker +* Operating parameters : non-burst - Tx internal port - app mode +*/ static void ipsec_wrkr_non_burst_int_port_app_mode (struct +eh_event_link_info *links, +uint8_t nb_links) +{ +struct lcore_conf_ev_tx_int_port_wrkr lconf; +unsigned int nb_rx =0 ; +struct rte_event ev; +uint32_t lcore_id; +int32_t socket_id; +int ret; + +/* Check if we have links registered for this lcore */ +if (nb_links ==0 ) { +/* No links registered - exit */ +return ; + } + +/* We have valid links */ + +/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Get socket ID */ + socket_id =rte_lcore_to_socket_id (lcore_id); + +/* Save routing table */ Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 527
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+ lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6; + lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = socket_ctx[socket_id].session_pool;
Session_priv_poolshould also be added for both inbound and outbound
Quoted 1 line
[Lukasz] I will add it in V5.
[Anoob] Actually, why do need both session_pool and private_pool? I think it's a remnant from the time we had session being created when the first packet arrives.
@Konstantin, thoughts?
Quoted 121 lines
Quoted 24 lines
Quoted 24 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+ lconf.outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out; + lconf.outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out; + lconf.outbound.sa_ctx = socket_ctx[socket_id].sa_out; + lconf.outbound.session_pool = socket_ctx[socket_id].session_pool; + +RTE_LOG (INFO ,IPSEC , +"Launching event mode worker (non-burst - Tx internal port - " +"app mode) on lcore %d\n" , lcore_id); + +/* Check if it's single link */ +if (nb_links !=1 ) { +RTE_LOG (INFO ,IPSEC , +"Multiple links not supported. Using first link\n" ); + } + +RTE_LOG (INFO ,IPSEC ," -- lcoreid=%u event_port_id=%u\n" , lcore_id, + links[0 ].event_port_id); + +while (!force_quit) { +/* Read packet from event queues */ + nb_rx = rte_event_dequeue_burst(links[0].eventdev_id, + links[0].event_port_id, + &ev, /* events */Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 556
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+1 ,/* nb_events */ + 0 /* timeout_ticks */); + +if (nb_rx ==0 ) +continue ; +Event type should be checked here before dereferencing it.
[Lukasz] I will add event type check in V5.
Quoted 85 lines
Quoted 84 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+if (is_unprotected_port (ev.mbuf->port)) + ret =process_ipsec_ev_inbound (&lconf.inbound, + &lconf.rt, &ev); +else + ret =process_ipsec_ev_outbound (&lconf.outbound, + &lconf.rt, &ev); +if (ret !=1 ) +/* The pkt has been dropped */ +continue ; + +/* +* Since tx internal port is available, events can be +* directly enqueued to the adapter and it would be +* internally submitted to the eth device. +*/ +rte_event_eth_tx_adapter_enqueue (links[0 ].eventdev_id, + links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ +0 /* flags */ ); + } +} +static uint8_t ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params*wrkrs)
{examples/ipsec-secgw/ipsec_worker.c +8
-0@@ -180,6 +592,14 @@ ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params *wrkrs) wrkr->cap.ipsec_mode = EH_IPSEC_MODE_TYPE_DRIVER; wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_drv_mode; wrkr++; + nb_wrkr_param++; + +/* Non-burst - Tx internal port - app mode */ + wrkr->cap.burst =EH_RX_TYPE_NON_BURST ; + wrkr->cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; + wrkr->cap.ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_app_mode; + nb_wrkr_param++;return nb_wrkr_param;}
examples/ipsec- renamed from examples/ipsec-secgw/ipsec_worker.h +0
-0
secgw/ipsec_worker.hnew file mode 100644 index 0000000..87b4f22examples/ipsec-secgw/ipsec_worker.h new file +34
-1@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port */ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */ --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Quoted 455 lines
Quoted 455 lines
Quoted 136 lines
Quoted 13 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Example ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>---
...
Quoted 120 lines
examples/ipsec-secgw/ipsec_worker.c +14
-0+static inline enum pkt_type +process_ipsec_get_pkt_type (struct rte_mbuf *pkt,uint8_t **nlp) { +struct rte_ether_hdr *eth; + + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); +if (eth->ether_type ==rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV4 )) { + *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip , ip_p)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV4 ; +else +return PKT_TYPE_PLAIN_IPV4 ; + }else if (eth->ether_type == +rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV6 )){
examples/ipsec-secgw/ipsec_worker.c +18
-0+ *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip6_hdr , ip6_nxt)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV6 ; +else +return PKT_TYPE_PLAIN_IPV6 ; + } + +/* Unknown/Unsupported type */ +return PKT_TYPE_INVALID ; +} + +static inline void +update_mac_addrs (struct rte_mbuf *pkt,uint16_t portid) { +struct rte_ether_hdr *ethhdr; + + ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src,
RTE_ETHER_ADDR_LEN);(quoted diff) +1
-0+ memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst,
RTE_ETHER_ADDR_LEN);examples/ipsec-secgw/ipsec_worker.c +77
-1+} static inline void ipsec_event_pre_forward(struct rte_mbuf *m, unsigned int port_id) @@ -61,6 +101,290 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, } } +static inline int +check_sp (struct sp_ctx *sp,const uint8_t *nlp,uint32_t *sa_idx) { +uint32_t res; + +if (unlikely (sp ==NULL )) +return 0 ; + +rte_acl_classify ((struct rte_acl_ctx *)sp, &nlp, &res,1 , +DEFAULT_MAX_CATEGORIES ); + +if (unlikely (res ==0 )) { +/* No match */ +return 0 ; + } + +if (res ==DISCARD ) +return 0 ; +else if (res ==BYPASS ) { + *sa_idx =-1 ; +return 1 ; + } + + *sa_idx = res -1 ; +return 1 ; +} + +static inline uint16_t +route4_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) { +uint32_t dst_ip; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip , ip_dst); + dst_ip = *rte_pktmbuf_mtod_offset(pkt, uint32_t *, offset); + dst_ip =rte_be_to_cpu_32 (dst_ip); + + ret =rte_lpm_lookup ((struct rte_lpm *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +/* TODO: To be tested */ +static inline uint16_t +route6_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) { +uint8_t dst_ip[16 ]; +uint8_t *ip6_dst; +uint16_t offset; +uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip6_hdr , ip6_dst); + ip6_dst = rte_pktmbuf_mtod_offset(pkt, uint8_t *, offset); +memcpy (&dst_ip[0 ], ip6_dst,16 ); + + ret =rte_lpm6_lookup ((struct rte_lpm6 *)rt_ctx, dst_ip, &hop); + +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +static inline uint16_t +get_route (struct rte_mbuf *pkt,struct route_table *rt,enum +pkt_type type) { +if (type ==PKT_TYPE_PLAIN_IPV4 || type ==PKT_TYPE_IPSEC_IPV4 )Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 188
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+return route4_pkt (pkt, rt->rt4_ctx); + else if (type == PKT_TYPE_PLAIN_IPV6 || type == PKT_TYPE_IPSEC_IPV6) + return route6_pkt(pkt, rt->rt6_ctx); + +return RTE_MAX_ETHPORTS ; +}Is it not possible to use the existing functions for finding routes, checking
packet types and checking security policies.
Quoted 3 lines
It will be very difficult to manage two separate functions for same work. I can see that the
pkt->data_offsAre not required to be updated in the inline case, but can we split the existing functions in two so that they canbe Called in the appropriate cases.
Quoted 3 lines
As you have said in the cover note as well to add lookaside protocol support. I also tried adding it, and it will get very Difficult to manage separate
functions for separate code paths.
Quoted 1 line
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
Theprepare_one_packet()andprepare_tx_pkt()do much more than we need and for performance reasons we crafted new functions. For example,process_ipsec_get_pkt_typefunction returns nlp and whether packet type is plain or IPsec. That's all.Prepare_one_packet()process packets in chunks and does much more - it adjusts mbuf and packet length then it demultiplex packets into plain and IPsec flows and finally does inline checks. This is similar forupdate_mac_addrs()vsprepare_tx_pkt()andcheck_sp()vsinbound_sp_sa()thatprepare_tx_pkt()andinbound_sp_sa()do more that we need in event mode.I understand your concern from the perspective of code maintenance but on the other hand we are concerned with performance.
The current code is not optimized to support multiple mode processing introduced withrte_security. We can work on a common routines once we have other modes also added, so that we can come up with a better solution than what we have today.Quoted 186 lines
Quoted 186 lines
examples/ipsec-secgw/ipsec_worker.c +186
-0+ +static inline int +process_ipsec_ev_inbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct ipsec_sa *sa =NULL ; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +case PKT_TYPE_PLAIN_IPV6 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { +RTE_LOG (ERR ,IPSEC , +"Inbound security offload failed\n" ); + goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +default : +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) + goto route_and_send_pkt; + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected with SA */ + +/* If the packet was IPsec processed, then SA pointer should be set */ +if (sa ==NULL ) + goto drop_pkt_and_exit; + +/* SPI on the packet should match with the one in SA */ +if (unlikely (sa->spi != ctx->sa_ctx->sa[sa_idx].spi)) + goto drop_pkt_and_exit; + +route_and_send_pkt: + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + +/* Update mac addresses */ +update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id); +return 1 ; + +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Inbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} + +static inline int +process_ipsec_ev_outbound (struct ipsec_ctx *ctx,struct route_table *rt, +struct rte_event *ev) +{ +struct rte_ipsec_session *sess; +struct sa_ctx *sa_ctx; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +struct ipsec_sa *sa; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +case PKT_TYPE_PLAIN_IPV6 : +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +default : +/* +* Only plain IPv4 & IPv6 packets are allowed +* on protected port. Drop the rest. +*/ +RTE_LOG (ERR ,IPSEC ,"Unsupported packet type = %d\n" , type); + goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) { + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + goto send_pkt; + } + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected */ + +/* Get SA ctx*/ + sa_ctx = ctx->sa_ctx; + +/* Get SA */ + sa = &(sa_ctx->sa[sa_idx]); + +/* Get IPsec session */ + sess =ipsec_get_primary_session (sa); + +/* Allow only inline protocol for now */ +if (sess->type !=RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ) { +RTE_LOG (ERR ,IPSEC ,"SA type not supported\n" ); + goto drop_pkt_and_exit; + } + +if (sess->security.ol_flags &RTE_SECURITY_TX_OLOAD_NEED_MDATA ) + pkt->userdata = sess->security.ses; + +/* Mark the packet for Tx security offload */ + pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ; + +/* Get the port to which this pkt need to be submitted */ + port_id = sa->portid; + +send_pkt: +/* Update mac addresses */ Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 279
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c +4
-0+update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id);How is IP checksum getting updated for the processed packet. If the hardware is not updating it, should we add a fallback mechanism for SW based Checksum update.
[Lukasz] In case of outbound inline protocol checksum has to be calculated by HW as final packet is formed by crypto device. There is no need to calculate it in SW.
Quoted 31 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ return 1;It will be better to use some MACROS while returning Like
#definePKT_FORWARD1
#definePKT_DROPPED0
#definePKT_POSTED2 /*may be for lookaside cases */Quoted 24 lines
examples/ipsec-secgw/ipsec_worker.c +10
-1+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +/* * Event mode exposes various operating modes depending on the * capabilities of the event device and the operating mode @@ -68,7 +392,7 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, */ /* Workers registered */ -#define IPSEC_EVENTMODE_WORKERS 1 +#define IPSEC_EVENTMODE_WORKERS 2/* * Event mode worker @@ -146,7 +470,7 @@ ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, }Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +1
-1/* Save security session */ - pkt->udata64 = (uint64_t ) sess_tbl[port_id]; + pkt->userdata = sess_tbl[port_id];/* Mark the packet for Tx security offload */
pkt->ol_flags|=PKT_TX_SEC_OFFLOAD; @@ -165,6+489,94 @@
Quoted 43 lines
Quoted 30 lines
ipsec_wrkr_non_burst_int_port_drv_mode(struct
eh_event_link_info*links,examples/ipsec-secgw/ipsec_worker.c +25
-0} } +/* +* Event mode worker +* Operating parameters : non-burst - Tx internal port - app mode +*/ static void ipsec_wrkr_non_burst_int_port_app_mode (struct +eh_event_link_info *links, +uint8_t nb_links) +{ +struct lcore_conf_ev_tx_int_port_wrkr lconf; +unsigned int nb_rx =0 ; +struct rte_event ev; +uint32_t lcore_id; +int32_t socket_id; +int ret; + +/* Check if we have links registered for this lcore */ +if (nb_links ==0 ) { +/* No links registered - exit */ +return ; + } + +/* We have valid links */ + +/* Get core ID */ + lcore_id =rte_lcore_id (); +examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 527
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+/* Get socket ID */ + socket_id =rte_lcore_to_socket_id (lcore_id); + +/* Save routing table */ + lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6; + lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = socket_ctx[socket_id].session_pool;
Session_priv_poolshould also be added for both inbound and outbound
Quoted 6 lines
Quoted 1 line
[Lukasz] I will add it in V5.
[Anoob] Actually, why do need both
session_poolandprivate_pool? I think it's a remnant from the time we had session being created when the first packet arrives.@Konstantin, thoughts?
I think we do need it for lksd sessions.
See create_lookaside_session() in ipsec.c
Quoted 122 lines
Quoted 122 lines
Quoted 25 lines
Quoted 25 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+ lconf.outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out; + lconf.outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out; + lconf.outbound.sa_ctx = socket_ctx[socket_id].sa_out; + lconf.outbound.session_pool = socket_ctx[socket_id].session_pool; + +RTE_LOG (INFO ,IPSEC , +"Launching event mode worker (non-burst - Tx internal port - " +"app mode) on lcore %d\n" , lcore_id); + +/* Check if it's single link */ +if (nb_links !=1 ) { +RTE_LOG (INFO ,IPSEC , +"Multiple links not supported. Using first link\n" ); + } + +RTE_LOG (INFO ,IPSEC ," -- lcoreid=%u event_port_id=%u\n" , lcore_id, + links[0 ].event_port_id); + +while (!force_quit) { +/* Read packet from event queues */ + nb_rx = rte_event_dequeue_burst(links[0].eventdev_id, + links[0].event_port_id, + &ev, /* events */Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 556
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+1 ,/* nb_events */ + 0 /* timeout_ticks */); + +if (nb_rx ==0 ) +continue ; +Event type should be checked here before dereferencing it.
[Lukasz] I will add event type check in V5.
Quoted 85 lines
Quoted 84 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+if (is_unprotected_port (ev.mbuf->port)) + ret =process_ipsec_ev_inbound (&lconf.inbound, + &lconf.rt, &ev); +else + ret =process_ipsec_ev_outbound (&lconf.outbound, + &lconf.rt, &ev); +if (ret !=1 ) +/* The pkt has been dropped */ +continue ; + +/* +* Since tx internal port is available, events can be +* directly enqueued to the adapter and it would be +* internally submitted to the eth device. +*/ +rte_event_eth_tx_adapter_enqueue (links[0 ].eventdev_id, + links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ +0 /* flags */ ); + } +} +static uint8_t ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params*wrkrs)
{examples/ipsec-secgw/ipsec_worker.c +8
-0@@ -180,6 +592,14 @@ ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params *wrkrs) wrkr->cap.ipsec_mode = EH_IPSEC_MODE_TYPE_DRIVER; wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_drv_mode; wrkr++; + nb_wrkr_param++; + +/* Non-burst - Tx internal port - app mode */ + wrkr->cap.burst =EH_RX_TYPE_NON_BURST ; + wrkr->cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; + wrkr->cap.ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_app_mode; + nb_wrkr_param++;return nb_wrkr_param;}
examples/ipsec- renamed from examples/ipsec-secgw/ipsec_worker.h +0
-0
secgw/ipsec_worker.hnew file mode 100644 index 0000000..87b4f22examples/ipsec-secgw/ipsec_worker.h new file +34
-1@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port */ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */ --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Hi Konstantin,
Please see inline.
Thanks,
Anoob
Quoted 500 lines
-----Original Message-----
From: Ananyev, Konstantin <[email protected]>
Sent: Tuesday, February 25, 2020 9:34 PM
To: Anoob Joseph <[email protected]>; Akhil Goyal <[email protected]>
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Narayana Prasad Raju Athreya <[email protected]>; Ankur Dwivedi <[email protected]>; Archana Muniganti <[email protected]>; Tejasree Kondoj <[email protected]>; Vamsi Krishna Attunuru <[email protected]>; [email protected]; Thomas Monjalon <[email protected]>; Nicolau, Radu <[email protected]>; Lukas Bartosik <[email protected]>
Subject: RE: [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode workerQuoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
Add application inbound/outbound worker thread and IPsec application processing code for event mode.
Example ipsec-secgw command in app mode:
ipsec-secgw -w 0002:02:00.0,ipsec_in_max_spi=128 -w 0002:03:00.0,ipsec_in_max_spi=128 -w 0002:0e:00.0 -w 0002:10:00.1 --log-level=8 -c0x1-- -P -p0x3-u0x1--config "(1,0,0),(0,0,0)" -f aes-gcm.cfg --transfer-mode event --event-schedule-type parallelSigned-off-by Anoob Joseph <[email protected]>Signed-off-by Ankur Dwivedi <[email protected]>Signed-off-by Lukasz Bartosik <[email protected]>---
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
...
examples/ipsec-secgw/ipsec_worker.c
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+static inline enum pkt_type +process_ipsec_get_pkt_type (struct rte_mbuf *pkt,uint8_t **nlp) { +struct rte_ether_hdr *eth; + + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + if (eth->ether_type ==
rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) {Quoted 69 lines
Quoted 69 lines
Quoted 69 lines
Quoted 69 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip , ip_p)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV4 ; +else +return PKT_TYPE_PLAIN_IPV4 ; + }else if (eth->ether_type == +rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV6 )){
examples/ipsec-secgw/ipsec_worker.c +18
-0+ *nlp =RTE_PTR_ADD (eth,RTE_ETHER_HDR_LEN + + offsetof(struct ip6_hdr , ip6_nxt)); +if (**nlp ==IPPROTO_ESP ) +return PKT_TYPE_IPSEC_IPV6 ; +else +return PKT_TYPE_PLAIN_IPV6 ; + } + +/* Unknown/Unsupported type */ +return PKT_TYPE_INVALID ; +} + +static inline void +update_mac_addrs (struct rte_mbuf *pkt,uint16_t portid) { +struct rte_ether_hdr *ethhdr; + + ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src,
RTE_ETHER_ADDR_LEN);(quoted diff) +1
-0+ memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst,
RTE_ETHER_ADDR_LEN);
+}static inline void
ipsec_event_pre_forward(structrte_mbuf*m, unsigned intport_id) @@
-61,6 +101,290 @@ prepare_out_sessions_tbl(structsa_ctx*sa_out,examples/ipsec-secgw/ipsec_worker.c +30
-0} } +static inline int +check_sp (struct sp_ctx *sp,const uint8_t *nlp,uint32_t *sa_idx) { +uint32_t res; + +if (unlikely (sp ==NULL )) +return 0 ; + +rte_acl_classify ((struct rte_acl_ctx *)sp, &nlp, &res,1 , +DEFAULT_MAX_CATEGORIES ); + +if (unlikely (res ==0 )) { +/* No match */ +return 0 ; + } + +if (res ==DISCARD ) +return 0 ; +else if (res ==BYPASS ) { + *sa_idx =-1 ; +return 1 ; + } + + *sa_idx = res -1 ; +return 1 ; +} + +static inline uint16_t +route4_pkt (struct rte_mbuf *pkt,struct rt_ctx *rt_ctx) { +uint32_t dst_ip; +uint16_t offset;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+uint32_t hop; +int ret; + + offset =RTE_ETHER_HDR_LEN + offsetof(struct ip , ip_dst); + dst_ip = *rte_pktmbuf_mtod_offset(pkt, uint32_t *, offset); + dst_ip =rte_be_to_cpu_32 (dst_ip); + + ret = rte_lpm_lookup((struct rte_lpm *)rt_ctx, dst_ip,&hop);
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
examples/ipsec-secgw/ipsec_worker.c +12
-0+ +if (ret ==0 ) { +/* We have a hit */ +return hop; + } + +/* else */ +return RTE_MAX_ETHPORTS ; +} + +/* TODO: To be tested */ +static inline uint16_tQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+route6_pkt(struct rte_mbuf *pkt, struct rt_ctx *rt_ctx) { + uint8_t dst_ip[16]; +uint8_t *ip6_dst; +uint16_t offset; +uint32_t hop; +int ret; + + offset = RTE_ETHER_HDR_LEN + offsetof(struct ip6_hdr,
ip6_dst);Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c +4
-0+ ip6_dst = rte_pktmbuf_mtod_offset(pkt, uint8_t *, offset); +memcpy (&dst_ip[0 ], ip6_dst,16 ); + + ret = rte_lpm6_lookup((struct rte_lpm6 *)rt_ctx, dst_ip,&hop);
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+ +if (ret ==0 ) { +/* We have a hit */ +return hop; + } +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+/* else */ +return RTE_MAX_ETHPORTS ; +} + +static inline uint16_t +get_route(struct rte_mbuf *pkt, struct route_table *rt, enum +pkt_type type) { + if (type == PKT_TYPE_PLAIN_IPV4 || type ==
PKT_TYPE_IPSEC_IPV4)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ return route4_pkt(pkt, rt->rt4_ctx); + else if (type == PKT_TYPE_PLAIN_IPV6 || type ==
PKT_TYPE_IPSEC_IPV6)Quoted 20 lines
Quoted 20 lines
Quoted 7 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 188
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c +4
-0+return route6_pkt (pkt, rt->rt6_ctx); + +return RTE_MAX_ETHPORTS ; +}Is it not possible to use the existing functions for finding routes, checking
packet types and checking security policies.
Quoted 4 lines
It will be very difficult to manage two separate functions for same work. I can see that the
pkt->data_offsAre not required to be updated in the inline case, but can we split the existing functions in two so that they canbe Called in the appropriate cases.
Quoted 4 lines
As you have said in the cover note as well to add lookaside protocol support. I also tried adding it, and it will get very Difficult to manage separate
functions for separate code paths.
Quoted 1 line
Quoted 12 lines
Quoted 4 lines
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
Theprepare_one_packet()andprepare_tx_pkt()do much more than we need and for performance reasons we crafted new functions. ForQuoted 8 lines
example,
process_ipsec_get_pkt_typefunction returns nlp and whether packet type is plain or IPsec. That's all.Prepare_one_packet()process packets in chunks and does much more - it adjusts mbuf and packet length then it demultiplex packets into plain and IPsec flows and finally does inline checks. This is similar forupdate_mac_addrs()vsprepare_tx_pkt()andcheck_sp()vsinbound_sp_sa()thatprepare_tx_pkt()andinbound_sp_sa()do more that we need in eventmode.
Quoted 11 lines
Quoted 11 lines
I understand your concern from the perspective of code maintenance but on the other hand we are concerned with performance. The current code is not optimized to support multiple mode processing introduced with
rte_security. We can work on a common routines once we have other modes also added, so that we can come up with a better solution than what we have today.Quoted 3 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 3 lines
examples/ipsec-secgw/ipsec_worker.c +3
-0+ +static inline int +process_ipsec_ev_inbound(struct ipsec_ctx *ctx, struct route_table*rt,
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
examples/ipsec-secgw/ipsec_worker.c +14
-0+ struct rte_event *ev) +{ +struct ipsec_sa *sa =NULL ; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { + RTE_LOG(ERR, IPSEC, + "Inbound security offloadfailed\n");
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+ goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + }Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+break ; + +case PKT_TYPE_PLAIN_IPV6 : +if (pkt->ol_flags &PKT_RX_SEC_OFFLOAD ) { +if (unlikely (pkt->ol_flags & +PKT_RX_SEC_OFFLOAD_FAILED )) { + RTE_LOG(ERR, IPSEC, + "Inbound security offloadfailed\n");
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+ goto drop_pkt_and_exit; + } + sa = pkt->userdata; + } + +/* Check if we have a match */ Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; + +default : + RTE_LOG(ERR, IPSEC, "Unsupported packet type =%d\n", type);
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+ goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) + goto route_and_send_pkt;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected with SA */ + +/* If the packet was IPsec processed, then SA pointer should be set */
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+if (sa ==NULL ) + goto drop_pkt_and_exit; + +/* SPI on the packet should match with the one in SA */ +if (unlikely (sa->spi != ctx->sa_ctx->sa[sa_idx].spi)) + goto drop_pkt_and_exit; + +route_and_send_pkt: + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + +/* Update mac addresses */ +update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id); +return 1 ; + +drop_pkt_and_exit:Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+RTE_LOG (ERR ,IPSEC ,"Inbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} + +static inline int +process_ipsec_ev_outbound(struct ipsec_ctx *ctx, struct
route_table*rt,Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
examples/ipsec-secgw/ipsec_worker.c +30
-0+ struct rte_event *ev) +{ +struct rte_ipsec_session *sess; +struct sa_ctx *sa_ctx; +struct rte_mbuf *pkt; +uint16_t port_id =0 ; +struct ipsec_sa *sa; +enum pkt_type type; +uint32_t sa_idx; +uint8_t *nlp; + +/* Get pkt from event */ + pkt = ev->mbuf; + +/* Check the packet type */ + type =process_ipsec_get_pkt_type (pkt, &nlp); + +switch (type) { +case PKT_TYPE_PLAIN_IPV4 : +/* Check if we have a match */ +if (check_sp (ctx->sp4_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit; + } +break ; +case PKT_TYPE_PLAIN_IPV6 : +/* Check if we have a match */ +if (check_sp (ctx->sp6_ctx, nlp, &sa_idx) ==0 ) { +/* No valid match */ + goto drop_pkt_and_exit;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ } +break ; +default : +/* +* Only plain IPv4 & IPv6 packets are allowed +* on protected port. Drop the rest. +*/ + RTE_LOG(ERR, IPSEC, "Unsupported packet type =%d\n", type);
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
examples/ipsec-secgw/ipsec_worker.c +23
-0+ goto drop_pkt_and_exit; + } + +/* Check if the packet has to be bypassed */ +if (sa_idx ==BYPASS ) { + port_id =get_route (pkt, rt, type); +if (unlikely (port_id ==RTE_MAX_ETHPORTS )) { +/* no match */ + goto drop_pkt_and_exit; + } +/* else, we have a matching route */ + goto send_pkt; + } + +/* Validate sa_idx */ +if (sa_idx >= ctx->sa_ctx->nb_sa) + goto drop_pkt_and_exit; + +/* Else the packet has to be protected */ + +/* Get SA ctx*/ + sa_ctx = ctx->sa_ctx; +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+/* Get SA */ + sa = &(sa_ctx->sa[sa_idx]); + +/* Get IPsec session */ + sess =ipsec_get_primary_session (sa); + +/* Allow only inline protocol for now */ + if (sess->type !=
RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL) {Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out,
Quoted 5 lines
examples/ipsec-secgw/ipsec_worker.c +5
-0+RTE_LOG (ERR ,IPSEC ,"SA type not supported\n" ); + goto drop_pkt_and_exit; + } + + if (sess->security.ol_flags &
RTE_SECURITY_TX_OLOAD_NEED_MDATA)Quoted 46 lines
Quoted 46 lines
Quoted 10 lines
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+ pkt->userdata = sess->security.ses; + +/* Mark the packet for Tx security offload */ + pkt->ol_flags |=PKT_TX_SEC_OFFLOAD ; + +/* Get the port to which this pkt need to be submitted */ + port_id = sa->portid; + +send_pkt: +/* Update mac addresses */ Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c prepare_out_sessions_tbl(struct sa_ctx *sa_out, · line 279
Quoted 4 lines
examples/ipsec-secgw/ipsec_worker.c +4
-0+update_mac_addrs (pkt, port_id); + +/* Update the event with the dest port */ +ipsec_event_pre_forward (pkt, port_id);How is IP checksum getting updated for the processed packet. If the hardware is not updating it, should we add a fallback mechanism for SW based Checksum update.
[Lukasz] In case of outbound inline protocol checksum has to be calculated by HW as final packet is formed by crypto device. There is no need to calculate it in SW.
Quoted 22 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ return 1;It will be better to use some MACROS while returning Like
#definePKT_FORWARD1
#definePKT_DROPPED0
#definePKT_POSTED2 /*may be for lookaside cases */Quoted 15 lines
examples/ipsec-secgw/ipsec_worker.c +9
-1+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +/* * Event mode exposes various operating modes depending on the * capabilities of the event device and the operating mode @@ -68,7 +392,7 @@ prepare_out_sessions_tbl(struct sa_ctx *sa_out, */ Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
examples/ipsec-secgw/ipsec_worker.c
Quoted 7 lines
/* Workers registered */
examples/ipsec-secgw/ipsec_worker.c +1
-1-#define IPSEC_EVENTMODE_WORKERS 1 +#define IPSEC_EVENTMODE_WORKERS 2/* * Event mode worker @@ -146,7 +470,7 @@ipsec_wrkr_non_burst_int_port_drv_mode(struct
Quoted 59 lines
Quoted 58 lines
Quoted 9 lines
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c +1
-1eh_event_link_info *links, }/* Save security session */ - pkt->udata64 = (uint64_t ) sess_tbl[port_id]; + pkt->userdata = sess_tbl[port_id];/* Mark the packet for Tx security offload */
pkt->ol_flags|=PKT_TX_SEC_OFFLOAD; @@ -165,6+489,94 @@
Quoted 37 lines
Quoted 37 lines
ipsec_wrkr_non_burst_int_port_drv_mode(struct
eh_event_link_info*links,examples/ipsec-secgw/ipsec_worker.c +32
-0} } +/* +* Event mode worker +* Operating parameters : non-burst - Tx internal port - app +mode */ static void +ipsec_wrkr_non_burst_int_port_app_mode (struct +eh_event_link_info *links, +uint8_t nb_links) +{ +struct lcore_conf_ev_tx_int_port_wrkr lconf; +unsigned int nb_rx =0 ; +struct rte_event ev; +uint32_t lcore_id; +int32_t socket_id; +int ret; + +/* Check if we have links registered for this lcore */ +if (nb_links ==0 ) { +/* No links registered - exit */ +return ; + } + +/* We have valid links */ + +/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Get socket ID */ + socket_id =rte_lcore_to_socket_id (lcore_id); + +/* Save routing table */ + lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6;Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
Quoted 5 lines
examples/ipsec-secgw/ipsec_worker.c +5
-0+ lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = +socket_ctx[socket_id].session_pool;
Session_priv_poolshould also be added for both inbound and outbound[Lukasz] I will add it in V5.
Quoted 8 lines
Quoted 2 lines
[Anoob] Actually, why do need both
session_poolandprivate_pool? I think it's a remnant from the time we had session being created when thefirst packet arrives.
Quoted 2 lines
@Konstantin, thoughts?
I think we do need it for lksd sessions.
Seecreate_lookaside_session()inipsec.c
[Anoob] You are right. It seems for lookaside, we still create session only when first packet arrives. The fix was done only for inline.
Said that, do you think we should fix the same for lookaside as well? Often, session creation is treated as a control path entity, and ipsec-secgw doesn't support changing sessions on the fly as well. But in ipsec-secgw, we create sessions in the data path. Also, once we do this, both inline & lookaside will have similar kind of treatment as well.
Do you think there is any value in retaining the current behavior? If not I can take this up following the merge.
Quoted 138 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
Quoted 11 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ lconf.outbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_out; + lconf.outbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_out; + lconf.outbound.sa_ctx = socket_ctx[socket_id].sa_out; + lconf.outbound.session_pool = +socket_ctx[socket_id].session_pool; + + RTE_LOG(INFO, IPSEC, + "Launching event mode worker (non-burst - Txinternal port - "
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +6
-0+ "app mode) on lcore %d\n", lcore_id); + +/* Check if it's single link */ +if (nb_links !=1 ) { + RTE_LOG(INFO, IPSEC, + "Multiple links not supported. Using firstlink\n");
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
examples/ipsec-secgw/ipsec_worker.c
Quoted 3 lines
examples/ipsec-secgw/ipsec_worker.c +3
-0+ } + + RTE_LOG(INFO, IPSEC, " -- lcoreid=%u event_port_id=%u\n",
lcore_id,Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
Quoted 5 lines
examples/ipsec-secgw/ipsec_worker.c +5
-0+ links[0].event_port_id); + +while (!force_quit) { +/* Read packet from event queues */ + nb_rx =rte_event_dequeue_burst(links[0].eventdev_id,
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 556
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ + 0 /* timeout_ticks */); + +if (nb_rx ==0 ) +continue ; +Event type should be checked here before dereferencing it.
Quoted 4 lines
Quoted 4 lines
[Lukasz] I will add event type check in V5.
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (is_unprotected_port(ev.mbuf->port)) + ret =process_ipsec_ev_inbound(&lconf.inbound,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ &lconf.rt,&ev);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ else + ret =process_ipsec_ev_outbound(&lconf.outbound,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ &lconf.rt,&ev);
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links, · line 579
Quoted 10 lines
examples/ipsec-secgw/ipsec_worker.c +10
-0+if (ret !=1 ) +/* The pkt has been dropped */ +continue ; + +/* +* Since tx internal port is available, events can be +* directly enqueued to the adapter and it would be +* internally submitted to the eth device. +*/ +rte_event_eth_tx_adapter_enqueue(links[0].eventdev_id,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c +7
-0+ links[0 ].event_port_id, + &ev,/* events */ +1 ,/* nb_events */ + 0 /* flags */); + } +} + static uint8_t ipsec_eventmode_populate_wrkr_params(struct
eh_app_worker_paramsQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review
Quoted 3 lines
*wrkrs)
{(quoted diff) +0
-0@@ -180,6 +592,14 @@ipsec_eventmode_populate_wrkr_params(struct
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_eventmode_populate_wrkr_params(struct eh_app_worker_params *wrkrs)
Quoted 11 lines
examples/ipsec-secgw/ipsec_worker.c +7
-0eh_app_worker_params *wrkrs) wrkr->cap.ipsec_mode = EH_IPSEC_MODE_TYPE_DRIVER; wrkr->worker_thread = ipsec_wrkr_non_burst_int_port_drv_mode; wrkr++; + nb_wrkr_param++; + +/* Non-burst - Tx internal port - app mode */ + wrkr->cap.burst =EH_RX_TYPE_NON_BURST ; + wrkr->cap.tx_internal_port =EH_TX_TYPE_INTERNAL_PORT ; + wrkr->cap.ipsec_mode =EH_IPSEC_MODE_TYPE_APP ; + wrkr->worker_thread =
ipsec_wrkr_non_burst_int_port_app_mode;Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
examples/ipsec-secgw/ipsec_worker.c +1
-0+ nb_wrkr_param++;return nb_wrkr_param;}
(quoted diff) +0
-0b/examples/ipsec-
secgw/ipsec_worker.hnew file mode 100644index
Quoted 41 lines
Quoted 41 lines
Quoted 41 lines
Quoted 40 lines
0000000..87b4f22
examples/ipsec-secgw/ipsec_worker.h new file +34
-1@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C) 2020 Marvell International Ltd. +*/ +#ifndef _IPSEC_WORKER_H_ +#define _IPSEC_WORKER_H_ + +#include "ipsec.h" + +enum pkt_type { +PKT_TYPE_PLAIN_IPV4 =1 , +PKT_TYPE_IPSEC_IPV4 , +PKT_TYPE_PLAIN_IPV6 , +PKT_TYPE_IPSEC_IPV6 , +PKT_TYPE_INVALID +}; + +struct route_table { +struct rt_ctx *rt4_ctx; +struct rt_ctx *rt6_ctx; +}; + +/* +* Conf required by event mode worker with tx internal port */ +struct lcore_conf_ev_tx_int_port_wrkr { +struct ipsec_ctx inbound; +struct ipsec_ctx outbound; +struct route_table rt; +} __rte_cache_aligned; + +void ipsec_poll_mode_worker (void ); + +int ipsec_launch_one_lcore (void *args); + +#endif /* _IPSEC_WORKER_H_ */ --2.7.4
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Hi Anoob,
Quoted 33 lines
Quoted 21 lines
Quoted 21 lines
Quoted 20 lines
Quoted 9 lines
Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c +9
-0+/* Get core ID */ + lcore_id =rte_lcore_id (); + +/* Get socket ID */ + socket_id =rte_lcore_to_socket_id (lcore_id); + +/* Save routing table */ + lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6;Quoted 9 lines
examples/ipsec-secgw/ipsec_worker.c ipsec_wrkr_non_burst_int_port_drv_mode(struct eh_event_link_info *links,
Quoted 5 lines
examples/ipsec-secgw/ipsec_worker.c +5
-0+ lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = +socket_ctx[socket_id].session_pool;
Session_priv_poolshould also be added for both inbound and outbound[Lukasz] I will add it in V5.
Quoted 8 lines
Quoted 2 lines
[Anoob] Actually, why do need both
session_poolandprivate_pool? I think it's a remnant from the time we had session being created when thefirst packet arrives.
Quoted 2 lines
@Konstantin, thoughts?
I think we do need it for lksd sessions.
Seecreate_lookaside_session()inipsec.c[Anoob] You are right. It seems for lookaside, we still create session only when first packet arrives. The fix was done only for inline.
Quoted 9 lines
Said that, do you think we should fix the same for lookaside as well? Often, session creation is treated as a control path entity, and ipsec-secgw doesn't support changing sessions on the fly as well. But in ipsec-secgw, we create sessions in the data path. Also, once we do this, both inline & lookaside will have similar kind of treatment as well.
Do you think there is any value in retaining the current behavior? If not I can take this up following the merge.
Yes we need that for lookaside cases.
And yes session creation was added in control path for inline cases only. We can move that Part for lookaside cases as well.
Earlier the patch was submitted for both but had issues in lookaside cases, so Intel just fixed the Inline cases as that was necessary for the inline cases(first packet was getting dropped).
Regards,
Akhil
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Quoted 44 lines
Quoted 34 lines
Quoted 22 lines
Quoted 22 lines
Quoted 21 lines
Quoted 10 lines
Quoted 10 lines
(quoted diff) +9
-0+ /* Get core ID */ + lcore_id = rte_lcore_id(); + + /* Get socket ID */ + socket_id = rte_lcore_to_socket_id(lcore_id); + + /* Save routing table */ + lconf.rt.rt4_ctx = socket_ctx[socket_id].rt_ip4; + lconf.rt.rt6_ctx = socket_ctx[socket_id].rt_ip6;Quoted 9 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ lconf.inbound.sp4_ctx = socket_ctx[socket_id].sp_ip4_in; + lconf.inbound.sp6_ctx = socket_ctx[socket_id].sp_ip6_in; + lconf.inbound.sa_ctx = socket_ctx[socket_id].sa_in; + lconf.inbound.session_pool = +socket_ctx[socket_id].session_pool;
Session_priv_poolshould also be added for both inbound and outbound[Lukasz] I will add it in V5.
Quoted 8 lines
Quoted 2 lines
[Anoob] Actually, why do need both
session_poolandprivate_pool? I think it's a remnant from the time we had session being created when thefirst packet arrives.
Quoted 2 lines
@Konstantin, thoughts?
I think we do need it for lksd sessions.
Seecreate_lookaside_session()inipsec.c[Anoob] You are right. It seems for lookaside, we still create session only when first packet arrives. The fix was done only for inline.
Quoted 9 lines
Said that, do you think we should fix the same for lookaside as well? Often, session creation is treated as a control path entity, and ipsec-secgw doesn't support changing sessions on the fly as well. But in ipsec-secgw, we create sessions in the data path. Also, once we do this, both inline & lookaside will have similar kind of treatment as well.
Do you think there is any value in retaining the current behavior? If not I can take this up following the merge.
Quoted 8 lines
Yes we need that for lookaside cases.
And yes session creation was added in control path for inline cases only. We can move that Part for lookaside cases as well.
Earlier the patch was submitted for both but had issues in lookaside cases, so Intel just fixed the Inline cases as that was necessary for the inline cases(first packet was getting dropped).
Yep, as Akhil pointed out it was some problems with lksd-proto cases as I remember. I wouldn't object if we'll change the code to create all sessions at startup. Though, I think we probably would still need a pool for private sessions. Konstantin
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
In reply to Lukas BartosikHi Lukasz,
Quoted 28 lines
Quoted 2 lines
Is it not possible to use the existing functions for finding routes, checking
packet types and checking security policies.
Quoted 1 line
It will be very difficult to manage two separate functions for same work. I can
see that the
pkt->data_offsQuoted 1 line
Are not required to be updated in the inline case, but can we split the existing
functions in two so that they can be
Quoted 3 lines
Called in the appropriate cases.
As you have said in the cover note as well to add lookaside protocol support. I
also tried adding it, and it will get very
Quoted 2 lines
Difficult to manage separate functions for separate code paths.
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
Theprepare_one_packet()andprepare_tx_pkt()do much more than we need and for performance reasons
we crafted new functions. For example,process_ipsec_get_pkt_typefunction returns nlp and whether
packet type is plain or IPsec. That's all.Prepare_one_packet()process packets in chunks and does much more -
it adjusts mbuf and packet length then it demultiplex packets into plain and IPsec flows and finally does
inline checks. This is similar forupdate_mac_addrs()vsprepare_tx_pkt()andcheck_sp()vsinbound_sp_sa()
thatprepare_tx_pkt()andinbound_sp_sa()do more that we need in event mode.
Quoted 7 lines
I understand your concern from the perspective of code maintenance but on the other hand we are concerned with performance.
The current code is not optimized to support multiple mode processing introduced withrte_security. We can work on a common
routines once we have other modes also added, so that we can come up with a better solution than what we have today.
Yes that is correct, but we should split the existing functions so that the part which is common In both mode should stay common and we do not have duplicate code in the app.
I believe we should take care of this when we add lookaside cases. We shall remove all duplicate Code. Ideally it should be part of this patchset. But we can postpone it to the lookaside case addition.
Quoted 9 lines
Quoted 9 lines
Review
Quoted 2 lines
(quoted diff) +1
-0+ return 1;It will be better to use some MACROS while returning Like
#definePKT_FORWARD1
#definePKT_DROPPED0
#definePKT_POSTED2 /*may be for lookaside cases */
I think you missed this comment.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
Hi Akhil,
Please see my answer below.
Thanks,
Lukasz
Quoted 55 lines · Akhil Goyal
Hi Lukasz,
Quoted 28 lines
Quoted 2 lines
Is it not possible to use the existing functions for finding routes, checking
packet types and checking security policies.
Quoted 1 line
It will be very difficult to manage two separate functions for same work. I can
see that the
pkt->data_offsQuoted 1 line
Are not required to be updated in the inline case, but can we split the existing
functions in two so that they can be
Quoted 3 lines
Called in the appropriate cases.
As you have said in the cover note as well to add lookaside protocol support. I
also tried adding it, and it will get very
Quoted 2 lines
Difficult to manage separate functions for separate code paths.
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
Theprepare_one_packet()andprepare_tx_pkt()do much more than we need and for performance reasons
we crafted new functions. For example,process_ipsec_get_pkt_typefunction returns nlp and whether
packet type is plain or IPsec. That's all.Prepare_one_packet()process packets in chunks and does much more -
it adjusts mbuf and packet length then it demultiplex packets into plain and IPsec flows and finally does
inline checks. This is similar forupdate_mac_addrs()vsprepare_tx_pkt()andcheck_sp()vsinbound_sp_sa()
thatprepare_tx_pkt()andinbound_sp_sa()do more that we need in event mode.Quoted 7 lines
I understand your concern from the perspective of code maintenance but on the other hand we are concerned with performance.
The current code is not optimized to support multiple mode processing introduced withrte_security. We can work on a common
routines once we have other modes also added, so that we can come up with a better solution than what we have today.Yes that is correct, but we should split the existing functions so that the part which is common In both mode should stay common and we do not have duplicate code in the app.
I believe we should take care of this when we add lookaside cases. We shall remove all duplicate Code. Ideally it should be part of this patchset. But we can postpone it to the lookaside case addition.
Quoted 9 lines
Quoted 9 lines
Review
Quoted 2 lines
(quoted diff) +1
-0+ return 1;It will be better to use some MACROS while returning Like
#definePKT_FORWARD1
#definePKT_DROPPED0
#definePKT_POSTED2 /*may be for lookaside cases */
Quoted 2 lines
I think you missed this comment.
[Lukasz] Thank you for pointing out that I missed the comment. I will use macros when returning instead of magic numbers.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
examples/ipsec-secgw/ipsec_worker.c +8
-0+ +drop_pkt_and_exit: +RTE_LOG (ERR ,IPSEC ,"Outbound packet dropped\n" ); +rte_pktmbuf_free (pkt); + ev->mbuf =NULL ; +return 0 ; +} +
Re: [dpdk-dev] [EXT] RE: [PATCH v4 12/15] examples/ipsec-secgw: add app mode worker
In reply to Akhil GoyalQuoted 46 lines
Hi Lukasz,
Quoted 4 lines
Quoted 2 lines
Is it not possible to use the existing functions for finding routes, checking
packet types and checking security policies.
Quoted 1 line
It will be very difficult to manage two separate functions for same work. I
can
Quoted 6 lines
see that the
pkt->data_offsQuoted 1 line
Are not required to be updated in the inline case, but can we split the existing
functions in two so that they can be
Quoted 3 lines
Called in the appropriate cases.
As you have said in the cover note as well to add lookaside protocol support.
I
Quoted 11 lines
also tried adding it, and it will get very
Quoted 2 lines
Difficult to manage separate functions for separate code paths.
[Lukasz] This was also Konstantin's comment during review of one of previous revisions.
Theprepare_one_packet()andprepare_tx_pkt()do much more than we need and for performance reasons
we crafted new functions. For example,process_ipsec_get_pkt_typefunction returns nlp and whether
packet type is plain or IPsec. That's all.Prepare_one_packet()process packetsin
Quoted 2 lines
chunks and does much more -
it adjusts mbuf and packet length then it demultiplex packets into plain andIPsec
Quoted 4 lines
flows and finally does
inline checks. This is similar forupdate_mac_addrs()vsprepare_tx_pkt()andcheck_sp()vsinbound_sp_sa()
thatprepare_tx_pkt()andinbound_sp_sa()do more that we need in eventmode.
Quoted 2 lines
I understand your concern from the perspective of code maintenance but on
the
Quoted 4 lines
other hand we are concerned with performance.
The current code is not optimized to support multiple mode processing introduced withrte_security. We can work on a common routines once we have other modes also added, so that we can come up witha
Quoted 2 lines
better solution than what we have today.
Quoted 10 lines
Yes that is correct, but we should split the existing functions so that the part which is common
In both mode should stay common and we do not have duplicate code in the app.I believe we should take care of this when we add lookaside cases. We shall remove all duplicate
Code. Ideally it should be part of this patchset. But we can postpone it to the lookaside case addition.
I believe the route(4/6)_pkts and route(4/6)_pkt can be made uniform quite easily. Now you can call either send_single_pkt() or rte_event_eth_tx_adapter_enqueue() from the caller of route4_pkts.
I don’t think this will impact the performance at all.
Instead of having 3 for loops, now there will be only 2 and nothing else is getting changed for anybody. In fact we can reduce 1 more, if we can call send pkts from inside the route4_pkts. I think that can also be done, but it may increase the lookup duration as there may be cache miss. But that need to be experimented. What say??
static inline void
route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint32_t *hop[],
uint8_t nb_pkts)
{
uint32_t dst_ip;
uint16_t i, offset;
if (nb_pkts == 0)
return;
/* Need to do an LPM lookup for non-inline packets. Inline packets will
* have port ID in the SA
*/
for (i = 0; i < nb_pkts; i++) {
if (!(pkts[i]->ol_flags & PKT_TX_SEC_OFFLOAD)) {
/* Security offload not enabled. So an LPM lookup is
* required to get the hop
*/
offset = offsetof(struct ip, ip_dst);
dst_ip = *rte_pktmbuf_mtod_offset(pkts[i],
uint32_t *, offset);
dst_ip = rte_be_to_cpu_32(dst_ip);
if (rte_lpm_lookup((struct rte_lpm *)rt_ctx, dst_ip, hop[i]))
rte_pktmbuf_free(pkts[i]);
} else {
*hop[i] = get_hop_for_offload_pkt(pkts[i], 0);
}
}
}