git-lng-odp

git-lng-odp@lists.linaro.org

2 participants
1206 discussions

[COMMIT] branch api-next updated. v1.16.0.0-733-g177eeff3

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 177eeff39e19289e771119cfdffc515cb16f9db5 (commit) via 49665e54259bc04b1ba0f9bc0456714d98ab13c6 (commit) via 1f82edd05f4e83ac3a6d6a3a3cd0ec914d5ad359 (commit) from c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 22 ++++- .../linux-generic/include/odp_ipsec_internal.h | 6 ++ platform/linux-generic/odp_ipsec.c | 67 +++++++++++++- platform/linux-generic/odp_ipsec_sad.c | 101 ++++++++++++++------- test/validation/api/ipsec/ipsec.c | 4 +- 5 files changed, 159 insertions(+), 41 deletions(-) hooks/post-receive --

8 years, 1 month

[COMMIT] branch api-next updated. v1.16.0.0-730-gc38fc105

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 (commit) via 4c4052f894b8df5784d2aae2e36b96796ee020fd (commit) via 9e388b884efed8d653cf453f6516f34019d02305 (commit) via 11da2d3bc8871379321048a5e951e142aa594b9d (commit) via 192693591500302fd5232eee92144dba204abaaf (commit) via 75f0096e1af7eca556e9f1c896f7cc34cc325edc (commit) via 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (commit) via bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e (commit) via b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 (commit) via 6b5cdc77eb9759a2349b10372a964648559bc92c (commit) via bb0ec2f991bc5b295928e87c8b9bc0efb92479d3 (commit) via ffcd7991e44109464fb8a71f9ee10546ea5b84b0 (commit) from f2a1a84b43642f3d0911a351d9308d5501693290 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c38fc105f0e9a88dd4ebb4d9e7ac9e1160466322 Merge: f2a1a84b 4c4052f8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Dec 21 17:33:36 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc DEPENDENCIES index 008c4df4,0805a183..829ff363 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@@ -19,9 -19,9 +19,9 @@@ Prerequisites for building the OpenData 3. Required libraries - Libraries currently required to link: openssl, libconfig - Libraries currently required to link: openssl, libatomic ++ Libraries currently required to link: openssl, libconfig, libatomic -3.1 OpenSSL native compile +3.1 OpenSSL and libconf native compile For native compilation, simply load the necessary libraries using the appropriate tool set. ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 + .shippable.yml | 8 +- .travis.yml | 2 + DEPENDENCIES | 10 ++- doc/.gitignore | 1 + platform/linux-generic/odp_pool.c | 87 ++++++++++------------ .../test/validation/api/shmem/shmem_odp1.c | 10 ++- scripts/Dockerfile | 3 +- test/common/odp_cunit_common.c | 13 +++- test/common/odp_cunit_common.h | 5 +- test/m4/miscellaneous.m4 | 18 ++++- test/performance/Makefile.am | 5 +- 12 files changed, 105 insertions(+), 60 deletions(-) create mode 100644 doc/.gitignore hooks/post-receive --

8 years, 1 month

[COMMIT] branch master updated. v1.16.0.0-37-g4c4052f8

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 4c4052f894b8df5784d2aae2e36b96796ee020fd (commit) via 9e388b884efed8d653cf453f6516f34019d02305 (commit) via 11da2d3bc8871379321048a5e951e142aa594b9d (commit) via 192693591500302fd5232eee92144dba204abaaf (commit) via 75f0096e1af7eca556e9f1c896f7cc34cc325edc (commit) from 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 +++ .shippable.yml | 8 +++++++- .travis.yml | 2 ++ doc/.gitignore | 1 + .../linux-generic/test/validation/api/shmem/shmem_odp1.c | 10 ++++++++-- scripts/Dockerfile | 3 ++- test/common/odp_cunit_common.c | 13 +++++++++++-- test/common/odp_cunit_common.h | 5 +++-- 8 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 doc/.gitignore hooks/post-receive --

8 years, 1 month

[COMMIT] branch master updated. v1.16.0.0-32-g3c02836d

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 3c02836d9d9ca16b1277bdd30e523779b9fe8374 (commit) via bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e (commit) via b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 (commit) from 6b5cdc77eb9759a2349b10372a964648559bc92c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3c02836d9d9ca16b1277bdd30e523779b9fe8374 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Dec 15 15:23:59 2017 +0200 DEPENDENCIES: update requirements for Red Hat Update instructions to support RHEL 7.4. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/DEPENDENCIES b/DEPENDENCIES index 68c7b8be..0805a183 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -19,7 +19,7 @@ Prerequisites for building the OpenDataPlane (ODP) API 3. Required libraries - Libraries currently required to link: openssl + Libraries currently required to link: openssl, libatomic 3.1 OpenSSL native compile @@ -163,6 +163,8 @@ Prerequisites for building the OpenDataPlane (ODP) API DPDK pktio adds a depency to NUMA library. # Debian/Ubuntu $ sudo apt-get install libnuma-dev + # CentOS/RedHat/Fedora + $ sudo yum install numactl-devel Note: only packet I/O is accelerated with DPDK. Use https://git.linaro.org/lng/odp-dpdk.git @@ -227,14 +229,16 @@ Prerequisites for building the OpenDataPlane (ODP) API make sudo make install + # On RedHat you also have to add path /usr/local/lib to /etc/ld.so.conf + # ... OR ... Install CUnit into user defined location. The same path is # used in step 4.4: PKG_CONFIG_PATH=/home/<my_cunit_path>/lib/pkgconfig ./configure --prefix=/home/<my_cunit_path> make make install - # Also (in Ubuntu at least) run ldconfig to update shared lib cache or - # reboot, before trying to run e.g. 'make distcheck'. + # Also (in Ubuntu/RedHat at least) run ldconfig to update shared lib + # cache or reboot, before trying to run e.g. 'make distcheck'. sudo ldconfig 4.3 Cross compile of CUnit commit bb003e11ae7bfacc1fb1e9b8276dd49a32a31b4e Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Dec 18 16:22:42 2017 +0200 test: odp_pktio_ordered: run test only if pcap is available The odp_pktio_ordered test depends on pcap pktio, so skip it if pcap is not available. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 1dccd82e..9c709e79 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -12,10 +12,13 @@ COMPILE_ONLY = odp_l2fwd \ odp_scheduling TESTSCRIPTS = odp_l2fwd_run.sh \ - odp_pktio_ordered_run.sh \ odp_sched_latency_run.sh \ odp_scheduling_run.sh +if HAVE_PCAP +TESTSCRIPTS += odp_pktio_ordered_run.sh +endif + TEST_EXTENSIONS = .sh if test_perf commit b5dfcef4586e0a1618c202aaeb7e863c17cc4d06 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Dec 18 15:24:04 2017 +0200 test: disable C++ test if no compiler is found Enables building ODP on systems which have no C++ compiler available. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/m4/miscellaneous.m4 b/test/m4/miscellaneous.m4 index dac236a6..07c32377 100644 --- a/test/m4/miscellaneous.m4 +++ b/test/m4/miscellaneous.m4 @@ -2,7 +2,21 @@ # Enable/disable test-cpp ########################################################################## AC_ARG_ENABLE([test-cpp], - [AS_HELP_STRING([--disable-test-cpp], [run basic test aginast cpp])], + [AS_HELP_STRING([--disable-test-cpp], [run basic test against cpp])], [test_cpp=$enableval], - [test_cpp=yes]) + [test_cpp=check]) + +if test "x$test_cpp" != "xno" ; then + AC_CACHE_CHECK([if C++ compiler works], [odp_cv_cxx_works], + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [odp_cv_cxx_works=yes], + [odp_cv_cxx_works=no]) + AC_LANG_POP([C++])]) + AS_IF([test "x$test_cpp$odp_cv_cxx_works" = "xyesno"], + [AC_MSG_FAILURE([C++ compiler test failed])], + [test "x$test_cpp$odp_cv_cxx_works" = "xcheckno"], + [AC_MSG_NOTICE([disabling C++ test]) ; test_cpp=no], + [test_cpp=yes]) +fi + AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) ----------------------------------------------------------------------- Summary of changes: DEPENDENCIES | 10 +++++++--- test/m4/miscellaneous.m4 | 18 ++++++++++++++++-- test/performance/Makefile.am | 5 ++++- 3 files changed, 27 insertions(+), 6 deletions(-) hooks/post-receive --

8 years, 1 month

[COMMIT] branch api-next updated. v1.16.0.0-718-gf2a1a84b

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via f2a1a84b43642f3d0911a351d9308d5501693290 (commit) via 233d0aa078f6c70a10c84e1bc1365b18c39a7ae9 (commit) from b1c287aa71c7559ee0cd1b1f3eef971491cf1c04 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f2a1a84b43642f3d0911a351d9308d5501693290 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 12 19:20:16 2017 +0300 api: ipsec: drop odp_ipsec_proto_layer_t Use odp_proto_layer_t to specify outer header retention level. Drop separate odp_ipsec_proto_layer_t. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index c6795468..4f8748a6 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -69,27 +69,6 @@ typedef enum odp_ipsec_op_mode_t { } odp_ipsec_op_mode_t; -/** - * Protocol layers in IPSEC configuration - */ -typedef enum odp_ipsec_proto_layer_t { - /** No layers */ - ODP_IPSEC_LAYER_NONE = ODP_PROTO_LAYER_NONE, - - /** Layer L2 protocols (Ethernet, VLAN, etc) */ - ODP_IPSEC_LAYER_L2 = ODP_PROTO_LAYER_L2, - - /** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */ - ODP_IPSEC_LAYER_L3 = ODP_PROTO_LAYER_L3, - - /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_IPSEC_LAYER_L4 = ODP_PROTO_LAYER_L4, - - /** All layers */ - ODP_IPSEC_LAYER_ALL = ODP_PROTO_LAYER_ALL - -} odp_ipsec_proto_layer_t; - /** * Configuration options for IPSEC inbound processing */ @@ -125,25 +104,25 @@ typedef struct odp_ipsec_inbound_config_t { * * Select up to which protocol layer (at least) outer headers are * retained in inbound inline processing. Default value is - * ODP_IPSEC_LAYER_NONE. + * ODP_PROTO_LAYER_NONE. * - * ODP_IPSEC_LAYER_NONE: Application does not require any outer + * ODP_PROTO_LAYER_NONE: Application does not require any outer * headers to be retained. * - * ODP_IPSEC_LAYER_L2: Retain headers up to layer 2. + * ODP_PROTO_LAYER_L2: Retain headers up to layer 2. * - * ODP_IPSEC_LAYER_L3: Retain headers up to layer 3, otherwise the - * same as ODP_IPSEC_LAYER_ALL. + * ODP_PROTO_LAYER_L3: Retain headers up to layer 3, otherwise the + * same as ODP_PROTO_LAYER_ALL. * - * ODP_IPSEC_LAYER_L4: Retain headers up to layer 4, otherwise the - * same as ODP_IPSEC_LAYER_ALL. + * ODP_PROTO_LAYER_L4: Retain headers up to layer 4, otherwise the + * same as ODP_PROTO_LAYER_ALL. * - * ODP_IPSEC_LAYER_ALL: In tunnel mode, all headers before IPSEC are + * ODP_PROTO_LAYER_ALL: In tunnel mode, all headers before IPSEC are * retained. In transport mode, all headers * before IP (carrying IPSEC) are retained. * */ - odp_ipsec_proto_layer_t retain_outer; + odp_proto_layer_t retain_outer; /** Parse packet headers after IPSEC transformation * commit 233d0aa078f6c70a10c84e1bc1365b18c39a7ae9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 12 19:18:29 2017 +0300 api: ipsec: use odp_proto_layer_t for parse layer spec Usign odp_proto_layer_t for parse layer spec is more logical, as it is the same enum that is used for the rest of packet parsing API. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 538472a5..c6795468 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -156,9 +156,9 @@ typedef struct odp_ipsec_inbound_config_t { * * Each successfully transformed packet has a valid value for L3 offset * regardless of the parse configuration. Default value is - * ODP_IPSEC_LAYER_NONE. ODP_IPSEC_LAYER_L2 is not a valid value. + * ODP_PROTO_LAYER_NONE. ODP_PROTO_LAYER_L2 is not a valid value. */ - odp_ipsec_proto_layer_t parse; + odp_proto_layer_t parse_level; /** Flags to control IPSEC payload data checks up to the selected parse * level. Checksum checking status can be queried for each packet with diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index ff8201c4..49d5531f 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -756,7 +756,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, parse_param.proto = state.is_ipv4 ? ODP_PROTO_IPV4 : ODP_PROTO_IPV6; - parse_param.last_layer = (odp_proto_layer_t)ipsec_config.inbound.parse; + parse_param.last_layer = ipsec_config.inbound.parse_level; parse_param.chksums = ipsec_config.inbound.chksums; /* We do not care about return code here. diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 9d263dfc..9729efb4 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -904,7 +904,7 @@ int ipsec_config(odp_instance_t ODP_UNUSED inst) ipsec_config.inbound_mode = suite_context.inbound_op_mode; ipsec_config.outbound_mode = suite_context.outbound_op_mode; ipsec_config.inbound.default_queue = suite_context.queue; - ipsec_config.inbound.parse = ODP_IPSEC_LAYER_ALL; + ipsec_config.inbound.parse_level = ODP_PROTO_LAYER_ALL; if (ODP_IPSEC_OK != odp_ipsec_config(&ipsec_config)) return -1; ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/ipsec.h | 43 ++++++++++---------------------------- platform/linux-generic/odp_ipsec.c | 2 +- test/validation/api/ipsec/ipsec.c | 2 +- 3 files changed, 13 insertions(+), 34 deletions(-) hooks/post-receive --

8 years, 1 month

[COMMIT] branch api-next updated. v1.16.0.0-716-gb1c287aa

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via b1c287aa71c7559ee0cd1b1f3eef971491cf1c04 (commit) from 9e35c84dea1b66bae27a35dfc71018a0bb455950 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b1c287aa71c7559ee0cd1b1f3eef971491cf1c04 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Tue Dec 19 16:40:02 2017 +0300 aad: crypto change aad.ptr to aad_ptr in packet params In new odp_crypto_packet_op_param_t change AAD from struct with a single pointer to just data pointer. This API is new, so there is no need to deprecate and/or handle old pointer in any specific way. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 293c15c6..81fecbc3 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -407,14 +407,10 @@ typedef struct odp_crypto_op_param_t { */ uint32_t hash_result_offset; - /** Additional Authenticated Data (AAD) */ - struct { - /** Pointer to AAD. AAD length is defined by 'auth_aad_len' - * session parameter. - */ - uint8_t *ptr; - - } aad; + /** Pointer to AAD. AAD length is defined by 'auth_aad_len' + * session parameter. + */ + uint8_t *aad_ptr; /** Data range to apply cipher */ odp_packet_data_range_t cipher_range; @@ -447,14 +443,10 @@ typedef struct odp_crypto_packet_op_param_t { */ uint32_t hash_result_offset; - /** Additional Authenticated Data (AAD) */ - struct { - /** Pointer to AAD. AAD length is defined by 'auth_aad_len' - * session parameter. - */ - uint8_t *ptr; - - } aad; + /** Pointer to AAD. AAD length is defined by 'auth_aad_len' + * session parameter. + */ + uint8_t *aad_ptr; /** Data range to apply cipher */ odp_packet_data_range_t cipher_range; diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index b9cc21a1..11635cda 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -478,7 +478,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, odp_crypto_generic_session_t *session) { EVP_CIPHER_CTX *ctx; - const uint8_t *aad_head = param->aad.ptr; + const uint8_t *aad_head = param->aad_ptr; uint32_t aad_len = session->p.auth_aad_len; void *iv_ptr; int dummy_len = 0; @@ -525,7 +525,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, odp_crypto_generic_session_t *session) { EVP_CIPHER_CTX *ctx; - const uint8_t *aad_head = param->aad.ptr; + const uint8_t *aad_head = param->aad_ptr; uint32_t aad_len = session->p.auth_aad_len; int dummy_len = 0; void *iv_ptr; @@ -1057,7 +1057,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, packet_param.session = param->session; packet_param.override_iv_ptr = param->override_iv_ptr; packet_param.hash_result_offset = param->hash_result_offset; - packet_param.aad.ptr = param->aad.ptr; + packet_param.aad_ptr = param->aad_ptr; packet_param.cipher_range = param->cipher_range; packet_param.auth_range = param->auth_range; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 4f23eb17..ff8201c4 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -424,7 +424,7 @@ static int ipsec_in_esp(odp_packet_t *pkt, state->esp.aad.seq_no = esp.seq_no; state->in.seq_no = odp_be_to_cpu_32(esp.seq_no); - param->aad.ptr = (uint8_t *)&state->esp.aad; + param->aad_ptr = (uint8_t *)&state->esp.aad; param->auth_range.offset = ipsec_offset; param->auth_range.length = state->ip_tot_len - @@ -1029,7 +1029,7 @@ static int ipsec_out_esp(odp_packet_t *pkt, state->esp.aad.spi = esp.spi; state->esp.aad.seq_no = esp.seq_no; - param->aad.ptr = (uint8_t *)&state->esp.aad; + param->aad_ptr = (uint8_t *)&state->esp.aad; memset(&esptrl, 0, sizeof(esptrl)); esptrl.pad_len = encrypt_len - ip_data_len - _ODP_ESPTRL_LEN; diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index cba472de..7ad2889f 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -102,7 +102,7 @@ static int alg_op(odp_packet_t pkt, if (op_iv_ptr) op_params.override_iv_ptr = op_iv_ptr; - op_params.aad.ptr = aad; + op_params.aad_ptr = aad; op_params.hash_result_offset = plaintext_len; @@ -174,7 +174,7 @@ static int alg_packet_op(odp_packet_t pkt, if (op_iv_ptr) op_params.override_iv_ptr = op_iv_ptr; - op_params.aad.ptr = aad; + op_params.aad_ptr = aad; op_params.hash_result_offset = plaintext_len; @@ -232,7 +232,7 @@ static int alg_packet_op_enq(odp_packet_t pkt, if (op_iv_ptr) op_params.override_iv_ptr = op_iv_ptr; - op_params.aad.ptr = aad; + op_params.aad_ptr = aad; op_params.hash_result_offset = plaintext_len; ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/crypto.h | 24 ++++++++---------------- platform/linux-generic/odp_crypto.c | 6 +++--- platform/linux-generic/odp_ipsec.c | 4 ++-- test/validation/api/crypto/odp_crypto_test_inp.c | 6 +++--- 4 files changed, 16 insertions(+), 24 deletions(-) hooks/post-receive --

8 years, 1 month

[COMMIT] branch api-next updated. v1.16.0.0-715-g9e35c84d

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 9e35c84dea1b66bae27a35dfc71018a0bb455950 (commit) via 54a0bc673c5fa6f1f579821faab8390556a6d424 (commit) via 567764ef01021210b8aa587df90ac1477715ec5c (commit) via 38487572609049023e51c88adbe1b2e77d62d996 (commit) via 9e0a675bacbbc497065e66e467a0ed75b1296a16 (commit) from 12fd3a9224a856271934986a1bad981843915d68 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e35c84dea1b66bae27a35dfc71018a0bb455950 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 15:02:17 2017 +0300 example: use odp_proto_layer_t instead of odp_pktio_parser_layer_t Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index e6381455..2592c374 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -52,7 +52,7 @@ static odp_pktio_t create_pktio(const char *name, odp_pool_t pool, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&in_queue_param); diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index d5a24aa6..3946546f 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -123,8 +123,8 @@ static int create_pktio(const char *name, odp_pool_t pool, odp_pktio_config_init(&config); config.parser.layer = global.cmd_args.error_check ? - ODP_PKTIO_PARSER_LAYER_ALL : - ODP_PKTIO_PARSER_LAYER_L4; + ODP_PROTO_LAYER_ALL : + ODP_PROTO_LAYER_L4; odp_pktio_config(pktio, &config); fwd_pktio->nb_rxq = (int)capa.max_input_queues; diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index be483099..3e52970b 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -240,7 +240,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); commit 54a0bc673c5fa6f1f579821faab8390556a6d424 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 15:02:17 2017 +0300 performance: use odp_proto_layer_t instead of odp_pktio_parser_layer_t Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 0ebb0dd1..27b29939 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -737,8 +737,8 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, odp_pktio_config_init(&config); config.parser.layer = gbl_args->appl.extra_check ? - ODP_PKTIO_PARSER_LAYER_ALL : - ODP_PKTIO_PARSER_LAYER_NONE; + ODP_PROTO_LAYER_ALL : + ODP_PROTO_LAYER_NONE; if (gbl_args->appl.chksum) { printf("Checksum offload enabled\n"); diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index ed4e2e8e..2248eb2f 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -618,7 +618,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index a4599de6..4c09b12e 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -797,7 +797,7 @@ static int test_init(void) * affects scalability. */ odp_pktio_config_init(&cfg); - cfg.parser.layer = ODP_PKTIO_PARSER_LAYER_NONE; + cfg.parser.layer = ODP_PROTO_LAYER_NONE; odp_pktio_config(gbl_args->pktio_rx, &cfg); if (gbl_args->args.num_ifaces > 1) { commit 567764ef01021210b8aa587df90ac1477715ec5c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 15:02:17 2017 +0300 validation: use odp_proto_layer_t instead of odp_pktio_parser_layer_t Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 09721673..9d263dfc 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -84,7 +84,7 @@ static int pktio_start(odp_pktio_t pktio, odp_bool_t in, odp_bool_t out) return 0; odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.parser.layer = ODP_PROTO_LAYER_ALL; config.inbound_ipsec = in; config.outbound_ipsec = out; diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index 66e726d0..1788d4d6 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -122,7 +122,7 @@ static odp_pktio_t create_pktio(int iface_idx, odp_pool_t pool) } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.parser.layer = ODP_PROTO_LAYER_ALL; if (odp_pktio_config(pktio, &config)) { printf("Error: failed to configure %s\n", iface); return ODP_PKTIO_INVALID; diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 39451de3..a6820a1d 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -1230,7 +1230,7 @@ void pktio_test_pktio_config(void) odp_pktio_config_init(&config); - CU_ASSERT(config.parser.layer == ODP_PKTIO_PARSER_LAYER_ALL); + CU_ASSERT(config.parser.layer == ODP_PROTO_LAYER_ALL); CU_ASSERT(odp_pktio_config(pktio, NULL) == 0); commit 38487572609049023e51c88adbe1b2e77d62d996 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 14:57:21 2017 +0300 linux-gen: adapt to odp_pktio_parser_layer_t removal Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 0f661679..346c2dc6 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -296,11 +296,11 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, /* Perform packet parse up to a given protocol layer */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer); + odp_proto_layer_t layer); /* Perform L3 and L4 parsing up to a given protocol layer */ int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer, + odp_proto_layer_t layer, uint32_t l3_offset, uint16_t ethtype); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 025f1259..27643092 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -973,7 +973,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, packet_set_len(pkt_hdr, pkt_len); packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, - ODP_PKTIO_PARSER_LAYER_ALL); + ODP_PROTO_LAYER_ALL); cos = cls_select_cos(entry, base, pkt_hdr); if (cos == NULL) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index cf76df72..72d1ca62 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2211,7 +2211,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->l3_offset = offset; - if (layer <= ODP_PKTIO_PARSER_LAYER_L2) + if (layer <= ODP_PROTO_LAYER_L2) return prs->error_flags.all != 0; /* Set l3 flag only for known ethtypes */ @@ -2242,7 +2242,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, ip_proto = 255; /* Reserved invalid by IANA */ } - if (layer == ODP_PKTIO_PARSER_LAYER_L3) + if (layer == ODP_PROTO_LAYER_L3) return prs->error_flags.all != 0; /* Set l4 flag only for known ip_proto */ @@ -2314,7 +2314,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, parseptr = ptr; offset = 0; - if (layer == ODP_PKTIO_PARSER_LAYER_NONE) + if (layer == ODP_PROTO_LAYER_NONE) return 0; /* Assume valid L2 header, no CRC/FCS check in SW */ @@ -2333,7 +2333,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, * Simple packet parser */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer) + odp_proto_layer_t layer) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); void *base = packet_data(pkt_hdr); @@ -2343,7 +2343,7 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, } int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer, + odp_proto_layer_t layer, uint32_t l3_offset, uint16_t ethtype) { diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index aa6cdb06..ffbc73b2 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -998,7 +998,7 @@ void odp_pktio_config_init(odp_pktio_config_t *config) { memset(config, 0, sizeof(odp_pktio_config_t)); - config->parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config->parser.layer = ODP_PROTO_LAYER_ALL; } int odp_pktio_info(odp_pktio_t hdl, odp_pktio_info_t *info) @@ -1203,7 +1203,7 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) /* The same parser is used for all pktios */ if (ret == 0) - capa->config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + capa->config.parser.layer = ODP_PROTO_LAYER_ALL; return ret; } commit 9e0a675bacbbc497065e66e467a0ed75b1296a16 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Dec 13 14:56:21 2017 +0300 api: pktio: start switching to using odp_proto_layer_t Instead of using separate odp_pktio_parser_layer_t switch to using odp_proto_layer_t. Deprecate old enum and values. For now do not put them under ODP_DEPRECATED_API to let the rest of ODP code to adapt. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Balasubramanian Manoharan <bala.manoharan(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index a3312d28..bf30877f 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -272,8 +272,8 @@ typedef struct odp_pktio_param_t { * not checked. * * IPv4 checksum checking may be enabled only when parsing level is - * ODP_PKTIO_PARSER_LAYER_L3 or higher. Similarly, L4 level checksum checking - * may be enabled only with parsing level ODP_PKTIO_PARSER_LAYER_L4 or higher. + * ODP_PROTO_LAYER_L3 or higher. Similarly, L4 level checksum checking + * may be enabled only with parsing level ODP_PROTO_LAYER_L4 or higher. * * Whether checksum checking was done and whether a checksum was correct * can be queried for each received packet with odp_packet_l3_chksum_status() @@ -405,24 +405,30 @@ typedef union odp_pktout_config_opt_t { /** * Parser layers + * + * @deprecated Use odp_proto_layer_t instead */ -typedef enum odp_pktio_parser_layer_t { - /** No layers */ - ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE, +typedef odp_proto_layer_t odp_pktio_parser_layer_t; - /** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */ - ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2, +/** No layers + * @deprecated Use ODP_PROTO_LAYER_NONE, instead */ +#define ODP_PKTIO_PARSER_LAYER_NONE ODP_PROTO_LAYER_NONE - /** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */ - ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3, +/** Layer L2 protocols (Ethernet, VLAN, ARP, etc) + * @deprecated Use ODP_PROTO_LAYER_L2, instead */ +#define ODP_PKTIO_PARSER_LAYER_L2 ODP_PROTO_LAYER_L2 - /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4, +/** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) + * @deprecated Use ODP_PROTO_LAYER_L3, instead */ +#define ODP_PKTIO_PARSER_LAYER_L3 ODP_PROTO_LAYER_L3 - /** All layers */ - ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL +/** Layer L4 protocols (UDP, TCP, SCTP) + * @deprecated Use ODP_PROTO_LAYER_L4, instead */ +#define ODP_PKTIO_PARSER_LAYER_L4 ODP_PROTO_LAYER_L4 -} odp_pktio_parser_layer_t; +/** All layers + * @deprecated Use ODP_PROTO_LAYER_ALL instead */ +#define ODP_PKTIO_PARSER_LAYER_ALL ODP_PROTO_LAYER_ALL /** * Parser configuration @@ -436,8 +442,8 @@ typedef struct odp_pktio_parser_config_t { * set. In addition, offset (and pointer) to the next layer is set. * Other layer/protocol specific metadata have undefined values. * - * The default value is ODP_PKTIO_PARSER_LAYER_ALL. */ - odp_pktio_parser_layer_t layer; + * The default value is ODP_PROTO_LAYER_ALL. */ + odp_proto_layer_t layer; } odp_pktio_parser_config_t; ----------------------------------------------------------------------- Summary of changes: example/l2fwd_simple/odp_l2fwd_simple.c | 2 +- example/l3fwd/odp_l3fwd.c | 4 +-- example/switch/odp_switch.c | 2 +- include/odp/api/spec/packet_io.h | 38 +++++++++++++--------- .../linux-generic/include/odp_packet_internal.h | 4 +-- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_packet.c | 10 +++--- platform/linux-generic/odp_packet_io.c | 4 +-- test/performance/odp_l2fwd.c | 4 +-- test/performance/odp_pktio_ordered.c | 2 +- test/performance/odp_pktio_perf.c | 2 +- test/validation/api/ipsec/ipsec.c | 2 +- test/validation/api/pktio/parser.c | 2 +- test/validation/api/pktio/pktio.c | 2 +- 14 files changed, 43 insertions(+), 37 deletions(-) hooks/post-receive --

8 years, 1 month

[COMMIT] branch api-next updated. v1.16.0.0-710-g12fd3a92

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 12fd3a9224a856271934986a1bad981843915d68 (commit) from 0588040068a50d0d15a641d091fce23214b15594 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 12fd3a9224a856271934986a1bad981843915d68 Author: Bill Fischofer <bill.fischofer(a)linaro.org> Date: Wed Nov 15 17:12:36 2017 -0600 doc: userguide: ipsec state machine changes Replace the FSMs used to describe SA state transitions and IPsec operations with a Message Sequence Diagram (MSC) that shows the same information in an easier to follow form. Update User Guide to reflect these changes as well. Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-by: Janne Peltonen <janne.peltonen(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/images/.gitignore b/doc/images/.gitignore index 0aa34793..9bcc44f5 100644 --- a/doc/images/.gitignore +++ b/doc/images/.gitignore @@ -1,5 +1,5 @@ resource_management.svg -ipsec_fsm.svg +ipsec_sa_states.svg pktio_fsm.svg timer_fsm.svg timeout_fsm.svg diff --git a/doc/images/ipsec_fsm.gv b/doc/images/ipsec_fsm.gv deleted file mode 100644 index 1e78c8b8..00000000 --- a/doc/images/ipsec_fsm.gv +++ /dev/null @@ -1,32 +0,0 @@ -digraph ipsec_state_machine { - rankdir=LR; - size="12,12"; - node [fontsize=28]; - edge [fontsize=28]; - node [shape=doublecircle]; Unconfigured Configured SA_Ready SA_Expired; - node [shape=circle]; - Unconfigured -> Configured [label="odp_ipsec_config()" - constraint=false]; - Configured -> SA_Ready [label="odp_ipsec_sa_create()"]; - SA_Ready -> Disable_Pending [label="odp_ipsec_sa_disable()"]; - Disable_Pending -> Disable_Check [label="odp_queue_deq()"]; - Disable_Pending -> Disable_Check [label="odp_schedule()"]; - SA_Disabled -> Configured [label="odp_ipsec_sa_destroy()" - constraint=false]; - SA_Ready -> Processing [label="odp_ipsec_in_enq()"]; - SA_Ready -> Processing [label="odp_ipsec_out_enq()"]; - Processing -> Op_Complete [label="odp_queue_deq()"]; - Processing -> Op_Complete [label="odp_schedule()"]; - Op_Complete -> SA_Expired [label="hard limit reached" constraint=false]; - SA_Ready -> SA_Ready [label="odp_ipsec_in()"]; - SA_Ready -> SA_Ready [label="odp_ipsec_out()"]; - SA_Ready -> SA_Ready [label="odp_ipsec_out_inline()"]; - SA_Ready -> SA_Expired [label="hard limit reached"]; - Op_Complete -> SA_Ready [label="odp_ipsec_result()"] - Op_Complete -> SA_Ready [label="odp_ipsec_status()"] - Disable_Check -> SA_Disabled [label="odp_ipsec_status()" - constraint=false]; - Disable_Check -> Disable_Pending [label="odp_ipsec_result()" - constraint=false]; - SA_Expired -> Disable_Pending [label="odp_ipsec_sa_disable()"]; -} diff --git a/doc/images/ipsec_sa_states.msc b/doc/images/ipsec_sa_states.msc new file mode 100644 index 00000000..7030877e --- /dev/null +++ b/doc/images/ipsec_sa_states.msc @@ -0,0 +1,76 @@ +msc { + + a [label = "Application"], + o [label = "ODP"], + p [label = "Platform"]; + + --- [label = "IPsec configuration, done once"]; + a->o [label = "odp_ipsec_config()"]; + o->p [label = "Config IPsec"]; + o->a [label = "OK"]; + + |||; + --- [label = "IPsec SA creation, per SA"]; + |||; + + a->o [label = "odp_ipsec_sa_create()"]; + o->p [label = "SA Create"]; + o->a [label = "OK"]; + + |||; + --- [label = "IPsec operations, per SA"]; + |||; + + a->o [label = "odp_ipsec_in()"]; + o->p [label = "IPsec Decrypt"]; + p->a [label = "Done"]; + + a->o [label = "odp_ipsec_out()"]; + o->p [label = "IPsec Encrypt"]; + p->a [label = "Done"]; + + a->o [label = "odp_ipsec_out_inline()"]; + o->p [label = "IPsec Encrypt Inline"]; + o->a [label = "OK"]; + p->o [label = "OK"]; + + a->o [label = "odp_ipsec_in_enq()"]; + o->p [label = "Initiate IPsec operation"]; + a->o [label = "odp_ipsec_out_enq()"]; + o->p [label = "Initiate IPsec operation"]; + + |||; + --- [label = "Time passes"]; + |||; + + p->o [label = "IPsec op complete"]; + a->o [label = "odp_schedule()"]; + o->p [label = "Get Event"]; + p->a [label = "ODP_EVENT_PACKET subtype ODP_EVENT_PACKET_IPSEC"]; + a->o [label = "odp_ipsec_result()"]; + o->a [label = "OK"]; + + |||; + --- [label = "App done with SA, per SA"]; + |||; + + a->o [label = "odp_ipsec_sa_disable()"]; + o->p [label = "Disable/Delete SA"]; + o->a [label = "OK"]; + p->o [label = "Done"]; + + |||; + --- [label = "Time passes"]; + |||; + + a->o [label = "odp_schedule()"]; + o->p [label = "Get Event"]; + p->a [label = "ODP_EVENT_IPSEC_STATUS"]; + a->o [label = "odp_ipsec_status"]; + o->a [label = "ODP_IPSEC_STATUS_SA_DISABLED"]; + + a->o [label = "odp_ipsec_sa_destroy()"]; + o->a [label = "OK"]; + + +} \ No newline at end of file diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 54f87bb6..b2ebd4d4 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -11,7 +11,7 @@ SRC = users-guide.adoc \ TARGET = users-guide.html IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/atomic_queue.svg \ - $(IMAGES_DIR)/ipsec_fsm.svg \ + $(IMAGES_DIR)/ipsec_sa_states.svg \ $(IMAGES_DIR)/odp_components.svg \ $(IMAGES_DIR)/ODP-Logo-HQ.svg \ $(IMAGES_DIR)/odp_rx_processing.svg \ @@ -48,7 +48,7 @@ IMAGES += $(IMAGES_DIR)/resource_management.svg endif IMAGES_SRCS = \ - $(IMAGES_DIR)/ipsec_fsm.gv \ + $(IMAGES_DIR)/ipsec_sa_states.msc \ $(IMAGES_DIR)/pktio_fsm.gv \ $(IMAGES_DIR)/resource_management.msc \ $(IMAGES_DIR)/timeout_fsm.gv \ diff --git a/doc/users-guide/users-guide-ipsec.adoc b/doc/users-guide/users-guide-ipsec.adoc index d560df9c..ac4eae85 100644 --- a/doc/users-guide/users-guide-ipsec.adoc +++ b/doc/users-guide/users-guide-ipsec.adoc @@ -244,12 +244,13 @@ IPsec operations may produce. This can be changed dynamically by the As can be seen, SAs have a large degree of configurability. ==== SA Lifecycle Management -In discussing the lifecycle of an SA, it is useful to refer to the following -state diagram: +In discussing the lifecycle of an SA and the operations it supports, it is +useful to refer to the following sequence diagram for IPsec configuration, SA +management, and IPsec operations: -image::ipsec_fsm.svg[align="center"] +image:ipsec_sa_states.svg[align="center"] -After creation, IPsec services are active for this Security Association. The +After creation, IPsec services are active for this Security Association. The specific APIs that can be used on this SA depends on the IPsec operating mode that has been configured. ----------------------------------------------------------------------- Summary of changes: doc/images/.gitignore | 2 +- doc/images/ipsec_fsm.gv | 32 -------------- doc/images/ipsec_sa_states.msc | 76 ++++++++++++++++++++++++++++++++++ doc/users-guide/Makefile.am | 4 +- doc/users-guide/users-guide-ipsec.adoc | 9 ++-- 5 files changed, 84 insertions(+), 39 deletions(-) delete mode 100644 doc/images/ipsec_fsm.gv create mode 100644 doc/images/ipsec_sa_states.msc hooks/post-receive --

8 years, 1 month

[COMMIT] branch caterpillar created. v1.15.0.0-948-g63fd8863

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, caterpillar has been created at 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive --

8 years, 1 month

[COMMIT] branch devel/caterpillar updated. v1.15.0.0-949-gbbbe6c0e

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, devel/caterpillar has been updated via bbbe6c0ef65c16f6d7d327712f177fbf6740e96f (commit) from 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bbbe6c0ef65c16f6d7d327712f177fbf6740e96f Author: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Date: Thu Nov 16 17:02:08 2017 -0600 linux-dpdk: buffer: remove default q metadata from odp_buffer_hdr_t Scalable queues do not require packet meta data meant for default queues. The meta data is compiled out while using scalable queues. Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com> Reviewed-by: Ola Liljedahl <ola.Liljedahl(a)arm.com> Reviewed-by: Kevin Wang <kevin.wang(a)arm.com> Signed-off-by: Yi He <yi.he(a)linaro.org> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 6dde37b9..c2cfa3d0 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -264,8 +264,6 @@ __LIB__libodp_dpdk_la_SOURCES = \ pool/dpdk.c \ ../linux-generic/odp_queue_if.c \ ../linux-generic/queue/subsystem.c \ - ../linux-generic/queue/generic.c \ - ../linux-generic/queue/scalable.c \ ../linux-generic/odp_rwlock.c \ ../linux-generic/odp_rwlock_recursive.c \ ../linux-generic/pool/subsystem.c \ @@ -347,8 +345,10 @@ endif endif endif if ODP_SCHEDULE_SCALABLE +__LIB__libodp_dpdk_la_SOURCES += ../linux-generic/queue/scalable.c ../linux-generic/queue/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE else +__LIB__libodp_dpdk_la_SOURCES += ../linux-generic/queue/generic.c ../linux-generic/queue/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE endif diff --git a/platform/linux-dpdk/buffer/dpdk.c b/platform/linux-dpdk/buffer/dpdk.c index 22e1123b..9033be50 100644 --- a/platform/linux-dpdk/buffer/dpdk.c +++ b/platform/linux-dpdk/buffer/dpdk.c @@ -36,7 +36,6 @@ static odp_buffer_t buffer_alloc(odp_pool_t pool_hdl) return ODP_BUFFER_INVALID; } - buf_hdl_to_hdr(buffer)->next = NULL; return buffer; } diff --git a/platform/linux-dpdk/include/odp_buffer_internal.h b/platform/linux-dpdk/include/odp_buffer_internal.h index fcb300ab..cc9c7d39 100644 --- a/platform/linux-dpdk/include/odp_buffer_internal.h +++ b/platform/linux-dpdk/include/odp_buffer_internal.h @@ -57,6 +57,7 @@ struct odp_buffer_hdr_t { /* ODP buffer type, not DPDK buf type */ int type; +#ifndef ODP_SCHEDULE_SCALABLE /* Burst counts */ int burst_num; int burst_first; @@ -64,6 +65,10 @@ struct odp_buffer_hdr_t { /* Next buf in a list */ struct odp_buffer_hdr_t *next; + /* Burst table */ + struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; +#endif + /* User context pointer or u64 */ union { uint64_t buf_u64; @@ -77,9 +82,6 @@ struct odp_buffer_hdr_t { /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ odp_event_type_t event_subtype; - /* Burst table */ - struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; - /* Pool handle */ odp_pool_t pool_hdl; diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c index 2391f13d..54f34007 100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@ -189,8 +189,6 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; - pkt_hdr->buf_hdr.next = NULL; - pkt_hdr->input = ODP_PKTIO_INVALID; pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; ----------------------------------------------------------------------- Summary of changes: platform/linux-dpdk/Makefile.am | 4 ++-- platform/linux-dpdk/buffer/dpdk.c | 1 - platform/linux-dpdk/include/odp_buffer_internal.h | 8 +++++--- platform/linux-dpdk/odp_packet.c | 2 -- 4 files changed, 7 insertions(+), 8 deletions(-) hooks/post-receive --

8 years, 1 month

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp