pipeline: add symmetric crypto to table action
PATCH 1/1 pipeline: add symmetric crypto to table action
This patch adds the symmetric crypto action support to pipeline library. The symmetric crypto action works as the shim layer between pipeline and DPDK cryptodev and is able to interact with cryptodev with the control path requests such as session creation/deletion and data path work to assemble the crypto operations for received packets.
--- lib/librte_pipeline/Makefile | 2 +- lib/librte_pipeline/meson.build | 2 +- lib/librte_pipeline/rte_table_action.c | 466 +++++++++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 70 +++++ 4 files changed, 538 insertions(+), 2 deletions(-)
lib/librte_pipeline/Makefile +1 -1
@@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table -LDLIBS += -lrte_port -lrte_meter -lrte_sched +LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev EXPORT_MAP := rte_pipeline_version.map
lib/librte_pipeline/meson.build +1 -1
@@ -5,4 +5,4 @@ version = 3 allow_experimental_apis = true sources = files('rte_pipeline.c', 'rte_port_in_action.c', 'rte_table_action.c') headers = files('rte_pipeline.h', 'rte_port_in_action.h', 'rte_table_action.h') -deps += ['port', 'table', 'meter', 'sched'] +deps += ['port', 'table', 'meter', 'sched', 'cryptodev']
lib/librte_pipeline/rte_table_action.c +466 -0
526 lines not on this page · raw message
lib/librte_pipeline/rte_table_action.h +70 -0
82 lines not on this page · raw message
Signature · 1 line
2.13.6
v2 cover pipeline: add symmetric crypto to action
This patchset creates an abstraction layer of DPDK Cryptodev to the pipeline library to enable its symmetric cryptographic capability. The ip_pipeline sample application is updated accordingly.
v2:
- Fixed bugs.
- Updated data structure.
- Updated IP-pipeline sample application.
Zhang, Roy Fan (7):
pipeline: add symmetric crypto to action examples/ip_pipeline: add cryptodev examples/ip_pipeline: configure crypto port examples/ip_pipeline: add symmetric crypto action examples/ip_pipeline: update cli parsing examples/ip_pipeline: add script
doc: update action documentation
doc/guides/prog_guide/packet_framework.rst | 11 +- doc/guides/sample_app_ug/ip_pipeline.rst | 23 + examples/ip_pipeline/Makefile | 1 + examples/ip_pipeline/action.c | 11 + examples/ip_pipeline/action.h | 1 + examples/ip_pipeline/cli.c | 577 +++++++++++++++++++++++++- examples/ip_pipeline/cryptodev.c | 117 ++++++ examples/ip_pipeline/cryptodev.h | 43 ++ examples/ip_pipeline/examples/flow_crypto.cli | 58 +++ examples/ip_pipeline/main.c | 9 + examples/ip_pipeline/meson.build | 3 +- examples/ip_pipeline/pipeline.c | 60 +++ examples/ip_pipeline/pipeline.h | 14 + examples/ip_pipeline/thread.c | 10 + lib/librte_pipeline/Makefile | 2 +- lib/librte_pipeline/meson.build | 2 +- lib/librte_pipeline/rte_pipeline_version.map | 1 + lib/librte_pipeline/rte_table_action.c | 503 +++++++++++++++++++++- lib/librte_pipeline/rte_table_action.h | 104 +++++ 19 files changed, 1543 insertions(+), 7 deletions(-) create mode 100644 examples/ip_pipeline/cryptodev.c create mode 100644 examples/ip_pipeline/cryptodev.h create mode 100644 examples/ip_pipeline/examples/flow_crypto.cli
Signature · 1 line
2.13.6
PATCH v2 1/7 pipeline: add symmetric crypto to action
From: "Zhang, Roy Fan" <[email protected]>
This patch adds the symmetric crypto action support to pipeline library. The symmetric crypto action works as the shim layer between pipeline and DPDK cryptodev and is able to interact with cryptodev with the control path requests such as session creation/deletion and data path work to assemble the crypto operations for received packets.
--- lib/librte_pipeline/Makefile | 2 +- lib/librte_pipeline/meson.build | 2 +- lib/librte_pipeline/rte_pipeline_version.map | 1 + lib/librte_pipeline/rte_table_action.c | 503 ++++++++++++++++++++++++++- lib/librte_pipeline/rte_table_action.h | 104 ++++++ 5 files changed, 609 insertions(+), 3 deletions(-)
lib/librte_pipeline/Makefile +1 -1
@@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table -LDLIBS += -lrte_port -lrte_meter -lrte_sched +LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev EXPORT_MAP := rte_pipeline_version.map
lib/librte_pipeline/meson.build +1 -1
@@ -5,4 +5,4 @@ version = 3 allow_experimental_apis = true sources = files('rte_pipeline.c', 'rte_port_in_action.c', 'rte_table_action.c') headers = files('rte_pipeline.h', 'rte_port_in_action.h', 'rte_table_action.h') -deps += ['port', 'table', 'meter', 'sched'] +deps += ['port', 'table', 'meter', 'sched', 'cryptodev']
lib/librte_pipeline/rte_pipeline_version.map +1 -0
@@ -72,4 +72,5 @@ EXPERIMENTAL { rte_table_action_stats_read; rte_table_action_time_read; rte_table_action_ttl_read; + rte_table_action_crypto_sym_session_get; };
lib/librte_pipeline/rte_table_action.c +502 -1
581 lines not on this page · raw message
lib/librte_pipeline/rte_table_action.h +104 -0
122 lines not on this page · raw message
Signature · 1 line
2.13.6
PATCH v2 2/7 examples/ip_pipeline: add cryptodev
In reply to Fan ZhangFrom: "Zhang, Roy Fan" <[email protected]>
This patch adds symmetric crypto device abstraction to ip_pipeline sameple application.
--- examples/ip_pipeline/Makefile | 1 + examples/ip_pipeline/cryptodev.c | 117 +++++++++++++++++++++++++++++++++++++++ examples/ip_pipeline/cryptodev.h | 43 ++++++++++++++ examples/ip_pipeline/main.c | 9 +++ examples/ip_pipeline/meson.build | 3 +- 5 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 examples/ip_pipeline/cryptodev.c create mode 100644 examples/ip_pipeline/cryptodev.h
examples/ip_pipeline/Makefile +1 -0
@@ -18,6 +18,7 @@ SRCS-y += swq.c SRCS-y += tap.c SRCS-y += thread.c SRCS-y += tmgr.c +SRCS-y += cryptodev.c # Build using pkg-config variables if possible $(shell pkg-config --exists libdpdk)
examples/ip_pipeline/cryptodev.c new file +117 -0
117 lines not on this page · raw message
examples/ip_pipeline/cryptodev.h new file +43 -0
43 lines not on this page · raw message
examples/ip_pipeline/main.c +9 -0
@@ -14,6 +14,7 @@#include "cli.h" #include "conn.h" #include "kni.h" +#include "cryptodev.h" #include "link.h" #include "mempool.h" #include "pipeline.h"
@@ -210,6 +211,14 @@ main(int argc, char **argv)return status; } +/* Sym Crypto */ + status =cryptodev_init (); +if (status) { +printf ("Error: Cryptodev initialization failed (%d)\n" , + status); +return status; + } +/* Action */ status =port_in_action_profile_init ();if (status) {
examples/ip_pipeline/meson.build +2 -1
@@ -21,5 +21,6 @@ sources = files( 'swq.c', 'tap.c', 'thread.c', - 'tmgr.c' + 'tmgr.c', + 'cryptodev.c' )
Signature · 1 line
2.13.6
PATCH v2 3/7 examples/ip_pipeline: configure crypto port
In reply to Fan ZhangFrom: "Zhang, Roy Fan" <[email protected]>
This patch adds symmetric crypto port configuration to ip_pipeline sample application.
--- examples/ip_pipeline/pipeline.c | 60 +++++++++++++++++++++++++++++++++++++++++ examples/ip_pipeline/pipeline.h | 13 +++++++++ 2 files changed, 73 insertions(+)
examples/ip_pipeline/pipeline.c +60 -0
@@ -18,6 +18,7 @@#include <rte_port_source_sink.h> #include <rte_port_fd.h> #include <rte_port_sched.h> +#include <rte_port_sym_crypto.h> #include <rte_table_acl.h> #include <rte_table_array.h>
@@ -36,6 +37,7 @@#include "tap.h" #include "tmgr.h" #include "swq.h" +#include "cryptodev.h" #ifndef PIPELINE_MSGQ_SIZE #define PIPELINE_MSGQ_SIZE 64
@@ -162,6 +164,7 @@ pipeline_port_in_create(const char *pipeline_name,struct rte_port_kni_reader_params kni;#endif struct rte_port_source_params source; +struct rte_port_sym_crypto_reader_params sym_crypto; } pp;struct pipeline *pipeline;
@@ -295,6 +298,27 @@ pipeline_port_in_create(const char *pipeline_name,break ; } +case PORT_IN_CRYPTODEV : + { +struct cryptodev *cryptodev; + + cryptodev =cryptodev_find (params->dev_name); +if (cryptodev ==NULL ) +return -1 ; + +if (params->rxq.queue_id > cryptodev->n_queues -1 ) +return -1 ; + + pp.sym_crypto.cryptodev_id = cryptodev->dev_id; + pp.sym_crypto.queue_id = params->cryptodev.queue_id; + pp.sym_crypto.f_callback = params->cryptodev.f_callback; + pp.sym_crypto.arg_callback = params->cryptodev.arg_callback; + p.ops = &rte_port_sym_crypto_reader_ops; + p.arg_create = &pp.sym_crypto; + +break ; + } +default :return -1 ; }
@@ -384,6 +408,7 @@ pipeline_port_out_create(const char *pipeline_name,struct rte_port_kni_writer_params kni;#endif struct rte_port_sink_params sink; +struct rte_port_sym_crypto_writer_params sym_crypto; } pp;union {
@@ -393,6 +418,7 @@ pipeline_port_out_create(const char *pipeline_name,#ifdef RTE_LIBRTE_KNI struct rte_port_kni_writer_nodrop_params kni;#endif +struct rte_port_sym_crypto_writer_nodrop_params sym_crypto; } pp_nodrop;struct pipeline *pipeline;
@@ -548,6 +574,40 @@ pipeline_port_out_create(const char *pipeline_name,break ; } +case PORT_OUT_CRYPTODEV : + { +struct cryptodev *cryptodev; + + cryptodev =cryptodev_find (params->dev_name); +if (cryptodev ==NULL ) +return -1 ; + +if (params->cryptodev.queue_id >= cryptodev->n_queues) +return -1 ; + + pp.sym_crypto.cryptodev_id = cryptodev->dev_id; + pp.sym_crypto.queue_id = params->cryptodev.queue_id; + pp.sym_crypto.tx_burst_sz = params->burst_size; + pp.sym_crypto.crypto_op_offset = params->cryptodev.op_offset; + + pp_nodrop.sym_crypto.cryptodev_id = cryptodev->dev_id; + pp_nodrop.sym_crypto.queue_id = params->cryptodev.queue_id; + pp_nodrop.sym_crypto.tx_burst_sz = params->burst_size; + pp_nodrop.sym_crypto.n_retries = params->retry; + pp_nodrop.sym_crypto.crypto_op_offset = + params->cryptodev.op_offset; + +if (params->retry ==0 ) { + p.ops = &rte_port_sym_crypto_writer_ops; + p.arg_create = &pp.sym_crypto; + }else { + p.ops = &rte_port_sym_crypto_writer_nodrop_ops; + p.arg_create = &pp_nodrop.sym_crypto; + } + +break ; + } +default :return -1 ; }
examples/ip_pipeline/pipeline.h +13 -0
@@ -27,6 +27,7 @@ enum port_in_type {PORT_IN_TAP ,PORT_IN_KNI ,PORT_IN_SOURCE , + PORT_IN_CRYPTODEV, }; struct port_in_params {
@@ -48,6 +49,12 @@ struct port_in_params {const char *file_name;uint32_t n_bytes_per_pkt; } source; + +struct { +uint16_t queue_id; +void *f_callback; +void *arg_callback; + } cryptodev; };uint32_t burst_size;
@@ -62,6 +69,7 @@ enum port_out_type {PORT_OUT_TAP ,PORT_OUT_KNI ,PORT_OUT_SINK , + PORT_OUT_CRYPTODEV, }; struct port_out_params {
@@ -76,6 +84,11 @@ struct port_out_params {const char *file_name;uint32_t max_n_pkts; } sink; + +struct { +uint16_t queue_id; +uint32_t op_offset; + } cryptodev; };uint32_t burst_size;int retry;
Signature · 1 line
2.13.6
PATCH v2 4/7 examples/ip_pipeline: add symmetric crypto action
In reply to Fan ZhangFrom: "Zhang, Roy Fan" <[email protected]>
This patch adds symmetric crypto action support to ip_pipeline application.
--- examples/ip_pipeline/action.c | 11 +++++++++++ examples/ip_pipeline/action.h | 1 + examples/ip_pipeline/pipeline.h | 1 + examples/ip_pipeline/thread.c | 10 ++++++++++ 4 files changed, 23 insertions(+)
examples/ip_pipeline/action.c +11 -0
@@ -333,6 +333,17 @@ table_action_profile_create(const char *name, } } +if (params->action_mask & (1LLU <<RTE_TABLE_ACTION_SYM_CRYPTO )) { + status =rte_table_action_profile_action_register (ap, +RTE_TABLE_ACTION_SYM_CRYPTO , + ¶ms->sym_crypto); + +if (status) { +rte_table_action_profile_free (ap); +return NULL ; + } + } + status =rte_table_action_profile_freeze (ap);if (status) {rte_table_action_profile_free (ap);
examples/ip_pipeline/action.h +1 -0
@@ -53,6 +53,7 @@ struct table_action_profile_params {struct rte_table_action_nat_config nat;struct rte_table_action_ttl_config ttl;struct rte_table_action_stats_config stats; +struct rte_table_action_sym_crypto_config sym_crypto; };struct table_action_profile {
examples/ip_pipeline/pipeline.h +1 -0
@@ -281,6 +281,7 @@ struct table_rule_action {struct rte_table_action_ttl_params ttl;struct rte_table_action_stats_params stats;struct rte_table_action_time_params time; +struct rte_table_action_sym_crypto_params sym_crypto; };int
examples/ip_pipeline/thread.c +10 -0
@@ -2476,6 +2476,16 @@ action_convert(struct rte_table_action *a,return status; } +if (action->action_mask & (1LLU <<RTE_TABLE_ACTION_SYM_CRYPTO )) { + status =rte_table_action_apply (a, + data, +RTE_TABLE_ACTION_SYM_CRYPTO , + &action->sym_crypto); + +if (status) +return status; + } +return 0 ; }
Signature · 1 line
2.13.6
PATCH v2 5/7 examples/ip_pipeline: update cli parsing
In reply to Fan ZhangFrom: "Zhang, Roy Fan" <[email protected]>
This patch updates the cli parsing of ip_pipeline application with extra symmetric crypto, port, session, and action support.
--- examples/ip_pipeline/cli.c | 577 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 575 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +575 -2
@@ -12,6 +12,8 @@#include <rte_ethdev.h> #include "cli.h" + +#include "cryptodev.h" #include "kni.h" #include "link.h" #include "mempool.h"
@@ -785,6 +787,65 @@ cmd_kni(char **tokens, } } +static const char cmd_cryptodev_help[] = +"cryptodev <cryptodev_name>\n" +" dev <device_name> | dev_id <device_id>\n" +" queue <n_queues> <queue_size>\n" ; + +static void +cmd_cryptodev (char **tokens, +uint32_t n_tokens, +char *out, +size_t out_size) +{ +struct cryptodev_params params; +char *name; + +memset (¶ms,0 ,sizeof (params)); +if (n_tokens !=7 ) { +snprintf (out, out_size,MSG_ARG_MISMATCH , tokens[0 ]); +return ; + } + + name = tokens[1 ]; + +if (strcmp (tokens[2 ],"dev" ) ==0 ) + params.dev_name = tokens[3 ]; +else if (strcmp (tokens[2 ],"dev_id" ) ==0 ) { +if (parser_read_uint32 (¶ms.dev_id, tokens[3 ]) <0 ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"dev_id" ); +return ; + } + }else { +snprintf (out, out_size,MSG_ARG_INVALID , +"cryptodev" ); +return ; + } + +if (strcmp (tokens[4 ],"queue" )) { +snprintf (out, out_size,MSG_ARG_NOT_FOUND , +"4" ); +return ; + } + +if (parser_read_uint32 (¶ms.n_queues, tokens[5 ]) <0 ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"q" ); +return ; + } + +if (parser_read_uint32 (¶ms.queue_size, tokens[6 ]) <0 ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"queue_size" ); +return ; + } + +if (cryptodev_create (name, ¶ms) ==NULL ) { +snprintf (out, out_size,MSG_CMD_FAIL , tokens[0 ]); +return ; + } +}static const char cmd_port_in_action_profile_help[] ="port in action profile <profile_name>\n"
@@ -968,7 +1029,10 @@ static const char cmd_table_action_profile_help[] =" [ttl drop | fwd\n" " stats none | pkts]\n" " [stats pkts | bytes | both]\n" -" [time]\n" ; +" [time]\n" +" [sym_crypto dev <CRYPTODEV_NAME> offset <op_offset> " +" mempool_create <mempool_name>\n" +" mempool_init <mempool_name>]\n" ; static void cmd_table_action_profile(char **tokens,
@@ -1336,6 +1400,57 @@ cmd_table_action_profile(char **tokens, t0 +=1 ; }/* time */ +if ((t0 < n_tokens) && (strcmp (tokens[t0],"sym_crypto" ) ==0 )) { +struct cryptodev *cryptodev; +struct mempool *mempool; + +if (n_tokens < t0 +9 || +strcmp (tokens[t0 +1 ],"dev" ) || +strcmp (tokens[t0 +3 ],"offset" ) || +strcmp (tokens[t0 +5 ],"mempool_create" ) || +strcmp (tokens[t0 +7 ],"mempool_init" )) { +snprintf (out, out_size,MSG_ARG_MISMATCH , +"table action profile sym_crypto" ); +return ; + } + + cryptodev =cryptodev_find (tokens[t0 +2 ]); +if (cryptodev ==NULL ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"table action profile sym_crypto" ); +return ; + } + + p.sym_crypto.cryptodev_id = cryptodev->dev_id; + +if (parser_read_uint32 (&p.sym_crypto.op_offset, + tokens[t0 +4 ]) !=0 ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"table action profile sym_crypto" ); +return ; + } + + mempool =mempool_find (tokens[t0 +6 ]); +if (mempool ==NULL ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"table action profile sym_crypto" ); +return ; + } + p.sym_crypto.mp_create = mempool->m; + + mempool =mempool_find (tokens[t0 +8 ]); +if (mempool ==NULL ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"table action profile sym_crypto" ); +return ; + } + p.sym_crypto.mp_init = mempool->m; + + p.action_mask |=1LLU <<RTE_TABLE_ACTION_SYM_CRYPTO ; + + t0 +=9 ; + }/* sym_crypto */ +if (t0 < n_tokens) {snprintf (out, out_size,MSG_ARG_MISMATCH , tokens[0 ]);return ;
@@ -1417,6 +1532,7 @@ static const char cmd_pipeline_port_in_help[] =" | tap <tap_name> mempool <mempool_name> mtu <mtu>\n" " | kni <kni_name>\n" " | source mempool <mempool_name> file <file_name> bpp <n_bytes_per_pkt>\n" +" | cryptodev <cryptodev_name> rxq <queue_id>\n" " [action <port_in_action_profile_name>]\n" " [disabled]\n" ;
@@ -1589,6 +1705,26 @@ cmd_pipeline_port_in(char **tokens, } t0 +=7 ; + }else if (strcmp (tokens[t0],"cryptodev" ) ==0 ) { +if (n_tokens < t0 +3 ) { +snprintf (out, out_size,MSG_ARG_MISMATCH , +"pipeline port in cryptodev" ); +return ; + } + + p.type =PORT_IN_CRYPTODEV ; + + p.dev_name = tokens[t0 +1 ]; +if (parser_read_uint16 (&p.rxq.queue_id, tokens[t0 +3 ]) !=0 ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"rxq" ); +return ; + } + + p.cryptodev.arg_callback =NULL ; + p.cryptodev.f_callback =NULL ; + + t0 +=4 ; }else {snprintf (out, out_size,MSG_ARG_INVALID , tokens[0 ]);return ;
@@ -1635,7 +1771,8 @@ static const char cmd_pipeline_port_out_help[] =" | tmgr <tmgr_name>\n" " | tap <tap_name>\n" " | kni <kni_name>\n" -" | sink [file <file_name> pkts <max_n_pkts>]\n" ; +" | sink [file <file_name> pkts <max_n_pkts>]\n" +" | cryptodev <cryptodev_name> txq <txq_id> offset <crypto_op_offset>\n" ; static void cmd_pipeline_port_out(char **tokens,
@@ -1769,6 +1906,41 @@ cmd_pipeline_port_out(char **tokens,return ; } } + + }else if (strcmp (tokens[6 ],"cryptodev" ) ==0 ) { +if (n_tokens !=12 ) { +snprintf (out, out_size,MSG_ARG_MISMATCH , +"pipeline port out cryptodev" ); +return ; + } + + p.type =PORT_OUT_CRYPTODEV ; + + p.dev_name = tokens[7 ]; + +if (strcmp (tokens[8 ],"txq" )) { +snprintf (out, out_size,MSG_ARG_MISMATCH , +"pipeline port out cryptodev" ); +return ; + } + +if (parser_read_uint16 (&p.cryptodev.queue_id, tokens[9 ]) + !=0 ) { +snprintf (out, out_size,MSG_ARG_INVALID ,"queue_id" ); +return ; + } + +if (strcmp (tokens[10 ],"offset" )) { +snprintf (out, out_size,MSG_ARG_MISMATCH , +"pipeline port out cryptodev" ); +return ; + } + +if (parser_read_uint32 (&p.cryptodev.op_offset, tokens[11 ]) + !=0 ) { +snprintf (out, out_size,MSG_ARG_INVALID ,"queue_id" ); +return ; + } }else {snprintf (out, out_size,MSG_ARG_INVALID , tokens[0 ]);return ;
@@ -2923,6 +3095,18 @@ parse_match(char **tokens,* [ttl dec | keep] * [stats] * [time] +* [sym_crypto +* encrypt | decrypt +* type +* | cipher +* cipher_algo <algo> cipher_key <key> cipher_iv <iv> +* | cipher_auth +* cipher_algo <algo> cipher_key <key> cipher_iv <iv> +* auth_algo <algo> auth_key <key> digest_size <size> +* | aead +* aead_algo <algo> aead_key <key> aead_iv <iv> aead_aad <aad> +* digest_size <size> +* data_offset <data_offset>] * * where: * <pa> ::= g | y | r | drop
@@ -3521,6 +3705,368 @@ parse_table_action_time(char **tokens,return 1 ; } +static void +parse_free_sym_crypto_param_data (struct rte_table_action_sym_crypto_params *p) +{ +struct rte_crypto_sym_xform *xform[2 ] = {NULL }; +uint32_t i; + + xform[0 ] = p->xform; +if (xform[0 ]) + xform[1 ] = xform[0 ]->next; + +for (i =0 ; i <2 ; i++) { +if (xform[i] ==NULL ) +continue ; + +switch (xform[i]->type) { +case RTE_CRYPTO_SYM_XFORM_CIPHER : +if (xform[i]->cipher.key.data) +free (xform[i]->cipher.key.data); +if (p->cipher_auth.cipher_iv.val) +free (p->cipher_auth.cipher_iv.val); +if (p->cipher_auth.cipher_iv_update.val) +free (p->cipher_auth.cipher_iv_update.val); +break ; +case RTE_CRYPTO_SYM_XFORM_AUTH : +if (xform[i]->auth.key.data) +free (xform[i]->cipher.key.data); +if (p->cipher_auth.auth_iv.val) +free (p->cipher_auth.cipher_iv.val); +if (p->cipher_auth.auth_iv_update.val) +free (p->cipher_auth.cipher_iv_update.val); +break ; +case RTE_CRYPTO_SYM_XFORM_AEAD : +if (xform[i]->aead.key.data) +free (xform[i]->cipher.key.data); +if (p->aead.iv.val) +free (p->aead.iv.val); +if (p->aead.aad.val) +free (p->aead.aad.val); +break ; +default : +continue ; + } + } + +} + +static struct rte_crypto_sym_xform * +parse_table_action_cipher (struct rte_table_action_sym_crypto_params *p, +char **tokens,uint32_t n_tokens,uint32_t encrypt, +uint32_t *used_n_tokens) +{ +struct rte_crypto_sym_xform *xform_cipher; +int status; +size_t len; + +if (n_tokens <7 ||strcmp (tokens[1 ],"cipher_algo" ) || +strcmp (tokens[3 ],"cipher_key" ) || +strcmp (tokens[5 ],"cipher_iv" )) +return NULL ; + + xform_cipher =calloc (1 ,sizeof (*xform_cipher)); +if (xform_cipher ==NULL ) +return NULL ; + + xform_cipher->type =RTE_CRYPTO_SYM_XFORM_CIPHER ; + xform_cipher->cipher.op = encrypt ?RTE_CRYPTO_CIPHER_OP_ENCRYPT : +RTE_CRYPTO_CIPHER_OP_DECRYPT ; + +/* cipher_algo */ + status =rte_cryptodev_get_cipher_algo_enum ( + &xform_cipher->cipher.algo, tokens[2 ]); +if (status <0 ) + goto error_exit; + +/* cipher_key */ + len =strlen (tokens[4 ]); + xform_cipher->cipher.key.data =calloc (1 , len /2 +1 ); +if (xform_cipher->cipher.key.data ==NULL ) + goto error_exit; + + status =parse_hex_string (tokens[4 ], + xform_cipher->cipher.key.data, + (uint32_t *)&len); +if (status <0 ) + goto error_exit; + + xform_cipher->cipher.key.length = (uint16_t )len; + +/* cipher_iv */ + len =strlen (tokens[6 ]); + + p->cipher_auth.cipher_iv.val =calloc (1 , len /2 +1 ); +if (p->cipher_auth.cipher_iv.val ==NULL ) + goto error_exit; + + status =parse_hex_string (tokens[6 ], + p->cipher_auth.cipher_iv.val, + (uint32_t *)&len); +if (status <0 ) + goto error_exit; + + xform_cipher->cipher.iv.length = (uint16_t )len; + xform_cipher->cipher.iv.offset =RTE_TABLE_ACTION_SYM_CRYPTO_IV_OFFSET ; + p->cipher_auth.cipher_iv.length = (uint32_t )len; + *used_n_tokens =7 ; + +return xform_cipher; + +error_exit: +if (xform_cipher->cipher.key.data) +free (xform_cipher->cipher.key.data); + +if (p->cipher_auth.cipher_iv.val) { +free (p->cipher_auth.cipher_iv.val); + p->cipher_auth.cipher_iv.val =NULL ; + } + +free (xform_cipher); + +return NULL ; +} + +static struct rte_crypto_sym_xform * +parse_table_action_cipher_auth (struct rte_table_action_sym_crypto_params *p, +char **tokens,uint32_t n_tokens,uint32_t encrypt, +uint32_t *used_n_tokens) +{ +struct rte_crypto_sym_xform *xform_cipher; +struct rte_crypto_sym_xform *xform_auth; +int status; +size_t len; + +if (n_tokens <13 || +strcmp (tokens[7 ],"auth_algo" ) || +strcmp (tokens[9 ],"auth_key" ) || +strcmp (tokens[11 ],"digest_size" )) +return NULL ; + + xform_auth =calloc (1 ,sizeof (*xform_auth)); +if (xform_auth ==NULL ) +return NULL ; + + xform_auth->type =RTE_CRYPTO_SYM_XFORM_AUTH ; + xform_auth->auth.op = encrypt ?RTE_CRYPTO_AUTH_OP_GENERATE : +RTE_CRYPTO_AUTH_OP_VERIFY ; + +/* auth_algo */ + status =rte_cryptodev_get_auth_algo_enum (&xform_auth->auth.algo, + tokens[8 ]); +if (status <0 ) + goto error_exit; + +/* auth_key */ + len =strlen (tokens[10 ]); + xform_auth->auth.key.data =calloc (1 , len /2 +1 ); +if (xform_auth->auth.key.data ==NULL ) + goto error_exit; + + status =parse_hex_string (tokens[10 ], + xform_auth->auth.key.data, (uint32_t *)&len); +if (status <0 ) + goto error_exit; + + xform_auth->auth.key.length = (uint16_t )len; + +if (strcmp (tokens[11 ],"digest_size" )) + goto error_exit; + + status =parser_read_uint16 (&xform_auth->auth.digest_length, + tokens[12 ]); +if (status <0 ) + goto error_exit; + + xform_cipher =parse_table_action_cipher (p, tokens,7 , encrypt, + used_n_tokens); +if (xform_cipher ==NULL ) + goto error_exit; + + *used_n_tokens +=6 ; + +if (encrypt) { + xform_cipher->next = xform_auth; +return xform_cipher; + }else { + xform_auth->next = xform_cipher; +return xform_auth; + } + +error_exit: +if (xform_auth->auth.key.data) +free (xform_auth->auth.key.data); +if (p->cipher_auth.auth_iv.val) { +free (p->cipher_auth.auth_iv.val); + p->cipher_auth.auth_iv.val =0 ; + } + +free (xform_auth); + +return NULL ; +} + +static struct rte_crypto_sym_xform * +parse_table_action_aead (struct rte_table_action_sym_crypto_params *p, +char **tokens,uint32_t n_tokens,uint32_t encrypt, +uint32_t *used_n_tokens) +{ +struct rte_crypto_sym_xform *xform_aead; +int status; +size_t len; + +if (n_tokens <11 ||strcmp (tokens[1 ],"aead_algo" ) || +strcmp (tokens[3 ],"aead_key" ) || +strcmp (tokens[5 ],"aead_iv" ) || +strcmp (tokens[7 ],"aead_aad" ) || +strcmp (tokens[9 ],"digest_size" )) +return NULL ; + + xform_aead =calloc (1 ,sizeof (*xform_aead)); +if (xform_aead ==NULL ) +return NULL ; + + xform_aead->type =RTE_CRYPTO_SYM_XFORM_AEAD ; + xform_aead->aead.op = encrypt ?RTE_CRYPTO_AEAD_OP_ENCRYPT : +RTE_CRYPTO_AEAD_OP_DECRYPT ; + +/* aead_algo */ + status =rte_cryptodev_get_aead_algo_enum (&xform_aead->aead.algo, + tokens[2 ]); +if (status <0 ) + goto error_exit; + +/* aead_key */ + len =strlen (tokens[4 ]); + xform_aead->aead.key.data =calloc (1 , len /2 +1 ); +if (xform_aead->aead.key.data ==NULL ) + goto error_exit; + + status =parse_hex_string (tokens[4 ], xform_aead->aead.key.data, + (uint32_t *)&len); +if (status <0 ) + goto error_exit; + + xform_aead->aead.key.length = (uint16_t )len; + +/* aead_iv */ + len =strlen (tokens[6 ]); + p->aead.iv.val =calloc (1 , len /2 +1 ); +if (p->aead.iv.val ==NULL ) + goto error_exit; + + status =parse_hex_string (tokens[6 ], p->aead.iv.val, + (uint32_t *)&len); +if (status <0 ) + goto error_exit; + + xform_aead->aead.iv.length = (uint16_t )len; + xform_aead->aead.iv.offset =RTE_TABLE_ACTION_SYM_CRYPTO_IV_OFFSET ; + p->aead.iv.length = (uint32_t )len; + +/* aead_aad */ + len =strlen (tokens[8 ]); + p->aead.aad.val =calloc (1 , len /2 +1 ); +if (p->aead.aad.val ==NULL ) + goto error_exit; + + status =parse_hex_string (tokens[8 ], p->aead.aad.val, (uint32_t *)&len); +if (status <0 ) + goto error_exit; + + xform_aead->aead.aad_length = (uint16_t )len; + p->aead.aad.length = (uint32_t )len; + +/* digest_size */ + status =parser_read_uint16 (&xform_aead->aead.digest_length, + tokens[10 ]); +if (status <0 ) + goto error_exit; + + *used_n_tokens =11 ; + +return xform_aead; + +error_exit: +if (xform_aead->aead.key.data) +free (xform_aead->aead.key.data); +if (p->aead.iv.val) { +free (p->aead.iv.val); + p->aead.iv.val =NULL ; + } +if (p->aead.aad.val) { +free (p->aead.aad.val); + p->aead.aad.val =NULL ; + } + +free (xform_aead); + +return NULL ; +} + + +static uint32_t +parse_table_action_sym_crypto (char **tokens, +uint32_t n_tokens, +struct table_rule_action *a) +{ +struct rte_table_action_sym_crypto_params *p = &a->sym_crypto; +struct rte_crypto_sym_xform *xform =NULL ; +uint32_t used_n_tokens; +uint32_t encrypt; +int status; + +if ((n_tokens <12 ) || +strcmp (tokens[0 ],"sym_crypto" ) || +strcmp (tokens[2 ],"type" )) +return 0 ; + +memset (p,0 ,sizeof (*p)); + +if (strcmp (tokens[1 ],"encrypt" ) ==0 ) + encrypt =1 ; +else + encrypt =0 ; + + status =parser_read_uint32 (&p->data_offset, tokens[n_tokens -1 ]); +if (status <0 ) +return 0 ; + +if (strcmp (tokens[3 ],"cipher" ) ==0 ) { + tokens +=3 ; + n_tokens -=3 ; + + xform =parse_table_action_cipher (p, tokens, n_tokens, encrypt, + &used_n_tokens); + }else if (strcmp (tokens[3 ],"cipher_auth" ) ==0 ) { + tokens +=3 ; + n_tokens -=3 ; + + xform =parse_table_action_cipher_auth (p, tokens, n_tokens, + encrypt, &used_n_tokens); + }else if (strcmp (tokens[3 ],"aead" ) ==0 ) { + tokens +=3 ; + n_tokens -=3 ; + + xform =parse_table_action_aead (p, tokens, n_tokens, encrypt, + &used_n_tokens); + } + +if (xform ==NULL ) +return 0 ; + + p->xform = xform; + +if (strcmp (tokens[used_n_tokens],"data_offset" )) { +parse_free_sym_crypto_param_data (p); +return 0 ; + } + + a->action_mask |=1 <<RTE_TABLE_ACTION_SYM_CRYPTO ; + +return used_n_tokens +5 ; +} + static uint32_t parse_table_action(char **tokens, uint32_t n_tokens,
@@ -3665,6 +4211,20 @@ parse_table_action(char **tokens, n_tokens -= n; } +if (n_tokens && (strcmp (tokens[0 ],"sym_crypto" ) ==0 )) { +uint32_t n; + + n =parse_table_action_sym_crypto (tokens, n_tokens, a); +if (n ==0 ) { +snprintf (out, out_size,MSG_ARG_INVALID , +"action sym_crypto" ); +return 0 ; + } + + tokens += n; + n_tokens -= n; + } +if (n_tokens0 - n_tokens ==1 ) {snprintf (out, out_size,MSG_ARG_INVALID ,"action" );return 0 ;
@@ -3752,6 +4312,9 @@ cmd_pipeline_table_rule_add(char **tokens,snprintf (out, out_size,MSG_CMD_FAIL , tokens[0 ]);return ; } + +if (a.action_mask &1 <<RTE_TABLE_ACTION_SYM_CRYPTO ) +parse_free_sym_crypto_param_data (&a.sym_crypto); }
@@ -4743,6 +5306,11 @@ cmd_help(char **tokens, uint32_t n_tokens, char *out, size_t out_size)return ; } +if (strcmp (tokens[0 ],"cryptodev" ) ==0 ) { +snprintf (out, out_size,"\n%s\n" , cmd_cryptodev_help); +return ; + } + if ((n_tokens == 4) && (strcmp(tokens[0], "port") == 0) && (strcmp(tokens[1], "in") == 0) &&
@@ -5033,6 +5601,11 @@ cli_process(char *in, char *out, size_t out_size)return ; } +if (strcmp (tokens[0 ],"cryptodev" ) ==0 ) { +cmd_cryptodev (tokens, n_tokens, out, out_size); +return ; + } +if (strcmp (tokens[0 ],"port" ) ==0 ) {cmd_port_in_action_profile (tokens, n_tokens, out, out_size);return ;
Signature · 1 line
2.13.6
PATCH v2 6/7 examples/ip_pipeline: add script
In reply to Fan ZhangFrom: "Zhang, Roy Fan" <[email protected]>
--- examples/ip_pipeline/examples/flow_crypto.cli | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 examples/ip_pipeline/examples/flow_crypto.cli
examples/ip_pipeline/examples/flow_crypto.cli new file +58 -0
@@ -0,0 +1,58 @@ +; SPDX-License-Identifier: BSD-3-Clause +; Copyright(c) 2018 Intel Corporation + +; ________________ +; LINK0 RXQ0 --->| |---> CRYPTO0 TXQ0 +; | Flow | +; CRYPTO0 RXQ0-->| Classification |---> LINK0 TXQ0 +; |________________| +; | +; +-----------> SINK0 (flow lookup miss) +; +; Input packet: Ethernet/IPv4 +; +; Packet buffer layout: +; # Field Name Offset (Bytes) Size (Bytes) +; 0 Mbuf 0 128 +; 1 Headroom 128 128 +; 2 Ethernet header 256 14 +; 3 IPv4 header 280 20 +; 4 Packet 256 1536 +; 5 Crypto Operation 1792 160 + +mempool MEMPOOL0 buffer 2304 pool 32K cache 256 cpu 1 +mempool MEMPOOL_SESSION0 buffer 1024 pool 1024 cache 128 cpu 1 + +link LINK0 dev 0000:81:00.0 rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on + +#Cryptodev +cryptodev CRYPTO0 dev crypto_aesni_gcm0 queue 1 1024 + +table action profile AP0 ipv4 offset 270 fwd sym_crypto dev CRYPTO0 offset 1792 mempool_create MEMPOOL_SESSION0 mempool_init MEMPOOL_SESSION0 +table action profile AP1 ipv4 offset 270 fwd + +pipeline PIPELINE0 period 10 offset_port_id 0 cpu 1 + +pipeline PIPELINE0 port in bsz 32 link LINK0 rxq 0 +pipeline PIPELINE0 port in bsz 32 cryptodev CRYPTO0 rxq 0 + +pipeline PIPELINE0 port out bsz 32 cryptodev CRYPTO0 txq 0 offset 1792 +pipeline PIPELINE0 port out bsz 32 link LINK0 txq 0 +pipeline PIPELINE0 port out bsz 32 sink + +pipeline PIPELINE0 table match hash ext key 8 mask FFFFFFFF00000000 offset 282 buckets 1K size 4K action AP0 +pipeline PIPELINE0 table match stub action AP1 + +pipeline PIPELINE0 port in 0 table 0 +pipeline PIPELINE0 port in 1 table 1 + +thread 24 pipeline PIPELINE0 enable + +pipeline PIPELINE0 table 0 rule add match default action fwd port 2 + +#AES-GCM encrypt +pipeline PIPELINE0 table 0 rule add match hash ipv4_addr 100.0.0.10 action fwd port 0 sym_crypto encrypt type aead aead_algo aes-gcm aead_key 000102030405060708090a0b0c0d0e0f aead_iv 000102030405060708090a0b aead_aad 000102030405060708090a0b0c0d0e0f digest_size 8 data_offset 290 +#AES-GCM decrypt +#pipeline PIPELINE0 table 0 rule add match hash ipv4_addr 100.0.0.10 action fwd port 0 sym_crypto decrypt type aead aead_algo aes-gcm aead_key 000102030405060708090a0b0c0d0e0f aead_iv 000102030405060708090a0b aead_aad 000102030405060708090a0b0c0d0e0f digest_size 8 data_offset 290 + +pipeline PIPELINE0 table 1 rule add match default action fwd port 1
Signature · 1 line
2.13.6
PATCH v2 7/7 doc: update action documentation
In reply to Fan ZhangFrom: "Zhang, Roy Fan" <[email protected]>
--- doc/guides/prog_guide/packet_framework.rst | 11 ++++++++++- doc/guides/sample_app_ug/ip_pipeline.rst | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-)
doc/guides/prog_guide/packet_framework.rst +10 -1
@@ -98,6 +98,10 @@ Port Types | | | character device. | | | | | +---+------------------+---------------------------------------------------------------------------------------+ + | 9 | Sym_crypto | Output port used to extract DPDK Cryptodev operations from a fixed offset of the | + | | | packet and then enqueue to the Cryptodev PMD. Input port used to dequeue the | + | | | Cryptodev operations from the Cryptodev PMD and then retrieve the packets from them. | + +---+------------------+---------------------------------------------------------------------------------------+ Port Interface ~~~~~~~~~~~~~~
@@ -1078,6 +1082,11 @@ with each table entry having its own set of enabled user actions and its own cop | | | checksum. | | | | | +---+-----------------------------------+---------------------------------------------------------------------+ + | 7 | Sym Crypto | Generate Cryptodev session based on the user-specified algorithm | + | | | and key(s), and assemble the cryptodev operation based on the | + | | | predefined offsets. | + | | | | + +---+-----------------------------------+---------------------------------------------------------------------+ Multicore Scaling -----------------
@@ -1133,7 +1142,7 @@ Typical devices with acceleration capabilities are: * Inline accelerators: NICs, switches, FPGAs, etc; -* Look-aside accelerators: chipsets, FPGAs, etc. +* Look-aside accelerators: chipsets, FPGAs, Intel QuickAssist, etc. Usually, to support a specific functional block, specific implementation of Packet Framework tables and/or ports and/or actions has to be provided for each accelerator, with all the implementations sharing the same API: pure SW implementation (no acceleration), implementation using accelerator A, implementation using accelerator B, etc.
doc/guides/sample_app_ug/ip_pipeline.rst +23 -0
@@ -304,6 +304,15 @@ Kni [thread <thread_id>] +Cryptodev +~~~~~~~~~ + + Create cryptodev port :: + + cryptodev <cryptodev_name> + dev <DPDK Cryptodev PMD name> + queue <n_queues> <queue_size> + Action profile ~~~~~~~~~~~~~~
@@ -330,6 +339,8 @@ Action profile [ttl drop | fwd stats none | pkts] [stats pkts | bytes | both] + [sym_crypto cryptodev <cryptodev_name> + mempool_create <mempool_name> mempool_init <mempool_name>] [time]
@@ -471,6 +482,18 @@ Add rule to table for specific pipeline instance :: [ttl dec | keep] [stats] [time] + [sym_crypto + encrypt | decrypt + type + | cipher + cipher_algo <algo> cipher_key <key> cipher_iv <iv> + | cipher_auth + cipher_algo <algo> cipher_key <key> cipher_iv <iv> + auth_algo <algo> auth_key <key> digest_size <size> + | aead + aead_algo <algo> aead_key <key> aead_iv <iv> aead_aad <aad> + digest_size <size> + data_offset <data_offset>] where: <pa> ::= g | y | r | drop
Signature · 1 line
2.13.6
Re: [PATCH v2 0/7] pipeline: add symmetric crypto to action
In reply to Fan ZhangQuoted 51 lines
-----Original Message-----
From: Zhang, Roy Fan
Sent: Friday, September 28, 2018 1:26 PM
To: [email protected]
Cc: Dumitrescu, Cristian <[email protected]>
Subject: [PATCH v2 0/7] pipeline: add symmetric crypto to actionThis patchset creates an abstraction layer of DPDK Cryptodev to the pipeline library to enable its symmetric cryptographic capability. The
ip_pipelinesample application is updated accordingly.v2:
- Fixed bugs.
- Updated data structure.
- Updated IP-pipeline sample application.Zhang, Roy Fan (7):
pipeline: add symmetric crypto to action examples/ip_pipeline: add cryptodev examples/ip_pipeline: configure crypto port examples/ip_pipeline: add symmetric crypto action examples/ip_pipeline: update cli parsing examples/ip_pipeline: add script
doc: update action documentationdoc/guides/prog_guide/packet_framework.rst | 11 +- doc/guides/sample_app_ug/ip_pipeline.rst | 23 + examples/ip_pipeline/Makefile | 1 + examples/ip_pipeline/action.c | 11 + examples/ip_pipeline/action.h | 1 + examples/ip_pipeline/cli.c | 577 +++++++++++++++++++++++++- examples/ip_pipeline/cryptodev.c | 117 ++++++ examples/ip_pipeline/cryptodev.h | 43 ++ examples/ip_pipeline/examples/flow_crypto.cli | 58 +++ examples/ip_pipeline/main.c | 9 + examples/ip_pipeline/meson.build | 3 +- examples/ip_pipeline/pipeline.c | 60 +++ examples/ip_pipeline/pipeline.h | 14 + examples/ip_pipeline/thread.c | 10 + lib/librte_pipeline/Makefile | 2 +- lib/librte_pipeline/meson.build | 2 +- lib/librte_pipeline/rte_pipeline_version.map | 1 + lib/librte_pipeline/rte_table_action.c | 503 +++++++++++++++++++++- lib/librte_pipeline/rte_table_action.h | 104 +++++ 19 files changed, 1543 insertions(+), 7 deletions(-) create mode 100644 examples/ip_pipeline/cryptodev.c create mode 100644 examples/ip_pipeline/cryptodev.h create mode 100644 examples/ip_pipeline/examples/flow_crypto.cli
Quoted 2 lines
--
2.13.6
Series applied to next-pipeline tree, thanks!