[COMMIT] branch api-next updated. v1.16.0.0-709-g05880400
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 0588040068a50d0d15a641d091fce23214b15594 (commit)
via 82f09d83ab85401f4d8d81c7c843c9b4c9f888f4 (commit)
via 8a3c2a83b81c6f5b9f697681c970593c95141828 (commit)
via 2269d302cdb9356255c9e0e004b170f016ec0e5e (commit)
via cffa4354cf0eb389e3ebb0108c71d4b1620463b7 (commit)
via 27c53bc0cd34582b772dff0b104385e8869caf07 (commit)
via 81ab0809af1b12eb5d65ed1ed6ddddfb0dfce833 (commit)
via 511178e589b1865d93ed0eb3cb0e33e3b18f8027 (commit)
via 73f047f65c214f7dd81c93e9cb54b00576650217 (commit)
via 0d6b4b8b03370a79c5f090a521f89186a821f350 (commit)
via 30762920eaed9ecb1d2e5d68f05c90b349e1b472 (commit)
via 661fa940d2d6c2897f96d22bffdf2c71d6fee2de (commit)
via 11815a8c8efc1c614d334430e24b0d9ebc913f87 (commit)
via 3842b5fa56f460b3c571dc0b5154fa2fa8291c5a (commit)
via b60b7080c27f72a197af8312a531d6c89772aaea (commit)
via 1a92f9cf847bc00d923076c1c0d32240b3e3dc5b (commit)
from da9d347e0bbe337ea86448306432080206f3ef49 (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 0588040068a50d0d15a641d091fce23214b15594
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Dec 12 18:48:00 2017 +0300
linux-gen: ipsec: pass checksum flags to packet parsing code
Pass checksum and protocol parsing flags to packet parsing code.
Checksum checks are not yet implemented by odp_packet_parse, it will be
done later.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 6568924a..4f23eb17 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -198,24 +198,6 @@ static const uint8_t ipsec_padding[255] = {
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
};
-static inline odp_pktio_parser_layer_t parse_layer(odp_ipsec_proto_layer_t l)
-{
- switch (l) {
- case ODP_IPSEC_LAYER_NONE:
- return ODP_PKTIO_PARSER_LAYER_NONE;
- case ODP_IPSEC_LAYER_L2:
- return ODP_PKTIO_PARSER_LAYER_L2;
- case ODP_IPSEC_LAYER_L3:
- return ODP_PKTIO_PARSER_LAYER_L3;
- case ODP_IPSEC_LAYER_L4:
- return ODP_PKTIO_PARSER_LAYER_L4;
- case ODP_IPSEC_LAYER_ALL:
- return ODP_PKTIO_PARSER_LAYER_ALL;
- }
-
- return ODP_PKTIO_PARSER_LAYER_NONE;
-}
-
typedef struct {
void *ip;
unsigned stats_length;
@@ -605,6 +587,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
odp_crypto_packet_op_param_t param;
int rc;
odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_parse_param_t parse_param;
odp_packet_hdr_t *pkt_hdr;
state.ip_offset = odp_packet_l3_offset(pkt);
@@ -770,15 +753,15 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto err;
}
- pkt_hdr = odp_packet_hdr(pkt);
-
- packet_parse_reset(pkt_hdr);
+ 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.chksums = ipsec_config.inbound.chksums;
- packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
- state.ip_offset,
- state.is_ipv4 ?
- _ODP_ETHTYPE_IPV4 :
- _ODP_ETHTYPE_IPV6);
+ /* We do not care about return code here.
+ * Parsing error should not result in IPsec error. */
+ odp_packet_parse(pkt, state.ip_offset, &parse_param);
*pkt_out = pkt;
commit 82f09d83ab85401f4d8d81c7c843c9b4c9f888f4
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 28 16:29:08 2017 +0300
validation: ipsec: add ODP_IPSEC_FRAG_CHECK checks
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index aa46a236..09721673 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -556,8 +556,8 @@ static int ipsec_send_out_one(const ipsec_test_part *part,
memset(¶m, 0, sizeof(param));
param.num_sa = 1;
param.sa = &sa;
- param.num_opt = 0;
- param.opt = NULL;
+ param.num_opt = part->num_opt;
+ param.opt = &part->opt;
if (ODP_IPSEC_OP_MODE_SYNC == suite_context.outbound_op_mode) {
CU_ASSERT_EQUAL(part->out_pkt, odp_ipsec_out(&pkt, 1,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index 9a24dd38..f2ebd388 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -45,6 +45,8 @@ typedef struct {
typedef struct {
const ipsec_test_packet *pkt_in;
odp_bool_t lookup;
+ int num_opt;
+ odp_ipsec_out_opt_t opt;
int out_pkt;
struct {
odp_ipsec_op_status_t status;
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 2ee8a131..4751e6ec 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -500,6 +500,192 @@ static void test_out_ipv4_esp_null_aes_gmac_128(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv4_ah_sha256_frag_check(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
+ param.outbound.mtu = 100;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.mtu = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test2 = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .num_opt = 1,
+ .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, },
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_check_out_one(&test2, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv4_ah_sha256_frag_check_2(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
+ param.outbound.mtu = 100;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.mtu = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test2 = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ odp_ipsec_sa_mtu_update(sa, 256);
+
+ ipsec_check_out_one(&test2, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv4_esp_null_sha256_frag_check(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
+ param.outbound.mtu = 100;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.mtu = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test2 = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .num_opt = 1,
+ .opt = { .mode = ODP_IPSEC_FRAG_DISABLED, },
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_check_out_one(&test2, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv4_esp_null_sha256_frag_check_2(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
+ param.outbound.mtu = 100;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.mtu = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test2 = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ odp_ipsec_sa_mtu_update(sa, 256);
+
+ ipsec_check_out_one(&test2, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_ipv6_ah_sha256(void)
{
odp_ipsec_sa_param_t param;
@@ -792,6 +978,14 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_ah_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_frag_check,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_frag_check_2,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256_frag_check,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256_frag_check_2,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_ah_sha256,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_ah_sha256_tun_ipv4,
commit 8a3c2a83b81c6f5b9f697681c970593c95141828
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 30 15:07:15 2017 +0300
validation: ipsec: fix out inline with NULL pkt_out
pkt_out can be NULL if we expect an error. IPsec outbound inline needs
proper outer header to function. Pass L2 header from inbound packet if
outbound packet is NULL.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 7b39c2c5..aa46a236 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -583,10 +583,18 @@ static int ipsec_send_out_one(const ipsec_test_part *part,
} else {
struct odp_ipsec_out_inline_param_t inline_param;
odp_queue_t queue;
- uint32_t hdr_len = part->out[0].pkt_out->l3_offset;
- uint8_t hdr[hdr_len];
+ uint32_t hdr_len;
+ uint8_t hdr[32];
- memcpy(hdr, part->out[0].pkt_out->data, hdr_len);
+ if (NULL != part->out[0].pkt_out) {
+ hdr_len = part->out[0].pkt_out->l3_offset;
+ CU_ASSERT_FATAL(hdr_len <= sizeof(hdr));
+ memcpy(hdr, part->out[0].pkt_out->data, hdr_len);
+ } else {
+ hdr_len = part->pkt_in->l3_offset;
+ CU_ASSERT_FATAL(hdr_len <= sizeof(hdr));
+ memcpy(hdr, part->pkt_in->data, hdr_len);
+ }
inline_param.pktio = suite_context.pktio;
inline_param.outer_hdr.ptr = hdr;
inline_param.outer_hdr.len = hdr_len;
commit 2269d302cdb9356255c9e0e004b170f016ec0e5e
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 28 16:28:29 2017 +0300
linux-gen: ipsec: support ODP_IPSEC_FRAG_CHECK
Support checking MTU after IPsec transformation.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 43fbafd5..6568924a 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -990,7 +990,8 @@ static int ipsec_out_esp(odp_packet_t *pkt,
ipsec_state_t *state,
ipsec_sa_t *ipsec_sa,
odp_crypto_packet_op_param_t *param,
- odp_ipsec_op_status_t *status)
+ odp_ipsec_op_status_t *status,
+ uint32_t mtu)
{
_odp_esphdr_t esp;
_odp_esptrl_t esptrl;
@@ -1026,6 +1027,11 @@ static int ipsec_out_esp(odp_packet_t *pkt,
udphdr.chksum = 0; /* should be 0 by RFC */
}
+ if (state->ip_tot_len + hdr_len + trl_len > mtu) {
+ status->error.mtu = 1;
+ return -1;
+ }
+
if (ipsec_out_iv(state, ipsec_sa) < 0) {
status->error.alg = 1;
return -1;
@@ -1124,7 +1130,8 @@ static int ipsec_out_ah(odp_packet_t *pkt,
ipsec_state_t *state,
ipsec_sa_t *ipsec_sa,
odp_crypto_packet_op_param_t *param,
- odp_ipsec_op_status_t *status)
+ odp_ipsec_op_status_t *status,
+ uint32_t mtu)
{
_odp_ahhdr_t ah;
unsigned hdr_len = _ODP_AHHDR_LEN + ipsec_sa->esp_iv_len +
@@ -1132,6 +1139,11 @@ static int ipsec_out_ah(odp_packet_t *pkt,
uint16_t ipsec_offset = state->ip_offset + state->ip_hdr_len;
uint8_t proto = _ODP_IPPROTO_AH;
+ if (state->ip_tot_len + hdr_len > mtu) {
+ status->error.mtu = 1;
+ return -1;
+ }
+
memset(&ah, 0, sizeof(ah));
ah.spi = odp_cpu_to_be_32(ipsec_sa->spi);
ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
@@ -1228,7 +1240,7 @@ static void ipsec_out_ah_post(ipsec_state_t *state, odp_packet_t pkt)
static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
odp_ipsec_sa_t sa,
odp_packet_t *pkt_out,
- const odp_ipsec_out_opt_t *opt ODP_UNUSED,
+ const odp_ipsec_out_opt_t *opt,
odp_ipsec_op_status_t *status)
{
ipsec_state_t state;
@@ -1237,6 +1249,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
int rc;
odp_crypto_packet_result_t crypto; /**< Crypto operation result */
odp_packet_hdr_t *pkt_hdr;
+ uint32_t mtu;
state.ip_offset = odp_packet_l3_offset(pkt);
ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != state.ip_offset);
@@ -1247,6 +1260,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ipsec_sa = _odp_ipsec_sa_use(sa);
ODP_ASSERT(NULL != ipsec_sa);
+ if ((opt && opt->mode == ODP_IPSEC_FRAG_CHECK) ||
+ (!opt && ipsec_sa->out.frag_mode == ODP_IPSEC_FRAG_CHECK))
+ mtu = ipsec_sa->out.mtu;
+ else
+ mtu = UINT32_MAX;
+
/* Initialize parameters block */
memset(¶m, 0, sizeof(param));
@@ -1281,9 +1300,9 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
}
if (ODP_IPSEC_ESP == ipsec_sa->proto) {
- rc = ipsec_out_esp(&pkt, &state, ipsec_sa, ¶m, status);
+ rc = ipsec_out_esp(&pkt, &state, ipsec_sa, ¶m, status, mtu);
} else if (ODP_IPSEC_AH == ipsec_sa->proto) {
- rc = ipsec_out_ah(&pkt, &state, ipsec_sa, ¶m, status);
+ rc = ipsec_out_ah(&pkt, &state, ipsec_sa, ¶m, status, mtu);
} else {
status->error.alg = 1;
goto err;
@@ -1401,10 +1420,6 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in,
return in_pkt;
}
-static const odp_ipsec_out_opt_t default_opt = {
- .mode = ODP_IPSEC_FRAG_DISABLED,
-};
-
int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in,
odp_packet_t pkt_out[], int *num_out,
const odp_ipsec_out_param_t *param)
@@ -1433,7 +1448,7 @@ int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in,
ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa);
if (0 == param->num_opt)
- opt = &default_opt;
+ opt = NULL;
else
opt = ¶m->opt[opt_idx];
@@ -1540,7 +1555,7 @@ int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in,
ODP_ASSERT(ODP_IPSEC_SA_INVALID != sa);
if (0 == param->num_opt)
- opt = &default_opt;
+ opt = NULL;
else
opt = ¶m->opt[opt_idx];
@@ -1635,7 +1650,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in,
}
if (0 == param->num_opt)
- opt = &default_opt;
+ opt = NULL;
else
opt = ¶m->opt[opt_idx];
commit cffa4354cf0eb389e3ebb0108c71d4b1620463b7
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 28 15:42:57 2017 +0300
linux-gen: ipsec: store mtu and frag_mode in SA
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 822c9016..c6f241fa 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -156,6 +156,8 @@ struct ipsec_sa_s {
struct {
odp_atomic_u64_t counter; /* for CTR/GCM */
odp_atomic_u32_t seq;
+ odp_ipsec_frag_mode_t frag_mode;
+ uint32_t mtu;
union {
struct {
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 82b3c452..2d632116 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -230,6 +230,8 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
odp_atomic_init_u64(&ipsec_sa->in.antireplay, 0);
} else {
odp_atomic_store_u32(&ipsec_sa->out.seq, 1);
+ ipsec_sa->out.frag_mode = param->outbound.frag_mode;
+ ipsec_sa->out.mtu = param->outbound.mtu;
}
ipsec_sa->dec_ttl = param->opt.dec_ttl;
ipsec_sa->copy_dscp = param->opt.copy_dscp;
@@ -489,10 +491,16 @@ uint64_t odp_ipsec_sa_to_u64(odp_ipsec_sa_t sa)
int odp_ipsec_sa_mtu_update(odp_ipsec_sa_t sa, uint32_t mtu)
{
- (void)sa;
- (void)mtu;
+ ipsec_sa_t *ipsec_sa;
+
+ ipsec_sa = _odp_ipsec_sa_use(sa);
+ ODP_ASSERT(NULL != ipsec_sa);
- return -1;
+ ipsec_sa->out.mtu = mtu;
+
+ _odp_ipsec_sa_unuse(ipsec_sa);
+
+ return 0;
}
ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup)
commit 27c53bc0cd34582b772dff0b104385e8869caf07
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Nov 25 03:56:51 2017 +0300
validation: add UDP-encapsulated IPsec test cases
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 15e1fe14..6262f4cb 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -376,6 +376,69 @@ static void test_in_ipv4_esp_null_sha256_tun_ipv6(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ipv4_esp_udp_null_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.opt.udp_encap = 1;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0_esp_udp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv4_esp_udp_null_sha256_lookup(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.opt.udp_encap = 1;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0_esp_udp_null_sha256_1,
+ .lookup = 1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_ipv4_ah_sha256_noreplay(void)
{
odp_ipsec_sa_param_t param;
@@ -1317,6 +1380,69 @@ static void test_in_ipv6_esp_null_sha256_tun_ipv6(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ipv6_esp_udp_null_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.opt.udp_encap = 1;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_esp_udp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv6_esp_udp_null_sha256_lookup(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.opt.udp_encap = 1;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_esp_udp_null_sha256_1,
+ .lookup = 1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void ipsec_test_capability(void)
{
odp_ipsec_capability_t capa;
@@ -1372,6 +1498,10 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_tun_ipv6,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_udp_null_sha256,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_udp_null_sha256_lookup,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_noreplay,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_replay,
@@ -1410,5 +1540,9 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_esp_null_sha256_tun_ipv6,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_esp_udp_null_sha256,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_esp_udp_null_sha256_lookup,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index f4e71dce..2ee8a131 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -283,6 +283,37 @@ static void test_out_ipv4_esp_aes_cbc_null(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv4_esp_udp_null_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.opt.udp_encap = 1;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0_esp_udp_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_ipv4_esp_aes_cbc_sha256(void)
{
odp_ipsec_sa_param_t param;
@@ -695,6 +726,37 @@ static void test_out_ipv6_esp_null_sha256_tun_ipv6(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv6_esp_udp_null_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.opt.udp_encap = 1;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0_esp_udp_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void ipsec_test_capability(void)
{
odp_ipsec_capability_t capa;
@@ -716,6 +778,8 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256_tun_ipv6,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_udp_null_sha256,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_cbc_null,
ipsec_check_esp_aes_cbc_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_cbc_sha256,
@@ -740,5 +804,7 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_esp_null_sha256_tun_ipv6,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_esp_udp_null_sha256,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 211f349d..a6b8616b 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -517,6 +517,53 @@ static const ODP_UNUSED ipsec_test_packet
},
};
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_udp_null_sha256_1 = {
+ .len = 178,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x11, 0xab, 0xf3, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* UDP encap */
+ 0x11, 0x94, 0x11, 0x94, 0x00, 0x90, 0x00, 0x00,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x01,
+
+ /* ICV */
+ 0xe9, 0x81, 0xcd, 0x65, 0x9b, 0x25, 0x0b, 0x33,
+ 0xe2, 0xf3, 0x83, 0xf1, 0x6d, 0x14, 0xb4, 0x1f,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet
pkt_ipv4_icmp_0_esp_null_sha256_1_bad1 = {
.len = 170,
@@ -1683,4 +1730,56 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = {
},
};
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv6_icmp_0_esp_udp_null_sha256_1 = {
+ .len = 206,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 62,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* UDP encap */
+ 0x11, 0x94, 0x11, 0x94, 0x00, 0x90, 0x00, 0x00,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x3a,
+
+ /* ICV */
+ 0x20, 0xa6, 0x89, 0x7b, 0x0a, 0x52, 0x5b, 0xca,
+ 0x98, 0x56, 0xd1, 0xfe, 0x56, 0xc7, 0xa4, 0x5b,
+ },
+};
+
#endif
commit 81ab0809af1b12eb5d65ed1ed6ddddfb0dfce833
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Nov 25 03:56:08 2017 +0300
linux-gen: packet: add flag for UDP-encapsulated IPsec packets
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h
index 82fc66e5..128e8314 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_types.h
@@ -151,6 +151,7 @@ typedef union {
uint64_t l3_chksum_done:1; /**< L3 checksum validation done */
uint64_t l4_chksum_done:1; /**< L4 checksum validation done */
+ uint64_t ipsec_udp:1; /**< UDP-encapsulated IPsec packet */
};
} _odp_packet_input_flags_t;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index f2130fc4..43fbafd5 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -472,7 +472,7 @@ static int ipsec_in_esp_post(odp_packet_t pkt,
ipsec_padding, esptrl.pad_len) != 0)
return -1;
- if (udp_encap) {
+ if (_ODP_IPPROTO_UDP == state->ip_next_hdr) {
state->ip_hdr_len -= _ODP_UDPHDR_LEN;
state->in.hdr_len += _ODP_UDPHDR_LEN;
}
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 5b5a9827..cf76df72 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -2185,6 +2185,17 @@ static inline void parse_udp(packet_parser_t *prs,
if (odp_unlikely(udplen < sizeof(_odp_udphdr_t)))
prs->error_flags.udp_err = 1;
+ if (odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) == udp->dst_port &&
+ udplen > 4) {
+ uint32_t val;
+
+ memcpy(&val, udp + 1, 4);
+ if (val != 0) {
+ prs->input_flags.ipsec = 1;
+ prs->input_flags.ipsec_udp = 1;
+ }
+ }
+
if (offset)
*offset += sizeof(_odp_udphdr_t);
*parseptr += sizeof(_odp_udphdr_t);
commit 511178e589b1865d93ed0eb3cb0e33e3b18f8027
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Nov 25 03:55:37 2017 +0300
linux-gen: add support for UDP-encapsulated ESP packets
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index b294e7c4..822c9016 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -131,6 +131,7 @@ struct ipsec_sa_s {
unsigned copy_df : 1;
unsigned copy_flabel : 1;
unsigned aes_ctr_iv : 1;
+ unsigned udp_encap : 1;
/* Only for outbound */
unsigned use_counter_iv : 1;
diff --git a/platform/linux-generic/include/protocols/udp.h b/platform/linux-generic/include/protocols/udp.h
index 535aba85..85984c99 100644
--- a/platform/linux-generic/include/protocols/udp.h
+++ b/platform/linux-generic/include/protocols/udp.h
@@ -38,6 +38,8 @@ typedef struct ODP_PACKED {
ODP_STATIC_ASSERT(sizeof(_odp_udphdr_t) == _ODP_UDPHDR_LEN,
"_ODP_UDPHDR_T__SIZE_ERROR");
+#define _ODP_UDP_IPSEC_PORT 4500
+
/**
* @}
*/
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 66342f1b..f2130fc4 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -18,6 +18,7 @@
#include <protocols/eth.h>
#include <protocols/ip.h>
#include <protocols/ipsec.h>
+#include <protocols/udp.h>
#include <string.h>
@@ -378,9 +379,29 @@ static int ipsec_in_esp(odp_packet_t *pkt,
_odp_esphdr_t esp;
uint16_t ipsec_offset;
ipsec_sa_t *ipsec_sa;
+ odp_bool_t udp_encap = false;
ipsec_offset = state->ip_offset + state->ip_hdr_len;
+ if (_ODP_IPPROTO_UDP == state->ip_next_hdr) {
+ _odp_udphdr_t udp;
+ uint16_t ip_data_len = state->ip_tot_len -
+ state->ip_hdr_len;
+
+ odp_packet_copy_to_mem(*pkt, ipsec_offset,
+ _ODP_UDPHDR_LEN, &udp);
+
+ if (udp.dst_port != odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) ||
+ udp.length != odp_cpu_to_be_16(ip_data_len)) {
+ status->error.proto = 1;
+ return -1;
+ }
+
+ ipsec_offset += _ODP_UDPHDR_LEN;
+ state->ip_hdr_len += _ODP_UDPHDR_LEN;
+ udp_encap = true;
+ }
+
if (odp_packet_copy_to_mem(*pkt, ipsec_offset,
sizeof(esp), &esp) < 0) {
status->error.alg = 1;
@@ -396,6 +417,11 @@ static int ipsec_in_esp(odp_packet_t *pkt,
if (status->error.all)
return -1;
+ if (!!ipsec_sa->udp_encap != udp_encap) {
+ status->error.proto = 1;
+ return -1;
+ }
+
if (ipsec_in_iv(*pkt, state, ipsec_sa,
ipsec_offset + _ODP_ESPHDR_LEN) < 0) {
status->error.alg = 1;
@@ -446,6 +472,11 @@ static int ipsec_in_esp_post(odp_packet_t pkt,
ipsec_padding, esptrl.pad_len) != 0)
return -1;
+ if (udp_encap) {
+ state->ip_hdr_len -= _ODP_UDPHDR_LEN;
+ state->in.hdr_len += _ODP_UDPHDR_LEN;
+ }
+
odp_packet_copy_from_mem(pkt, state->ip_next_hdr_offset,
1, &esptrl.next_header);
state->in.trl_len += esptrl.pad_len;
@@ -603,7 +634,8 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
}
/* Check IP header for IPSec protocols and look it up */
- if (_ODP_IPPROTO_ESP == state.ip_next_hdr) {
+ if (_ODP_IPPROTO_ESP == state.ip_next_hdr ||
+ _ODP_IPPROTO_UDP == state.ip_next_hdr) {
rc = ipsec_in_esp(&pkt, &state, &ipsec_sa, sa, ¶m, status);
} else if (_ODP_IPPROTO_AH == state.ip_next_hdr) {
rc = ipsec_in_ah(&pkt, &state, &ipsec_sa, sa, ¶m, status);
@@ -962,6 +994,7 @@ static int ipsec_out_esp(odp_packet_t *pkt,
{
_odp_esphdr_t esp;
_odp_esptrl_t esptrl;
+ _odp_udphdr_t udphdr;
uint32_t encrypt_len;
uint16_t ip_data_len = state->ip_tot_len -
state->ip_hdr_len;
@@ -983,6 +1016,16 @@ static int ipsec_out_esp(odp_packet_t *pkt,
ip_data_len +
ipsec_sa->icv_len;
+ if (ipsec_sa->udp_encap) {
+ hdr_len += _ODP_UDPHDR_LEN;
+ proto = _ODP_IPPROTO_UDP;
+ udphdr.src_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT);
+ udphdr.dst_port = odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT);
+ udphdr.length = odp_cpu_to_be_16(ip_data_len +
+ hdr_len + trl_len);
+ udphdr.chksum = 0; /* should be 0 by RFC */
+ }
+
if (ipsec_out_iv(state, ipsec_sa) < 0) {
status->error.alg = 1;
return -1;
@@ -1030,6 +1073,14 @@ static int ipsec_out_esp(odp_packet_t *pkt,
encrypt_len -
_ODP_ESPTRL_LEN;
+ if (ipsec_sa->udp_encap) {
+ odp_packet_copy_from_mem(*pkt, ipsec_offset, _ODP_UDPHDR_LEN,
+ &udphdr);
+ ipsec_offset += _ODP_UDPHDR_LEN;
+ hdr_len -= _ODP_UDPHDR_LEN;
+ state->ip_hdr_len += _ODP_UDPHDR_LEN;
+ }
+
odp_packet_copy_from_mem(*pkt,
ipsec_offset, _ODP_ESPHDR_LEN,
&esp);
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 812ad0c4..82b3c452 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -235,6 +235,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->copy_dscp = param->opt.copy_dscp;
ipsec_sa->copy_df = param->opt.copy_df;
ipsec_sa->copy_flabel = param->opt.copy_flabel;
+ ipsec_sa->udp_encap = param->opt.udp_encap;
odp_atomic_store_u64(&ipsec_sa->bytes, 0);
odp_atomic_store_u64(&ipsec_sa->packets, 0);
commit 73f047f65c214f7dd81c93e9cb54b00576650217
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Nov 25 02:35:34 2017 +0300
linux-gen: ipsec: simplify seq no handling
There is no point in filling artificial AAD struct for AH just for the
sake of sequence number checking. Instead use AAD just for ESP and
provide separate seq_no field.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 71484467..66342f1b 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -233,6 +233,7 @@ typedef struct {
struct {
uint16_t hdr_len;
uint16_t trl_len;
+ odp_u32be_t seq_no;
} in;
odp_u32be_t ipv4_addr;
uint8_t ipv6_addr[_ODP_IPV6ADDR_LEN];
@@ -247,8 +248,10 @@ typedef struct {
odp_u32be_t ver_tc_flow;
uint8_t hop_limit;
} ah_ipv6;
+ struct {
+ ipsec_aad_t aad;
+ } esp;
};
- ipsec_aad_t aad;
uint8_t iv[IPSEC_MAX_IV_LEN];
} ipsec_state_t;
@@ -409,10 +412,11 @@ static int ipsec_in_esp(odp_packet_t *pkt,
ipsec_sa->icv_len;
param->override_iv_ptr = state->iv;
- state->aad.spi = esp.spi;
- state->aad.seq_no = esp.seq_no;
+ state->esp.aad.spi = esp.spi;
+ 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->aad;
+ param->aad.ptr = (uint8_t *)&state->esp.aad;
param->auth_range.offset = ipsec_offset;
param->auth_range.length = state->ip_tot_len -
@@ -515,10 +519,7 @@ static int ipsec_in_ah(odp_packet_t *pkt,
ipv6hdr->hop_limit = 0;
}
- state->aad.spi = ah.spi;
- state->aad.seq_no = ah.seq_no;
-
- param->aad.ptr = (uint8_t *)&state->aad;
+ state->in.seq_no = odp_be_to_cpu_32(ah.seq_no);
param->auth_range.offset = state->ip_offset;
param->auth_range.length = state->ip_tot_len;
@@ -614,7 +615,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto err;
if (_odp_ipsec_sa_replay_precheck(ipsec_sa,
- odp_be_to_cpu_32(state.aad.seq_no),
+ state.in.seq_no,
status) < 0)
goto err;
@@ -659,7 +660,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto err;
if (_odp_ipsec_sa_replay_update(ipsec_sa,
- odp_be_to_cpu_32(state.aad.seq_no),
+ state.in.seq_no,
status) < 0)
goto err;
@@ -993,10 +994,10 @@ static int ipsec_out_esp(odp_packet_t *pkt,
esp.spi = odp_cpu_to_be_32(ipsec_sa->spi);
esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
- state->aad.spi = esp.spi;
- state->aad.seq_no = esp.seq_no;
+ state->esp.aad.spi = esp.spi;
+ state->esp.aad.seq_no = esp.seq_no;
- param->aad.ptr = (uint8_t *)&state->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;
@@ -1117,11 +1118,6 @@ static int ipsec_out_ah(odp_packet_t *pkt,
ah.ah_len = hdr_len / 4 - 2;
- state->aad.spi = ah.spi;
- state->aad.seq_no = ah.seq_no;
-
- param->aad.ptr = (uint8_t *)&state->aad;
-
/* For GMAC */
if (ipsec_out_iv(state, ipsec_sa) < 0) {
status->error.alg = 1;
commit 0d6b4b8b03370a79c5f090a521f89186a821f350
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 21 21:03:31 2017 +0300
validation: ipsec: add tests for IPv6 functionality
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 5af98112..15e1fe14 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -71,6 +71,37 @@ static void test_in_ipv4_ah_sha256_tun_ipv4(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ipv4_ah_sha256_tun_ipv6(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0_ah_tun_ipv6_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_ipv4_ah_sha256_tun_ipv4_notun(void)
{
odp_ipsec_sa_param_t param;
@@ -314,6 +345,37 @@ static void test_in_ipv4_esp_null_sha256_tun_ipv4(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ipv4_esp_null_sha256_tun_ipv6(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0_esp_tun_ipv6_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_ipv4_ah_sha256_noreplay(void)
{
odp_ipsec_sa_param_t param;
@@ -1071,6 +1133,190 @@ static void test_in_ipv4_esp_null_aes_gmac_128(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ipv6_ah_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv6_ah_sha256_tun_ipv4(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_ah_tun_ipv4_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv6_ah_sha256_tun_ipv6(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_ah_tun_ipv6_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv6_esp_null_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv6_esp_null_sha256_tun_ipv4(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_esp_tun_ipv4_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ipv6_esp_null_sha256_tun_ipv6(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0_esp_tun_ipv6_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void ipsec_test_capability(void)
{
odp_ipsec_capability_t capa;
@@ -1106,6 +1352,8 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv4,
ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv6,
+ ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv4_notun,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256,
@@ -1122,6 +1370,8 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_tun_ipv4,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_tun_ipv6,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_noreplay,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_replay,
@@ -1148,5 +1398,17 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_ah_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_ah_sha256,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_ah_sha256_tun_ipv4,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_ah_sha256_tun_ipv6,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_esp_null_sha256,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_esp_null_sha256_tun_ipv4,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv6_esp_null_sha256_tun_ipv6,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 757b9005..f4e71dce 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -83,6 +83,50 @@ static void test_out_ipv4_ah_sha256_tun_ipv4(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv4_ah_sha256_tun_ipv6(void)
+{
+ uint8_t src[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ };
+ uint8_t dst[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+ };
+ odp_ipsec_tunnel_param_t tunnel = {
+ .type = ODP_IPSEC_TUNNEL_IPV6,
+ .ipv6.src_addr = src,
+ .ipv6.dst_addr = dst,
+ .ipv6.hlimit = 64,
+ };
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv4_icmp_0_ah_tun_ipv6_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_ipv4_esp_null_sha256(void)
{
odp_ipsec_sa_param_t param;
@@ -152,6 +196,51 @@ static void test_out_ipv4_esp_null_sha256_tun_ipv4(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv4_esp_null_sha256_tun_ipv6(void)
+{
+ uint8_t src[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ };
+ uint8_t dst[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+ };
+ odp_ipsec_tunnel_param_t tunnel = {
+ .type = ODP_IPSEC_TUNNEL_IPV6,
+ .ipv6.src_addr = src,
+ .ipv6.dst_addr = dst,
+ .ipv6.hlimit = 64,
+ };
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv4_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out =
+ &pkt_ipv4_icmp_0_esp_tun_ipv6_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_ipv4_esp_aes_cbc_null(void)
{
odp_ipsec_sa_param_t param;
@@ -380,6 +469,232 @@ static void test_out_ipv4_esp_null_aes_gmac_128(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ipv6_ah_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0_ah_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv6_ah_sha256_tun_ipv4(void)
+{
+ uint32_t src = IPV4ADDR(10, 0, 111, 2);
+ uint32_t dst = IPV4ADDR(10, 0, 222, 2);
+ odp_ipsec_tunnel_param_t tunnel = {
+ .type = ODP_IPSEC_TUNNEL_IPV4,
+ .ipv4.src_addr = &src,
+ .ipv4.dst_addr = &dst,
+ .ipv4.ttl = 64,
+ };
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0_ah_tun_ipv4_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv6_ah_sha256_tun_ipv6(void)
+{
+ uint8_t src[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ };
+ uint8_t dst[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+ };
+ odp_ipsec_tunnel_param_t tunnel = {
+ .type = ODP_IPSEC_TUNNEL_IPV6,
+ .ipv6.src_addr = src,
+ .ipv6.dst_addr = dst,
+ .ipv6.hlimit = 64,
+ };
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0_ah_tun_ipv6_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv6_esp_null_sha256(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_ipv6_icmp_0_esp_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv6_esp_null_sha256_tun_ipv4(void)
+{
+ uint32_t src = IPV4ADDR(10, 0, 111, 2);
+ uint32_t dst = IPV4ADDR(10, 0, 222, 2);
+ odp_ipsec_tunnel_param_t tunnel = {
+ .type = ODP_IPSEC_TUNNEL_IPV4,
+ .ipv4.src_addr = &src,
+ .ipv4.dst_addr = &dst,
+ .ipv4.ttl = 64,
+ };
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out =
+ &pkt_ipv6_icmp_0_esp_tun_ipv4_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_out_ipv6_esp_null_sha256_tun_ipv6(void)
+{
+ uint8_t src[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ };
+ uint8_t dst[16] = {
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+ };
+ odp_ipsec_tunnel_param_t tunnel = {
+ .type = ODP_IPSEC_TUNNEL_IPV6,
+ .ipv6.src_addr = &src,
+ .ipv6.dst_addr = &dst,
+ .ipv6.hlimit = 64,
+ };
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_ipv6_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out =
+ &pkt_ipv6_icmp_0_esp_tun_ipv6_null_sha256_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void ipsec_test_capability(void)
{
odp_ipsec_capability_t capa;
@@ -393,10 +708,14 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_tun_ipv4,
ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_tun_ipv6,
+ ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256,
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256_tun_ipv4,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256_tun_ipv6,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_cbc_null,
ipsec_check_esp_aes_cbc_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_cbc_sha256,
@@ -409,5 +728,17 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_ah_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_ah_sha256,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_ah_sha256_tun_ipv4,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_ah_sha256_tun_ipv6,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_esp_null_sha256,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_esp_null_sha256_tun_ipv4,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv6_esp_null_sha256_tun_ipv6,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index c057f776..211f349d 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -204,6 +204,54 @@ static const ODP_UNUSED ipsec_test_packet
},
};
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_ah_tun_ipv6_sha256_1 = {
+ .len = 214,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 54,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x33, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* AH */
+ 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x00, 0x01,
+ 0x2b, 0x45, 0xbe, 0xd2, 0x9c, 0x9c, 0x3e, 0x0d,
+ 0xe0, 0x32, 0xaf, 0xa0, 0x2d, 0x26, 0xe1, 0x91,
+ 0x00, 0x00, 0x00, 0x00,
+
+ /* Inner IP */
+ 0x45, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x01, 0xac, 0x27, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1_bad1 = {
.len = 168,
.l2_offset = 0,
@@ -418,6 +466,57 @@ static const ODP_UNUSED ipsec_test_packet
},
};
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_tun_ipv6_null_sha256_1 = {
+ .len = 210,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 54,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x32, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* Inner IP */
+ 0x45, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x01, 0xac, 0x27, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x04,
+
+ /* ICV */
+ 0x73, 0x8d, 0xf6, 0x9a, 0x26, 0x06, 0x4d, 0xa1,
+ 0x88, 0x37, 0x65, 0xab, 0x0d, 0xe9, 0x95, 0x3b,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet
pkt_ipv4_icmp_0_esp_null_sha256_1_bad1 = {
.len = 170,
@@ -717,6 +816,350 @@ static const ODP_UNUSED ipsec_test_packet
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_ipv6_icmp_0 = {
+ .len = 170,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 62,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x3a, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet pkt_ipv6_icmp_0_ah_sha256_1 = {
+ .len = 202,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 62,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x94, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x33, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* AH */
+ 0x3a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x00, 0x01,
+ 0xd9, 0x14, 0x87, 0x27, 0x20, 0x1a, 0xc2, 0x66,
+ 0xc1, 0xca, 0x99, 0x2b, 0x8a, 0xae, 0x2f, 0x27,
+ 0x00, 0x00, 0x00, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv6_icmp_0_ah_tun_ipv4_sha256_1 = {
+ .len = 218,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x33, 0x18, 0xfb, 0x0a, 0x00, 0x6f, 0x02,
+ 0x0a, 0x00, 0xde, 0x02,
+
+ /* AH */
+ 0x29, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x00, 0x01,
+ 0x7f, 0xde, 0x8a, 0x48, 0xc5, 0xc5, 0xfa, 0x52,
+ 0xb8, 0xf6, 0xc2, 0xe3, 0x8f, 0x10, 0xb2, 0x47,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x3a, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv6_icmp_0_ah_tun_ipv6_sha256_1 = {
+ .len = 242,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 54,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x33, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* AH */
+ 0x29, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x00, 0x01,
+ 0x62, 0x96, 0x2b, 0x40, 0x3e, 0x53, 0x76, 0x4a,
+ 0x4d, 0x7f, 0xf6, 0x22, 0x35, 0x3c, 0x74, 0xe2,
+ 0x00, 0x00, 0x00, 0x00,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x3a, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet pkt_ipv6_icmp_0_esp_null_sha256_1 = {
+ .len = 198,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 62,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x32, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x3a,
+
+ /* ICV */
+ 0x20, 0xa6, 0x89, 0x7b, 0x0a, 0x52, 0x5b, 0xca,
+ 0x98, 0x56, 0xd1, 0xfe, 0x56, 0xc7, 0xa4, 0x5b,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv6_icmp_0_esp_tun_ipv4_null_sha256_1 = {
+ .len = 218,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x32, 0x18, 0xfc, 0x0a, 0x00, 0x6f, 0x02,
+ 0x0a, 0x00, 0xde, 0x02,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x3a, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x29,
+
+ /* ICV */
+ 0xd0, 0x96, 0x6e, 0xda, 0xc5, 0x08, 0xcc, 0x0e,
+ 0xd1, 0x22, 0xa5, 0xed, 0x13, 0x07, 0xd9, 0xcd,
+ },
+};
+
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv6_icmp_0_esp_tun_ipv6_null_sha256_1 = {
+ .len = 238,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 54,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x86, 0xdd,
+
+ /* IP */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x32, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* IP v6 */
+ 0x60, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x40,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x11, 0x43, 0xff, 0xfe, 0x4a, 0xd7, 0x0a,
+ 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+
+ /* Hop-by-Hop */
+ 0x3a, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x29,
+
+ /* ICV */
+ 0xd0, 0x96, 0x6e, 0xda, 0xc5, 0x08, 0xcc, 0x0e,
+ 0xd1, 0x22, 0xa5, 0xed, 0x13, 0x07, 0xd9, 0xcd,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_rfc3602_5 = {
.len = 98,
.l2_offset = 0,
commit 30762920eaed9ecb1d2e5d68f05c90b349e1b472
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 21 20:57:12 2017 +0300
linux-gen: ipsec: implement IPv6 protocol support
Implement support for handling IPv6 packets and IPv6 tunnels.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 06447870..b294e7c4 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -24,6 +24,8 @@ extern "C" {
#include <odp/api/ipsec.h>
#include <odp/api/ticketlock.h>
+#include <protocols/ip.h>
+
/** @ingroup odp_ipsec
* @{
*/
@@ -127,10 +129,12 @@ struct ipsec_sa_s {
unsigned dec_ttl : 1;
unsigned copy_dscp : 1;
unsigned copy_df : 1;
+ unsigned copy_flabel : 1;
unsigned aes_ctr_iv : 1;
/* Only for outbound */
unsigned use_counter_iv : 1;
+ unsigned tun_ipv4 : 1;
/* Only for inbound */
unsigned antireplay : 1;
@@ -140,23 +144,38 @@ struct ipsec_sa_s {
union {
struct {
odp_ipsec_lookup_mode_t lookup_mode;
- odp_u32be_t lookup_dst_ip;
+ odp_ipsec_ip_version_t lookup_ver;
+ union {
+ odp_u32be_t lookup_dst_ipv4;
+ uint8_t lookup_dst_ipv6[_ODP_IPV6ADDR_LEN];
+ };
odp_atomic_u64_t antireplay;
} in;
struct {
- odp_u32be_t tun_src_ip;
- odp_u32be_t tun_dst_ip;
-
- /* 32-bit from which low 16 are used */
- odp_atomic_u32_t tun_hdr_id;
- odp_atomic_u32_t seq;
-
odp_atomic_u64_t counter; /* for CTR/GCM */
+ odp_atomic_u32_t seq;
- uint8_t tun_ttl;
- uint8_t tun_dscp;
- uint8_t tun_df;
+ union {
+ struct {
+ odp_u32be_t src_ip;
+ odp_u32be_t dst_ip;
+
+ /* 32-bit from which low 16 are used */
+ odp_atomic_u32_t hdr_id;
+
+ uint8_t ttl;
+ uint8_t dscp;
+ uint8_t df;
+ } tun_ipv4;
+ struct {
+ uint8_t src_ip[_ODP_IPV6ADDR_LEN];
+ uint8_t dst_ip[_ODP_IPV6ADDR_LEN];
+ uint8_t hlimit;
+ uint8_t dscp;
+ uint32_t flabel;
+ } tun_ipv6;
+ };
} out;
};
};
@@ -171,7 +190,8 @@ typedef struct odp_ipsec_sa_lookup_s {
/** SPI value */
uint32_t spi;
- /* FIXME: IPv4 vs IPv6 */
+ /** IP protocol version */
+ odp_ipsec_ip_version_t ver;
/** IP destination address (NETWORK ENDIAN) */
void *dst_addr;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 2b9de577..71484467 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -125,6 +125,8 @@ static inline int _odp_ipv4_csum(odp_packet_t pkt,
#define _ODP_IPV4HDR_CSUM_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, chksum)
#define _ODP_IPV4HDR_PROTO_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, proto)
+#define _ODP_IPV6HDR_NHDR_OFFSET ODP_OFFSETOF(_odp_ipv6hdr_t, next_hdr)
+#define _ODP_IPV6HDREXT_NHDR_OFFSET ODP_OFFSETOF(_odp_ipv6hdr_ext_t, next_hdr)
/**
* Calculate and fill in IPv4 checksum
@@ -159,11 +161,6 @@ static inline int _odp_ipv4_csum_update(odp_packet_t pkt)
}
#define ipv4_hdr_len(ip) (_ODP_IPV4HDR_IHL((ip)->ver_ihl) * 4)
-static inline
-void ipv4_adjust_len(_odp_ipv4hdr_t *ip, int adj)
-{
- ip->tot_len = odp_cpu_to_be_16(odp_be_to_cpu_16(ip->tot_len) + adj);
-}
static const uint8_t ipsec_padding[255] = {
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -219,13 +216,17 @@ static inline odp_pktio_parser_layer_t parse_layer(odp_ipsec_proto_layer_t l)
}
typedef struct {
- _odp_ipv4hdr_t *ip;
+ void *ip;
unsigned stats_length;
uint16_t ip_offset;
uint16_t ip_hdr_len;
uint16_t ip_tot_len;
+ uint16_t ip_next_hdr_offset;
+ uint8_t ip_next_hdr;
+ unsigned is_ipv4 : 1;
union {
struct {
+ uint32_t ip_flabel;
uint16_t ip_df;
uint8_t ip_tos;
} out_tunnel;
@@ -233,25 +234,76 @@ typedef struct {
uint16_t hdr_len;
uint16_t trl_len;
} in;
+ odp_u32be_t ipv4_addr;
+ uint8_t ipv6_addr[_ODP_IPV6ADDR_LEN];
};
union {
struct {
uint8_t tos;
uint8_t ttl;
- uint16_t frag_offset;
+ odp_u16be_t frag_offset;
} ah_ipv4;
+ struct {
+ odp_u32be_t ver_tc_flow;
+ uint8_t hop_limit;
+ } ah_ipv6;
};
ipsec_aad_t aad;
uint8_t iv[IPSEC_MAX_IV_LEN];
} ipsec_state_t;
-static int ipsec_parse_ipv4(ipsec_state_t *state)
+static int ipsec_parse_ipv4(ipsec_state_t *state, odp_packet_t pkt)
{
- if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(state->ip->frag_offset)))
+ _odp_ipv4hdr_t ipv4hdr;
+
+ odp_packet_copy_to_mem(pkt, state->ip_offset,
+ _ODP_IPV4HDR_LEN, &ipv4hdr);
+
+ if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ipv4hdr.frag_offset)))
return -1;
- state->ip_hdr_len = ipv4_hdr_len(state->ip);
- state->ip_tot_len = odp_be_to_cpu_16(state->ip->tot_len);
+ state->ip_hdr_len = ipv4_hdr_len(&ipv4hdr);
+ state->ip_tot_len = odp_be_to_cpu_16(ipv4hdr.tot_len);
+ state->ip_next_hdr = ipv4hdr.proto;
+ state->ip_next_hdr_offset = state->ip_offset +
+ _ODP_IPV4HDR_PROTO_OFFSET;
+ state->ipv4_addr = ipv4hdr.dst_addr;
+
+ return 0;
+}
+
+static int ipsec_parse_ipv6(ipsec_state_t *state, odp_packet_t pkt)
+{
+ _odp_ipv6hdr_t ipv6hdr;
+ _odp_ipv6hdr_ext_t ipv6hdrext;
+
+ odp_packet_copy_to_mem(pkt, state->ip_offset,
+ _ODP_IPV6HDR_LEN, &ipv6hdr);
+
+ state->ip_hdr_len = _ODP_IPV6HDR_LEN;
+ state->ip_next_hdr = ipv6hdr.next_hdr;
+ state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV6HDR_NHDR_OFFSET;
+ /* FIXME: Jumbo frames */
+ state->ip_tot_len = odp_be_to_cpu_16(ipv6hdr.payload_len) +
+ _ODP_IPV6HDR_LEN;
+ memcpy(state->ipv6_addr, &ipv6hdr.dst_addr, _ODP_IPV6ADDR_LEN);
+
+ while (state->ip_next_hdr == _ODP_IPPROTO_HOPOPTS ||
+ state->ip_next_hdr == _ODP_IPPROTO_DEST ||
+ state->ip_next_hdr == _ODP_IPPROTO_ROUTE) {
+ odp_packet_copy_to_mem(pkt,
+ state->ip_offset + state->ip_hdr_len,
+ sizeof(ipv6hdrext),
+ &ipv6hdrext);
+ state->ip_next_hdr = ipv6hdrext.next_hdr;
+ state->ip_next_hdr_offset = state->ip_offset +
+ state->ip_hdr_len +
+ _ODP_IPV6HDREXT_NHDR_OFFSET;
+ state->ip_hdr_len += (ipv6hdrext.ext_len + 1) * 8;
+ }
+
+ if (_ODP_IPPROTO_FRAG == state->ip_next_hdr)
+ return -1;
return 0;
}
@@ -259,6 +311,7 @@ static int ipsec_parse_ipv4(ipsec_state_t *state)
static inline ipsec_sa_t *ipsec_get_sa(odp_ipsec_sa_t sa,
odp_ipsec_protocol_t proto,
uint32_t spi,
+ odp_ipsec_ip_version_t ver,
void *dst_addr,
odp_ipsec_op_status_t *status)
{
@@ -269,6 +322,7 @@ static inline ipsec_sa_t *ipsec_get_sa(odp_ipsec_sa_t sa,
lookup.proto = proto;
lookup.spi = spi;
+ lookup.ver = ver;
lookup.dst_addr = dst_addr;
ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
@@ -332,7 +386,9 @@ static int ipsec_in_esp(odp_packet_t *pkt,
ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_ESP,
odp_be_to_cpu_32(esp.spi),
- &state->ip->dst_addr, status);
+ state->is_ipv4 ? ODP_IPSEC_IPV4 :
+ ODP_IPSEC_IPV6,
+ &state->ipv4_addr, status);
*_ipsec_sa = ipsec_sa;
if (status->error.all)
return -1;
@@ -386,8 +442,10 @@ static int ipsec_in_esp_post(odp_packet_t pkt,
ipsec_padding, esptrl.pad_len) != 0)
return -1;
- state->ip->proto = esptrl.next_header;
+ odp_packet_copy_from_mem(pkt, state->ip_next_hdr_offset,
+ 1, &esptrl.next_header);
state->in.trl_len += esptrl.pad_len;
+ state->ip_next_hdr = esptrl.next_header;
return 0;
}
@@ -413,7 +471,9 @@ static int ipsec_in_ah(odp_packet_t *pkt,
ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_AH,
odp_be_to_cpu_32(ah.spi),
- &state->ip->dst_addr, status);
+ state->is_ipv4 ? ODP_IPSEC_IPV4 :
+ ODP_IPSEC_IPV6,
+ &state->ipv4_addr, status);
*_ipsec_sa = ipsec_sa;
if (status->error.all)
return -1;
@@ -429,19 +489,31 @@ static int ipsec_in_ah(odp_packet_t *pkt,
state->in.hdr_len = (ah.ah_len + 2) * 4;
state->in.trl_len = 0;
- /* Save everything to context */
- state->ah_ipv4.tos = state->ip->tos;
- state->ah_ipv4.frag_offset = state->ip->frag_offset;
- state->ah_ipv4.ttl = state->ip->ttl;
+ if (state->is_ipv4) {
+ _odp_ipv4hdr_t *ipv4hdr = state->ip;
+
+ /* Save everything to context */
+ state->ah_ipv4.tos = ipv4hdr->tos;
+ state->ah_ipv4.frag_offset = ipv4hdr->frag_offset;
+ state->ah_ipv4.ttl = ipv4hdr->ttl;
+
+ /* FIXME: zero copy of header, passing it to crypto! */
+ /*
+ * If authenticating, zero the mutable fields build the request
+ */
+ ipv4hdr->chksum = 0;
+ ipv4hdr->tos = 0;
+ ipv4hdr->frag_offset = 0;
+ ipv4hdr->ttl = 0;
+ } else {
+ _odp_ipv6hdr_t *ipv6hdr = state->ip;
- /* FIXME: zero copy of header, passing it to crypto! */
- /*
- * If authenticating, zero the mutable fields build the request
- */
- state->ip->chksum = 0;
- state->ip->tos = 0;
- state->ip->frag_offset = 0;
- state->ip->ttl = 0;
+ state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow;
+ state->ah_ipv6.hop_limit = ipv6hdr->hop_limit;
+ ipv6hdr->ver_tc_flow =
+ odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT);
+ ipv6hdr->hop_limit = 0;
+ }
state->aad.spi = ah.spi;
state->aad.seq_no = ah.seq_no;
@@ -470,12 +542,23 @@ static int ipsec_in_ah_post(odp_packet_t pkt,
sizeof(ah), &ah) < 0)
return -1;
- state->ip->proto = ah.next_header;
+ odp_packet_copy_from_mem(pkt, state->ip_next_hdr_offset,
+ 1, &ah.next_header);
/* Restore mutable fields */
- state->ip->ttl = state->ah_ipv4.ttl;
- state->ip->tos = state->ah_ipv4.tos;
- state->ip->frag_offset = state->ah_ipv4.frag_offset;
+ if (state->is_ipv4) {
+ _odp_ipv4hdr_t *ipv4hdr = state->ip;
+
+ ipv4hdr->ttl = state->ah_ipv4.ttl;
+ ipv4hdr->tos = state->ah_ipv4.tos;
+ ipv4hdr->frag_offset = state->ah_ipv4.frag_offset;
+ } else {
+ _odp_ipv6hdr_t *ipv6hdr = odp_packet_l3_ptr(pkt, NULL);
+
+ ipv6hdr->ver_tc_flow = state->ah_ipv6.ver_tc_flow;
+ ipv6hdr->hop_limit = state->ah_ipv6.hop_limit;
+ }
+ state->ip_next_hdr = ah.next_header;
return 0;
}
@@ -501,7 +584,17 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
/* Initialize parameters block */
memset(¶m, 0, sizeof(param));
- rc = ipsec_parse_ipv4(&state);
+ /*
+ * FIXME: maybe use packet flag as below ???
+ * This adds requirement that input packets contain not only valid
+ * l3/l4 offsets, but also valid packet flags
+ * state.is_ipv4 = odp_packet_has_ipv4(pkt);
+ */
+ state.is_ipv4 = (((uint8_t *)state.ip)[0] >> 4) == 0x4;
+ if (state.is_ipv4)
+ rc = ipsec_parse_ipv4(&state, pkt);
+ else
+ rc = ipsec_parse_ipv6(&state, pkt);
if (rc < 0 ||
state.ip_tot_len + state.ip_offset > odp_packet_len(pkt)) {
status->error.alg = 1;
@@ -509,9 +602,9 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
}
/* Check IP header for IPSec protocols and look it up */
- if (_ODP_IPPROTO_ESP == state.ip->proto) {
+ if (_ODP_IPPROTO_ESP == state.ip_next_hdr) {
rc = ipsec_in_esp(&pkt, &state, &ipsec_sa, sa, ¶m, status);
- } else if (_ODP_IPPROTO_AH == state.ip->proto) {
+ } else if (_ODP_IPPROTO_AH == state.ip_next_hdr) {
rc = ipsec_in_ah(&pkt, &state, &ipsec_sa, sa, ¶m, status);
} else {
status->error.proto = 1;
@@ -587,6 +680,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
status->error.alg = 1;
goto err;
}
+ state.ip_tot_len -= state.in.trl_len;
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
/* We have a tunneled IPv4 packet, strip outer and IPsec
@@ -600,11 +694,14 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
status->error.alg = 1;
goto err;
}
-
- if (odp_packet_len(pkt) > sizeof(*state.ip)) {
- state.ip = odp_packet_l3_ptr(pkt, NULL);
- state.ip->ttl -= ipsec_sa->dec_ttl;
- _odp_ipv4_csum_update(pkt);
+ state.ip_tot_len -= state.ip_hdr_len + state.in.hdr_len;
+ if (_ODP_IPPROTO_IPIP == state.ip_next_hdr) {
+ state.is_ipv4 = 1;
+ } else if (_ODP_IPPROTO_IPV6 == state.ip_next_hdr) {
+ state.is_ipv4 = 0;
+ } else {
+ status->error.proto = 1;
+ goto err;
}
} else {
odp_packet_move_data(pkt, state.in.hdr_len, 0,
@@ -614,13 +711,30 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
status->error.alg = 1;
goto err;
}
+ state.ip_tot_len -= state.in.hdr_len;
+ }
- if (odp_packet_len(pkt) > sizeof(*state.ip)) {
- state.ip = odp_packet_l3_ptr(pkt, NULL);
- ipv4_adjust_len(state.ip,
- -(state.in.hdr_len + state.in.trl_len));
- _odp_ipv4_csum_update(pkt);
- }
+ /* Finalize the IPv4 header */
+ if (state.is_ipv4 && odp_packet_len(pkt) > _ODP_IPV4HDR_LEN) {
+ _odp_ipv4hdr_t *ipv4hdr = odp_packet_l3_ptr(pkt, NULL);
+
+ if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode)
+ ipv4hdr->tot_len = odp_cpu_to_be_16(state.ip_tot_len);
+ else
+ ipv4hdr->ttl -= ipsec_sa->dec_ttl;
+ _odp_ipv4_csum_update(pkt);
+ } else if (!state.is_ipv4 && odp_packet_len(pkt) > _ODP_IPV6HDR_LEN) {
+ _odp_ipv6hdr_t *ipv6hdr = odp_packet_l3_ptr(pkt, NULL);
+
+ if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode)
+ ipv6hdr->payload_len =
+ odp_cpu_to_be_16(state.ip_tot_len -
+ _ODP_IPV6HDR_LEN);
+ else
+ ipv6hdr->hop_limit -= ipsec_sa->dec_ttl;
+ } else {
+ status->error.proto = 1;
+ goto err;
}
pkt_hdr = odp_packet_hdr(pkt);
@@ -628,7 +742,10 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
packet_parse_reset(pkt_hdr);
packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
- state.ip_offset, _ODP_ETHTYPE_IPV4);
+ state.ip_offset,
+ state.is_ipv4 ?
+ _ODP_ETHTYPE_IPV4 :
+ _ODP_ETHTYPE_IPV6);
*pkt_out = pkt;
@@ -662,6 +779,24 @@ static int ipsec_out_tunnel_parse_ipv4(ipsec_state_t *state,
ipv4hdr->ttl -= ipsec_sa->dec_ttl;
state->out_tunnel.ip_tos = ipv4hdr->tos;
state->out_tunnel.ip_df = _ODP_IPV4HDR_FLAGS_DONT_FRAG(flags);
+ state->out_tunnel.ip_flabel = 0;
+
+ return 0;
+}
+
+static int ipsec_out_tunnel_parse_ipv6(ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa)
+{
+ _odp_ipv6hdr_t *ipv6hdr = state->ip;
+
+ ipv6hdr->hop_limit -= ipsec_sa->dec_ttl;
+ state->out_tunnel.ip_tos = (ipv6hdr->ver_tc_flow &
+ _ODP_IPV6HDR_TC_MASK) >>
+ _ODP_IPV6HDR_TC_SHIFT;
+ state->out_tunnel.ip_df = 0;
+ state->out_tunnel.ip_flabel = (ipv6hdr->ver_tc_flow &
+ _ODP_IPV6HDR_FLOW_LABEL_MASK) >>
+ _ODP_IPV6HDR_FLOW_LABEL_SHIFT;
return 0;
}
@@ -679,26 +814,25 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt,
else
out_ip.tos = (state->out_tunnel.ip_tos &
~_ODP_IP_TOS_DSCP_MASK) |
- (ipsec_sa->out.tun_dscp <<
+ (ipsec_sa->out.tun_ipv4.dscp <<
_ODP_IP_TOS_DSCP_SHIFT);
state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset;
state->ip_tot_len += _ODP_IPV4HDR_LEN;
out_ip.tot_len = odp_cpu_to_be_16(state->ip_tot_len);
/* No need to convert to BE: ID just should not be duplicated */
- out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id,
+ out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_ipv4.hdr_id,
1);
if (ipsec_sa->copy_df)
flags = state->out_tunnel.ip_df;
else
- flags = ((uint16_t)ipsec_sa->out.tun_df) << 14;
+ flags = ((uint16_t)ipsec_sa->out.tun_ipv4.df) << 14;
out_ip.frag_offset = odp_cpu_to_be_16(flags);
- out_ip.ttl = ipsec_sa->out.tun_ttl;
- out_ip.proto = _ODP_IPPROTO_IPIP;
+ out_ip.ttl = ipsec_sa->out.tun_ipv4.ttl;
/* Will be filled later by packet checksum update */
out_ip.chksum = 0;
- out_ip.src_addr = ipsec_sa->out.tun_src_ip;
- out_ip.dst_addr = ipsec_sa->out.tun_dst_ip;
+ out_ip.src_addr = ipsec_sa->out.tun_ipv4.src_ip;
+ out_ip.dst_addr = ipsec_sa->out.tun_ipv4.dst_ip;
if (odp_packet_extend_head(pkt, _ODP_IPV4HDR_LEN,
NULL, NULL) < 0)
@@ -713,6 +847,70 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt,
state->ip = odp_packet_l3_ptr(*pkt, NULL);
state->ip_hdr_len = _ODP_IPV4HDR_LEN;
+ if (state->is_ipv4)
+ state->ip_next_hdr = _ODP_IPPROTO_IPIP;
+ else
+ state->ip_next_hdr = _ODP_IPPROTO_IPV6;
+ state->ip_next_hdr_offset = state->ip_offset +
+ _ODP_IPV4HDR_PROTO_OFFSET;
+
+ state->is_ipv4 = 1;
+
+ return 0;
+}
+
+static int ipsec_out_tunnel_ipv6(odp_packet_t *pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa)
+{
+ _odp_ipv6hdr_t out_ip;
+ uint32_t ver;
+
+ ver = 6 << _ODP_IPV6HDR_VERSION_SHIFT;
+ if (ipsec_sa->copy_dscp)
+ ver |= state->out_tunnel.ip_tos << _ODP_IPV6HDR_TC_SHIFT;
+ else
+ ver |= ((state->out_tunnel.ip_tos &
+ ~_ODP_IP_TOS_DSCP_MASK) |
+ (ipsec_sa->out.tun_ipv6.dscp <<
+ _ODP_IP_TOS_DSCP_SHIFT)) <<
+ _ODP_IPV6HDR_TC_SHIFT;
+ if (ipsec_sa->copy_flabel)
+ ver |= state->out_tunnel.ip_flabel;
+ else
+ ver |= ipsec_sa->out.tun_ipv6.flabel;
+ out_ip.ver_tc_flow = odp_cpu_to_be_32(ver);
+
+ state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset;
+ out_ip.payload_len = odp_cpu_to_be_16(state->ip_tot_len);
+ state->ip_tot_len += _ODP_IPV6HDR_LEN;
+
+ out_ip.hop_limit = ipsec_sa->out.tun_ipv6.hlimit;
+ memcpy(&out_ip.src_addr, ipsec_sa->out.tun_ipv6.src_ip,
+ _ODP_IPV6ADDR_LEN);
+ memcpy(&out_ip.dst_addr, ipsec_sa->out.tun_ipv6.dst_ip,
+ _ODP_IPV6ADDR_LEN);
+
+ if (odp_packet_extend_head(pkt, _ODP_IPV6HDR_LEN,
+ NULL, NULL) < 0)
+ return -1;
+
+ odp_packet_move_data(*pkt, 0, _ODP_IPV6HDR_LEN, state->ip_offset);
+
+ odp_packet_copy_from_mem(*pkt, state->ip_offset,
+ sizeof(out_ip), &out_ip);
+
+ odp_packet_l4_offset_set(*pkt, state->ip_offset + _ODP_IPV6HDR_LEN);
+
+ state->ip = odp_packet_l3_ptr(*pkt, NULL);
+ state->ip_hdr_len = _ODP_IPV6HDR_LEN;
+ if (state->is_ipv4)
+ state->ip_next_hdr = _ODP_IPPROTO_IPIP;
+ else
+ state->ip_next_hdr = _ODP_IPPROTO_IPV6;
+ state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV6HDR_NHDR_OFFSET;
+
+ state->is_ipv4 = 0;
return 0;
}
@@ -770,6 +968,7 @@ static int ipsec_out_esp(odp_packet_t *pkt,
uint16_t ipsec_offset = state->ip_offset + state->ip_hdr_len;
unsigned hdr_len;
unsigned trl_len;
+ uint8_t proto = _ODP_IPPROTO_ESP;
/* ESP trailer should be 32-bit right aligned */
if (pad_block < 4)
@@ -790,6 +989,32 @@ static int ipsec_out_esp(odp_packet_t *pkt,
param->override_iv_ptr = state->iv;
+ memset(&esp, 0, sizeof(esp));
+ esp.spi = odp_cpu_to_be_32(ipsec_sa->spi);
+ esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
+
+ state->aad.spi = esp.spi;
+ state->aad.seq_no = esp.seq_no;
+
+ param->aad.ptr = (uint8_t *)&state->aad;
+
+ memset(&esptrl, 0, sizeof(esptrl));
+ esptrl.pad_len = encrypt_len - ip_data_len - _ODP_ESPTRL_LEN;
+ esptrl.next_header = state->ip_next_hdr;
+
+ odp_packet_copy_from_mem(*pkt, state->ip_next_hdr_offset, 1, &proto);
+ state->ip_tot_len += hdr_len + trl_len;
+ if (state->is_ipv4) {
+ _odp_ipv4hdr_t *ipv4hdr = state->ip;
+
+ ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len);
+ } else {
+ _odp_ipv6hdr_t *ipv6hdr = state->ip;
+
+ ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len -
+ _ODP_IPV6HDR_LEN);
+ }
+
if (odp_packet_extend_tail(pkt, trl_len, NULL, NULL) < 0 ||
odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) {
status->error.alg = 1;
@@ -798,32 +1023,12 @@ static int ipsec_out_esp(odp_packet_t *pkt,
odp_packet_move_data(*pkt, 0, hdr_len, ipsec_offset);
- state->ip = odp_packet_l3_ptr(*pkt, NULL);
-
- /* Set IPv4 length before authentication */
- ipv4_adjust_len(state->ip, hdr_len + trl_len);
- state->ip_tot_len += hdr_len + trl_len;
-
uint32_t esptrl_offset = state->ip_offset +
state->ip_hdr_len +
hdr_len +
encrypt_len -
_ODP_ESPTRL_LEN;
- memset(&esp, 0, sizeof(esp));
- esp.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
-
- state->aad.spi = esp.spi;
- state->aad.seq_no = esp.seq_no;
-
- param->aad.ptr = (uint8_t *)&state->aad;
-
- memset(&esptrl, 0, sizeof(esptrl));
- esptrl.pad_len = encrypt_len - ip_data_len - _ODP_ESPTRL_LEN;
- esptrl.next_header = state->ip->proto;
- state->ip->proto = _ODP_IPPROTO_ESP;
-
odp_packet_copy_from_mem(*pkt,
ipsec_offset, _ODP_ESPHDR_LEN,
&esp);
@@ -857,6 +1062,12 @@ static int ipsec_out_esp(odp_packet_t *pkt,
return 0;
}
+static void ipsec_out_esp_post(ipsec_state_t *state, odp_packet_t pkt)
+{
+ if (state->is_ipv4)
+ _odp_ipv4_csum_update(pkt);
+}
+
static int ipsec_out_ah(odp_packet_t *pkt,
ipsec_state_t *state,
ipsec_sa_t *ipsec_sa,
@@ -867,31 +1078,44 @@ static int ipsec_out_ah(odp_packet_t *pkt,
unsigned hdr_len = _ODP_AHHDR_LEN + ipsec_sa->esp_iv_len +
ipsec_sa->icv_len;
uint16_t ipsec_offset = state->ip_offset + state->ip_hdr_len;
-
- /* Save IPv4 stuff */
- state->ah_ipv4.tos = state->ip->tos;
- state->ah_ipv4.frag_offset = state->ip->frag_offset;
- state->ah_ipv4.ttl = state->ip->ttl;
-
- if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) {
- status->error.alg = 1;
- return -1;
- }
-
- odp_packet_move_data(*pkt, 0, hdr_len, ipsec_offset);
-
- state->ip = odp_packet_l3_ptr(*pkt, NULL);
-
- /* Set IPv4 length before authentication */
- ipv4_adjust_len(state->ip, hdr_len);
- state->ip_tot_len += hdr_len;
+ uint8_t proto = _ODP_IPPROTO_AH;
memset(&ah, 0, sizeof(ah));
ah.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- ah.ah_len = 1 + (ipsec_sa->esp_iv_len + ipsec_sa->icv_len) / 4;
ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
- ah.next_header = state->ip->proto;
- state->ip->proto = _ODP_IPPROTO_AH;
+ ah.next_header = state->ip_next_hdr;
+
+ odp_packet_copy_from_mem(*pkt, state->ip_next_hdr_offset, 1, &proto);
+ /* Save IP stuff */
+ if (state->is_ipv4) {
+ _odp_ipv4hdr_t *ipv4hdr = state->ip;
+
+ state->ah_ipv4.tos = ipv4hdr->tos;
+ state->ah_ipv4.frag_offset = ipv4hdr->frag_offset;
+ state->ah_ipv4.ttl = ipv4hdr->ttl;
+ ipv4hdr->chksum = 0;
+ ipv4hdr->tos = 0;
+ ipv4hdr->frag_offset = 0;
+ ipv4hdr->ttl = 0;
+ hdr_len = IPSEC_PAD_LEN(hdr_len, 4);
+ state->ip_tot_len += hdr_len;
+ ipv4hdr->tot_len = odp_cpu_to_be_16(state->ip_tot_len);
+ } else {
+ _odp_ipv6hdr_t *ipv6hdr = state->ip;
+
+ state->ah_ipv6.ver_tc_flow = ipv6hdr->ver_tc_flow;
+ state->ah_ipv6.hop_limit = ipv6hdr->hop_limit;
+ ipv6hdr->ver_tc_flow =
+ odp_cpu_to_be_32(6 << _ODP_IPV6HDR_VERSION_SHIFT);
+ ipv6hdr->hop_limit = 0;
+
+ hdr_len = IPSEC_PAD_LEN(hdr_len, 8);
+ state->ip_tot_len += hdr_len;
+ ipv6hdr->payload_len = odp_cpu_to_be_16(state->ip_tot_len -
+ _ODP_IPV6HDR_LEN);
+ }
+
+ ah.ah_len = hdr_len / 4 - 2;
state->aad.spi = ah.spi;
state->aad.seq_no = ah.seq_no;
@@ -906,6 +1130,13 @@ static int ipsec_out_ah(odp_packet_t *pkt,
param->override_iv_ptr = state->iv;
+ if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) {
+ status->error.alg = 1;
+ return -1;
+ }
+
+ odp_packet_move_data(*pkt, 0, hdr_len, ipsec_offset);
+
odp_packet_copy_from_mem(*pkt,
ipsec_offset, _ODP_AHHDR_LEN,
&ah);
@@ -916,12 +1147,8 @@ static int ipsec_out_ah(odp_packet_t *pkt,
_odp_packet_set_data(*pkt,
ipsec_offset + _ODP_AHHDR_LEN +
ipsec_sa->esp_iv_len,
- 0, ipsec_sa->icv_len);
-
- state->ip->chksum = 0;
- state->ip->tos = 0;
- state->ip->frag_offset = 0;
- state->ip->ttl = 0;
+ 0,
+ hdr_len - _ODP_AHHDR_LEN - ipsec_sa->esp_iv_len);
param->auth_range.offset = state->ip_offset;
param->auth_range.length = state->ip_tot_len;
@@ -933,11 +1160,22 @@ static int ipsec_out_ah(odp_packet_t *pkt,
return 0;
}
-static void ipsec_out_ah_post(ipsec_state_t *state)
+static void ipsec_out_ah_post(ipsec_state_t *state, odp_packet_t pkt)
{
- state->ip->ttl = state->ah_ipv4.ttl;
- state->ip->tos = state->ah_ipv4.tos;
- state->ip->frag_offset = state->ah_ipv4.frag_offset;
+ if (state->is_ipv4) {
+ _odp_ipv4hdr_t *ipv4hdr = odp_packet_l3_ptr(pkt, NULL);
+
+ ipv4hdr->ttl = state->ah_ipv4.ttl;
+ ipv4hdr->tos = state->ah_ipv4.tos;
+ ipv4hdr->frag_offset = state->ah_ipv4.frag_offset;
+
+ _odp_ipv4_csum_update(pkt);
+ } else {
+ _odp_ipv6hdr_t *ipv6hdr = odp_packet_l3_ptr(pkt, NULL);
+
+ ipv6hdr->ver_tc_flow = state->ah_ipv6.ver_tc_flow;
+ ipv6hdr->hop_limit = state->ah_ipv6.hop_limit;
+ }
}
static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
@@ -965,18 +1203,30 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
/* Initialize parameters block */
memset(¶m, 0, sizeof(param));
+ state.is_ipv4 = (((uint8_t *)state.ip)[0] >> 4) == 0x4;
+
if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) {
- rc = ipsec_parse_ipv4(&state);
+ if (state.is_ipv4)
+ rc = ipsec_parse_ipv4(&state, pkt);
+ else
+ rc = ipsec_parse_ipv6(&state, pkt);
+
if (state.ip_tot_len + state.ip_offset != odp_packet_len(pkt))
rc = -1;
} else {
- rc = ipsec_out_tunnel_parse_ipv4(&state, ipsec_sa);
+ if (state.is_ipv4)
+ rc = ipsec_out_tunnel_parse_ipv4(&state, ipsec_sa);
+ else
+ rc = ipsec_out_tunnel_parse_ipv6(&state, ipsec_sa);
if (rc < 0) {
status->error.alg = 1;
goto err;
}
- rc = ipsec_out_tunnel_ipv4(&pkt, &state, ipsec_sa);
+ if (ipsec_sa->tun_ipv4)
+ rc = ipsec_out_tunnel_ipv4(&pkt, &state, ipsec_sa);
+ else
+ rc = ipsec_out_tunnel_ipv6(&pkt, &state, ipsec_sa);
}
if (rc < 0) {
status->error.alg = 1;
@@ -1033,8 +1283,10 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
}
/* Finalize the IPv4 header */
- if (ODP_IPSEC_AH == ipsec_sa->proto)
- ipsec_out_ah_post(&state);
+ if (ODP_IPSEC_ESP == ipsec_sa->proto)
+ ipsec_out_esp_post(&state, pkt);
+ else if (ODP_IPSEC_AH == ipsec_sa->proto)
+ ipsec_out_ah_post(&state, pkt);
_odp_ipv4_csum_update(pkt);
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 0287d6f7..812ad0c4 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -211,10 +211,18 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->flags = 0;
if (ODP_IPSEC_DIR_INBOUND == param->dir) {
ipsec_sa->in.lookup_mode = param->inbound.lookup_mode;
- if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode)
- memcpy(&ipsec_sa->in.lookup_dst_ip,
- param->inbound.lookup_param.dst_addr,
- sizeof(ipsec_sa->in.lookup_dst_ip));
+ if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode) {
+ ipsec_sa->in.lookup_ver =
+ param->inbound.lookup_param.ip_version;
+ if (ODP_IPSEC_IPV4 == ipsec_sa->in.lookup_ver)
+ memcpy(&ipsec_sa->in.lookup_dst_ipv4,
+ param->inbound.lookup_param.dst_addr,
+ sizeof(ipsec_sa->in.lookup_dst_ipv4));
+ else
+ memcpy(&ipsec_sa->in.lookup_dst_ipv6,
+ param->inbound.lookup_param.dst_addr,
+ sizeof(ipsec_sa->in.lookup_dst_ipv6));
+ }
if (param->inbound.antireplay_ws > IPSEC_ANTIREPLAY_WS)
return ODP_IPSEC_SA_INVALID;
@@ -226,6 +234,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->dec_ttl = param->opt.dec_ttl;
ipsec_sa->copy_dscp = param->opt.copy_dscp;
ipsec_sa->copy_df = param->opt.copy_df;
+ ipsec_sa->copy_flabel = param->opt.copy_flabel;
odp_atomic_store_u64(&ipsec_sa->bytes, 0);
odp_atomic_store_u64(&ipsec_sa->packets, 0);
@@ -236,19 +245,36 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode &&
ODP_IPSEC_DIR_OUTBOUND == param->dir) {
- if (param->outbound.tunnel.type != ODP_IPSEC_TUNNEL_IPV4)
- goto error;
-
- memcpy(&ipsec_sa->out.tun_src_ip,
- param->outbound.tunnel.ipv4.src_addr,
- sizeof(ipsec_sa->out.tun_src_ip));
- memcpy(&ipsec_sa->out.tun_dst_ip,
- param->outbound.tunnel.ipv4.dst_addr,
- sizeof(ipsec_sa->out.tun_dst_ip));
- odp_atomic_init_u32(&ipsec_sa->out.tun_hdr_id, 0);
- ipsec_sa->out.tun_ttl = param->outbound.tunnel.ipv4.ttl;
- ipsec_sa->out.tun_dscp = param->outbound.tunnel.ipv4.dscp;
- ipsec_sa->out.tun_df = param->outbound.tunnel.ipv4.df;
+ if (ODP_IPSEC_TUNNEL_IPV4 == param->outbound.tunnel.type) {
+ ipsec_sa->tun_ipv4 = 1;
+ memcpy(&ipsec_sa->out.tun_ipv4.src_ip,
+ param->outbound.tunnel.ipv4.src_addr,
+ sizeof(ipsec_sa->out.tun_ipv4.src_ip));
+ memcpy(&ipsec_sa->out.tun_ipv4.dst_ip,
+ param->outbound.tunnel.ipv4.dst_addr,
+ sizeof(ipsec_sa->out.tun_ipv4.dst_ip));
+ odp_atomic_init_u32(&ipsec_sa->out.tun_ipv4.hdr_id, 0);
+ ipsec_sa->out.tun_ipv4.ttl =
+ param->outbound.tunnel.ipv4.ttl;
+ ipsec_sa->out.tun_ipv4.dscp =
+ param->outbound.tunnel.ipv4.dscp;
+ ipsec_sa->out.tun_ipv4.df =
+ param->outbound.tunnel.ipv4.df;
+ } else {
+ ipsec_sa->tun_ipv4 = 0;
+ memcpy(&ipsec_sa->out.tun_ipv6.src_ip,
+ param->outbound.tunnel.ipv6.src_addr,
+ sizeof(ipsec_sa->out.tun_ipv6.src_ip));
+ memcpy(&ipsec_sa->out.tun_ipv6.dst_ip,
+ param->outbound.tunnel.ipv6.dst_addr,
+ sizeof(ipsec_sa->out.tun_ipv6.dst_ip));
+ ipsec_sa->out.tun_ipv6.hlimit =
+ param->outbound.tunnel.ipv6.hlimit;
+ ipsec_sa->out.tun_ipv6.dscp =
+ param->outbound.tunnel.ipv6.dscp;
+ ipsec_sa->out.tun_ipv6.flabel =
+ param->outbound.tunnel.ipv6.flabel;
+ }
}
odp_crypto_session_param_init(&crypto_param);
@@ -485,8 +511,11 @@ ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup)
if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode &&
lookup->proto == ipsec_sa->proto &&
lookup->spi == ipsec_sa->spi &&
- !memcmp(lookup->dst_addr, &ipsec_sa->in.lookup_dst_ip,
- sizeof(ipsec_sa->in.lookup_dst_ip))) {
+ lookup->ver == ipsec_sa->in.lookup_ver &&
+ !memcmp(lookup->dst_addr, &ipsec_sa->in.lookup_dst_ipv4,
+ lookup->ver == ODP_IPSEC_IPV4 ?
+ _ODP_IPV4ADDR_LEN :
+ _ODP_IPV6ADDR_LEN)) {
if (NULL != best)
_odp_ipsec_sa_unuse(best);
return ipsec_sa;
commit 661fa940d2d6c2897f96d22bffdf2c71d6fee2de
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 21 17:01:26 2017 +0300
linux-gen: protocols: ip: add more ipv6 defines
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h
index 0fc391ab..7b6b736a 100644
--- a/platform/linux-generic/include/protocols/ip.h
+++ b/platform/linux-generic/include/protocols/ip.h
@@ -161,11 +161,13 @@ typedef struct ODP_PACKED {
#define _ODP_IPPROTO_IPIP 0x04 /**< IP Encapsulation within IP (4) */
#define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */
#define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */
+#define _ODP_IPPROTO_IPV6 0x29 /**< IPv6 Routing header (41) */
#define _ODP_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */
#define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */
#define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */
#define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */
#define _ODP_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */
+#define _ODP_IPPROTO_DEST 0x3C /**< IPv6 Destination header (60) */
#define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol
(132) */
#define _ODP_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */
commit 11815a8c8efc1c614d334430e24b0d9ebc913f87
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Nov 21 17:00:38 2017 +0300
linux-gen: don't include odp_ipsec_internal.h in odp_packet_internal.h
Such include adds unnecessary build dependencies. Just include
<odp/api/ipsec.h>, which is enough.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index a16ec316..0f661679 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -25,7 +25,7 @@ extern "C" {
#include <odp/api/packet.h>
#include <odp/api/packet_io.h>
#include <odp/api/crypto.h>
-#include <odp_ipsec_internal.h>
+#include <odp/api/ipsec.h>
#include <odp/api/plat/packet_types.h>
#include <odp_queue_if.h>
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index 96df7272..f887e1a2 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -11,6 +11,7 @@
#include <odp_packet_internal.h>
#include <odp_packet_io_internal.h>
#include <odp_classification_internal.h>
+#include <odp_ipsec_internal.h>
#include <odp_debug_internal.h>
#include <odp/api/hints.h>
#include <odp_queue_if.h>
commit 3842b5fa56f460b3c571dc0b5154fa2fa8291c5a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 20 16:13:34 2017 +0300
validation: ipsec: fix next_header field in mcgrew gcm test vectors
Test vectors from draft-mcgrew-gcm-test-01 contain invalid next_header
field in ESP trailers (0x01 = ICMP instead of 0x04 = IPv4). Correct test
vectors. Test 12 is disabled till NoNH packets are properly supported in
a defined way.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index daafaf69..5af98112 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -947,6 +947,7 @@ static void test_in_ipv4_mcgrew_gcm_4_esp(void)
ipsec_sa_destroy(sa);
}
+#if 0
static void test_in_ipv4_mcgrew_gcm_12_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
@@ -977,6 +978,7 @@ static void test_in_ipv4_mcgrew_gcm_12_esp(void)
ipsec_sa_destroy(sa);
}
+#endif
static void test_in_ipv4_mcgrew_gcm_15_esp(void)
{
@@ -1094,8 +1096,10 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_aes_gcm_256),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_4_esp,
ipsec_check_esp_aes_gcm_128),
+#if 0
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_12_esp,
ipsec_check_esp_aes_gcm_128),
+#endif
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_15_esp,
ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 51aa97cc..c057f776 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -1021,9 +1021,9 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_2_esp = {
0x3d, 0xe8, 0x18, 0x27, 0xc1, 0x0e, 0x9a, 0x4f,
0x51, 0x33, 0x0d, 0x0e, 0xec, 0x41, 0x66, 0x42,
0xcf, 0xbb, 0x85, 0xa5, 0xb4, 0x7e, 0x48, 0xa4,
- 0xec, 0x3b, 0x9b, 0xa9, 0x5d, 0x91, 0x8b, 0xd1,
- 0x83, 0xb7, 0x0d, 0x3a, 0xa8, 0xbc, 0x6e, 0xe4,
- 0xc3, 0x09, 0xe9, 0xd8, 0x5a, 0x41, 0xad, 0x4a,
+ 0xec, 0x3b, 0x9b, 0xa9, 0x5d, 0x91, 0x8b, 0xd4,
+ 0x26, 0xf8, 0x39, 0x1b, 0x99, 0x27, 0xd0, 0xfc,
+ 0xc9, 0x84, 0x56, 0x1b, 0xbb, 0xce, 0x9f, 0xc0,
},
};
@@ -1078,9 +1078,9 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_3_esp = {
0x06, 0xef, 0xae, 0x9d, 0x65, 0xa5, 0xd7, 0x63,
0x74, 0x8a, 0x63, 0x79, 0x85, 0x77, 0x1d, 0x34,
0x7f, 0x05, 0x45, 0x65, 0x9f, 0x14, 0xe9, 0x9d,
- 0xef, 0x84, 0x2d, 0x8e, 0xb3, 0x35, 0xf4, 0xee,
- 0xcf, 0xdb, 0xf8, 0x31, 0x82, 0x4b, 0x4c, 0x49,
- 0x15, 0x95, 0x6c, 0x96,
+ 0xef, 0x84, 0x2d, 0x8b, 0x42, 0xf5, 0x64, 0xf5,
+ 0x2d, 0xfd, 0xd6, 0xee, 0xf4, 0xf9, 0x2e, 0xad,
+ 0xba, 0xc2, 0x39, 0x90,
},
};
@@ -1137,9 +1137,9 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_4_esp = {
0x45, 0x64, 0x76, 0x49, 0x27, 0x19, 0xff, 0xb6,
0x4d, 0xe7, 0xd9, 0xdc, 0xa1, 0xe1, 0xd8, 0x94,
0xbc, 0x3b, 0xd5, 0x78, 0x73, 0xed, 0x4d, 0x18,
- 0x1d, 0x19, 0xd4, 0xd5, 0xc8, 0xc1, 0x8a, 0xf3,
- 0xf8, 0x21, 0xd4, 0x96, 0xee, 0xb0, 0x96, 0xe9,
- 0x8a, 0xd2, 0xb6, 0x9e, 0x47, 0x99, 0xc7, 0x1d,
+ 0x1d, 0x19, 0xd4, 0xd5, 0xc8, 0xc1, 0x8a, 0xf6,
+ 0xfe, 0x1d, 0x73, 0x72, 0x22, 0x8a, 0x69, 0xf4,
+ 0x0d, 0xeb, 0x37, 0x3d, 0xdc, 0x01, 0x67, 0x6b,
},
};
@@ -1177,9 +1177,9 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_12_esp = {
0x43, 0x45, 0x7e, 0x91, 0x82, 0x44, 0x3b, 0xc6,
/* Data */
- 0x43, 0x7f, 0x86, 0x6b, 0xcb, 0x3f, 0x69, 0x9f,
- 0xe9, 0xb0, 0x82, 0x2b, 0xac, 0x96, 0x1c, 0x45,
- 0x04, 0xbe, 0xf2, 0x70,
+ 0x43, 0x7f, 0x86, 0x51, 0x7e, 0xa5, 0x95, 0xd2,
+ 0xca, 0x00, 0x4c, 0x33, 0x38, 0x8c, 0x46, 0x77,
+ 0x0c, 0x59, 0x0a, 0xd6,
},
};
@@ -1234,9 +1234,9 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = {
0x02, 0x00, 0x07, 0x00, 0x61, 0x62, 0x63, 0x64,
0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74,
- 0x01, 0x02, 0x02, 0x01, 0xf2, 0xa9, 0xa8, 0x36,
- 0xe1, 0x55, 0x10, 0x6a, 0xa8, 0xdc, 0xd6, 0x18,
- 0xe4, 0x09, 0x9a, 0xaa,
+ 0x01, 0x02, 0x02, 0x04, 0x59, 0x4f, 0x40, 0x55,
+ 0x42, 0x8d, 0x39, 0x9a, 0x9d, 0x66, 0xc1, 0x5e,
+ 0x77, 0x02, 0x3a, 0x98,
},
};
commit b60b7080c27f72a197af8312a531d6c89772aaea
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 22 11:46:31 2017 +0300
linux-gen: modularize IPsec implementation
To ease adding IPv6/IPcomp/etc modularize IPsec implementation,
refactoring out functions handling ESP/AH and header parsing/tunneling.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 8735e605..2b9de577 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -123,8 +123,8 @@ static inline int _odp_ipv4_csum(odp_packet_t pkt,
return 0;
}
-/** @internal Checksum offset in IPv4 header */
-#define _ODP_IPV4HDR_CSUM_OFFSET 10
+#define _ODP_IPV4HDR_CSUM_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, chksum)
+#define _ODP_IPV4HDR_PROTO_OFFSET ODP_OFFSETOF(_odp_ipv4hdr_t, proto)
/**
* Calculate and fill in IPv4 checksum
@@ -158,7 +158,7 @@ static inline int _odp_ipv4_csum_update(odp_packet_t pkt)
2, &chksum);
}
-#define ipv4_hdr_len(ip) (_ODP_IPV4HDR_IHL(ip->ver_ihl) * 4)
+#define ipv4_hdr_len(ip) (_ODP_IPV4HDR_IHL((ip)->ver_ihl) * 4)
static inline
void ipv4_adjust_len(_odp_ipv4hdr_t *ip, int adj)
{
@@ -218,200 +218,310 @@ static inline odp_pktio_parser_layer_t parse_layer(odp_ipsec_proto_layer_t l)
return ODP_PKTIO_PARSER_LAYER_NONE;
}
-static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
- odp_ipsec_sa_t sa,
- odp_packet_t *pkt_out,
- odp_ipsec_op_status_t *status)
-{
- ipsec_sa_t *ipsec_sa = NULL;
- uint32_t ip_offset = odp_packet_l3_offset(pkt);
- _odp_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL);
- uint16_t ip_hdr_len = ipv4_hdr_len(ip);
- odp_crypto_packet_op_param_t param;
- int rc;
+typedef struct {
+ _odp_ipv4hdr_t *ip;
unsigned stats_length;
- uint16_t ipsec_offset; /**< Offset of IPsec header from
- buffer start */
- uint8_t iv[IPSEC_MAX_IV_LEN]; /**< ESP IV storage */
- ipsec_aad_t aad; /**< AAD, note ESN is not fully supported */
- unsigned hdr_len; /**< Length of IPsec headers */
- unsigned trl_len; /**< Length of IPsec trailers */
- uint8_t ip_tos; /**< Saved IP TOS value */
- uint8_t ip_ttl; /**< Saved IP TTL value */
- uint16_t ip_frag_offset; /**< Saved IP flags value */
- odp_crypto_packet_result_t crypto; /**< Crypto operation result */
- odp_packet_hdr_t *pkt_hdr;
+ uint16_t ip_offset;
+ uint16_t ip_hdr_len;
+ uint16_t ip_tot_len;
+ union {
+ struct {
+ uint16_t ip_df;
+ uint8_t ip_tos;
+ } out_tunnel;
+ struct {
+ uint16_t hdr_len;
+ uint16_t trl_len;
+ } in;
+ };
+ union {
+ struct {
+ uint8_t tos;
+ uint8_t ttl;
+ uint16_t frag_offset;
+ } ah_ipv4;
+ };
+ ipsec_aad_t aad;
+ uint8_t iv[IPSEC_MAX_IV_LEN];
+} ipsec_state_t;
+
+static int ipsec_parse_ipv4(ipsec_state_t *state)
+{
+ if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(state->ip->frag_offset)))
+ return -1;
- ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset);
- ODP_ASSERT(NULL != ip);
+ state->ip_hdr_len = ipv4_hdr_len(state->ip);
+ state->ip_tot_len = odp_be_to_cpu_16(state->ip->tot_len);
- ip_tos = 0;
- ip_ttl = 0;
- ip_frag_offset = 0;
+ return 0;
+}
- /* Initialize parameters block */
- memset(¶m, 0, sizeof(param));
+static inline ipsec_sa_t *ipsec_get_sa(odp_ipsec_sa_t sa,
+ odp_ipsec_protocol_t proto,
+ uint32_t spi,
+ void *dst_addr,
+ odp_ipsec_op_status_t *status)
+{
+ ipsec_sa_t *ipsec_sa;
+
+ if (ODP_IPSEC_SA_INVALID == sa) {
+ ipsec_sa_lookup_t lookup;
+
+ lookup.proto = proto;
+ lookup.spi = spi;
+ lookup.dst_addr = dst_addr;
+
+ ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
+ if (NULL == ipsec_sa) {
+ status->error.sa_lookup = 1;
+ return NULL;
+ }
+ } else {
+ ipsec_sa = _odp_ipsec_sa_use(sa);
+ ODP_ASSERT(NULL != ipsec_sa);
+ if (ipsec_sa->proto != proto ||
+ ipsec_sa->spi != spi) {
+ status->error.proto = 1;
+ return ipsec_sa;
+ }
+ }
+
+ return ipsec_sa;
+}
- ipsec_offset = ip_offset + ip_hdr_len;
+static int ipsec_in_iv(odp_packet_t pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa,
+ uint16_t iv_offset)
+{
+ memcpy(state->iv, ipsec_sa->salt, ipsec_sa->salt_length);
+ if (odp_packet_copy_to_mem(pkt,
+ iv_offset,
+ ipsec_sa->esp_iv_len,
+ state->iv + ipsec_sa->salt_length) < 0)
+ return -1;
- if (odp_be_to_cpu_16(ip->tot_len) + ip_offset > odp_packet_len(pkt)) {
+ if (ipsec_sa->aes_ctr_iv) {
+ state->iv[12] = 0;
+ state->iv[13] = 0;
+ state->iv[14] = 0;
+ state->iv[15] = 1;
+ }
+
+ return 0;
+}
+
+static int ipsec_in_esp(odp_packet_t *pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t **_ipsec_sa,
+ odp_ipsec_sa_t sa,
+ odp_crypto_packet_op_param_t *param,
+ odp_ipsec_op_status_t *status)
+{
+ _odp_esphdr_t esp;
+ uint16_t ipsec_offset;
+ ipsec_sa_t *ipsec_sa;
+
+ ipsec_offset = state->ip_offset + state->ip_hdr_len;
+
+ if (odp_packet_copy_to_mem(*pkt, ipsec_offset,
+ sizeof(esp), &esp) < 0) {
status->error.alg = 1;
- goto err;
+ return -1;
}
- if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
- status->error.proto = 1;
- goto err;
+ ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_ESP,
+ odp_be_to_cpu_32(esp.spi),
+ &state->ip->dst_addr, status);
+ *_ipsec_sa = ipsec_sa;
+ if (status->error.all)
+ return -1;
+
+ if (ipsec_in_iv(*pkt, state, ipsec_sa,
+ ipsec_offset + _ODP_ESPHDR_LEN) < 0) {
+ status->error.alg = 1;
+ return -1;
}
- /* Check IP header for IPSec protocols and look it up */
- if (_ODP_IPPROTO_ESP == ip->proto) {
- _odp_esphdr_t esp;
+ state->in.hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
+ state->in.trl_len = _ODP_ESPTRL_LEN + ipsec_sa->icv_len;
- if (odp_packet_copy_to_mem(pkt, ipsec_offset,
- sizeof(esp), &esp) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ param->cipher_range.offset = ipsec_offset + state->in.hdr_len;
+ param->cipher_range.length = state->ip_tot_len -
+ state->ip_hdr_len -
+ state->in.hdr_len -
+ ipsec_sa->icv_len;
+ param->override_iv_ptr = state->iv;
- if (ODP_IPSEC_SA_INVALID == sa) {
- ipsec_sa_lookup_t lookup;
+ state->aad.spi = esp.spi;
+ state->aad.seq_no = esp.seq_no;
- lookup.proto = ODP_IPSEC_ESP;
- lookup.spi = odp_be_to_cpu_32(esp.spi);
- lookup.dst_addr = &ip->dst_addr;
+ param->aad.ptr = (uint8_t *)&state->aad;
- ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
- if (NULL == ipsec_sa) {
- status->error.sa_lookup = 1;
- goto err;
- }
- } else {
- ipsec_sa = _odp_ipsec_sa_use(sa);
- ODP_ASSERT(NULL != ipsec_sa);
- if (ipsec_sa->proto != ODP_IPSEC_ESP ||
- ipsec_sa->spi != odp_be_to_cpu_32(esp.spi)) {
- status->error.proto = 1;
- goto err;
- }
- }
+ param->auth_range.offset = ipsec_offset;
+ param->auth_range.length = state->ip_tot_len -
+ state->ip_hdr_len -
+ ipsec_sa->icv_len;
+ param->hash_result_offset = state->ip_offset +
+ state->ip_tot_len -
+ ipsec_sa->icv_len;
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
- if (odp_packet_copy_to_mem(pkt,
- ipsec_offset + _ODP_ESPHDR_LEN,
- ipsec_sa->esp_iv_len,
- iv + ipsec_sa->salt_length) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ state->stats_length = param->cipher_range.length;
- if (ipsec_sa->aes_ctr_iv) {
- iv[12] = 0;
- iv[13] = 0;
- iv[14] = 0;
- iv[15] = 1;
- }
+ return 0;
+}
- hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
- trl_len = _ODP_ESPTRL_LEN + ipsec_sa->icv_len;
+static int ipsec_in_esp_post(odp_packet_t pkt,
+ ipsec_state_t *state)
+{
+ _odp_esptrl_t esptrl;
+ uint32_t esptrl_offset = state->ip_offset +
+ state->ip_tot_len -
+ state->in.trl_len;
+
+ if (odp_packet_copy_to_mem(pkt, esptrl_offset,
+ sizeof(esptrl), &esptrl) < 0 ||
+ state->ip_offset + esptrl.pad_len > esptrl_offset ||
+ _odp_packet_cmp_data(pkt, esptrl_offset - esptrl.pad_len,
+ ipsec_padding, esptrl.pad_len) != 0)
+ return -1;
- param.cipher_range.offset = ipsec_offset + hdr_len;
- param.cipher_range.length = odp_be_to_cpu_16(ip->tot_len) -
- ip_hdr_len -
- hdr_len -
- ipsec_sa->icv_len;
- param.override_iv_ptr = iv;
+ state->ip->proto = esptrl.next_header;
+ state->in.trl_len += esptrl.pad_len;
- aad.spi = esp.spi;
- aad.seq_no = esp.seq_no;
+ return 0;
+}
- param.aad.ptr = (uint8_t *)&aad;
+static int ipsec_in_ah(odp_packet_t *pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t **_ipsec_sa,
+ odp_ipsec_sa_t sa,
+ odp_crypto_packet_op_param_t *param,
+ odp_ipsec_op_status_t *status)
+{
+ _odp_ahhdr_t ah;
+ uint16_t ipsec_offset;
+ ipsec_sa_t *ipsec_sa;
- param.auth_range.offset = ipsec_offset;
- param.auth_range.length = odp_be_to_cpu_16(ip->tot_len) -
- ip_hdr_len -
- ipsec_sa->icv_len;
- param.hash_result_offset = ip_offset +
- odp_be_to_cpu_16(ip->tot_len) -
- ipsec_sa->icv_len;
+ ipsec_offset = state->ip_offset + state->ip_hdr_len;
- stats_length = param.cipher_range.length;
- } else if (_ODP_IPPROTO_AH == ip->proto) {
- _odp_ahhdr_t ah;
+ if (odp_packet_copy_to_mem(*pkt, ipsec_offset,
+ sizeof(ah), &ah) < 0) {
+ status->error.alg = 1;
+ return -1;
+ }
- if (odp_packet_copy_to_mem(pkt, ipsec_offset,
- sizeof(ah), &ah) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ ipsec_sa = ipsec_get_sa(sa, ODP_IPSEC_AH,
+ odp_be_to_cpu_32(ah.spi),
+ &state->ip->dst_addr, status);
+ *_ipsec_sa = ipsec_sa;
+ if (status->error.all)
+ return -1;
- if (ODP_IPSEC_SA_INVALID == sa) {
- ipsec_sa_lookup_t lookup;
+ if (ipsec_in_iv(*pkt, state, ipsec_sa,
+ ipsec_offset + _ODP_AHHDR_LEN) < 0) {
+ status->error.alg = 1;
+ return -1;
+ }
- lookup.proto = ODP_IPSEC_AH;
- lookup.spi = odp_be_to_cpu_32(ah.spi);
- lookup.dst_addr = &ip->dst_addr;
+ param->override_iv_ptr = state->iv;
- ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
- if (NULL == ipsec_sa) {
- status->error.sa_lookup = 1;
- goto err;
- }
- } else {
- ipsec_sa = _odp_ipsec_sa_use(sa);
- ODP_ASSERT(NULL != ipsec_sa);
- if (ipsec_sa->proto != ODP_IPSEC_AH ||
- ipsec_sa->spi != odp_be_to_cpu_32(ah.spi)) {
- status->error.proto = 1;
- goto err;
- }
- }
+ state->in.hdr_len = (ah.ah_len + 2) * 4;
+ state->in.trl_len = 0;
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
- if (odp_packet_copy_to_mem(pkt,
- ipsec_offset + _ODP_AHHDR_LEN,
- ipsec_sa->esp_iv_len,
- iv + ipsec_sa->salt_length) < 0) {
- status->error.alg = 1;
- goto err;
- }
- param.override_iv_ptr = iv;
+ /* Save everything to context */
+ state->ah_ipv4.tos = state->ip->tos;
+ state->ah_ipv4.frag_offset = state->ip->frag_offset;
+ state->ah_ipv4.ttl = state->ip->ttl;
+
+ /* FIXME: zero copy of header, passing it to crypto! */
+ /*
+ * If authenticating, zero the mutable fields build the request
+ */
+ state->ip->chksum = 0;
+ state->ip->tos = 0;
+ state->ip->frag_offset = 0;
+ state->ip->ttl = 0;
- hdr_len = (ah.ah_len + 2) * 4;
- trl_len = 0;
+ state->aad.spi = ah.spi;
+ state->aad.seq_no = ah.seq_no;
- /* Save everything to context */
- ip_tos = ip->tos;
- ip_frag_offset = odp_be_to_cpu_16(ip->frag_offset);
- ip_ttl = ip->ttl;
+ param->aad.ptr = (uint8_t *)&state->aad;
- /* FIXME: zero copy of header, passing it to crypto! */
- /*
- * If authenticating, zero the mutable fields build the request
- */
- ip->chksum = 0;
- ip->tos = 0;
- ip->frag_offset = 0;
- ip->ttl = 0;
+ param->auth_range.offset = state->ip_offset;
+ param->auth_range.length = state->ip_tot_len;
+ param->hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN +
+ ipsec_sa->esp_iv_len;
- aad.spi = ah.spi;
- aad.seq_no = ah.seq_no;
+ state->stats_length = param->auth_range.length;
- param.aad.ptr = (uint8_t *)&aad;
+ return 0;
+}
+
+static int ipsec_in_ah_post(odp_packet_t pkt,
+ ipsec_state_t *state)
+{
+ _odp_ahhdr_t ah;
+ uint16_t ipsec_offset;
- param.auth_range.offset = ip_offset;
- param.auth_range.length = odp_be_to_cpu_16(ip->tot_len);
- param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN +
- ipsec_sa->esp_iv_len;
+ ipsec_offset = state->ip_offset + state->ip_hdr_len;
- stats_length = param.auth_range.length;
+ if (odp_packet_copy_to_mem(pkt, ipsec_offset,
+ sizeof(ah), &ah) < 0)
+ return -1;
+
+ state->ip->proto = ah.next_header;
+
+ /* Restore mutable fields */
+ state->ip->ttl = state->ah_ipv4.ttl;
+ state->ip->tos = state->ah_ipv4.tos;
+ state->ip->frag_offset = state->ah_ipv4.frag_offset;
+
+ return 0;
+}
+
+static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
+ odp_ipsec_sa_t sa,
+ odp_packet_t *pkt_out,
+ odp_ipsec_op_status_t *status)
+{
+ ipsec_state_t state;
+ ipsec_sa_t *ipsec_sa = NULL;
+ odp_crypto_packet_op_param_t param;
+ int rc;
+ odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_hdr_t *pkt_hdr;
+
+ state.ip_offset = odp_packet_l3_offset(pkt);
+ ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != state.ip_offset);
+
+ state.ip = odp_packet_l3_ptr(pkt, NULL);
+ ODP_ASSERT(NULL != state.ip);
+
+ /* Initialize parameters block */
+ memset(¶m, 0, sizeof(param));
+
+ rc = ipsec_parse_ipv4(&state);
+ if (rc < 0 ||
+ state.ip_tot_len + state.ip_offset > odp_packet_len(pkt)) {
+ status->error.alg = 1;
+ goto err;
+ }
+
+ /* Check IP header for IPSec protocols and look it up */
+ if (_ODP_IPPROTO_ESP == state.ip->proto) {
+ rc = ipsec_in_esp(&pkt, &state, &ipsec_sa, sa, ¶m, status);
+ } else if (_ODP_IPPROTO_AH == state.ip->proto) {
+ rc = ipsec_in_ah(&pkt, &state, &ipsec_sa, sa, ¶m, status);
} else {
status->error.proto = 1;
goto err;
}
+ if (rc < 0)
+ goto err;
if (_odp_ipsec_sa_replay_precheck(ipsec_sa,
- odp_be_to_cpu_32(aad.seq_no),
+ odp_be_to_cpu_32(state.aad.seq_no),
status) < 0)
goto err;
@@ -450,70 +560,30 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto err;
}
- if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
+ if (_odp_ipsec_sa_stats_update(ipsec_sa,
+ state.stats_length,
+ status) < 0)
goto err;
if (_odp_ipsec_sa_replay_update(ipsec_sa,
- odp_be_to_cpu_32(aad.seq_no),
+ odp_be_to_cpu_32(state.aad.seq_no),
status) < 0)
goto err;
- ip_offset = odp_packet_l3_offset(pkt);
- ip = odp_packet_l3_ptr(pkt, NULL);
- ip_hdr_len = ipv4_hdr_len(ip);
-
- if (_ODP_IPPROTO_ESP == ip->proto) {
- /*
- * Finish cipher by finding ESP trailer and processing
- */
- _odp_esptrl_t esptrl;
- uint32_t esptrl_offset = ip_offset +
- odp_be_to_cpu_16(ip->tot_len) -
- trl_len;
-
- if (odp_packet_copy_to_mem(pkt, esptrl_offset,
- sizeof(esptrl), &esptrl) < 0) {
- status->error.proto = 1;
- goto err;
- }
-
- if (ip_offset + esptrl.pad_len > esptrl_offset) {
- status->error.proto = 1;
- goto err;
- }
-
- if (_odp_packet_cmp_data(pkt, esptrl_offset - esptrl.pad_len,
- ipsec_padding, esptrl.pad_len) != 0) {
- status->error.proto = 1;
- goto err;
- }
+ state.ip = odp_packet_l3_ptr(pkt, NULL);
- ip->proto = esptrl.next_header;
- trl_len += esptrl.pad_len;
- } else if (_ODP_IPPROTO_AH == ip->proto) {
- /*
- * Finish auth
- */
- _odp_ahhdr_t ah;
-
- if (odp_packet_copy_to_mem(pkt, ipsec_offset,
- sizeof(ah), &ah) < 0) {
- status->error.alg = 1;
- goto err;
- }
-
- ip->proto = ah.next_header;
-
- /* Restore mutable fields */
- ip->ttl = ip_ttl;
- ip->tos = ip_tos;
- ip->frag_offset = odp_cpu_to_be_16(ip_frag_offset);
- } else {
+ if (ODP_IPSEC_ESP == ipsec_sa->proto)
+ rc = ipsec_in_esp_post(pkt, &state);
+ else if (ODP_IPSEC_AH == ipsec_sa->proto)
+ rc = ipsec_in_ah_post(pkt, &state);
+ else
+ rc = -1;
+ if (rc < 0) {
status->error.proto = 1;
goto err;
}
- if (odp_packet_trunc_tail(&pkt, trl_len, NULL, NULL) < 0) {
+ if (odp_packet_trunc_tail(&pkt, state.in.trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
goto err;
}
@@ -521,32 +591,36 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
/* We have a tunneled IPv4 packet, strip outer and IPsec
* headers */
- odp_packet_move_data(pkt, ip_hdr_len + hdr_len, 0,
- ip_offset);
- if (odp_packet_trunc_head(&pkt, ip_hdr_len + hdr_len,
+ odp_packet_move_data(pkt, state.ip_hdr_len + state.in.hdr_len,
+ 0,
+ state.ip_offset);
+ if (odp_packet_trunc_head(&pkt, state.ip_hdr_len +
+ state.in.hdr_len,
NULL, NULL) < 0) {
status->error.alg = 1;
goto err;
}
+
+ if (odp_packet_len(pkt) > sizeof(*state.ip)) {
+ state.ip = odp_packet_l3_ptr(pkt, NULL);
+ state.ip->ttl -= ipsec_sa->dec_ttl;
+ _odp_ipv4_csum_update(pkt);
+ }
} else {
- odp_packet_move_data(pkt, hdr_len, 0,
- ip_offset + ip_hdr_len);
- if (odp_packet_trunc_head(&pkt, hdr_len,
+ odp_packet_move_data(pkt, state.in.hdr_len, 0,
+ state.ip_offset + state.ip_hdr_len);
+ if (odp_packet_trunc_head(&pkt, state.in.hdr_len,
NULL, NULL) < 0) {
status->error.alg = 1;
goto err;
}
- }
-
- /* Finalize the IPv4 header */
- if (odp_packet_len(pkt) > sizeof(*ip)) {
- ip = odp_packet_l3_ptr(pkt, NULL);
-
- if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode)
- ipv4_adjust_len(ip, -(hdr_len + trl_len));
- ip->ttl -= ipsec_sa->dec_ttl;
- _odp_ipv4_csum_update(pkt);
+ if (odp_packet_len(pkt) > sizeof(*state.ip)) {
+ state.ip = odp_packet_l3_ptr(pkt, NULL);
+ ipv4_adjust_len(state.ip,
+ -(state.in.hdr_len + state.in.trl_len));
+ _odp_ipv4_csum_update(pkt);
+ }
}
pkt_hdr = odp_packet_hdr(pkt);
@@ -554,7 +628,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
packet_parse_reset(pkt_hdr);
packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
- ip_offset, _ODP_ETHTYPE_IPV4);
+ state.ip_offset, _ODP_ETHTYPE_IPV4);
*pkt_out = pkt;
@@ -577,317 +651,353 @@ uint32_t ipsec_seq_no(ipsec_sa_t *ipsec_sa)
}
/* Helper for calculating encode length using data length and block size */
-#define ESP_ENCODE_LEN(x, b) ((((x) + ((b) - 1)) / (b)) * (b))
+#define IPSEC_PAD_LEN(x, b) ((((x) + ((b) - 1)) / (b)) * (b))
-static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
- odp_ipsec_sa_t sa,
- odp_packet_t *pkt_out,
- const odp_ipsec_out_opt_t *opt ODP_UNUSED,
- odp_ipsec_op_status_t *status)
+static int ipsec_out_tunnel_parse_ipv4(ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa)
{
- ipsec_sa_t *ipsec_sa = NULL;
- uint32_t ip_offset = odp_packet_l3_offset(pkt);
- _odp_ipv4hdr_t *ip = odp_packet_l3_ptr(pkt, NULL);
- uint16_t ip_hdr_len = ipv4_hdr_len(ip);
- odp_crypto_packet_op_param_t param;
- unsigned stats_length;
- int rc;
- uint16_t ipsec_offset; /**< Offset of IPsec header from
- buffer start */
- uint8_t iv[IPSEC_MAX_IV_LEN]; /**< ESP IV storage */
- ipsec_aad_t aad; /**< AAD, note ESN is not fully supported */
- unsigned hdr_len; /**< Length of IPsec headers */
- unsigned trl_len; /**< Length of IPsec trailers */
- uint8_t ip_tos; /**< Saved IP TOS value */
- uint8_t ip_ttl; /**< Saved IP TTL value */
- uint16_t ip_frag_offset; /**< Saved IP flags value */
- odp_crypto_packet_result_t crypto; /**< Crypto operation result */
- odp_packet_hdr_t *pkt_hdr;
+ _odp_ipv4hdr_t *ipv4hdr = state->ip;
+ uint16_t flags = odp_be_to_cpu_16(ipv4hdr->frag_offset);
- ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset);
- ODP_ASSERT(NULL != ip);
+ ipv4hdr->ttl -= ipsec_sa->dec_ttl;
+ state->out_tunnel.ip_tos = ipv4hdr->tos;
+ state->out_tunnel.ip_df = _ODP_IPV4HDR_FLAGS_DONT_FRAG(flags);
- ip_tos = 0;
- ip_ttl = 0;
- ip_frag_offset = 0;
+ return 0;
+}
- ipsec_sa = _odp_ipsec_sa_use(sa);
- ODP_ASSERT(NULL != ipsec_sa);
+static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa)
+{
+ _odp_ipv4hdr_t out_ip;
+ uint16_t flags;
+
+ out_ip.ver_ihl = 0x45;
+ if (ipsec_sa->copy_dscp)
+ out_ip.tos = state->out_tunnel.ip_tos;
+ else
+ out_ip.tos = (state->out_tunnel.ip_tos &
+ ~_ODP_IP_TOS_DSCP_MASK) |
+ (ipsec_sa->out.tun_dscp <<
+ _ODP_IP_TOS_DSCP_SHIFT);
+ state->ip_tot_len = odp_packet_len(*pkt) - state->ip_offset;
+ state->ip_tot_len += _ODP_IPV4HDR_LEN;
+
+ out_ip.tot_len = odp_cpu_to_be_16(state->ip_tot_len);
+ /* No need to convert to BE: ID just should not be duplicated */
+ out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id,
+ 1);
+ if (ipsec_sa->copy_df)
+ flags = state->out_tunnel.ip_df;
+ else
+ flags = ((uint16_t)ipsec_sa->out.tun_df) << 14;
+ out_ip.frag_offset = odp_cpu_to_be_16(flags);
+ out_ip.ttl = ipsec_sa->out.tun_ttl;
+ out_ip.proto = _ODP_IPPROTO_IPIP;
+ /* Will be filled later by packet checksum update */
+ out_ip.chksum = 0;
+ out_ip.src_addr = ipsec_sa->out.tun_src_ip;
+ out_ip.dst_addr = ipsec_sa->out.tun_dst_ip;
+
+ if (odp_packet_extend_head(pkt, _ODP_IPV4HDR_LEN,
+ NULL, NULL) < 0)
+ return -1;
- /* Initialize parameters block */
- memset(¶m, 0, sizeof(param));
+ odp_packet_move_data(*pkt, 0, _ODP_IPV4HDR_LEN, state->ip_offset);
- if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode &&
- _ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
- status->error.alg = 1;
- goto err;
- }
+ odp_packet_copy_from_mem(*pkt, state->ip_offset,
+ _ODP_IPV4HDR_LEN, &out_ip);
- if (odp_be_to_cpu_16(ip->tot_len) + ip_offset > odp_packet_len(pkt)) {
- status->error.alg = 1;
- goto err;
- }
+ odp_packet_l4_offset_set(*pkt, state->ip_offset + _ODP_IPV4HDR_LEN);
- if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
- _odp_ipv4hdr_t out_ip;
- uint16_t tot_len;
+ state->ip = odp_packet_l3_ptr(*pkt, NULL);
+ state->ip_hdr_len = _ODP_IPV4HDR_LEN;
- ip->ttl -= ipsec_sa->dec_ttl;
+ return 0;
+}
- out_ip.ver_ihl = 0x45;
- if (ipsec_sa->copy_dscp)
- out_ip.tos = ip->tos;
- else
- out_ip.tos = (ip->tos & ~_ODP_IP_TOS_DSCP_MASK) |
- (ipsec_sa->out.tun_dscp <<
- _ODP_IP_TOS_DSCP_SHIFT);
- tot_len = odp_be_to_cpu_16(ip->tot_len) + _ODP_IPV4HDR_LEN;
- out_ip.tot_len = odp_cpu_to_be_16(tot_len);
- /* No need to convert to BE: ID just should not be duplicated */
- out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id,
- 1);
- if (ipsec_sa->copy_df)
- out_ip.frag_offset = ip->frag_offset & 0x4000;
- else
- out_ip.frag_offset =
- ((uint16_t)ipsec_sa->out.tun_df) << 14;
- out_ip.ttl = ipsec_sa->out.tun_ttl;
- out_ip.proto = _ODP_IPV4;
- /* Will be filled later by packet checksum update */
- out_ip.chksum = 0;
- out_ip.src_addr = ipsec_sa->out.tun_src_ip;
- out_ip.dst_addr = ipsec_sa->out.tun_dst_ip;
-
- if (odp_packet_extend_head(&pkt, _ODP_IPV4HDR_LEN,
- NULL, NULL) < 0) {
- status->error.alg = 1;
- goto err;
+static int ipsec_out_iv(ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa)
+{
+ if (ipsec_sa->use_counter_iv) {
+ uint64_t ctr;
+
+ /* Both GCM and CTR use 8-bit counters */
+ ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+
+ ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
+ 1);
+ /* Check for overrun */
+ if (ctr == 0)
+ return -1;
+
+ memcpy(state->iv, ipsec_sa->salt, ipsec_sa->salt_length);
+ memcpy(state->iv + ipsec_sa->salt_length, &ctr,
+ ipsec_sa->esp_iv_len);
+
+ if (ipsec_sa->aes_ctr_iv) {
+ state->iv[12] = 0;
+ state->iv[13] = 0;
+ state->iv[14] = 0;
+ state->iv[15] = 1;
}
+ } else if (ipsec_sa->esp_iv_len) {
+ uint32_t len;
- odp_packet_move_data(pkt, 0, _ODP_IPV4HDR_LEN, ip_offset);
+ len = odp_random_data(state->iv, ipsec_sa->esp_iv_len,
+ ODP_RANDOM_CRYPTO);
- odp_packet_copy_from_mem(pkt, ip_offset,
- _ODP_IPV4HDR_LEN, &out_ip);
+ if (len != ipsec_sa->esp_iv_len)
+ return -1;
+ }
- odp_packet_l4_offset_set(pkt, ip_offset + _ODP_IPV4HDR_LEN);
+ return 0;
+}
- ip = odp_packet_l3_ptr(pkt, NULL);
- ip_hdr_len = _ODP_IPV4HDR_LEN;
+static int ipsec_out_esp(odp_packet_t *pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa,
+ odp_crypto_packet_op_param_t *param,
+ odp_ipsec_op_status_t *status)
+{
+ _odp_esphdr_t esp;
+ _odp_esptrl_t esptrl;
+ uint32_t encrypt_len;
+ uint16_t ip_data_len = state->ip_tot_len -
+ state->ip_hdr_len;
+ uint32_t pad_block = ipsec_sa->esp_block_len;
+ uint16_t ipsec_offset = state->ip_offset + state->ip_hdr_len;
+ unsigned hdr_len;
+ unsigned trl_len;
+
+ /* ESP trailer should be 32-bit right aligned */
+ if (pad_block < 4)
+ pad_block = 4;
+
+ encrypt_len = IPSEC_PAD_LEN(ip_data_len + _ODP_ESPTRL_LEN,
+ pad_block);
+
+ hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
+ trl_len = encrypt_len -
+ ip_data_len +
+ ipsec_sa->icv_len;
+
+ if (ipsec_out_iv(state, ipsec_sa) < 0) {
+ status->error.alg = 1;
+ return -1;
}
- ipsec_offset = ip_offset + ip_hdr_len;
+ param->override_iv_ptr = state->iv;
- if (ipsec_sa->proto == ODP_IPSEC_ESP) {
- _odp_esphdr_t esp;
- _odp_esptrl_t esptrl;
- uint32_t encrypt_len;
- uint16_t ip_data_len = odp_be_to_cpu_16(ip->tot_len) -
- ip_hdr_len;
- uint32_t pad_block = ipsec_sa->esp_block_len;
+ if (odp_packet_extend_tail(pkt, trl_len, NULL, NULL) < 0 ||
+ odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) {
+ status->error.alg = 1;
+ return -1;
+ }
- /* ESP trailer should be 32-bit right aligned */
- if (pad_block < 4)
- pad_block = 4;
+ odp_packet_move_data(*pkt, 0, hdr_len, ipsec_offset);
+
+ state->ip = odp_packet_l3_ptr(*pkt, NULL);
+
+ /* Set IPv4 length before authentication */
+ ipv4_adjust_len(state->ip, hdr_len + trl_len);
+ state->ip_tot_len += hdr_len + trl_len;
+
+ uint32_t esptrl_offset = state->ip_offset +
+ state->ip_hdr_len +
+ hdr_len +
+ encrypt_len -
+ _ODP_ESPTRL_LEN;
+
+ memset(&esp, 0, sizeof(esp));
+ esp.spi = odp_cpu_to_be_32(ipsec_sa->spi);
+ esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
+
+ state->aad.spi = esp.spi;
+ state->aad.seq_no = esp.seq_no;
+
+ param->aad.ptr = (uint8_t *)&state->aad;
+
+ memset(&esptrl, 0, sizeof(esptrl));
+ esptrl.pad_len = encrypt_len - ip_data_len - _ODP_ESPTRL_LEN;
+ esptrl.next_header = state->ip->proto;
+ state->ip->proto = _ODP_IPPROTO_ESP;
+
+ odp_packet_copy_from_mem(*pkt,
+ ipsec_offset, _ODP_ESPHDR_LEN,
+ &esp);
+ odp_packet_copy_from_mem(*pkt,
+ ipsec_offset + _ODP_ESPHDR_LEN,
+ ipsec_sa->esp_iv_len,
+ state->iv + ipsec_sa->salt_length);
+ odp_packet_copy_from_mem(*pkt,
+ esptrl_offset - esptrl.pad_len,
+ esptrl.pad_len, ipsec_padding);
+ odp_packet_copy_from_mem(*pkt,
+ esptrl_offset, _ODP_ESPTRL_LEN,
+ &esptrl);
+
+ param->cipher_range.offset = ipsec_offset + hdr_len;
+ param->cipher_range.length = state->ip_tot_len -
+ state->ip_hdr_len -
+ hdr_len -
+ ipsec_sa->icv_len;
+
+ param->auth_range.offset = ipsec_offset;
+ param->auth_range.length = state->ip_tot_len -
+ state->ip_hdr_len -
+ ipsec_sa->icv_len;
+ param->hash_result_offset = state->ip_offset +
+ state->ip_tot_len -
+ ipsec_sa->icv_len;
+
+ state->stats_length = param->cipher_range.length;
- encrypt_len = ESP_ENCODE_LEN(ip_data_len + _ODP_ESPTRL_LEN,
- pad_block);
+ return 0;
+}
- hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
- trl_len = encrypt_len -
- ip_data_len +
- ipsec_sa->icv_len;
+static int ipsec_out_ah(odp_packet_t *pkt,
+ ipsec_state_t *state,
+ ipsec_sa_t *ipsec_sa,
+ odp_crypto_packet_op_param_t *param,
+ odp_ipsec_op_status_t *status)
+{
+ _odp_ahhdr_t ah;
+ unsigned hdr_len = _ODP_AHHDR_LEN + ipsec_sa->esp_iv_len +
+ ipsec_sa->icv_len;
+ uint16_t ipsec_offset = state->ip_offset + state->ip_hdr_len;
- if (ipsec_sa->use_counter_iv) {
- uint64_t ctr;
+ /* Save IPv4 stuff */
+ state->ah_ipv4.tos = state->ip->tos;
+ state->ah_ipv4.frag_offset = state->ip->frag_offset;
+ state->ah_ipv4.ttl = state->ip->ttl;
- /* Both GCM and CTR use 8-bit counters */
- ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+ if (odp_packet_extend_head(pkt, hdr_len, NULL, NULL) < 0) {
+ status->error.alg = 1;
+ return -1;
+ }
- ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
- 1);
- /* Check for overrun */
- if (ctr == 0)
- goto err;
+ odp_packet_move_data(*pkt, 0, hdr_len, ipsec_offset);
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
- memcpy(iv + ipsec_sa->salt_length, &ctr,
- ipsec_sa->esp_iv_len);
+ state->ip = odp_packet_l3_ptr(*pkt, NULL);
- if (ipsec_sa->aes_ctr_iv) {
- iv[12] = 0;
- iv[13] = 0;
- iv[14] = 0;
- iv[15] = 1;
- }
- } else if (ipsec_sa->esp_iv_len) {
- uint32_t len;
+ /* Set IPv4 length before authentication */
+ ipv4_adjust_len(state->ip, hdr_len);
+ state->ip_tot_len += hdr_len;
- len = odp_random_data(iv, ipsec_sa->esp_iv_len,
- ODP_RANDOM_CRYPTO);
+ memset(&ah, 0, sizeof(ah));
+ ah.spi = odp_cpu_to_be_32(ipsec_sa->spi);
+ ah.ah_len = 1 + (ipsec_sa->esp_iv_len + ipsec_sa->icv_len) / 4;
+ ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
+ ah.next_header = state->ip->proto;
+ state->ip->proto = _ODP_IPPROTO_AH;
- if (len != ipsec_sa->esp_iv_len) {
- status->error.alg = 1;
- goto err;
- }
- }
+ state->aad.spi = ah.spi;
+ state->aad.seq_no = ah.seq_no;
- param.override_iv_ptr = iv;
+ param->aad.ptr = (uint8_t *)&state->aad;
- if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ /* For GMAC */
+ if (ipsec_out_iv(state, ipsec_sa) < 0) {
+ status->error.alg = 1;
+ return -1;
+ }
- if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ param->override_iv_ptr = state->iv;
- odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset);
-
- ip = odp_packet_l3_ptr(pkt, NULL);
-
- /* Set IPv4 length before authentication */
- ipv4_adjust_len(ip, hdr_len + trl_len);
-
- uint32_t esptrl_offset = ip_offset +
- ip_hdr_len +
- hdr_len +
- encrypt_len -
- _ODP_ESPTRL_LEN;
-
- memset(&esp, 0, sizeof(esp));
- esp.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- esp.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
-
- aad.spi = esp.spi;
- aad.seq_no = esp.seq_no;
-
- param.aad.ptr = (uint8_t *)&aad;
-
- memset(&esptrl, 0, sizeof(esptrl));
- esptrl.pad_len = encrypt_len - ip_data_len - _ODP_ESPTRL_LEN;
- esptrl.next_header = ip->proto;
- ip->proto = _ODP_IPPROTO_ESP;
-
- odp_packet_copy_from_mem(pkt,
- ipsec_offset, _ODP_ESPHDR_LEN,
- &esp);
- odp_packet_copy_from_mem(pkt,
- ipsec_offset + _ODP_ESPHDR_LEN,
- ipsec_sa->esp_iv_len,
- iv + ipsec_sa->salt_length);
- odp_packet_copy_from_mem(pkt,
- esptrl_offset - esptrl.pad_len,
- esptrl.pad_len, ipsec_padding);
- odp_packet_copy_from_mem(pkt,
- esptrl_offset, _ODP_ESPTRL_LEN,
- &esptrl);
-
- param.cipher_range.offset = ipsec_offset + hdr_len;
- param.cipher_range.length = odp_be_to_cpu_16(ip->tot_len) -
- ip_hdr_len -
- hdr_len -
- ipsec_sa->icv_len;
-
- param.auth_range.offset = ipsec_offset;
- param.auth_range.length = odp_be_to_cpu_16(ip->tot_len) -
- ip_hdr_len -
- ipsec_sa->icv_len;
- param.hash_result_offset = ip_offset +
- odp_be_to_cpu_16(ip->tot_len) -
- ipsec_sa->icv_len;
-
- stats_length = param.cipher_range.length;
- } else if (ipsec_sa->proto == ODP_IPSEC_AH) {
- _odp_ahhdr_t ah;
-
- hdr_len = _ODP_AHHDR_LEN + ipsec_sa->esp_iv_len +
- ipsec_sa->icv_len;
- trl_len = 0;
-
- /* Save IPv4 stuff */
- ip_tos = ip->tos;
- ip_frag_offset = odp_be_to_cpu_16(ip->frag_offset);
- ip_ttl = ip->ttl;
-
- if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ odp_packet_copy_from_mem(*pkt,
+ ipsec_offset, _ODP_AHHDR_LEN,
+ &ah);
+ odp_packet_copy_from_mem(*pkt,
+ ipsec_offset + _ODP_AHHDR_LEN,
+ ipsec_sa->esp_iv_len,
+ state->iv + ipsec_sa->salt_length);
+ _odp_packet_set_data(*pkt,
+ ipsec_offset + _ODP_AHHDR_LEN +
+ ipsec_sa->esp_iv_len,
+ 0, ipsec_sa->icv_len);
- if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) {
- status->error.alg = 1;
- goto err;
- }
+ state->ip->chksum = 0;
+ state->ip->tos = 0;
+ state->ip->frag_offset = 0;
+ state->ip->ttl = 0;
- odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset);
+ param->auth_range.offset = state->ip_offset;
+ param->auth_range.length = state->ip_tot_len;
+ param->hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN +
+ ipsec_sa->esp_iv_len;
- ip = odp_packet_l3_ptr(pkt, NULL);
+ state->stats_length = param->auth_range.length;
- /* Set IPv4 length before authentication */
- ipv4_adjust_len(ip, hdr_len + trl_len);
+ return 0;
+}
- memset(&ah, 0, sizeof(ah));
- ah.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- ah.ah_len = 1 + (ipsec_sa->esp_iv_len + ipsec_sa->icv_len) / 4;
- ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
- ah.next_header = ip->proto;
- ip->proto = _ODP_IPPROTO_AH;
+static void ipsec_out_ah_post(ipsec_state_t *state)
+{
+ state->ip->ttl = state->ah_ipv4.ttl;
+ state->ip->tos = state->ah_ipv4.tos;
+ state->ip->frag_offset = state->ah_ipv4.frag_offset;
+}
- aad.spi = ah.spi;
- aad.seq_no = ah.seq_no;
+static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
+ odp_ipsec_sa_t sa,
+ odp_packet_t *pkt_out,
+ const odp_ipsec_out_opt_t *opt ODP_UNUSED,
+ odp_ipsec_op_status_t *status)
+{
+ ipsec_state_t state;
+ ipsec_sa_t *ipsec_sa;
+ odp_crypto_packet_op_param_t param;
+ int rc;
+ odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_hdr_t *pkt_hdr;
- param.aad.ptr = (uint8_t *)&aad;
+ state.ip_offset = odp_packet_l3_offset(pkt);
+ ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != state.ip_offset);
- /* For GMAC */
- if (ipsec_sa->use_counter_iv) {
- uint64_t ctr;
+ state.ip = odp_packet_l3_ptr(pkt, NULL);
+ ODP_ASSERT(NULL != state.ip);
- ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+ ipsec_sa = _odp_ipsec_sa_use(sa);
+ ODP_ASSERT(NULL != ipsec_sa);
- ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
- 1);
- /* Check for overrun */
- if (ctr == 0)
- goto err;
+ /* Initialize parameters block */
+ memset(¶m, 0, sizeof(param));
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
- memcpy(iv + ipsec_sa->salt_length, &ctr,
- ipsec_sa->esp_iv_len);
- param.override_iv_ptr = iv;
+ if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) {
+ rc = ipsec_parse_ipv4(&state);
+ if (state.ip_tot_len + state.ip_offset != odp_packet_len(pkt))
+ rc = -1;
+ } else {
+ rc = ipsec_out_tunnel_parse_ipv4(&state, ipsec_sa);
+ if (rc < 0) {
+ status->error.alg = 1;
+ goto err;
}
- odp_packet_copy_from_mem(pkt,
- ipsec_offset, _ODP_AHHDR_LEN,
- &ah);
- odp_packet_copy_from_mem(pkt,
- ipsec_offset + _ODP_AHHDR_LEN,
- ipsec_sa->esp_iv_len,
- iv + ipsec_sa->salt_length);
- _odp_packet_set_data(pkt,
- ipsec_offset + _ODP_AHHDR_LEN +
- ipsec_sa->esp_iv_len,
- 0, ipsec_sa->icv_len);
-
- ip->chksum = 0;
- ip->tos = 0;
- ip->frag_offset = 0;
- ip->ttl = 0;
-
- param.auth_range.offset = ip_offset;
- param.auth_range.length = odp_be_to_cpu_16(ip->tot_len);
- param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN +
- ipsec_sa->esp_iv_len;
-
- stats_length = param.auth_range.length;
+ rc = ipsec_out_tunnel_ipv4(&pkt, &state, ipsec_sa);
+ }
+ if (rc < 0) {
+ status->error.alg = 1;
+ goto err;
+ }
+
+ if (ODP_IPSEC_ESP == ipsec_sa->proto) {
+ rc = ipsec_out_esp(&pkt, &state, ipsec_sa, ¶m, status);
+ } else if (ODP_IPSEC_AH == ipsec_sa->proto) {
+ rc = ipsec_out_ah(&pkt, &state, ipsec_sa, ¶m, status);
} else {
status->error.alg = 1;
goto err;
}
+ if (rc < 0)
+ goto err;
/* No need to run precheck here, we know that packet is authentic */
- if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
+ if (_odp_ipsec_sa_stats_update(ipsec_sa,
+ state.stats_length,
+ status) < 0)
goto err;
param.session = ipsec_sa->session;
@@ -922,14 +1032,9 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
goto err;
}
- ip = odp_packet_l3_ptr(pkt, NULL);
-
/* Finalize the IPv4 header */
- if (ip->proto == _ODP_IPPROTO_AH) {
- ip->ttl = ip_ttl;
- ip->tos = ip_tos;
- ip->frag_offset = odp_cpu_to_be_16(ip_frag_offset);
- }
+ if (ODP_IPSEC_AH == ipsec_sa->proto)
+ ipsec_out_ah_post(&state);
_odp_ipv4_csum_update(pkt);
commit 1a92f9cf847bc00d923076c1c0d32240b3e3dc5b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 16 03:14:19 2017 +0300
validation: ipsec: add ipv4 name parts
In preparation to add IPv6 support, add ipv4 everywhere (to test packets
and to test names).
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 294e4a5d..daafaf69 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -10,7 +10,7 @@
#include "test_vectors.h"
-static void test_in_ah_sha256(void)
+static void test_in_ipv4_ah_sha256(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -26,12 +26,12 @@ static void test_in_ah_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -40,7 +40,7 @@ static void test_in_ah_sha256(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_sha256_tun(void)
+static void test_in_ipv4_ah_sha256_tun_ipv4(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -57,12 +57,12 @@ static void test_in_ah_sha256_tun(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_tun_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_tun_ipv4_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -71,7 +71,7 @@ static void test_in_ah_sha256_tun(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_sha256_tun_notun(void)
+static void test_in_ipv4_ah_sha256_tun_ipv4_notun(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -87,12 +87,12 @@ static void test_in_ah_sha256_tun_notun(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_tun_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_tun_ipv4_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_ipip },
+ .pkt_out = &pkt_ipv4_icmp_0_ipip },
},
};
@@ -101,7 +101,7 @@ static void test_in_ah_sha256_tun_notun(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_null_sha256(void)
+static void test_in_ipv4_esp_null_sha256(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -117,12 +117,12 @@ static void test_in_esp_null_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -131,7 +131,7 @@ static void test_in_esp_null_sha256(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_aes_cbc_null(void)
+static void test_in_ipv4_esp_aes_cbc_null(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -147,12 +147,12 @@ static void test_in_esp_aes_cbc_null(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_aes_cbc_null_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_aes_cbc_null_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -161,7 +161,7 @@ static void test_in_esp_aes_cbc_null(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_aes_cbc_sha256(void)
+static void test_in_ipv4_esp_aes_cbc_sha256(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -177,12 +177,12 @@ static void test_in_esp_aes_cbc_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_aes_cbc_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_aes_cbc_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -191,7 +191,7 @@ static void test_in_esp_aes_cbc_sha256(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_aes_ctr_null(void)
+static void test_in_ipv4_esp_aes_ctr_null(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -207,12 +207,12 @@ static void test_in_esp_aes_ctr_null(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_aes_ctr_null_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_aes_ctr_null_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -221,7 +221,7 @@ static void test_in_esp_aes_ctr_null(void)
ipsec_sa_destroy(sa);
}
-static void test_in_lookup_ah_sha256(void)
+static void test_in_ipv4_ah_sha256_lookup(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -237,13 +237,13 @@ static void test_in_lookup_ah_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.lookup = 1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -252,7 +252,7 @@ static void test_in_lookup_ah_sha256(void)
ipsec_sa_destroy(sa);
}
-static void test_in_lookup_esp_null_sha256(void)
+static void test_in_ipv4_esp_null_sha256_lookup(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -268,13 +268,13 @@ static void test_in_lookup_esp_null_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.lookup = 1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -283,7 +283,7 @@ static void test_in_lookup_esp_null_sha256(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_null_sha256_tun(void)
+static void test_in_ipv4_esp_null_sha256_tun_ipv4(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -300,12 +300,12 @@ static void test_in_esp_null_sha256_tun(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_tun_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_tun_ipv4_null_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -314,7 +314,7 @@ static void test_in_esp_null_sha256_tun(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_sha256_noreplay(void)
+static void test_in_ipv4_ah_sha256_noreplay(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -331,22 +331,22 @@ static void test_in_ah_sha256_noreplay(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
ipsec_test_part test_1235 = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1235,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1235,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -358,7 +358,7 @@ static void test_in_ah_sha256_noreplay(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_sha256_replay(void)
+static void test_in_ipv4_ah_sha256_replay(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -375,17 +375,17 @@ static void test_in_ah_sha256_replay(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
ipsec_test_part test_repl = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -395,12 +395,12 @@ static void test_in_ah_sha256_replay(void)
};
ipsec_test_part test_1235 = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1235,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1235,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -412,7 +412,7 @@ static void test_in_ah_sha256_replay(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_null_sha256_noreplay(void)
+static void test_in_ipv4_esp_null_sha256_noreplay(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -429,22 +429,22 @@ static void test_in_esp_null_sha256_noreplay(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
ipsec_test_part test_1235 = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1235,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1235,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -456,7 +456,7 @@ static void test_in_esp_null_sha256_noreplay(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_null_sha256_replay(void)
+static void test_in_ipv4_esp_null_sha256_replay(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -473,17 +473,17 @@ static void test_in_esp_null_sha256_replay(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
ipsec_test_part test_repl = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -493,12 +493,12 @@ static void test_in_esp_null_sha256_replay(void)
};
ipsec_test_part test_1235 = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1235,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1235,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -510,13 +510,13 @@ static void test_in_esp_null_sha256_replay(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_esp_pkt(void)
+static void test_in_ipv4_ah_esp_pkt(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
/* This test will not work properly inbound inline mode.
- * test_in_lookup_ah_esp_pkt will be used instead. */
+ * test_in_ipv4_ah_esp_pkt_lookup will be used instead. */
if (suite_context.inbound_op_mode == ODP_IPSEC_OP_MODE_INLINE)
return;
@@ -531,7 +531,7 @@ static void test_in_ah_esp_pkt(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -545,13 +545,13 @@ static void test_in_ah_esp_pkt(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_ah_pkt(void)
+static void test_in_ipv4_esp_ah_pkt(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
/* This test will not work properly inbound inline mode.
- * test_in_lookup_esp_ah_pkt will be used instead. */
+ * test_in_ipv4_esp_ah_pkt_lookup will be used instead. */
if (suite_context.inbound_op_mode == ODP_IPSEC_OP_MODE_INLINE)
return;
@@ -566,7 +566,7 @@ static void test_in_esp_ah_pkt(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -580,7 +580,7 @@ static void test_in_esp_ah_pkt(void)
ipsec_sa_destroy(sa);
}
-static void test_in_lookup_ah_esp_pkt(void)
+static void test_in_ipv4_ah_esp_pkt_lookup(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -596,7 +596,7 @@ static void test_in_lookup_ah_esp_pkt(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1,
.lookup = 1,
.out_pkt = 1,
.out = {
@@ -611,7 +611,7 @@ static void test_in_lookup_ah_esp_pkt(void)
ipsec_sa_destroy(sa);
}
-static void test_in_lookup_esp_ah_pkt(void)
+static void test_in_ipv4_esp_ah_pkt_lookup(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -627,7 +627,7 @@ static void test_in_lookup_esp_ah_pkt(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1,
.lookup = 1,
.out_pkt = 1,
.out = {
@@ -642,7 +642,7 @@ static void test_in_lookup_esp_ah_pkt(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_sha256_bad1(void)
+static void test_in_ipv4_ah_sha256_bad1(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -658,7 +658,7 @@ static void test_in_ah_sha256_bad1(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1_bad1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -672,7 +672,7 @@ static void test_in_ah_sha256_bad1(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_sha256_bad2(void)
+static void test_in_ipv4_ah_sha256_bad2(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -688,7 +688,7 @@ static void test_in_ah_sha256_bad2(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_sha256_1_bad2,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_sha256_1_bad2,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -702,7 +702,7 @@ static void test_in_ah_sha256_bad2(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_null_sha256_bad1(void)
+static void test_in_ipv4_esp_null_sha256_bad1(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -718,7 +718,7 @@ static void test_in_esp_null_sha256_bad1(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_sha256_1_bad1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_sha256_1_bad1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
@@ -732,7 +732,7 @@ static void test_in_esp_null_sha256_bad1(void)
ipsec_sa_destroy(sa);
}
-static void test_in_rfc3602_5_esp(void)
+static void test_in_ipv4_rfc3602_5_esp(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -762,7 +762,7 @@ static void test_in_rfc3602_5_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_rfc3602_6_esp(void)
+static void test_in_ipv4_rfc3602_6_esp(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -792,7 +792,7 @@ static void test_in_rfc3602_6_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_rfc3602_7_esp(void)
+static void test_in_ipv4_rfc3602_7_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -823,7 +823,7 @@ static void test_in_rfc3602_7_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_rfc3602_8_esp(void)
+static void test_in_ipv4_rfc3602_8_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -854,7 +854,7 @@ static void test_in_rfc3602_8_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_mcgrew_gcm_2_esp(void)
+static void test_in_ipv4_mcgrew_gcm_2_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -885,7 +885,7 @@ static void test_in_mcgrew_gcm_2_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_mcgrew_gcm_3_esp(void)
+static void test_in_ipv4_mcgrew_gcm_3_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -916,7 +916,7 @@ static void test_in_mcgrew_gcm_3_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_mcgrew_gcm_4_esp(void)
+static void test_in_ipv4_mcgrew_gcm_4_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -947,7 +947,7 @@ static void test_in_mcgrew_gcm_4_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_mcgrew_gcm_12_esp(void)
+static void test_in_ipv4_mcgrew_gcm_12_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -978,7 +978,7 @@ static void test_in_mcgrew_gcm_12_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_mcgrew_gcm_15_esp(void)
+static void test_in_ipv4_mcgrew_gcm_15_esp(void)
{
odp_ipsec_tunnel_param_t tunnel = {};
odp_ipsec_sa_param_t param;
@@ -1009,7 +1009,7 @@ static void test_in_mcgrew_gcm_15_esp(void)
ipsec_sa_destroy(sa);
}
-static void test_in_ah_aes_gmac_128(void)
+static void test_in_ipv4_ah_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -1025,12 +1025,12 @@ static void test_in_ah_aes_gmac_128(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_ah_aes_gmac_128_1,
+ .pkt_in = &pkt_ipv4_icmp_0_ah_aes_gmac_128_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -1039,7 +1039,7 @@ static void test_in_ah_aes_gmac_128(void)
ipsec_sa_destroy(sa);
}
-static void test_in_esp_null_aes_gmac_128(void)
+static void test_in_ipv4_esp_null_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -1055,12 +1055,12 @@ static void test_in_esp_null_aes_gmac_128(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0_esp_null_aes_gmac_128_1,
+ .pkt_in = &pkt_ipv4_icmp_0_esp_null_aes_gmac_128_1,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -1078,71 +1078,71 @@ static void ipsec_test_capability(void)
odp_testinfo_t ipsec_in_suite[] = {
ODP_TEST_INFO(ipsec_test_capability),
- ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_5_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_rfc3602_5_esp,
ipsec_check_esp_aes_cbc_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_6_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_rfc3602_6_esp,
ipsec_check_esp_aes_cbc_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_7_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_rfc3602_7_esp,
ipsec_check_esp_aes_cbc_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_in_rfc3602_8_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_rfc3602_8_esp,
ipsec_check_esp_aes_cbc_128_null),
/* test 1, 5, 6, 8 -- 11 -- ESN */
/* test 7 -- invalid, plaintext packet includes trl into IP length */
- ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_2_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_2_esp,
ipsec_check_esp_aes_gcm_128),
- ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_3_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_3_esp,
ipsec_check_esp_aes_gcm_256),
- ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_4_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_4_esp,
ipsec_check_esp_aes_gcm_128),
- ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_12_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_12_esp,
ipsec_check_esp_aes_gcm_128),
- ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_15_esp,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_mcgrew_gcm_15_esp,
ipsec_check_esp_null_aes_gmac_128),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_tun,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv4,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_tun_notun,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_tun_ipv4_notun,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_cbc_null,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_aes_cbc_null,
ipsec_check_esp_aes_cbc_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_cbc_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_aes_cbc_sha256,
ipsec_check_esp_aes_cbc_128_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_ctr_null,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_aes_ctr_null,
ipsec_check_esp_aes_ctr_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_in_lookup_ah_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_lookup,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_lookup_esp_null_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_lookup,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_tun,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_tun_ipv4,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_noreplay,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_noreplay,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_replay,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_replay,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_noreplay,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_noreplay,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_replay,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_replay,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_esp_pkt,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_esp_pkt,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_ah_pkt,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_ah_pkt,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_lookup_ah_esp_pkt,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_esp_pkt_lookup,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_lookup_esp_ah_pkt,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_ah_pkt_lookup,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_bad1,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_bad1,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_bad2,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_sha256_bad2,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_bad1,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_sha256_bad1,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_in_ah_aes_gmac_128,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_ah_aes_gmac_128,
ipsec_check_ah_aes_gmac_128),
- ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_aes_gmac_128,
+ ODP_TEST_INFO_CONDITIONAL(test_in_ipv4_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 7d4ea4a7..757b9005 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -10,7 +10,7 @@
#include "test_vectors.h"
-static void test_out_ah_sha256(void)
+static void test_out_ipv4_ah_sha256(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -26,12 +26,12 @@ static void test_out_ah_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_ah_sha256_1 },
+ .pkt_out = &pkt_ipv4_icmp_0_ah_sha256_1 },
},
};
@@ -45,7 +45,7 @@ static void test_out_ah_sha256(void)
(c << 8) | \
(d << 0))
-static void test_out_ah_sha256_tun(void)
+static void test_out_ipv4_ah_sha256_tun_ipv4(void)
{
uint32_t src = IPV4ADDR(10, 0, 111, 2);
uint32_t dst = IPV4ADDR(10, 0, 222, 2);
@@ -69,12 +69,12 @@ static void test_out_ah_sha256_tun(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_ah_tun_sha256_1 },
+ .pkt_out = &pkt_ipv4_icmp_0_ah_tun_ipv4_sha256_1 },
},
};
@@ -83,7 +83,7 @@ static void test_out_ah_sha256_tun(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_null_sha256_out(void)
+static void test_out_ipv4_esp_null_sha256(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -99,12 +99,12 @@ static void test_out_esp_null_sha256_out(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_esp_null_sha256_1 },
+ .pkt_out = &pkt_ipv4_icmp_0_esp_null_sha256_1 },
},
};
@@ -113,7 +113,7 @@ static void test_out_esp_null_sha256_out(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_null_sha256_tun_out(void)
+static void test_out_ipv4_esp_null_sha256_tun_ipv4(void)
{
uint32_t src = IPV4ADDR(10, 0, 111, 2);
uint32_t dst = IPV4ADDR(10, 0, 222, 2);
@@ -137,12 +137,13 @@ static void test_out_esp_null_sha256_tun_out(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_esp_tun_null_sha256_1 },
+ .pkt_out =
+ &pkt_ipv4_icmp_0_esp_tun_ipv4_null_sha256_1 },
},
};
@@ -151,49 +152,7 @@ static void test_out_esp_null_sha256_tun_out(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_null_sha256(void)
-{
- odp_ipsec_sa_param_t param;
- odp_ipsec_sa_t sa;
- odp_ipsec_sa_t sa2;
-
- ipsec_sa_param_fill(¶m,
- false, false, 123, NULL,
- ODP_CIPHER_ALG_NULL, NULL,
- ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
-
- sa = odp_ipsec_sa_create(¶m);
-
- CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
-
- ipsec_sa_param_fill(¶m,
- true, false, 123, NULL,
- ODP_CIPHER_ALG_NULL, NULL,
- ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
-
- sa2 = odp_ipsec_sa_create(¶m);
-
- CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
-
- ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
- .out_pkt = 1,
- .out = {
- { .status.warn.all = 0,
- .status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
- },
- };
-
- ipsec_check_out_in_one(&test, sa, sa2);
-
- ipsec_sa_destroy(sa2);
- ipsec_sa_destroy(sa);
-}
-
-static void test_out_esp_aes_cbc_null(void)
+static void test_out_ipv4_esp_aes_cbc_null(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -220,12 +179,12 @@ static void test_out_esp_aes_cbc_null(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -235,7 +194,7 @@ static void test_out_esp_aes_cbc_null(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_aes_cbc_sha256(void)
+static void test_out_ipv4_esp_aes_cbc_sha256(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -262,12 +221,12 @@ static void test_out_esp_aes_cbc_sha256(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -277,7 +236,7 @@ static void test_out_esp_aes_cbc_sha256(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_aes_ctr_null(void)
+static void test_out_ipv4_esp_aes_ctr_null(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -304,12 +263,12 @@ static void test_out_esp_aes_ctr_null(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -319,7 +278,7 @@ static void test_out_esp_aes_ctr_null(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_aes_gcm128(void)
+static void test_out_ipv4_esp_aes_gcm128(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -346,12 +305,12 @@ static void test_out_esp_aes_gcm128(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0 },
+ .pkt_out = &pkt_ipv4_icmp_0 },
},
};
@@ -361,7 +320,7 @@ static void test_out_esp_aes_gcm128(void)
ipsec_sa_destroy(sa);
}
-static void test_out_ah_aes_gmac_128(void)
+static void test_out_ipv4_ah_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -377,12 +336,12 @@ static void test_out_ah_aes_gmac_128(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_ah_aes_gmac_128_1 },
+ .pkt_out = &pkt_ipv4_icmp_0_ah_aes_gmac_128_1 },
},
};
@@ -391,7 +350,7 @@ static void test_out_ah_aes_gmac_128(void)
ipsec_sa_destroy(sa);
}
-static void test_out_esp_null_aes_gmac_128(void)
+static void test_out_ipv4_esp_null_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
odp_ipsec_sa_t sa;
@@ -407,12 +366,12 @@ static void test_out_esp_null_aes_gmac_128(void)
CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
ipsec_test_part test = {
- .pkt_in = &pkt_icmp_0,
+ .pkt_in = &pkt_ipv4_icmp_0,
.out_pkt = 1,
.out = {
{ .status.warn.all = 0,
.status.error.all = 0,
- .pkt_out = &pkt_icmp_0_esp_null_aes_gmac_128_1 },
+ .pkt_out = &pkt_ipv4_icmp_0_esp_null_aes_gmac_128_1 },
},
};
@@ -430,27 +389,25 @@ static void ipsec_test_capability(void)
odp_testinfo_t ipsec_out_suite[] = {
ODP_TEST_INFO(ipsec_test_capability),
- ODP_TEST_INFO_CONDITIONAL(test_out_ah_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_out_ah_sha256_tun,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_sha256_tun_ipv4,
ipsec_check_ah_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_sha256_out,
- ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_sha256_tun_out,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_sha256_tun_ipv4,
ipsec_check_esp_null_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_cbc_null,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_cbc_null,
ipsec_check_esp_aes_cbc_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_cbc_sha256,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_cbc_sha256,
ipsec_check_esp_aes_cbc_128_sha256),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_ctr_null,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_ctr_null,
ipsec_check_esp_aes_ctr_128_null),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_gcm128,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_aes_gcm128,
ipsec_check_esp_aes_gcm_128),
- ODP_TEST_INFO_CONDITIONAL(test_out_ah_aes_gmac_128,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_ah_aes_gmac_128,
ipsec_check_ah_aes_gmac_128),
- ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_aes_gmac_128,
+ ODP_TEST_INFO_CONDITIONAL(test_out_ipv4_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 7fb7d5a8..51aa97cc 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -49,7 +49,7 @@ KEY(key_mcgrew_gcm_15, 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda,
0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34);
KEY(key_mcgrew_gcm_salt_15, 0x22, 0x43, 0x3c, 0x64);
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0 = {
.len = 142,
.l2_offset = 0,
.l3_offset = 14,
@@ -82,7 +82,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ipip = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ipip = {
.len = 162,
.l2_offset = 0,
.l3_offset = 14,
@@ -120,7 +120,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ipip = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -159,7 +159,8 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_tun_sha256_1 = {
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_ah_tun_ipv4_sha256_1 = {
.len = 190,
.l2_offset = 0,
.l3_offset = 14,
@@ -203,7 +204,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_tun_sha256_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad1 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1_bad1 = {
.len = 168,
.l2_offset = 0,
.l3_offset = 14,
@@ -242,7 +243,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad2 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1_bad2 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -281,7 +282,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad2 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1235 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_sha256_1235 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -325,7 +326,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1235 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_esp_null_sha256_1 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -368,7 +369,8 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_tun_null_sha256_1 = {
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_tun_ipv4_null_sha256_1 = {
.len = 190,
.l2_offset = 0,
.l3_offset = 14,
@@ -416,7 +418,8 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_tun_null_sha256_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1_bad1 = {
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_null_sha256_1_bad1 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -459,7 +462,8 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1_bad1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1235 = {
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_null_sha256_1235 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -502,7 +506,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1235 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_null_1 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_esp_aes_cbc_null_1 = {
.len = 170,
.l2_offset = 0,
.l3_offset = 14,
@@ -542,7 +546,8 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_null_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_sha256_1 = {
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_aes_cbc_sha256_1 = {
.len = 186,
.l2_offset = 0,
.l3_offset = 14,
@@ -586,7 +591,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_sha256_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_ctr_null_1 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_esp_aes_ctr_null_1 = {
.len = 162,
.l2_offset = 0,
.l3_offset = 14,
@@ -625,7 +630,7 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_ctr_null_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_aes_gmac_128_1 = {
+static const ODP_UNUSED ipsec_test_packet pkt_ipv4_icmp_0_ah_aes_gmac_128_1 = {
.len = 178,
.l2_offset = 0,
.l3_offset = 14,
@@ -665,7 +670,8 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_aes_gmac_128_1 = {
},
};
-static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_aes_gmac_128_1 = {
+static const ODP_UNUSED ipsec_test_packet
+ pkt_ipv4_icmp_0_esp_null_aes_gmac_128_1 = {
.len = 178,
.l2_offset = 0,
.l3_offset = 14,
-----------------------------------------------------------------------
Summary of changes:
.../include/odp/api/plat/packet_types.h | 1 +
.../linux-generic/include/odp_ipsec_internal.h | 49 +-
.../linux-generic/include/odp_packet_internal.h | 2 +-
platform/linux-generic/include/protocols/ip.h | 2 +
platform/linux-generic/include/protocols/udp.h | 2 +
platform/linux-generic/odp_ipsec.c | 1418 +++++++++++++-------
platform/linux-generic/odp_ipsec_sad.c | 82 +-
platform/linux-generic/odp_packet.c | 11 +
platform/linux-generic/pktio/loop.c | 1 +
test/validation/api/ipsec/ipsec.c | 18 +-
test/validation/api/ipsec/ipsec.h | 2 +
test/validation/api/ipsec/ipsec_test_in.c | 630 +++++++--
test/validation/api/ipsec/ipsec_test_out.c | 664 ++++++++-
test/validation/api/ipsec/test_vectors.h | 610 ++++++++-
14 files changed, 2739 insertions(+), 753 deletions(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch devel/native-drivers updated. v1.15.0.0-953-g121a1e14
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/native-drivers has been updated
via 121a1e14d0b3b205420df876587ec1e8ef4cf723 (commit)
from 6336beb21e88eef30fbfcd415e6d038c96f4343d (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 121a1e14d0b3b205420df876587ec1e8ef4cf723
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Thu Dec 14 15:45:12 2017 +0100
physmem: rename init/term functions
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/pktio/physmem/physmem.c b/platform/linux-generic/pktio/physmem/physmem.c
index 54b62d2d..b426c21d 100644
--- a/platform/linux-generic/pktio/physmem/physmem.c
+++ b/platform/linux-generic/pktio/physmem/physmem.c
@@ -544,7 +544,7 @@ static void init_blocks(void)
LIST_INIT(&block_data.empty);
}
-int physmem_block_global_init(void)
+int physmem_block_init_global(void)
{
init_blocks();
@@ -557,7 +557,7 @@ int physmem_block_global_init(void)
return 0;
}
-int physmem_block_global_term(void)
+int physmem_block_term_global(void)
{
for (int i = 0; i < MAX_HUGEPAGES; ++i) {
if (pages[i].fd == 0)
diff --git a/platform/linux-generic/pktio/physmem/physmem.h b/platform/linux-generic/pktio/physmem/physmem.h
index 0ebc2ba6..9a7f37c4 100644
--- a/platform/linux-generic/pktio/physmem/physmem.h
+++ b/platform/linux-generic/pktio/physmem/physmem.h
@@ -32,8 +32,8 @@ struct physmem_block {
physmem_block_type_t type;
};
-int physmem_block_global_init(void);
-int physmem_block_global_term(void);
+int physmem_block_init_global(void);
+int physmem_block_term_global(void);
struct physmem_block *physmem_block_alloc(uint64_t);
void physmem_block_free(struct physmem_block *);
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/pktio/physmem/physmem.c | 4 ++--
platform/linux-generic/pktio/physmem/physmem.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-693-gda9d347e
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 da9d347e0bbe337ea86448306432080206f3ef49 (commit)
via d533d85ad15ea431a431c407dad468e38ae87ec0 (commit)
via fa7ce5da4b669e55b8d34c7d90b67070879ba5da (commit)
from d96a8207591fbcaac25b79286d7d72a537354c1f (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 da9d347e0bbe337ea86448306432080206f3ef49
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 21 14:12:02 2017 +0200
validation: queue: refer to blocking level
Refer to the new blocking level capability and parameter
fields to check that those exist.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index 1ec05b1f..3c6db33a 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -69,6 +69,8 @@ void queue_test_capa(void)
CU_ASSERT(capa.sched_prios != 0);
CU_ASSERT(capa.plain.max_num != 0);
CU_ASSERT(capa.sched.max_num != 0);
+ CU_ASSERT(capa.plain.nonblocking >= ODP_BLOCKING);
+ CU_ASSERT(capa.sched.nonblocking >= ODP_BLOCKING);
min = capa.plain.max_num;
if (min > capa.sched.max_num)
@@ -82,6 +84,7 @@ void queue_test_capa(void)
name[ODP_QUEUE_NAME_LEN - 1] = 0;
odp_queue_param_init(&qparams);
+ CU_ASSERT(qparams.nonblocking == ODP_BLOCKING);
for (j = 0; j < 2; j++) {
if (j == 0) {
commit d533d85ad15ea431a431c407dad468e38ae87ec0
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 21 13:52:00 2017 +0200
linux-gen: queue: fill blocking capa
Currently, only blocking queues are implemented.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index 3f355e69..58103930 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -150,7 +150,9 @@ static int queue_capability(odp_queue_capability_t *capa)
capa->max_sched_groups = sched_fn->num_grps();
capa->sched_prios = odp_schedule_num_prio();
capa->plain.max_num = capa->max_queues;
+ capa->plain.nonblocking = ODP_BLOCKING;
capa->sched.max_num = capa->max_queues;
+ capa->sched.nonblocking = ODP_BLOCKING;
return 0;
}
@@ -601,6 +603,7 @@ static void queue_param_init(odp_queue_param_t *params)
params->type = ODP_QUEUE_TYPE_PLAIN;
params->enq_mode = ODP_QUEUE_OP_MT;
params->deq_mode = ODP_QUEUE_OP_MT;
+ params->nonblocking = ODP_BLOCKING;
params->sched.prio = ODP_SCHED_PRIO_DEFAULT;
params->sched.sync = ODP_SCHED_SYNC_PARALLEL;
params->sched.group = ODP_SCHED_GROUP_ALL;
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 07201ce7..88a5a8c2 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -315,8 +315,10 @@ static int queue_capability(odp_queue_capability_t *capa)
capa->sched_prios = odp_schedule_num_prio();
capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
capa->plain.max_size = 0;
+ capa->plain.nonblocking = ODP_BLOCKING;
capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
capa->sched.max_size = 0;
+ capa->sched.nonblocking = ODP_BLOCKING;
return 0;
}
@@ -861,6 +863,7 @@ static void queue_param_init(odp_queue_param_t *params)
params->type = ODP_QUEUE_TYPE_PLAIN;
params->enq_mode = ODP_QUEUE_OP_MT;
params->deq_mode = ODP_QUEUE_OP_MT;
+ params->nonblocking = ODP_BLOCKING;
params->sched.prio = ODP_SCHED_PRIO_DEFAULT;
params->sched.sync = ODP_SCHED_SYNC_PARALLEL;
params->sched.group = ODP_SCHED_GROUP_ALL;
commit fa7ce5da4b669e55b8d34c7d90b67070879ba5da
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 21 13:41:14 2017 +0200
api: queue: non-blocking level parameter
Add queue parameter and capability to indicate queue operation
blocking level. This guarantee of non-blocking is important for
real-time applications. HW based implementations may be always
non-blocking. Where as, SW based implementation need to trade-off
between block freedom and performance.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(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/queue.h b/include/odp/api/spec/queue.h
index 014d3362..79a26df3 100644
--- a/include/odp/api/spec/queue.h
+++ b/include/odp/api/spec/queue.h
@@ -96,6 +96,54 @@ typedef enum odp_queue_op_mode_t {
} odp_queue_op_mode_t;
+/**
+ * Non-blocking level
+ *
+ * A non-blocking level defines implementation guarantees for application
+ * progress when multiple threads operate on the same resource (e.g. a queue)
+ * simultaneously. The first level (ODP_BLOCKING) does not have any block
+ * freedom guarantees, but a suspending thread may block the other threads for
+ * the entire time it remains suspended (infinitely if crashed).
+ * On the contrary, actual non-blocking levels provide guarantees of progress:
+ *
+ * ODP_NONBLOCKING_LF: A non-blocking and lock-free implementation guarantees
+ * that at least one of the threads successfully completes
+ * its operations, regardless of what other threads do.
+ * Application progress is guaranteed, but individual
+ * threads may starve while trying to execute their
+ * operations on the shared resource.
+ *
+ * ODP_NONBLOCKING_WF: A non-blocking and wait-free implementation guarantees
+ * application progress with starvation freedom. All
+ * threads are guaranteed to complete their operations in
+ * a bounded number of steps, regardless of what other
+ * threads do.
+ *
+ * Non-blocking levels are listed from the weakest to the strongest guarantee of
+ * block freedom. Performance of a non-blocking implementation may be lower than
+ * the blocking one. Non-blocking guarantees are important e.g. for real-time
+ * applications when real-time and non real-time threads share a resource.
+ */
+typedef enum odp_nonblocking_t {
+ /** Blocking implementation. A suspeding thread may block all other
+ * threads, i.e. no block freedom guarantees. This is the lowest level.
+ */
+ ODP_BLOCKING = 0,
+
+ /** Non-blocking and lock-free implementation. Other threads can make
+ * progress while a thread is suspended. Starvation freedom is not
+ * guaranteed.
+ */
+ ODP_NONBLOCKING_LF,
+
+ /** Non-blocking and wait-free implementation. Other threads can make
+ * progress while a thread is suspended. Starvation freedom is
+ * guaranteed.
+ */
+ ODP_NONBLOCKING_WF
+
+} odp_nonblocking_t;
+
/**
* Queue capabilities
*/
@@ -125,6 +173,10 @@ typedef struct odp_queue_capability_t {
* store all available events. */
uint32_t max_size;
+ /** The strongest guarantee of block freedom that is supported
+ * for plain queues. */
+ odp_nonblocking_t nonblocking;
+
} plain;
/** Scheduled queue capabilities */
@@ -138,6 +190,10 @@ typedef struct odp_queue_capability_t {
* store all available events. */
uint32_t max_size;
+ /** The strongest guarantee of block freedom that is supported
+ * for scheduled queues. */
+ odp_nonblocking_t nonblocking;
+
} sched;
} odp_queue_capability_t;
@@ -178,6 +234,13 @@ typedef struct odp_queue_param_t {
* ODP_QUEUE_TYPE_SCHED. */
odp_schedule_param_t sched;
+ /** Non-blocking level
+ *
+ * Queue implementation must guarantee at least this level of block
+ * freedom for queue enqueue and dequeue/schedule operations.
+ * The default value is ODP_BLOCKING. */
+ odp_nonblocking_t nonblocking;
+
/** Queue context pointer
*
* User defined context pointer associated with the queue. The same
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/queue.h | 63 +++++++++++++++++++++++++++++
platform/linux-generic/odp_queue.c | 3 ++
platform/linux-generic/odp_queue_scalable.c | 3 ++
test/validation/api/queue/queue.c | 3 ++
4 files changed, 72 insertions(+)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-29-g6b5cdc77
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 6b5cdc77eb9759a2349b10372a964648559bc92c (commit)
via bb0ec2f991bc5b295928e87c8b9bc0efb92479d3 (commit)
via ffcd7991e44109464fb8a71f9ee10546ea5b84b0 (commit)
from 6881620135a179911a5839d4be97423a8d80e5ab (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 6b5cdc77eb9759a2349b10372a964648559bc92c
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Mon Dec 11 11:04:57 2017 -0600
linux-generic: pool: avoid direct use of printf() in odp_pool_print()
Use ODP_PRINT() rather than printf() to send output through the
log function.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <onnappa.nagarahalli(a)arm.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index d0e4674f..abd5ef07 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -924,33 +924,33 @@ void odp_pool_print(odp_pool_t pool_hdl)
pool = pool_entry_from_hdl(pool_hdl);
- printf("\nPool info\n");
- printf("---------\n");
- printf(" pool %" PRIu64 "\n",
- odp_pool_to_u64(pool->pool_hdl));
- printf(" name %s\n", pool->name);
- printf(" pool type %s\n",
- pool->params.type == ODP_POOL_BUFFER ? "buffer" :
- (pool->params.type == ODP_POOL_PACKET ? "packet" :
- (pool->params.type == ODP_POOL_TIMEOUT ? "timeout" :
- "unknown")));
- printf(" pool shm %" PRIu64 "\n",
- odp_shm_to_u64(pool->shm));
- printf(" user area shm %" PRIu64 "\n",
- odp_shm_to_u64(pool->uarea_shm));
- printf(" num %u\n", pool->num);
- printf(" align %u\n", pool->align);
- printf(" headroom %u\n", pool->headroom);
- printf(" seg len %u\n", pool->seg_len);
- printf(" max data len %u\n", pool->max_len);
- printf(" tailroom %u\n", pool->tailroom);
- printf(" block size %u\n", pool->block_size);
- printf(" uarea size %u\n", pool->uarea_size);
- printf(" shm size %u\n", pool->shm_size);
- printf(" base addr %p\n", pool->base_addr);
- printf(" uarea shm size %u\n", pool->uarea_shm_size);
- printf(" uarea base addr %p\n", pool->uarea_base_addr);
- printf("\n");
+ ODP_PRINT("\nPool info\n");
+ ODP_PRINT("---------\n");
+ ODP_PRINT(" pool %" PRIu64 "\n",
+ odp_pool_to_u64(pool->pool_hdl));
+ ODP_PRINT(" name %s\n", pool->name);
+ ODP_PRINT(" pool type %s\n",
+ pool->params.type == ODP_POOL_BUFFER ? "buffer" :
+ (pool->params.type == ODP_POOL_PACKET ? "packet" :
+ (pool->params.type == ODP_POOL_TIMEOUT ? "timeout" :
+ "unknown")));
+ ODP_PRINT(" pool shm %" PRIu64 "\n",
+ odp_shm_to_u64(pool->shm));
+ ODP_PRINT(" user area shm %" PRIu64 "\n",
+ odp_shm_to_u64(pool->uarea_shm));
+ ODP_PRINT(" num %u\n", pool->num);
+ ODP_PRINT(" align %u\n", pool->align);
+ ODP_PRINT(" headroom %u\n", pool->headroom);
+ ODP_PRINT(" seg len %u\n", pool->seg_len);
+ ODP_PRINT(" max data len %u\n", pool->max_len);
+ ODP_PRINT(" tailroom %u\n", pool->tailroom);
+ ODP_PRINT(" block size %u\n", pool->block_size);
+ ODP_PRINT(" uarea size %u\n", pool->uarea_size);
+ ODP_PRINT(" shm size %u\n", pool->shm_size);
+ ODP_PRINT(" base addr %p\n", pool->base_addr);
+ ODP_PRINT(" uarea shm size %u\n", pool->uarea_shm_size);
+ ODP_PRINT(" uarea base addr %p\n", pool->uarea_base_addr);
+ ODP_PRINT("\n");
}
odp_pool_t odp_buffer_pool(odp_buffer_t buf)
commit bb0ec2f991bc5b295928e87c8b9bc0efb92479d3
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Mon Dec 11 11:03:49 2017 -0600
linux-generic: pool: avoid direct use of printf() in check_params
Use ODP_DBG() for diagnostic error prints rather than direct use
of printf(). This allows errors to be output conditionally and via
the log function.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <onnappa.nagarahalli(a)arm.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index b3c65236..d0e4674f 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -534,17 +534,17 @@ static int check_params(odp_pool_param_t *params)
switch (params->type) {
case ODP_POOL_BUFFER:
if (params->buf.num > capa.buf.max_num) {
- printf("buf.num too large %u\n", params->buf.num);
+ ODP_DBG("buf.num too large %u\n", params->buf.num);
return -1;
}
if (params->buf.size > capa.buf.max_size) {
- printf("buf.size too large %u\n", params->buf.size);
+ ODP_DBG("buf.size too large %u\n", params->buf.size);
return -1;
}
if (params->buf.align > capa.buf.max_align) {
- printf("buf.align too large %u\n", params->buf.align);
+ ODP_DBG("buf.align too large %u\n", params->buf.align);
return -1;
}
@@ -552,25 +552,25 @@ static int check_params(odp_pool_param_t *params)
case ODP_POOL_PACKET:
if (params->pkt.len > capa.pkt.max_len) {
- printf("pkt.len too large %u\n", params->pkt.len);
+ ODP_DBG("pkt.len too large %u\n", params->pkt.len);
return -1;
}
if (params->pkt.max_len > capa.pkt.max_len) {
- printf("pkt.max_len too large %u\n",
- params->pkt.max_len);
+ ODP_DBG("pkt.max_len too large %u\n",
+ params->pkt.max_len);
return -1;
}
if (params->pkt.seg_len > capa.pkt.max_seg_len) {
- printf("pkt.seg_len too large %u\n",
- params->pkt.seg_len);
+ ODP_DBG("pkt.seg_len too large %u\n",
+ params->pkt.seg_len);
return -1;
}
if (params->pkt.uarea_size > capa.pkt.max_uarea_size) {
- printf("pkt.uarea_size too large %u\n",
- params->pkt.uarea_size);
+ ODP_DBG("pkt.uarea_size too large %u\n",
+ params->pkt.uarea_size);
return -1;
}
@@ -578,13 +578,13 @@ static int check_params(odp_pool_param_t *params)
case ODP_POOL_TIMEOUT:
if (params->tmo.num > capa.tmo.max_num) {
- printf("tmo.num too large %u\n", params->tmo.num);
+ ODP_DBG("tmo.num too large %u\n", params->tmo.num);
return -1;
}
break;
default:
- printf("bad pool type %i\n", params->type);
+ ODP_DBG("bad pool type %i\n", params->type);
return -1;
}
commit ffcd7991e44109464fb8a71f9ee10546ea5b84b0
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Dec 6 17:31:08 2017 -0600
linux-generic: pool: validate params before creating pool
Enhance the check_params() routine to verify that params != NULL
prior to dereferencing it.
This fixes Bug https://bugs.linaro.org/show_bug.cgi?id=3465
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Honnappa Nagarahalli <onnappa.nagarahalli(a)arm.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index c0dd41eb..b3c65236 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -352,11 +352,6 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
const char *postfix = "_uarea";
char uarea_name[ODP_POOL_NAME_LEN + sizeof(postfix)];
- if (params == NULL) {
- ODP_ERR("No params");
- return ODP_POOL_INVALID;
- }
-
align = 0;
if (params->type == ODP_POOL_BUFFER)
@@ -533,7 +528,7 @@ static int check_params(odp_pool_param_t *params)
{
odp_pool_capability_t capa;
- if (odp_pool_capability(&capa) < 0)
+ if (!params || odp_pool_capability(&capa) < 0)
return -1;
switch (params->type) {
@@ -603,7 +598,7 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params)
if (check_params(params))
return ODP_POOL_INVALID;
- if (params && (params->type == ODP_POOL_PACKET))
+ if (params->type == ODP_POOL_PACKET)
shm_flags = ODP_SHM_PROC;
return pool_create(name, params, shm_flags);
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/odp_pool.c | 87 ++++++++++++++++++---------------------
1 file changed, 41 insertions(+), 46 deletions(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch devel/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, devel/caterpillar has been created
at 63fd88635cc10caaa02fdccd3f52c9494487bdd2 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-690-gd96a8207
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 d96a8207591fbcaac25b79286d7d72a537354c1f (commit)
via 21ed0fc8045e32e3263f5782401dbfe860152965 (commit)
from 87d47c93d93ed934af9502937d2aceaec59d229a (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 d96a8207591fbcaac25b79286d7d72a537354c1f
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Dec 11 14:45:17 2017 +0200
validation: shm: add name tests
Test shm blocks with NULL and maximum length names.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c
index d1abc62b..30eb08da 100644
--- a/test/validation/api/shmem/shmem.c
+++ b/test/validation/api/shmem/shmem.c
@@ -136,24 +136,59 @@ void shmem_test_basic(void)
odp_shm_t shm2;
shared_test_data_t *shared_test_data;
odp_cpumask_t unused;
+ int i;
+ char max_name[ODP_SHM_NAME_LEN];
+
+ for (i = 0; i < ODP_SHM_NAME_LEN; i++)
+ max_name[i] = 'A' + (i % 26);
+
+ max_name[ODP_QUEUE_NAME_LEN - 1] = 0;
+
+ /* NULL name */
+ shm = odp_shm_reserve(NULL,
+ sizeof(shared_test_data_t), ALIGN_SIZE, 0);
+ CU_ASSERT(ODP_SHM_INVALID != shm);
+ shared_test_data = odp_shm_addr(shm);
+ CU_ASSERT_FATAL(NULL != shared_test_data);
+ shared_test_data->foo = 0;
+ CU_ASSERT(0 == odp_shm_free(shm));
+
+ /* Maximum length name */
+ shm = odp_shm_reserve(max_name,
+ sizeof(shared_test_data_t), ALIGN_SIZE, 0);
+ CU_ASSERT(ODP_SHM_INVALID != shm);
+ shm2 = odp_shm_lookup(max_name);
+ CU_ASSERT(ODP_SHM_INVALID != shm2);
+ CU_ASSERT(odp_shm_addr(shm) == odp_shm_addr(shm2));
+ shared_test_data = odp_shm_addr(shm);
+ CU_ASSERT_FATAL(NULL != shared_test_data);
+ shared_test_data->foo = 0;
+ CU_ASSERT(0 == odp_shm_free(shm));
+ /* Non-unique name */
shm = odp_shm_reserve(MEM_NAME,
sizeof(shared_test_data_t), ALIGN_SIZE, 0);
CU_ASSERT(ODP_SHM_INVALID != shm);
CU_ASSERT(odp_shm_to_u64(shm) !=
odp_shm_to_u64(ODP_SHM_INVALID));
-
- /* also check that another reserve with same name is accepted: */
shm2 = odp_shm_reserve(MEM_NAME,
sizeof(shared_test_data_t), ALIGN_SIZE, 0);
CU_ASSERT(ODP_SHM_INVALID != shm2);
CU_ASSERT(odp_shm_to_u64(shm2) !=
odp_shm_to_u64(ODP_SHM_INVALID));
+ CU_ASSERT(odp_shm_addr(shm) != odp_shm_addr(shm2));
+ shared_test_data = odp_shm_addr(shm);
+ CU_ASSERT_FATAL(NULL != shared_test_data);
+ shared_test_data->foo = 0;
+ shared_test_data = odp_shm_addr(shm2);
+ CU_ASSERT_FATAL(NULL != shared_test_data);
+ shared_test_data->foo = 0;
CU_ASSERT(0 == odp_shm_free(shm));
CU_ASSERT(0 == odp_shm_free(shm2));
CU_ASSERT(ODP_SHM_INVALID == odp_shm_lookup(MEM_NAME));
+ /* Share with multiple threads */
shm = odp_shm_reserve(MEM_NAME,
sizeof(shared_test_data_t), ALIGN_SIZE, 0);
CU_ASSERT(ODP_SHM_INVALID != shm);
commit 21ed0fc8045e32e3263f5782401dbfe860152965
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Dec 11 14:22:16 2017 +0200
api: shm: name is optional
Align shared memory name parameter specification with other
APIs. Name is optional and does not need to be unique, except
when it's used for lookups.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h
index 60a0cdde..38c82a10 100644
--- a/include/odp/api/spec/shared_memory.h
+++ b/include/odp/api/spec/shared_memory.h
@@ -127,7 +127,14 @@ int odp_shm_capability(odp_shm_capability_t *capa);
/**
* Reserve a contiguous block of shared memory
*
- * @param name Name of the block (maximum ODP_SHM_NAME_LEN - 1 chars)
+ * Reserve a contiguous block of shared memory that fulfills size, alignment
+ * and shareability (ODP_SHM_* flags) requirements. In general, a name is
+ * optional and does not need to be unique. However, if the block will be
+ * searched with odp_shm_lookup() or odp_shm_import(), a unique name is needed
+ * for correct match.
+ *
+ * @param name Name of the block or NULL. Maximum string length is
+ * ODP_SHM_NAME_LEN.
* @param size Block size in bytes
* @param align Block alignment in bytes
* @param flags Shared memory parameter flags (ODP_SHM_*). Default value is 0.
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/shared_memory.h | 9 ++++++++-
test/validation/api/shmem/shmem.c | 39 ++++++++++++++++++++++++++++++++++--
2 files changed, 45 insertions(+), 3 deletions(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-688-g87d47c93
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 87d47c93d93ed934af9502937d2aceaec59d229a (commit)
from bcbbe7e92c5a9510735a541d06342cc4923e5bbd (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 87d47c93d93ed934af9502937d2aceaec59d229a
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Dec 11 15:21:05 2017 +0200
api: crypto: typo correction
Subtype PACKET_CRYPTO in capital letters.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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 2109509f..293c15c6 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -830,7 +830,7 @@ odp_event_t odp_crypto_packet_to_event(odp_packet_t pkt);
* Successful crypto operations of all types (SYNC and ASYNC) produce packets
* which contain crypto result metadata. This function copies the operation
* results from an crypto processed packet. Event subtype of this kind of
- * packet is ODP_EVENT_PACKET_crypto. Results are undefined if a non-crypto
+ * packet is ODP_EVENT_PACKET_CRYPTO. Results are undefined if a non-crypto
* processed packet is passed as input.
*
* @param packet An crypto processed packet (ODP_EVENT_PACKET_CRYPTO)
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/crypto.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-687-gbcbbe7e9
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 bcbbe7e92c5a9510735a541d06342cc4923e5bbd (commit)
via 99a2871375955861c46a271162e86a4ac13a2d8b (commit)
via fe7221162f62b820b053a8b12fa2b11005769693 (commit)
via 4612aa0de04cea3b7dc1b74678a9b25d2bc832b0 (commit)
via 76997bb4087981751966df0fa1d0897486a3da1d (commit)
from 65d690fbcf03c6a4d5eb3f01bde36807833feaaa (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 bcbbe7e92c5a9510735a541d06342cc4923e5bbd
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 8 15:21:54 2017 +0200
linux-gen: packet: set next layer offsets allways
Update implementation to follow API change of layer offsets.
Set L3 offset always after successful L2 parse. Set L4 offset
always after successful L3 parse.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 4e74d269..5b5a9827 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -2198,11 +2198,12 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
{
uint8_t ip_proto;
+ prs->l3_offset = offset;
+
if (layer <= ODP_PKTIO_PARSER_LAYER_L2)
return prs->error_flags.all != 0;
- /* Set l3_offset+flag only for known ethtypes */
- prs->l3_offset = offset;
+ /* Set l3 flag only for known ethtypes */
prs->input_flags.l3 = 1;
/* Parse Layer 3 headers */
@@ -2210,12 +2211,14 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
case _ODP_ETHTYPE_IPV4:
prs->input_flags.ipv4 = 1;
ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len);
+ prs->l4_offset = offset;
break;
case _ODP_ETHTYPE_IPV6:
prs->input_flags.ipv6 = 1;
ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len,
seg_len);
+ prs->l4_offset = offset;
break;
case _ODP_ETHTYPE_ARP:
@@ -2225,15 +2228,13 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
default:
prs->input_flags.l3 = 0;
- prs->l3_offset = ODP_PACKET_OFFSET_INVALID;
ip_proto = 255; /* Reserved invalid by IANA */
}
if (layer == ODP_PKTIO_PARSER_LAYER_L3)
return prs->error_flags.all != 0;
- /* Set l4_offset+flag only for known ip_proto */
- prs->l4_offset = offset;
+ /* Set l4 flag only for known ip_proto */
prs->input_flags.l4 = 1;
/* Parse Layer 4 headers */
@@ -2279,7 +2280,6 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
default:
prs->input_flags.l4 = 0;
- prs->l4_offset = ODP_PACKET_OFFSET_INVALID;
break;
}
commit 99a2871375955861c46a271162e86a4ac13a2d8b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 8 14:22:10 2017 +0200
api: parse: set next layer offset
Explicitly require that implementation sets the next layer
offset after user defined last parse layer. Next layer offset
can be set without checking the layer itself. For example:
l4_offset = l3_offset + l3_hdr_len
Also renamed packet_parse_param 'layer' to 'last_layer' since
it's documenting the usage better:
parse.proto = ODP_PROTO_IPV4;
parse.last_layer = ODP_PROTO_LAYER_L4;
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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 6f00a2c9..538472a5 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -148,10 +148,15 @@ typedef struct odp_ipsec_inbound_config_t {
/** Parse packet headers after IPSEC transformation
*
* Select header parsing level after inbound processing. Headers of the
- * resulting packet must be parsed (at least) up to this level. Parsing
- * starts from IP (layer 3). Each successfully transformed packet has
- * a valid value for L3 offset regardless of the parse configuration.
- * Default value is ODP_IPSEC_LAYER_NONE.
+ * resulting packet must be checked (at least) up to this level.
+ * Parsing starts from IP (layer 3). Packet metadata from IP to this
+ * layer is set. In addition, offset (and pointer) to the next layer
+ * is set. Other layer/protocol specific metadata have undefined
+ * values.
+ *
+ * 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_ipsec_proto_layer_t parse;
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index 02333fe1..3655f589 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -1246,7 +1246,7 @@ typedef struct odp_packet_parse_param_t {
/** Continue parsing until this layer. Must be the same or higher
* layer than the layer of 'proto'. */
- odp_proto_layer_t layer;
+ odp_proto_layer_t last_layer;
/** Flags to control payload data checksums checks up to the selected
* parse layer. Checksum checking status can be queried for each packet
@@ -1260,19 +1260,21 @@ typedef struct odp_packet_parse_param_t {
/**
* Parse packet
*
- * Parse protocol headers in packet data. Parsing starts at 'offset', which
- * is the first header byte of protocol 'param.proto'. Parameter 'param.layer'
- * defines the last layer application is interested about.
- * Use ODP_PROTO_LAYER_ALL for all layers. A successful operation sets or resets
- * packet metadata for all layers from the layer of 'param.proto' to the
- * application defined last layer. Metadata of other layers have undefined
- * values. When operation fails, metadata of all protocol layers have undefined
- * values.
+ * Parse protocol headers in packet data and update layer/protocol specific
+ * metadata (e.g. offsets, errors, protocols, checksum statuses, etc). Parsing
+ * starts at 'offset', which is the first header byte of protocol 'param.proto'.
+ * Parameter 'param.last_layer' defines the last layer application requests
+ * to check. Use ODP_PROTO_LAYER_ALL for all layers. A successful operation
+ * sets (or resets) packet metadata for all layers from the layer of
+ * 'param.proto' to the application defined last layer. In addition, offset
+ * (and pointer) to the next layer is set. Other layer/protocol specific
+ * metadata have undefined values. When operation fails, all layer/protocol
+ * specific metadata have undefined values.
*
* @param pkt Packet handle
* @param offset Byte offset into the packet
- * @param param Parse parameters. Proto and layer fields must be set. Clear
- * all check bits that are not used.
+ * @param param Parse parameters. Proto and last_layer fields must be set.
+ * Clear all check bits that are not used.
*
* @retval 0 on success
* @retval <0 on failure
@@ -1284,14 +1286,14 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset,
* Parse multiple packets
*
* Otherwise like odp_packet_parse(), but parses multiple packets. Packets may
- * have unique offsets, but must start with the same protocol. Also, packets are
- * parsed up to the same protocol layer.
+ * have unique offsets, but must start with the same protocol. The same
+ * parse parameters are applied to all packets.
*
* @param pkt Packet handle array
* @param offset Byte offsets into the packets
* @param num Number of packets and offsets
- * @param param Parse parameters. Proto and layer fields must be set. Clear
- * all check bits that are not used.
+ * @param param Parse parameters. Proto and last_layer fields must be set.
+ * Clear all check bits that are not used.
*
* @return Number of packets parsed successfully (0 ... num)
* @retval <0 on failure
diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h
index d25afa3e..a3312d28 100644
--- a/include/odp/api/spec/packet_io.h
+++ b/include/odp/api/spec/packet_io.h
@@ -430,8 +430,13 @@ typedef enum odp_pktio_parser_layer_t {
typedef struct odp_pktio_parser_config_t {
/** Protocol parsing level in packet input
*
- * Parse protocol layers in minimum up to this level during packet
- * input. The default value is ODP_PKTIO_PARSER_LAYER_ALL. */
+ * Application requires that protocol headers in a packet are checked
+ * up to this layer during packet input. Use ODP_PROTO_LAYER_ALL for
+ * all layers. Packet metadata for this and all preceding layers are
+ * 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;
} odp_pktio_parser_config_t;
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 222fa8c8..4e74d269 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -2355,7 +2355,7 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset,
uint32_t seg_len;
uint32_t packet_len = pkt_hdr->frame_len;
odp_proto_t proto = param->proto;
- odp_proto_layer_t layer = param->layer;
+ odp_proto_layer_t layer = param->last_layer;
int ret;
uint16_t ethtype;
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index b3ef6980..1dbacb1f 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -2512,7 +2512,7 @@ void packet_test_parse(void)
}
parse.proto = ODP_PROTO_ETH;
- parse.layer = ODP_PROTO_LAYER_ALL;
+ parse.last_layer = ODP_PROTO_LAYER_ALL;
parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
@@ -2543,7 +2543,7 @@ void packet_test_parse(void)
}
parse.proto = ODP_PROTO_IPV4;
- parse.layer = ODP_PROTO_LAYER_L4;
+ parse.last_layer = ODP_PROTO_LAYER_L4;
parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
@@ -2573,7 +2573,7 @@ void packet_test_parse(void)
}
parse.proto = ODP_PROTO_ETH;
- parse.layer = ODP_PROTO_LAYER_L4;
+ parse.last_layer = ODP_PROTO_LAYER_L4;
parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
@@ -2603,7 +2603,7 @@ void packet_test_parse(void)
}
parse.proto = ODP_PROTO_ETH;
- parse.layer = ODP_PROTO_LAYER_L4;
+ parse.last_layer = ODP_PROTO_LAYER_L4;
parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
@@ -2634,7 +2634,7 @@ void packet_test_parse(void)
}
parse.proto = ODP_PROTO_ETH;
- parse.layer = ODP_PROTO_LAYER_ALL;
+ parse.last_layer = ODP_PROTO_LAYER_ALL;
parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
commit fe7221162f62b820b053a8b12fa2b11005769693
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Dec 7 17:08:03 2017 +0200
api: packet_flags: adjust white spaces
Improve header file readability by aligning param and
retval documentation with spaces.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/packet_flags.h b/include/odp/api/spec/packet_flags.h
index e940f00f..dfbed4bb 100644
--- a/include/odp/api/spec/packet_flags.h
+++ b/include/odp/api/spec/packet_flags.h
@@ -137,9 +137,10 @@ int odp_packet_has_eth(odp_packet_t pkt);
* ODP recognizes the destination MAC address FF:FF:FF:FF:FF:FF as
* a broadcast address. All others are considered non-broadcast.
*
- * @param pkt Packet handle
- * @retval non-zero if Ethernet destination address is the broadcast address
- * @retval 0 if Ethernet destination address is not the broadcast address
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Ethernet destination address is the broadcast address
+ * @retval 0 Ethernet destination address is not the broadcast address
*/
int odp_packet_has_eth_bcast(odp_packet_t pkt);
@@ -148,63 +149,70 @@ int odp_packet_has_eth_bcast(odp_packet_t pkt);
*
* ODP recognizes the destination MAC address as multicast if bit 7 is 1.
*
- * @param pkt Packet handle
- * @retval non-zero if Ethernet destination address is a multicast address
- * @retval 0 if Ethernet destination address is not a multicast address
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Ethernet destination address is a multicast address
+ * @retval 0 Ethernet destination address is not a multicast address
*/
int odp_packet_has_eth_mcast(odp_packet_t pkt);
/**
* Check for jumbo frame
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a jumbo frame
- * @retval 0 if packet does not contain a jumbo frame
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet is a jumbo frame
+ * @retval 0 Packet is not a jumbo frame
*/
int odp_packet_has_jumbo(odp_packet_t pkt);
/**
* Check for VLAN
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a VLAN header
- * @retval 0 if packet does not contain a VLAN header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains a VLAN header
+ * @retval 0 Packet does not contain a VLAN header
*/
int odp_packet_has_vlan(odp_packet_t pkt);
/**
* Check for VLAN QinQ (stacked VLAN)
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a VLAN QinQ header
- * @retval 0 if packet does not contain a VLAN QinQ header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains a VLAN QinQ header
+ * @retval 0 Packet does not contain a VLAN QinQ header
*/
int odp_packet_has_vlan_qinq(odp_packet_t pkt);
/**
* Check for ARP
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains an ARP message
- * @retval 0 if packet does not contain an ARP message
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains an ARP message
+ * @retval 0 Packet does not contain an ARP message
*/
int odp_packet_has_arp(odp_packet_t pkt);
/**
* Check for IPv4
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains an IPv4 header
- * @retval 0 if packet does not contain an IPv4 header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains an IPv4 header
+ * @retval 0 Packet does not contain an IPv4 header
*/
int odp_packet_has_ipv4(odp_packet_t pkt);
/**
* Check for IPv6
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains an IPv6 header
- * @retval 0 if packet does not contain an IPv6 header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains an IPv6 header
+ * @retval 0 Packet does not contain an IPv6 header
*/
int odp_packet_has_ipv6(odp_packet_t pkt);
@@ -216,9 +224,10 @@ int odp_packet_has_ipv6(odp_packet_t pkt);
*
* For IPv6, no destination addresses are recognized as broadcast addresses.
*
- * @param pkt Packet handle
- * @retval non-zero if IP destination address is a broadcast address
- * @retval 0 if IP destination address is not a broadcast address
+ * @param pkt Packet handle
+ *
+ * @retval non-zero IP destination address is a broadcast address
+ * @retval 0 IP destination address is not a broadcast address
*/
int odp_packet_has_ip_bcast(odp_packet_t pkt);
@@ -231,91 +240,100 @@ int odp_packet_has_ip_bcast(odp_packet_t pkt);
* For IPv6 ODP recognizes destination IP addresses with prefixes FF00::
* through FFFF:: as multicast addresses.
*
- * @param pkt Packet handle
- * @retval non-zero if IP destination address is a multicast address
- * @retval 0 if IP destination address is not a multicast address
+ * @param pkt Packet handle
+ *
+ * @retval non-zero IP destination address is a multicast address
+ * @retval 0 IP destination address is not a multicast address
*/
int odp_packet_has_ip_mcast(odp_packet_t pkt);
/**
* Check for IP fragment
*
- * @param pkt Packet handle
- * @retval non-zero if packet is an IP fragment
- * @retval 0 if packet is not an IP fragment
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet is an IP fragment
+ * @retval 0 Packet is not an IP fragment
*/
int odp_packet_has_ipfrag(odp_packet_t pkt);
/**
* Check for IP options
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains IP options
- * @retval 0 if packet does not contain IP options
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains IP options
+ * @retval 0 Packet does not contain IP options
*/
int odp_packet_has_ipopt(odp_packet_t pkt);
/**
* Check for IPSec
*
- * @param pkt Packet handle
- * @retval non-zero if packet requires IPSec processing
- * @retval 0 if packet does not require IPSec processing
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet requires IPSec processing
+ * @retval 0 Packet does not require IPSec processing
*/
int odp_packet_has_ipsec(odp_packet_t pkt);
/**
* Check for UDP
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a UDP header
- * @retval 0 if packet does not contain a UDP header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains a UDP header
+ * @retval 0 Packet does not contain a UDP header
*/
int odp_packet_has_udp(odp_packet_t pkt);
/**
* Check for TCP
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a TCP header
- * @retval 0 if packet does not contain a TCP header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains a TCP header
+ * @retval 0 Packet does not contain a TCP header
*/
int odp_packet_has_tcp(odp_packet_t pkt);
/**
* Check for SCTP
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a SCTP header
- * @retval 0 if packet does not contain a SCTP header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains a SCTP header
+ * @retval 0 Packet does not contain a SCTP header
*/
int odp_packet_has_sctp(odp_packet_t pkt);
/**
* Check for ICMP
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains an ICMP header
- * @retval 0 if packet does not contain an ICMP header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains an ICMP header
+ * @retval 0 Packet does not contain an ICMP header
*/
int odp_packet_has_icmp(odp_packet_t pkt);
/**
* Check for packet flow hash
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a hash value
- * @retval 0 if packet does not contain a hash value
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains a hash value
+ * @retval 0 Packet does not contain a hash value
*/
int odp_packet_has_flow_hash(odp_packet_t pkt);
/**
* Check for packet timestamp
*
- * @param pkt Packet handle
+ * @param pkt Packet handle
*
- * @retval non-zero if packet contains a timestamp value
- * @retval 0 if packet does not contain a timestamp value
+ * @retval non-zero Packet contains a timestamp value
+ * @retval 0 Packet does not contain a timestamp value
*
* @see odp_packet_has_ts_clr()
*/
commit 4612aa0de04cea3b7dc1b74678a9b25d2bc832b0
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Dec 7 16:40:30 2017 +0200
api: packet_flags: refine error and layer flags
Error flag functions (packet_has_error, packet_has_l4_error)
indicate if an error was found. Layer flag functions
(packet_has_l4) tell if parser did found and checked a protocol
(header) of a layer. Both are controlled by parser configuration.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/packet_flags.h b/include/odp/api/spec/packet_flags.h
index 377b75ba..e940f00f 100644
--- a/include/odp/api/spec/packet_flags.h
+++ b/include/odp/api/spec/packet_flags.h
@@ -23,87 +23,111 @@ extern "C" {
#include <odp/api/packet.h>
/** @addtogroup odp_packet
- * Boolean operations on a packet.
+ * Operations on packet metadata flags.
* @{
*/
/**
- * Check for packet errors
+ * Check for all errors in packet
*
- * Checks all error flags at once.
+ * Check if packet parsing has found any errors in the packet. The level of
+ * error checking depends on the parse configuration (e.g. included layers and
+ * checksums). Protocol layer functions (e.g. odp_packet_has_l3()) indicate
+ * which layers have been checked, and layer error functions
+ * (e.g. odp_packet_has_l3_error()) which layers have errors.
*
- * @param pkt Packet handle
- * @retval non-zero packet has errors
- * @retval 0 packet has no errors
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet has errors
+ * @retval 0 No errors were found
*/
int odp_packet_has_error(odp_packet_t pkt);
/**
- * Check for packet L2 errors
+ * Check for errors in layer 2
*
- * check for all L2 errors
+ * When layer 2 is included in the parse configuration, check if any errors were
+ * found in layer 2 of the packet.
*
- * @param pkt Packet handle
- * @retval non-zero packet has L2 errors
- * @retval 0 packet has no L2 error
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet has errors in layer 2
+ * @retval 0 No errors were found in layer 2
*/
int odp_packet_has_l2_error(odp_packet_t pkt);
/**
- * Check for L2 header, e.g. ethernet
+ * Check for errors in layer 3
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a valid & known L2 header
- * @retval 0 if packet does not contain a valid & known L2 header
+ * When layer 3 is included in the parse configuration, check if any errors were
+ * found in layer 3 of the packet.
+ *
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet has errors in layer 3
+ * @retval 0 No errors found in layer 3
*/
-int odp_packet_has_l2(odp_packet_t pkt);
+int odp_packet_has_l3_error(odp_packet_t pkt);
/**
- * Check for packet L3 errors
+ * Check for errors in layer 4
*
- * check for all L3 errors
+ * When layer 4 is included in the parse configuration, check if any errors were
+ * found in layer 4 of the packet.
*
- * @param pkt Packet handle
- * @retval non-zero packet has L3 errors
- * @retval 0 packet has no L3 error
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet has errors in layer 4
+ * @retval 0 No errors were found in layer 4
*/
-int odp_packet_has_l3_error(odp_packet_t pkt);
+int odp_packet_has_l4_error(odp_packet_t pkt);
/**
- * Check for L3 header, e.g. IPv4, IPv6
+ * Check for layer 2 protocols
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a valid & known L3 header
- * @retval 0 if packet does not contain a valid & known L3 header
+ * When layer 2 is included in the parse configuration, check if packet parsing
+ * has found and checked a layer 2 protocol (e.g. Ethernet) in the packet.
+ *
+ * @param pkt Packet handle
+ *
+ * @retval non-zero A layer 2 protocol header was found and checked
+ * @retval 0 No layer 2 protocol was found
*/
-int odp_packet_has_l3(odp_packet_t pkt);
+int odp_packet_has_l2(odp_packet_t pkt);
/**
- * Check for packet L4 errors
+ * Check for layer 3 protocols
*
- * check for all L4 errors
+ * When layer 3 is included in the parse configuration, check if packet parsing
+ * has found and checked a layer 3 protocol (e.g. IPv4, IPv6) in the packet.
*
- * @param pkt Packet handle
- * @retval non-zero packet has L4 errors
- * @retval 0 packet has no L4 error
+ * @param pkt Packet handle
+ *
+ * @retval non-zero A layer 3 protocol header was found and checked
+ * @retval 0 No layer 3 protocol was found
*/
-int odp_packet_has_l4_error(odp_packet_t pkt);
+int odp_packet_has_l3(odp_packet_t pkt);
/**
- * Check for L4 header, e.g. UDP, TCP, SCTP (also ICMP)
+ * Check for layer 4 protocols
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a valid & known L4 header
- * @retval 0 if packet does not contain a valid & known L4 header
+ * When layer 4 is included in the parse configuration, check if packet parsing
+ * has found and checked a layer 4 protocol (e.g. UDP, TCP, SCTP) in the packet.
+ *
+ * @param pkt Packet handle
+ *
+ * @retval non-zero A layer 4 protocol header was found and checked
+ * @retval 0 No layer 4 protocol was found
*/
int odp_packet_has_l4(odp_packet_t pkt);
/**
* Check for Ethernet header
*
- * @param pkt Packet handle
- * @retval non-zero if packet contains a valid eth header
- * @retval 0 if packet does not contain a valid eth header
+ * @param pkt Packet handle
+ *
+ * @retval non-zero Packet contains an Ethernet header
+ * @retval 0 Packet does not contain an Ethernet header
*/
int odp_packet_has_eth(odp_packet_t pkt);
commit 76997bb4087981751966df0fa1d0897486a3da1d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Dec 7 15:29:04 2017 +0200
api: packet: refine layer offset specification
Offset functions just point to the start of an layer. Offsets
may be set also when a layer does not have a known header or
a known header has an error. For example, L4 offset may be
set always after a successful parse of L3 (IP) layer. There
are other API calls to check if L4 is a known protocol
(e.g. packet_has_l4, packet_has_udp), or if it contain errors
(e.g. packet_has_l4_error).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(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/packet.h b/include/odp/api/spec/packet.h
index bb62ef87..02333fe1 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -1387,15 +1387,16 @@ uint32_t odp_packet_user_area_size(odp_packet_t pkt);
/**
* Layer 2 start pointer
*
- * Returns pointer to the start of the layer 2 header. Optionally, outputs
- * number of data bytes in the segment following the pointer.
+ * Returns pointer to the start of layer 2. Optionally, outputs number of data
+ * bytes in the segment following the pointer. The pointer value is generated
+ * from the current layer 2 offset.
*
* @param pkt Packet handle
* @param[out] len Number of data bytes remaining in the segment (output).
* Ignored when NULL.
*
- * @return Layer 2 start pointer
- * @retval NULL packet does not contain a valid L2 header
+ * @return Layer 2 start pointer
+ * @retval NULL Layer 2 offset has not been set
*
* @see odp_packet_l2_offset(), odp_packet_l2_offset_set(), odp_packet_has_l2()
*/
@@ -1404,16 +1405,16 @@ void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len);
/**
* Layer 2 start offset
*
- * Returns offset to the start of the layer 2 header. The offset is calculated
- * from the current odp_packet_data() position in bytes.
- *
- * User is responsible to update the offset when modifying the packet data
- * pointer position.
+ * Returns offset to the start of layer 2. The offset is calculated from the
+ * current odp_packet_data() position in bytes. Packet parsing sets the offset
+ * according to parse configuration and layers recognized in the packet. Data
+ * start position updating functions (e.g. odp_packet_push_head()) do not modify
+ * the offset, but user sets a new value when needed.
*
* @param pkt Packet handle
*
- * @return Layer 2 start offset
- * @retval ODP_PACKET_OFFSET_INVALID packet does not contain a valid L2 header
+ * @return Layer 2 start offset
+ * @retval ODP_PACKET_OFFSET_INVALID Layer 2 offset has not been set
*
* @see odp_packet_l2_offset_set(), odp_packet_has_l2()
*/
@@ -1422,9 +1423,9 @@ uint32_t odp_packet_l2_offset(odp_packet_t pkt);
/**
* Set layer 2 start offset
*
- * Set offset to the start of the layer 2 header. The offset is calculated from
- * the current odp_packet_data() position in bytes. Offset must not exceed
- * packet data length. Packet is not modified on an error.
+ * Set offset to the start of layer 2. The offset is calculated from the current
+ * odp_packet_data() position in bytes. Offset must not exceed packet data
+ * length. Offset is not modified on an error.
*
* @param pkt Packet handle
* @param offset Layer 2 start offset (0 ... odp_packet_len()-1)
@@ -1437,15 +1438,16 @@ int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset);
/**
* Layer 3 start pointer
*
- * Returns pointer to the start of the layer 3 header. Optionally, outputs
- * number of data bytes in the segment following the pointer.
+ * Returns pointer to the start of layer 3. Optionally, outputs number of data
+ * bytes in the segment following the pointer. The pointer value is generated
+ * from the current layer 3 offset.
*
* @param pkt Packet handle
* @param[out] len Number of data bytes remaining in the segment (output).
* Ignored when NULL.
*
- * @return Layer 3 start pointer
- * @retval NULL packet does not contain a valid L3 header
+ * @return Layer 3 start pointer
+ * @retval NULL Layer 3 offset has not been set
*
* @see odp_packet_l3_offset(), odp_packet_l3_offset_set(), odp_packet_has_l3()
*/
@@ -1454,16 +1456,16 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len);
/**
* Layer 3 start offset
*
- * Returns offset to the start of the layer 3 header. The offset is calculated
- * from the current odp_packet_data() position in bytes.
- *
- * User is responsible to update the offset when modifying the packet data
- * pointer position.
+ * Returns offset to the start of layer 3. The offset is calculated from the
+ * current odp_packet_data() position in bytes. Packet parsing sets the offset
+ * according to parse configuration and layers recognized in the packet. Data
+ * start position updating functions (e.g. odp_packet_push_head()) do not modify
+ * the offset, but user sets a new value when needed.
*
* @param pkt Packet handle
*
- * @return Layer 3 start offset, or ODP_PACKET_OFFSET_INVALID when packet does
- * not contain a valid L3 header.
+ * @return Layer 3 start offset
+ * @retval ODP_PACKET_OFFSET_INVALID Layer 3 offset has not been set
*
* @see odp_packet_l3_offset_set(), odp_packet_has_l3()
*/
@@ -1472,9 +1474,9 @@ uint32_t odp_packet_l3_offset(odp_packet_t pkt);
/**
* Set layer 3 start offset
*
- * Set offset to the start of the layer 3 header. The offset is calculated from
- * the current odp_packet_data() position in bytes. Offset must not exceed
- * packet data length. Packet is not modified on an error.
+ * Set offset to the start of layer 3. The offset is calculated from the current
+ * odp_packet_data() position in bytes. Offset must not exceed packet data
+ * length. Offset is not modified on an error.
*
* @param pkt Packet handle
* @param offset Layer 3 start offset (0 ... odp_packet_len()-1)
@@ -1487,15 +1489,16 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset);
/**
* Layer 4 start pointer
*
- * Returns pointer to the start of the layer 4 header. Optionally, outputs
- * number of data bytes in the segment following the pointer.
+ * Returns pointer to the start of layer 4. Optionally, outputs number of data
+ * bytes in the segment following the pointer. The pointer value is generated
+ * from the current layer 4 offset.
*
* @param pkt Packet handle
* @param[out] len Number of data bytes remaining in the segment (output).
* Ignored when NULL.
*
- * @return Layer 4 start pointer
- * @retval NULL packet does not contain a valid L4 header
+ * @return Layer 4 start pointer
+ * @retval NULL Layer 4 offset has not been set
*
* @see odp_packet_l4_offset(), odp_packet_l4_offset_set(), odp_packet_has_l4()
*/
@@ -1504,16 +1507,16 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len);
/**
* Layer 4 start offset
*
- * Returns offset to the start of the layer 4 header. The offset is calculated
- * from the current odp_packet_data() position in bytes.
- *
- * User is responsible to update the offset when modifying the packet data
- * pointer position.
+ * Returns offset to the start of layer 4. The offset is calculated from the
+ * current odp_packet_data() position in bytes. Packet parsing sets the offset
+ * according to parse configuration and layers recognized in the packet. Data
+ * start position updating functions (e.g. odp_packet_push_head()) do not modify
+ * the offset, but user sets a new value when needed.
*
* @param pkt Packet handle
*
- * @return Layer 4 start offset
- * @retval ODP_PACKET_OFFSET_INVALID packet does not contain a valid L4 header
+ * @return Layer 4 start offset
+ * @retval ODP_PACKET_OFFSET_INVALID Layer 4 offset has not been set
*
* @see odp_packet_l4_offset_set(), odp_packet_has_l4()
*/
@@ -1522,9 +1525,9 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt);
/**
* Set layer 4 start offset
*
- * Set offset to the start of the layer 4 header. The offset is calculated from
- * the current odp_packet_data() position in bytes. Offset must not exceed
- * packet data length. Packet is not modified on an error.
+ * Set offset to the start of layer 4. The offset is calculated from the current
+ * odp_packet_data() position in bytes. Offset must not exceed packet data
+ * length. Offset is not modified on an error.
*
* @param pkt Packet handle
* @param offset Layer 4 start offset (0 ... odp_packet_len()-1)
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/ipsec.h | 13 +-
include/odp/api/spec/packet.h | 119 +++++++++---------
include/odp/api/spec/packet_flags.h | 236 +++++++++++++++++++++---------------
include/odp/api/spec/packet_io.h | 9 +-
platform/linux-generic/odp_packet.c | 14 +--
test/validation/api/packet/packet.c | 10 +-
6 files changed, 229 insertions(+), 172 deletions(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-682-g65d690fb
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 65d690fbcf03c6a4d5eb3f01bde36807833feaaa (commit)
via 8e2b2acb39e27ff172461b425abf2fef6413f522 (commit)
via d43523f0e0175ade19a7d944ef7fbd98247f5d7a (commit)
via 428099c6200e764bd50581b65084e1e4cbe07dce (commit)
via d187988a5f1c16efc67e2bc70730bd3735683742 (commit)
via f2092a68171e9cdd83ce9f055b81cba4f9b5899d (commit)
via 58a6affec5db9c2e21d21ad5513d45e4b9e07c63 (commit)
via cc727d927fe007c1fb85d97bd3225fbb4a044166 (commit)
via 0405287898a99821691928e4fd1f9afe91681c3a (commit)
via bb77b93e77c75a4a7507543ff0d38d32fe8b51ed (commit)
via b8c85795ffd6fc98813b4882ba671866d19762ba (commit)
via 015674f10e67c319e6299fe99332787c491d59c2 (commit)
from 0c7769e1e8e7893f3631d7c8b8297f87b718d27d (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 65d690fbcf03c6a4d5eb3f01bde36807833feaaa
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 16:18:54 2017 +0200
validation: event: filter packet test
Test the new filter packet function.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c
index 901fe6ed..5add99c3 100644
--- a/test/validation/api/event/event.c
+++ b/test/validation/api/event/event.c
@@ -348,11 +348,50 @@ static void event_test_type_multi(void)
CU_ASSERT(odp_pool_destroy(pkt_pool) == 0);
}
+static void event_test_filter_packet(void)
+{
+ odp_pool_t buf_pool, pkt_pool;
+ int i, num_pkt, num_rem;
+ int num = 2 * NUM_TYPE_TEST;
+ odp_event_t buf_event[NUM_TYPE_TEST];
+ odp_event_t pkt_event[NUM_TYPE_TEST];
+ odp_event_t event[num];
+ odp_packet_t packet[num];
+ odp_event_t remain[num];
+
+ type_test_init(&buf_pool, &pkt_pool, buf_event, pkt_event, event);
+
+ for (i = 0; i < num; i++) {
+ packet[i] = ODP_PACKET_INVALID;
+ remain[i] = ODP_EVENT_INVALID;
+ }
+
+ num_pkt = odp_event_filter_packet(event, packet, remain, num);
+ CU_ASSERT(num_pkt == NUM_TYPE_TEST);
+
+ for (i = 0; i < num_pkt; i++)
+ CU_ASSERT(packet[i] != ODP_PACKET_INVALID);
+
+ num_rem = num - num_pkt;
+ CU_ASSERT(num_rem == NUM_TYPE_TEST);
+
+ for (i = 0; i < num_rem; i++) {
+ CU_ASSERT(remain[i] != ODP_EVENT_INVALID);
+ CU_ASSERT(odp_event_type(remain[i]) == ODP_EVENT_BUFFER);
+ }
+
+ odp_event_free_multi(event, num);
+
+ CU_ASSERT(odp_pool_destroy(buf_pool) == 0);
+ CU_ASSERT(odp_pool_destroy(pkt_pool) == 0);
+}
+
odp_testinfo_t event_suite[] = {
ODP_TEST_INFO(event_test_free),
ODP_TEST_INFO(event_test_free_multi),
ODP_TEST_INFO(event_test_free_multi_mixed),
ODP_TEST_INFO(event_test_type_multi),
+ ODP_TEST_INFO(event_test_filter_packet),
ODP_TEST_INFO_NULL,
};
commit 8e2b2acb39e27ff172461b425abf2fef6413f522
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 15:02:35 2017 +0200
linux-gen: packet: implement event filter packet
Simple implementation of the new event filter packets
function.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index cdcb62d2..222fa8c8 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -967,6 +967,27 @@ void odp_packet_to_event_multi(const odp_packet_t pkt[], odp_event_t ev[],
ev[i] = odp_packet_to_event(pkt[i]);
}
+int odp_event_filter_packet(const odp_event_t event[],
+ odp_packet_t packet[],
+ odp_event_t remain[], int num)
+{
+ int i;
+ int num_pkt = 0;
+ int num_rem = 0;
+
+ for (i = 0; i < num; i++) {
+ if (odp_event_type(event[i]) == ODP_EVENT_PACKET) {
+ packet[num_pkt] = odp_packet_from_event(event[i]);
+ num_pkt++;
+ } else {
+ remain[num_rem] = event[i];
+ num_rem++;
+ }
+ }
+
+ return num_pkt;
+}
+
/*
*
* Pointers and lengths
commit d43523f0e0175ade19a7d944ef7fbd98247f5d7a
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 14:44:18 2017 +0200
api: event: filter and convert packets
This call optimizes into a single call the common case of
first checking that events are packets and then converting
those to packet handles.
while (1) {
num = odp_schedule_multi(NULL, 0, event, max_num);
if (num <= 0)
continue;
num_pkt = odp_event_filter_packet(event, packet, remain, num);
packet_foo(packet, num_pkt);
other_foo(remain, num - num_pkt);
...
}
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h
index e5edaacc..2228c596 100644
--- a/include/odp/api/spec/event.h
+++ b/include/odp/api/spec/event.h
@@ -19,12 +19,13 @@
extern "C" {
#endif
+#include <odp/api/packet.h>
+
/** @defgroup odp_event ODP EVENT
* Operations on an event.
* @{
*/
-
/**
* @typedef odp_event_t
* ODP event
@@ -141,6 +142,27 @@ odp_event_type_t odp_event_types(odp_event_t event,
int odp_event_type_multi(const odp_event_t event[], int num,
odp_event_type_t *type);
+/**
+ * Filter and convert packet events
+ *
+ * Checks event type of all input events, converts all packet events and outputs
+ * packet handles. Returns the number packet handles outputted. Outputs the
+ * remaining, non-packet event handles to 'remain' array. Handles are outputted
+ * to both arrays in the same order those are stored in 'event' array. Both
+ * output arrays must fit 'num' elements.
+ *
+ * @param event Array of event handles
+ * @param[out] packet Packet handle array for output
+ * @param[out] remain Event handle array for output of remaining, non-packet
+ * events
+ * @param num Number of events (> 0)
+ *
+ * @return Number of packets outputted (0 ... num)
+ */
+int odp_event_filter_packet(const odp_event_t event[],
+ odp_packet_t packet[],
+ odp_event_t remain[], int num);
+
/**
* Get printable value for an odp_event_t
*
commit 428099c6200e764bd50581b65084e1e4cbe07dce
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 15:41:07 2017 +0200
validation: event: type multi
Test the new event type multi function.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c
index fc048c1d..901fe6ed 100644
--- a/test/validation/api/event/event.c
+++ b/test/validation/api/event/event.c
@@ -245,10 +245,114 @@ static void event_test_free_multi_mixed(void)
CU_ASSERT(odp_pool_destroy(pool3) == 0);
}
+#define NUM_TYPE_TEST 6
+
+static void type_test_init(odp_pool_t *buf_pool, odp_pool_t *pkt_pool,
+ odp_event_t buf_event[],
+ odp_event_t pkt_event[],
+ odp_event_t event[])
+{
+ odp_pool_t pool1, pool2;
+ odp_pool_param_t pool_param;
+ int i;
+ odp_buffer_t buf;
+ odp_packet_t pkt;
+
+ /* Buffer events */
+ odp_pool_param_init(&pool_param);
+ pool_param.buf.num = NUM_EVENTS;
+ pool_param.buf.size = EVENT_SIZE;
+ pool_param.type = ODP_POOL_BUFFER;
+
+ pool1 = odp_pool_create("event_type_buf", &pool_param);
+ CU_ASSERT_FATAL(pool1 != ODP_POOL_INVALID);
+
+ for (i = 0; i < NUM_TYPE_TEST; i++) {
+ buf = odp_buffer_alloc(pool1);
+ CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID);
+ buf_event[i] = odp_buffer_to_event(buf);
+ }
+
+ /* Packet events */
+ odp_pool_param_init(&pool_param);
+ pool_param.pkt.num = NUM_EVENTS;
+ pool_param.pkt.len = EVENT_SIZE;
+ pool_param.type = ODP_POOL_PACKET;
+
+ pool2 = odp_pool_create("event_type_pkt", &pool_param);
+ CU_ASSERT_FATAL(pool2 != ODP_POOL_INVALID);
+
+ for (i = 0; i < NUM_TYPE_TEST; i++) {
+ pkt = odp_packet_alloc(pool2, EVENT_SIZE);
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ pkt_event[i] = odp_packet_to_event(pkt);
+ }
+
+ /* 1 buf, 1 pkt, 2 buf, 2 pkt, 3 buf, 3 pkt */
+ event[0] = buf_event[0];
+ event[1] = pkt_event[0];
+ event[2] = buf_event[1];
+ event[3] = buf_event[2];
+ event[4] = pkt_event[1];
+ event[5] = pkt_event[2];
+ event[6] = buf_event[3];
+ event[7] = buf_event[4];
+ event[8] = buf_event[5];
+ event[9] = pkt_event[3];
+ event[10] = pkt_event[4];
+ event[11] = pkt_event[5];
+
+ *buf_pool = pool1;
+ *pkt_pool = pool2;
+}
+
+static void event_test_type_multi(void)
+{
+ odp_pool_t buf_pool, pkt_pool;
+ odp_event_type_t type;
+ int num;
+ odp_event_t buf_event[NUM_TYPE_TEST];
+ odp_event_t pkt_event[NUM_TYPE_TEST];
+ odp_event_t event[2 * NUM_TYPE_TEST];
+
+ type_test_init(&buf_pool, &pkt_pool, buf_event, pkt_event, event);
+
+ num = odp_event_type_multi(&event[0], 12, &type);
+ CU_ASSERT(num == 1);
+ CU_ASSERT(type == ODP_EVENT_BUFFER);
+
+ num = odp_event_type_multi(&event[1], 11, &type);
+ CU_ASSERT(num == 1);
+ CU_ASSERT(type == ODP_EVENT_PACKET);
+
+ num = odp_event_type_multi(&event[2], 10, &type);
+ CU_ASSERT(num == 2);
+ CU_ASSERT(type == ODP_EVENT_BUFFER);
+
+ num = odp_event_type_multi(&event[4], 8, &type);
+ CU_ASSERT(num == 2);
+ CU_ASSERT(type == ODP_EVENT_PACKET);
+
+ num = odp_event_type_multi(&event[6], 6, &type);
+ CU_ASSERT(num == 3);
+ CU_ASSERT(type == ODP_EVENT_BUFFER);
+
+ num = odp_event_type_multi(&event[9], 3, &type);
+ CU_ASSERT(num == 3);
+ CU_ASSERT(type == ODP_EVENT_PACKET);
+
+ odp_event_free_multi(buf_event, NUM_TYPE_TEST);
+ odp_event_free_multi(pkt_event, NUM_TYPE_TEST);
+
+ CU_ASSERT(odp_pool_destroy(buf_pool) == 0);
+ CU_ASSERT(odp_pool_destroy(pkt_pool) == 0);
+}
+
odp_testinfo_t event_suite[] = {
ODP_TEST_INFO(event_test_free),
ODP_TEST_INFO(event_test_free_multi),
ODP_TEST_INFO(event_test_free_multi_mixed),
+ ODP_TEST_INFO(event_test_type_multi),
ODP_TEST_INFO_NULL,
};
commit d187988a5f1c16efc67e2bc70730bd3735683742
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 15:13:02 2017 +0200
linux-gen: event: implement type multi
Simple implementation of the new event type multi function.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
index fe12cfbc..d8cc0051 100644
--- a/platform/linux-generic/odp_event.c
+++ b/platform/linux-generic/odp_event.c
@@ -45,6 +45,22 @@ odp_event_type_t odp_event_types(odp_event_t event,
return event_type;
}
+int odp_event_type_multi(const odp_event_t event[], int num,
+ odp_event_type_t *type_out)
+{
+ int i;
+ odp_event_type_t type = odp_event_type(event[0]);
+
+ for (i = 1; i < num; i++) {
+ if (odp_event_type(event[i]) != type)
+ break;
+ }
+
+ *type_out = type;
+
+ return i;
+}
+
void odp_event_free(odp_event_t event)
{
switch (odp_event_type(event)) {
commit f2092a68171e9cdd83ce9f055b81cba4f9b5899d
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 14:10:59 2017 +0200
api: event: event type multi
This functions allows application to check event type of
multiple events with single call e.g. after receiving those
from odp_schedule_multi(). Performance is optimized when
application can pass a burst of packets (or other events)
from one API call to another.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h
index 7e895c31..e5edaacc 100644
--- a/include/odp/api/spec/event.h
+++ b/include/odp/api/spec/event.h
@@ -125,6 +125,22 @@ odp_event_subtype_t odp_event_subtype(odp_event_t event);
odp_event_type_t odp_event_types(odp_event_t event,
odp_event_subtype_t *subtype);
+/**
+ * Event type of multiple events
+ *
+ * Returns the number of first events in the array which have the same event
+ * type. Outputs the event type of those events.
+ *
+ * @param event Array of event handles
+ * @param num Number of events (> 0)
+ * @param[out] type Event type pointer for output
+ *
+ * @return Number of first events (1 ... num) with the same event type
+ * (includes event[0])
+ */
+int odp_event_type_multi(const odp_event_t event[], int num,
+ odp_event_type_t *type);
+
/**
* Get printable value for an odp_event_t
*
commit 58a6affec5db9c2e21d21ad5513d45e4b9e07c63
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 13:26:23 2017 +0200
validation: packet: multi converts and single pool free
Added tests for the new multi convert and single pool
free functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index 703dfb56..b3ef6980 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -396,6 +396,50 @@ void packet_test_alloc_free_multi(void)
CU_ASSERT(odp_pool_destroy(pool[1]) == 0);
}
+void packet_test_free_sp(void)
+{
+ const int num_pkt = 10;
+ odp_pool_t pool;
+ int i, ret;
+ odp_packet_t packet[num_pkt];
+ odp_pool_param_t params;
+ odp_pool_capability_t capa;
+ uint32_t len = packet_len;
+
+ CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0);
+
+ if (capa.pkt.max_len < len)
+ len = capa.pkt.max_len;
+
+ odp_pool_param_init(¶ms);
+
+ params.type = ODP_POOL_PACKET;
+ params.pkt.len = len;
+ params.pkt.num = num_pkt;
+
+ pool = odp_pool_create("packet_pool_free_sp", ¶ms);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ ret = packet_alloc_multi(pool, len, packet, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT_FATAL(packet[i] != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_len(packet[i]) == len);
+ }
+ odp_packet_free_sp(packet, num_pkt);
+
+ /* Check that all the packets were returned back to the pool */
+ ret = packet_alloc_multi(pool, len, packet, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT_FATAL(packet[i] != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_len(packet[i]) == len);
+ }
+ odp_packet_free_sp(packet, num_pkt);
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
void packet_test_alloc_segmented(void)
{
const int num = 5;
@@ -481,23 +525,41 @@ void packet_test_alloc_segmented(void)
void packet_test_event_conversion(void)
{
- odp_packet_t pkt = test_packet;
+ odp_packet_t pkt0 = test_packet;
+ odp_packet_t pkt1 = segmented_test_packet;
odp_packet_t tmp_pkt;
- odp_event_t ev;
+ odp_event_t event;
odp_event_subtype_t subtype;
-
- ev = odp_packet_to_event(pkt);
- CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID);
- CU_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET);
- CU_ASSERT(odp_event_subtype(ev) == ODP_EVENT_PACKET_BASIC);
- CU_ASSERT(odp_event_types(ev, &subtype) ==
+ odp_packet_t pkt[2] = {pkt0, pkt1};
+ odp_event_t ev[2];
+ int i;
+
+ event = odp_packet_to_event(pkt0);
+ CU_ASSERT_FATAL(event != ODP_EVENT_INVALID);
+ CU_ASSERT(odp_event_type(event) == ODP_EVENT_PACKET);
+ CU_ASSERT(odp_event_subtype(event) == ODP_EVENT_PACKET_BASIC);
+ CU_ASSERT(odp_event_types(event, &subtype) ==
ODP_EVENT_PACKET);
CU_ASSERT(subtype == ODP_EVENT_PACKET_BASIC);
- tmp_pkt = odp_packet_from_event(ev);
+ tmp_pkt = odp_packet_from_event(event);
CU_ASSERT_FATAL(tmp_pkt != ODP_PACKET_INVALID);
- CU_ASSERT(tmp_pkt == pkt);
- packet_compare_data(tmp_pkt, pkt);
+ CU_ASSERT(tmp_pkt == pkt0);
+ packet_compare_data(tmp_pkt, pkt0);
+
+ odp_packet_to_event_multi(pkt, ev, 2);
+
+ for (i = 0; i < 2; i++) {
+ CU_ASSERT_FATAL(ev[i] != ODP_EVENT_INVALID);
+ CU_ASSERT(odp_event_type(ev[i]) == ODP_EVENT_PACKET);
+ CU_ASSERT(odp_event_subtype(ev[i]) == ODP_EVENT_PACKET_BASIC);
+ }
+
+ odp_packet_from_event_multi(pkt, ev, 2);
+ CU_ASSERT(pkt[0] == pkt0);
+ CU_ASSERT(pkt[1] == pkt1);
+ packet_compare_data(pkt[0], pkt0);
+ packet_compare_data(pkt[1], pkt1);
}
void packet_test_basic_metadata(void)
@@ -2595,6 +2657,7 @@ void packet_test_parse(void)
odp_testinfo_t packet_suite[] = {
ODP_TEST_INFO(packet_test_alloc_free),
ODP_TEST_INFO(packet_test_alloc_free_multi),
+ ODP_TEST_INFO(packet_test_free_sp),
ODP_TEST_INFO(packet_test_alloc_segmented),
ODP_TEST_INFO(packet_test_basic_metadata),
ODP_TEST_INFO(packet_test_debug),
diff --git a/test/validation/api/packet/packet.h b/test/validation/api/packet/packet.h
index 4e99679e..1d9947af 100644
--- a/test/validation/api/packet/packet.h
+++ b/test/validation/api/packet/packet.h
@@ -12,6 +12,7 @@
/* test functions: */
void packet_test_alloc_free(void);
void packet_test_alloc_free_multi(void);
+void packet_test_free_sp(void);
void packet_test_alloc_segmented(void);
void packet_test_event_conversion(void);
void packet_test_basic_metadata(void);
commit cc727d927fe007c1fb85d97bd3225fbb4a044166
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 13:02:25 2017 +0200
linux-gen: packet: multi converts and single pool free
Simple implement of the new multi convert and single pool
free functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index bdcb482f..cdcb62d2 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -912,6 +912,11 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num)
packet_free_multi(buf_hdr, num - num_freed);
}
+void odp_packet_free_sp(const odp_packet_t pkt[], int num)
+{
+ odp_packet_free_multi(pkt, num);
+}
+
int odp_packet_reset(odp_packet_t pkt, uint32_t len)
{
odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt);
@@ -944,6 +949,24 @@ odp_event_t odp_packet_to_event(odp_packet_t pkt)
return (odp_event_t)buffer_handle(packet_hdr(pkt));
}
+void odp_packet_from_event_multi(odp_packet_t pkt[], const odp_event_t ev[],
+ int num)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ pkt[i] = odp_packet_from_event(ev[i]);
+}
+
+void odp_packet_to_event_multi(const odp_packet_t pkt[], odp_event_t ev[],
+ int num)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ ev[i] = odp_packet_to_event(pkt[i]);
+}
+
/*
*
* Pointers and lengths
commit 0405287898a99821691928e4fd1f9afe91681c3a
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 12:55:20 2017 +0200
api: packet: multi converts and single pool free
Added multi versions for better throughput. Convert multiple
packets/events with a single call. Free multiple packets into
the same originating pool.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index 19572034..bb62ef87 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -204,6 +204,17 @@ void odp_packet_free(odp_packet_t pkt);
*/
void odp_packet_free_multi(const odp_packet_t pkt[], int num);
+/**
+ * Free multiple packets to the same pool
+ *
+ * Otherwise like odp_packet_free_multi(), but all packets must be from the
+ * same originating pool.
+ *
+ * @param pkt Array of packet handles
+ * @param num Number of packets to free
+ */
+void odp_packet_free_sp(const odp_packet_t pkt[], int num);
+
/**
* Reset packet
*
@@ -235,6 +246,18 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len);
*/
odp_packet_t odp_packet_from_event(odp_event_t ev);
+/**
+ * Convert multiple packet events to packet handles
+ *
+ * All events must be of type ODP_EVENT_PACKET.
+ *
+ * @param[out] pkt Packet handle array for output
+ * @param ev Array of event handles to convert
+ * @param num Number of packets and events
+ */
+void odp_packet_from_event_multi(odp_packet_t pkt[], const odp_event_t ev[],
+ int num);
+
/**
* Convert packet handle to event
*
@@ -244,6 +267,16 @@ odp_packet_t odp_packet_from_event(odp_event_t ev);
*/
odp_event_t odp_packet_to_event(odp_packet_t pkt);
+/**
+ * Convert multiple packet handles to events
+ *
+ * @param pkt Array of packet handles to convert
+ * @param[out] ev Event handle array for output
+ * @param num Number of packets and events
+ */
+void odp_packet_to_event_multi(const odp_packet_t pkt[], odp_event_t ev[],
+ int num);
+
/*
*
* Pointers and lengths
commit bb77b93e77c75a4a7507543ff0d38d32fe8b51ed
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Dec 1 11:19:30 2017 +0200
validation: event: add event test suite
Added suite for event API tests. Test event types, free and
free multiple event functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/m4/configure.m4 b/test/m4/configure.m4
index ef6096e8..dd07839f 100644
--- a/test/m4/configure.m4
+++ b/test/m4/configure.m4
@@ -15,6 +15,7 @@ AC_CONFIG_FILES([test/Makefile
test/validation/api/cpumask/Makefile
test/validation/api/crypto/Makefile
test/validation/api/errno/Makefile
+ test/validation/api/event/Makefile
test/validation/api/hash/Makefile
test/validation/api/init/Makefile
test/validation/api/ipsec/Makefile
diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am
index be3fb63e..0503e092 100644
--- a/test/validation/api/Makefile.am
+++ b/test/validation/api/Makefile.am
@@ -6,6 +6,7 @@ ODP_MODULES = atomic \
cpumask \
crypto \
errno \
+ event \
hash \
init \
ipsec \
@@ -38,6 +39,7 @@ TESTS = \
cpumask/cpumask_main$(EXEEXT) \
crypto/crypto_main$(EXEEXT) \
errno/errno_main$(EXEEXT) \
+ event/event_main$(EXEEXT) \
hash/hash_main$(EXEEXT) \
init/init_main_ok$(EXEEXT) \
init/init_main_abort$(EXEEXT) \
diff --git a/test/validation/api/event/.gitignore b/test/validation/api/event/.gitignore
new file mode 100644
index 00000000..05d34d7c
--- /dev/null
+++ b/test/validation/api/event/.gitignore
@@ -0,0 +1 @@
+event_main
diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am
new file mode 100644
index 00000000..be4764b5
--- /dev/null
+++ b/test/validation/api/event/Makefile.am
@@ -0,0 +1,5 @@
+include ../Makefile.inc
+
+test_PROGRAMS = event_main
+event_main_SOURCES = event_main.c event.c event.h
+event_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP)
diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c
new file mode 100644
index 00000000..fc048c1d
--- /dev/null
+++ b/test/validation/api/event/event.c
@@ -0,0 +1,274 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "config.h"
+#include <odp_api.h>
+#include <odp_cunit_common.h>
+#include "event.h"
+
+#define NUM_EVENTS 100
+#define EVENT_SIZE 100
+#define EVENT_BURST 10
+
+static void event_test_free(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t pool_param;
+ int i;
+ odp_buffer_t buf;
+ odp_packet_t pkt;
+ odp_timeout_t tmo;
+ odp_event_subtype_t subtype;
+ odp_event_t event[EVENT_BURST];
+
+ /* Buffer events */
+ odp_pool_param_init(&pool_param);
+ pool_param.buf.num = NUM_EVENTS;
+ pool_param.buf.size = EVENT_SIZE;
+ pool_param.type = ODP_POOL_BUFFER;
+
+ pool = odp_pool_create("event_free", &pool_param);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (i = 0; i < EVENT_BURST; i++) {
+ buf = odp_buffer_alloc(pool);
+ CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID);
+ event[i] = odp_buffer_to_event(buf);
+ CU_ASSERT(odp_event_type(event[i]) == ODP_EVENT_BUFFER);
+ CU_ASSERT(odp_event_subtype(event[i]) == ODP_EVENT_NO_SUBTYPE);
+ CU_ASSERT(odp_event_types(event[i], &subtype) ==
+ ODP_EVENT_BUFFER);
+ CU_ASSERT(subtype == ODP_EVENT_NO_SUBTYPE);
+ }
+
+ for (i = 0; i < EVENT_BURST; i++)
+ odp_event_free(event[i]);
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+
+ /* Packet events */
+ odp_pool_param_init(&pool_param);
+ pool_param.pkt.num = NUM_EVENTS;
+ pool_param.pkt.len = EVENT_SIZE;
+ pool_param.type = ODP_POOL_PACKET;
+
+ pool = odp_pool_create("event_free", &pool_param);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (i = 0; i < EVENT_BURST; i++) {
+ pkt = odp_packet_alloc(pool, EVENT_SIZE);
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ event[i] = odp_packet_to_event(pkt);
+ CU_ASSERT(odp_event_type(event[i]) == ODP_EVENT_PACKET);
+ CU_ASSERT(odp_event_subtype(event[i]) ==
+ ODP_EVENT_PACKET_BASIC);
+ CU_ASSERT(odp_event_types(event[i], &subtype) ==
+ ODP_EVENT_PACKET);
+ CU_ASSERT(subtype == ODP_EVENT_PACKET_BASIC);
+ }
+
+ for (i = 0; i < EVENT_BURST; i++)
+ odp_event_free(event[i]);
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+
+ /* Timeout events */
+ odp_pool_param_init(&pool_param);
+ pool_param.tmo.num = NUM_EVENTS;
+ pool_param.type = ODP_POOL_TIMEOUT;
+
+ pool = odp_pool_create("event_free", &pool_param);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (i = 0; i < EVENT_BURST; i++) {
+ tmo = odp_timeout_alloc(pool);
+ CU_ASSERT_FATAL(tmo != ODP_TIMEOUT_INVALID);
+ event[i] = odp_timeout_to_event(tmo);
+ CU_ASSERT(odp_event_type(event[i]) == ODP_EVENT_TIMEOUT);
+ CU_ASSERT(odp_event_subtype(event[i]) == ODP_EVENT_NO_SUBTYPE);
+ CU_ASSERT(odp_event_types(event[i], &subtype) ==
+ ODP_EVENT_TIMEOUT);
+ CU_ASSERT(subtype == ODP_EVENT_NO_SUBTYPE);
+ }
+
+ for (i = 0; i < EVENT_BURST; i++)
+ odp_event_free(event[i]);
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
+static void event_test_free_multi(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t pool_param;
+ int i, j;
+ odp_buffer_t buf;
+ odp_packet_t pkt;
+ odp_timeout_t tmo;
+ odp_event_t event[EVENT_BURST];
+
+ /* Buffer events */
+ odp_pool_param_init(&pool_param);
+ pool_param.buf.num = NUM_EVENTS;
+ pool_param.buf.size = EVENT_SIZE;
+ pool_param.type = ODP_POOL_BUFFER;
+
+ pool = odp_pool_create("event_free", &pool_param);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < EVENT_BURST; i++) {
+ buf = odp_buffer_alloc(pool);
+ CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID);
+ event[i] = odp_buffer_to_event(buf);
+ }
+
+ if (j == 0)
+ odp_event_free_multi(event, EVENT_BURST);
+ else
+ odp_event_free_sp(event, EVENT_BURST);
+ }
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+
+ /* Packet events */
+ odp_pool_param_init(&pool_param);
+ pool_param.pkt.num = NUM_EVENTS;
+ pool_param.pkt.len = EVENT_SIZE;
+ pool_param.type = ODP_POOL_PACKET;
+
+ pool = odp_pool_create("event_free", &pool_param);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < EVENT_BURST; i++) {
+ pkt = odp_packet_alloc(pool, EVENT_SIZE);
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ event[i] = odp_packet_to_event(pkt);
+ }
+
+ if (j == 0)
+ odp_event_free_multi(event, EVENT_BURST);
+ else
+ odp_event_free_sp(event, EVENT_BURST);
+ }
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+
+ /* Timeout events */
+ odp_pool_param_init(&pool_param);
+ pool_param.tmo.num = NUM_EVENTS;
+ pool_param.type = ODP_POOL_TIMEOUT;
+
+ pool = odp_pool_create("event_free", &pool_param);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < EVENT_BURST; i++) {
+ tmo = odp_timeout_alloc(pool);
+ CU_ASSERT_FATAL(tmo != ODP_TIMEOUT_INVALID);
+ event[i] = odp_timeout_to_event(tmo);
+ }
+
+ if (j == 0)
+ odp_event_free_multi(event, EVENT_BURST);
+ else
+ odp_event_free_sp(event, EVENT_BURST);
+ }
+
+ CU_ASSERT(odp_pool_destroy(pool) == 0);
+}
+
+static void event_test_free_multi_mixed(void)
+{
+ odp_pool_t pool1, pool2, pool3;
+ odp_pool_param_t pool_param;
+ int i, j;
+ odp_buffer_t buf;
+ odp_packet_t pkt;
+ odp_timeout_t tmo;
+ odp_event_t event[3 * EVENT_BURST];
+
+ /* Buffer events */
+ odp_pool_param_init(&pool_param);
+ pool_param.buf.num = NUM_EVENTS;
+ pool_param.buf.size = EVENT_SIZE;
+ pool_param.type = ODP_POOL_BUFFER;
+
+ pool1 = odp_pool_create("event_free1", &pool_param);
+ CU_ASSERT_FATAL(pool1 != ODP_POOL_INVALID);
+
+ /* Packet events */
+ odp_pool_param_init(&pool_param);
+ pool_param.pkt.num = NUM_EVENTS;
+ pool_param.pkt.len = EVENT_SIZE;
+ pool_param.type = ODP_POOL_PACKET;
+
+ pool2 = odp_pool_create("event_free2", &pool_param);
+ CU_ASSERT_FATAL(pool2 != ODP_POOL_INVALID);
+
+ /* Timeout events */
+ odp_pool_param_init(&pool_param);
+ pool_param.tmo.num = NUM_EVENTS;
+ pool_param.type = ODP_POOL_TIMEOUT;
+
+ pool3 = odp_pool_create("event_free3", &pool_param);
+ CU_ASSERT_FATAL(pool3 != ODP_POOL_INVALID);
+
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < 3 * EVENT_BURST;) {
+ buf = odp_buffer_alloc(pool1);
+ CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID);
+ event[i] = odp_buffer_to_event(buf);
+ i++;
+ pkt = odp_packet_alloc(pool2, EVENT_SIZE);
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ event[i] = odp_packet_to_event(pkt);
+ i++;
+ tmo = odp_timeout_alloc(pool3);
+ CU_ASSERT_FATAL(tmo != ODP_TIMEOUT_INVALID);
+ event[i] = odp_timeout_to_event(tmo);
+ i++;
+ }
+
+ if (j == 0)
+ odp_event_free_multi(event, 3 * EVENT_BURST);
+ else
+ odp_event_free_sp(event, 3 * EVENT_BURST);
+ }
+
+ CU_ASSERT(odp_pool_destroy(pool1) == 0);
+ CU_ASSERT(odp_pool_destroy(pool2) == 0);
+ CU_ASSERT(odp_pool_destroy(pool3) == 0);
+}
+
+odp_testinfo_t event_suite[] = {
+ ODP_TEST_INFO(event_test_free),
+ ODP_TEST_INFO(event_test_free_multi),
+ ODP_TEST_INFO(event_test_free_multi_mixed),
+ ODP_TEST_INFO_NULL,
+};
+
+odp_suiteinfo_t event_suites[] = {
+ {"Event", NULL, NULL, event_suite},
+ ODP_SUITE_INFO_NULL,
+};
+
+int event_main(int argc, char *argv[])
+{
+ int ret;
+
+ /* parse common options: */
+ if (odp_cunit_parse_options(argc, argv))
+ return -1;
+
+ ret = odp_cunit_register(event_suites);
+
+ if (ret == 0)
+ ret = odp_cunit_run();
+
+ return ret;
+}
diff --git a/test/validation/api/event/event.h b/test/validation/api/event/event.h
new file mode 100644
index 00000000..1d2b6e69
--- /dev/null
+++ b/test/validation/api/event/event.h
@@ -0,0 +1,12 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _ODP_TEST_EVENT_H_
+#define _ODP_TEST_EVENT_H_
+
+int event_main(int argc, char *argv[]);
+
+#endif
diff --git a/test/validation/api/event/event_main.c b/test/validation/api/event/event_main.c
new file mode 100644
index 00000000..3fbefdb8
--- /dev/null
+++ b/test/validation/api/event/event_main.c
@@ -0,0 +1,13 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "config.h"
+#include "event.h"
+
+int main(int argc, char *argv[])
+{
+ return event_main(argc, argv);
+}
commit b8c85795ffd6fc98813b4882ba671866d19762ba
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Nov 30 16:25:34 2017 +0200
linux-gen: event: free multiple functions
Simple implementation of the new functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
index 4a37b5e4..fe12cfbc 100644
--- a/platform/linux-generic/odp_event.c
+++ b/platform/linux-generic/odp_event.c
@@ -68,6 +68,19 @@ void odp_event_free(odp_event_t event)
}
}
+void odp_event_free_multi(const odp_event_t event[], int num)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ odp_event_free(event[i]);
+}
+
+void odp_event_free_sp(const odp_event_t event[], int num)
+{
+ odp_event_free_multi(event, num);
+}
+
uint64_t odp_event_to_u64(odp_event_t hdl)
{
return _odp_pri(hdl);
commit 015674f10e67c319e6299fe99332787c491d59c2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Nov 30 16:20:36 2017 +0200
api: event: add free multiple
It's more efficient to free multiple events with a single
call than with separate calls.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h
index f924973f..7e895c31 100644
--- a/include/odp/api/spec/event.h
+++ b/include/odp/api/spec/event.h
@@ -149,6 +149,28 @@ uint64_t odp_event_to_u64(odp_event_t hdl);
*/
void odp_event_free(odp_event_t event);
+/**
+ * Free multiple events
+ *
+ * Otherwise like odp_event_free(), but frees multiple events to their
+ * originating pools.
+ *
+ * @param event Array of event handles
+ * @param num Number of events to free
+ */
+void odp_event_free_multi(const odp_event_t event[], int num);
+
+/**
+ * Free multiple events to the same pool
+ *
+ * Otherwise like odp_event_free_multi(), but all events must be from the
+ * same originating pool.
+ *
+ * @param event Array of event handles
+ * @param num Number of events to free
+ */
+void odp_event_free_sp(const odp_event_t event[], int num);
+
/**
* @}
*/
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/event.h | 62 ++-
include/odp/api/spec/packet.h | 33 ++
platform/linux-generic/odp_event.c | 29 ++
platform/linux-generic/odp_packet.c | 44 +++
test/m4/configure.m4 | 1 +
test/validation/api/Makefile.am | 2 +
test/validation/api/event/.gitignore | 1 +
test/validation/api/event/Makefile.am | 5 +
test/validation/api/event/event.c | 417 +++++++++++++++++++++
.../api/{chksum/chksum_main.c => event/event.h} | 10 +-
.../{chksum/chksum_main.c => event/event_main.c} | 5 +-
test/validation/api/packet/packet.c | 85 ++++-
test/validation/api/packet/packet.h | 1 +
13 files changed, 676 insertions(+), 19 deletions(-)
create mode 100644 test/validation/api/event/.gitignore
create mode 100644 test/validation/api/event/Makefile.am
create mode 100644 test/validation/api/event/event.c
copy test/validation/api/{chksum/chksum_main.c => event/event.h} (53%)
copy test/validation/api/{chksum/chksum_main.c => event/event_main.c} (68%)
hooks/post-receive
--
8 years, 1 month
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-670-g0c7769e1
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 0c7769e1e8e7893f3631d7c8b8297f87b718d27d (commit)
via 87ec9465899591ddc2125740d19a395d4b8b9608 (commit)
from 411629a3e9efb8e44f5d0c6337c565720418d653 (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 0c7769e1e8e7893f3631d7c8b8297f87b718d27d
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 30 00:32:16 2017 +0300
api: ipsec: reuse checksum checking flags from packet API
Reuse odp_packet_parse_chksum_t from packet API to ease passing checksum
flags to packet parsing functions.
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 d57815ed..6f00a2c9 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -158,33 +158,9 @@ typedef struct odp_ipsec_inbound_config_t {
/** Flags to control IPSEC payload data checks up to the selected parse
* level. Checksum checking status can be queried for each packet with
* odp_packet_l3_chksum_status() and odp_packet_l4_chksum_status().
+ * Default value for all bits is 0 (skip all checksum checks).
*/
- union {
- /** Mapping for individual bits */
- struct {
- /** Check IPv4 header checksum in IPSEC payload.
- * Default value is 0. */
- uint32_t ipv4_chksum : 1;
-
- /** Check UDP checksum in IPSEC payload.
- * Default value is 0. */
- uint32_t udp_chksum : 1;
-
- /** Check TCP checksum in IPSEC payload.
- * Default value is 0. */
- uint32_t tcp_chksum : 1;
-
- /** Check SCTP checksum in IPSEC payload.
- * Default value is 0. */
- uint32_t sctp_chksum : 1;
- } check;
-
- /** All bits of the bit field structure
- *
- * This field can be used to set/clear all flags, or bitwise
- * operations over the entire structure. */
- uint32_t all_check;
- };
+ odp_proto_chksums_t chksums;
} odp_ipsec_inbound_config_t;
commit 87ec9465899591ddc2125740d19a395d4b8b9608
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 30 00:31:17 2017 +0300
api: packet: separate checksum check flags
Separate union controlling different checksum checks. It will be used by
IPsec 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/packet.h b/include/odp/api/spec/packet.h
index 1dbbfafe..19572034 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -1178,6 +1178,31 @@ int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset,
*
*/
+/**
+ * Flags to control packet data checksum checking
+ */
+typedef union odp_proto_chksums_t {
+ /** Individual checksum bits. */
+ struct {
+ /** IPv4 header checksum */
+ uint32_t ipv4 : 1;
+
+ /** UDP checksum */
+ uint32_t udp : 1;
+
+ /** TCP checksum */
+ uint32_t tcp : 1;
+
+ /** SCTP checksum */
+ uint32_t sctp : 1;
+
+ } chksum;
+
+ /** All checksum bits. This can be used to set/clear all flags. */
+ uint32_t all_chksum;
+
+} odp_proto_chksums_t;
+
/**
* Packet parse parameters
*/
@@ -1190,30 +1215,12 @@ typedef struct odp_packet_parse_param_t {
* layer than the layer of 'proto'. */
odp_proto_layer_t layer;
- /** Flags to control payload data checks up to the selected parse
- * layer. Checksum checking status can be queried for each packet with
- * odp_packet_l3_chksum_status() and odp_packet_l4_chksum_status().
+ /** Flags to control payload data checksums checks up to the selected
+ * parse layer. Checksum checking status can be queried for each packet
+ * with odp_packet_l3_chksum_status() and
+ * odp_packet_l4_chksum_status().
*/
- union {
- /** Individual check bits. */
- struct {
- /** Check IPv4 header checksum */
- uint32_t ipv4_chksum : 1;
-
- /** Check UDP checksum */
- uint32_t udp_chksum : 1;
-
- /** Check TCP checksum */
- uint32_t tcp_chksum : 1;
-
- /** Check SCTP checksum */
- uint32_t sctp_chksum : 1;
-
- } check;
-
- /** All check bits. This can be used to set/clear all flags. */
- uint32_t all_check;
- };
+ odp_proto_chksums_t chksums;
} odp_packet_parse_param_t;
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index ce4d66c0..703dfb56 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -2451,7 +2451,7 @@ void packet_test_parse(void)
parse.proto = ODP_PROTO_ETH;
parse.layer = ODP_PROTO_LAYER_ALL;
- parse.all_check = 0;
+ parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
@@ -2482,7 +2482,7 @@ void packet_test_parse(void)
parse.proto = ODP_PROTO_IPV4;
parse.layer = ODP_PROTO_LAYER_L4;
- parse.all_check = 0;
+ parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
@@ -2512,7 +2512,7 @@ void packet_test_parse(void)
parse.proto = ODP_PROTO_ETH;
parse.layer = ODP_PROTO_LAYER_L4;
- parse.all_check = 0;
+ parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
@@ -2542,7 +2542,7 @@ void packet_test_parse(void)
parse.proto = ODP_PROTO_ETH;
parse.layer = ODP_PROTO_LAYER_L4;
- parse.all_check = 0;
+ parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
@@ -2573,7 +2573,7 @@ void packet_test_parse(void)
parse.proto = ODP_PROTO_ETH;
parse.layer = ODP_PROTO_LAYER_ALL;
- parse.all_check = 0;
+ parse.chksums.all_chksum = 0;
CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/ipsec.h | 28 ++------------------
include/odp/api/spec/packet.h | 53 +++++++++++++++++++++----------------
test/validation/api/packet/packet.c | 10 +++----
3 files changed, 37 insertions(+), 54 deletions(-)
hooks/post-receive
--
8 years, 1 month
- 1
- 0