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