app/test: add event inline security tests
Subsystems (2)
PATCH v2 1/1 app/test: add event inline security tests
Enable ability to run inline security tests using event API(rte_event_eth_tx_adapter_enqueue/rte_event_dequeue_burst). New test command - event_inline_ipsec_autotest will run same list of test cases as inline_ipsec_autotest, but packets will go through eventdev.
---
v2:
* Fixed compilation with mingw.
--- app/test/test_security_inline_proto.c | 392 +++++++++++++++++++++++++- 1 file changed, 377 insertions(+), 15 deletions(-)
app/test/test_security_inline_proto.c +377 -15
@@ -21,8 +21,19 @@ test_inline_ipsec(void) return TEST_SKIPPED; } +static int +test_event_inline_ipsec (void ) +{ +printf ("Event inline ipsec not supported on Windows, skipping test\n" ); +return TEST_SKIPPED ; +} +#else +#include <rte_eventdev.h> +#include <rte_event_eth_rx_adapter.h> +#include <rte_event_eth_tx_adapter.h> +#define NB_ETHPORTS_USED 1#define MEMPOOL_CACHE_SIZE 32#define MAX_PKT_BURST 32
@@ -93,7 +104,12 @@ static struct rte_eth_txconf tx_conf = { .tx_rs_thresh = 32, /* Use PMD default values */ }; -uint16_t port_id; +static uint16_t port_id; +static uint8_t eventdev_id; +static uint8_t rx_adapter_id; +static uint8_t tx_adapter_id; + +static bool event_mode_enabled;static uint64_t link_mbps;
@@ -885,6 +901,51 @@ test_ipsec_with_reassembly(struct reassembly_vector *vector,return ret; } +static int +event_tx_burst (struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +struct rte_event ev = {0 }; +int i, nb_sent =0 ; + +/* Convert packets to events */ + ev.sched_type =RTE_SCHED_TYPE_PARALLEL ; +for (i =0 ; i < nb_pkts; i++) { + ev.mbuf = tx_pkts[i]; + nb_sent +=rte_event_eth_tx_adapter_enqueue ( + eventdev_id, port_id, &ev,1 ,0 ); + } + +return nb_sent; +} + +static int +event_rx_burst (struct rte_mbuf **rx_pkts,uint16_t nb_pkts_to_rx) +{ +int nb_ev, nb_rx =0 , j =0 ; +const int ms_per_pkt =3 ; +struct rte_event ev; + +do { + nb_ev =rte_event_dequeue_burst (eventdev_id, port_id, + &ev,1 ,0 ); + +if (nb_ev ==0 ) { +rte_delay_ms (1 ); +continue ; + } + +/* Get packet from event */ +if (ev.event_type !=RTE_EVENT_TYPE_ETHDEV ) { +printf ("Unsupported event type: %i\n" , + ev.event_type); +continue ; + } + rx_pkts[nb_rx++] = ev.mbuf; + }while (j++ < (nb_pkts_to_rx * ms_per_pkt) && nb_rx < nb_pkts_to_rx); + +return nb_rx; +} + static int test_ipsec_inline_proto_process(struct ipsec_test_data *td, struct ipsec_test_data *res_d,
@@ -958,9 +1019,13 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td, } }/* Send packet to ethdev for inline IPsec processing. */ - nb_sent =rte_eth_tx_burst (port_id,0 , tx_pkts_burst, nb_pkts); +if (event_mode_enabled) + nb_sent =event_tx_burst (tx_pkts_burst, nb_pkts); +else + nb_sent =rte_eth_tx_burst (port_id,0 , tx_pkts_burst, nb_pkts); +if (nb_sent != nb_pkts) { -printf ("\nUnable to TX %d packets" , nb_pkts); +printf ("\nUnable to TX %d packets, sent: %i" , nb_pkts, nb_sent);for ( ; nb_sent < nb_pkts; nb_sent++)rte_pktmbuf_free (tx_pkts_burst[nb_sent]); ret =TEST_FAILED ;
@@ -970,17 +1035,22 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td,rte_pause ();/* Receive back packet on loopback interface. */ -do { -rte_delay_ms (1 ); - nb_rx +=rte_eth_rx_burst (port_id,0 , &rx_pkts_burst[nb_rx], - nb_sent - nb_rx); -if (nb_rx >= nb_sent) -break ; - }while (j++ <5 || nb_rx ==0 ); +if (event_mode_enabled) + nb_rx =event_rx_burst (rx_pkts_burst, nb_sent); +else +do { +rte_delay_ms (1 ); + nb_rx +=rte_eth_rx_burst (port_id,0 , + &rx_pkts_burst[nb_rx], + nb_sent - nb_rx); +if (nb_rx >= nb_sent) +break ; + }while (j++ <5 || nb_rx ==0 );if (nb_rx != nb_sent) { -printf ("\nUnable to RX all %d packets" , nb_sent); -while (--nb_rx) +printf ("\nUnable to RX all %d packets, received(%i)" , + nb_sent, nb_rx); +while (--nb_rx >=0 )rte_pktmbuf_free (rx_pkts_burst[nb_rx]); ret =TEST_FAILED ; goto out;
@@ -1380,6 +1450,289 @@ inline_ipsec_testsuite_teardown(void)printf ("rte_eth_dev_reset: err=%s, port=%u\n" ,rte_strerror (-ret), port_id); } +rte_free (tx_pkts_burst); +rte_free (rx_pkts_burst); +} + +static int +event_inline_ipsec_testsuite_setup (void ) +{ +struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0 }; +struct rte_event_dev_info evdev_default_conf = {0 }; +struct rte_event_dev_config eventdev_conf = {0 }; +struct rte_event_queue_conf eventq_conf = {0 }; +struct rte_event_port_conf ev_port_conf = {0 }; +const uint16_t nb_txd =1024 , nb_rxd =1024 ; +uint16_t nb_rx_queue =1 , nb_tx_queue =1 ; +uint8_t ev_queue_id =0 , tx_queue_id =0 ; +int nb_eventqueue =1 , nb_eventport =1 ; +const int all_queues =-1 ; +uint32_t caps =0 ; +uint16_t nb_ports; +int ret; + +printf ("Start event inline IPsec test.\n" ); + + nb_ports =rte_eth_dev_count_avail (); +if (nb_ports ==0 ) { +printf ("Test require: 1 port, available: 0\n" ); +return TEST_SKIPPED ; + } + +init_mempools (NB_MBUF ); + +if (tx_pkts_burst ==NULL ) { + tx_pkts_burst = (struct rte_mbuf **)rte_calloc ("tx_buff" , +MAX_TRAFFIC_BURST , +sizeof (void *), +RTE_CACHE_LINE_SIZE ); +if (!tx_pkts_burst) +return -1 ; + + rx_pkts_burst = (struct rte_mbuf **)rte_calloc ("rx_buff" , +MAX_TRAFFIC_BURST , +sizeof (void *), +RTE_CACHE_LINE_SIZE ); +if (!rx_pkts_burst) +return -1 ; + + } + +printf ("Generate %d packets\n" ,MAX_TRAFFIC_BURST ); + +/* configuring port 0 for the test is enough */ + port_id =0 ; +/* port configure */ + ret =rte_eth_dev_configure (port_id, nb_rx_queue, + nb_tx_queue, &port_conf); +if (ret <0 ) { +printf ("Cannot configure device: err=%d, port=%d\n" , + ret, port_id); +return ret; + } + +/* Tx queue setup */ + ret =rte_eth_tx_queue_setup (port_id,0 , nb_txd, +SOCKET_ID_ANY , &tx_conf); +if (ret <0 ) { +printf ("rte_eth_tx_queue_setup: err=%d, port=%d\n" , + ret, port_id); +return ret; + } + +/* rx queue steup */ + ret =rte_eth_rx_queue_setup (port_id,0 , nb_rxd,SOCKET_ID_ANY , + &rx_conf, mbufpool); +if (ret <0 ) { +printf ("rte_eth_rx_queue_setup: err=%d, port=%d\n" , + ret, port_id); +return ret; + } + +/* Setup eventdev */ + eventdev_id =0 ; + rx_adapter_id =0 ; + tx_adapter_id =0 ; + +/* Get default conf of eventdev */ + ret =rte_event_dev_info_get (eventdev_id, &evdev_default_conf); +if (ret <0 ) { +printf ("Error in getting event device info[devID:%d]\n" , + eventdev_id); +return ret; + } + +/* Get Tx adapter capabilities */ + ret =rte_event_eth_tx_adapter_caps_get (eventdev_id, tx_adapter_id, &caps); +if (ret <0 ) { +printf ("Failed to get event device %d eth tx adapter" +" capabilities for port %d\n" , + eventdev_id, port_id); +return ret; + } +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + tx_queue_id = nb_eventqueue++; + + eventdev_conf.nb_events_limit = + evdev_default_conf.max_num_events; + eventdev_conf.nb_event_queue_flows = + evdev_default_conf.max_event_queue_flows; + eventdev_conf.nb_event_port_dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + eventdev_conf.nb_event_port_enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + + eventdev_conf.nb_event_queues = nb_eventqueue; + eventdev_conf.nb_event_ports = nb_eventport; + +/* Configure event device */ + + ret =rte_event_dev_configure (eventdev_id, &eventdev_conf); +if (ret <0 ) { +printf ("Error in configuring event device\n" ); +return ret; + } + +/* Configure event queue */ + eventq_conf.schedule_type =RTE_SCHED_TYPE_PARALLEL ; + eventq_conf.nb_atomic_flows =1024 ; + eventq_conf.nb_atomic_order_sequences =1024 ; + +/* Setup the queue */ + ret =rte_event_queue_setup (eventdev_id, ev_queue_id, &eventq_conf); +if (ret <0 ) { +printf ("Failed to setup event queue %d\n" , ret); +return ret; + } + +/* Configure event port */ + ret =rte_event_port_setup (eventdev_id, port_id,NULL ); +if (ret <0 ) { +printf ("Failed to setup event port %d\n" , ret); +return ret; + } + +/* Make event queue - event port link */ + ret =rte_event_port_link (eventdev_id, port_id,NULL ,NULL ,1 ); +if (ret <0 ) { +printf ("Failed to link event port %d\n" , ret); +return ret; + } + +/* Setup port conf */ + ev_port_conf.new_event_threshold =1200 ; + ev_port_conf.dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + ev_port_conf.enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + +/* Create Rx adapter */ + ret =rte_event_eth_rx_adapter_create (rx_adapter_id, eventdev_id, + &ev_port_conf); +if (ret <0 ) { +printf ("Failed to create rx adapter %d\n" , ret); +return ret; + } + +/* Setup queue conf */ + queue_conf.ev.queue_id = ev_queue_id; + queue_conf.ev.sched_type =RTE_SCHED_TYPE_PARALLEL ; + queue_conf.ev.event_type =RTE_EVENT_TYPE_ETHDEV ; + +/* Add queue to the adapter */ + ret =rte_event_eth_rx_adapter_queue_add (rx_adapter_id, port_id, + all_queues, &queue_conf); +if (ret <0 ) { +printf ("Failed to add eth queue to rx adapter %d\n" , ret); +return ret; + } + +/* Start rx adapter */ + ret =rte_event_eth_rx_adapter_start (rx_adapter_id); +if (ret <0 ) { +printf ("Failed to start rx adapter %d\n" , ret); +return ret; + } + +/* Create tx adapter */ + ret =rte_event_eth_tx_adapter_create (tx_adapter_id, eventdev_id, + &ev_port_conf); +if (ret <0 ) { +printf ("Failed to create tx adapter %d\n" , ret); +return ret; + } + +/* Add queue to the adapter */ + ret =rte_event_eth_tx_adapter_queue_add (tx_adapter_id, port_id, + all_queues); +if (ret <0 ) { +printf ("Failed to add eth queue to tx adapter %d\n" , ret); +return ret; + } +/* Setup Tx queue & port */ +if (tx_queue_id) { +/* Setup the queue */ + ret =rte_event_queue_setup (eventdev_id, tx_queue_id, + &eventq_conf); +if (ret <0 ) { +printf ("Failed to setup tx event queue %d\n" , ret); +return ret; + } +/* Link Tx event queue to Tx port */ + ret =rte_event_port_link (eventdev_id, port_id, + &tx_queue_id,NULL ,1 ); +if (ret !=1 ) { +printf ("Failed to link event queue to port\n" ); +return ret; + } + } + +/* Start tx adapter */ + ret =rte_event_eth_tx_adapter_start (tx_adapter_id); +if (ret <0 ) { +printf ("Failed to start tx adapter %d\n" , ret); +return ret; + } + +/* Start eventdev */ + ret =rte_event_dev_start (eventdev_id); +if (ret <0 ) { +printf ("Failed to start event device %d\n" , ret); +return ret; + } + + event_mode_enabled = true; +test_ipsec_alg_list_populate (); + +return 0 ; +} + +static void +event_inline_ipsec_testsuite_teardown (void ) +{ +uint16_t portid; +int ret; + + event_mode_enabled = false; + +/* Stop and release rx adapter */ + ret =rte_event_eth_rx_adapter_stop (rx_adapter_id); +if (ret <0 ) +printf ("Failed to stop rx adapter %d\n" , ret); + ret =rte_event_eth_rx_adapter_queue_del (rx_adapter_id, port_id,-1 ); +if (ret <0 ) +printf ("Failed to remove rx adapter queues %d\n" , ret); + ret =rte_event_eth_rx_adapter_free (rx_adapter_id); +if (ret <0 ) +printf ("Failed to free rx adapter %d\n" , ret); + +/* Stop and release tx adapter */ + ret =rte_event_eth_tx_adapter_stop (tx_adapter_id); +if (ret <0 ) +printf ("Failed to stop tx adapter %d\n" , ret); + ret =rte_event_eth_tx_adapter_queue_del (tx_adapter_id, port_id,-1 ); +if (ret <0 ) +printf ("Failed to remove tx adapter queues %d\n" , ret); + ret =rte_event_eth_tx_adapter_free (tx_adapter_id); +if (ret <0 ) +printf ("Failed to free tx adapter %d\n" , ret); + +/* Stop and release event devices */ +rte_event_dev_stop (eventdev_id); + ret =rte_event_dev_close (eventdev_id); +if (ret <0 ) +printf ("Failed to close event dev %d, %d\n" , eventdev_id, ret); + +/* port tear down */ +RTE_ETH_FOREACH_DEV (portid) { + ret =rte_eth_dev_reset (portid); +if (ret !=0 ) +printf ("rte_eth_dev_reset: err=%s, port=%u\n" , +rte_strerror (-ret), port_id); + } + +rte_free (tx_pkts_burst); +rte_free (rx_pkts_burst); } static int
@@ -1920,7 +2273,7 @@ test_ipsec_inline_pkt_replay(const void *test_data, const uint64_t esn[], flags.antireplay = true;for (i =0 ; i < nb_pkts; i++) { -memcpy (&td_outb[i], test_data,sizeof (td_outb)); +memcpy (&td_outb[i], test_data,sizeof (td_outb[0 ])); td_outb[i].ipsec_xform.options.iv_gen_disable =1 ; td_outb[i].ipsec_xform.replay_win_sz = winsz; td_outb[i].ipsec_xform.options.esn = esn_en;
@@ -2054,8 +2407,6 @@ test_ipsec_inline_proto_pkt_esn_antireplay4096(const void *test_data)static struct unit_test_suite inline_ipsec_testsuite = { .suite_name ="Inline IPsec Ethernet Device Unit Test Suite" , - .setup = inline_ipsec_testsuite_setup, - .teardown = inline_ipsec_testsuite_teardown, .unit_test_cases = { TEST_CASE_NAMED_WITH_DATA( "Outbound known vector (ESP tunnel mode IPv4 AES-GCM 128)",
@@ -2374,9 +2725,20 @@ static struct unit_test_suite inline_ipsec_testsuite = {static int test_inline_ipsec (void ) { + inline_ipsec_testsuite.setup = inline_ipsec_testsuite_setup; + inline_ipsec_testsuite.teardown = inline_ipsec_testsuite_teardown; +return unit_test_suite_runner (&inline_ipsec_testsuite); +} + +static int +test_event_inline_ipsec (void ) +{ + inline_ipsec_testsuite.setup = event_inline_ipsec_testsuite_setup; + inline_ipsec_testsuite.teardown = event_inline_ipsec_testsuite_teardown;return unit_test_suite_runner (&inline_ipsec_testsuite); }#endif /* !RTE_EXEC_ENV_WINDOWS */ REGISTER_TEST_COMMAND (inline_ipsec_autotest, test_inline_ipsec); +REGISTER_TEST_COMMAND (event_inline_ipsec_autotest, test_event_inline_ipsec);
Signature · 1 line
2.25.1
PATCH v3 1/1 app/test: add event inline security tests
Enable ability to run inline security tests using event API(rte_event_eth_tx_adapter_enqueue/rte_event_dequeue_burst). New test command - event_inline_ipsec_autotest will run same list of test cases as inline_ipsec_autotest, but packets will go through eventdev.
---
v2:
* Fixed compilation with mingw.
v3:
* Fixed struct zero initialization for gcc 4.*
--- app/test/test_security_inline_proto.c | 393 +++++++++++++++++++++++++- 1 file changed, 378 insertions(+), 15 deletions(-)
app/test/test_security_inline_proto.c +378 -15
@@ -21,8 +21,19 @@ test_inline_ipsec(void) return TEST_SKIPPED; } +static int +test_event_inline_ipsec (void ) +{ +printf ("Event inline ipsec not supported on Windows, skipping test\n" ); +return TEST_SKIPPED ; +} +#else +#include <rte_eventdev.h> +#include <rte_event_eth_rx_adapter.h> +#include <rte_event_eth_tx_adapter.h> +#define NB_ETHPORTS_USED 1#define MEMPOOL_CACHE_SIZE 32#define MAX_PKT_BURST 32
@@ -93,7 +104,12 @@ static struct rte_eth_txconf tx_conf = { .tx_rs_thresh = 32, /* Use PMD default values */ }; -uint16_t port_id; +static uint16_t port_id; +static uint8_t eventdev_id; +static uint8_t rx_adapter_id; +static uint8_t tx_adapter_id; + +static bool event_mode_enabled;static uint64_t link_mbps;
@@ -885,6 +901,52 @@ test_ipsec_with_reassembly(struct reassembly_vector *vector,return ret; } +static int +event_tx_burst (struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +struct rte_event ev; +int i, nb_sent =0 ; + +/* Convert packets to events */ +memset (&ev,0 ,sizeof (ev)); + ev.sched_type =RTE_SCHED_TYPE_PARALLEL ; +for (i =0 ; i < nb_pkts; i++) { + ev.mbuf = tx_pkts[i]; + nb_sent +=rte_event_eth_tx_adapter_enqueue ( + eventdev_id, port_id, &ev,1 ,0 ); + } + +return nb_sent; +} + +static int +event_rx_burst (struct rte_mbuf **rx_pkts,uint16_t nb_pkts_to_rx) +{ +int nb_ev, nb_rx =0 , j =0 ; +const int ms_per_pkt =3 ; +struct rte_event ev; + +do { + nb_ev =rte_event_dequeue_burst (eventdev_id, port_id, + &ev,1 ,0 ); + +if (nb_ev ==0 ) { +rte_delay_ms (1 ); +continue ; + } + +/* Get packet from event */ +if (ev.event_type !=RTE_EVENT_TYPE_ETHDEV ) { +printf ("Unsupported event type: %i\n" , + ev.event_type); +continue ; + } + rx_pkts[nb_rx++] = ev.mbuf; + }while (j++ < (nb_pkts_to_rx * ms_per_pkt) && nb_rx < nb_pkts_to_rx); + +return nb_rx; +} + static int test_ipsec_inline_proto_process(struct ipsec_test_data *td, struct ipsec_test_data *res_d,
@@ -958,9 +1020,13 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td, } }/* Send packet to ethdev for inline IPsec processing. */ - nb_sent =rte_eth_tx_burst (port_id,0 , tx_pkts_burst, nb_pkts); +if (event_mode_enabled) + nb_sent =event_tx_burst (tx_pkts_burst, nb_pkts); +else + nb_sent =rte_eth_tx_burst (port_id,0 , tx_pkts_burst, nb_pkts); +if (nb_sent != nb_pkts) { -printf ("\nUnable to TX %d packets" , nb_pkts); +printf ("\nUnable to TX %d packets, sent: %i" , nb_pkts, nb_sent);for ( ; nb_sent < nb_pkts; nb_sent++)rte_pktmbuf_free (tx_pkts_burst[nb_sent]); ret =TEST_FAILED ;
@@ -970,17 +1036,22 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td,rte_pause ();/* Receive back packet on loopback interface. */ -do { -rte_delay_ms (1 ); - nb_rx +=rte_eth_rx_burst (port_id,0 , &rx_pkts_burst[nb_rx], - nb_sent - nb_rx); -if (nb_rx >= nb_sent) -break ; - }while (j++ <5 || nb_rx ==0 ); +if (event_mode_enabled) + nb_rx =event_rx_burst (rx_pkts_burst, nb_sent); +else +do { +rte_delay_ms (1 ); + nb_rx +=rte_eth_rx_burst (port_id,0 , + &rx_pkts_burst[nb_rx], + nb_sent - nb_rx); +if (nb_rx >= nb_sent) +break ; + }while (j++ <5 || nb_rx ==0 );if (nb_rx != nb_sent) { -printf ("\nUnable to RX all %d packets" , nb_sent); -while (--nb_rx) +printf ("\nUnable to RX all %d packets, received(%i)" , + nb_sent, nb_rx); +while (--nb_rx >=0 )rte_pktmbuf_free (rx_pkts_burst[nb_rx]); ret =TEST_FAILED ; goto out;
@@ -1380,6 +1451,289 @@ inline_ipsec_testsuite_teardown(void)printf ("rte_eth_dev_reset: err=%s, port=%u\n" ,rte_strerror (-ret), port_id); } +rte_free (tx_pkts_burst); +rte_free (rx_pkts_burst); +} + +static int +event_inline_ipsec_testsuite_setup (void ) +{ +struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0 }; +struct rte_event_dev_info evdev_default_conf = {0 }; +struct rte_event_dev_config eventdev_conf = {0 }; +struct rte_event_queue_conf eventq_conf = {0 }; +struct rte_event_port_conf ev_port_conf = {0 }; +const uint16_t nb_txd =1024 , nb_rxd =1024 ; +uint16_t nb_rx_queue =1 , nb_tx_queue =1 ; +uint8_t ev_queue_id =0 , tx_queue_id =0 ; +int nb_eventqueue =1 , nb_eventport =1 ; +const int all_queues =-1 ; +uint32_t caps =0 ; +uint16_t nb_ports; +int ret; + +printf ("Start event inline IPsec test.\n" ); + + nb_ports =rte_eth_dev_count_avail (); +if (nb_ports ==0 ) { +printf ("Test require: 1 port, available: 0\n" ); +return TEST_SKIPPED ; + } + +init_mempools (NB_MBUF ); + +if (tx_pkts_burst ==NULL ) { + tx_pkts_burst = (struct rte_mbuf **)rte_calloc ("tx_buff" , +MAX_TRAFFIC_BURST , +sizeof (void *), +RTE_CACHE_LINE_SIZE ); +if (!tx_pkts_burst) +return -1 ; + + rx_pkts_burst = (struct rte_mbuf **)rte_calloc ("rx_buff" , +MAX_TRAFFIC_BURST , +sizeof (void *), +RTE_CACHE_LINE_SIZE ); +if (!rx_pkts_burst) +return -1 ; + + } + +printf ("Generate %d packets\n" ,MAX_TRAFFIC_BURST ); + +/* configuring port 0 for the test is enough */ + port_id =0 ; +/* port configure */ + ret =rte_eth_dev_configure (port_id, nb_rx_queue, + nb_tx_queue, &port_conf); +if (ret <0 ) { +printf ("Cannot configure device: err=%d, port=%d\n" , + ret, port_id); +return ret; + } + +/* Tx queue setup */ + ret =rte_eth_tx_queue_setup (port_id,0 , nb_txd, +SOCKET_ID_ANY , &tx_conf); +if (ret <0 ) { +printf ("rte_eth_tx_queue_setup: err=%d, port=%d\n" , + ret, port_id); +return ret; + } + +/* rx queue steup */ + ret =rte_eth_rx_queue_setup (port_id,0 , nb_rxd,SOCKET_ID_ANY , + &rx_conf, mbufpool); +if (ret <0 ) { +printf ("rte_eth_rx_queue_setup: err=%d, port=%d\n" , + ret, port_id); +return ret; + } + +/* Setup eventdev */ + eventdev_id =0 ; + rx_adapter_id =0 ; + tx_adapter_id =0 ; + +/* Get default conf of eventdev */ + ret =rte_event_dev_info_get (eventdev_id, &evdev_default_conf); +if (ret <0 ) { +printf ("Error in getting event device info[devID:%d]\n" , + eventdev_id); +return ret; + } + +/* Get Tx adapter capabilities */ + ret =rte_event_eth_tx_adapter_caps_get (eventdev_id, tx_adapter_id, &caps); +if (ret <0 ) { +printf ("Failed to get event device %d eth tx adapter" +" capabilities for port %d\n" , + eventdev_id, port_id); +return ret; + } +if (!(caps &RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT )) + tx_queue_id = nb_eventqueue++; + + eventdev_conf.nb_events_limit = + evdev_default_conf.max_num_events; + eventdev_conf.nb_event_queue_flows = + evdev_default_conf.max_event_queue_flows; + eventdev_conf.nb_event_port_dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + eventdev_conf.nb_event_port_enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + + eventdev_conf.nb_event_queues = nb_eventqueue; + eventdev_conf.nb_event_ports = nb_eventport; + +/* Configure event device */ + + ret =rte_event_dev_configure (eventdev_id, &eventdev_conf); +if (ret <0 ) { +printf ("Error in configuring event device\n" ); +return ret; + } + +/* Configure event queue */ + eventq_conf.schedule_type =RTE_SCHED_TYPE_PARALLEL ; + eventq_conf.nb_atomic_flows =1024 ; + eventq_conf.nb_atomic_order_sequences =1024 ; + +/* Setup the queue */ + ret =rte_event_queue_setup (eventdev_id, ev_queue_id, &eventq_conf); +if (ret <0 ) { +printf ("Failed to setup event queue %d\n" , ret); +return ret; + } + +/* Configure event port */ + ret =rte_event_port_setup (eventdev_id, port_id,NULL ); +if (ret <0 ) { +printf ("Failed to setup event port %d\n" , ret); +return ret; + } + +/* Make event queue - event port link */ + ret =rte_event_port_link (eventdev_id, port_id,NULL ,NULL ,1 ); +if (ret <0 ) { +printf ("Failed to link event port %d\n" , ret); +return ret; + } + +/* Setup port conf */ + ev_port_conf.new_event_threshold =1200 ; + ev_port_conf.dequeue_depth = + evdev_default_conf.max_event_port_dequeue_depth; + ev_port_conf.enqueue_depth = + evdev_default_conf.max_event_port_enqueue_depth; + +/* Create Rx adapter */ + ret =rte_event_eth_rx_adapter_create (rx_adapter_id, eventdev_id, + &ev_port_conf); +if (ret <0 ) { +printf ("Failed to create rx adapter %d\n" , ret); +return ret; + } + +/* Setup queue conf */ + queue_conf.ev.queue_id = ev_queue_id; + queue_conf.ev.sched_type =RTE_SCHED_TYPE_PARALLEL ; + queue_conf.ev.event_type =RTE_EVENT_TYPE_ETHDEV ; + +/* Add queue to the adapter */ + ret =rte_event_eth_rx_adapter_queue_add (rx_adapter_id, port_id, + all_queues, &queue_conf); +if (ret <0 ) { +printf ("Failed to add eth queue to rx adapter %d\n" , ret); +return ret; + } + +/* Start rx adapter */ + ret =rte_event_eth_rx_adapter_start (rx_adapter_id); +if (ret <0 ) { +printf ("Failed to start rx adapter %d\n" , ret); +return ret; + } + +/* Create tx adapter */ + ret =rte_event_eth_tx_adapter_create (tx_adapter_id, eventdev_id, + &ev_port_conf); +if (ret <0 ) { +printf ("Failed to create tx adapter %d\n" , ret); +return ret; + } + +/* Add queue to the adapter */ + ret =rte_event_eth_tx_adapter_queue_add (tx_adapter_id, port_id, + all_queues); +if (ret <0 ) { +printf ("Failed to add eth queue to tx adapter %d\n" , ret); +return ret; + } +/* Setup Tx queue & port */ +if (tx_queue_id) { +/* Setup the queue */ + ret =rte_event_queue_setup (eventdev_id, tx_queue_id, + &eventq_conf); +if (ret <0 ) { +printf ("Failed to setup tx event queue %d\n" , ret); +return ret; + } +/* Link Tx event queue to Tx port */ + ret =rte_event_port_link (eventdev_id, port_id, + &tx_queue_id,NULL ,1 ); +if (ret !=1 ) { +printf ("Failed to link event queue to port\n" ); +return ret; + } + } + +/* Start tx adapter */ + ret =rte_event_eth_tx_adapter_start (tx_adapter_id); +if (ret <0 ) { +printf ("Failed to start tx adapter %d\n" , ret); +return ret; + } + +/* Start eventdev */ + ret =rte_event_dev_start (eventdev_id); +if (ret <0 ) { +printf ("Failed to start event device %d\n" , ret); +return ret; + } + + event_mode_enabled = true; +test_ipsec_alg_list_populate (); + +return 0 ; +} + +static void +event_inline_ipsec_testsuite_teardown (void ) +{ +uint16_t portid; +int ret; + + event_mode_enabled = false; + +/* Stop and release rx adapter */ + ret =rte_event_eth_rx_adapter_stop (rx_adapter_id); +if (ret <0 ) +printf ("Failed to stop rx adapter %d\n" , ret); + ret =rte_event_eth_rx_adapter_queue_del (rx_adapter_id, port_id,-1 ); +if (ret <0 ) +printf ("Failed to remove rx adapter queues %d\n" , ret); + ret =rte_event_eth_rx_adapter_free (rx_adapter_id); +if (ret <0 ) +printf ("Failed to free rx adapter %d\n" , ret); + +/* Stop and release tx adapter */ + ret =rte_event_eth_tx_adapter_stop (tx_adapter_id); +if (ret <0 ) +printf ("Failed to stop tx adapter %d\n" , ret); + ret =rte_event_eth_tx_adapter_queue_del (tx_adapter_id, port_id,-1 ); +if (ret <0 ) +printf ("Failed to remove tx adapter queues %d\n" , ret); + ret =rte_event_eth_tx_adapter_free (tx_adapter_id); +if (ret <0 ) +printf ("Failed to free tx adapter %d\n" , ret); + +/* Stop and release event devices */ +rte_event_dev_stop (eventdev_id); + ret =rte_event_dev_close (eventdev_id); +if (ret <0 ) +printf ("Failed to close event dev %d, %d\n" , eventdev_id, ret); + +/* port tear down */ +RTE_ETH_FOREACH_DEV (portid) { + ret =rte_eth_dev_reset (portid); +if (ret !=0 ) +printf ("rte_eth_dev_reset: err=%s, port=%u\n" , +rte_strerror (-ret), port_id); + } + +rte_free (tx_pkts_burst); +rte_free (rx_pkts_burst); } static int
@@ -1920,7 +2274,7 @@ test_ipsec_inline_pkt_replay(const void *test_data, const uint64_t esn[], flags.antireplay = true;for (i =0 ; i < nb_pkts; i++) { -memcpy (&td_outb[i], test_data,sizeof (td_outb)); +memcpy (&td_outb[i], test_data,sizeof (td_outb[0 ])); td_outb[i].ipsec_xform.options.iv_gen_disable =1 ; td_outb[i].ipsec_xform.replay_win_sz = winsz; td_outb[i].ipsec_xform.options.esn = esn_en;
@@ -2054,8 +2408,6 @@ test_ipsec_inline_proto_pkt_esn_antireplay4096(const void *test_data)static struct unit_test_suite inline_ipsec_testsuite = { .suite_name ="Inline IPsec Ethernet Device Unit Test Suite" , - .setup = inline_ipsec_testsuite_setup, - .teardown = inline_ipsec_testsuite_teardown, .unit_test_cases = { TEST_CASE_NAMED_WITH_DATA( "Outbound known vector (ESP tunnel mode IPv4 AES-GCM 128)",
@@ -2374,9 +2726,20 @@ static struct unit_test_suite inline_ipsec_testsuite = {static int test_inline_ipsec (void ) { + inline_ipsec_testsuite.setup = inline_ipsec_testsuite_setup; + inline_ipsec_testsuite.teardown = inline_ipsec_testsuite_teardown; +return unit_test_suite_runner (&inline_ipsec_testsuite); +} + +static int +test_event_inline_ipsec (void ) +{ + inline_ipsec_testsuite.setup = event_inline_ipsec_testsuite_setup; + inline_ipsec_testsuite.teardown = event_inline_ipsec_testsuite_teardown;return unit_test_suite_runner (&inline_ipsec_testsuite); }#endif /* !RTE_EXEC_ENV_WINDOWS */ REGISTER_TEST_COMMAND (inline_ipsec_autotest, test_inline_ipsec); +REGISTER_TEST_COMMAND (event_inline_ipsec_autotest, test_event_inline_ipsec);
Signature · 1 line
2.25.1
Quoted 7 lines
Enable ability to run inline security tests using event
API(rte_event_eth_tx_adapter_enqueue/rte_event_dequeue_burst). New test command -event_inline_ipsec_autotestwill run same list of test cases asinline_ipsec_autotest, but packets will go through eventdev.Signed-off-by Volodymyr Fialko <[email protected]>
Quoted 11 lines
Enable ability to run inline security tests using event
API(rte_event_eth_tx_adapter_enqueue/rte_event_dequeue_burst). New test command -event_inline_ipsec_autotestwill run same list of test cases asinline_ipsec_autotest, but packets will go through eventdev.Signed-off-by Volodymyr Fialko <[email protected]>---
v2:
* Fixed compilation with mingw.
v3:
* Fixed struct zero initialization for gcc 4.*
Applied to dpdk-next-crypto
Thanks.
PATCH 1/1 doc: announce change in crypto adapter queue add
In reply to Volodymyr FialkoThe function rte_event_crypto_adapter_queue_pair_add will accept rte_event_crypto_adapter_queue_conf argument instead of rte_event.
--- doc/guides/rel_notes/deprecation.rst | 6 ++++++ 1 file changed, 6 insertions(+)
doc/guides/rel_notes/deprecation.rst +6 -0
@@ -125,3 +125,9 @@ Deprecation Notices applications should be updated to use the ``dmadev`` library instead, with the underlying HW-functionality being provided by the ``ioat`` or ``idxd`` dma drivers + +* eventdev: The function ``rte_event_crypto_adapter_queue_pair_add`` will + accept configuration of type ``rte_event_crypto_adapter_queue_conf`` instead + of ``rte_event``, similar to ``rte_event_eth_rx_adapter_queue_add`` signature. + Event will be one of the configuration fields, together with additional + vector parameters.
Signature · 1 line
2.25.1
RE: [PATCH] doc: announce change in crypto adapter queue add
Quoted 6 lines
Subject: [PATCH] doc: announce change in crypto adapter queue add
The function
rte_event_crypto_adapter_queue_pair_addwill acceptrte_event_crypto_adapter_queue_confargument instead ofrte_event.Signed-off-by Volodymyr Fialko <[email protected]>
Jerin Jacob
Acked-byRe: [PATCH] doc: announce change in crypto adapter queue add
Quoted 8 lines · Akhil Goyal
Quoted 7 lines
Subject: [PATCH] doc: announce change in crypto adapter queue add
The function
rte_event_crypto_adapter_queue_pair_addwill acceptrte_event_crypto_adapter_queue_confargument instead ofrte_event.Signed-off-by Volodymyr Fialko <[email protected]>Acked-by Akhil Goyal <[email protected]>
Quoted 1 line
RE: [EXT] Re: [PATCH] doc: announce change in crypto adapter queue add
Quoted 11 lines · Akhil Goyal
Quoted 8 lines
Quoted 7 lines
Subject: [PATCH] doc: announce change in crypto adapter queue add
The function
rte_event_crypto_adapter_queue_pair_addwill acceptrte_event_crypto_adapter_queue_confargument instead ofrte_event.Signed-off-by Volodymyr Fialko <[email protected]>Acked-by Akhil Goyal <[email protected]>Acked-by Jerin Jacob <[email protected]>
Hi Abhinandan,
Could you please Ack this deprecation notice.
Regards,
Akhil
Gujjar, Abhinandan S
Acked-byRE: [EXT] Re: [PATCH] doc: announce change in crypto adapter queue add
Quoted 24 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Tuesday, July 12, 2022 11:02 AM
To: Jerin Jacob <[email protected]>; Gujjar, Abhinandan S <[email protected]>
Cc: Volodymyr Fialko <[email protected]>; [email protected]; Ray Kinsella <[email protected]>; Jerin Jacob Kollanukkaran <[email protected]>; Anoob Joseph <[email protected]>
Subject: RE: [EXT] Re: [PATCH] doc: announce change in crypto adapter queue addQuoted 11 lines · Akhil Goyal
Quoted 8 lines
Quoted 7 lines
Subject: [PATCH] doc: announce change in crypto adapter queue add
The function
rte_event_crypto_adapter_queue_pair_addwill acceptrte_event_crypto_adapter_queue_confargument instead ofrte_event.Signed-off-by Volodymyr Fialko <[email protected]>Acked-by Akhil Goyal <[email protected]>Acked-by Jerin Jacob <[email protected]>
Quoted 6 lines
Hi Abhinandan,
Could you please Ack this deprecation notice.
Regards,
Akhil
Re: [PATCH] doc: announce change in crypto adapter queue add
In reply to Volodymyr FialkoQuoted 4 lines · Volodymyr Fialko
The function
rte_event_crypto_adapter_queue_pair_addwill acceptrte_event_crypto_adapter_queue_confargument instead ofrte_event.Signed-off-by Volodymyr Fialko <[email protected]>
Quoted 18 lines
--- doc/guides/rel_notes/deprecation.rst | 6 ++++++ 1 file changed, 6 insertions(+)doc/guides/rel_notes/deprecation.rst +6
-0@@ -125,3 +125,9 @@ Deprecation Notices applications should be updated to use the ``dmadev`` library instead, with the underlying HW-functionality being provided by the ``ioat`` or ``idxd`` dma drivers + +* eventdev: The function ``rte_event_crypto_adapter_queue_pair_add`` will + accept configuration of type ``rte_event_crypto_adapter_queue_conf`` instead + of ``rte_event``, similar to ``rte_event_eth_rx_adapter_queue_add`` signature. + Event will be one of the configuration fields, together with additional + vector parameters.
Thomas Monjalon
Acked-by Akhil Goyal Acked-by Jerin Jacob Acked-by Abhinandan Gujjar Acked-by Hemant Agrawal on v1 1/1 AppliedRe: [PATCH] doc: announce change in crypto adapter queue add
In reply to Volodymyr Fialko28/06/2022 14:09, Volodymyr Fialko:
Quoted 4 lines
The function
rte_event_crypto_adapter_queue_pair_addwill acceptrte_event_crypto_adapter_queue_confargument instead ofrte_event.Signed-off-by Volodymyr Fialko <[email protected]>
Applied, thanks.
cover Vector support for event crypto adapter
In reply to Volodymyr FialkoIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing rte_event_vector whose event type is RTE_EVENT_TYPE_CRYPTODEV_VECTOR.
Volodymyr Fialko (3):
eventdev: introduce event cryptodev vector type
crypto/cnxk: add burst enqueue for event crypto
crypto/cnxk: add vectorization for event crypto
app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 +- .../prog_guide/event_crypto_adapter.rst | 23 +- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 455 ++++++++++++++++-- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/meson.build | 2 +- drivers/crypto/cnxk/version.map | 1 + drivers/event/cnxk/cn10k_eventdev.c | 47 +- drivers/event/cnxk/cn10k_worker.c | 10 - drivers/event/cnxk/cn10k_worker.h | 8 +- drivers/event/cnxk/cn9k_eventdev.c | 14 +- drivers/event/cnxk/cnxk_eventdev.h | 4 +- drivers/event/cnxk/cnxk_eventdev_adptr.c | 17 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 +++- lib/eventdev/rte_event_crypto_adapter.h | 101 +++- lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 + 23 files changed, 768 insertions(+), 118 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 eventdev: introduce event cryptodev vector type
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing rte_event_vector whose event type is RTE_EVENT_TYPE_CRYPTODEV_VECTOR.
Application should set RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in rte_event_crypto_adapter_queue_conf::flag and provide vector configuration with respect of rte_event_crypto_adapter_vector_limits, which could be obtained by calling rte_event_crypto_adapter_vector_limits_get, to enable vectorization.
The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in rte_event_crypto_metadata::response_info.
Updated drivers and tests accordingly to new API.
--- app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 ++- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 ++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 +++++++++++++++++- lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 ++ 14 files changed, 276 insertions(+), 43 deletions(-)
app/test-eventdev/test_perf_common.c +5 -5
@@ -837,14 +837,14 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf; - response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); + &conf); }else { ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id,NULL );
app/test/test_event_crypto_adapter.c +10 -2
@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void)static int test_crypto_adapter_qp_add_del (void ) { +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;
@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); +TEST_CDEV_ID ,TEST_CDEV_QP_ID , &queue_conf); }else ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID ,TEST_CDEV_ID ,TEST_CDEV_QP_ID ,NULL );
@@ -1206,6 +1210,10 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode) .new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;
@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); +TEST_CDEV_ID ,TEST_CDEV_QP_ID , &queue_conf); }else ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID ,TEST_CDEV_ID ,TEST_CDEV_QP_ID ,NULL );
doc/guides/prog_guide/event_crypto_adapter.rst +20 -3
@@ -201,10 +201,10 @@ capability, event information must be passed to the add API. ret = rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) { - struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, &event); + // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, NULL);
@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); } +Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto operations based on +provided response information of ``rte_event_crypto_metadata::response_info`` +and generate a ``rte_event`` containing ``rte_event_vector`` whose event type +is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be obtained by calling +``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capability indicates whether +PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/event/cnxk/cn10k_eventdev.c +2 -2
@@ -889,11 +889,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn10k" );
drivers/event/cnxk/cn9k_eventdev.c +3 -2
@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,static int cn9k_crypto_adapter_qp_add (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev, -int32_t queue_pair_id,const struct rte_event *event) +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" );
drivers/event/dpaa/dpaa_eventdev.c +5 -4
@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h>
@@ -775,10 +776,10 @@ static int dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;
@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev,if (rx_queue_id ==-1 )return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) {DPAA_EVENTDEV_ERR ("dpaa_sec_eventq_attach failed: ret: %d\n" , ret);
drivers/event/dpaa2/dpaa2_eventdev.c +5 -4
@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h>
@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;
@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,if (rx_queue_id ==-1 )return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) {DPAA2_EVENTDEV_ERR ("dpaa2_sec_eventq_attach failed: ret: %d\n" , ret);
drivers/event/octeontx/ssovf_evdev.c +2 -2
@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {for (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) {
lib/eventdev/eventdev_pmd.h +30 -5
@@ -907,6 +907,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice
@@ -961,11 +962,11 @@ typedef int (*eventdev_crypto_adapter_caps_get_t)* - <0: Error code returned by the driver function. * */ -typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *queue_conf);/**
@@ -1074,6 +1075,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
@@ -1339,6 +1361,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;/**< Get ethernet Rx queue stats */
lib/eventdev/eventdev_trace.h +4 -2
@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h"
@@ -271,11 +272,12 @@ RTE_TRACE_POINT(RTE_TRACE_POINT ( rte_eventdev_trace_crypto_adapter_queue_pair_add, RTE_TRACE_POINT_ARGS(uint8_t adptr_id, uint8_t cdev_id, - const void *event, int32_t queue_pair_id), + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf *conf), rte_trace_point_emit_u8(adptr_id);rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(
lib/eventdev/rte_event_crypto_adapter.c +84 -6
124 lines not on this page · raw message
lib/eventdev/rte_event_crypto_adapter.h +96 -5
125 lines not on this page · raw message
lib/eventdev/rte_event_eth_rx_adapter.h +2 -1
@@ -457,7 +457,8 @@ int rte_event_eth_rx_adapter_free(uint8_t id);* @see RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ * * @param conf -* Additional configuration structure of type *rte_event_eth_rx_adapter_conf* +* Additional configuration structure of type +* *rte_event_eth_rx_adapter_queue_conf* * * @return * - 0: Success, Receive queue added correctly.
lib/eventdev/rte_eventdev.h +8 -0
@@ -1203,6 +1203,9 @@ struct rte_event_vector {#define RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR \ (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The event vector generated from eth Rx adapter. */ +#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV) +/**< The event vector generated from cryptodev adapter. */ #define RTE_EVENT_TYPE_MAX 0x10/**< Maximum number of event types */
@@ -1420,6 +1423,11 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);* the private data information along with the crypto session. */ +#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device
Signature · 1 line
2.25.1
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Hi Abhinandan/Hemant,
Can you review this patchset?
The library changes need to merged in RC1.
If no comments, this will be merged in couple of days. It has been over 6 weeks for this patch.
Regards,
Akhil
Quoted 19 lines
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORinrte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits, which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Signed-off-by Volodymyr Fialko <[email protected]>
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Hi Akhil,
I have started reviewing it.
You can expect some feedback in the weekend.
Regards
Abhinandan
Quoted 42 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Thursday, September 22, 2022 12:02 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Anoob Joseph <[email protected]>; Volodymyr Fialko <[email protected]>
Subject: RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeHi Abhinandan/Hemant,
Can you review this patchset?
The library changes need to merged in RC1.
If no comments, this will be merged in couple of days. It has been over 6 weeks for this patch.Regards,
AkhilQuoted 19 lines
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORinrte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits, which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Signed-off-by Volodymyr Fialko <[email protected]>
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
In reply to Volodymyr FialkoQuoted 32 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Thursday, August 4, 2022 3:29 PM
To: [email protected]; Jerin Jacob <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: [email protected]; [email protected]; Volodymyr Fialko <[email protected]>
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector typeIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORinrte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits, which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Signed-off-by Volodymyr Fialko <[email protected]>
Quoted 17 lines
--- app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 ++- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 ++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 +++++++++++++++++- lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 ++ 14 files changed, 276 insertions(+), 43 deletions(-)
I don't see dataplane implementation of vectorization in the crypto adapter! Is it missed out in the patch?
comments inline.
Quoted 401 lines
app/test- renamed from app/test-eventdev/test_perf_common.c +0
-0
eventdev/test_perf_common.c
index81420be73a..c770bc93f6100644app/test-eventdev/test_perf_common.c +5
-5@@ -837,14 +837,14 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf; - response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); + &conf); }else {app/test-eventdev/test_perf_common.c +0
-0ret = rte_event_crypto_adapter_queue_pair_add( TEST_PERF_CA_ID, p->ca.cdev_id, p->ca.cdev_qp_id,NULL); diff --git
a/app/test/test_event_crypto_adapter.cb/app/test/test_event_crypto_adapter.c
index2ecc7e2cea..bb617c1042100644app/test/test_event_crypto_adapter.c +5
-1@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void) static inttest_crypto_adapter_qp_add_del (void) { +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); + TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID,
NULL); @@ -1206,6 +1210,10 @@configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)app/test/test_event_crypto_adapter.c +4
-1.new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, - TEST_CDEV_ID, TEST_CDEV_QP_ID,
&response_info);app/test/test_event_crypto_adapter.c +1
-0+ TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID, NULL); diff
--gita/doc/guides/prog_guide/event_crypto_adapter.rstb/doc/guides/prog_guide/event_crypto_adapter.rst
index4fb5c688e0..554df7e358100644doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -201,10 +201,10 @@ capability, event information must be passed to theadd API.
ret =
rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {doc/guides/prog_guide/event_crypto_adapter.rst +1
-3- struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id,&event);
doc/guides/prog_guide/event_crypto_adapter.rst +3
-0+ // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, cdev_id, + qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id,NULL);
doc/guides/prog_guide/event_crypto_adapter.rst +18
-0@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); } +Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto operations +based on provided response information of +``rte_event_crypto_metadata::response_info`` +and generate a ``rte_event`` containing ``rte_event_vector`` whose +event type is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be obtained by +calling ``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capability indicates +whether PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/event/cnxk/cn10k_eventdev.c +2
-2@@ -889,11 +889,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );
CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k"); diff --
gita/drivers/event/cnxk/cn9k_eventdev.cb/drivers/event/cnxk/cn9k_eventdev.c
index2e27030049..45ed547cb0100644drivers/event/cnxk/cn9k_eventdev.c +0
-0@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(const struct
rte_eventdev*event_dev, static int cn9k_crypto_adapter_qp_add(const structrte_eventdev*event_dev,drivers/event/cnxk/cn9k_eventdev.c +2
-1const struct rte_cryptodev *cdev, - int32_t queue_pair_id, const struct rte_event *event) + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf*conf)
{drivers/event/cnxk/cn9k_eventdev.c +1
-1struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" ); CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k"); diff --git
a/drivers/event/dpaa/dpaa_eventdev.cb/drivers/event/dpaa/dpaa_eventdev.cindexff6cc0be18..2b9ecd9fbf100644drivers/event/dpaa/dpaa_eventdev.c +5
-4@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h> @@ -775,10 +776,10 @@ static int dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) { DPAA_EVENTDEV_ERR(drivers/event/dpaa/dpaa_eventdev.c +0
-1"dpaa_sec_eventq_attach failed: ret: %d\n", ret); diff - -git a/drivers/event/dpaa2/dpaa2_eventdev.c
b/drivers/event/dpaa2/dpaa2_eventdev.c
index ffc7b8b073..0137736794 100644drivers/event/dpaa2/dpaa2_eventdev.c +5
-4@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> @@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) { DPAA2_EVENTDEV_ERR("
dpaa2_sec_eventq_attachfailed: ret: %d\n", ret); diff
--gita/drivers/event/octeontx/ssovf_evdev.cb/drivers/event/octeontx/ssovf_evdev.c
index9e14e35d10..17acd8ef64100644drivers/event/octeontx/ssovf_evdev.c +2
-2@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {drivers/event/octeontx/ssovf_evdev.c +0
-0for (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) {lib/eventdev/eventdev_pmd.h +1
-0@@ -907,6 +907,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice @@ -961,11 +962,11 @@ typedef int (
*eventdev_crypto_adapter_caps_get_t)
* - <0: Error code returned by the driver function.
*
*/lib/eventdev/eventdev_pmd.h +5
-5-typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf
*queue_conf);/**
lib/eventdev/eventdev_pmd.h +21
-0@@ -1074,6 +1075,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
lib/eventdev/eventdev_pmd.h +3
-0@@ -1339,6 +1361,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;lib/eventdev/eventdev_pmd.h +0
-0/**< Get ethernet Rx queue stats */ lib/eventdev/eventdev_trace.h +4
-2@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h" @@ -271,11 +272,12 @@ RTE_TRACE_POINT(RTE_TRACE_POINT ( rte_eventdev_trace_crypto_adapter_queue_pair_add, RTE_TRACE_POINT_ARGS(uint8_t adptr_id, uint8_t cdev_id, - const void *event, int32_t queue_pair_id), + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf *conf), rte_trace_point_emit_u8(adptr_id);rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(lib/eventdev/rte_event_crypto_adapter.c +3
-2@@ -921,11 +921,12 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { + struct rte_event_crypto_adapter_vector_limits limits;struct event_crypto_adapter *adapter; -struct rte_eventdev *dev;struct crypto_device_info *dev_info; +struct rte_eventdev *dev;uint32_t cap;int ret;@@ -951,11 +952,47 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, } if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) &&lib/eventdev/rte_event_crypto_adapter.c +1
-1- (event == NULL)) { + (conf == NULL)) { RTE_EDEV_LOG_ERR("Conf value can not be NULL fordev_id=%u",
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 959
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0cdev_id);return -EINVAL ; }
Newline?
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 960
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((conf != NULL) &&
Checking conf twice?
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 961
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ (conf->flags & RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR)) {
Else condition if the flags is not set?
Quoted 14 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR) == 0) {lib/eventdev/rte_event_crypto_adapter.c +1
-0+ RTE_EDEV_LOG_ERR("Event vectorization is notsupported,"
lib/eventdev/rte_event_crypto_adapter.c +9
-0+"dev %" PRIu8" cdev %" PRIu8, id, + cdev_id); +return -ENOTSUP ; + } + + ret =rte_event_crypto_adapter_vector_limits_get ( + adapter->eventdev_id, cdev_id, &limits); +if (ret <0 ) { + RTE_EDEV_LOG_ERR("Failed to get event device vector"
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 976
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.c +4
-0+"limits, dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + }
New line? Please check other cases.
Quoted 61 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+if (conf->vector_sz < limits.min_sz || + conf->vector_sz > limits.max_sz || + conf->vector_timeout_ns < limits.min_timeout_ns || + conf->vector_timeout_ns > limits.max_timeout_ns || + conf->vector_mp ==NULL ) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +8
-0+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } +if (conf->vector_mp->elt_size < + (sizeof (struct rte_event_vector ) + + (sizeof (uintptr_t ) * conf->vector_sz))) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +8
-3+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } + } dev_info = &adapter->cdevs[cdev_id];@@ -990,7 +1027,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, dev_info->dev, queue_pair_id, - event); + conf);if (ret)return ret;@@ -1030,8 +1067,8 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id,rte_service_component_runstate_set (adapter->service_id,1 ); } -rte_eventdev_trace_crypto_adapter_queue_pair_add (id, cdev_id, event, - queue_pair_id); +rte_eventdev_trace_crypto_adapter_queue_pair_add (id, cdev_id, + queue_pair_id, conf);return 0 ;}
lib/eventdev/rte_event_crypto_adapter.c +9
-0@@ -1290,3 +1327,44 @@ rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id)return 0 ; } + +int +rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits) { +struct rte_cryptodev *cdev; +struct rte_eventdev *dev; +uint32_t cap; +int ret;
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t · line 1349
Quoted 10 lines
lib/eventdev/rte_event_crypto_adapter.c +10
-0+ +RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET (dev_id, -EINVAL ); + +if (!rte_cryptodev_is_valid_dev (cdev_id)) { +RTE_EDEV_LOG_ERR ("Invalid dev_id=%" PRIu8, cdev_id); +return -EINVAL ; + } + +if (limits ==NULL ) +return -EINVAL ;
Add appropriate error message like above?
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1362
Quoted 13 lines
lib/eventdev/rte_event_crypto_adapter.c +13
-0+ + dev = &rte_eventdevs[dev_id]; + cdev =rte_cryptodev_pmd_get_dev (cdev_id); + + ret =rte_event_crypto_adapter_caps_get (dev_id, cdev_id, &cap); +if (ret) { +RTE_EDEV_LOG_ERR ("Failed to get adapter caps edev %" PRIu8 +"cdev %" PRIu16, dev_id, cdev_id); +return ret; + } + +if (!(cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR )) +return -ENOTSUP ;
Same here.
Quoted 44 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+ +RTE_FUNC_PTR_OR_ERR_RET ( + *dev->dev_ops->crypto_adapter_vector_limits_get, + -ENOTSUP ); + +return dev->dev_ops->crypto_adapter_vector_limits_get ( + dev, cdev, limits); +}lib/eventdev/rte_event_crypto_adapter.h +17
-0@@ -253,6 +253,78 @@ struct rte_event_crypto_adapter_conf {*/ }; +#define RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR 0x1 +/**< This flag indicates that crypto operations processed on the crypto +* adapter need to be vectorized +* @see rte_event_crypto_adapter_queue_conf::flags +*/ + +/** +* Adapter queue configuration structure */ struct +rte_event_crypto_adapter_queue_conf { +uint32_t flags; +/**< Flags for handling crypto operations +* @see RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR +*/ +struct rte_event ev; +/**< If HW supports cryptodev queue pair to event queue binding, +* application is expected to fill in event information. +* @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDlib/eventdev/rte_event_crypto_adapter.h +3
-0+*/ +uint16_t vector_sz; +/**< Indicates the maximum number for crypto operations to combine and
lib/eventdev/rte_event_crypto_adapter.h +4
-0+* form a vector. +* @see rte_event_crypto_adapter_vector_limits::min_sz +* @see rte_event_crypto_adapter_vector_limits::max_sz +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf { · line 281
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* @see rte_event_crypto_adapter_queue_conf::rx_queue_flags
rx_queue_flags??
Quoted 82 lines
lib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint64_t vector_timeout_ns; +/**< +* Indicates the maximum number of nanoseconds to wait for aggregating
lib/eventdev/rte_event_crypto_adapter.h +5
-0+* crypto operations. Should be within vectorization limits of the +* adapter +* @see rte_event_crypto_adapter_vector_limits::min_timeout_ns +* @see rte_event_crypto_adapter_vector_limits::max_timeout_ns +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +7
-0+* @see rte_event_crypto_adapter_queue_conf::flags +*/ +struct rte_mempool *vector_mp; +/**< Indicates the mempool that should be used for allocating +* rte_event_vector container. +* Should be created by using `rte_event_vector_pool_create`. +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +34
-5+* @see rte_event_crypto_adapter_queue_conf::flags. +*/ +}; + +/** +* A structure used to retrieve event crypto adapter vector limits. +*/ +struct rte_event_crypto_adapter_vector_limits { +uint16_t min_sz; +/**< Minimum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint16_t max_sz; +/**< Maximum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint8_t log2_sz; +/**< True if the size configured should be in log2. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint64_t min_timeout_ns; +/**< Minimum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns +*/ +uint64_t max_timeout_ns; +/**< Maximum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns +*/ +}; +/** * Function type used for adapter configuration callback. The callback is * used to fill in members of the struct rte_event_crypto_adapter_conf, this @@ -392,10 +464,9 @@ rte_event_crypto_adapter_free(uint8_t id);* Cryptodev queue pair identifier. If queue_pair_id is set -1, * adapter adds all the pre configured queue pairs to the instance. * -* @param event -* if HW supports cryptodev queue pair to event queue binding, application is -* expected to fill in event information, else it will be NULL. -* @see RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND +* @param conf +* Additional configuration structure of type +* *rte_event_crypto_adapter_queue_conf* * * @return * - 0: Success, queue pair added correctly. @@ -405,7 +476,7 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event); + const struct rte_event_crypto_adapter_queue_conf *conf);/** * Delete a queue pair from an event crypto adapter.
lib/eventdev/rte_event_crypto_adapter.h +0
-0@@ -523,6 +594,26 @@ rte_event_crypto_adapter_service_id_get(uint8_t id,
uint32_t*service_id); intrte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);lib/eventdev/rte_event_crypto_adapter.h +2
-0+/** +* Retrieve vector limits for a given event dev and crypto dev pair.
lib/eventdev/rte_event_crypto_adapter.h rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id); · line 607
Quoted 10 lines
lib/eventdev/rte_event_crypto_adapter.h +10
-0+* @see rte_event_crypto_adapter_vector_limits +* +* @param dev_id +* Event device identifier. +* @param cdev_id +* Crypto device identifier. +* @param [out] limits +* A pointer to rte_event_crypto_adapter_vector_limits structure that +has to +* be filled.
Space missing before "be filled"
Quoted 19 lines
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Error code on failure.
+ */lib/eventdev/rte_event_crypto_adapter.h +4
-0+int rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Enqueue a burst of crypto operations as event objects supplied in *rte_event*
* structure on an event crypto adapter designated by its event *dev_id*
through diff --gita/lib/eventdev/rte_event_eth_rx_adapter.hb/lib/eventdev/rte_event_eth_rx_adapter.h
index3608a7b2cf..c8f2936866100644
lib/eventdev/rte_event_eth_rx_adapter.h int rte_event_eth_rx_adapter_free(uint8_t id); · line 462
Quoted 7 lines
lib/eventdev/rte_event_eth_rx_adapter.h +2
-1@@ -457,7 +457,8 @@ int rte_event_eth_rx_adapter_free(uint8_t id);* @see RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ * * @param conf -* Additional configuration structure of type *rte_event_eth_rx_adapter_conf* +* Additional configuration structure of type +* *rte_event_eth_rx_adapter_queue_conf*
These changes are not relevant. Please consider sending separate patch.
Quoted 33 lines
lib/eventdev/rte_event_eth_rx_adapter.h +0
-0* * @return * - 0: Success, Receive queue added correctly.
lib/eventdev/rte_eventdev.h index renamed from lib/eventdev/rte_eventdev.h +0
-0
6a6f6ea4c1..1a737bf851100644lib/eventdev/rte_eventdev.h +2
-0@@ -1203,6 +1203,9 @@ struct rte_event_vector {#define RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR \ (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The event vector generated from eth Rx adapter. */ +#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV)/**< The event
lib/eventdev/rte_eventdev.h +6
-0+vector generated from cryptodev adapter. */ #define RTE_EVENT_TYPE_MAX 0x10/**< Maximum number of event types */ @@ -1420,6 +1423,11 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id,uint32_t *caps); * the private data information along with the crypto session. */ +#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device
--
2.25.1
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 65 lines
-----Original Message-----
From: Gujjar, Abhinandan S <[email protected]>
Sent: Saturday, September 24, 2022 10:44 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: [EXT] RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeExternal Email
----------------------------------------------------------------------
Quoted 30 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Thursday, August 4, 2022 3:29 PM
To: [email protected]; Jerin Jacob <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: [email protected]; [email protected]; Volodymyr Fialko <[email protected]>
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector typeIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORinrte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits, which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Signed-off-by Volodymyr Fialko <[email protected]>Quoted 17 lines
--- app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 ++- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 ++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 +++++++++++++++++- lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 ++ 14 files changed, 276 insertions(+), 43 deletions(-)
Quoted 4 lines
I don't see dataplane implementation of vectorization in the crypto adapter! Is it missed out in the patch?
comments inline.
Right now we are targeting crypto_cn10k PMD and ipsec-secgw event mode to support vectorization.
Quoted 393 lines
Quoted 393 lines
app/test- renamed from app/test-eventdev/test_perf_common.c +0
-0
eventdev/test_perf_common.cindex81420be73a..c770bc93f6100644app/test-eventdev/test_perf_common.c +5
-5@@ -837,14 +837,14 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf; - response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); + &conf); }else {app/test-eventdev/test_perf_common.c +0
-1ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id,NULL ); diff --git a/app/test/test_event_crypto_adapter.c
b/app/test/test_event_crypto_adapter.c
index2ecc7e2cea..bb617c1042100644app/test/test_event_crypto_adapter.c +5
-1@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void) static inttest_crypto_adapter_qp_add_del (void) { +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); + TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID,
NULL); @@ -1206,6 +1210,10 @@configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)app/test/test_event_crypto_adapter.c +4
-1.new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, - TEST_CDEV_ID, TEST_CDEV_QP_ID,
&response_info);app/test/test_event_crypto_adapter.c +1
-0+ TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID, NULL); diff --gita/doc/guides/prog_guide/event_crypto_adapter.rstb/doc/guides/prog_guide/event_crypto_adapter.rst
index4fb5c688e0..554df7e358100644doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -201,10 +201,10 @@ capability, event information must be passed tothe add API.
ret =
rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {doc/guides/prog_guide/event_crypto_adapter.rst +1
-3- struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id,&event);
doc/guides/prog_guide/event_crypto_adapter.rst +3
-0+ // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, cdev_id, + qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id, cdev_id,
qp_id, NULL);doc/guides/prog_guide/event_crypto_adapter.rst +18
-0@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); } +Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto operations +based on provided response information of +``rte_event_crypto_metadata::response_info`` +and generate a ``rte_event`` containing ``rte_event_vector`` whose +event type is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be obtained +by calling ``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capability indicates +whether PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/event/cnxk/cn10k_eventdev.c +2
-2@@ -889,11 +889,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );
CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k"); diff -- gita/drivers/event/cnxk/cn9k_eventdev.cb/drivers/event/cnxk/cn9k_eventdev.c
index2e27030049..45ed547cb0100644drivers/event/cnxk/cn9k_eventdev.c +0
-0@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(const struct
rte_eventdev*event_dev, static int cn9k_crypto_adapter_qp_add(const structrte_eventdev*event_dev,drivers/event/cnxk/cn9k_eventdev.c +2
-1const struct rte_cryptodev *cdev, - int32_t queue_pair_id, const struct rte_event *event) + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf*conf)
{drivers/event/cnxk/cn9k_eventdev.c +1
-1struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" ); CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k"); diff --git
a/drivers/event/dpaa/dpaa_eventdev.cb/drivers/event/dpaa/dpaa_eventdev.c
indexff6cc0be18..2b9ecd9fbf100644drivers/event/dpaa/dpaa_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h> @@ -775,10 +776,10 @@ static int dpaa_eventdev_crypto_queue_add(const structrte_eventdev*dev,drivers/event/dpaa/dpaa_eventdev.c +4
-4const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) { DPAA_EVENTDEV_ERR("
dpaa_sec_eventq_attachfailed: ret: %d\n", ret); diff - -gita/drivers/event/dpaa2/dpaa2_eventdev.cb/drivers/event/dpaa2/dpaa2_eventdev.c
index ffc7b8b073..0137736794 100644drivers/event/dpaa2/dpaa2_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h>drivers/event/dpaa2/dpaa2_eventdev.c +4
-4@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) { DPAA2_EVENTDEV_ERR("
dpaa2_sec_eventq_attachfailed: ret: %d\n", ret); diff --gita/drivers/event/octeontx/ssovf_evdev.cb/drivers/event/octeontx/ssovf_evdev.c
index9e14e35d10..17acd8ef64100644drivers/event/octeontx/ssovf_evdev.c +2
-2@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {for (
qp_id= 0;qp_id<cdev->data->nb_queue_pairs; qp_id++) { diff
--gita/lib/eventdev/eventdev_pmd.hb/lib/eventdev/eventdev_pmd.hindex69402668d8..bcfc9cbcb2100644lib/eventdev/eventdev_pmd.h +1
-0@@ -907,6 +907,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice @@ -961,11 +962,11 @@ typedef int (
*eventdev_crypto_adapter_caps_get_t)
* - <0: Error code returned by the driver function.
*
*/lib/eventdev/eventdev_pmd.h +5
-5-typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf
*queue_conf);/**
lib/eventdev/eventdev_pmd.h +21
-0@@ -1074,6 +1075,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
lib/eventdev/eventdev_pmd.h +3
-0@@ -1339,6 +1361,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;lib/eventdev/eventdev_pmd.h +0
-0/**< Get ethernet Rx queue stats */ (quoted diff) +0
-0
b/lib/eventdev/eventdev_trace.hindex5ec43d80ee..d48cd58850100644lib/eventdev/eventdev_trace.h +4
-2@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h" @@ -271,11 +272,12 @@ RTE_TRACE_POINT( RTE_TRACE_POINT( rte_eventdev_trace_crypto_adapter_queue_pair_add,RTE_TRACE_POINT_ARGS (uint8_t adptr_id,uint8_t cdev_id, -const void *event,int32_t queue_pair_id), +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf),rte_trace_point_emit_u8 (adptr_id );rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(lib/eventdev/rte_event_crypto_adapter.c +3
-2@@ -921,11 +921,12 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { + struct rte_event_crypto_adapter_vector_limits limits;struct event_crypto_adapter *adapter; -struct rte_eventdev *dev;struct crypto_device_info *dev_info; +struct rte_eventdev *dev;uint32_t cap;int ret;@@ -951,11 +952,47 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, }
Quoted 10 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 959
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) &&lib/eventdev/rte_event_crypto_adapter.c +1
-1- (event == NULL)) { + (conf == NULL)) {RTE_EDEV_LOG_ERR ("Conf value can not be NULL for dev_id=%u" , cdev_id);return -EINVAL ; }Newline?
Ack
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 960
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((conf != NULL) &&Checking conf twice?
Will rewrite as if conf == NULL/else, to avoid double checking.
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 961
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ (conf->flags & RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR)) {Else condition if the flags is not set?
There's no additional handing for case when flag is no set.
Quoted 11 lines
Quoted 11 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR) == 0) {lib/eventdev/rte_event_crypto_adapter.c +1
-0+ RTE_EDEV_LOG_ERR("Event vectorization is notsupported,"
lib/eventdev/rte_event_crypto_adapter.c +7
-0+"dev %" PRIu8" cdev %" PRIu8, id, + cdev_id); +return -ENOTSUP ; + } + + ret =rte_event_crypto_adapter_vector_limits_get ( + adapter->eventdev_id, cdev_id, &limits);
Quoted 9 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 976
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +2
-0+if (ret <0 ) { + RTE_EDEV_LOG_ERR("Failed to get event device vector"
lib/eventdev/rte_event_crypto_adapter.c +4
-0+"limits, dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + }New line? Please check other cases.
Ack
Quoted 64 lines
Quoted 64 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+if (conf->vector_sz < limits.min_sz || + conf->vector_sz > limits.max_sz || + conf->vector_timeout_ns < limits.min_timeout_ns || + conf->vector_timeout_ns > limits.max_timeout_ns || + conf->vector_mp ==NULL ) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +8
-0+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } +if (conf->vector_mp->elt_size < + (sizeof (struct rte_event_vector ) + + (sizeof (uintptr_t ) * conf->vector_sz))) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +8
-3+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } + } dev_info = &adapter->cdevs[cdev_id];@@ -990,7 +1027,7 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id, ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, dev_info->dev, queue_pair_id, - event); + conf);if (ret)return ret;@@ -1030,8 +1067,8 @@ rte_event_crypto_adapter_queue_pair_add(uint8_t id,rte_service_component_runstate_set (adapter->service_id,1 ); } -rte_eventdev_trace_crypto_adapter_queue_pair_add (id, cdev_id, event, - queue_pair_id); +rte_eventdev_trace_crypto_adapter_queue_pair_add (id, cdev_id, + queue_pair_id, conf);return 0 ;}
lib/eventdev/rte_event_crypto_adapter.c +12
-0@@ -1290,3 +1327,44 @@ rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id)return 0 ; } + +int +rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits) { +struct rte_cryptodev *cdev; +struct rte_eventdev *dev; +uint32_t cap; +int ret; + +RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET (dev_id, -EINVAL ); +
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1349
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+if (!rte_cryptodev_is_valid_dev (cdev_id)) { +RTE_EDEV_LOG_ERR ("Invalid dev_id=%" PRIu8, cdev_id); +return -EINVAL ; + } + +if (limits ==NULL ) +return -EINVAL ;Add appropriate error message like above?
Ack, will add.
Quoted 6 lines
Quoted 6 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+ + dev = &rte_eventdevs[dev_id]; + cdev =rte_cryptodev_pmd_get_dev (cdev_id); + + ret =rte_event_crypto_adapter_caps_get (dev_id, cdev_id, &cap); +if (ret) {
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1362
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+RTE_EDEV_LOG_ERR ("Failed to get adapter caps edev %" PRIu8 +"cdev %" PRIu16, dev_id, cdev_id); +return ret; + } + +if (!(cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR )) +return -ENOTSUP ;Same here.
Ack, will add.
Quoted 39 lines
Quoted 39 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+ +RTE_FUNC_PTR_OR_ERR_RET ( + *dev->dev_ops->crypto_adapter_vector_limits_get, + -ENOTSUP ); + +return dev->dev_ops->crypto_adapter_vector_limits_get ( + dev, cdev, limits); +}lib/eventdev/rte_event_crypto_adapter.h +18
-0@@ -253,6 +253,78 @@ struct rte_event_crypto_adapter_conf {*/ }; +#define RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR 0x1 +/**< This flag indicates that crypto operations processed on the +crypto +* adapter need to be vectorized +* @see rte_event_crypto_adapter_queue_conf::flags +*/ + +/** +* Adapter queue configuration structure */ struct +rte_event_crypto_adapter_queue_conf { +uint32_t flags; +/**< Flags for handling crypto operations +* @see RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR +*/ +struct rte_event ev; +/**< If HW supports cryptodev queue pair to event queue binding, +* application is expected to fill in event information. +* @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDlib/eventdev/rte_event_crypto_adapter.h +3
-0+*/ +uint16_t vector_sz; +/**< Indicates the maximum number for crypto operations to combine
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf { · line 281
Quoted 7 lines
and
lib/eventdev/rte_event_crypto_adapter.h +4
-0+* form a vector. +* @see rte_event_crypto_adapter_vector_limits::min_sz +* @see rte_event_crypto_adapter_vector_limits::max_sz +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* @see rte_event_crypto_adapter_queue_conf::rx_queue_flags
rx_queue_flags??
Typo, should be conf::flags.
Quoted 83 lines
Quoted 52 lines
lib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint64_t vector_timeout_ns; +/**< +* Indicates the maximum number of nanoseconds to wait for aggregating
lib/eventdev/rte_event_crypto_adapter.h +5
-0+* crypto operations. Should be within vectorization limits of the +* adapter +* @see rte_event_crypto_adapter_vector_limits::min_timeout_ns +* @see rte_event_crypto_adapter_vector_limits::max_timeout_ns +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +7
-0+* @see rte_event_crypto_adapter_queue_conf::flags +*/ +struct rte_mempool *vector_mp; +/**< Indicates the mempool that should be used for allocating +* rte_event_vector container. +* Should be created by using `rte_event_vector_pool_create`. +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +30
-0+* @see rte_event_crypto_adapter_queue_conf::flags. +*/ +}; + +/** +* A structure used to retrieve event crypto adapter vector limits. +*/ +struct rte_event_crypto_adapter_vector_limits { +uint16_t min_sz; +/**< Minimum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint16_t max_sz; +/**< Maximum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint8_t log2_sz; +/**< True if the size configured should be in log2. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint64_t min_timeout_ns; +/**< Minimum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns +*/ +uint64_t max_timeout_ns; +/**< Maximum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns +*/ +}; +/** * Function type used for adapter configuration callback. The callback is * used to fill in members of the struct Quoted 1 line
rte_event_crypto_adapter_conf, this @@ -392,10 +464,9 @@
rte_event_crypto_adapter_free(uint8_t id);Quoted 29 lines
* Cryptodev queue pair identifier. If
queue_pair_idis set -1,
* adapter adds all the pre configured queue pairs to the instance. *
- * @param event
- * if HW supports cryptodev queue pair to event queue binding, application is
- * expected to fill in event information, else it will be NULL.
- * @seeRTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND
+ * @param conf
+ * Additional configuration structure of type
+ * *rte_event_crypto_adapter_queue_conf*
*
* @return
* - 0: Success, queue pair added correctly.lib/eventdev/rte_event_crypto_adapter.h +1
-1@@ -405,7 +476,7 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event); + const struct rte_event_crypto_adapter_queue_conf *conf);/** * Delete a queue pair from an event crypto adapter.
lib/eventdev/rte_event_crypto_adapter.h +0
-0@@ -523,6 +594,26 @@ rte_event_crypto_adapter_service_id_get(uint8_tid,
uint32_t*service_id); int
rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id);
Quoted 13 lines
lib/eventdev/rte_event_crypto_adapter.h rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id); · line 607
Quoted 12 lines
lib/eventdev/rte_event_crypto_adapter.h +12
-0+/** +* Retrieve vector limits for a given event dev and crypto dev pair. +* @see rte_event_crypto_adapter_vector_limits +* +* @param dev_id +* Event device identifier. +* @param cdev_id +* Crypto device identifier. +* @param [out] limits +* A pointer to rte_event_crypto_adapter_vector_limits structure +that has to +* be filled. Space missing before "be filled"
Ack
Quoted 19 lines
Quoted 19 lines
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Error code on failure.
+ */lib/eventdev/rte_event_crypto_adapter.h +4
-0+int rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Enqueue a burst of crypto operations as event objects supplied in *rte_event*
* structure on an event crypto adapter designated by its event
*dev_id* through diff --gita/lib/eventdev/rte_event_eth_rx_adapter.hb/lib/eventdev/rte_event_eth_rx_adapter.h
index3608a7b2cf..c8f2936866100644lib/eventdev/rte_event_eth_rx_adapter.h +0
-0@@ -457,7 +457,8 @@ int rte_event_eth_rx_adapter_free(uint8_t id);
Quoted 9 lines
lib/eventdev/rte_event_eth_rx_adapter.h int rte_event_eth_rx_adapter_free(uint8_t id); · line 461
Quoted 7 lines
lib/eventdev/rte_event_eth_rx_adapter.h +2
-1* @see RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ * * @param conf -* Additional configuration structure of type *rte_event_eth_rx_adapter_conf* +* Additional configuration structure of type +* *rte_event_eth_rx_adapter_queue_conf* These changes are not relevant. Please consider sending separate patch.
Ack, Will send this change as a separate patch.
Quoted 33 lines
Quoted 33 lines
lib/eventdev/rte_event_eth_rx_adapter.h +0
-0* * @return * - 0: Success, Receive queue added correctly.
lib/eventdev/rte_eventdev.h +0
-0index
6a6f6ea4c1..1a737bf851100644lib/eventdev/rte_eventdev.h +0
-0@@ -1203,6 +1203,9 @@ struct rte_event_vector {#define RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR \ (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The event vector generated from eth Rx adapter. */
lib/eventdev/rte_eventdev.h +2
-0+#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV)/**< The event
+vector generated from cryptodev adapter. */#define
RTE_EVENT_TYPE_MAX0x10
/**< Maximum number of event types */ @@ -1420,6 +1423,11 @@rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);
* the private data information along with the crypto session. */lib/eventdev/rte_eventdev.h +5
-1+#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device -- 2.25.1
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 84 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Monday, September 26, 2022 4:32 PM
To: Gujjar, Abhinandan S <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 68 lines
-----Original Message-----
From: Gujjar, Abhinandan S <[email protected]>
Sent: Saturday, September 24, 2022 10:44 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: [EXT] RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeExternal Email
----------------------------------------------------------------------
Quoted 48 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Thursday, August 4, 2022 3:29 PM
To: [email protected]; Jerin Jacob <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: [email protected]; [email protected]; Volodymyr Fialko <[email protected]>
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector typeIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORinrte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits,
which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Signed-off-by Volodymyr Fialko <[email protected]>--- app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 ++- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 ++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 +++++++++++++++++- lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 ++ 14 files changed, 276 insertions(+), 43 deletions(-)
Quoted 6 lines
Quoted 4 lines
I don't see dataplane implementation of vectorization in the crypto adapter! Is it missed out in the patch?
comments inline.Right now we are targeting
crypto_cn10kPMD and ipsec-secgw event mode to support vectorization.
Is there a way to test this? When can be dataplane changes expected?
Quoted 752 lines
Quoted 14 lines
Quoted 14 lines
app/test- renamed from app/test-eventdev/test_perf_common.c +0
-0
eventdev/test_perf_common.cindex81420be73a..c770bc93f6100644app/test-eventdev/test_perf_common.c +1
-1@@ -837,14 +837,14 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf;Quoted 13 lines
app/test-eventdev/test_perf_common.c perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) · line 846
Quoted 13 lines
app/test-eventdev/test_perf_common.c +4
-4- response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); + &conf); }else {app/test-eventdev/test_perf_common.c +0
-0ret = rte_event_crypto_adapter_queue_pair_add( TEST_PERF_CA_ID, p->ca.cdev_id, p->ca.cdev_qp_id,NULL); diff
Quoted 17 lines
Quoted 17 lines
--git
a/app/test/test_event_crypto_adapter.cb/app/test/test_event_crypto_adapter.c
index2ecc7e2cea..bb617c1042100644app/test/test_event_crypto_adapter.c +4
-0@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void) static inttest_crypto_adapter_qp_add_del (void) { +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)Quoted 12 lines
Quoted 10 lines
app/test/test_event_crypto_adapter.c +1
-1if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); + TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =Quoted 2 lines
rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID,NULL); @@ -1206,6 +1210,10 @@
Quoted 15 lines
Quoted 15 lines
configure_event_crypto_adapter(enum
rte_event_crypto_adapter_modemode)app/test/test_event_crypto_adapter.c +4
-0.new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)Quoted 12 lines
Quoted 10 lines
app/test/test_event_crypto_adapter.c +0
-1if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, - TEST_CDEV_ID, TEST_CDEV_QP_ID,
&response_info);app/test/test_event_crypto_adapter.c +1
-0+ TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =Quoted 2 lines
rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID, NULL); diff--git
Quoted 28 lines
Quoted 28 lines
a/doc/guides/prog_guide/event_crypto_adapter.rstb/doc/guides/prog_guide/event_crypto_adapter.rst
index4fb5c688e0..554df7e358100644doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -201,10 +201,10 @@ capability, event information must be passedto the add API.
ret =
rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {doc/guides/prog_guide/event_crypto_adapter.rst +1
-3- struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id,&event);
doc/guides/prog_guide/event_crypto_adapter.rst +3
-0+ // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, + cdev_id, qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id,
cdev_id,qp_id, NULL);doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); }Quoted 16 lines
Quoted 6 lines
doc/guides/prog_guide/event_crypto_adapter.rst +6
-0+Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto operations +based on provided response information of +``rte_event_crypto_metadata::response_info``doc/guides/prog_guide/event_crypto_adapter.rst the ``rte_crypto_op``.
Quoted 10 lines
doc/guides/prog_guide/event_crypto_adapter.rst +10
-0+and generate a ``rte_event`` containing ``rte_event_vector`` whose +event type is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be obtained +by calling ``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capabilityindicates
Quoted 79 lines
Quoted 79 lines
doc/guides/prog_guide/event_crypto_adapter.rst +2
-0+whether PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/event/cnxk/cn10k_eventdev.c +2
-2@@ -889,11 +889,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );
CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k"); diff --
gita/drivers/event/cnxk/cn9k_eventdev.cb/drivers/event/cnxk/cn9k_eventdev.c
index2e27030049..45ed547cb0100644drivers/event/cnxk/cn9k_eventdev.c +0
-0@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(const struct
rte_eventdev*event_dev, static int cn9k_crypto_adapter_qp_add(const structrte_eventdev*event_dev,drivers/event/cnxk/cn9k_eventdev.c +2
-1const struct rte_cryptodev *cdev, - int32_t queue_pair_id, const struct rte_event *event) + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf*conf)
{drivers/event/cnxk/cn9k_eventdev.c +1
-1struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" ); CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k"); diff --git
a/drivers/event/dpaa/dpaa_eventdev.cb/drivers/event/dpaa/dpaa_eventdev.c
indexff6cc0be18..2b9ecd9fbf100644drivers/event/dpaa/dpaa_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h> @@ -775,10 +776,10 @@ static int dpaa_eventdev_crypto_queue_add(const structrte_eventdev*dev,drivers/event/dpaa/dpaa_eventdev.c +3
-3const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev);Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa/dpaa_eventdev.c +1
-1ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) { DPAA_EVENTDEV_ERR("
dpaa_sec_eventq_attachfailed: ret: %d\n", ret); diff --git
Quoted 34 lines
Quoted 34 lines
a/drivers/event/dpaa2/dpaa2_eventdev.cb/drivers/event/dpaa2/dpaa2_eventdev.c
index ffc7b8b073..0137736794 100644drivers/event/dpaa2/dpaa2_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h>drivers/event/dpaa2/dpaa2_eventdev.c +3
-3@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev);Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa2/dpaa2_eventdev.c +1
-1ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) { DPAA2_EVENTDEV_ERR("
dpaa2_sec_eventq_attachfailed: ret: %d\n", ret); diff--git
Quoted 143 lines
Quoted 143 lines
a/drivers/event/octeontx/ssovf_evdev.cb/drivers/event/octeontx/ssovf_evdev.c
index9e14e35d10..17acd8ef64100644drivers/event/octeontx/ssovf_evdev.c +2
-2@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {drivers/event/octeontx/ssovf_evdev.c +0
-0for (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) {(quoted diff) +0
-0
b/lib/eventdev/eventdev_pmd.hindex69402668d8..bcfc9cbcb2100644lib/eventdev/eventdev_pmd.h +1
-0@@ -907,6 +907,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice @@ -961,11 +962,11 @@ typedef int (
*eventdev_crypto_adapter_caps_get_t)
* - <0: Error code returned by the driver function.
*
*/lib/eventdev/eventdev_pmd.h +5
-5-typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf
*queue_conf);/**
lib/eventdev/eventdev_pmd.h +21
-0@@ -1074,6 +1075,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
lib/eventdev/eventdev_pmd.h +3
-0@@ -1339,6 +1361,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;/**< Get ethernet Rx queue stats */ diff --git
a/lib/eventdev/eventdev_trace.hb/lib/eventdev/eventdev_trace.hindex5ec43d80ee..d48cd58850100644lib/eventdev/eventdev_trace.h +4
-2@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h" @@ -271,11 +272,12 @@ RTE_TRACE_POINT( RTE_TRACE_POINT( rte_eventdev_trace_crypto_adapter_queue_pair_add,RTE_TRACE_POINT_ARGS (uint8_t adptr_id,uint8_t cdev_id, -const void *event,int32_t queue_pair_id), +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf),rte_trace_point_emit_u8 (adptr_id );rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(lib/eventdev/rte_event_crypto_adapter.c +3
-2@@ -921,11 +921,12 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { + struct rte_event_crypto_adapter_vector_limits limits;struct event_crypto_adapter *adapter; -struct rte_eventdev *dev;struct crypto_device_info *dev_info; +struct rte_eventdev *dev;uint32_t cap;int ret;@@ -951,11 +952,47 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
id,
}Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id,
Quoted 5 lines
if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) &&lib/eventdev/rte_event_crypto_adapter.c +1
-1- (event == NULL)) { + (conf == NULL)) { RTE_EDEV_LOG_ERR("Conf value can not be NULL fordev_id=%u",
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 959
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0cdev_id);return -EINVAL ; }Newline?
Ack
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 960
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((conf != NULL) &&Checking conf twice?
Will rewrite as if conf == NULL/else, to avoid double checking.
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 961
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ (conf->flags & RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR)) {Else condition if the flags is not set?
There's no additional handing for case when flag is no set.
Quoted 11 lines
Quoted 11 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR) == 0) {lib/eventdev/rte_event_crypto_adapter.c +1
-0+ RTE_EDEV_LOG_ERR("Event vectorization is notsupported,"
lib/eventdev/rte_event_crypto_adapter.c +7
-0+"dev %" PRIu8" cdev %" PRIu8, id, + cdev_id); +return -ENOTSUP ; + } + + ret =rte_event_crypto_adapter_vector_limits_get ( + adapter->eventdev_id, cdev_id, &limits);Quoted 9 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 976
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +2
-0+if (ret <0 ) { + RTE_EDEV_LOG_ERR("Failed to get event device vector"
lib/eventdev/rte_event_crypto_adapter.c +4
-0+"limits, dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + }New line? Please check other cases.
Ack
Quoted 22 lines
Quoted 22 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+if (conf->vector_sz < limits.min_sz || + conf->vector_sz > limits.max_sz || + conf->vector_timeout_ns < limits.min_timeout_ns || + conf->vector_timeout_ns > limits.max_timeout_ns || + conf->vector_mp ==NULL ) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +8
-0+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } +if (conf->vector_mp->elt_size < + (sizeof (struct rte_event_vector ) + + (sizeof (uintptr_t ) * conf->vector_sz))) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +5
-0+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } + }Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0dev_info = &adapter->cdevs[cdev_id];@@ -990,7 +1027,7 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
Quoted 41 lines
Quoted 41 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-1id, ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, dev_info->dev, queue_pair_id, - event); + conf);if (ret)return ret;@@ -1030,8 +1067,8 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
id,lib/eventdev/rte_event_crypto_adapter.c +0
-1rte_service_component_runstate_set (adapter->service_id,1 ); } - rte_eventdev_trace_crypto_adapter_queue_pair_add(id, cdev_id,event,
lib/eventdev/rte_event_crypto_adapter.c +2
-1- queue_pair_id); +rte_eventdev_trace_crypto_adapter_queue_pair_add (id, cdev_id, + queue_pair_id, conf);return 0 ; }@@ -1290,3 +1327,44 @@rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id)lib/eventdev/rte_event_crypto_adapter.c +12
-0return 0 ; } + +int +rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits) { +struct rte_cryptodev *cdev; +struct rte_eventdev *dev; +uint32_t cap; +int ret; + +RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET (dev_id, -EINVAL ); +Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1349
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+if (!rte_cryptodev_is_valid_dev (cdev_id)) { +RTE_EDEV_LOG_ERR ("Invalid dev_id=%" PRIu8, cdev_id); +return -EINVAL ; + } + +if (limits ==NULL ) +return -EINVAL ;Add appropriate error message like above?
Ack, will add.
Quoted 6 lines
Quoted 6 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+ + dev = &rte_eventdevs[dev_id]; + cdev =rte_cryptodev_pmd_get_dev (cdev_id); + + ret =rte_event_crypto_adapter_caps_get (dev_id, cdev_id, &cap); +if (ret) {Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1362
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+RTE_EDEV_LOG_ERR ("Failed to get adapter caps edev %" PRIu8 +"cdev %" PRIu16, dev_id, cdev_id); +return ret; + } + +if (!(cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR )) +return -ENOTSUP ;Same here.
Ack, will add.
Quoted 39 lines
Quoted 39 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+ +RTE_FUNC_PTR_OR_ERR_RET ( + *dev->dev_ops->crypto_adapter_vector_limits_get, + -ENOTSUP ); + +return dev->dev_ops->crypto_adapter_vector_limits_get ( + dev, cdev, limits); +}lib/eventdev/rte_event_crypto_adapter.h +18
-0@@ -253,6 +253,78 @@ struct rte_event_crypto_adapter_conf {*/ }; +#define RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR 0x1 +/**< This flag indicates that crypto operations processed on the +crypto +* adapter need to be vectorized +* @see rte_event_crypto_adapter_queue_conf::flags +*/ + +/** +* Adapter queue configuration structure */ struct +rte_event_crypto_adapter_queue_conf { +uint32_t flags; +/**< Flags for handling crypto operations +* @see RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR +*/ +struct rte_event ev; +/**< If HW supports cryptodev queue pair to event queue binding, +* application is expected to fill in event information. +* @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDlib/eventdev/rte_event_crypto_adapter.h +3
-0+*/ +uint16_t vector_sz; +/**< Indicates the maximum number for crypto operations to combine Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf { · line 281
Quoted 7 lines
and
lib/eventdev/rte_event_crypto_adapter.h +4
-0+* form a vector. +* @see rte_event_crypto_adapter_vector_limits::min_sz +* @see rte_event_crypto_adapter_vector_limits::max_sz +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* @see rte_event_crypto_adapter_queue_conf::rx_queue_flags
rx_queue_flags??Typo, should be
conf::flags.Quoted 46 lines
Quoted 46 lines
lib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint64_t vector_timeout_ns; +/**< +* Indicates the maximum number of nanoseconds to wait for aggregating
lib/eventdev/rte_event_crypto_adapter.h +5
-0+* crypto operations. Should be within vectorization limits of the +* adapter +* @see rte_event_crypto_adapter_vector_limits::min_timeout_ns +* @see rte_event_crypto_adapter_vector_limits::max_timeout_ns +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +7
-0+* @see rte_event_crypto_adapter_queue_conf::flags +*/ +struct rte_mempool *vector_mp; +/**< Indicates the mempool that should be used for allocating +* rte_event_vector container. +* Should be created by using `rte_event_vector_pool_create`. +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +27
-0+* @see rte_event_crypto_adapter_queue_conf::flags. +*/ +}; + +/** +* A structure used to retrieve event crypto adapter vector limits. +*/ +struct rte_event_crypto_adapter_vector_limits { +uint16_t min_sz; +/**< Minimum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint16_t max_sz; +/**< Maximum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint8_t log2_sz; +/**< True if the size configured should be in log2. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint64_t min_timeout_ns; +/**< Minimum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns +*/ +uint64_t max_timeout_ns; +/**< Maximum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns Quoted 16 lines
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.h +3
-0+*/ +}; +/** * Function type used for adapter configuration callback. The callback is * used to fill in members of the struct
rte_event_crypto_adapter_conf, this @@ -392,10 +464,9 @@
rte_event_crypto_adapter_free(uint8_t id);Quoted 8 lines
* Cryptodev queue pair identifier. If
queue_pair_idis set -1,
* adapter adds all the pre configured queue pairs to the instance. *
- * @param event
- * if HW supports cryptodev queue pair to event queue binding, application is
- * expected to fill in event information, else it will be NULL.
- * @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDQuoted 21 lines
Quoted 21 lines
+ * @param conf
+ * Additional configuration structure of type
+ * *rte_event_crypto_adapter_queue_conf*
*
* @return
* - 0: Success, queue pair added correctly.lib/eventdev/rte_event_crypto_adapter.h +1
-1@@ -405,7 +476,7 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event); + const struct rte_event_crypto_adapter_queue_conf *conf);/** * Delete a queue pair from an event crypto adapter.
lib/eventdev/rte_event_crypto_adapter.h +0
-0@@ -523,6 +594,26 @@ rte_event_crypto_adapter_service_id_get(uint8_tid,
uint32_t*service_id); int
rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id);Quoted 13 lines
lib/eventdev/rte_event_crypto_adapter.h rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id); · line 607
Quoted 12 lines
lib/eventdev/rte_event_crypto_adapter.h +12
-0+/** +* Retrieve vector limits for a given event dev and crypto dev pair. +* @see rte_event_crypto_adapter_vector_limits +* +* @param dev_id +* Event device identifier. +* @param cdev_id +* Crypto device identifier. +* @param [out] limits +* A pointer to rte_event_crypto_adapter_vector_limits structure +that has to +* be filled. Space missing before "be filled"
Ack
Quoted 21 lines
Quoted 21 lines
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Error code on failure.
+ */lib/eventdev/rte_event_crypto_adapter.h +4
-0+int rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Enqueue a burst of crypto operations as event objects supplied in
*rte_event*
* structure on an event crypto adapter designated by its event
*dev_id* through diff --gita/lib/eventdev/rte_event_eth_rx_adapter.hb/lib/eventdev/rte_event_eth_rx_adapter.h
index3608a7b2cf..c8f2936866100644lib/eventdev/rte_event_eth_rx_adapter.h +0
-0@@ -457,7 +457,8 @@ int rte_event_eth_rx_adapter_free(uint8_t id);Quoted 9 lines
lib/eventdev/rte_event_eth_rx_adapter.h int rte_event_eth_rx_adapter_free(uint8_t id); · line 461
Quoted 7 lines
lib/eventdev/rte_event_eth_rx_adapter.h +2
-1* @see RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ * * @param conf -* Additional configuration structure of type *rte_event_eth_rx_adapter_conf* +* Additional configuration structure of type +* *rte_event_eth_rx_adapter_queue_conf* These changes are not relevant. Please consider sending separate patch.
Ack, Will send this change as a separate patch.
Quoted 10 lines
lib/eventdev/rte_eventdev.h struct rte_event_vector { · line 1203
Quoted 10 lines
lib/eventdev/rte_event_eth_rx_adapter.h +0
-0* * @return * - 0: Success, Receive queue added correctly.
(quoted diff) +0
-0
b/lib/eventdev/rte_eventdev.hindex6a6f6ea4c1..1a737bf851100644lib/eventdev/rte_eventdev.h +0
-0@@ -1203,6 +1203,9 @@ struct rte_event_vector {#define RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR \
Quoted 1 line
lib/eventdev/rte_eventdev.h struct rte_event_vector { · line 1204
Quoted 1 line
lib/eventdev/rte_eventdev.h +0
-0(RTE_EVENT_TYPE_VECTOR |RTE_EVENT_TYPE_ETH_RX_ADAPTER )/**< The
Quoted 22 lines
Quoted 22 lines
event vector generated from eth Rx adapter. */
lib/eventdev/rte_eventdev.h +2
-0+#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV)/**< The event
+vector generated from cryptodev adapter. */#define
RTE_EVENT_TYPE_MAX0x10
/**< Maximum number of event types */ @@ -1420,6 +1423,11 @@rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);
* the private data information along with the crypto session. */lib/eventdev/rte_eventdev.h +5
-1+#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device -- 2.25.1
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 103 lines
-----Original Message-----
From: Gujjar, Abhinandan S <[email protected]>
Sent: Tuesday, September 27, 2022 11:05 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: [EXT] RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeExternal Email
----------------------------------------------------------------------
Quoted 86 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Monday, September 26, 2022 4:32 PM
To: Gujjar, Abhinandan S <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 70 lines
-----Original Message-----
From: Gujjar, Abhinandan S <[email protected]>
Sent: Saturday, September 24, 2022 10:44 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: [EXT] RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeExternal Email
--------------------------------------------------------------------
--Quoted 49 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Thursday, August 4, 2022 3:29 PM
To: [email protected]; Jerin Jacob <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: [email protected]; [email protected]; Volodymyr Fialko <[email protected]>
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector typeIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORinrte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits,
which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Signed-off-by Volodymyr Fialko <[email protected]>--- app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 ++- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 ++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 +++++++++++++++++- lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 ++ 14 files changed, 276 insertions(+), 43 deletions(-)
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
I don't see dataplane implementation of vectorization in the crypto adapter! Is it missed out in the patch?
comments inline.Right now we are targeting
crypto_cn10kPMD and ipsec-secgw event mode to support vectorization.Is there a way to test this? When can be dataplane changes expected?
If the spec looks okay, support in s/w crypto adapter and other h/w PMDs can be added by respective maintainers. Currently, we are adding library change, support for one PMD and an application to test the feature. Feature is exposed with capability flag to not break existing functionality.
Quoted 756 lines
Quoted 756 lines
Quoted 14 lines
Quoted 14 lines
app/test- renamed from app/test-eventdev/test_perf_common.c +0
-0
eventdev/test_perf_common.cindex81420be73a..c770bc93f6100644app/test-eventdev/test_perf_common.c +1
-1@@ -837,14 +837,14 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf;Quoted 13 lines
app/test-eventdev/test_perf_common.c perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) · line 846
Quoted 13 lines
app/test-eventdev/test_perf_common.c +4
-4- response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); + &conf); }else {app/test-eventdev/test_perf_common.c +0
-0ret = rte_event_crypto_adapter_queue_pair_add( TEST_PERF_CA_ID, p->ca.cdev_id, p->ca.cdev_qp_id,NULL); diff
Quoted 18 lines
Quoted 18 lines
--git
a/app/test/test_event_crypto_adapter.cb/app/test/test_event_crypto_adapter.c
index2ecc7e2cea..bb617c1042100644app/test/test_event_crypto_adapter.c +0
-0@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void) staticint
test_crypto_adapter_qp_add_del(void)
{app/test/test_event_crypto_adapter.c +4
-0+struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)Quoted 12 lines
Quoted 10 lines
app/test/test_event_crypto_adapter.c +1
-1if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); + TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =Quoted 2 lines
rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID,NULL); @@ -1206,6 +1210,10 @@
Quoted 15 lines
Quoted 15 lines
configure_event_crypto_adapter(enum
rte_event_crypto_adapter_modemode)app/test/test_event_crypto_adapter.c +4
-0.new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)Quoted 12 lines
Quoted 10 lines
app/test/test_event_crypto_adapter.c +0
-1if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, - TEST_CDEV_ID, TEST_CDEV_QP_ID,
&response_info);app/test/test_event_crypto_adapter.c +1
-0+ TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =Quoted 2 lines
rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID, NULL); diff--git
Quoted 28 lines
Quoted 28 lines
a/doc/guides/prog_guide/event_crypto_adapter.rstb/doc/guides/prog_guide/event_crypto_adapter.rst
index4fb5c688e0..554df7e358100644doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -201,10 +201,10 @@ capability, event information must be passedto the add API.
ret =
rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {doc/guides/prog_guide/event_crypto_adapter.rst +1
-3- struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id,&event);
doc/guides/prog_guide/event_crypto_adapter.rst +3
-0+ // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, + cdev_id, qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id,
cdev_id,qp_id, NULL);doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); }Quoted 16 lines
Quoted 6 lines
doc/guides/prog_guide/event_crypto_adapter.rst +6
-0+Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto +operations based on provided response information of +``rte_event_crypto_metadata::response_info``doc/guides/prog_guide/event_crypto_adapter.rst the ``rte_crypto_op``.
Quoted 10 lines
doc/guides/prog_guide/event_crypto_adapter.rst +10
-0+and generate a ``rte_event`` containing ``rte_event_vector`` +whose event type is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be +obtained by calling ``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capabilityindicates
Quoted 80 lines
Quoted 80 lines
doc/guides/prog_guide/event_crypto_adapter.rst +2
-0+whether PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/event/cnxk/cn10k_eventdev.c +2
-2@@ -889,11 +889,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );
CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k"); diff --
gita/drivers/event/cnxk/cn9k_eventdev.cb/drivers/event/cnxk/cn9k_eventdev.c
index2e27030049..45ed547cb0100644drivers/event/cnxk/cn9k_eventdev.c +0
-0@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(const struct
rte_eventdev*event_dev, static int cn9k_crypto_adapter_qp_add(const structrte_eventdev*event_dev,drivers/event/cnxk/cn9k_eventdev.c +2
-1const struct rte_cryptodev *cdev, - int32_t queue_pair_id, const struct rte_event *event) + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf*conf)
{drivers/event/cnxk/cn9k_eventdev.c +1
-2struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" ); diff --git a/drivers/event/dpaa/dpaa_eventdev.c
b/drivers/event/dpaa/dpaa_eventdev.c
indexff6cc0be18..2b9ecd9fbf100644drivers/event/dpaa/dpaa_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h> @@ -775,10
+776,10 @@ static int dpaa_eventdev_crypto_queue_add(const structrte_eventdev*dev,drivers/event/dpaa/dpaa_eventdev.c +3
-3const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev);Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa/dpaa_eventdev.c +1
-1ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) { DPAA_EVENTDEV_ERR("
dpaa_sec_eventq_attachfailed: ret: %d\n", ret); diff --git
Quoted 34 lines
Quoted 34 lines
a/drivers/event/dpaa2/dpaa2_eventdev.cb/drivers/event/dpaa2/dpaa2_eventdev.c
index ffc7b8b073..0137736794 100644drivers/event/dpaa2/dpaa2_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h>drivers/event/dpaa2/dpaa2_eventdev.c +3
-3@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1)return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev);Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa2/dpaa2_eventdev.c +1
-1ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) { DPAA2_EVENTDEV_ERR("
dpaa2_sec_eventq_attachfailed: ret: %d\n", ret); diff--git
Quoted 143 lines
Quoted 143 lines
a/drivers/event/octeontx/ssovf_evdev.cb/drivers/event/octeontx/ssovf_evdev.c
index9e14e35d10..17acd8ef64100644drivers/event/octeontx/ssovf_evdev.c +2
-2@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {drivers/event/octeontx/ssovf_evdev.c +0
-0for (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) {(quoted diff) +0
-0
b/lib/eventdev/eventdev_pmd.hindex69402668d8..bcfc9cbcb2100644lib/eventdev/eventdev_pmd.h +1
-0@@ -907,6 +907,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice @@ -961,11 +962,11 @@ typedef int (
*eventdev_crypto_adapter_caps_get_t)
* - <0: Error code returned by the driver function.
*
*/lib/eventdev/eventdev_pmd.h +5
-5-typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf
*queue_conf);/**
lib/eventdev/eventdev_pmd.h +21
-0@@ -1074,6 +1075,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
lib/eventdev/eventdev_pmd.h +3
-0@@ -1339,6 +1361,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;/**< Get ethernet Rx queue stats */ diff --git
a/lib/eventdev/eventdev_trace.hb/lib/eventdev/eventdev_trace.hindex5ec43d80ee..d48cd58850100644lib/eventdev/eventdev_trace.h +4
-2@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h" @@ -271,11 +272,12 @@ RTE_TRACE_POINT( RTE_TRACE_POINT( rte_eventdev_trace_crypto_adapter_queue_pair_add,RTE_TRACE_POINT_ARGS (uint8_t adptr_id,uint8_t cdev_id, -const void *event,int32_t queue_pair_id), +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf),rte_trace_point_emit_u8 (adptr_id );rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(lib/eventdev/rte_event_crypto_adapter.c +3
-2@@ -921,11 +921,12 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { + struct rte_event_crypto_adapter_vector_limits limits;struct event_crypto_adapter *adapter; -struct rte_eventdev *dev;struct crypto_device_info *dev_info; +struct rte_eventdev *dev;uint32_t cap;int ret;@@ -951,11 +952,47 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
id,
}Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id,
Quoted 5 lines
if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) &&lib/eventdev/rte_event_crypto_adapter.c +1
-1- (event == NULL)) { + (conf == NULL)) { RTE_EDEV_LOG_ERR("Conf value can not be NULL fordev_id=%u",
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 959
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0cdev_id);return -EINVAL ; }Newline?
Ack
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 960
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((conf != NULL) &&Checking conf twice?
Will rewrite as if conf == NULL/else, to avoid double checking.
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 961
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ (conf->flags & RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR)) {Else condition if the flags is not set?
There's no additional handing for case when flag is no set.
Quoted 11 lines
Quoted 11 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR) == 0) {lib/eventdev/rte_event_crypto_adapter.c +1
-0+ RTE_EDEV_LOG_ERR("Event vectorization is notsupported,"
lib/eventdev/rte_event_crypto_adapter.c +7
-0+"dev %" PRIu8" cdev %" PRIu8, id, + cdev_id); +return -ENOTSUP ; + } + + ret =rte_event_crypto_adapter_vector_limits_get ( + adapter->eventdev_id, cdev_id, &limits);Quoted 9 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 976
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +2
-0+if (ret <0 ) { + RTE_EDEV_LOG_ERR("Failed to get event device vector"
lib/eventdev/rte_event_crypto_adapter.c +4
-0+"limits, dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + }New line? Please check other cases.
Ack
Quoted 22 lines
Quoted 22 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+if (conf->vector_sz < limits.min_sz || + conf->vector_sz > limits.max_sz || + conf->vector_timeout_ns < limits.min_timeout_ns || + conf->vector_timeout_ns > limits.max_timeout_ns || + conf->vector_mp ==NULL ) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +8
-0+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } +if (conf->vector_mp->elt_size < + (sizeof (struct rte_event_vector ) + + (sizeof (uintptr_t ) * conf->vector_sz))) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +5
-0+" dev %" PRIu8" cdev %" PRIu8, + id, cdev_id); +return -EINVAL ; + } + }Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0dev_info = &adapter->cdevs[cdev_id];@@ -990,7 +1027,7 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
Quoted 41 lines
Quoted 41 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-1id, ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, dev_info->dev, queue_pair_id, - event); + conf);if (ret)return ret;@@ -1030,8 +1067,8 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
id,lib/eventdev/rte_event_crypto_adapter.c +0
-1rte_service_component_runstate_set (adapter->service_id,1 ); } - rte_eventdev_trace_crypto_adapter_queue_pair_add(id, cdev_id,event,
lib/eventdev/rte_event_crypto_adapter.c +2
-1- queue_pair_id); +rte_eventdev_trace_crypto_adapter_queue_pair_add (id, cdev_id, + queue_pair_id, conf);return 0 ; }@@ -1290,3 +1327,44 @@rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id)lib/eventdev/rte_event_crypto_adapter.c +12
-0return 0 ; } + +int +rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits) { +struct rte_cryptodev *cdev; +struct rte_eventdev *dev; +uint32_t cap; +int ret; + +RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET (dev_id, -EINVAL ); +Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1349
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+if (!rte_cryptodev_is_valid_dev (cdev_id)) { +RTE_EDEV_LOG_ERR ("Invalid dev_id=%" PRIu8, cdev_id); +return -EINVAL ; + } + +if (limits ==NULL ) +return -EINVAL ;Add appropriate error message like above?
Ack, will add.
Quoted 6 lines
Quoted 6 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0+ + dev = &rte_eventdevs[dev_id]; + cdev =rte_cryptodev_pmd_get_dev (cdev_id); + + ret =rte_event_crypto_adapter_caps_get (dev_id, cdev_id, &cap); +if (ret) {Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1362
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+RTE_EDEV_LOG_ERR ("Failed to get adapter caps edev %" PRIu8 +"cdev %" PRIu16, dev_id, cdev_id); +return ret; + } + +if (!(cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR )) +return -ENOTSUP ;Same here.
Ack, will add.
Quoted 40 lines
Quoted 40 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+ +RTE_FUNC_PTR_OR_ERR_RET ( + *dev->dev_ops->crypto_adapter_vector_limits_get, + -ENOTSUP ); + +return dev->dev_ops->crypto_adapter_vector_limits_get ( + dev, cdev, limits); +}lib/eventdev/rte_event_crypto_adapter.h +18
-0@@ -253,6 +253,78 @@ struct rte_event_crypto_adapter_conf {*/ }; +#define RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR 0x1 +/**< This flag indicates that crypto operations processed on the +crypto +* adapter need to be vectorized +* @see rte_event_crypto_adapter_queue_conf::flags +*/ + +/** +* Adapter queue configuration structure */ struct +rte_event_crypto_adapter_queue_conf { +uint32_t flags; +/**< Flags for handling crypto operations +* @see RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR +*/ +struct rte_event ev; +/**< If HW supports cryptodev queue pair to event queue binding, +* application is expected to fill in event information. +* @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDlib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint16_t vector_sz; +/**< Indicates the maximum number for crypto operations to +combine Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf { · line 281
Quoted 7 lines
and
lib/eventdev/rte_event_crypto_adapter.h +4
-0+* form a vector. +* @see rte_event_crypto_adapter_vector_limits::min_sz +* @see rte_event_crypto_adapter_vector_limits::max_sz +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* @see rte_event_crypto_adapter_queue_conf::rx_queue_flags
rx_queue_flags??Typo, should be
conf::flags.Quoted 46 lines
Quoted 46 lines
lib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint64_t vector_timeout_ns; +/**< +* Indicates the maximum number of nanoseconds to wait for aggregating
lib/eventdev/rte_event_crypto_adapter.h +5
-0+* crypto operations. Should be within vectorization limits of the +* adapter +* @see rte_event_crypto_adapter_vector_limits::min_timeout_ns +* @see rte_event_crypto_adapter_vector_limits::max_timeout_ns +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +7
-0+* @see rte_event_crypto_adapter_queue_conf::flags +*/ +struct rte_mempool *vector_mp; +/**< Indicates the mempool that should be used for allocating +* rte_event_vector container. +* Should be created by using `rte_event_vector_pool_create`. +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is set in
lib/eventdev/rte_event_crypto_adapter.h +27
-0+* @see rte_event_crypto_adapter_queue_conf::flags. +*/ +}; + +/** +* A structure used to retrieve event crypto adapter vector limits. +*/ +struct rte_event_crypto_adapter_vector_limits { +uint16_t min_sz; +/**< Minimum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint16_t max_sz; +/**< Maximum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint8_t log2_sz; +/**< True if the size configured should be in log2. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint64_t min_timeout_ns; +/**< Minimum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns +*/ +uint64_t max_timeout_ns; +/**< Maximum vector timeout configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_timeout_ns Quoted 16 lines
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.h +3
-0+*/ +}; +/** * Function type used for adapter configuration callback. The callback is * used to fill in members of the struct
rte_event_crypto_adapter_conf, this @@ -392,10 +464,9 @@
rte_event_crypto_adapter_free(uint8_t id);Quoted 8 lines
* Cryptodev queue pair identifier. If
queue_pair_idis set -1,
* adapter adds all the pre configured queue pairs to the instance. *
- * @param event
- * if HW supports cryptodev queue pair to event queue binding, application is
- * expected to fill in event information, else it will be NULL.
- * @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDQuoted 22 lines
Quoted 22 lines
+ * @param conf
+ * Additional configuration structure of type
+ * *rte_event_crypto_adapter_queue_conf*
*
* @return
* - 0: Success, queue pair added correctly.lib/eventdev/rte_event_crypto_adapter.h +1
-1@@ -405,7 +476,7 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event); + const struct rte_event_crypto_adapter_queue_conf *conf);/** * Delete a queue pair from an event crypto adapter.
lib/eventdev/rte_event_crypto_adapter.h +0
-0@@ -523,6 +594,26 @@rte_event_crypto_adapter_service_id_get(uint8_t
id,uint32_t*service_id); int
rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id);Quoted 13 lines
lib/eventdev/rte_event_crypto_adapter.h rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id); · line 607
Quoted 12 lines
lib/eventdev/rte_event_crypto_adapter.h +12
-0+/** +* Retrieve vector limits for a given event dev and crypto dev pair. +* @see rte_event_crypto_adapter_vector_limits +* +* @param dev_id +* Event device identifier. +* @param cdev_id +* Crypto device identifier. +* @param [out] limits +* A pointer to rte_event_crypto_adapter_vector_limits structure +that has to +* be filled. Space missing before "be filled"
Ack
Quoted 21 lines
Quoted 21 lines
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Error code on failure.
+ */lib/eventdev/rte_event_crypto_adapter.h +4
-0+int rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Enqueue a burst of crypto operations as event objects supplied in
*rte_event*
* structure on an event crypto adapter designated by its event
*dev_id* through diff --gita/lib/eventdev/rte_event_eth_rx_adapter.hb/lib/eventdev/rte_event_eth_rx_adapter.h
index3608a7b2cf..c8f2936866100644lib/eventdev/rte_event_eth_rx_adapter.h +0
-0@@ -457,7 +457,8 @@ int rte_event_eth_rx_adapter_free(uint8_t id);Quoted 9 lines
lib/eventdev/rte_event_eth_rx_adapter.h int rte_event_eth_rx_adapter_free(uint8_t id); · line 461
Quoted 7 lines
lib/eventdev/rte_event_eth_rx_adapter.h +2
-1* @see RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ * * @param conf -* Additional configuration structure of type *rte_event_eth_rx_adapter_conf* +* Additional configuration structure of type +* *rte_event_eth_rx_adapter_queue_conf* These changes are not relevant. Please consider sending separate patch.
Ack, Will send this change as a separate patch.
Quoted 10 lines
Quoted 10 lines
lib/eventdev/rte_event_eth_rx_adapter.h +0
-0* * @return * - 0: Success, Receive queue added correctly.
(quoted diff) +0
-0
b/lib/eventdev/rte_eventdev.hindex6a6f6ea4c1..1a737bf851100644lib/eventdev/rte_eventdev.h +0
-0@@ -1203,6 +1203,9 @@ struct rte_event_vector { #define
RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR\
Quoted 1 line
Quoted 1 line
(
RTE_EVENT_TYPE_VECTOR|RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The
Quoted 22 lines
Quoted 22 lines
event vector generated from eth Rx adapter. */
lib/eventdev/rte_eventdev.h +2
-0+#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV)/**< The event
+vector generated from cryptodev adapter. */#define
RTE_EVENT_TYPE_MAX0x10
/**< Maximum number of event types */ @@ -1420,6 +1423,11 @@rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);
* the private data information along with the crypto session. */lib/eventdev/rte_eventdev.h +5
-1+#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device -- 2.25.1
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 131 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Tuesday, September 27, 2022 2:55 PM
To: Gujjar, Abhinandan S <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 14 lines
-----Original Message-----
From: Gujjar, Abhinandan S <[email protected]>
Sent: Tuesday, September 27, 2022 11:05 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: [EXT] RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 49 lines
External Email
----------------------------------------------------------------------
Quoted 44 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Monday, September 26, 2022 4:32 PM
To: Gujjar, Abhinandan S <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 28 lines
-----Original Message-----
From: Gujjar, Abhinandan S <[email protected]>
Sent: Saturday, September 24, 2022 10:44 AM
To: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: [EXT] RE: [PATCH 1/3] eventdev: introduce event cryptodev vector typeExternal Email
------------------------------------------------------------------
--
--Quoted 7 lines
-----Original Message-----
From: Volodymyr Fialko <[email protected]>
Sent: Thursday, August 4, 2022 3:29 PM
To: [email protected]; Jerin Jacob <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh <[email protected]>; Shijith Thotton <[email protected]>; Hemant AgrawalQuoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>
Cc: [email protected]; [email protected]; Volodymyr Fialko <[email protected]>
Subject: [PATCH 1/3] eventdev: introduce event cryptodev vector typeIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type is
RTE_EVENT_TYPE_CRYPTODEV_VECTOR.Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Application should set
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTORin
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
rte_event_crypto_adapter_queue_conf::flagand provide vector configuration with respect ofrte_event_crypto_adapter_vector_limits,
which could be obtained by callingrte_event_crypto_adapter_vector_limits_get, to enable vectorization.The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in
rte_event_crypto_metadata::response_info.Updated drivers and tests accordingly to new API.
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Signed-off-by Volodymyr Fialko <[email protected]>--- app/test-eventdev/test_perf_common.c | 10 +- app/test/test_event_crypto_adapter.c | 12 ++- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +-Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 90 ++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101+++++++++++++++++-
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
lib/eventdev/rte_event_eth_rx_adapter.h | 3 +- lib/eventdev/rte_eventdev.h | 8 ++ 14 files changed, 276 insertions(+), 43 deletions(-)I don't see dataplane implementation of vectorization in the crypto
adapter!
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Is it missed out in the patch?
comments inline.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Right now we are targeting
crypto_cn10kPMD and ipsec-secgw event mode to support vectorization.Is there a way to test this? When can be dataplane changes expected?
If the spec looks okay, support in s/w crypto adapter and other h/w PMDs can be added by respective maintainers. Currently, we are adding library change, support for one PMD and an application to test the feature. Feature is exposed with capability flag to not break existing functionality.
Got it. How do I test this feature without data plane changes?
This design is right now tested for cn10k, I am not sure this works for sw adapter. If there is a way to test this, please let me know.
I need to have perf data with and without vectorization support to approve.
Quoted 796 lines
Quoted 103 lines
Quoted 103 lines
Quoted 15 lines
Quoted 15 lines
app/test- renamed from app/test-eventdev/test_perf_common.c +0
-0
eventdev/test_perf_common.cindex81420be73a..c770bc93f6100644app/test-eventdev/test_perf_common.c +1
-1@@ -837,14 +837,14 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf;Quoted 13 lines
app/test-eventdev/test_perf_common.c perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) · line 846
Quoted 13 lines
app/test-eventdev/test_perf_common.c +4
-4- response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); + &conf); }else {app/test-eventdev/test_perf_common.c +0
-0ret = rte_event_crypto_adapter_queue_pair_add( TEST_PERF_CA_ID, p->ca.cdev_id, p->ca.cdev_qp_id,NULL); diff
Quoted 18 lines
Quoted 18 lines
--git
a/app/test/test_event_crypto_adapter.cb/app/test/test_event_crypto_adapter.c
index2ecc7e2cea..bb617c1042100644app/test/test_event_crypto_adapter.c +0
-0@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void) staticint
test_crypto_adapter_qp_add_del(void)
{app/test/test_event_crypto_adapter.c +4
-0+struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)Quoted 12 lines
Quoted 10 lines
app/test/test_event_crypto_adapter.c +1
-1if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); + TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =Quoted 2 lines
rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID,NULL); @@ -1206,6 +1210,10 @@
Quoted 15 lines
Quoted 15 lines
configure_event_crypto_adapter(enum
rte_event_crypto_adapter_modemode)app/test/test_event_crypto_adapter.c +4
-0.new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)Quoted 12 lines
Quoted 10 lines
app/test/test_event_crypto_adapter.c +0
-1if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID, - TEST_CDEV_ID, TEST_CDEV_QP_ID,
&response_info);app/test/test_event_crypto_adapter.c +1
-0+ TEST_CDEV_ID, TEST_CDEV_QP_ID,
&queue_conf);app/test/test_event_crypto_adapter.c +0
-0}else ret =Quoted 2 lines
rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID,TEST_CDEV_QP_ID, NULL); diff--git
Quoted 15 lines
Quoted 15 lines
a/doc/guides/prog_guide/event_crypto_adapter.rstb/doc/guides/prog_guide/event_crypto_adapter.rst
index4fb5c688e0..554df7e358100644doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -201,10 +201,10 @@ capability, event information must bepassed to the add API.
ret =
rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {doc/guides/prog_guide/event_crypto_adapter.rst +2
-1- struct rte_event event; + struct rte_event_crypto_adapter_queue_conf + conf;Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
doc/guides/prog_guide/event_crypto_adapter.rst
Quoted 2 lines
doc/guides/prog_guide/event_crypto_adapter.rst +0
-2- // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id,
qp_id,Quoted 34 lines
Quoted 34 lines
Quoted 12 lines
Quoted 12 lines
&event);
doc/guides/prog_guide/event_crypto_adapter.rst +3
-0+ // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, + cdev_id, qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id,
cdev_id,qp_id, NULL);doc/guides/prog_guide/event_crypto_adapter.rst +0
-0@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); }Quoted 16 lines
Quoted 6 lines
doc/guides/prog_guide/event_crypto_adapter.rst +6
-0+Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto +operations based on provided response information of +``rte_event_crypto_metadata::response_info``doc/guides/prog_guide/event_crypto_adapter.rst the ``rte_crypto_op``. · line 309
Quoted 10 lines
doc/guides/prog_guide/event_crypto_adapter.rst +10
-0+and generate a ``rte_event`` containing ``rte_event_vector`` +whose event type is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide +vector configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be +obtained by calling ``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capabilityindicates
Quoted 5 lines
Quoted 5 lines
doc/guides/prog_guide/event_crypto_adapter.rst +2
-0+whether PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/event/cnxk/cn10k_eventdev.c static int · line 892
Quoted 11 lines
drivers/event/cnxk/cn10k_eventdev.c +1
-1@@ -889,11 +889,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct
rte_event_crypto_adapter_queue_confQuoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/event/cnxk/cn10k_eventdev.c +1
-1*conf) {struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/event/cnxk/cn10k_eventdev.c +0
-0CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );
CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k"); diff
-- gita/drivers/event/cnxk/cn9k_eventdev.cb/drivers/event/cnxk/cn9k_eventdev.c
index2e27030049..45ed547cb0100644
---a/drivers/event/cnxk/cn9k_eventdev.cQuoted 8 lines
Quoted 8 lines
drivers/event/cnxk/cn10k_eventdev.c
Quoted 8 lines
+++
b/drivers/event/cnxk/cn9k_eventdev.cdrivers/event/cnxk/cn10k_eventdev.c +0
-0@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(conststruct
rte_eventdev*event_dev, static int cn9k_crypto_adapter_qp_add(const structrte_eventdev*event_dev,drivers/event/cnxk/cn10k_eventdev.c +2
-1const struct rte_cryptodev *cdev, - int32_t queue_pair_id, const struct rte_event *event) + int32_t queue_pair_id, + const struct
rte_event_crypto_adapter_queue_confQuoted 21 lines
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
*conf)
{drivers/event/cnxk/cn10k_eventdev.c +1
-2struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" ); diff --git a/drivers/event/dpaa/dpaa_eventdev.c
b/drivers/event/dpaa/dpaa_eventdev.c
indexff6cc0be18..2b9ecd9fbf100644drivers/event/dpaa/dpaa_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h> @@Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/event/dpaa/dpaa_eventdev.c static int
Quoted 8 lines
-775,10
+776,10 @@ static int dpaa_eventdev_crypto_queue_add(const +structrte_eventdev*dev,drivers/event/dpaa/dpaa_eventdev.c +1
-1const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf*conf)
Quoted 35 lines
Quoted 35 lines
Quoted 15 lines
Quoted 15 lines
{
drivers/event/dpaa/dpaa_eventdev.c +2
-2struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1) return dpaa_eventdev_crypto_queue_add_all(dev, - cryptodev, ev); + cryptodev, &conf->ev);Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa/dpaa_eventdev.c +1
-1ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) { DPAA_EVENTDEV_ERR("
dpaa_sec_eventq_attachfailed: ret: %d\n", ret); diff --git
Quoted 13 lines
Quoted 13 lines
a/drivers/event/dpaa2/dpaa2_eventdev.cb/drivers/event/dpaa2/dpaa2_eventdev.c
index ffc7b8b073..0137736794 100644drivers/event/dpaa2/dpaa2_eventdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include<
rte_event_eth_tx_adapter.h>Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa2/dpaa2_eventdev.c static int · line 869
Quoted 6 lines
drivers/event/dpaa2/dpaa2_eventdev.c +1
-1@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf*conf)
Quoted 22 lines
Quoted 22 lines
Quoted 15 lines
Quoted 15 lines
drivers/event/dpaa2/dpaa2_eventdev.c +2
-2{struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, if (rx_queue_id == -1) return dpaa2_eventdev_crypto_queue_add_all(dev, - cryptodev, ev); + cryptodev, &conf->ev);Quoted 6 lines
Quoted 6 lines
drivers/event/dpaa2/dpaa2_eventdev.c +1
-1ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) { DPAA2_EVENTDEV_ERR("
dpaa2_sec_eventq_attachfailed: ret: %d\n", ret); diff--git
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/event/octeontx/ssovf_evdev.c static int · line 748
Quoted 11 lines
a/drivers/event/octeontx/ssovf_evdev.cb/drivers/event/octeontx/ssovf_evdev.c
index9e14e35d10..17acd8ef64100644drivers/event/octeontx/ssovf_evdev.c +1
-1@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct
rte_event_crypto_adapter_queue_confQuoted 57 lines
Quoted 57 lines
Quoted 57 lines
Quoted 57 lines
drivers/event/octeontx/ssovf_evdev.c +1
-1*conf) {struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {for (
qp_id= 0;qp_id<cdev->data->nb_queue_pairs; qp_id++)
{ diff --gita/lib/eventdev/eventdev_pmd.hb/lib/eventdev/eventdev_pmd.hindex69402668d8..bcfc9cbcb2100644lib/eventdev/eventdev_pmd.h +1
-0@@ -907,6 +907,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice @@ -961,11 +962,11 @@ typedef int (
*eventdev_crypto_adapter_caps_get_t)
* - <0: Error code returned by the driver function.
*
*/lib/eventdev/eventdev_pmd.h +5
-5-typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf
*queue_conf);/**
lib/eventdev/eventdev_pmd.h +11
-0@@ -1074,6 +1075,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/eventdev_pmd.h typedef int (*eventdev_crypto_adapter_stats_reset)
Quoted 8 lines
lib/eventdev/eventdev_pmd.h +8
-0+* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( + const struct rte_eventdev *dev, const struct rte_cryptodev*cdev,
Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
lib/eventdev/eventdev_pmd.h +2
-0+ struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
lib/eventdev/eventdev_pmd.h +3
-0@@ -1339,6 +1361,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;/**< Get ethernet Rx queue stats */ diff --git
a/lib/eventdev/eventdev_trace.hb/lib/eventdev/eventdev_trace.hindex5ec43d80ee..d48cd58850100644lib/eventdev/eventdev_trace.h +1
-0@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h" Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
lib/eventdev/eventdev_trace.h RTE_TRACE_POINT( RTE_TRACE_POINT( · line 275
Quoted 6 lines
lib/eventdev/eventdev_trace.h +2
-1@@ -271,11 +272,12 @@ RTE_TRACE_POINT( RTE_TRACE_POINT( rte_eventdev_trace_crypto_adapter_queue_pair_add,RTE_TRACE_POINT_ARGS (uint8_t adptr_id,uint8_t cdev_id, - const void *event, int32_t queue_pair_id), +int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf*conf),
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
lib/eventdev/eventdev_trace.h +1
-1rte_trace_point_emit_u8 (adptr_id);rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); )Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
lib/eventdev/eventdev_trace.h +0
-0RTE_TRACE_POINT(lib/eventdev/rte_event_crypto_adapter.c +0
-0Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c int · line 924
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-1@@ -921,11 +921,12 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event) + const struct
rte_event_crypto_adapter_queue_confQuoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
lib/eventdev/rte_event_crypto_adapter.c +2
-1*conf) { +struct rte_event_crypto_adapter_vector_limits limits;struct event_crypto_adapter *adapter; -struct rte_eventdev *dev;struct crypto_device_info *dev_info; +struct rte_eventdev *dev;uint32_t cap;int ret;Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0@@ -951,11 +952,47 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
id,lib/eventdev/rte_event_crypto_adapter.c +0
-0} if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND)&&
Quoted 9 lines
Quoted 9 lines
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id,
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-1- (event == NULL)) { + (conf == NULL)) { RTE_EDEV_LOG_ERR("Conf value can not be NULL fordev_id=%u",
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 959
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-0cdev_id);return -EINVAL ; }Newline?
Quoted 7 lines
Quoted 7 lines
Ack
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 960
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((conf != NULL) &&Checking conf twice?
Will rewrite as if conf == NULL/else, to avoid double checking.
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ (conf->flags &
RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR)) {Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Else condition if the flags is not set?
There's no additional handing for case when flag is no set.
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ if ((cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR) == 0) {lib/eventdev/rte_event_crypto_adapter.c +1
-0+ RTE_EDEV_LOG_ERR("Event vectorization isnot
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 2 lines
supported,"
lib/eventdev/rte_event_crypto_adapter.c +1
-0+"dev %" PRIu8" cdev %" PRIu8, id,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id,
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+ cdev_id); +return -ENOTSUP ; + } + + ret =rte_event_crypto_adapter_vector_limits_get ( + adapter->eventdev_id, cdev_id, &limits); +if (ret <0 ) { + RTE_EDEV_LOG_ERR("Failed to get eventdevice vector
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 2 lines
"
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ "limits, dev %" PRIu8 " cdev%" PRIu8,
Quoted 11 lines
Quoted 11 lines
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id, · line 976
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +3
-0+ id, cdev_id); +return -EINVAL ; + }New line? Please check other cases.
Ack
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_queue_pair_add(uint8_t id,
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.c +4
-0+if (conf->vector_sz < limits.min_sz || + conf->vector_sz > limits.max_sz || + conf->vector_timeout_ns < limits.min_timeout_ns || + conf->vector_timeout_ns > limits.max_timeout_ns|| > > > > + conf->vector_mp == NULL) {Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 3 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +1
-0+" dev %" PRIu8" cdev %" PRIu8,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 9 lines
lib/eventdev/rte_event_crypto_adapter.c +7
-0+ id, cdev_id); +return -EINVAL ; + } +if (conf->vector_mp->elt_size < + (sizeof (struct rte_event_vector ) + + (sizeof (uintptr_t ) * conf->vector_sz))) { + RTE_EDEV_LOG_ERR("Invalid event vectorconfiguration,"
lib/eventdev/rte_event_crypto_adapter.c +1
-0+" dev %" PRIu8" cdev %" PRIu8,
Quoted 24 lines
Quoted 24 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +4
-0+ id, cdev_id); +return -EINVAL ; + } + } dev_info = &adapter->cdevs[cdev_id];@@ -990,7 +1027,7 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
Quoted 15 lines
Quoted 15 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-1id, ret = (*dev->dev_ops->crypto_adapter_queue_pair_add)(dev, dev_info->dev, queue_pair_id, - event); + conf);if (ret)return ret;@@ -1030,8 +1067,8 @@rte_event_crypto_adapter_queue_pair_add(uint8_t
id,lib/eventdev/rte_event_crypto_adapter.c +0
-0rte_service_component_runstate_set (adapter->service_id,1 ); }Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.c +0
-1- rte_eventdev_trace_crypto_adapter_queue_pair_add(id, cdev_id,event,
lib/eventdev/rte_event_crypto_adapter.c +1
-1- queue_pair_id); + rte_eventdev_trace_crypto_adapter_queue_pair_add(id,
cdev_id,Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +1
-0+ queue_pair_id, conf);return 0 ; }@@ -1290,3 +1327,44 @@rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id)Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +6
-0return 0 ; } + +int +rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits) { +struct rte_cryptodev *cdev;Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id)
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+struct rte_eventdev *dev; +uint32_t cap; +int ret; + +RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET (dev_id, -EINVAL ); + +if (!rte_cryptodev_is_valid_dev (cdev_id)) { + RTE_EDEV_LOG_ERR("Invalid dev_id=%" PRIu8,
cdev_id);Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id) · line 1349
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c +5
-0+return -EINVAL ; + } + +if (limits ==NULL ) +return -EINVAL ;Add appropriate error message like above?
Quoted 7 lines
Quoted 7 lines
Ack, will add.
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id)
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c +5
-0+ + dev = &rte_eventdevs[dev_id]; + cdev =rte_cryptodev_pmd_get_dev (cdev_id); + + ret = rte_event_crypto_adapter_caps_get(dev_id, cdev_id,&cap);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c +2
-0+if (ret) { + RTE_EDEV_LOG_ERR("Failed to get adapter caps edev%" PRIu8
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t *event_port_id)
Quoted 5 lines
lib/eventdev/rte_event_crypto_adapter.c +5
-0+ "cdev %" PRIu16, dev_id, cdev_id); +return ret; + } + + if (!(cap &
RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR))Quoted 21 lines
Quoted 21 lines
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.c
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.c +1
-0+return -ENOTSUP ;Same here.
Ack, will add.
Quoted 17 lines
Quoted 17 lines
lib/eventdev/rte_event_crypto_adapter.c +8
-0+ +RTE_FUNC_PTR_OR_ERR_RET ( + *dev->dev_ops->crypto_adapter_vector_limits_get, + -ENOTSUP ); + +return dev->dev_ops->crypto_adapter_vector_limits_get ( + dev, cdev, limits); +}lib/eventdev/rte_event_crypto_adapter.h +0
-0@@ -253,6 +253,78 @@ struct rte_event_crypto_adapter_conf {*/ };Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h +8
-0+#define RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR 0x1 +/**< This flag indicates that crypto operations processed on +the crypto +* adapter need to be vectorized +* @see rte_event_crypto_adapter_queue_conf::flags +*/ + +/** Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf {
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h +8
-0+* Adapter queue configuration structure */ struct +rte_event_crypto_adapter_queue_conf { +uint32_t flags; +/**< Flags for handling crypto operations +* @see RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR +*/ +struct rte_event ev; +/**< If HW supports cryptodev queue pair to event queue binding,
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.h +2
-0+* application is expected to fill in event information. +* @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDlib/eventdev/rte_event_crypto_adapter.h +1
-0+*/ Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf {
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h +3
-0+uint16_t vector_sz; +/**< Indicates the maximum number for crypto operations to +combine and
lib/eventdev/rte_event_crypto_adapter.h +4
-0+* form a vector. +* @see rte_event_crypto_adapter_vector_limits::min_sz +* @see rte_event_crypto_adapter_vector_limits::max_sz +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.h
Quoted 2 lines
set in
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* @see
rte_event_crypto_adapter_queue_conf::rx_queue_flagsQuoted 9 lines
Quoted 9 lines
Quoted 1 line
rx_queue_flags??Typo, should be
conf::flags.Quoted 6 lines
lib/eventdev/rte_event_crypto_adapter.h
Quoted 6 lines
lib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint64_t vector_timeout_ns; +/**< +* Indicates the maximum number of nanoseconds to wait for aggregating
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* crypto operations. Should be within vectorization limits of the
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.h
Quoted 2 lines
lib/eventdev/rte_event_crypto_adapter.h +2
-0+* adapter +* @see
rte_event_crypto_adapter_vector_limits::min_timeout_nsQuoted 1 line
Quoted 1 line
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.h
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* @see
rte_event_crypto_adapter_vector_limits::max_timeout_nsQuoted 1 line
Quoted 1 line
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.h
Quoted 1 line
lib/eventdev/rte_event_crypto_adapter.h +1
-0+* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf {
Quoted 8 lines
set in
lib/eventdev/rte_event_crypto_adapter.h +7
-0+* @see rte_event_crypto_adapter_queue_conf::flags +*/ +struct rte_mempool *vector_mp; +/**< Indicates the mempool that should be used for allocating +* rte_event_vector container. +* Should be created by using `rte_event_vector_pool_create`. +* Valid when RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR flag is
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
set in
lib/eventdev/rte_event_crypto_adapter.h +15
-0+* @see rte_event_crypto_adapter_queue_conf::flags. +*/ +}; + +/** +* A structure used to retrieve event crypto adapter vector limits. +*/ +struct rte_event_crypto_adapter_vector_limits { +uint16_t min_sz; +/**< Minimum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint16_t max_sz; +/**< Maximum vector limit configurable. +* @see rte_event_crypto_adapter_queue_conf::vector_sz Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf {
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h +8
-0+*/ +uint8_t log2_sz; +/**< True if the size configured should be in log2. +* @see rte_event_crypto_adapter_queue_conf::vector_sz +*/ +uint64_t min_timeout_ns; +/**< Minimum vector timeout configurable. +* @see
rte_event_crypto_adapter_queue_conf::vector_timeout_nsQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.h struct rte_event_crypto_adapter_conf {
Quoted 4 lines
lib/eventdev/rte_event_crypto_adapter.h +4
-0+*/ +uint64_t max_timeout_ns; +/**< Maximum vector timeout configurable. +* @see
rte_event_crypto_adapter_queue_conf::vector_timeout_nsQuoted 17 lines
Quoted 17 lines
Quoted 16 lines
Quoted 7 lines
lib/eventdev/rte_event_crypto_adapter.h +3
-0+*/ +}; +/** * Function type used for adapter configuration callback. The callback is * used to fill in members of the struct
rte_event_crypto_adapter_conf, this @@ -392,10 +464,9 @@
rte_event_crypto_adapter_free(uint8_t id);Quoted 8 lines
* Cryptodev queue pair identifier. If
queue_pair_idis set -1,
* adapter adds all the pre configured queue pairs to the instance. *
- * @param event
- * if HW supports cryptodev queue pair to event queue binding, application is
- * expected to fill in event information, else it will be NULL.
- * @see
RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BINDQuoted 12 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
+ * @param conf
+ * Additional configuration structure of type
+ * *rte_event_crypto_adapter_queue_conf*
*Quoted 8 lines
Quoted 8 lines
lib/eventdev/rte_event_crypto_adapter.h int · line 479
Quoted 8 lines
* @return
* - 0: Success, queue pair added correctly.lib/eventdev/rte_event_crypto_adapter.h +1
-1@@ -405,7 +476,7 @@ int rte_event_crypto_adapter_queue_pair_add(uint8_t id, uint8_t cdev_id, int32_t queue_pair_id, - const struct rte_event *event); + const struct
rte_event_crypto_adapter_queue_confQuoted 68 lines
Quoted 68 lines
Quoted 10 lines
Quoted 10 lines
lib/eventdev/rte_event_crypto_adapter.h +0
-0*conf);/** * Delete a queue pair from an event crypto adapter.
lib/eventdev/rte_event_crypto_adapter.h +0
-0@@ -523,6 +594,26 @@rte_event_crypto_adapter_service_id_get(uint8_t
id,uint32_t*service_id); int
rte_event_crypto_adapter_event_port_get(uint8_t
id,uint8_t*event_port_id);Quoted 13 lines
lib/eventdev/rte_event_crypto_adapter.h rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t *service_id); · line 607
Quoted 12 lines
lib/eventdev/rte_event_crypto_adapter.h +12
-0+/** +* Retrieve vector limits for a given event dev and crypto dev pair. +* @see rte_event_crypto_adapter_vector_limits +* +* @param dev_id +* Event device identifier. +* @param cdev_id +* Crypto device identifier. +* @param [out] limits +* A pointer to rte_event_crypto_adapter_vector_limits +structure that has to +* be filled. Space missing before "be filled"
Ack
Quoted 21 lines
Quoted 21 lines
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Error code on failure.
+ */lib/eventdev/rte_event_crypto_adapter.h +4
-0+int rte_event_crypto_adapter_vector_limits_get ( +uint8_t dev_id,uint16_t cdev_id, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Enqueue a burst of crypto operations as event objects supplied in
*rte_event*
* structure on an event crypto adapter designated by its event
*dev_id* through diff --gita/lib/eventdev/rte_event_eth_rx_adapter.hb/lib/eventdev/rte_event_eth_rx_adapter.h
index3608a7b2cf..c8f2936866100644lib/eventdev/rte_event_eth_rx_adapter.h +0
-0@@ -457,7 +457,8 @@ int rte_event_eth_rx_adapter_free(uint8_t id);Quoted 9 lines
lib/eventdev/rte_event_eth_rx_adapter.h int rte_event_eth_rx_adapter_free(uint8_t id); · line 461
Quoted 7 lines
lib/eventdev/rte_event_eth_rx_adapter.h +2
-1* @see RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ * * @param conf -* Additional configuration structure of type *rte_event_eth_rx_adapter_conf* +* Additional configuration structure of type +* *rte_event_eth_rx_adapter_queue_conf* These changes are not relevant. Please consider sending separate patch.
Ack, Will send this change as a separate patch.
Quoted 10 lines
Quoted 10 lines
lib/eventdev/rte_event_eth_rx_adapter.h +0
-0* * @return * - 0: Success, Receive queue added correctly.
(quoted diff) +0
-0
b/lib/eventdev/rte_eventdev.hindex6a6f6ea4c1..1a737bf851100644lib/eventdev/rte_eventdev.h +0
-0@@ -1203,6 +1203,9 @@ struct rte_event_vector { #define
RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR\
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
(
RTE_EVENT_TYPE_VECTOR|RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The
Quoted 2 lines
Quoted 2 lines
event vector generated from eth Rx adapter. */
+#defineRTE_EVENT_TYPE_CRYPTODEV_VECTOR\
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/eventdev/rte_eventdev.h struct rte_event_vector { · line 1207
Quoted 1 line
lib/eventdev/rte_eventdev.h +1
-0+ (RTE_EVENT_TYPE_VECTOR |RTE_EVENT_TYPE_CRYPTODEV )/**< The
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
event
+vector generated from cryptodev adapter. */#define
RTE_EVENT_TYPE_MAX0x10
/**< Maximum number of event types */ @@ -1420,6 +1423,11 @@rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);
* the private data information along with the crypto session. */lib/eventdev/rte_eventdev.h +5
-1+#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device -- 2.25.1
Re: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 10 lines
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Right now we are targeting
crypto_cn10kPMD and ipsec-secgw event mode to support vectorization.Is there a way to test this? When can be dataplane changes expected?
If the spec looks okay, support in s/w crypto adapter and other h/w PMDs can be added by respective maintainers. Currently, we are adding library change, support for one PMD and an application to test the feature. Feature is exposed with capability flag to not break existing functionality.
Got it. How do I test this feature without data plane changes?
Hi @Gujjar, Abhinandan S
Quoted 1 line
If there is a way to test this, please let me know.
Dataplane changes can be tested on the cn10k platform. This feature is a hardware assisted feature.
Quoted 1 line
This design is right now tested for cn10k, I am not sure this works for sw adapter.
SW driver support is not added in this series as in order to accept a API change, one would need,
1)API spec
2)One of the driver
3)Test application to exercise the API.
It is a similar case for all ethdev, rte_flow features etc. Community can add SW driver support just like any other subsystem APIs.
Also, The proposed library changes don't differentiate between SW & HW PMDs. The proposed changes are exposed with a capability flag and so SW crypto adapter will not have any perf impact.
Quoted 1 line
I need to have perf data with and without vectorization support to approve.
On the cn10k platform, we see nearly 2.5x performance with vectorization. Eth rx adapter already supports vectorization and this spec change is in line with that.
Also IPsec gateway update to exercise these APIs. See
http://patches.dpdk.org/project/dpdk/patch/[email protected]/
Command to test on drivers which have this functionality.
./dpdk-ipsec-secgw -c 0xff0000 -a 0002:01:00.1 -a 0002:20:00.1 -a 0002:1e:00.0 -- -P -p 0x1 -P --transfer-mode event -l --event-schedule-type parallel --desc-nb 8192 --event-vector -f simple.conf
sample.conf
sp ipv4 out esp protect 19 pri 1 dst 192.18.0.0/32 sport 0:65535 dport 0:65535 sa out 19 aead_algo aes-128-gcm aead_key 73:69:78:74:65:65:6e:62:79:74:65:73:20:6b:65:79:64:70:64:6b mode ipv4-tunnel src 2.1.1.1 dst 1.1.1.1 type lookaside-protocol-offload port_id 0
neigh port 0 d0:37:45:02:b0:d3
rt ipv4 dst 1.1.0.0/16 port 0
In order to make forward progress and merge patch in RC1, I would request 1)Review the API specific patch(eventdev: introduce event cryptodev vector type), If spec needs to be changed to adapt any other driver(SW or HW) then the author should address that.
2)If you think, API usage is not enough with dpdk-ipsec-secgw application, I think, author should update the test-eventdev application to support the new mode.Which can be merged after RC1 as it is a test application change.
Let us know what you think to make forward progress.
RE: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 84 lines
-----Original Message-----
From: Jerin Jacob <[email protected]>
Sent: Tuesday, September 27, 2022 6:56 PM
To: Gujjar, Abhinandan S <[email protected]>
Cc: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>; Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: Re: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 9 lines
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Right now we are targeting
crypto_cn10kPMD and ipsec-secgw event mode to support vectorization.Is there a way to test this? When can be dataplane changes expected?
If the spec looks okay, support in s/w crypto adapter and other h/w PMDs can be added by respective maintainers. Currently, we are adding library change, support for one PMD and an application to test the feature. Feature is exposed with capability flag to not break
existing functionality.
Quoted 1 line
Got it. How do I test this feature without data plane changes?
Hi @Gujjar, Abhinandan S
Quoted 1 line
If there is a way to test this, please let me know.
Dataplane changes can be tested on the cn10k platform. This feature is a hardware assisted feature.
Quoted 1 line
This design is right now tested for cn10k, I am not sure this works for sw
adapter.
SW driver support is not added in this series as in order to accept a API change, one would need, 1)API spec 2)One of the driver 3)Test application to exercise the API.
It is a similar case for all ethdev,
rte_flowfeatures etc. Community can add SW driver support just like any other subsystem APIs.Also, The proposed library changes don't differentiate between SW & HW PMDs.
The proposed changes are exposed with a capability flag and so SW crypto adapter will not have any perf impact.Quoted 1 line
I need to have perf data with and without vectorization support to approve.
On the cn10k platform, we see nearly 2.5x performance with vectorization. Eth rx adapter already supports vectorization and this spec change is in line with that.
Also IPsec gateway update to exercise these APIs. See
http://patches.dpdk.org/project/dpdk/patch/20220804103626.102688-6-
[email protected]/Command to test on drivers which have this functionality.
./dpdk-ipsec-secgw -c
0xff0000-a 0002:01:00.1 -a 0002:20:00.1 -a 0002:1e:00.0 -- -P -p0x1-P --transfer-mode event -l --event-schedule-type parallel --desc-nb 8192 --event-vector -f simple.confsample.conf
sp ipv4 out esp protect 19 pri 1 dst 192.18.0.0/32 sport 0:65535 dport 0:65535 sa out 19
aead_algoaes-128-gcmaead_key73:69:78:74:65:65:6e:62:79:74:65:73:20:6b:65:79:64:70:64:6b mode ipv4- tunnel src 2.1.1.1 dst 1.1.1.1 type lookaside-protocol-offloadport_id0neigh port 0 d0:37:45:02:b0:d3
rt ipv4 dst 1.1.0.0/16 port 0In order to make forward progress and merge patch in RC1, I would request 1)Review the API specific patch(eventdev: introduce event cryptodev vector type), If spec needs to be changed to adapt any other driver(SW or HW) then the author should address that.
2)If you think, API usage is not enough with dpdk-ipsec-secgw application, I think, author should update the test-eventdev application to support the new mode.Which can be merged after RC1 as it is a test application change.
Quoted 1 line
Let us know what you think to make forward progress.
Hi @Jerin Jacob & @Volodymyr Fialko,
Thanks for clarifying. We would like to have a call to discuss on this. Could you please setup a call & include @Jayatheerthan, Jay also into it?
Thanks
Abhinandan
Re: [PATCH 1/3] eventdev: introduce event cryptodev vector type
Quoted 85 lines · Abhinandan S
Quoted 85 lines
-----Original Message-----
From: Jerin Jacob <[email protected]>
Sent: Tuesday, September 27, 2022 6:56 PM
To: Gujjar, Abhinandan S <[email protected]>
Cc: Volodymyr Fialko <[email protected]>; [email protected]; Jerin Jacob Kollanukkaran <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; Shijith Thotton <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Jayatheerthan, Jay <[email protected]>; Akhil Goyal <[email protected]>; Anoob Joseph <[email protected]>
Subject: Re: [PATCH 1/3] eventdev: introduce event cryptodev vector typeQuoted 9 lines
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Right now we are targeting
crypto_cn10kPMD and ipsec-secgw event mode to support vectorization.Is there a way to test this? When can be dataplane changes expected?
If the spec looks okay, support in s/w crypto adapter and other h/w PMDs can be added by respective maintainers. Currently, we are adding library change, support for one PMD and an application to test the feature. Feature is exposed with capability flag to not break
existing functionality.
Quoted 1 line
Got it. How do I test this feature without data plane changes?
Hi @Gujjar, Abhinandan S
Quoted 1 line
If there is a way to test this, please let me know.
Dataplane changes can be tested on the cn10k platform. This feature is a hardware assisted feature.
Quoted 1 line
This design is right now tested for cn10k, I am not sure this works for sw
adapter.
SW driver support is not added in this series as in order to accept a API change, one would need, 1)API spec 2)One of the driver 3)Test application to exercise the API.
It is a similar case for all ethdev,
rte_flowfeatures etc. Community can add SW driver support just like any other subsystem APIs.Also, The proposed library changes don't differentiate between SW & HW PMDs.
The proposed changes are exposed with a capability flag and so SW crypto adapter will not have any perf impact.Quoted 1 line
I need to have perf data with and without vectorization support to approve.
On the cn10k platform, we see nearly 2.5x performance with vectorization. Eth rx adapter already supports vectorization and this spec change is in line with that.
Also IPsec gateway update to exercise these APIs. See
http://patches.dpdk.org/project/dpdk/patch/20220804103626.102688-6-
[email protected]/Command to test on drivers which have this functionality.
./dpdk-ipsec-secgw -c
0xff0000-a 0002:01:00.1 -a 0002:20:00.1 -a 0002:1e:00.0 -- -P -p0x1-P --transfer-mode event -l --event-schedule-type parallel --desc-nb 8192 --event-vector -f simple.confsample.conf
sp ipv4 out esp protect 19 pri 1 dst 192.18.0.0/32 sport 0:65535 dport 0:65535 sa out 19
aead_algoaes-128-gcmaead_key73:69:78:74:65:65:6e:62:79:74:65:73:20:6b:65:79:64:70:64:6b mode ipv4- tunnel src 2.1.1.1 dst 1.1.1.1 type lookaside-protocol-offloadport_id0neigh port 0 d0:37:45:02:b0:d3
rt ipv4 dst 1.1.0.0/16 port 0In order to make forward progress and merge patch in RC1, I would request 1)Review the API specific patch(eventdev: introduce event cryptodev vector type), If spec needs to be changed to adapt any other driver(SW or HW) then the author should address that.
2)If you think, API usage is not enough with dpdk-ipsec-secgw application, I think, author should update the test-eventdev application to support the new mode.Which can be merged after RC1 as it is a test application change.
Quoted 5 lines
Quoted 1 line
Let us know what you think to make forward progress.
Hi @Jerin Jacob & @Volodymyr Fialko,
Thanks for clarifying. We would like to have a call to discuss on this. Could you please setup a call & include @Jayatheerthan, Jay also into it?
Sure. Setting up one at 4PM IST on 29 Oct.
Please find the details.
Hi there,
Jerin Jacob Kollanukkaran is inviting you to a scheduled Zoom meeting.
Topic: Jerin Jacob Kollanukkaran's Personal Meeting Room
Join Zoom Meeting:
https://marvell.zoom.us/j/9901077677?pwd=T2lTTGMwYlc1YTQzMnR4eGRWQXR6QT09
Password: 339888
Or Telephone:
Dial(for higher quality, dial a number based on your current location):
US: +1 646 558 8656 or +1 646 931 3860 or +1 669 444 9171
or +1 669 900 6833 or +1 719 359 4580 or +1 253 215 8782 or +1 301 715 8592 or +1 309 205 3325 or +1 312 626 6799 or +1 346 248 7799 or +1 386 347 5053 or +1 564 217 2000 or 888 788 0099 (Toll Free) or 833 548 0276 (Toll Free) or 833 548 0282 (Toll Free) or 833 928 4608 (Toll Free) or 833 928 4609 (Toll Free) or 833 928 4610 (Toll Free) or 877 853 5247 (Toll Free)
Meeting ID: 990 107 7677
Password: 358309
International numbers available: https://marvell.zoom.us/u/adpcCpMHYtOr a Video Conference Room:
From Touchpad: Tap Join Zoom button. When prompted, enter 990 107 7677
Password: 358309
For China locations, from Touchpad: Dial* then 990 107 7677
Password: 358309
Quoted 3 lines
Thanks
Abhinandan
PATCH 2/3 crypto/cnxk: add burst enqueue for event crypto
In reply to Volodymyr FialkoAdded support for burst enqueue for cn10k event crypto adapter. Instruction will be grouped based on the queue pair and sent in a burst.
--- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 141 +++++++++++++++------- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 7 +- drivers/crypto/cnxk/meson.build | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn10k_worker.c | 10 -- drivers/event/cnxk/cn10k_worker.h | 2 - 6 files changed, 105 insertions(+), 59 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +99 -42
@@ -9,11 +9,12 @@#include "cn10k_cryptodev.h" #include "cn10k_cryptodev_ops.h" -#include "cn10k_ipsec_la_ops.h" #include "cn10k_ipsec.h" +#include "cn10k_ipsec_la_ops.h" #include "cnxk_ae.h" #include "cnxk_cryptodev.h" #include "cnxk_cryptodev_ops.h" +#include "cnxk_eventdev.h" #include "cnxk_se.h" #include "roc_api.h"
@@ -391,79 +392,135 @@ cn10k_ca_meta_info_extract(struct rte_crypto_op *op,return 0 ; } -uint16_t -cn10k_cpt_crypto_adapter_enqueue (uintptr_t base,struct rte_crypto_op *op) +static inline uint16_t +ca_lmtst_burst_submit (struct cn10k_sso_hws *ws,uint64_t w2[],struct cnxk_cpt_qp *qp, +struct rte_crypto_op *op[],uint16_t nb_ops) { +struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ]; +uint64_t lmt_base, lmt_arg, io_addr; +struct cpt_inst_s *inst, *inst_base;struct cpt_inflight_req *infl_req; -uint64_t lmt_base, lmt_arg, w2; -struct cpt_inst_s *inst;union cpt_fc_write_s fc; -struct cnxk_cpt_qp *qp;uint64_t *fc_addr;uint16_t lmt_id; -int ret; +int ret, i; - ret =cn10k_ca_meta_info_extract (op, &qp, &w2); -if (unlikely (ret)) { - rte_errno =EINVAL ; -return 0 ; - } + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; + +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst_base = (struct cpt_inst_s *)lmt_base;if (unlikely (!qp->ca.enabled)) { rte_errno =EINVAL ;return 0 ; } -if (unlikely (rte_mempool_get (qp->ca.req_mp, (void **)&infl_req))) { +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, nb_ops))) { rte_errno =ENOMEM ;return 0 ; } - infl_req->op_flags =0 ; - - lmt_base = qp->lmtline.lmt_base; - fc_addr = qp->lmtline.fc_addr; -const uint32_t fc_thresh = qp->lmtline.fc_thresh; +for (i =0 ; i < nb_ops; i++) { + inst = &inst_base[2 * i]; + infl_req = infl_reqs[i]; + infl_req->op_flags =0 ; -ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); - inst = (struct cpt_inst_s *)lmt_base; + ret =cn10k_cpt_fill_inst (qp, &op[i], inst, infl_req); +if (unlikely (ret !=1 )) { +plt_dp_err ("Could not process op: %p" , op[i]); +if (i !=0 ) + goto submit; +else + goto put; + } - ret =cn10k_cpt_fill_inst (qp, &op, inst, infl_req); -if (unlikely (ret !=1 )) { -plt_dp_err ("Could not process op: %p" , op); -rte_mempool_put (qp->ca.req_mp, infl_req); -return 0 ; + infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; + infl_req->qp = qp; + inst->w0.u64 =0 ; + inst->res_addr = (uint64_t )&infl_req->res; + inst->w2.u64 = w2[i]; + inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); } - infl_req->cop = op; - infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; - infl_req->qp = qp; - inst->w0.u64 =0 ; - inst->res_addr = (uint64_t )&infl_req->res; - inst->w2.u64 = w2; - inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); - fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED);if (unlikely (fc.s.qsize > fc_thresh)) { -rte_mempool_put (qp->ca.req_mp, infl_req); rte_errno =EAGAIN ; -return 0 ; + i =0 ; + goto put; } -if (inst->w2.s.tt ==RTE_SCHED_TYPE_ORDERED ) -roc_sso_hws_head_wait (base); +submit: +if (CNXK_TT_FROM_TAG (ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (ws->base); - lmt_arg =ROC_CN10K_CPT_LMT_ARG | (uint64_t )lmt_id; -roc_lmt_submit_steorl (lmt_arg, qp->lmtline.io_addr); +if (i >PKTS_PER_STEORL ) { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -PKTS_PER_STEORL -1 ) <<12 | + (uint64_t )(lmt_id +PKTS_PER_STEORL ); +roc_lmt_submit_steorl (lmt_arg, io_addr); + }else { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + }rte_io_wmb (); -return 1 ; +put: +if (unlikely (i != nb_ops)) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], nb_ops - i); + +return i; +} + +uint16_t __rte_hot +cn10k_cpt_crypto_adapter_enqueue (void *ws,struct rte_event ev[],uint16_t nb_events) +{ +struct rte_crypto_op *ops[PKTS_PER_LOOP ], *op; +struct cnxk_cpt_qp *qp, *curr_qp =NULL ; +uint64_t w2s[PKTS_PER_LOOP ], w2; +uint16_t submitted, count =0 ; +int ret, i, ops_len =0 ; + +for (i =0 ; i < nb_events; i++) { + op = ev[i].event_ptr; + ret =cn10k_ca_meta_info_extract (op, &qp, &w2); +if (unlikely (ret)) { + rte_errno =EINVAL ; +return count; + } + +if (qp != curr_qp) { +if (ops_len) { + submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); + count += submitted; +if (unlikely (submitted != ops_len)) +return count; + ops_len =0 ; + } + curr_qp = qp; + } + w2s[ops_len] = w2; + ops[ops_len] = op; +if (++ops_len ==PKTS_PER_LOOP ) { + submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); + count += submitted; +if (unlikely (submitted != ops_len)) +return count; + ops_len =0 ; + } + } +if (ops_len) + count +=ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +return count; }static inline void -cn10k_cpt_sec_post_process (struct rte_crypto_op *cop, -struct cpt_cn10k_res_s *res) +cn10k_cpt_sec_post_process (struct rte_crypto_op *cop,struct cpt_cn10k_res_s *res) {struct rte_mbuf *mbuf = cop->sym->m_src;const uint16_t m_len = res->rlen;
drivers/crypto/cnxk/cn10k_cryptodev_ops.h +4 -3
@@ -5,16 +5,17 @@#ifndef _CN10K_CRYPTODEV_OPS_H_#define _CN10K_CRYPTODEV_OPS_H_ -#include <rte_cryptodev.h> #include <cryptodev_pmd.h> +#include <rte_cryptodev.h> +#include <rte_eventdev.h> extern struct rte_cryptodev_ops cn10k_cpt_ops;void cn10k_cpt_set_enqdeq_fns (struct rte_cryptodev *dev);__rte_internal -uint16_t cn10k_cpt_crypto_adapter_enqueue(uintptr_t base, -struct rte_crypto_op *op); +uint16_t __rte_hot cn10k_cpt_crypto_adapter_enqueue(void *ws, struct rte_event ev[], +uint16_t nb_events);__rte_internal uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1);
drivers/crypto/cnxk/meson.build +1 -1
@@ -24,7 +24,7 @@ sources = files( deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev'] -includes += include_directories('../../../lib/net') +includes += include_directories('../../../lib/net', '../../event/cnxk') if get_option('buildtype').contains('debug') cflags += [ '-DLA_IPSEC_DEBUG' ]
drivers/event/cnxk/cn10k_eventdev.c +1 -1
@@ -454,7 +454,7 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev) sso_hws_deq_tmo_ca_burst); } } - event_dev->ca_enqueue = cn10k_sso_hws_ca_enq; + event_dev->ca_enqueue = cn10k_cpt_crypto_adapter_enqueue;if (dev->tx_offloads &NIX_TX_MULTI_SEG_F ) CN10K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
drivers/event/cnxk/cn10k_worker.c +0 -10
@@ -64,13 +64,3 @@ cn10k_sso_hws_enq_fwd_burst(void *port, const struct rte_event ev[],return 1 ; } - -uint16_t __rte_hot -cn10k_sso_hws_ca_enq (void *port,struct rte_event ev[],uint16_t nb_events) -{ -struct cn10k_sso_hws *ws = port; - -RTE_SET_USED (nb_events); - -return cn10k_cpt_crypto_adapter_enqueue (ws->base, ev->event_ptr); -}
drivers/event/cnxk/cn10k_worker.h +0 -2
@@ -353,8 +353,6 @@ uint16_t __rte_hot cn10k_sso_hws_enq_new_burst(void *port, uint16_t __rte_hot cn10k_sso_hws_enq_fwd_burst(void *port,const struct rte_event ev[],uint16_t nb_events); -uint16_t __rte_hot cn10k_sso_hws_ca_enq(void *port, struct rte_event ev[], -uint16_t nb_events);#define R (name, flags) \ uint16_t __rte_hot cn10k_sso_hws_deq_##name( \
Signature · 1 line
2.25.1
PATCH 3/3 crypto/cnxk: add vectorization for event crypto
In reply to Volodymyr FialkoAdd support for vector aggregation of crypto operations for cn10k. Crypto operations will be grouped by sub event type, flow id, scheduler type and queue id fields from rte_event_crypto_metadata::response_info.
---
Depends-on: Series-24099
Depends-on: Series-24066
drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 398 +++++++++++++++++++--- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 2 + drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/version.map | 1 + drivers/event/cnxk/cn10k_eventdev.c | 43 ++- drivers/event/cnxk/cn10k_worker.h | 6 +- drivers/event/cnxk/cn9k_eventdev.c | 11 +- drivers/event/cnxk/cnxk_eventdev.h | 4 +- drivers/event/cnxk/cnxk_eventdev_adptr.c | 17 +- 9 files changed, 431 insertions(+), 60 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +358 -40
@@ -19,6 +19,25 @@#include "roc_api.h" +#define PKTS_PER_LOOP 32 +#define PKTS_PER_STEORL 16 + +/* Holds information required to send crypto operations in one burst */ +struct ops_burst { +struct rte_crypto_op *op[PKTS_PER_LOOP ]; +uint64_t w2[PKTS_PER_LOOP ]; +struct cn10k_sso_hws *ws; +struct cnxk_cpt_qp *qp; +uint16_t nb_ops; +}; + +/* Holds information required to send vector of operations */ +struct vec_request { +struct cpt_inflight_req *req; +struct rte_event_vector *vec; +uint64_t w2; +}; +static inline struct cnxk_se_sess *cn10k_cpt_sym_temp_sess_create (struct cnxk_cpt_qp *qp,struct rte_crypto_op *op) {
@@ -183,9 +202,6 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[],return 1 ; } -#define PKTS_PER_LOOP 32 -#define PKTS_PER_STEORL 16 -static uint16_t cn10k_cpt_enqueue_burst (void *qptr,struct rte_crypto_op **ops,uint16_t nb_ops) {
@@ -286,9 +302,9 @@ cn10k_cpt_crypto_adapter_ev_mdata_set(struct rte_cryptodev *dev __rte_unused,union rte_event_crypto_metadata *ec_mdata = mdata;struct rte_event *rsp_info;struct cnxk_cpt_qp *qp; +uint64_t w2, tag_type;uint8_t cdev_id;int16_t qp_id; -uint64_t w2;/* Get queue pair */ cdev_id = ec_mdata->request_info.cdev_id;
@@ -296,9 +312,9 @@ cn10k_cpt_crypto_adapter_ev_mdata_set(struct rte_cryptodev *dev __rte_unused, qp = rte_cryptodevs[cdev_id].data->queue_pairs[qp_id];/* Prepare w2 */ + tag_type = qp->ca.vector_sz ?RTE_EVENT_TYPE_CRYPTODEV_VECTOR :RTE_EVENT_TYPE_CRYPTODEV ; rsp_info = &ec_mdata->response_info; - w2 =CNXK_CPT_INST_W2 ((RTE_EVENT_TYPE_CRYPTODEV <<28 ) | - (rsp_info->sub_event_type <<20 ) | + w2 =CNXK_CPT_INST_W2 ((tag_type <<28 ) | (rsp_info->sub_event_type <<20 ) | rsp_info->flow_id, rsp_info->sched_type, rsp_info->queue_id,0 );
@@ -392,18 +408,236 @@ cn10k_ca_meta_info_extract(struct rte_crypto_op *op,return 0 ; } +static inline void +cn10k_cpt_vec_inst_fill (struct vec_request *vec_req,struct cpt_inst_s *inst, +struct cnxk_cpt_qp *qp) +{ +const union cpt_res_s res = {.cn10k.compcode =CPT_COMP_NOT_DONE }; +struct cpt_inflight_req *infl_req = vec_req->req; + +const union cpt_inst_w4 w4 = { + .s.opcode_major =ROC_SE_MAJOR_OP_MISC , + .s.opcode_minor =ROC_SE_MISC_MINOR_OP_PASSTHROUGH , + .s.param1 =1 , + .s.param2 =1 , + .s.dlen =0 , + }; + + infl_req->vec = vec_req->vec; + infl_req->qp = qp; + + inst->res_addr = (uint64_t )&infl_req->res; +__atomic_store_n (&infl_req->res.u64[0 ], res.u64[0 ], __ATOMIC_RELAXED); + + inst->w0.u64 =0 ; + inst->w2.u64 = vec_req->w2; + inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); + inst->w4.u64 = w4.u64; + inst->w7.u64 =ROC_CPT_DFLT_ENG_GRP_SE <<61 ; +} + +static void +cn10k_cpt_vec_pkt_submission_timeout_handle (void ) +{ +plt_dp_err ("Vector packet submission timedout" ); +abort (); +} + +static inline void +cn10k_cpt_vec_submit (struct vec_request vec_tbl[],uint16_t vec_tbl_len,struct cnxk_cpt_qp *qp) +{ +uint64_t lmt_base, lmt_arg, lmt_id, io_addr; +union cpt_fc_write_s fc; +struct cpt_inst_s *inst; +uint16_t burst_size; +uint64_t *fc_addr; +int i; + +if (vec_tbl_len ==0 ) +return ; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; +/* +* Use 10 mins timeout for the poll. It is not possible to recover from partial submission +* of vector packet. Actual packets for processing are submitted to CPT prior to this +* routine. Hence, any failure for submission of vector packet would indicate an +* unrecoverable error for the application. +*/ +const uint64_t timeout =rte_get_timer_cycles () +10 *60 *rte_get_timer_hz (); + + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst = (struct cpt_inst_s *)lmt_base; + +again: + burst_size =RTE_MIN (PKTS_PER_STEORL , vec_tbl_len); +for (i =0 ; i < burst_size; i++) +cn10k_cpt_vec_inst_fill (&vec_tbl[i], &inst[i *2 ], qp); + +do { + fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED); +if (likely (fc.s.qsize < fc_thresh)) +break ; +if (unlikely (rte_get_timer_cycles () > timeout)) +cn10k_cpt_vec_pkt_submission_timeout_handle (); + }while (true); + + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + +rte_io_wmb (); + + vec_tbl_len -= i; + +if (vec_tbl_len >0 ) { + vec_tbl += i; + goto again; + } +} + +static inline int +ca_lmtst_vec_submit (struct ops_burst *burst,struct vec_request vec_tbl[],uint16_t *vec_tbl_len) +{ +struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ]; +uint64_t lmt_base, lmt_arg, io_addr; +uint16_t lmt_id, len = *vec_tbl_len; +struct cpt_inst_s *inst, *inst_base; +struct cpt_inflight_req *infl_req; +struct rte_event_vector *vec; +union cpt_fc_write_s fc; +struct cnxk_cpt_qp *qp; +uint64_t *fc_addr; +int ret, i, vi; + + qp = burst->qp; + + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; + +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst_base = (struct cpt_inst_s *)lmt_base; + +#ifdef CNXK_CRYPTODEV_DEBUG +if (unlikely (!qp->ca.enabled)) { + rte_errno =EINVAL ; +return 0 ; + } +#endif + +/* Perform fc check before putting packets into vectors */ + fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED); +if (unlikely (fc.s.qsize > fc_thresh)) { + rte_errno =EAGAIN ; +return 0 ; + } + +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, burst->nb_ops))) { + rte_errno =ENOMEM ; +return 0 ; + } + +for (i =0 ; i < burst->nb_ops; i++) { + inst = &inst_base[2 * i]; + infl_req = infl_reqs[i]; + infl_req->op_flags =0 ; + + ret =cn10k_cpt_fill_inst (qp, &burst->op[i], inst, infl_req); +if (unlikely (ret !=1 )) { +plt_cpt_dbg ("Could not process op: %p" , burst->op[i]); +if (i !=0 ) + goto submit; +else + goto put; + } + + infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; + infl_req->qp = qp; + inst->w3.u64 =0x1 ; + +/* Lookup for existing vector by w2 */ +for (vi = len -1 ; vi >=0 ; vi--) { +if (vec_tbl[vi].w2 != burst->w2[i]) +continue ; + vec = vec_tbl[vi].vec; +if (unlikely (vec->nb_elem == qp->ca.vector_sz)) +continue ; + vec->ptrs[vec->nb_elem++] = infl_req; + goto next_op;/* continue outer loop */ + } + +/* No available vectors found, allocate a new one */ +if (unlikely (rte_mempool_get (qp->ca.vector_mp, (void **)&vec_tbl[len].vec))) { + rte_errno =ENOMEM ; +if (i !=0 ) + goto submit; +else + goto put; + } +/* Also preallocate in-flight request, that will be used to +* submit misc passthrough instruction +*/ +if (unlikely (rte_mempool_get (qp->ca.req_mp, (void **)&vec_tbl[len].req))) { +rte_mempool_put (qp->ca.vector_mp, vec_tbl[len].vec); + rte_errno =ENOMEM ; +if (i !=0 ) + goto submit; +else + goto put; + } + vec_tbl[len].w2 = burst->w2[i]; + vec_tbl[len].vec->ptrs[0 ] = infl_req; + vec_tbl[len].vec->nb_elem =1 ; + len++; + +next_op:; + } + +/* Submit operations in burst */ +submit: +if (CNXK_TT_FROM_TAG (burst->ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (burst->ws->base); + +if (i >PKTS_PER_STEORL ) { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -PKTS_PER_STEORL -1 ) <<12 | + (uint64_t )(lmt_id +PKTS_PER_STEORL ); +roc_lmt_submit_steorl (lmt_arg, io_addr); + }else { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + } + +rte_io_wmb (); + +put: +if (i != burst->nb_ops) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], burst->nb_ops - i); + + *vec_tbl_len = len; + +return i; +} +static inline uint16_t -ca_lmtst_burst_submit (struct cn10k_sso_hws *ws,uint64_t w2[],struct cnxk_cpt_qp *qp, -struct rte_crypto_op *op[],uint16_t nb_ops) +ca_lmtst_burst_submit (struct ops_burst *burst) {struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ];uint64_t lmt_base, lmt_arg, io_addr;struct cpt_inst_s *inst, *inst_base;struct cpt_inflight_req *infl_req;union cpt_fc_write_s fc; +struct cnxk_cpt_qp *qp;uint64_t *fc_addr;uint16_t lmt_id; -int ret, i; +int ret, i, j; + + qp = burst->qp; lmt_base = qp->lmtline.lmt_base; io_addr = qp->lmtline.io_addr;
@@ -414,24 +648,26 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_qROC_LMT_BASE_ID_GET (lmt_base, lmt_id); inst_base = (struct cpt_inst_s *)lmt_base; +#ifdef CNXK_CRYPTODEV_DEBUG if (unlikely (!qp->ca.enabled)) { rte_errno =EINVAL ;return 0 ; } +#endif -if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, nb_ops))) { +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, burst->nb_ops))) { rte_errno =ENOMEM ;return 0 ; } -for (i =0 ; i < nb_ops; i++) { +for (i =0 ; i < burst->nb_ops; i++) { inst = &inst_base[2 * i]; infl_req = infl_reqs[i]; infl_req->op_flags =0 ; - ret =cn10k_cpt_fill_inst (qp, &op[i], inst, infl_req); + ret =cn10k_cpt_fill_inst (qp, &burst->op[i], inst, infl_req);if (unlikely (ret !=1 )) { -plt_dp_err ("Could not process op: %p" , op[i]); +plt_dp_dbg ("Could not process op: %p" , burst->op[i]);if (i !=0 ) goto submit;else
@@ -442,20 +678,25 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_q infl_req->qp = qp; inst->w0.u64 =0 ; inst->res_addr = (uint64_t )&infl_req->res; - inst->w2.u64 = w2[i]; + inst->w2.u64 = burst->w2[i]; inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); } fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED);if (unlikely (fc.s.qsize > fc_thresh)) { rte_errno =EAGAIN ; +for (j =0 ; j < i; j++) { + infl_req = infl_reqs[j]; +if (unlikely (infl_req->op_flags &CPT_OP_FLAGS_METABUF )) +rte_mempool_put (qp->meta_info.pool, infl_req->mdata); + } i =0 ; goto put; } submit: -if (CNXK_TT_FROM_TAG (ws->gw_rdata) ==SSO_TT_ORDERED ) -roc_sso_hws_head_wait (ws->base); +if (CNXK_TT_FROM_TAG (burst->ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (burst->ws->base);if (i >PKTS_PER_STEORL ) { lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | (uint64_t )lmt_id;
@@ -471,8 +712,8 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_qrte_io_wmb (); put: -if (unlikely (i != nb_ops)) -rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], nb_ops - i); +if (unlikely (i != burst->nb_ops)) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], burst->nb_ops - i);return i; }
@@ -480,42 +721,76 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_q uint16_t __rte_hotcn10k_cpt_crypto_adapter_enqueue (void *ws,struct rte_event ev[],uint16_t nb_events) { -struct rte_crypto_op *ops[PKTS_PER_LOOP ], *op; -struct cnxk_cpt_qp *qp, *curr_qp =NULL ; -uint64_t w2s[PKTS_PER_LOOP ], w2; -uint16_t submitted, count =0 ; -int ret, i, ops_len =0 ; +uint16_t submitted, count =0 , vec_tbl_len =0 ; +struct vec_request vec_tbl[nb_events]; +struct rte_crypto_op *op; +struct ops_burst burst; +struct cnxk_cpt_qp *qp; +bool is_vector = false; +uint64_t w2; +int ret, i; + + burst.ws = ws; + burst.qp =NULL ; + burst.nb_ops =0 ;for (i =0 ; i < nb_events; i++) { op = ev[i].event_ptr; ret =cn10k_ca_meta_info_extract (op, &qp, &w2);if (unlikely (ret)) { rte_errno =EINVAL ; -return count; + goto vec_submit; } -if (qp != curr_qp) { -if (ops_len) { - submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +/* Queue pair change check */ +if (qp != burst.qp) { +if (burst.nb_ops) { +if (is_vector) { + submitted = +ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +/* +* Vector submission is required on qp change, but not in +* other cases, since we could send several vectors per +* lmtst instruction only for same qp +*/ +cn10k_cpt_vec_submit (vec_tbl, vec_tbl_len, burst.qp); + vec_tbl_len =0 ; + }else { + submitted =ca_lmtst_burst_submit (&burst); + } count += submitted; -if (unlikely (submitted != ops_len)) -return count; - ops_len =0 ; +if (unlikely (submitted != burst.nb_ops)) + goto vec_submit; + burst.nb_ops =0 ; } - curr_qp = qp; + is_vector = qp->ca.vector_sz; + burst.qp = qp; } - w2s[ops_len] = w2; - ops[ops_len] = op; -if (++ops_len ==PKTS_PER_LOOP ) { - submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); + burst.w2[burst.nb_ops] = w2; + burst.op[burst.nb_ops] = op; + +/* Max nb_ops per burst check */ +if (++burst.nb_ops ==PKTS_PER_LOOP ) { +if (is_vector) + submitted =ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +else + submitted =ca_lmtst_burst_submit (&burst); count += submitted; -if (unlikely (submitted != ops_len)) -return count; - ops_len =0 ; +if (unlikely (submitted != burst.nb_ops)) + goto vec_submit; + burst.nb_ops =0 ; } } -if (ops_len) - count +=ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +/* Submit the rest of crypto operations */ +if (burst.nb_ops) { +if (is_vector) + count +=ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +else + count +=ca_lmtst_burst_submit (&burst); + } + +vec_submit: +cn10k_cpt_vec_submit (vec_tbl, vec_tbl_len, burst.qp);return count; }
@@ -673,6 +948,49 @@ cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1)return (uintptr_t )cop; } +uintptr_t +cn10k_cpt_crypto_adapter_vector_dequeue (uintptr_t get_work1) +{ +struct cpt_inflight_req *infl_req, *vec_infl_req; +struct rte_mempool *meta_mp, *req_mp; +struct rte_event_vector *vec; +struct rte_crypto_op *cop; +struct cnxk_cpt_qp *qp; +union cpt_res_s res; +int i; + + vec_infl_req = (struct cpt_inflight_req *)(get_work1); + + vec = vec_infl_req->vec; + qp = vec_infl_req->qp; + meta_mp = qp->meta_info.pool; + req_mp = qp->ca.req_mp; + +#ifdef CNXK_CRYPTODEV_DEBUG + res.u64[0 ] =__atomic_load_n (&vec_infl_req->res.u64[0 ], __ATOMIC_RELAXED); +PLT_ASSERT (res.cn10k.compcode ==CPT_COMP_WARN ); +PLT_ASSERT (res.cn10k.uc_compcode ==0 ); +#endif + +for (i =0 ; i < vec->nb_elem; i++) { + infl_req = vec->ptrs[i]; + cop = infl_req->cop; + + res.u64[0 ] =__atomic_load_n (&infl_req->res.u64[0 ], __ATOMIC_RELAXED); +cn10k_cpt_dequeue_post_process (qp, cop, infl_req, &res.cn10k); + + vec->ptrs[i] = cop; +if (unlikely (infl_req->op_flags &CPT_OP_FLAGS_METABUF )) +rte_mempool_put (meta_mp, infl_req->mdata); + +rte_mempool_put (req_mp, infl_req); + } + +rte_mempool_put (req_mp, vec_infl_req); + +return (uintptr_t )vec; +} +static uint16_t cn10k_cpt_dequeue_burst (void *qptr,struct rte_crypto_op **ops,uint16_t nb_ops) {
drivers/crypto/cnxk/cn10k_cryptodev_ops.h +2 -0
@@ -18,5 +18,7 @@ uint16_t __rte_hot cn10k_cpt_crypto_adapter_enqueue(void *ws, struct rte_event e uint16_t nb_events);__rte_internal uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1); +__rte_internal +uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1);#endif /* _CN10K_CRYPTODEV_OPS_H_ */
drivers/crypto/cnxk/cnxk_cryptodev_ops.h +8 -1
@@ -37,7 +37,10 @@ struct cpt_qp_meta_info {struct cpt_inflight_req {union cpt_res_s res; -struct rte_crypto_op *cop; +union { +struct rte_crypto_op *cop; +struct rte_event_vector *vec; + };void *mdata;uint8_t op_flags;void *qp;
@@ -63,6 +66,10 @@ struct crypto_adpter_info {/**< Set if queue pair is added to crypto adapter */ struct rte_mempool *req_mp;/**< CPT inflight request mempool */ +uint16_t vector_sz; +/** Maximum number of cops to combine into single vector */ +struct rte_mempool *vector_mp; +/** Pool for allocating rte_event_vector */ };struct cnxk_cpt_qp {
drivers/crypto/cnxk/version.map +1 -0
@@ -5,6 +5,7 @@ INTERNAL { cn9k_cpt_crypto_adapter_dequeue; cn10k_cpt_crypto_adapter_enqueue; cn10k_cpt_crypto_adapter_dequeue; + cn10k_cpt_crypto_adapter_vector_dequeue; local: *; };
drivers/event/cnxk/cn10k_eventdev.c +37 -6
76 lines not on this page · raw message
drivers/event/cnxk/cn10k_worker.h +4 -2
@@ -207,6 +207,9 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64,if ((flags &CPT_RX_WQE_F ) && (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_CRYPTODEV )) { u64[1 ] =cn10k_cpt_crypto_adapter_dequeue (u64[1 ]); + }else if ((flags &CPT_RX_WQE_F ) && + (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_CRYPTODEV_VECTOR )) { + u64[1 ] =cn10k_cpt_crypto_adapter_vector_dequeue (u64[1 ]); }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_ETHDEV ) {uint8_t port =CNXK_SUB_EVENT_FROM_TAG (u64[0 ]);uint64_t mbuf;
@@ -253,8 +256,7 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64, flags &NIX_RX_OFFLOAD_TSTAMP_F , (uint64_t *)tstamp_ptr); u64[1 ] = mbuf; - }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) == -RTE_EVENT_TYPE_ETHDEV_VECTOR ) { + }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_ETHDEV_VECTOR ) {uint8_t port =CNXK_SUB_EVENT_FROM_TAG (u64[0 ]);__uint128_t vwqe_hdr = *(__uint128_t *)u64[1 ];
drivers/event/cnxk/cn9k_eventdev.c +6 -5
@@ -1124,8 +1124,7 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); - -RTE_SET_USED (conf); +int ret;CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" );
@@ -1133,12 +1132,14 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, dev->is_ca_internal_port =1 ;cn9k_sso_fp_fns_set ((struct rte_eventdev *)(uintptr_t )event_dev); -return cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id); + ret =cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id, conf); +cn9k_sso_set_priv_mem (event_dev,NULL ,0 ); + +return ret; }static int -cn9k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev, +cn9k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev,int32_t queue_pair_id) {CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );
drivers/event/cnxk/cnxk_eventdev.h +3 -1
@@ -10,6 +10,7 @@#include <cryptodev_pmd.h> #include <rte_devargs.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <rte_kvargs.h>
@@ -312,7 +313,8 @@ int cnxk_sso_tx_adapter_start(uint8_t id, const struct rte_eventdev *event_dev);int cnxk_sso_tx_adapter_stop (uint8_t id,const struct rte_eventdev *event_dev);int cnxk_sso_tx_adapter_free (uint8_t id,const struct rte_eventdev *event_dev);int cnxk_crypto_adapter_qp_add (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev,int32_t queue_pair_id); +const struct rte_cryptodev *cdev,int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf);int cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev,int32_t queue_pair_id);#endif /* __CNXK_EVENTDEV_H__ */
drivers/event/cnxk/cnxk_eventdev_adptr.c +12 -5
@@ -631,7 +631,8 @@ cnxk_sso_tx_adapter_free(uint8_t id __rte_unused, }static int -crypto_adapter_qp_setup (const struct rte_cryptodev *cdev,struct cnxk_cpt_qp *qp) +crypto_adapter_qp_setup (const struct rte_cryptodev *cdev,struct cnxk_cpt_qp *qp, +const struct rte_event_crypto_adapter_queue_conf *conf) {char name[RTE_MEMPOOL_NAMESIZE ];uint32_t cache_size, nb_req;
@@ -664,6 +665,10 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qpif (qp->ca.req_mp ==NULL )return -ENOMEM ; +if (conf !=NULL ) { + qp->ca.vector_sz = conf->vector_sz; + qp->ca.vector_mp = conf->vector_mp; + } qp->ca.enabled = true;return 0 ;
@@ -671,7 +676,8 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qpint cnxk_crypto_adapter_qp_add (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev, -int32_t queue_pair_id) +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *sso_evdev =cnxk_sso_pmd_priv (event_dev);uint32_t adptr_xae_cnt =0 ;
@@ -683,7 +689,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rtfor (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) { qp = cdev->data->queue_pairs[qp_id]; - ret =crypto_adapter_qp_setup (cdev, qp); + ret =crypto_adapter_qp_setup (cdev, qp, conf);if (ret) {cnxk_crypto_adapter_qp_del (cdev,-1 );return ret;
@@ -692,7 +698,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rt } }else { qp = cdev->data->queue_pairs[queue_pair_id]; - ret =crypto_adapter_qp_setup (cdev, qp); + ret =crypto_adapter_qp_setup (cdev, qp, conf);if (ret)return ret; adptr_xae_cnt = qp->ca.req_mp->size;
@@ -723,7 +729,8 @@ crypto_adapter_qp_free(struct cnxk_cpt_qp *qp) }int -cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev,int32_t queue_pair_id) +cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev, +int32_t queue_pair_id) {struct cnxk_cpt_qp *qp;
Signature · 1 line
2.25.1
v2 cover Vector support for event crypto adapter
In reply to Volodymyr FialkoIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing rte_event_vector whose event type is RTE_EVENT_TYPE_CRYPTODEV_VECTOR.
* Changes since v1
- Add missing newline/space issues
- Add missing error messages
- Remove double check of conf input parameter
Volodymyr Fialko (3):
eventdev: introduce event cryptodev vector type
crypto/cnxk: add burst enqueue for event crypto
crypto/cnxk: add vectorization for event crypto
app/test-eventdev/test_perf_common.c | 11 +- app/test/test_event_crypto_adapter.c | 12 +- .../prog_guide/event_crypto_adapter.rst | 23 +- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 456 ++++++++++++++++-- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/meson.build | 2 +- drivers/crypto/cnxk/version.map | 1 + drivers/event/cnxk/cn10k_eventdev.c | 50 +- drivers/event/cnxk/cn10k_worker.c | 10 - drivers/event/cnxk/cn10k_worker.h | 8 +- drivers/event/cnxk/cn9k_eventdev.c | 13 +- drivers/event/cnxk/cnxk_eventdev.h | 4 +- drivers/event/cnxk/cnxk_eventdev_adptr.c | 17 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 105 +++- lib/eventdev/rte_event_crypto_adapter.h | 101 +++- lib/eventdev/rte_eventdev.h | 8 + 22 files changed, 782 insertions(+), 120 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 eventdev: introduce event cryptodev vector type
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing rte_event_vector whose event type is RTE_EVENT_TYPE_CRYPTODEV_VECTOR.
Application should set RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in rte_event_crypto_adapter_queue_conf::flag and provide vector configuration with respect of rte_event_crypto_adapter_vector_limits, which could be obtained by calling rte_event_crypto_adapter_vector_limits_get, to enable vectorization.
The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in rte_event_crypto_metadata::response_info.
Updated drivers and tests accordingly to new API.
--- app/test-eventdev/test_perf_common.c | 11 +- app/test/test_event_crypto_adapter.c | 12 +- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 105 ++++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 ++++++++++++++++- lib/eventdev/rte_eventdev.h | 8 ++ 13 files changed, 285 insertions(+), 47 deletions(-)
app/test-eventdev/test_perf_common.c +5 -6
@@ -837,14 +837,13 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf; - response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add ( -TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); +TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, &conf); }else { ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id,NULL );
app/test/test_event_crypto_adapter.c +10 -2
@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void)static int test_crypto_adapter_qp_add_del (void ) { +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;
@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); +TEST_CDEV_ID ,TEST_CDEV_QP_ID , &queue_conf); }else ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID ,TEST_CDEV_ID ,TEST_CDEV_QP_ID ,NULL );
@@ -1206,6 +1210,10 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode) .new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;
@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); +TEST_CDEV_ID ,TEST_CDEV_QP_ID , &queue_conf); }else ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID ,TEST_CDEV_ID ,TEST_CDEV_QP_ID ,NULL );
doc/guides/prog_guide/event_crypto_adapter.rst +20 -3
@@ -201,10 +201,10 @@ capability, event information must be passed to the add API. ret = rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) { - struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, &event); + // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, NULL);
@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); } +Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto operations based on +provided response information of ``rte_event_crypto_metadata::response_info`` +and generate a ``rte_event`` containing ``rte_event_vector`` whose event type +is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be obtained by calling +``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capability indicates whether +PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/event/cnxk/cn10k_eventdev.c +2 -2
@@ -1029,11 +1029,11 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn10k" );
drivers/event/cnxk/cn9k_eventdev.c +3 -2
@@ -1120,11 +1120,12 @@ cn9k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,static int cn9k_crypto_adapter_qp_add (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev, -int32_t queue_pair_id,const struct rte_event *event) +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" );
drivers/event/dpaa/dpaa_eventdev.c +5 -4
@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h>
@@ -775,10 +776,10 @@ static int dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;
@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev,if (rx_queue_id ==-1 )return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) {DPAA_EVENTDEV_ERR ("dpaa_sec_eventq_attach failed: ret: %d\n" , ret);
drivers/event/dpaa2/dpaa2_eventdev.c +5 -4
@@ -26,6 +26,7 @@#include <rte_bus_vdev.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h>
@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;
@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,if (rx_queue_id ==-1 )return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) {DPAA2_EVENTDEV_ERR ("dpaa2_sec_eventq_attach failed: ret: %d\n" , ret);
drivers/event/octeontx/ssovf_evdev.c +2 -2
@@ -745,12 +745,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {for (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) {
lib/eventdev/eventdev_pmd.h +30 -5
@@ -910,6 +910,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice
@@ -964,11 +965,11 @@ typedef int (*eventdev_crypto_adapter_caps_get_t)* - <0: Error code returned by the driver function. * */ -typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *queue_conf);/**
@@ -1077,6 +1078,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
@@ -1363,6 +1385,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;/**< Get ethernet Rx queue stats */
lib/eventdev/eventdev_trace.h +4 -2
@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h"
@@ -271,11 +272,12 @@ RTE_TRACE_POINT(RTE_TRACE_POINT ( rte_eventdev_trace_crypto_adapter_queue_pair_add, RTE_TRACE_POINT_ARGS(uint8_t adptr_id, uint8_t cdev_id, - const void *event, int32_t queue_pair_id), + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf *conf), rte_trace_point_emit_u8(adptr_id);rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(
lib/eventdev/rte_event_crypto_adapter.c +95 -10
135 lines not on this page · raw message
lib/eventdev/rte_event_crypto_adapter.h +96 -5
125 lines not on this page · raw message
lib/eventdev/rte_eventdev.h +8 -0
@@ -1219,6 +1219,9 @@ struct rte_event_vector {#define RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR \ (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The event vector generated from eth Rx adapter. */ +#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV) +/**< The event vector generated from cryptodev adapter. */ #define RTE_EVENT_TYPE_MAX 0x10/**< Maximum number of event types */
@@ -1436,6 +1439,11 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);* the private data information along with the crypto session. */ +#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device
Signature · 1 line
2.25.1
PATCH v2 2/3 crypto/cnxk: add burst enqueue for event crypto
In reply to Volodymyr FialkoAdded support for burst enqueue for cn10k event crypto adapter. Instruction will be grouped based on the queue pair and sent in a burst.
--- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 147 ++++++++++++++++------ drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 7 +- drivers/crypto/cnxk/meson.build | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn10k_worker.c | 10 -- drivers/event/cnxk/cn10k_worker.h | 2 - 6 files changed, 113 insertions(+), 57 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +107 -40
@@ -9,11 +9,12 @@#include "cn10k_cryptodev.h" #include "cn10k_cryptodev_ops.h" -#include "cn10k_ipsec_la_ops.h" #include "cn10k_ipsec.h" +#include "cn10k_ipsec_la_ops.h" #include "cnxk_ae.h" #include "cnxk_cryptodev.h" #include "cnxk_cryptodev_ops.h" +#include "cnxk_eventdev.h" #include "cnxk_se.h" #include "roc_api.h"
@@ -391,74 +392,140 @@ cn10k_ca_meta_info_extract(struct rte_crypto_op *op,return 0 ; } -uint16_t -cn10k_cpt_crypto_adapter_enqueue (uintptr_t base,struct rte_crypto_op *op) +static inline uint16_t +ca_lmtst_burst_submit (struct cn10k_sso_hws *ws,uint64_t w2[], +struct cnxk_cpt_qp *qp,struct rte_crypto_op *op[], +uint16_t nb_ops) { +struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ]; +uint64_t lmt_base, lmt_arg, io_addr; +struct cpt_inst_s *inst, *inst_base;struct cpt_inflight_req *infl_req; -uint64_t lmt_base, lmt_arg, w2; -struct cpt_inst_s *inst;union cpt_fc_write_s fc; -struct cnxk_cpt_qp *qp;uint64_t *fc_addr;uint16_t lmt_id; -int ret; +int ret, i; - ret =cn10k_ca_meta_info_extract (op, &qp, &w2); -if (unlikely (ret)) { - rte_errno =EINVAL ; -return 0 ; - } + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; + +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst_base = (struct cpt_inst_s *)lmt_base;if (unlikely (!qp->ca.enabled)) { rte_errno =EINVAL ;return 0 ; } -if (unlikely (rte_mempool_get (qp->ca.req_mp, (void **)&infl_req))) { +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, + nb_ops))) { rte_errno =ENOMEM ;return 0 ; } - infl_req->op_flags =0 ; - lmt_base = qp->lmtline.lmt_base; - fc_addr = qp->lmtline.fc_addr; - -const uint32_t fc_thresh = qp->lmtline.fc_thresh; +for (i =0 ; i < nb_ops; i++) { + inst = &inst_base[2 * i]; + infl_req = infl_reqs[i]; + infl_req->op_flags =0 ; -ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); - inst = (struct cpt_inst_s *)lmt_base; + ret =cn10k_cpt_fill_inst (qp, &op[i], inst, infl_req); +if (unlikely (ret !=1 )) { +plt_dp_err ("Could not process op: %p" , op[i]); +if (i !=0 ) + goto submit; +else + goto put; + } - ret =cn10k_cpt_fill_inst (qp, &op, inst, infl_req); -if (unlikely (ret !=1 )) { -plt_dp_err ("Could not process op: %p" , op); -rte_mempool_put (qp->ca.req_mp, infl_req); -return 0 ; + infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; + infl_req->qp = qp; + inst->w0.u64 =0 ; + inst->res_addr = (uint64_t )&infl_req->res; + inst->w2.u64 = w2[i]; + inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); } - infl_req->cop = op; - infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; - infl_req->qp = qp; - inst->w0.u64 =0 ; - inst->res_addr = (uint64_t )&infl_req->res; - inst->w2.u64 = w2; - inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); - fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED);if (unlikely (fc.s.qsize > fc_thresh)) { -rte_mempool_put (qp->ca.req_mp, infl_req); rte_errno =EAGAIN ; -return 0 ; + i =0 ; + goto put; } -if (inst->w2.s.tt ==RTE_SCHED_TYPE_ORDERED ) -roc_sso_hws_head_wait (base); +submit: +if (CNXK_TT_FROM_TAG (ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (ws->base); - lmt_arg =ROC_CN10K_CPT_LMT_ARG | (uint64_t )lmt_id; -roc_lmt_submit_steorl (lmt_arg, qp->lmtline.io_addr); +if (i >PKTS_PER_STEORL ) { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | + (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + lmt_arg =ROC_CN10K_CPT_LMT_ARG | + (i -PKTS_PER_STEORL -1 ) <<12 | + (uint64_t )(lmt_id +PKTS_PER_STEORL ); +roc_lmt_submit_steorl (lmt_arg, io_addr); + }else { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | + (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + }rte_io_wmb (); -return 1 ; +put: +if (unlikely (i != nb_ops)) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], + nb_ops - i); + +return i; +} + +uint16_t __rte_hot +cn10k_cpt_crypto_adapter_enqueue (void *ws,struct rte_event ev[], +uint16_t nb_events) +{ +struct rte_crypto_op *ops[PKTS_PER_LOOP ], *op; +struct cnxk_cpt_qp *qp, *curr_qp =NULL ; +uint64_t w2s[PKTS_PER_LOOP ], w2; +uint16_t submitted, count =0 ; +int ret, i, ops_len =0 ; + +for (i =0 ; i < nb_events; i++) { + op = ev[i].event_ptr; + ret =cn10k_ca_meta_info_extract (op, &qp, &w2); +if (unlikely (ret)) { + rte_errno =EINVAL ; +return count; + } + +if (qp != curr_qp) { +if (ops_len) { + submitted =ca_lmtst_burst_submit ( + ws, w2s, curr_qp, ops, ops_len); + count += submitted; +if (unlikely (submitted != ops_len)) +return count; + ops_len =0 ; + } + curr_qp = qp; + } + w2s[ops_len] = w2; + ops[ops_len] = op; +if (++ops_len ==PKTS_PER_LOOP ) { + submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, + ops_len); + count += submitted; +if (unlikely (submitted != ops_len)) +return count; + ops_len =0 ; + } + } +if (ops_len) + count +=ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +return count; } static inline void
drivers/crypto/cnxk/cn10k_cryptodev_ops.h +4 -3
@@ -5,16 +5,17 @@#ifndef _CN10K_CRYPTODEV_OPS_H_#define _CN10K_CRYPTODEV_OPS_H_ -#include <rte_cryptodev.h> #include <cryptodev_pmd.h> +#include <rte_cryptodev.h> +#include <rte_eventdev.h> extern struct rte_cryptodev_ops cn10k_cpt_ops;void cn10k_cpt_set_enqdeq_fns (struct rte_cryptodev *dev);__rte_internal -uint16_t cn10k_cpt_crypto_adapter_enqueue(uintptr_t base, -struct rte_crypto_op *op); +uint16_t __rte_hot cn10k_cpt_crypto_adapter_enqueue(void *ws, struct rte_event ev[], +uint16_t nb_events);__rte_internal uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1);
drivers/crypto/cnxk/meson.build +1 -1
@@ -24,7 +24,7 @@ sources = files( deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev'] -includes += include_directories('../../../lib/net') +includes += include_directories('../../../lib/net', '../../event/cnxk') if get_option('buildtype').contains('debug') cflags += [ '-DLA_IPSEC_DEBUG' ]
drivers/event/cnxk/cn10k_eventdev.c +1 -1
@@ -594,7 +594,7 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev) } } } - event_dev->ca_enqueue = cn10k_sso_hws_ca_enq; + event_dev->ca_enqueue = cn10k_cpt_crypto_adapter_enqueue;if (dev->tx_offloads &NIX_TX_MULTI_SEG_F ) CN10K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
drivers/event/cnxk/cn10k_worker.c +0 -10
@@ -64,13 +64,3 @@ cn10k_sso_hws_enq_fwd_burst(void *port, const struct rte_event ev[],return 1 ; } - -uint16_t __rte_hot -cn10k_sso_hws_ca_enq (void *port,struct rte_event ev[],uint16_t nb_events) -{ -struct cn10k_sso_hws *ws = port; - -RTE_SET_USED (nb_events); - -return cn10k_cpt_crypto_adapter_enqueue (ws->base, ev->event_ptr); -}
drivers/event/cnxk/cn10k_worker.h +0 -2
@@ -353,8 +353,6 @@ uint16_t __rte_hot cn10k_sso_hws_enq_new_burst(void *port, uint16_t __rte_hot cn10k_sso_hws_enq_fwd_burst(void *port,const struct rte_event ev[],uint16_t nb_events); -uint16_t __rte_hot cn10k_sso_hws_ca_enq(void *port, struct rte_event ev[], -uint16_t nb_events);#define R (name, flags) \ uint16_t __rte_hot cn10k_sso_hws_deq_##name( \
Signature · 1 line
2.25.1
PATCH v2 3/3 crypto/cnxk: add vectorization for event crypto
In reply to Volodymyr FialkoAdd support for vector aggregation of crypto operations for cn10k. Crypto operations will be grouped by sub event type, flow id, scheduler type and queue id fields from rte_event_crypto_metadata::response_info.
--- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 403 +++++++++++++++++++--- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 2 + drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/version.map | 1 + drivers/event/cnxk/cn10k_eventdev.c | 46 ++- drivers/event/cnxk/cn10k_worker.h | 6 +- drivers/event/cnxk/cn9k_eventdev.c | 10 +- drivers/event/cnxk/cnxk_eventdev.h | 4 +- drivers/event/cnxk/cnxk_eventdev_adptr.c | 17 +- 9 files changed, 433 insertions(+), 65 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +358 -45
@@ -19,6 +19,25 @@#include "roc_api.h" +#define PKTS_PER_LOOP 32 +#define PKTS_PER_STEORL 16 + +/* Holds information required to send crypto operations in one burst */ +struct ops_burst { +struct rte_crypto_op *op[PKTS_PER_LOOP ]; +uint64_t w2[PKTS_PER_LOOP ]; +struct cn10k_sso_hws *ws; +struct cnxk_cpt_qp *qp; +uint16_t nb_ops; +}; + +/* Holds information required to send vector of operations */ +struct vec_request { +struct cpt_inflight_req *req; +struct rte_event_vector *vec; +uint64_t w2; +}; +static inline struct cnxk_se_sess *cn10k_cpt_sym_temp_sess_create (struct cnxk_cpt_qp *qp,struct rte_crypto_op *op) {
@@ -183,9 +202,6 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[],return 1 ; } -#define PKTS_PER_LOOP 32 -#define PKTS_PER_STEORL 16 -static uint16_t cn10k_cpt_enqueue_burst (void *qptr,struct rte_crypto_op **ops,uint16_t nb_ops) {
@@ -286,9 +302,9 @@ cn10k_cpt_crypto_adapter_ev_mdata_set(struct rte_cryptodev *dev __rte_unused,union rte_event_crypto_metadata *ec_mdata = mdata;struct rte_event *rsp_info;struct cnxk_cpt_qp *qp; +uint64_t w2, tag_type;uint8_t cdev_id;int16_t qp_id; -uint64_t w2;/* Get queue pair */ cdev_id = ec_mdata->request_info.cdev_id;
@@ -296,9 +312,9 @@ cn10k_cpt_crypto_adapter_ev_mdata_set(struct rte_cryptodev *dev __rte_unused, qp = rte_cryptodevs[cdev_id].data->queue_pairs[qp_id];/* Prepare w2 */ + tag_type = qp->ca.vector_sz ?RTE_EVENT_TYPE_CRYPTODEV_VECTOR :RTE_EVENT_TYPE_CRYPTODEV ; rsp_info = &ec_mdata->response_info; - w2 =CNXK_CPT_INST_W2 ((RTE_EVENT_TYPE_CRYPTODEV <<28 ) | - (rsp_info->sub_event_type <<20 ) | + w2 =CNXK_CPT_INST_W2 ((tag_type <<28 ) | (rsp_info->sub_event_type <<20 ) | rsp_info->flow_id, rsp_info->sched_type, rsp_info->queue_id,0 );
@@ -392,19 +408,236 @@ cn10k_ca_meta_info_extract(struct rte_crypto_op *op,return 0 ; } +static inline void +cn10k_cpt_vec_inst_fill (struct vec_request *vec_req,struct cpt_inst_s *inst, +struct cnxk_cpt_qp *qp) +{ +const union cpt_res_s res = {.cn10k.compcode =CPT_COMP_NOT_DONE }; +struct cpt_inflight_req *infl_req = vec_req->req; + +const union cpt_inst_w4 w4 = { + .s.opcode_major =ROC_SE_MAJOR_OP_MISC , + .s.opcode_minor =ROC_SE_MISC_MINOR_OP_PASSTHROUGH , + .s.param1 =1 , + .s.param2 =1 , + .s.dlen =0 , + }; + + infl_req->vec = vec_req->vec; + infl_req->qp = qp; + + inst->res_addr = (uint64_t )&infl_req->res; +__atomic_store_n (&infl_req->res.u64[0 ], res.u64[0 ], __ATOMIC_RELAXED); + + inst->w0.u64 =0 ; + inst->w2.u64 = vec_req->w2; + inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); + inst->w4.u64 = w4.u64; + inst->w7.u64 =ROC_CPT_DFLT_ENG_GRP_SE <<61 ; +} + +static void +cn10k_cpt_vec_pkt_submission_timeout_handle (void ) +{ +plt_dp_err ("Vector packet submission timedout" ); +abort (); +} + +static inline void +cn10k_cpt_vec_submit (struct vec_request vec_tbl[],uint16_t vec_tbl_len,struct cnxk_cpt_qp *qp) +{ +uint64_t lmt_base, lmt_arg, lmt_id, io_addr; +union cpt_fc_write_s fc; +struct cpt_inst_s *inst; +uint16_t burst_size; +uint64_t *fc_addr; +int i; + +if (vec_tbl_len ==0 ) +return ; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; +/* +* Use 10 mins timeout for the poll. It is not possible to recover from partial submission +* of vector packet. Actual packets for processing are submitted to CPT prior to this +* routine. Hence, any failure for submission of vector packet would indicate an +* unrecoverable error for the application. +*/ +const uint64_t timeout =rte_get_timer_cycles () +10 *60 *rte_get_timer_hz (); + + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst = (struct cpt_inst_s *)lmt_base; + +again: + burst_size =RTE_MIN (PKTS_PER_STEORL , vec_tbl_len); +for (i =0 ; i < burst_size; i++) +cn10k_cpt_vec_inst_fill (&vec_tbl[i], &inst[i *2 ], qp); + +do { + fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED); +if (likely (fc.s.qsize < fc_thresh)) +break ; +if (unlikely (rte_get_timer_cycles () > timeout)) +cn10k_cpt_vec_pkt_submission_timeout_handle (); + }while (true); + + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + +rte_io_wmb (); + + vec_tbl_len -= i; + +if (vec_tbl_len >0 ) { + vec_tbl += i; + goto again; + } +} + +static inline int +ca_lmtst_vec_submit (struct ops_burst *burst,struct vec_request vec_tbl[],uint16_t *vec_tbl_len) +{ +struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ]; +uint64_t lmt_base, lmt_arg, io_addr; +uint16_t lmt_id, len = *vec_tbl_len; +struct cpt_inst_s *inst, *inst_base; +struct cpt_inflight_req *infl_req; +struct rte_event_vector *vec; +union cpt_fc_write_s fc; +struct cnxk_cpt_qp *qp; +uint64_t *fc_addr; +int ret, i, vi; + + qp = burst->qp; + + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; + +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst_base = (struct cpt_inst_s *)lmt_base; + +#ifdef CNXK_CRYPTODEV_DEBUG +if (unlikely (!qp->ca.enabled)) { + rte_errno =EINVAL ; +return 0 ; + } +#endif + +/* Perform fc check before putting packets into vectors */ + fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED); +if (unlikely (fc.s.qsize > fc_thresh)) { + rte_errno =EAGAIN ; +return 0 ; + } + +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, burst->nb_ops))) { + rte_errno =ENOMEM ; +return 0 ; + } + +for (i =0 ; i < burst->nb_ops; i++) { + inst = &inst_base[2 * i]; + infl_req = infl_reqs[i]; + infl_req->op_flags =0 ; + + ret =cn10k_cpt_fill_inst (qp, &burst->op[i], inst, infl_req); +if (unlikely (ret !=1 )) { +plt_cpt_dbg ("Could not process op: %p" , burst->op[i]); +if (i !=0 ) + goto submit; +else + goto put; + } + + infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; + infl_req->qp = qp; + inst->w3.u64 =0x1 ; + +/* Lookup for existing vector by w2 */ +for (vi = len -1 ; vi >=0 ; vi--) { +if (vec_tbl[vi].w2 != burst->w2[i]) +continue ; + vec = vec_tbl[vi].vec; +if (unlikely (vec->nb_elem == qp->ca.vector_sz)) +continue ; + vec->ptrs[vec->nb_elem++] = infl_req; + goto next_op;/* continue outer loop */ + } + +/* No available vectors found, allocate a new one */ +if (unlikely (rte_mempool_get (qp->ca.vector_mp, (void **)&vec_tbl[len].vec))) { + rte_errno =ENOMEM ; +if (i !=0 ) + goto submit; +else + goto put; + } +/* Also preallocate in-flight request, that will be used to +* submit misc passthrough instruction +*/ +if (unlikely (rte_mempool_get (qp->ca.req_mp, (void **)&vec_tbl[len].req))) { +rte_mempool_put (qp->ca.vector_mp, vec_tbl[len].vec); + rte_errno =ENOMEM ; +if (i !=0 ) + goto submit; +else + goto put; + } + vec_tbl[len].w2 = burst->w2[i]; + vec_tbl[len].vec->ptrs[0 ] = infl_req; + vec_tbl[len].vec->nb_elem =1 ; + len++; + +next_op:; + } + +/* Submit operations in burst */ +submit: +if (CNXK_TT_FROM_TAG (burst->ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (burst->ws->base); + +if (i >PKTS_PER_STEORL ) { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -PKTS_PER_STEORL -1 ) <<12 | + (uint64_t )(lmt_id +PKTS_PER_STEORL ); +roc_lmt_submit_steorl (lmt_arg, io_addr); + }else { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + } + +rte_io_wmb (); + +put: +if (i != burst->nb_ops) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], burst->nb_ops - i); + + *vec_tbl_len = len; + +return i; +} +static inline uint16_t -ca_lmtst_burst_submit (struct cn10k_sso_hws *ws,uint64_t w2[], -struct cnxk_cpt_qp *qp,struct rte_crypto_op *op[], -uint16_t nb_ops) +ca_lmtst_burst_submit (struct ops_burst *burst) {struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ];uint64_t lmt_base, lmt_arg, io_addr;struct cpt_inst_s *inst, *inst_base;struct cpt_inflight_req *infl_req;union cpt_fc_write_s fc; +struct cnxk_cpt_qp *qp;uint64_t *fc_addr;uint16_t lmt_id; -int ret, i; +int ret, i, j; + + qp = burst->qp; lmt_base = qp->lmtline.lmt_base; io_addr = qp->lmtline.io_addr;
@@ -415,25 +648,26 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[],ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); inst_base = (struct cpt_inst_s *)lmt_base; +#ifdef CNXK_CRYPTODEV_DEBUG if (unlikely (!qp->ca.enabled)) { rte_errno =EINVAL ;return 0 ; } +#endif -if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, - nb_ops))) { +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, burst->nb_ops))) { rte_errno =ENOMEM ;return 0 ; } -for (i =0 ; i < nb_ops; i++) { +for (i =0 ; i < burst->nb_ops; i++) { inst = &inst_base[2 * i]; infl_req = infl_reqs[i]; infl_req->op_flags =0 ; - ret =cn10k_cpt_fill_inst (qp, &op[i], inst, infl_req); + ret =cn10k_cpt_fill_inst (qp, &burst->op[i], inst, infl_req);if (unlikely (ret !=1 )) { -plt_dp_err ("Could not process op: %p" , op[i]); +plt_dp_dbg ("Could not process op: %p" , burst->op[i]);if (i !=0 ) goto submit;else
@@ -444,20 +678,25 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], infl_req->qp = qp; inst->w0.u64 =0 ; inst->res_addr = (uint64_t )&infl_req->res; - inst->w2.u64 = w2[i]; + inst->w2.u64 = burst->w2[i]; inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); } fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED);if (unlikely (fc.s.qsize > fc_thresh)) { rte_errno =EAGAIN ; +for (j =0 ; j < i; j++) { + infl_req = infl_reqs[j]; +if (unlikely (infl_req->op_flags &CPT_OP_FLAGS_METABUF )) +rte_mempool_put (qp->meta_info.pool, infl_req->mdata); + } i =0 ; goto put; } submit: -if (CNXK_TT_FROM_TAG (ws->gw_rdata) ==SSO_TT_ORDERED ) -roc_sso_hws_head_wait (ws->base); +if (CNXK_TT_FROM_TAG (burst->ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (burst->ws->base);if (i >PKTS_PER_STEORL ) { lmt_arg = ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL - 1) << 12 |
@@ -476,9 +715,8 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[],rte_io_wmb (); put: -if (unlikely (i != nb_ops)) -rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], - nb_ops - i); +if (unlikely (i != burst->nb_ops)) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], burst->nb_ops - i);return i; }
@@ -487,44 +725,76 @@ uint16_t __rte_hot cn10k_cpt_crypto_adapter_enqueue(void *ws, struct rte_event ev[], uint16_t nb_events) { -struct rte_crypto_op *ops[PKTS_PER_LOOP ], *op; -struct cnxk_cpt_qp *qp, *curr_qp =NULL ; -uint64_t w2s[PKTS_PER_LOOP ], w2; -uint16_t submitted, count =0 ; -int ret, i, ops_len =0 ; +uint16_t submitted, count =0 , vec_tbl_len =0 ; +struct vec_request vec_tbl[nb_events]; +struct rte_crypto_op *op; +struct ops_burst burst; +struct cnxk_cpt_qp *qp; +bool is_vector = false; +uint64_t w2; +int ret, i; + + burst.ws = ws; + burst.qp =NULL ; + burst.nb_ops =0 ;for (i =0 ; i < nb_events; i++) { op = ev[i].event_ptr; ret =cn10k_ca_meta_info_extract (op, &qp, &w2);if (unlikely (ret)) { rte_errno =EINVAL ; -return count; + goto vec_submit; } -if (qp != curr_qp) { -if (ops_len) { - submitted =ca_lmtst_burst_submit ( - ws, w2s, curr_qp, ops, ops_len); +/* Queue pair change check */ +if (qp != burst.qp) { +if (burst.nb_ops) { +if (is_vector) { + submitted = +ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +/* +* Vector submission is required on qp change, but not in +* other cases, since we could send several vectors per +* lmtst instruction only for same qp +*/ +cn10k_cpt_vec_submit (vec_tbl, vec_tbl_len, burst.qp); + vec_tbl_len =0 ; + }else { + submitted =ca_lmtst_burst_submit (&burst); + } count += submitted; -if (unlikely (submitted != ops_len)) -return count; - ops_len =0 ; +if (unlikely (submitted != burst.nb_ops)) + goto vec_submit; + burst.nb_ops =0 ; } - curr_qp = qp; + is_vector = qp->ca.vector_sz; + burst.qp = qp; } - w2s[ops_len] = w2; - ops[ops_len] = op; -if (++ops_len ==PKTS_PER_LOOP ) { - submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, - ops_len); + burst.w2[burst.nb_ops] = w2; + burst.op[burst.nb_ops] = op; + +/* Max nb_ops per burst check */ +if (++burst.nb_ops ==PKTS_PER_LOOP ) { +if (is_vector) + submitted =ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +else + submitted =ca_lmtst_burst_submit (&burst); count += submitted; -if (unlikely (submitted != ops_len)) -return count; - ops_len =0 ; +if (unlikely (submitted != burst.nb_ops)) + goto vec_submit; + burst.nb_ops =0 ; } } -if (ops_len) - count +=ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +/* Submit the rest of crypto operations */ +if (burst.nb_ops) { +if (is_vector) + count +=ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +else + count +=ca_lmtst_burst_submit (&burst); + } + +vec_submit: +cn10k_cpt_vec_submit (vec_tbl, vec_tbl_len, burst.qp);return count; }
@@ -683,6 +953,49 @@ cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1)return (uintptr_t )cop; } +uintptr_t +cn10k_cpt_crypto_adapter_vector_dequeue (uintptr_t get_work1) +{ +struct cpt_inflight_req *infl_req, *vec_infl_req; +struct rte_mempool *meta_mp, *req_mp; +struct rte_event_vector *vec; +struct rte_crypto_op *cop; +struct cnxk_cpt_qp *qp; +union cpt_res_s res; +int i; + + vec_infl_req = (struct cpt_inflight_req *)(get_work1); + + vec = vec_infl_req->vec; + qp = vec_infl_req->qp; + meta_mp = qp->meta_info.pool; + req_mp = qp->ca.req_mp; + +#ifdef CNXK_CRYPTODEV_DEBUG + res.u64[0 ] =__atomic_load_n (&vec_infl_req->res.u64[0 ], __ATOMIC_RELAXED); +PLT_ASSERT (res.cn10k.compcode ==CPT_COMP_WARN ); +PLT_ASSERT (res.cn10k.uc_compcode ==0 ); +#endif + +for (i =0 ; i < vec->nb_elem; i++) { + infl_req = vec->ptrs[i]; + cop = infl_req->cop; + + res.u64[0 ] =__atomic_load_n (&infl_req->res.u64[0 ], __ATOMIC_RELAXED); +cn10k_cpt_dequeue_post_process (qp, cop, infl_req, &res.cn10k); + + vec->ptrs[i] = cop; +if (unlikely (infl_req->op_flags &CPT_OP_FLAGS_METABUF )) +rte_mempool_put (meta_mp, infl_req->mdata); + +rte_mempool_put (req_mp, infl_req); + } + +rte_mempool_put (req_mp, vec_infl_req); + +return (uintptr_t )vec; +} +static uint16_t cn10k_cpt_dequeue_burst (void *qptr,struct rte_crypto_op **ops,uint16_t nb_ops) {
drivers/crypto/cnxk/cn10k_cryptodev_ops.h +2 -0
@@ -18,5 +18,7 @@ uint16_t __rte_hot cn10k_cpt_crypto_adapter_enqueue(void *ws, struct rte_event e uint16_t nb_events);__rte_internal uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1); +__rte_internal +uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1);#endif /* _CN10K_CRYPTODEV_OPS_H_ */
drivers/crypto/cnxk/cnxk_cryptodev_ops.h +8 -1
@@ -37,7 +37,10 @@ struct cpt_qp_meta_info {struct cpt_inflight_req {union cpt_res_s res; -struct rte_crypto_op *cop; +union { +struct rte_crypto_op *cop; +struct rte_event_vector *vec; + };void *mdata;uint8_t op_flags;void *qp;
@@ -63,6 +66,10 @@ struct crypto_adpter_info {/**< Set if queue pair is added to crypto adapter */ struct rte_mempool *req_mp;/**< CPT inflight request mempool */ +uint16_t vector_sz; +/** Maximum number of cops to combine into single vector */ +struct rte_mempool *vector_mp; +/** Pool for allocating rte_event_vector */ };struct cnxk_cpt_qp {
drivers/crypto/cnxk/version.map +1 -0
@@ -5,6 +5,7 @@ INTERNAL { cn9k_cpt_crypto_adapter_dequeue; cn10k_cpt_crypto_adapter_enqueue; cn10k_cpt_crypto_adapter_dequeue; + cn10k_cpt_crypto_adapter_vector_dequeue; local: *; };
drivers/event/cnxk/cn10k_eventdev.c +40 -6
79 lines not on this page · raw message
drivers/event/cnxk/cn10k_worker.h +4 -2
@@ -207,6 +207,9 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64,if ((flags &CPT_RX_WQE_F ) && (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_CRYPTODEV )) { u64[1 ] =cn10k_cpt_crypto_adapter_dequeue (u64[1 ]); + }else if ((flags &CPT_RX_WQE_F ) && + (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_CRYPTODEV_VECTOR )) { + u64[1 ] =cn10k_cpt_crypto_adapter_vector_dequeue (u64[1 ]); }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_ETHDEV ) {uint8_t port =CNXK_SUB_EVENT_FROM_TAG (u64[0 ]);uint64_t mbuf;
@@ -253,8 +256,7 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64, flags &NIX_RX_OFFLOAD_TSTAMP_F , (uint64_t *)tstamp_ptr); u64[1 ] = mbuf; - }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) == -RTE_EVENT_TYPE_ETHDEV_VECTOR ) { + }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_ETHDEV_VECTOR ) {uint8_t port =CNXK_SUB_EVENT_FROM_TAG (u64[0 ]);__uint128_t vwqe_hdr = *(__uint128_t *)u64[1 ];
drivers/event/cnxk/cn9k_eventdev.c +5 -5
@@ -1125,20 +1125,20 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, {struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev); -RTE_SET_USED (conf); -CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" ); dev->is_ca_internal_port =1 ;cn9k_sso_fp_fns_set ((struct rte_eventdev *)(uintptr_t )event_dev); -return cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id); + ret =cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id, conf); +cn9k_sso_set_priv_mem (event_dev,NULL ,0 ); + +return ret; }static int -cn9k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev, +cn9k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev,int32_t queue_pair_id) {CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );
drivers/event/cnxk/cnxk_eventdev.h +3 -1
@@ -10,6 +10,7 @@#include <cryptodev_pmd.h> #include <rte_devargs.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <rte_kvargs.h>
@@ -303,7 +304,8 @@ int cnxk_sso_tx_adapter_start(uint8_t id, const struct rte_eventdev *event_dev);int cnxk_sso_tx_adapter_stop (uint8_t id,const struct rte_eventdev *event_dev);int cnxk_sso_tx_adapter_free (uint8_t id,const struct rte_eventdev *event_dev);int cnxk_crypto_adapter_qp_add (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev,int32_t queue_pair_id); +const struct rte_cryptodev *cdev,int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf);int cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev,int32_t queue_pair_id);#endif /* __CNXK_EVENTDEV_H__ */
drivers/event/cnxk/cnxk_eventdev_adptr.c +12 -5
@@ -631,7 +631,8 @@ cnxk_sso_tx_adapter_free(uint8_t id __rte_unused, }static int -crypto_adapter_qp_setup (const struct rte_cryptodev *cdev,struct cnxk_cpt_qp *qp) +crypto_adapter_qp_setup (const struct rte_cryptodev *cdev,struct cnxk_cpt_qp *qp, +const struct rte_event_crypto_adapter_queue_conf *conf) {char name[RTE_MEMPOOL_NAMESIZE ];uint32_t cache_size, nb_req;
@@ -664,6 +665,10 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qpif (qp->ca.req_mp ==NULL )return -ENOMEM ; +if (conf !=NULL ) { + qp->ca.vector_sz = conf->vector_sz; + qp->ca.vector_mp = conf->vector_mp; + } qp->ca.enabled = true;return 0 ;
@@ -671,7 +676,8 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qpint cnxk_crypto_adapter_qp_add (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev, -int32_t queue_pair_id) +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *sso_evdev =cnxk_sso_pmd_priv (event_dev);uint32_t adptr_xae_cnt =0 ;
@@ -683,7 +689,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rtfor (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) { qp = cdev->data->queue_pairs[qp_id]; - ret =crypto_adapter_qp_setup (cdev, qp); + ret =crypto_adapter_qp_setup (cdev, qp, conf);if (ret) {cnxk_crypto_adapter_qp_del (cdev,-1 );return ret;
@@ -692,7 +698,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rt } }else { qp = cdev->data->queue_pairs[queue_pair_id]; - ret =crypto_adapter_qp_setup (cdev, qp); + ret =crypto_adapter_qp_setup (cdev, qp, conf);if (ret)return ret; adptr_xae_cnt = qp->ca.req_mp->size;
@@ -723,7 +729,8 @@ crypto_adapter_qp_free(struct cnxk_cpt_qp *qp) }int -cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev,int32_t queue_pair_id) +cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev, +int32_t queue_pair_id) {struct cnxk_cpt_qp *qp;
Signature · 1 line
2.25.1
v3 cover Vector support for event crypto adapter
In reply to Volodymyr FialkoIntroduce ability to aggregate crypto operations processed by event crypto adapter into single event containing rte_event_vector whose event type is RTE_EVENT_TYPE_CRYPTODEV_VECTOR.
* Changes since v1
- Add missing newline/space issues
- Add missing error messages
- Remove double check of conf input parameter
* Changes since v2
- Rebase on top of dpdk-next-eventdev branch
- Remove already merged patch
Volodymyr Fialko (2):
eventdev: introduce event cryptodev vector type
crypto/cnxk: add vectorization for event crypto
app/test-eventdev/test_perf_common.c | 11 +- app/test/test_event_crypto_adapter.c | 12 +- .../prog_guide/event_crypto_adapter.rst | 23 +- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 398 ++++++++++++++++-- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 2 + drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/version.map | 1 + drivers/event/cnxk/cn10k_eventdev.c | 33 +- drivers/event/cnxk/cn10k_worker.h | 6 +- drivers/event/cnxk/cn9k_eventdev.c | 10 +- drivers/event/cnxk/cnxk_eventdev.h | 4 +- drivers/event/cnxk/cnxk_eventdev_adptr.c | 17 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 105 ++++- lib/eventdev/rte_event_crypto_adapter.h | 101 ++++- lib/eventdev/rte_eventdev.h | 8 + 20 files changed, 698 insertions(+), 105 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/2 eventdev: introduce event cryptodev vector type
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing rte_event_vector whose event type is RTE_EVENT_TYPE_CRYPTODEV_VECTOR.
Application should set RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in rte_event_crypto_adapter_queue_conf::flag and provide vector configuration with respect of rte_event_crypto_adapter_vector_limits, which could be obtained by calling rte_event_crypto_adapter_vector_limits_get, to enable vectorization.
The event crypto adapter would be responsible for vectorizing the crypto operations based on provided response information in rte_event_crypto_metadata::response_info.
Updated drivers and tests accordingly to new API.
--- app/test-eventdev/test_perf_common.c | 11 +- app/test/test_event_crypto_adapter.c | 12 +- .../prog_guide/event_crypto_adapter.rst | 23 +++- drivers/event/cnxk/cn10k_eventdev.c | 4 +- drivers/event/cnxk/cn9k_eventdev.c | 5 +- drivers/event/dpaa/dpaa_eventdev.c | 9 +- drivers/event/dpaa2/dpaa2_eventdev.c | 9 +- drivers/event/octeontx/ssovf_evdev.c | 4 +- lib/eventdev/eventdev_pmd.h | 35 +++++- lib/eventdev/eventdev_trace.h | 6 +- lib/eventdev/rte_event_crypto_adapter.c | 105 ++++++++++++++++-- lib/eventdev/rte_event_crypto_adapter.h | 101 ++++++++++++++++- lib/eventdev/rte_eventdev.h | 8 ++ 13 files changed, 285 insertions(+), 47 deletions(-)
app/test-eventdev/test_perf_common.c +5 -6
@@ -837,14 +837,13 @@ perf_event_crypto_adapter_setup(struct test_perf *t, struct prod_data *p) }if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { -struct rte_event response_info; +struct rte_event_crypto_adapter_queue_conf conf; - response_info.event =0 ; - response_info.sched_type =RTE_SCHED_TYPE_ATOMIC ; - response_info.queue_id = p->queue_id; +memset (&conf,0 ,sizeof (conf)); + conf.ev.sched_type =RTE_SCHED_TYPE_ATOMIC ; + conf.ev.queue_id = p->queue_id; ret =rte_event_crypto_adapter_queue_pair_add ( -TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, - &response_info); +TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id, &conf); }else { ret =rte_event_crypto_adapter_queue_pair_add (TEST_PERF_CA_ID , p->ca.cdev_id, p->ca.cdev_qp_id,NULL );
app/test/test_event_crypto_adapter.c +10 -2
@@ -1175,6 +1175,10 @@ test_crypto_adapter_create(void)static int test_crypto_adapter_qp_add_del (void ) { +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;
@@ -1183,7 +1187,7 @@ test_crypto_adapter_qp_add_del(void)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); +TEST_CDEV_ID ,TEST_CDEV_QP_ID , &queue_conf); }else ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID ,TEST_CDEV_ID ,TEST_CDEV_QP_ID ,NULL );
@@ -1206,6 +1210,10 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode) .new_event_threshold = 1200, }; +struct rte_event_crypto_adapter_queue_conf queue_conf = { + .ev = response_info, + }; +uint32_t cap;int ret;
@@ -1238,7 +1246,7 @@ configure_event_crypto_adapter(enum rte_event_crypto_adapter_mode mode)if (cap &RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND ) { ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID , -TEST_CDEV_ID ,TEST_CDEV_QP_ID , &response_info); +TEST_CDEV_ID ,TEST_CDEV_QP_ID , &queue_conf); }else ret =rte_event_crypto_adapter_queue_pair_add (TEST_ADAPTER_ID ,TEST_CDEV_ID ,TEST_CDEV_QP_ID ,NULL );
doc/guides/prog_guide/event_crypto_adapter.rst +20 -3
@@ -201,10 +201,10 @@ capability, event information must be passed to the add API. ret = rte_event_crypto_adapter_caps_get(id, evdev, &cap); if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) { - struct rte_event event; + struct rte_event_crypto_adapter_queue_conf conf; - // Fill in event information & pass it to add API - rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, &event); + // Fill in conf.event information & pass it to add API + rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, &conf); } else rte_event_crypto_adapter_queue_pair_add(id, cdev_id, qp_id, NULL);
@@ -291,6 +291,23 @@ the ``rte_crypto_op``. rte_memcpy(op + len, &m_data, sizeof(m_data)); } +Enable event vectorization +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The event crypto adapter can aggregate outcoming crypto operations based on +provided response information of ``rte_event_crypto_metadata::response_info`` +and generate a ``rte_event`` containing ``rte_event_vector`` whose event type +is ``RTE_EVENT_TYPE_CRYPTODEV_VECTOR``. +To enable vectorization application should set +RTE_EVENT_CRYPTO_ADAPTER_EVENT_VECTOR in +``rte_event_crypto_adapter_queue_conf::flag`` and provide vector +configuration(size, mempool, etc.) with respect of +``rte_event_crypto_adapter_vector_limits``, which could be obtained by calling +``rte_event_crypto_adapter_vector_limits_get()``. + +The RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR capability indicates whether +PMD supports this feature. + Start the adapter instance ~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/event/cnxk/cn10k_eventdev.c +2 -2
@@ -1034,12 +1034,12 @@ static int cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);int ret; -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn10k" );
drivers/event/cnxk/cn9k_eventdev.c +3 -2
@@ -1125,12 +1125,13 @@ cn9k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,static int cn9k_crypto_adapter_qp_add (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev, -int32_t queue_pair_id,const struct rte_event *event) +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev);int ret; -RTE_SET_USED (event); +RTE_SET_USED (conf);CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" );
drivers/event/dpaa/dpaa_eventdev.c +5 -4
@@ -26,6 +26,7 @@#include <rte_eventdev.h> #include <eventdev_pmd_vdev.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <cryptodev_pmd.h>
@@ -775,10 +776,10 @@ static int dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;u16 ch_id = priv->evq_info[ev_qid].ch_id;int ret;
@@ -786,10 +787,10 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev *dev,if (rx_queue_id ==-1 )return dpaa_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa_sec_eventq_attach (cryptodev, rx_queue_id, - ch_id, ev); + ch_id, &conf->ev);if (ret) {DPAA_EVENTDEV_ERR ("dpaa_sec_eventq_attach failed: ret: %d\n" , ret);
drivers/event/dpaa2/dpaa2_eventdev.c +5 -4
@@ -26,6 +26,7 @@#include <bus_vdev_driver.h> #include <ethdev_driver.h> #include <cryptodev_pmd.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h>
@@ -865,10 +866,10 @@ static int dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cryptodev, int32_t rx_queue_id, - const struct rte_event *ev) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct dpaa2_eventdev *priv = dev->data->dev_private; -uint8_t ev_qid = ev->queue_id; +uint8_t ev_qid = conf->ev.queue_id;struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;int ret;
@@ -876,10 +877,10 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,if (rx_queue_id ==-1 )return dpaa2_eventdev_crypto_queue_add_all (dev, - cryptodev, ev); + cryptodev, &conf->ev); ret =dpaa2_sec_eventq_attach (cryptodev, rx_queue_id, - dpcon, ev); + dpcon, &conf->ev);if (ret) {DPAA2_EVENTDEV_ERR ("dpaa2_sec_eventq_attach failed: ret: %d\n" , ret);
drivers/event/octeontx/ssovf_evdev.c +2 -2
@@ -746,12 +746,12 @@ static int ssovf_crypto_adapter_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev, int32_t queue_pair_id, - const struct rte_event *event) + const struct rte_event_crypto_adapter_queue_conf *conf) { struct cpt_instance *qp;uint8_t qp_id; -RTE_SET_USED (event); +RTE_SET_USED (conf);if (queue_pair_id ==-1 ) {for (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) {
lib/eventdev/eventdev_pmd.h +30 -5
@@ -910,6 +910,7 @@ rte_event_pmd_selftest_seqn(struct rte_mbuf *mbuf) }struct rte_cryptodev ; +struct rte_event_crypto_adapter_queue_conf ;/** * This API may change without prior notice
@@ -964,11 +965,11 @@ typedef int (*eventdev_crypto_adapter_caps_get_t)* - <0: Error code returned by the driver function. * */ -typedef int (*eventdev_crypto_adapter_queue_pair_add_t ) - (const struct rte_eventdev *dev, -const struct rte_cryptodev *cdev, -int32_t queue_pair_id, -const struct rte_event *event); +typedef int (*eventdev_crypto_adapter_queue_pair_add_t )( +const struct rte_eventdev *dev, +const struct rte_cryptodev *cdev, +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *queue_conf);/**
@@ -1077,6 +1078,27 @@ typedef int (*eventdev_crypto_adapter_stats_reset) (const struct rte_eventdev *dev, const struct rte_cryptodev *cdev); +struct rte_event_crypto_adapter_vector_limits ; +/** +* Get event vector limits for a given event, crypto device pair. +* +* @param dev +* Event device pointer +* +* @param cdev +* Crypto device pointer +* +* @param[out] limits +* Pointer to the limits structure to be filled. +* +* @return +* - 0: Success. +* - <0: Error code returned by the driver function. +*/ +typedef int (*eventdev_crypto_adapter_vector_limits_get_t )( +const struct rte_eventdev *dev,const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits); +/** * Retrieve the event device's eth Tx adapter capabilities. *
@@ -1402,6 +1424,9 @@ struct eventdev_ops {/**< Get crypto stats */ eventdev_crypto_adapter_stats_reset crypto_adapter_stats_reset;/**< Reset crypto stats */ +eventdev_crypto_adapter_vector_limits_get_t + crypto_adapter_vector_limits_get; +/**< Get event vector limits for the crypto adapter */ eventdev_eth_rx_adapter_q_stats_get eth_rx_adapter_queue_stats_get;/**< Get ethernet Rx queue stats */
lib/eventdev/eventdev_trace.h +4 -2
@@ -18,6 +18,7 @@ extern "C" {#include <rte_trace_point.h> #include "rte_eventdev.h" +#include "rte_event_crypto_adapter.h" #include "rte_event_eth_rx_adapter.h" #include "rte_event_timer_adapter.h"
@@ -271,11 +272,12 @@ RTE_TRACE_POINT(RTE_TRACE_POINT ( rte_eventdev_trace_crypto_adapter_queue_pair_add, RTE_TRACE_POINT_ARGS(uint8_t adptr_id, uint8_t cdev_id, - const void *event, int32_t queue_pair_id), + int32_t queue_pair_id, + const struct rte_event_crypto_adapter_queue_conf *conf), rte_trace_point_emit_u8(adptr_id);rte_trace_point_emit_u8 (cdev_id);rte_trace_point_emit_i32 (queue_pair_id); -rte_trace_point_emit_ptr (event); +rte_trace_point_emit_ptr (conf); ) RTE_TRACE_POINT(
lib/eventdev/rte_event_crypto_adapter.c +95 -10
135 lines not on this page · raw message
lib/eventdev/rte_event_crypto_adapter.h +96 -5
125 lines not on this page · raw message
lib/eventdev/rte_eventdev.h +8 -0
@@ -1220,6 +1220,9 @@ struct rte_event_vector {#define RTE_EVENT_TYPE_ETH_RX_ADAPTER_VECTOR \ (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_ETH_RX_ADAPTER)/**< The event vector generated from eth Rx adapter. */ +#define RTE_EVENT_TYPE_CRYPTODEV_VECTOR \ + (RTE_EVENT_TYPE_VECTOR | RTE_EVENT_TYPE_CRYPTODEV) +/**< The event vector generated from cryptodev adapter. */ #define RTE_EVENT_TYPE_MAX 0x10/**< Maximum number of event types */
@@ -1437,6 +1440,11 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps);* the private data information along with the crypto session. */ +#define RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR 0x10 +/**< Flag indicates HW is capable of aggregating processed +* crypto operations into rte_event_vector. +*/ +/** * Retrieve the event device's crypto adapter capabilities for the * specified cryptodev device
Signature · 1 line
2.25.1
PATCH v3 2/2 crypto/cnxk: add vectorization for event crypto
In reply to Volodymyr FialkoAdd support for vector aggregation of crypto operations for cn10k. Crypto operations will be grouped by sub event type, flow id, scheduler type and queue id fields from rte_event_crypto_metadata::response_info.
--- drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 398 +++++++++++++++++++--- drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 2 + drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 9 +- drivers/crypto/cnxk/version.map | 1 + drivers/event/cnxk/cn10k_eventdev.c | 31 +- drivers/event/cnxk/cn10k_worker.h | 6 +- drivers/event/cnxk/cn9k_eventdev.c | 7 +- drivers/event/cnxk/cnxk_eventdev.h | 4 +- drivers/event/cnxk/cnxk_eventdev_adptr.c | 17 +- 9 files changed, 415 insertions(+), 60 deletions(-)
drivers/crypto/cnxk/cn10k_cryptodev_ops.c +358 -40
@@ -19,6 +19,25 @@#include "roc_api.h" +#define PKTS_PER_LOOP 32 +#define PKTS_PER_STEORL 16 + +/* Holds information required to send crypto operations in one burst */ +struct ops_burst { +struct rte_crypto_op *op[PKTS_PER_LOOP ]; +uint64_t w2[PKTS_PER_LOOP ]; +struct cn10k_sso_hws *ws; +struct cnxk_cpt_qp *qp; +uint16_t nb_ops; +}; + +/* Holds information required to send vector of operations */ +struct vec_request { +struct cpt_inflight_req *req; +struct rte_event_vector *vec; +uint64_t w2; +}; +static inline struct cnxk_se_sess *cn10k_cpt_sym_temp_sess_create (struct cnxk_cpt_qp *qp,struct rte_crypto_op *op) {
@@ -164,9 +183,6 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[],return 1 ; } -#define PKTS_PER_LOOP 32 -#define PKTS_PER_STEORL 16 -static uint16_t cn10k_cpt_enqueue_burst (void *qptr,struct rte_crypto_op **ops,uint16_t nb_ops) {
@@ -267,9 +283,9 @@ cn10k_cpt_crypto_adapter_ev_mdata_set(struct rte_cryptodev *dev __rte_unused,union rte_event_crypto_metadata *ec_mdata = mdata;struct rte_event *rsp_info;struct cnxk_cpt_qp *qp; +uint64_t w2, tag_type;uint8_t cdev_id;int16_t qp_id; -uint64_t w2;/* Get queue pair */ cdev_id = ec_mdata->request_info.cdev_id;
@@ -277,9 +293,9 @@ cn10k_cpt_crypto_adapter_ev_mdata_set(struct rte_cryptodev *dev __rte_unused, qp = rte_cryptodevs[cdev_id].data->queue_pairs[qp_id];/* Prepare w2 */ + tag_type = qp->ca.vector_sz ?RTE_EVENT_TYPE_CRYPTODEV_VECTOR :RTE_EVENT_TYPE_CRYPTODEV ; rsp_info = &ec_mdata->response_info; - w2 =CNXK_CPT_INST_W2 ((RTE_EVENT_TYPE_CRYPTODEV <<28 ) | - (rsp_info->sub_event_type <<20 ) | + w2 =CNXK_CPT_INST_W2 ((tag_type <<28 ) | (rsp_info->sub_event_type <<20 ) | rsp_info->flow_id, rsp_info->sched_type, rsp_info->queue_id,0 );
@@ -373,18 +389,236 @@ cn10k_ca_meta_info_extract(struct rte_crypto_op *op,return 0 ; } +static inline void +cn10k_cpt_vec_inst_fill (struct vec_request *vec_req,struct cpt_inst_s *inst, +struct cnxk_cpt_qp *qp) +{ +const union cpt_res_s res = {.cn10k.compcode =CPT_COMP_NOT_DONE }; +struct cpt_inflight_req *infl_req = vec_req->req; + +const union cpt_inst_w4 w4 = { + .s.opcode_major =ROC_SE_MAJOR_OP_MISC , + .s.opcode_minor =ROC_SE_MISC_MINOR_OP_PASSTHROUGH , + .s.param1 =1 , + .s.param2 =1 , + .s.dlen =0 , + }; + + infl_req->vec = vec_req->vec; + infl_req->qp = qp; + + inst->res_addr = (uint64_t )&infl_req->res; +__atomic_store_n (&infl_req->res.u64[0 ], res.u64[0 ], __ATOMIC_RELAXED); + + inst->w0.u64 =0 ; + inst->w2.u64 = vec_req->w2; + inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); + inst->w4.u64 = w4.u64; + inst->w7.u64 =ROC_CPT_DFLT_ENG_GRP_SE <<61 ; +} + +static void +cn10k_cpt_vec_pkt_submission_timeout_handle (void ) +{ +plt_dp_err ("Vector packet submission timedout" ); +abort (); +} + +static inline void +cn10k_cpt_vec_submit (struct vec_request vec_tbl[],uint16_t vec_tbl_len,struct cnxk_cpt_qp *qp) +{ +uint64_t lmt_base, lmt_arg, lmt_id, io_addr; +union cpt_fc_write_s fc; +struct cpt_inst_s *inst; +uint16_t burst_size; +uint64_t *fc_addr; +int i; + +if (vec_tbl_len ==0 ) +return ; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; +/* +* Use 10 mins timeout for the poll. It is not possible to recover from partial submission +* of vector packet. Actual packets for processing are submitted to CPT prior to this +* routine. Hence, any failure for submission of vector packet would indicate an +* unrecoverable error for the application. +*/ +const uint64_t timeout =rte_get_timer_cycles () +10 *60 *rte_get_timer_hz (); + + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst = (struct cpt_inst_s *)lmt_base; + +again: + burst_size =RTE_MIN (PKTS_PER_STEORL , vec_tbl_len); +for (i =0 ; i < burst_size; i++) +cn10k_cpt_vec_inst_fill (&vec_tbl[i], &inst[i *2 ], qp); + +do { + fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED); +if (likely (fc.s.qsize < fc_thresh)) +break ; +if (unlikely (rte_get_timer_cycles () > timeout)) +cn10k_cpt_vec_pkt_submission_timeout_handle (); + }while (true); + + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + +rte_io_wmb (); + + vec_tbl_len -= i; + +if (vec_tbl_len >0 ) { + vec_tbl += i; + goto again; + } +} + +static inline int +ca_lmtst_vec_submit (struct ops_burst *burst,struct vec_request vec_tbl[],uint16_t *vec_tbl_len) +{ +struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ]; +uint64_t lmt_base, lmt_arg, io_addr; +uint16_t lmt_id, len = *vec_tbl_len; +struct cpt_inst_s *inst, *inst_base; +struct cpt_inflight_req *infl_req; +struct rte_event_vector *vec; +union cpt_fc_write_s fc; +struct cnxk_cpt_qp *qp; +uint64_t *fc_addr; +int ret, i, vi; + + qp = burst->qp; + + lmt_base = qp->lmtline.lmt_base; + io_addr = qp->lmtline.io_addr; + fc_addr = qp->lmtline.fc_addr; + +const uint32_t fc_thresh = qp->lmtline.fc_thresh; + +ROC_LMT_BASE_ID_GET (lmt_base, lmt_id); + inst_base = (struct cpt_inst_s *)lmt_base; + +#ifdef CNXK_CRYPTODEV_DEBUG +if (unlikely (!qp->ca.enabled)) { + rte_errno =EINVAL ; +return 0 ; + } +#endif + +/* Perform fc check before putting packets into vectors */ + fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED); +if (unlikely (fc.s.qsize > fc_thresh)) { + rte_errno =EAGAIN ; +return 0 ; + } + +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, burst->nb_ops))) { + rte_errno =ENOMEM ; +return 0 ; + } + +for (i =0 ; i < burst->nb_ops; i++) { + inst = &inst_base[2 * i]; + infl_req = infl_reqs[i]; + infl_req->op_flags =0 ; + + ret =cn10k_cpt_fill_inst (qp, &burst->op[i], inst, infl_req); +if (unlikely (ret !=1 )) { +plt_cpt_dbg ("Could not process op: %p" , burst->op[i]); +if (i !=0 ) + goto submit; +else + goto put; + } + + infl_req->res.cn10k.compcode =CPT_COMP_NOT_DONE ; + infl_req->qp = qp; + inst->w3.u64 =0x1 ; + +/* Lookup for existing vector by w2 */ +for (vi = len -1 ; vi >=0 ; vi--) { +if (vec_tbl[vi].w2 != burst->w2[i]) +continue ; + vec = vec_tbl[vi].vec; +if (unlikely (vec->nb_elem == qp->ca.vector_sz)) +continue ; + vec->ptrs[vec->nb_elem++] = infl_req; + goto next_op;/* continue outer loop */ + } + +/* No available vectors found, allocate a new one */ +if (unlikely (rte_mempool_get (qp->ca.vector_mp, (void **)&vec_tbl[len].vec))) { + rte_errno =ENOMEM ; +if (i !=0 ) + goto submit; +else + goto put; + } +/* Also preallocate in-flight request, that will be used to +* submit misc passthrough instruction +*/ +if (unlikely (rte_mempool_get (qp->ca.req_mp, (void **)&vec_tbl[len].req))) { +rte_mempool_put (qp->ca.vector_mp, vec_tbl[len].vec); + rte_errno =ENOMEM ; +if (i !=0 ) + goto submit; +else + goto put; + } + vec_tbl[len].w2 = burst->w2[i]; + vec_tbl[len].vec->ptrs[0 ] = infl_req; + vec_tbl[len].vec->nb_elem =1 ; + len++; + +next_op:; + } + +/* Submit operations in burst */ +submit: +if (CNXK_TT_FROM_TAG (burst->ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (burst->ws->base); + +if (i >PKTS_PER_STEORL ) { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -PKTS_PER_STEORL -1 ) <<12 | + (uint64_t )(lmt_id +PKTS_PER_STEORL ); +roc_lmt_submit_steorl (lmt_arg, io_addr); + }else { + lmt_arg =ROC_CN10K_CPT_LMT_ARG | (i -1 ) <<12 | (uint64_t )lmt_id; +roc_lmt_submit_steorl (lmt_arg, io_addr); + } + +rte_io_wmb (); + +put: +if (i != burst->nb_ops) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], burst->nb_ops - i); + + *vec_tbl_len = len; + +return i; +} +static inline uint16_t -ca_lmtst_burst_submit (struct cn10k_sso_hws *ws,uint64_t w2[],struct cnxk_cpt_qp *qp, -struct rte_crypto_op *op[],uint16_t nb_ops) +ca_lmtst_burst_submit (struct ops_burst *burst) {struct cpt_inflight_req *infl_reqs[PKTS_PER_LOOP ];uint64_t lmt_base, lmt_arg, io_addr;struct cpt_inst_s *inst, *inst_base;struct cpt_inflight_req *infl_req;union cpt_fc_write_s fc; +struct cnxk_cpt_qp *qp;uint64_t *fc_addr;uint16_t lmt_id; -int ret, i; +int ret, i, j; + + qp = burst->qp; lmt_base = qp->lmtline.lmt_base; io_addr = qp->lmtline.io_addr;
@@ -395,24 +629,26 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_qROC_LMT_BASE_ID_GET (lmt_base, lmt_id); inst_base = (struct cpt_inst_s *)lmt_base; +#ifdef CNXK_CRYPTODEV_DEBUG if (unlikely (!qp->ca.enabled)) { rte_errno =EINVAL ;return 0 ; } +#endif -if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, nb_ops))) { +if (unlikely (rte_mempool_get_bulk (qp->ca.req_mp, (void **)infl_reqs, burst->nb_ops))) { rte_errno =ENOMEM ;return 0 ; } -for (i =0 ; i < nb_ops; i++) { +for (i =0 ; i < burst->nb_ops; i++) { inst = &inst_base[2 * i]; infl_req = infl_reqs[i]; infl_req->op_flags =0 ; - ret =cn10k_cpt_fill_inst (qp, &op[i], inst, infl_req); + ret =cn10k_cpt_fill_inst (qp, &burst->op[i], inst, infl_req);if (unlikely (ret !=1 )) { -plt_dp_dbg ("Could not process op: %p" , op[i]); +plt_dp_dbg ("Could not process op: %p" , burst->op[i]);if (i !=0 ) goto submit;else
@@ -423,20 +659,25 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_q infl_req->qp = qp; inst->w0.u64 =0 ; inst->res_addr = (uint64_t )&infl_req->res; - inst->w2.u64 = w2[i]; + inst->w2.u64 = burst->w2[i]; inst->w3.u64 =CNXK_CPT_INST_W3 (1 , infl_req); } fc.u64[0 ] =__atomic_load_n (fc_addr, __ATOMIC_RELAXED);if (unlikely (fc.s.qsize > fc_thresh)) { rte_errno =EAGAIN ; +for (j =0 ; j < i; j++) { + infl_req = infl_reqs[j]; +if (unlikely (infl_req->op_flags &CPT_OP_FLAGS_METABUF )) +rte_mempool_put (qp->meta_info.pool, infl_req->mdata); + } i =0 ; goto put; } submit: -if (CNXK_TT_FROM_TAG (ws->gw_rdata) ==SSO_TT_ORDERED ) -roc_sso_hws_head_wait (ws->base); +if (CNXK_TT_FROM_TAG (burst->ws->gw_rdata) ==SSO_TT_ORDERED ) +roc_sso_hws_head_wait (burst->ws->base);if (i >PKTS_PER_STEORL ) { lmt_arg =ROC_CN10K_CPT_LMT_ARG | (PKTS_PER_STEORL -1 ) <<12 | (uint64_t )lmt_id;
@@ -452,8 +693,8 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_qrte_io_wmb (); put: -if (unlikely (i != nb_ops)) -rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], nb_ops - i); +if (unlikely (i != burst->nb_ops)) +rte_mempool_put_bulk (qp->ca.req_mp, (void *)&infl_reqs[i], burst->nb_ops - i);return i; }
@@ -461,42 +702,76 @@ ca_lmtst_burst_submit(struct cn10k_sso_hws *ws, uint64_t w2[], struct cnxk_cpt_q uint16_t __rte_hotcn10k_cpt_crypto_adapter_enqueue (void *ws,struct rte_event ev[],uint16_t nb_events) { -struct rte_crypto_op *ops[PKTS_PER_LOOP ], *op; -struct cnxk_cpt_qp *qp, *curr_qp =NULL ; -uint64_t w2s[PKTS_PER_LOOP ], w2; -uint16_t submitted, count =0 ; -int ret, i, ops_len =0 ; +uint16_t submitted, count =0 , vec_tbl_len =0 ; +struct vec_request vec_tbl[nb_events]; +struct rte_crypto_op *op; +struct ops_burst burst; +struct cnxk_cpt_qp *qp; +bool is_vector = false; +uint64_t w2; +int ret, i; + + burst.ws = ws; + burst.qp =NULL ; + burst.nb_ops =0 ;for (i =0 ; i < nb_events; i++) { op = ev[i].event_ptr; ret =cn10k_ca_meta_info_extract (op, &qp, &w2);if (unlikely (ret)) { rte_errno =EINVAL ; -return count; + goto vec_submit; } -if (qp != curr_qp) { -if (ops_len) { - submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +/* Queue pair change check */ +if (qp != burst.qp) { +if (burst.nb_ops) { +if (is_vector) { + submitted = +ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +/* +* Vector submission is required on qp change, but not in +* other cases, since we could send several vectors per +* lmtst instruction only for same qp +*/ +cn10k_cpt_vec_submit (vec_tbl, vec_tbl_len, burst.qp); + vec_tbl_len =0 ; + }else { + submitted =ca_lmtst_burst_submit (&burst); + } count += submitted; -if (unlikely (submitted != ops_len)) -return count; - ops_len =0 ; +if (unlikely (submitted != burst.nb_ops)) + goto vec_submit; + burst.nb_ops =0 ; } - curr_qp = qp; + is_vector = qp->ca.vector_sz; + burst.qp = qp; } - w2s[ops_len] = w2; - ops[ops_len] = op; -if (++ops_len ==PKTS_PER_LOOP ) { - submitted =ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); + burst.w2[burst.nb_ops] = w2; + burst.op[burst.nb_ops] = op; + +/* Max nb_ops per burst check */ +if (++burst.nb_ops ==PKTS_PER_LOOP ) { +if (is_vector) + submitted =ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +else + submitted =ca_lmtst_burst_submit (&burst); count += submitted; -if (unlikely (submitted != ops_len)) -return count; - ops_len =0 ; +if (unlikely (submitted != burst.nb_ops)) + goto vec_submit; + burst.nb_ops =0 ; } } -if (ops_len) - count +=ca_lmtst_burst_submit (ws, w2s, curr_qp, ops, ops_len); +/* Submit the rest of crypto operations */ +if (burst.nb_ops) { +if (is_vector) + count +=ca_lmtst_vec_submit (&burst, vec_tbl, &vec_tbl_len); +else + count +=ca_lmtst_burst_submit (&burst); + } + +vec_submit: +cn10k_cpt_vec_submit (vec_tbl, vec_tbl_len, burst.qp);return count; }
@@ -654,6 +929,49 @@ cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1)return (uintptr_t )cop; } +uintptr_t +cn10k_cpt_crypto_adapter_vector_dequeue (uintptr_t get_work1) +{ +struct cpt_inflight_req *infl_req, *vec_infl_req; +struct rte_mempool *meta_mp, *req_mp; +struct rte_event_vector *vec; +struct rte_crypto_op *cop; +struct cnxk_cpt_qp *qp; +union cpt_res_s res; +int i; + + vec_infl_req = (struct cpt_inflight_req *)(get_work1); + + vec = vec_infl_req->vec; + qp = vec_infl_req->qp; + meta_mp = qp->meta_info.pool; + req_mp = qp->ca.req_mp; + +#ifdef CNXK_CRYPTODEV_DEBUG + res.u64[0 ] =__atomic_load_n (&vec_infl_req->res.u64[0 ], __ATOMIC_RELAXED); +PLT_ASSERT (res.cn10k.compcode ==CPT_COMP_WARN ); +PLT_ASSERT (res.cn10k.uc_compcode ==0 ); +#endif + +for (i =0 ; i < vec->nb_elem; i++) { + infl_req = vec->ptrs[i]; + cop = infl_req->cop; + + res.u64[0 ] =__atomic_load_n (&infl_req->res.u64[0 ], __ATOMIC_RELAXED); +cn10k_cpt_dequeue_post_process (qp, cop, infl_req, &res.cn10k); + + vec->ptrs[i] = cop; +if (unlikely (infl_req->op_flags &CPT_OP_FLAGS_METABUF )) +rte_mempool_put (meta_mp, infl_req->mdata); + +rte_mempool_put (req_mp, infl_req); + } + +rte_mempool_put (req_mp, vec_infl_req); + +return (uintptr_t )vec; +} +static uint16_t cn10k_cpt_dequeue_burst (void *qptr,struct rte_crypto_op **ops,uint16_t nb_ops) {
drivers/crypto/cnxk/cn10k_cryptodev_ops.h +2 -0
@@ -18,5 +18,7 @@ uint16_t __rte_hot cn10k_cpt_crypto_adapter_enqueue(void *ws, struct rte_event e uint16_t nb_events);__rte_internal uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1); +__rte_internal +uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1);#endif /* _CN10K_CRYPTODEV_OPS_H_ */
drivers/crypto/cnxk/cnxk_cryptodev_ops.h +8 -1
@@ -37,7 +37,10 @@ struct cpt_qp_meta_info {struct cpt_inflight_req {union cpt_res_s res; -struct rte_crypto_op *cop; +union { +struct rte_crypto_op *cop; +struct rte_event_vector *vec; + };void *mdata;uint8_t op_flags;void *qp;
@@ -63,6 +66,10 @@ struct crypto_adpter_info {/**< Set if queue pair is added to crypto adapter */ struct rte_mempool *req_mp;/**< CPT inflight request mempool */ +uint16_t vector_sz; +/** Maximum number of cops to combine into single vector */ +struct rte_mempool *vector_mp; +/** Pool for allocating rte_event_vector */ };struct cnxk_cpt_qp {
drivers/crypto/cnxk/version.map +1 -0
@@ -5,6 +5,7 @@ INTERNAL { cn9k_cpt_crypto_adapter_dequeue; cn10k_cpt_crypto_adapter_enqueue; cn10k_cpt_crypto_adapter_dequeue; + cn10k_cpt_crypto_adapter_vector_dequeue; local: *; };
drivers/event/cnxk/cn10k_eventdev.c +25 -6
@@ -1025,7 +1025,8 @@ cn10k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn10k" ); *caps =RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD | -RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA ; +RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA | +RTE_EVENT_CRYPTO_ADAPTER_CAP_EVENT_VECTOR ;return 0 ; }
@@ -1039,23 +1040,20 @@ cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev);int ret; -RTE_SET_USED (conf); -CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn10k" ); dev->is_ca_internal_port =1 ;cn10k_sso_fp_fns_set ((struct rte_eventdev *)(uintptr_t )event_dev); - ret =cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id); + ret =cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id, conf);cn10k_sso_set_priv_mem (event_dev,NULL ,0 );return ret; }static int -cn10k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev, +cn10k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev,int32_t queue_pair_id) {CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" );
@@ -1072,6 +1070,26 @@ cn10k_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, cn10k_sso_set_priv_mem); } +static int +cn10k_crypto_adapter_vec_limits (const struct rte_eventdev *event_dev, +const struct rte_cryptodev *cdev, +struct rte_event_crypto_adapter_vector_limits *limits) +{ +CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn10k" ); +CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn10k" ); + + limits->log2_sz = false; + limits->min_sz =0 ; + limits->max_sz =UINT16_MAX ; +/* Unused timeout, in software implementation we aggregate all crypto +* operations passed to the enqueue function +*/ + limits->min_timeout_ns =0 ; + limits->max_timeout_ns =0 ; + +return 0 ; +} +static struct eventdev_ops cn10k_sso_dev_ops = { .dev_infos_get = cn10k_sso_info_get, .dev_configure = cn10k_sso_dev_configure,
@@ -1109,6 +1127,7 @@ static struct eventdev_ops cn10k_sso_dev_ops = { .crypto_adapter_caps_get = cn10k_crypto_adapter_caps_get, .crypto_adapter_queue_pair_add = cn10k_crypto_adapter_qp_add, .crypto_adapter_queue_pair_del = cn10k_crypto_adapter_qp_del, + .crypto_adapter_vector_limits_get = cn10k_crypto_adapter_vec_limits, .xstats_get = cnxk_sso_xstats_get, .xstats_reset = cnxk_sso_xstats_reset,
drivers/event/cnxk/cn10k_worker.h +4 -2
@@ -230,6 +230,9 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64,if ((flags &CPT_RX_WQE_F ) && (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_CRYPTODEV )) { u64[1 ] =cn10k_cpt_crypto_adapter_dequeue (u64[1 ]); + }else if ((flags &CPT_RX_WQE_F ) && + (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_CRYPTODEV_VECTOR )) { + u64[1 ] =cn10k_cpt_crypto_adapter_vector_dequeue (u64[1 ]); }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_ETHDEV ) {uint8_t port =CNXK_SUB_EVENT_FROM_TAG (u64[0 ]);uint64_t mbuf;
@@ -272,8 +275,7 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64,cn10k_sso_process_tstamp (u64[1 ], mbuf, ws->tstamp[port]); u64[1 ] = mbuf; - }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) == -RTE_EVENT_TYPE_ETHDEV_VECTOR ) { + }else if (CNXK_EVENT_TYPE_FROM_TAG (u64[0 ]) ==RTE_EVENT_TYPE_ETHDEV_VECTOR ) {uint8_t port =CNXK_SUB_EVENT_FROM_TAG (u64[0 ]);__uint128_t vwqe_hdr = *(__uint128_t *)u64[1 ];
drivers/event/cnxk/cn9k_eventdev.c +2 -5
@@ -1131,23 +1131,20 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,struct cnxk_sso_evdev *dev =cnxk_sso_pmd_priv (event_dev);int ret; -RTE_SET_USED (conf); -CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );CNXK_VALID_DEV_OR_ERR_RET (cdev->device,"crypto_cn9k" ); dev->is_ca_internal_port =1 ;cn9k_sso_fp_fns_set ((struct rte_eventdev *)(uintptr_t )event_dev); - ret =cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id); + ret =cnxk_crypto_adapter_qp_add (event_dev, cdev, queue_pair_id, conf);cn9k_sso_set_priv_mem (event_dev,NULL ,0 );return ret; }static int -cn9k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev, +cn9k_crypto_adapter_qp_del (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev,int32_t queue_pair_id) {CNXK_VALID_DEV_OR_ERR_RET (event_dev->dev,"event_cn9k" );
drivers/event/cnxk/cnxk_eventdev.h +3 -1
@@ -10,6 +10,7 @@#include <cryptodev_pmd.h> #include <rte_devargs.h> #include <rte_ethdev.h> +#include <rte_event_crypto_adapter.h> #include <rte_event_eth_rx_adapter.h> #include <rte_event_eth_tx_adapter.h> #include <rte_kvargs.h>
@@ -305,7 +306,8 @@ int cnxk_sso_tx_adapter_start(uint8_t id, const struct rte_eventdev *event_dev);int cnxk_sso_tx_adapter_stop (uint8_t id,const struct rte_eventdev *event_dev);int cnxk_sso_tx_adapter_free (uint8_t id,const struct rte_eventdev *event_dev);int cnxk_crypto_adapter_qp_add (const struct rte_eventdev *event_dev, -const struct rte_cryptodev *cdev,int32_t queue_pair_id); +const struct rte_cryptodev *cdev,int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf);int cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev,int32_t queue_pair_id);#endif /* __CNXK_EVENTDEV_H__ */
drivers/event/cnxk/cnxk_eventdev_adptr.c +12 -5
@@ -641,7 +641,8 @@ cnxk_sso_tx_adapter_free(uint8_t id __rte_unused, }static int -crypto_adapter_qp_setup (const struct rte_cryptodev *cdev,struct cnxk_cpt_qp *qp) +crypto_adapter_qp_setup (const struct rte_cryptodev *cdev,struct cnxk_cpt_qp *qp, +const struct rte_event_crypto_adapter_queue_conf *conf) {char name[RTE_MEMPOOL_NAMESIZE ];uint32_t cache_size, nb_req;
@@ -674,6 +675,10 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qpif (qp->ca.req_mp ==NULL )return -ENOMEM ; +if (conf !=NULL ) { + qp->ca.vector_sz = conf->vector_sz; + qp->ca.vector_mp = conf->vector_mp; + } qp->ca.enabled = true;return 0 ;
@@ -681,7 +686,8 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qpint cnxk_crypto_adapter_qp_add (const struct rte_eventdev *event_dev,const struct rte_cryptodev *cdev, -int32_t queue_pair_id) +int32_t queue_pair_id, +const struct rte_event_crypto_adapter_queue_conf *conf) {struct cnxk_sso_evdev *sso_evdev =cnxk_sso_pmd_priv (event_dev);uint32_t adptr_xae_cnt =0 ;
@@ -693,7 +699,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rtfor (qp_id =0 ; qp_id < cdev->data->nb_queue_pairs; qp_id++) { qp = cdev->data->queue_pairs[qp_id]; - ret =crypto_adapter_qp_setup (cdev, qp); + ret =crypto_adapter_qp_setup (cdev, qp, conf);if (ret) {cnxk_crypto_adapter_qp_del (cdev,-1 );return ret;
@@ -702,7 +708,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rt } }else { qp = cdev->data->queue_pairs[queue_pair_id]; - ret =crypto_adapter_qp_setup (cdev, qp); + ret =crypto_adapter_qp_setup (cdev, qp, conf);if (ret)return ret; adptr_xae_cnt = qp->ca.req_mp->size;
@@ -733,7 +739,8 @@ crypto_adapter_qp_free(struct cnxk_cpt_qp *qp) }int -cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev,int32_t queue_pair_id) +cnxk_crypto_adapter_qp_del (const struct rte_cryptodev *cdev, +int32_t queue_pair_id) {struct cnxk_cpt_qp *qp;
Signature · 1 line
2.25.1
RE: [PATCH v3 0/2] Vector support for event crypto adapter
In reply to Volodymyr FialkoQuoted 6 lines
Subject: [PATCH v3 0/2] Vector support for event crypto adapter
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.
Quoted 9 lines
* Changes since v1
- Add missing newline/space issues
- Add missing error messages
- Remove double check of conf input parameter* Changes since v2
- Rebase on top of dpdk-next-eventdev branch
- Remove already merged patch
Series Acked-by: Akhil Goyal <[email protected]>
Since there is no response and we are approaching RC1 deadline patches are applied to dpdk-next-crypto
with below changes.
Updated release notes and removed deprecation notice.
Added a build fix because of removal of a macro RTE_FUNC_PTR_OR_ERR_RET.
Thanks.
RE: [PATCH v3 0/2] Vector support for event crypto adapter
Quoted 27 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Saturday, October 1, 2022 9:12 AM
To: Volodymyr Fialko <[email protected]>; [email protected]
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Anoob Joseph <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Volodymyr Fialko <[email protected]>
Subject: RE: [PATCH v3 0/2] Vector support for event crypto adapterQuoted 6 lines
Subject: [PATCH v3 0/2] Vector support for event crypto adapter
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.Quoted 9 lines
* Changes since v1
- Add missing newline/space issues
- Add missing error messages
- Remove double check of conf input parameter* Changes since v2
- Rebase on top of dpdk-next-eventdev branch
- Remove already merged patch
Quoted 4 lines
Series Acked-by: Akhil Goyal <[email protected]>
Since there is no response and we are approaching RC1 deadline patches are applied to dpdk-next-crypto with below changes.
Hi @Akhil Goyal,
Did not we discuss in the call, and I committed to acked the patch by Saturday? You cant call that as no response!
Quoted 5 lines
Updated release notes and removed deprecation notice.
Added a build fix because of removal of a macroRTE_FUNC_PTR_OR_ERR_RET.Thanks.
RE: [PATCH v3 0/2] Vector support for event crypto adapter
Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
Subject: [PATCH v3 0/2] Vector support for event crypto adapter
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.* Changes since v1
- Add missing newline/space issues
- Add missing error messages
- Remove double check of conf input parameter* Changes since v2
- Rebase on top of dpdk-next-eventdev branch
- Remove already merged patch
Quoted 8 lines
Quoted 4 lines
Series Acked-by: Akhil Goyal <[email protected]>
Since there is no response and we are approaching RC1 deadline patches are applied to dpdk-next-crypto with below changes.
Hi @Akhil Goyal,
Did not we discuss in the call, and I committed to acked the patch by Saturday? You cant call that as no response!
I mentioned in the call that we have RC1 deadline, ack/nack shall be provided as soon as possible. It was agreed that it will come by Friday. I can not spend all of my weekend on a particular series. There are other series also.
The patches have been there for about 2 months(V1 was shared on August 4).
As per DPDK guidelines, I could merge a patch if there is no response for more than 3 weeks even without asking anybody. I asked out to you just to be courteous on Sep 22. And even after that your responses were pretty slow. You should give ample time for rework to happen before the deadline.
From next time onwards, I will not ask for review. You should be proactive within 3 weeks.
Quoted 6 lines
Quoted 3 lines
Updated release notes and removed deprecation notice. Added a build fix because of removal of a macro
RTE_FUNC_PTR_OR_ERR_RET.Quoted 2 lines
Thanks.
RE: [PATCH v3 0/2] Vector support for event crypto adapter
Quoted 38 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Saturday, October 1, 2022 2:18 PM
To: Gujjar, Abhinandan S <[email protected]>; Volodymyr Fialko <[email protected]>; [email protected]
Cc: Jerin Jacob Kollanukkaran <[email protected]>; Anoob Joseph <[email protected]>; Volodymyr Fialko <[email protected]>; Jayatheerthan, Jay <[email protected]>
Subject: RE: [PATCH v3 0/2] Vector support for event crypto adapterQuoted 16 lines
Quoted 16 lines
Quoted 15 lines
Subject: [PATCH v3 0/2] Vector support for event crypto adapter
Introduce ability to aggregate crypto operations processed by event crypto adapter into single event containing
rte_event_vectorwhose event type isRTE_EVENT_TYPE_CRYPTODEV_VECTOR.* Changes since v1
- Add missing newline/space issues
- Add missing error messages
- Remove double check of conf input parameter* Changes since v2
- Rebase on top of dpdk-next-eventdev branch
- Remove already merged patchQuoted 7 lines
Quoted 4 lines
Series Acked-by: Akhil Goyal <[email protected]>
Since there is no response and we are approaching RC1 deadline patches are applied to dpdk-next-crypto with below changes.
Hi @Akhil Goyal,
Did not we discuss in the call, and I committed to acked the patch by
Saturday?
Quoted 1 line
You cant call that as no response!
Quoted 11 lines
I mentioned in the call that we have RC1 deadline, ack/nack shall be provided as soon as possible.
It was agreed that it will come by Friday. I can not spend all of my weekend on a particular series.
There are other series also.
The patches have been there for about 2 months(V1 was shared on August 4). As per DPDK guidelines, I could merge a patch if there is no response for more than 3 weeks even without asking anybody.
I asked out to you just to be courteous on Sep 22. And even after that your responses were pretty slow.
You should give ample time for rework to happen before the deadline.
But this time few things were not clear. So, we had a call. I would not have sent this mail if I had agreed on Friday.
Quoted 3 lines
From next time onwards, I will not ask for review. You should be proactive within 3 weeks.
BTW, there is nothing wrong in sending reminder for the review. It will help in prioritizing the task in the busy schedule.
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
Updated release notes and removed deprecation notice. Added a build fix because of removal of a macro
RTE_FUNC_PTR_OR_ERR_RET.Quoted 2 lines
Thanks.