December 2017 - git-lng-odp - lists.linaro.org

[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 --

6 years, 6 months

1
0
0 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 --

6 years, 6 months

1
0
0 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 --

6 years, 6 months

1
0
0 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(&params); + + params.type = ODP_POOL_PACKET; + params.pkt.len = len; + params.pkt.num = num_pkt; + + pool = odp_pool_create("packet_pool_free_sp", &params); + 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 --

6 years, 6 months

1
0
0 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 --

6 years, 6 months

1
0
0 0

[COMMIT] branch api-next updated. v1.16.0.0-668-g411629a3

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 411629a3e9efb8e44f5d0c6337c565720418d653 (commit) via 072b0d72318cfb5b847300404a2bd2130e5130c1 (commit) from ced550922123b8fd8151d98490a78766a0bcf847 (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 411629a3e9efb8e44f5d0c6337c565720418d653 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 30 12:36:23 2017 +0200 linux-gen: event: move event subtype to packet header Event subtype is only used by packets, so move subtype to packet header to optimize cache usage. This change fixes the ~30% performance penalty in l2fwd (zero-copy dpdk pktio) caused by the initialization of event subtype. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h index e095aec5..a5658e81 100644 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ b/platform/linux-generic/include/odp_buffer_inlines.h @@ -21,8 +21,6 @@ extern "C" { odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); -odp_event_subtype_t _odp_buffer_event_subtype(odp_buffer_t buf); -void _odp_buffer_event_subtype_set(odp_buffer_t buf, int ev); int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); static inline odp_buffer_t buf_from_buf_hdr(odp_buffer_hdr_t *hdr) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 64887d75..c56c5b01 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -104,9 +104,6 @@ struct odp_buffer_hdr_t { /* User area pointer */ void *uarea_addr; - /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ - int8_t event_subtype; - /* ipc mapped process can not walk over pointers, * offset has to be used */ uint64_t ipc_data_offset; diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index ab31d070..a16ec316 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -132,6 +132,9 @@ typedef struct { uint16_t headroom; uint16_t tailroom; + /* Event subtype */ + int8_t subtype; + /* * Members below are not initialized by packet_init() */ @@ -195,6 +198,16 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr) return &last->buf_hdr.seg[last_seg]; } +static inline odp_event_subtype_t packet_subtype(odp_packet_t pkt) +{ + return odp_packet_hdr(pkt)->subtype; +} + +static inline void packet_subtype_set(odp_packet_t pkt, int ev) +{ + odp_packet_hdr(pkt)->subtype = ev; +} + /** * Initialize packet */ @@ -234,9 +247,10 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->headroom = CONFIG_PACKET_HEADROOM; pkt_hdr->tailroom = pool->seg_len - seg_len + CONFIG_PACKET_TAILROOM; - pkt_hdr->input = ODP_PKTIO_INVALID; - pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + if (odp_unlikely(pkt_hdr->subtype != ODP_EVENT_PACKET_BASIC)) + pkt_hdr->subtype = ODP_EVENT_PACKET_BASIC; + pkt_hdr->input = ODP_PKTIO_INVALID; } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index b5f538dd..b9cc21a1 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1072,8 +1072,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, /* Indicate to caller operation was sync */ *posted = 0; - _odp_buffer_event_subtype_set(packet_to_buffer(out_pkt), - ODP_EVENT_PACKET_BASIC); + packet_subtype_set(out_pkt, ODP_EVENT_PACKET_BASIC); /* Fill in result */ local_result.ctx = param->ctx; @@ -1351,8 +1350,7 @@ int odp_crypto_int(odp_packet_t pkt_in, } /* Fill in result */ - _odp_buffer_event_subtype_set(packet_to_buffer(out_pkt), - ODP_EVENT_PACKET_CRYPTO); + packet_subtype_set(out_pkt, ODP_EVENT_PACKET_CRYPTO); op_result = get_op_result_from_packet(out_pkt); op_result->cipher_status.alg_err = rc_cipher; op_result->cipher_status.hw_err = ODP_CRYPTO_HW_ERR_NONE; diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index 66bc11fe..4a37b5e4 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -16,6 +16,7 @@ #include <odp_ipsec_internal.h> #include <odp_buffer_inlines.h> #include <odp_debug_internal.h> +#include <odp_packet_internal.h> odp_event_type_t odp_event_type(odp_event_t event) { @@ -24,17 +25,24 @@ odp_event_type_t odp_event_type(odp_event_t event) odp_event_subtype_t odp_event_subtype(odp_event_t event) { - return _odp_buffer_event_subtype(odp_buffer_from_event(event)); + if (_odp_buffer_event_type(odp_buffer_from_event(event)) != + ODP_EVENT_PACKET) + return ODP_EVENT_NO_SUBTYPE; + + return packet_subtype(odp_packet_from_event(event)); } odp_event_type_t odp_event_types(odp_event_t event, odp_event_subtype_t *subtype) { odp_buffer_t buf = odp_buffer_from_event(event); + odp_event_type_t event_type = _odp_buffer_event_type(buf); - *subtype = _odp_buffer_event_subtype(buf); + *subtype = event_type == ODP_EVENT_PACKET ? + packet_subtype(odp_packet_from_event(event)) : + ODP_EVENT_NO_SUBTYPE; - return _odp_buffer_event_type(buf); + return event_type; } void odp_event_free(odp_event_t event) diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 18ae8ece..8735e605 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -973,8 +973,7 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_in_single(pkt, sa, &pkt, &status); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1037,8 +1036,7 @@ int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); ODP_ASSERT(NULL != ipsec_sa); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1085,8 +1083,7 @@ int odp_ipsec_in_enq(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_in_single(pkt, sa, &pkt, &status); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1146,8 +1143,7 @@ int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); ODP_ASSERT(NULL != ipsec_sa); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1186,8 +1182,7 @@ int _odp_ipsec_try_inline(odp_packet_t pkt) if (NULL == ipsec_sa) return -1; - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; @@ -1264,8 +1259,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, ipsec_sa = ipsec_out_single(pkt, sa, &pkt, opt, &status); ODP_ASSERT(NULL != ipsec_sa); - _odp_buffer_event_subtype_set(packet_to_buffer(pkt), - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->sa = ipsec_sa->ipsec_sa_hdl; @@ -1286,11 +1280,8 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, } } else { odp_queue_t queue; - odp_buffer_t buf; err: - buf = packet_to_buffer(pkt); - _odp_buffer_event_subtype_set(buf, - ODP_EVENT_PACKET_IPSEC); + packet_subtype_set(pkt, ODP_EVENT_PACKET_IPSEC); result = ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->sa = ipsec_sa->ipsec_sa_hdl; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 25f0ed3b..f1e7d028 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -298,7 +298,6 @@ static void init_buffers(pool_t *pool) buf_hdr->index = i; buf_hdr->type = type; buf_hdr->event_type = type; - buf_hdr->event_subtype = ODP_EVENT_NO_SUBTYPE; buf_hdr->pool_ptr = pool; buf_hdr->uarea_addr = uarea; buf_hdr->segcount = 1; @@ -665,16 +664,6 @@ void _odp_buffer_event_type_set(odp_buffer_t buf, int ev) buf_hdl_to_hdr(buf)->event_type = ev; } -odp_event_subtype_t _odp_buffer_event_subtype(odp_buffer_t buf) -{ - return buf_hdl_to_hdr(buf)->event_subtype; -} - -void _odp_buffer_event_subtype_set(odp_buffer_t buf, int ev) -{ - buf_hdl_to_hdr(buf)->event_subtype = ev; -} - odp_pool_t odp_pool_lookup(const char *name) { uint32_t i; diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 8bb4b4f1..96df7272 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -172,18 +172,16 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (pktio_entry->s.config.outbound_ipsec) for (i = 0; i < len; ++i) { - odp_buffer_t buf = buf_from_buf_hdr(hdr_tbl[i]); odp_ipsec_packet_result_t result; - if (_odp_buffer_event_subtype(buf) != + if (packet_subtype(pkt_tbl[i]) != ODP_EVENT_PACKET_IPSEC) continue; /* Possibly postprocessing packet */ odp_ipsec_result(&result, pkt_tbl[i]); - _odp_buffer_event_subtype_set(buf, - ODP_EVENT_PACKET_BASIC); + packet_subtype_set(pkt_tbl[i], ODP_EVENT_PACKET_BASIC); } odp_ticketlock_lock(&pktio_entry->s.txl); commit 072b0d72318cfb5b847300404a2bd2130e5130c1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Nov 30 09:42:58 2017 +0200 linux-gen: buffer: remove unused members from odp_buffer_hdr_t Remove unused odp_buffer_hdr_t members (caused by a merge error). Signed-off-by: Matias Elo <matias.elo(a)nokia.com> 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/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index d9e55e03..64887d75 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -104,12 +104,6 @@ struct odp_buffer_hdr_t { /* User area pointer */ void *uarea_addr; - /* User area size */ - uint32_t uarea_size; - - /* Max data size */ - uint32_t size; - /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ int8_t event_subtype; ----------------------------------------------------------------------- Summary of changes: .../linux-generic/include/odp_buffer_inlines.h | 2 -- .../linux-generic/include/odp_buffer_internal.h | 9 --------- .../linux-generic/include/odp_packet_internal.h | 18 +++++++++++++++-- platform/linux-generic/odp_crypto.c | 6 ++---- platform/linux-generic/odp_event.c | 14 ++++++++++--- platform/linux-generic/odp_ipsec.c | 23 +++++++--------------- platform/linux-generic/odp_pool.c | 11 ----------- platform/linux-generic/pktio/loop.c | 6 ++---- 8 files changed, 38 insertions(+), 51 deletions(-) hooks/post-receive --

6 years, 6 months

1
0
0 0

[COMMIT] branch api-next updated. v1.16.0.0-666-gced55092

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 ced550922123b8fd8151d98490a78766a0bcf847 (commit) via 6881620135a179911a5839d4be97423a8d80e5ab (commit) via e118bc6c2084c306968cb5d947649eca4a8029ba (commit) via f55bd7c695d142cfb2306b5f156bc401ba11473b (commit) via 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa (commit) via 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (commit) via 37b4da286aeff3321084e62045d0b3ab10c07399 (commit) via e02d9f43ea8675db5ad5202ef605e6dd8014abb5 (commit) via 442638dd1514f8dda882d48fbb1ebc88ef9af430 (commit) via c6573eb58dcf0d0316ada1e91ae1993100c4d559 (commit) via aab8ff7237c117e9ed63a8b7d595aca7f5665ff9 (commit) via c15a810b7a47f2e07200f83aa534163ca06e2b16 (commit) via aef79483e3d3e517b4cf2d71b3c22985326532c0 (commit) via f49d7bad7316ed0be807f37984908fc37da68004 (commit) via 811281a22b6274b7f41b926a9cfbe09e48a366bd (commit) from 630d8422564ebf4991b468cb38a29e9483fc2ec2 (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 ced550922123b8fd8151d98490a78766a0bcf847 Merge: 630d8422 68816201 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Mon Dec 11 18:30:10 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc .travis.yml index e0eaf5de,25c2d0a5..564f7b74 --- a/.travis.yml +++ b/.travis.yml @@@ -70,9 -69,9 +70,10 @@@ cache env: - CONF="" - CONF="--disable-abi-compat" + - CONF="--enable-deprecated" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" + - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" diff --cc example/generator/odp_generator.c index 81d95466,861e9836..b1827e9c --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@@ -32,8 -33,10 +33,11 @@@ #define APPL_MODE_UDP 0 /**< UDP mode */ #define APPL_MODE_PING 1 /**< ping mode */ #define APPL_MODE_RCV 2 /**< receive mode */ +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) + #define PING_THR_TX 0 + #define PING_THR_RX 1 + /** print appl mode */ #define PRINT_APPL_MODE(x) printf("%s(%i)\n", #x, (x)) @@@ -517,18 -532,26 +534,32 @@@ static int create_pktio(const char *dev return -1; } odp_pktio_config_init(&itf->config); - itf->config.pktin.bit.ipv4_chksum = capa.config.pktin.bit.ipv4_chksum; - itf->config.pktin.bit.udp_chksum = capa.config.pktin.bit.udp_chksum; - itf->config.pktin.bit.drop_ipv4_err = - capa.config.pktin.bit.drop_ipv4_err; - itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; - - itf->config.pktout.bit.ipv4_chksum_ena = - capa.config.pktout.bit.ipv4_chksum_ena; - itf->config.pktout.bit.udp_chksum_ena = - capa.config.pktout.bit.udp_chksum_ena; - itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; - itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; + if (args->appl.csum) { + itf->config.pktin.bit.ipv4_chksum = + capa.config.pktin.bit.ipv4_chksum; + itf->config.pktin.bit.udp_chksum = + capa.config.pktin.bit.udp_chksum; + itf->config.pktin.bit.drop_ipv4_err = + capa.config.pktin.bit.drop_ipv4_err; + itf->config.pktin.bit.drop_udp_err = + capa.config.pktin.bit.drop_udp_err; + ++ itf->config.pktout.bit.ipv4_chksum_ena = ++ capa.config.pktout.bit.ipv4_chksum_ena; ++ itf->config.pktout.bit.udp_chksum_ena = ++ capa.config.pktout.bit.udp_chksum_ena; + itf->config.pktout.bit.ipv4_chksum = + capa.config.pktout.bit.ipv4_chksum; + itf->config.pktout.bit.udp_chksum = + capa.config.pktout.bit.udp_chksum; + } else { /* explicit disable */ + itf->config.pktin.bit.ipv4_chksum = 0; + itf->config.pktin.bit.udp_chksum = 0; ++ itf->config.pktout.bit.ipv4_chksum_ena = 0; ++ itf->config.pktout.bit.udp_chksum_ena = 0; + itf->config.pktout.bit.ipv4_chksum = 0; + itf->config.pktout.bit.udp_chksum = 0; + } if (odp_pktio_config(itf->pktio, &itf->config)) { EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", @@@ -792,10 -819,11 +827,11 @@@ static int gen_recv_thread(void *arg odp_packet_t pkts[MAX_RX_BURST], pkt; odp_event_t events[MAX_RX_BURST]; int pkt_cnt, ev_cnt, i; - interface_t *itfs, *itf; + odp_packet_chksum_status_t csum_status; + (void)arg; thr = odp_thread_id(); + thr_args = (thread_args_t *)arg; - itfs = thr_args->rx.ifs; printf(" [%02i] created mode: RECEIVE\n", thr); odp_barrier_wait(&barrier); diff --cc platform/linux-generic/Makefile.am index 8f783463,bbe6a21c..4371e7a9 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -16,8 -13,13 +16,14 @@@ AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconf AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) +AM_CPPFLAGS += $(LIBCONFIG_CFLAGS) + if PKTIO_DPDK + if ARCH_IS_X86 + AM_CFLAGS += -msse4.2 + endif + endif + odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ include/odp/visibility_begin.h \ ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + .travis.yml | 60 +++++-- example/generator/odp_generator.c | 322 ++++++++++++++++++++++------------ m4/odp_dpdk.m4 | 76 ++++++++ platform/linux-generic/Makefile.am | 6 + platform/linux-generic/m4/odp_dpdk.m4 | 57 +++--- platform/linux-generic/pktio/dpdk.c | 30 +++- 7 files changed, 388 insertions(+), 164 deletions(-) create mode 100644 m4/odp_dpdk.m4 hooks/post-receive --

6 years, 6 months

1
0
0 0

[COMMIT] branch api-next updated. v1.16.0.0-651-g630d8422

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 630d8422564ebf4991b468cb38a29e9483fc2ec2 (commit) from ec42b01dc4f9992d0efef95d7f55399bba115f90 (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 630d8422564ebf4991b468cb38a29e9483fc2ec2 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Sat Dec 2 04:51:24 2017 +0300 linux-gen: arm/aarch64 rename dmb to _odp_dmb Rename dmb() to _odp_dmb() to remove clash with DPDK-defined dmb(). 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/arch/aarch64/odp_cpu.h b/platform/linux-generic/arch/aarch64/odp_cpu.h index fc35a462..170f23d8 100644 --- a/platform/linux-generic/arch/aarch64/odp_cpu.h +++ b/platform/linux-generic/arch/aarch64/odp_cpu.h @@ -40,7 +40,7 @@ */ #define CONFIG_WFE -static inline void dmb(void) +static inline void _odp_dmb(void) { __asm__ volatile("dmb" : : : "memory"); } diff --git a/platform/linux-generic/arch/arm/odp_cpu.h b/platform/linux-generic/arch/arm/odp_cpu.h index d77c8521..4e8acc7f 100644 --- a/platform/linux-generic/arch/arm/odp_cpu.h +++ b/platform/linux-generic/arch/arm/odp_cpu.h @@ -40,7 +40,7 @@ */ /* #define CONFIG_WFE */ -static inline void dmb(void) +static inline void _odp_dmb(void) { __asm__ volatile("dmb" : : : "memory"); } diff --git a/platform/linux-generic/arch/arm/odp_llsc.h b/platform/linux-generic/arch/arm/odp_llsc.h index b53cedc2..fd12c63c 100644 --- a/platform/linux-generic/arch/arm/odp_llsc.h +++ b/platform/linux-generic/arch/arm/odp_llsc.h @@ -23,7 +23,7 @@ static inline uint32_t ll8(uint8_t *var, int mm) : ); /* Barrier after an acquiring load */ if (mm == __ATOMIC_ACQUIRE) - dmb(); + _odp_dmb(); return old; } @@ -37,7 +37,7 @@ static inline uint32_t ll(uint32_t *var, int mm) : ); /* Barrier after an acquiring load */ if (mm == __ATOMIC_ACQUIRE) - dmb(); + _odp_dmb(); return old; } @@ -50,7 +50,7 @@ static inline uint32_t sc(uint32_t *var, uint32_t neu, int mm) /* Barrier before a releasing store */ if (mm == __ATOMIC_RELEASE) - dmb(); + _odp_dmb(); __asm__ volatile("strex %0, %1, [%2]" : "=&r" (ret) : "r" (neu), "r" (var) @@ -70,7 +70,7 @@ static inline uint64_t lld(uint64_t *var, int mm) : ); /* Barrier after an acquiring load */ if (mm == __ATOMIC_ACQUIRE) - dmb(); + _odp_dmb(); return old; } @@ -83,7 +83,7 @@ static inline uint32_t scd(uint64_t *var, uint64_t neu, int mm) /* Barrier before a releasing store */ if (mm == __ATOMIC_RELEASE) - dmb(); + _odp_dmb(); __asm__ volatile("strexd %0, %1, %H1, [%2]" : "=&r" (ret) : "r" (neu), "r" (var) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/arch/aarch64/odp_cpu.h | 2 +- platform/linux-generic/arch/arm/odp_cpu.h | 2 +- platform/linux-generic/arch/arm/odp_llsc.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive --

6 years, 6 months

1
0
0 0

[COMMIT] branch master updated. v1.16.0.0-26-g68816201

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 6881620135a179911a5839d4be97423a8d80e5ab (commit) via e118bc6c2084c306968cb5d947649eca4a8029ba (commit) via f55bd7c695d142cfb2306b5f156bc401ba11473b (commit) via 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa (commit) from 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 (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 6881620135a179911a5839d4be97423a8d80e5ab Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed Dec 6 17:15:14 2017 +0200 example: generator: replace atomic counter with per worker counters Use of atomic counters reduces total packet throughput. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 0a81cdeb..861e9836 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -34,6 +34,9 @@ #define APPL_MODE_PING 1 /**< ping mode */ #define APPL_MODE_RCV 2 /**< receive mode */ +#define PING_THR_TX 0 +#define PING_THR_RX 1 + /** print appl mode */ #define PRINT_APPL_MODE(x) printf("%s(%i)\n", #x, (x)) @@ -82,18 +85,21 @@ typedef struct { /** * counters */ -static struct { - odp_atomic_u64_t seq; /**< ip seq to be send */ - odp_atomic_u64_t ip; /**< ip packets */ - odp_atomic_u64_t udp; /**< udp packets */ - odp_atomic_u64_t icmp; /**< icmp packets */ - odp_atomic_u64_t cnt; /**< sent packets*/ - odp_atomic_u64_t tx_drops; /**< packets dropped in transmit */ -} counters; +typedef struct { + uint64_t ctr_pkt_snd; /**< sent packets*/ + uint64_t ctr_pkt_snd_drop; /**< packets dropped in transmit */ + + uint64_t ctr_pkt_rcv; /**< recv packets */ + uint64_t ctr_seq; /**< ip seq to be send */ + uint64_t ctr_udp_rcv; /**< udp packets */ + uint64_t ctr_icmp_reply_rcv; /**< icmp reply packets */ +} counters_t; /** * Thread specific arguments */ typedef struct { + counters_t counters; /**< Packet conters */ + odp_bool_t stop; /**< Stop packet processing */ union { struct { odp_pktout_queue_t pktout; /**< Packet output queue */ @@ -120,6 +126,9 @@ typedef struct { appl_args_t appl; /** Thread specific arguments */ thread_args_t thread[MAX_WORKERS]; + /** Global arguments */ + int thread_cnt; + int tx_burst_size; } args_t; /** Global pointer to args */ @@ -131,7 +140,8 @@ static odp_barrier_t barrier; /** Packet processing function types */ typedef odp_packet_t (*setup_pkt_ref_fn_t)(odp_pool_t, odp_pktout_config_opt_t *); -typedef int (*setup_pkt_fn_t)(odp_packet_t, odp_pktout_config_opt_t *); +typedef int (*setup_pkt_fn_t)(odp_packet_t, odp_pktout_config_opt_t *, + counters_t *); /* helper funcs */ static void parse_args(int argc, char *argv[], appl_args_t *appl_args); @@ -245,6 +255,7 @@ static int setup_pkt_ref_array(odp_pool_t pool, * @return 0 success, -1 failed */ static int setup_pkt_array(odp_pktout_config_opt_t *pktout_cfg, + counters_t *counters, odp_packet_t *pkt_ref_array, odp_packet_t *pkt_array, int pkt_array_size, @@ -253,7 +264,7 @@ static int setup_pkt_array(odp_pktout_config_opt_t *pktout_cfg, int i; for (i = 0; i < pkt_array_size; i++) { - if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg)) + if ((*setup_pkt)(pkt_ref_array[i], pktout_cfg, counters)) break; pkt_array[i] = odp_packet_ref_static(pkt_ref_array[i]); @@ -342,7 +353,8 @@ static odp_packet_t setup_udp_pkt_ref(odp_pool_t pool, * @return Success/Failed * @retval 0 on success, -1 on fail */ -static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg) +static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg, + counters_t *counters) { char *buf; odph_ipv4hdr_t *ip; @@ -352,7 +364,8 @@ static int setup_udp_pkt(odp_packet_t pkt, odp_pktout_config_opt_t *pktout_cfg) /*Update IP ID and checksum*/ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); - seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xFFFF; + seq = counters->ctr_seq % 0xFFFF; + counters->ctr_seq++; ip->id = odp_cpu_to_be_16(seq); if (!pktout_cfg->bit.ipv4_chksum) { ip->chksum = 0; @@ -437,7 +450,8 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool, * @retval 0 on success, -1 on fail */ static int setup_icmp_pkt(odp_packet_t pkt, - odp_pktout_config_opt_t *pktout_cfg) + odp_pktout_config_opt_t *pktout_cfg, + counters_t *counters) { char *buf; odph_ipv4hdr_t *ip; @@ -450,7 +464,8 @@ static int setup_icmp_pkt(odp_packet_t pkt, /* ip */ ip = (odph_ipv4hdr_t *)(buf + ODPH_ETHHDR_LEN); - seq = odp_atomic_fetch_add_u64(&counters.seq, 1) % 0xffff; + seq = counters->ctr_seq % 0xffff; + counters->ctr_seq++; ip->id = odp_cpu_to_be_16(seq); if (!pktout_cfg->bit.ipv4_chksum) { ip->chksum = 0; @@ -607,30 +622,39 @@ static int gen_send_thread(void *arg) odp_pktout_config_opt_t *pktout_cfg; odp_packet_t pkt_ref_array[MAX_UDP_TX_BURST]; odp_packet_t pkt_array[MAX_UDP_TX_BURST]; - int pkt_array_size; + int pkt_array_size, seq_step; int burst_start, burst_size; setup_pkt_ref_fn_t setup_pkt_ref = NULL; setup_pkt_fn_t setup_pkt = NULL; + counters_t *counters; + uint64_t pkt_count_max = 0; thr = odp_thread_id(); thr_args = arg; pktout = thr_args->tx.pktout; pktout_cfg = thr_args->tx.pktout_cfg; + counters = &thr_args->counters; /* Create reference packets*/ if (args->appl.mode == APPL_MODE_UDP) { - pkt_array_size = args->appl.udp_tx_burst; setup_pkt_ref = setup_udp_pkt_ref; setup_pkt = setup_udp_pkt; + seq_step = args->tx_burst_size * (args->thread_cnt - 1); + if (args->appl.number != -1) + pkt_count_max = args->appl.number / args->thread_cnt + + (args->appl.number % args->thread_cnt ? 1 : 0); } else if (args->appl.mode == APPL_MODE_PING) { - pkt_array_size = 1; setup_pkt_ref = setup_icmp_pkt_ref; setup_pkt = setup_icmp_pkt; + seq_step = 0; + if (args->appl.number != -1) + pkt_count_max = args->appl.number; } else { EXAMPLE_ERR(" [%02i] Error: invalid processing mode %d\n", thr, args->appl.mode); return -1; } + pkt_array_size = args->tx_burst_size; if (setup_pkt_ref_array(thr_args->pool, pktout_cfg, pkt_ref_array, pkt_array_size, @@ -645,13 +669,17 @@ static int gen_send_thread(void *arg) odp_barrier_wait(&barrier); for (;;) { - if (args->appl.number != -1 && - odp_atomic_fetch_add_u64(&counters.cnt, pkt_array_size) >= - (unsigned int)args->appl.number) + if (thr_args->stop) break; + if (pkt_count_max && counters->ctr_pkt_snd > pkt_count_max) { + sleep(1); /* wait for stop command */ + continue; + } + /* Setup TX burst*/ - if (setup_pkt_array(pktout_cfg, pkt_ref_array, pkt_array, + if (setup_pkt_array(pktout_cfg, counters, + pkt_ref_array, pkt_array, pkt_array_size, setup_pkt)) { EXAMPLE_ERR("[%02i] Error: failed to setup packets\n", thr); @@ -663,10 +691,12 @@ static int gen_send_thread(void *arg) ret = odp_pktout_send(pktout, &pkt_array[burst_start], burst_size); if (ret == burst_size) { + burst_size = 0; break; } else if (ret >= 0 && ret < burst_size) { - odp_atomic_add_u64(&counters.tx_drops, - burst_size - ret); + thr_args->counters.ctr_pkt_snd_drop += + burst_size - ret; + burst_start += ret; burst_size -= ret; continue; @@ -677,32 +707,20 @@ static int gen_send_thread(void *arg) break; } + counters->ctr_pkt_snd += pkt_array_size - burst_size; + if (args->appl.interval != 0) { printf(" [%02i] send pkt no:%ju seq %ju\n", thr, - odp_atomic_load_u64(&counters.seq), - odp_atomic_load_u64(&counters.seq)%0xffff); + counters->ctr_seq, + counters->ctr_seq % 0xffff); millisleep(args->appl.interval, thr_args->tp, thr_args->tim, thr_args->tq, thr_args->tmo_ev); } - } - - /* receive number of reply pks until timeout */ - if (args->appl.mode == APPL_MODE_PING && args->appl.number > 0) { - while (args->appl.timeout >= 0) { - if (odp_atomic_load_u64(&counters.icmp) >= - (unsigned int)args->appl.number) - break; - millisleep(DEFAULT_PKT_INTERVAL, - thr_args->tp, - thr_args->tim, - thr_args->tq, - thr_args->tmo_ev); - args->appl.timeout--; - } + counters->ctr_seq += seq_step; } odp_packet_free_multi(pkt_ref_array, pkt_array_size); @@ -717,7 +735,8 @@ static int gen_send_thread(void *arg) * @param msg output buffer */ -static void process_icmp_pkt(odph_icmphdr_t *icmp, char *msg) +static void process_icmp_pkt(thread_args_t *thr_args, + odph_icmphdr_t *icmp, char *msg) { uint64_t trecv; uint64_t tsend; @@ -726,7 +745,7 @@ static void process_icmp_pkt(odph_icmphdr_t *icmp, char *msg) msg[0] = 0; if (icmp->type == ICMP_ECHOREPLY) { - odp_atomic_inc_u64(&counters.icmp); + thr_args->counters.ctr_icmp_reply_rcv++; memcpy(&tsend, (uint8_t *)icmp + ODPH_ICMPHDR_LEN, sizeof(uint64_t)); @@ -751,7 +770,8 @@ static void process_icmp_pkt(odph_icmphdr_t *icmp, char *msg) * @param pkt_tbl packets to be print * @param len packet number */ -static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len) +static void print_pkts(int thr, thread_args_t *thr_args, + odp_packet_t pkt_tbl[], unsigned len) { odp_packet_t pkt; char *buf; @@ -768,21 +788,20 @@ static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len) if (!odp_packet_has_ipv4(pkt)) continue; - odp_atomic_inc_u64(&counters.ip); + thr_args->counters.ctr_pkt_rcv++; buf = odp_packet_data(pkt); ip = (odph_ipv4hdr_t *)(buf + odp_packet_l3_offset(pkt)); offset = odp_packet_l4_offset(pkt); /* udp */ - if (ip->proto == ODPH_IPPROTO_UDP) { - odp_atomic_inc_u64(&counters.udp); - } + if (ip->proto == ODPH_IPPROTO_UDP) + thr_args->counters.ctr_udp_rcv++; /* icmp */ if (ip->proto == ODPH_IPPROTO_ICMPv4) { icmp = (odph_icmphdr_t *)(buf + offset); - process_icmp_pkt(icmp, msg); + process_icmp_pkt(thr_args, icmp, msg); printf(" [%02i] %s\n", thr, msg); } } @@ -810,14 +829,11 @@ static int gen_recv_thread(void *arg) odp_barrier_wait(&barrier); for (;;) { - if (args->appl.number != -1 && - odp_atomic_load_u64(&counters.icmp) >= - (unsigned int)args->appl.number) { + if (thr_args->stop) break; - } /* Use schedule to get buf from any input queue */ - ev_cnt = odp_schedule_multi(NULL, ODP_SCHED_WAIT, + ev_cnt = odp_schedule_multi(NULL, ODP_SCHED_NO_WAIT, events, MAX_RX_BURST); if (ev_cnt == 0) continue; @@ -848,7 +864,7 @@ static int gen_recv_thread(void *arg) } if (pkt_cnt) { - print_pkts(thr, pkts, pkt_cnt); + print_pkts(thr, thr_args, pkts, pkt_cnt); odp_packet_free_multi(pkts, pkt_cnt); } @@ -857,6 +873,35 @@ static int gen_recv_thread(void *arg) return 0; } +#define COUNTER_SUM(_c, _nw) \ +({ \ + int _itr; \ + uint64_t _result = 0; \ + \ + for (_itr = 0; _itr < _nw; _itr++) \ + _result += args->thread[_itr].counters.ctr_ ## _c; \ + \ + _result; \ +}) + +static void garceful_stop_ping(void) +{ + uint64_t snd, rcv; + + if (args->appl.mode != APPL_MODE_PING) + return; + + while (args->appl.timeout >= 0) { + snd = COUNTER_SUM(pkt_snd, 2); + rcv = COUNTER_SUM(icmp_reply_rcv, 2); + if (rcv >= snd) + break; + + sleep(1); + args->appl.timeout--; + } +} + /** * printing verbose statistics * @@ -868,8 +913,8 @@ static void print_global_stats(int num_workers) uint64_t pps_snd = 0, maximum_pps_snd = 0; uint64_t pkts_rcv = 0, pkts_rcv_prev = 0; uint64_t pps_rcv = 0, maximum_pps_rcv = 0; - uint64_t stall; - int verbose_interval = 20; + uint64_t stall, pkts_snd_drop; + int verbose_interval = 20, i; odp_thrmask_t thrd_mask; odp_barrier_wait(&barrier); @@ -878,12 +923,15 @@ static void print_global_stats(int num_workers) next = odp_time_sum(odp_time_local(), wait); while (odp_thrmask_worker(&thrd_mask) == num_workers) { - if (args->appl.number != -1 && - odp_atomic_load_u64(&counters.cnt) >= - (unsigned int)args->appl.number) { - break; - } + if (args->appl.mode != APPL_MODE_RCV && + args->appl.number != -1) { + uint64_t cnt = COUNTER_SUM(pkt_snd, num_workers); + if (cnt >= (unsigned int)args->appl.number) { + garceful_stop_ping(); + break; + } + } cur = odp_time_local(); if (odp_time_cmp(next, cur) > 0) { left = odp_time_diff(next, cur); @@ -894,18 +942,22 @@ static void print_global_stats(int num_workers) usleep(stall / ODP_TIME_USEC_IN_NS); continue; } - next = odp_time_sum(cur, wait); + switch (args->appl.mode) { case APPL_MODE_RCV: - pkts_rcv = odp_atomic_load_u64(&counters.ip); + pkts_rcv = COUNTER_SUM(pkt_rcv, num_workers); + pkts_snd = 0; + pkts_snd_drop = 0; break; case APPL_MODE_PING: - pkts_snd = odp_atomic_load_u64(&counters.seq); - pkts_rcv = odp_atomic_load_u64(&counters.icmp); + pkts_snd = COUNTER_SUM(pkt_snd, num_workers); + pkts_snd_drop = COUNTER_SUM(pkt_snd_drop, num_workers); + pkts_rcv = COUNTER_SUM(icmp_reply_rcv, num_workers); break; case APPL_MODE_UDP: - pkts_snd = odp_atomic_load_u64(&counters.seq); + pkts_snd = COUNTER_SUM(pkt_snd, num_workers); + pkts_snd_drop = COUNTER_SUM(pkt_snd_drop, num_workers); break; default: continue; @@ -927,11 +979,14 @@ static void print_global_stats(int num_workers) "rcv: %" PRIu64 ", " "recv rate: %" PRIu64 " pps, " "max recv rate: %" PRIu64 " pps\n", - pkts_snd, odp_atomic_load_u64(&counters.tx_drops), + pkts_snd, pkts_snd_drop, pps_snd, maximum_pps_snd, pkts_rcv, pps_rcv, maximum_pps_rcv); fflush(NULL); } + + for (i = 0; i < num_workers; i++) + args->thread[i].stop = 1; } /** @@ -968,14 +1023,6 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - /* init counters */ - odp_atomic_init_u64(&counters.seq, 0); - odp_atomic_init_u64(&counters.ip, 0); - odp_atomic_init_u64(&counters.udp, 0); - odp_atomic_init_u64(&counters.icmp, 0); - odp_atomic_init_u64(&counters.cnt, 0); - odp_atomic_init_u64(&counters.tx_drops, 0); - /* Reserve memory for args from shared mem */ shm = odp_shm_reserve("shm_args", sizeof(args_t), ODP_CACHE_LINE_SIZE, 0); @@ -1024,6 +1071,15 @@ int main(int argc, char *argv[]) num_workers = 2; } } + args->thread_cnt = num_workers; + + /* Burst size */ + if (args->appl.mode == APPL_MODE_PING) + args->tx_burst_size = 1; + else if (args->appl.mode == APPL_MODE_UDP) + args->tx_burst_size = args->appl.udp_tx_burst; + else + args->tx_burst_size = 0; /* Create packet pool */ odp_pool_param_init(&params); @@ -1104,6 +1160,7 @@ int main(int argc, char *argv[]) if (args->appl.mode == APPL_MODE_PING) { odp_cpumask_t cpu_mask; int cpu_first, cpu_next; + thread_args_t *thr_args; odp_cpumask_zero(&cpu_mask); cpu_first = odp_cpumask_first(&cpumask); @@ -1114,60 +1171,64 @@ int main(int argc, char *argv[]) EXAMPLE_ERR("queue_create failed\n"); abort(); } - args->thread[1].rx.ifs = ifs; - args->thread[1].rx.ifs_count = args->appl.if_count; - args->thread[1].pool = pool; - args->thread[1].tp = tp; - args->thread[1].tq = tq; - args->thread[1].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[1].tim == ODP_TIMER_INVALID) { + thr_args = &args->thread[PING_THR_RX]; + thr_args->rx.ifs = ifs; + thr_args->rx.ifs_count = args->appl.if_count; + thr_args->pool = pool; + thr_args->tp = tp; + thr_args->tq = tq; + thr_args->tim = odp_timer_alloc(tp, tq, NULL); + if (thr_args->tim == ODP_TIMER_INVALID) { EXAMPLE_ERR("timer_alloc failed\n"); abort(); } - args->thread[1].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[1].tmo_ev == ODP_TIMEOUT_INVALID) { + thr_args->tmo_ev = odp_timeout_alloc(tmop); + if (thr_args->tmo_ev == ODP_TIMEOUT_INVALID) { EXAMPLE_ERR("timeout_alloc failed\n"); abort(); } - args->thread[1].mode = args->appl.mode; + thr_args->mode = args->appl.mode; memset(&thr_params, 0, sizeof(thr_params)); thr_params.start = gen_recv_thread; - thr_params.arg = &args->thread[1]; + thr_params.arg = thr_args; thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; - odph_odpthreads_create(&thread_tbl[1], &cpu_mask, &thr_params); + odph_odpthreads_create(&thread_tbl[PING_THR_RX], + &cpu_mask, &thr_params); tq = odp_queue_create("", NULL); if (tq == ODP_QUEUE_INVALID) { EXAMPLE_ERR("queue_create failed\n"); abort(); } - args->thread[0].tx.pktout = ifs[0].pktout[0]; - args->thread[0].tx.pktout_cfg = &ifs[0].config.pktout; - args->thread[0].pool = pool; - args->thread[0].tp = tp; - args->thread[0].tq = tq; - args->thread[0].tim = odp_timer_alloc(tp, tq, NULL); - if (args->thread[0].tim == ODP_TIMER_INVALID) { + thr_args = &args->thread[PING_THR_TX]; + thr_args->tx.pktout = ifs[0].pktout[0]; + thr_args->tx.pktout_cfg = &ifs[0].config.pktout; + thr_args->pool = pool; + thr_args->tp = tp; + thr_args->tq = tq; + thr_args->tim = odp_timer_alloc(tp, tq, NULL); + if (thr_args->tim == ODP_TIMER_INVALID) { EXAMPLE_ERR("timer_alloc failed\n"); abort(); } - args->thread[0].tmo_ev = odp_timeout_alloc(tmop); - if (args->thread[0].tmo_ev == ODP_TIMEOUT_INVALID) { + thr_args->tmo_ev = odp_timeout_alloc(tmop); + if (thr_args->tmo_ev == ODP_TIMEOUT_INVALID) { EXAMPLE_ERR("timeout_alloc failed\n"); abort(); } - args->thread[0].mode = args->appl.mode; + thr_args->mode = args->appl.mode; cpu_next = odp_cpumask_next(&cpumask, cpu_first); odp_cpumask_zero(&cpu_mask); odp_cpumask_set(&cpu_mask, cpu_next); thr_params.start = gen_send_thread; - thr_params.arg = &args->thread[0]; + thr_params.arg = thr_args; - odph_odpthreads_create(&thread_tbl[0], &cpu_mask, &thr_params); + odph_odpthreads_create(&thread_tbl[PING_THR_TX], + &cpu_mask, &thr_params); } else { int cpu = odp_cpumask_first(&cpumask); @@ -1176,6 +1237,7 @@ int main(int argc, char *argv[]) odp_cpumask_t thd_mask; int (*thr_run_func)(void *); int if_idx, pktout_idx; + uint64_t start_seq; if (args->appl.mode == APPL_MODE_RCV) { args->thread[i].rx.ifs = ifs; @@ -1185,11 +1247,13 @@ int main(int argc, char *argv[]) if_idx = i % args->appl.if_count; pktout_idx = (i / args->appl.if_count) % ifs[if_idx].pktout_count; + start_seq = i * args->tx_burst_size; args->thread[i].tx.pktout = ifs[if_idx].pktout[pktout_idx]; args->thread[i].tx.pktout_cfg = &ifs[if_idx].config.pktout; + args->thread[i].counters.ctr_seq = start_seq; } tq = odp_queue_create("", NULL); if (tq == ODP_QUEUE_INVALID) { @@ -1531,9 +1595,9 @@ static void usage(char *progname) "OpenDataPlane example application.\n" "\n" " Work mode:\n" - " 1.send udp packets\n" + " 1.send ipv4 udp packets\n" " odp_generator -I eth0 --srcmac fe:0f:97:c9:e0:44 --dstmac 32:cb:9b:27:2f:1a --srcip 192.168.0.1 --dstip 192.168.0.2 -m u\n" - " 2.receive udp packets\n" + " 2.receive ipv4 packets\n" " odp_generator -I eth0 -m r\n" " 3.work likes ping\n" " odp_generator -I eth0 --srcmac fe:0f:97:c9:e0:44 --dstmac 32:cb:9b:27:2f:1a --srcip 192.168.0.1 --dstip 192.168.0.2 --cpumask 0xc -m p\n" commit e118bc6c2084c306968cb5d947649eca4a8029ba Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Thu Dec 7 10:59:27 2017 +0200 example: generator: add configuration option for csum support Add configuration option to enable platform checksum support (if available) for calculation and validation. By default, checksum calculation is performed in software and validation is disabled. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 47b91d6e..0a81cdeb 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -76,6 +76,7 @@ typedef struct { each packet */ int udp_tx_burst; /**< number of udp packets to send with one API call */ + odp_bool_t csum; /**< use platform csum support if available */ } appl_args_t; /** @@ -516,14 +517,26 @@ static int create_pktio(const char *dev, odp_pool_t pool, return -1; } odp_pktio_config_init(&itf->config); - itf->config.pktin.bit.ipv4_chksum = capa.config.pktin.bit.ipv4_chksum; - itf->config.pktin.bit.udp_chksum = capa.config.pktin.bit.udp_chksum; - itf->config.pktin.bit.drop_ipv4_err = - capa.config.pktin.bit.drop_ipv4_err; - itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; - - itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; - itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; + if (args->appl.csum) { + itf->config.pktin.bit.ipv4_chksum = + capa.config.pktin.bit.ipv4_chksum; + itf->config.pktin.bit.udp_chksum = + capa.config.pktin.bit.udp_chksum; + itf->config.pktin.bit.drop_ipv4_err = + capa.config.pktin.bit.drop_ipv4_err; + itf->config.pktin.bit.drop_udp_err = + capa.config.pktin.bit.drop_udp_err; + + itf->config.pktout.bit.ipv4_chksum = + capa.config.pktout.bit.ipv4_chksum; + itf->config.pktout.bit.udp_chksum = + capa.config.pktout.bit.udp_chksum; + } else { /* explicit disable */ + itf->config.pktin.bit.ipv4_chksum = 0; + itf->config.pktin.bit.udp_chksum = 0; + itf->config.pktout.bit.ipv4_chksum = 0; + itf->config.pktout.bit.udp_chksum = 0; + } if (odp_pktio_config(itf->pktio, &itf->config)) { EXAMPLE_ERR("Error: Failed to set interface configuration %s\n", @@ -1299,10 +1312,11 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"interval", required_argument, NULL, 'i'}, {"help", no_argument, NULL, 'h'}, {"udp_tx_burst", required_argument, NULL, 'x'}, + {"csum", no_argument, NULL, 'y'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:"; + static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:f:y"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1315,6 +1329,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; appl_args->srcport = 0; appl_args->dstport = 0; + appl_args->csum = 0; opterr = 0; /* do not issue errors on helper options */ @@ -1455,6 +1470,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) } break; + case 'y': + appl_args->csum = 1; + break; case 'h': usage(argv[0]); exit(EXIT_SUCCESS); @@ -1541,6 +1559,8 @@ static void usage(char *progname) " -n, --count the number of packets to be send\n" " -c, --cpumask to set on cores\n" " -x, --udp_tx_burst size of UDP TX burst\n" + " -y, --csum use platform checksum support if available\n" + " default is disabled\n" "\n", NO_PATH(progname), NO_PATH(progname) ); } commit f55bd7c695d142cfb2306b5f156bc401ba11473b Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Wed Dec 6 17:27:55 2017 +0200 example: generator: increase maximum TX burst size to 512 Bigger TX bursts may increase packet throughput. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 6ee4f638..47b91d6e 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -26,7 +26,8 @@ #define POOL_NUM_PKT 2048 /* Number of packets in packet pool */ #define POOL_PKT_LEN 1856 /* Max packet length */ #define DEFAULT_PKT_INTERVAL 1000 /* Interval between each packet */ -#define MAX_UDP_TX_BURST 32 +#define DEFAULT_UDP_TX_BURST 16 +#define MAX_UDP_TX_BURST 512 #define MAX_RX_BURST 32 #define APPL_MODE_UDP 0 /**< UDP mode */ @@ -1311,7 +1312,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->payload = 56; appl_args->timeout = -1; appl_args->interval = DEFAULT_PKT_INTERVAL; - appl_args->udp_tx_burst = 16; + appl_args->udp_tx_burst = DEFAULT_UDP_TX_BURST; appl_args->srcport = 0; appl_args->dstport = 0; commit 6e09adf147ad3ccb4df1cc988d20d31c3246d2aa Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Dec 5 11:05:27 2017 +0200 example: generator: remove 1 ms sleep on send loop The 1 ms sleep is reducing total packet throughput. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 53b397b3..6ee4f638 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -655,7 +655,6 @@ static int gen_send_thread(void *arg) burst_size - ret); burst_start += ret; burst_size -= ret; - odp_time_wait_ns(ODP_TIME_MSEC_IN_NS); continue; } EXAMPLE_ERR(" [%02i] packet send failed\n", thr); ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 310 ++++++++++++++++++++++++-------------- 1 file changed, 197 insertions(+), 113 deletions(-) hooks/post-receive --

6 years, 6 months

1
0
0 0

[COMMIT] branch api-next updated. v1.16.0.0-650-gec42b01d

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 ec42b01dc4f9992d0efef95d7f55399bba115f90 (commit) via 1b9cf6bc48e3ce6ef889e84cff400974a6ec2ed2 (commit) via bf6d0c8164f4f53192405a238262f1135b637679 (commit) via 5158e0deb21aa90d1e032f75e703c9fa8e0b95c0 (commit) via ab18a721760b8a4b61c0feec8fa6724ef2990a86 (commit) from 0980001e33b4190133d478a0aa2e718fd1e3c164 (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 ec42b01dc4f9992d0efef95d7f55399bba115f90 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 29 15:03:11 2017 +0200 linux-gen: dpdk: checksum insert enabled flag Added interface level flag to optimize checksum insertion checks. If checksum insertion has not been enabled, further configuration or packet level checks are not performed. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index f323d5c3..598b1ad5 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -113,7 +113,8 @@ struct pktio_entry { /* These two locks together lock the whole pktio device */ odp_ticketlock_t rxl; /**< RX ticketlock */ odp_ticketlock_t txl; /**< TX ticketlock */ - int cls_enabled; /**< is classifier enabled */ + uint8_t cls_enabled; /**< classifier enabled */ + uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { pkt_loop_t pkt_loop; /**< Using loopback for IO */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 4a37fe6e..48c2d0b0 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -546,6 +546,9 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg, odp_bool_t ipv4_chksum_pkt, udp_chksum_pkt, tcp_chksum_pkt; packet_parser_t *pkt_p = &pkt_hdr->p; + if (pkt_p->l3_offset == ODP_PACKET_OFFSET_INVALID) + return; + l3_hdr = (void *)(mbuf_data + pkt_p->l3_offset); if (check_proto(l3_hdr, &l3_proto_v4, &l4_proto)) @@ -633,7 +636,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data); - if (pkt_hdr->p.l3_offset != ODP_PACKET_OFFSET_INVALID) { + if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) { odp_pktout_config_opt_t *pktout_capa = &pktio_entry->s.capa.config.pktout; @@ -748,7 +751,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) { mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pkt_hdr->p.l3_offset != ODP_PACKET_OFFSET_INVALID) + if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, _odp_packet_data(pkt)); } else { @@ -771,8 +774,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, mbuf_init((struct rte_mempool *) pool_entry->ext_desc, mbuf, pkt_hdr); mbuf_update(mbuf, pkt_hdr, pkt_len); - if (pkt_hdr->p.l3_offset != - ODP_PACKET_OFFSET_INVALID) + if (pktio_entry->s.chksum_insert_ena) pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr, mbuf, _odp_packet_data(pkt)); @@ -1432,6 +1434,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) rte_eth_dev_info_get(port_id, &dev_info); dev_info.default_txconf.txq_flags = txq_flags; txconf = &dev_info.default_txconf; + pktio_entry->s.chksum_insert_ena = 1; } ret = rte_eth_tx_queue_setup(port_id, i, DPDK_NM_TX_DESC, commit 1b9cf6bc48e3ce6ef889e84cff400974a6ec2ed2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 29 14:09:45 2017 +0200 test: l2fwd: add checksum offload option Added option to enable checksum insertion at packet output. This can be used to test checksum offload in various packet IO combinations. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2daf0e2d..0ebb0dd1 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -92,6 +92,7 @@ static inline int sched_mode(pktin_mode_t in_mode) * Parsed command line application arguments */ typedef struct { + int extra_check; /**< Some extra checks have been enabled */ int cpu_count; int if_count; /**< Number of interfaces to be used */ int addr_count; /**< Number of dst addresses to be used */ @@ -106,6 +107,7 @@ typedef struct { int dst_change; /**< Change destination eth addresses */ int src_change; /**< Change source eth addresses */ int error_check; /**< Check packet errors */ + int chksum; /**< Checksum offload */ int sched_mode; /**< Scheduler mode */ int num_groups; /**< Number of scheduling groups */ int verbose; /**< Verbose output */ @@ -293,6 +295,18 @@ static inline int event_queue_send(odp_queue_t queue, odp_packet_t *pkt_tbl, return sent; } +static inline void chksum_insert(odp_packet_t *pkt_tbl, int pkts) +{ + odp_packet_t pkt; + int i; + + for (i = 0; i < pkts; i++) { + pkt = pkt_tbl[i]; + odp_packet_l3_chksum_insert(pkt, 1); + odp_packet_l4_chksum_insert(pkt, 1); + } +} + /** * Packet IO worker thread using scheduled queues * @@ -366,18 +380,23 @@ static int run_worker_sched_mode(void *arg) for (i = 0; i < pkts; i++) pkt_tbl[i] = odp_packet_from_event(ev_tbl[i]); - if (gbl_args->appl.error_check) { - int rx_drops; + if (odp_unlikely(gbl_args->appl.extra_check)) { + if (gbl_args->appl.chksum) + chksum_insert(pkt_tbl, pkts); - /* Drop packets with errors */ - rx_drops = drop_err_pkts(pkt_tbl, pkts); + if (gbl_args->appl.error_check) { + int rx_drops; - if (odp_unlikely(rx_drops)) { - stats->s.rx_drops += rx_drops; - if (pkts == rx_drops) - continue; + /* Drop packets with errors */ + rx_drops = drop_err_pkts(pkt_tbl, pkts); - pkts -= rx_drops; + if (odp_unlikely(rx_drops)) { + stats->s.rx_drops += rx_drops; + if (pkts == rx_drops) + continue; + + pkts -= rx_drops; + } } } @@ -487,18 +506,23 @@ static int run_worker_plain_queue_mode(void *arg) for (i = 0; i < pkts; i++) pkt_tbl[i] = odp_packet_from_event(event[i]); - if (gbl_args->appl.error_check) { - int rx_drops; + if (odp_unlikely(gbl_args->appl.extra_check)) { + if (gbl_args->appl.chksum) + chksum_insert(pkt_tbl, pkts); - /* Drop packets with errors */ - rx_drops = drop_err_pkts(pkt_tbl, pkts); + if (gbl_args->appl.error_check) { + int rx_drops; - if (odp_unlikely(rx_drops)) { - stats->s.rx_drops += rx_drops; - if (pkts == rx_drops) - continue; + /* Drop packets with errors */ + rx_drops = drop_err_pkts(pkt_tbl, pkts); - pkts -= rx_drops; + if (odp_unlikely(rx_drops)) { + stats->s.rx_drops += rx_drops; + if (pkts == rx_drops) + continue; + + pkts -= rx_drops; + } } } @@ -605,18 +629,23 @@ static int run_worker_direct_mode(void *arg) if (odp_unlikely(pkts <= 0)) continue; - if (gbl_args->appl.error_check) { - int rx_drops; + if (odp_unlikely(gbl_args->appl.extra_check)) { + if (gbl_args->appl.chksum) + chksum_insert(pkt_tbl, pkts); + + if (gbl_args->appl.error_check) { + int rx_drops; - /* Drop packets with errors */ - rx_drops = drop_err_pkts(pkt_tbl, pkts); + /* Drop packets with errors */ + rx_drops = drop_err_pkts(pkt_tbl, pkts); - if (odp_unlikely(rx_drops)) { - stats->s.rx_drops += rx_drops; - if (pkts == rx_drops) - continue; + if (odp_unlikely(rx_drops)) { + stats->s.rx_drops += rx_drops; + if (pkts == rx_drops) + continue; - pkts -= rx_drops; + pkts -= rx_drops; + } } } @@ -707,9 +736,17 @@ 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.error_check ? + config.parser.layer = gbl_args->appl.extra_check ? ODP_PKTIO_PARSER_LAYER_ALL : ODP_PKTIO_PARSER_LAYER_NONE; + + if (gbl_args->appl.chksum) { + printf("Checksum offload enabled\n"); + config.pktout.bit.ipv4_chksum_ena = 1; + config.pktout.bit.udp_chksum_ena = 1; + config.pktout.bit.tcp_chksum_ena = 1; + } + odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); @@ -1132,9 +1169,12 @@ static void usage(char *progname) " Requires also the -d flag to be set\n" " -e, --error_check <arg> 0: Don't check packet errors (default)\n" " 1: Check packet errors\n" + " -k, --chksum <arg> 0: Don't use checksum offload (default)\n" + " 1: Use checksum offload\n" " -g, --groups <num> Number of groups to use: 0 ... num\n" " 0: SCHED_GROUP_ALL (default)\n" " num: must not exceed number of interfaces or workers\n" + " -v, --verbose Verbose output.\n" " -h, --help Display help and exit.\n\n" "\n", NO_PATH(progname), NO_PATH(progname), MAX_PKTIOS ); @@ -1166,13 +1206,14 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) {"dst_change", required_argument, NULL, 'd'}, {"src_change", required_argument, NULL, 's'}, {"error_check", required_argument, NULL, 'e'}, + {"chksum", required_argument, NULL, 'k'}, {"groups", required_argument, NULL, 'g'}, {"verbose", no_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:g:vh"; + static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:k:g:vh"; /* let helper collect its own arguments (e.g. --odph_proc) */ odph_parse_options(argc, argv, shortopts, longopts); @@ -1184,6 +1225,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->num_groups = 0; /* use default group */ appl_args->error_check = 0; /* don't check packet errors by default */ appl_args->verbose = 0; + appl_args->chksum = 0; /* don't use checksum offload by default */ opterr = 0; /* do not issue errors on helper options */ @@ -1308,6 +1350,9 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'e': appl_args->error_check = atoi(optarg); break; + case 'k': + appl_args->chksum = atoi(optarg); + break; case 'g': appl_args->num_groups = atoi(optarg); break; @@ -1335,6 +1380,8 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) exit(EXIT_FAILURE); } + appl_args->extra_check = appl_args->error_check || appl_args->chksum; + optind = 1; /* reset 'extern optind' from the getopt lib */ } commit bf6d0c8164f4f53192405a238262f1135b637679 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed Nov 29 12:51:50 2017 +0200 linux-gen: dpdk: use checksum insert enable config Enable checksum insertion only when requested. DPDK uses less optimized driver code (on Intel NICs at least) when any of the L4 checksum offloads is enabled. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index d0a238aa..4a37fe6e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -123,6 +123,7 @@ static inline void mbuf_update(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr, mbuf->data_len = pkt_len; mbuf->pkt_len = pkt_len; mbuf->refcnt = 1; + mbuf->ol_flags = 0; if (odp_unlikely(pkt_hdr->buf_hdr.base_data != pkt_hdr->buf_hdr.seg[0].data)) @@ -1253,6 +1254,13 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry, (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) ? 1 : 0; capa->config.pktout.bit.tcp_chksum = (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) ? 1 : 0; + + capa->config.pktout.bit.ipv4_chksum_ena = + capa->config.pktout.bit.ipv4_chksum; + capa->config.pktout.bit.udp_chksum_ena = + capa->config.pktout.bit.udp_chksum; + capa->config.pktout.bit.tcp_chksum_ena = + capa->config.pktout.bit.tcp_chksum; } static int dpdk_open(odp_pktio_t id ODP_UNUSED, @@ -1388,9 +1396,47 @@ static int dpdk_start(pktio_entry_t *pktio_entry) } /* Init TX queues */ for (i = 0; i < pktio_entry->s.num_out_queue; i++) { + struct rte_eth_dev_info dev_info; + const struct rte_eth_txconf *txconf = NULL; + int ip_ena = pktio_entry->s.config.pktout.bit.ipv4_chksum_ena; + int udp_ena = pktio_entry->s.config.pktout.bit.udp_chksum_ena; + int tcp_ena = pktio_entry->s.config.pktout.bit.tcp_chksum_ena; + int sctp_ena = pktio_entry->s.config.pktout.bit.sctp_chksum_ena; + int chksum_ena = ip_ena | udp_ena | tcp_ena | sctp_ena; + + if (chksum_ena) { + /* Enable UDP, TCP, STCP checksum offload */ + uint32_t txq_flags = 0; + + if (udp_ena == 0) + txq_flags |= ETH_TXQ_FLAGS_NOXSUMUDP; + + if (tcp_ena == 0) + txq_flags |= ETH_TXQ_FLAGS_NOXSUMTCP; + + if (sctp_ena == 0) + txq_flags |= ETH_TXQ_FLAGS_NOXSUMSCTP; + + /* When IP checksum is requested alone, enable UDP + * offload. DPDK IP checksum offload is enabled only + * when one of the L4 checksum offloads is requested.*/ + if ((udp_ena == 0) && (tcp_ena == 0) && (sctp_ena == 0)) + txq_flags = ETH_TXQ_FLAGS_NOXSUMTCP | + ETH_TXQ_FLAGS_NOXSUMSCTP; + + txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS | + ETH_TXQ_FLAGS_NOREFCOUNT | + ETH_TXQ_FLAGS_NOMULTMEMP | + ETH_TXQ_FLAGS_NOVLANOFFL; + + rte_eth_dev_info_get(port_id, &dev_info); + dev_info.default_txconf.txq_flags = txq_flags; + txconf = &dev_info.default_txconf; + } + ret = rte_eth_tx_queue_setup(port_id, i, DPDK_NM_TX_DESC, rte_eth_dev_socket_id(port_id), - NULL); + txconf); if (ret < 0) { ODP_ERR("Queue setup failed: err=%d, port=%" PRIu8 "\n", ret, port_id); commit 5158e0deb21aa90d1e032f75e703c9fa8e0b95c0 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Nov 28 14:44:47 2017 +0200 example: generator use checksum enable Use new checksum insert enable bits. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index e1d98539..81d95466 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -523,6 +523,10 @@ static int create_pktio(const char *dev, odp_pool_t pool, capa.config.pktin.bit.drop_ipv4_err; itf->config.pktin.bit.drop_udp_err = capa.config.pktin.bit.drop_udp_err; + itf->config.pktout.bit.ipv4_chksum_ena = + capa.config.pktout.bit.ipv4_chksum_ena; + itf->config.pktout.bit.udp_chksum_ena = + capa.config.pktout.bit.udp_chksum_ena; itf->config.pktout.bit.ipv4_chksum = capa.config.pktout.bit.ipv4_chksum; itf->config.pktout.bit.udp_chksum = capa.config.pktout.bit.udp_chksum; commit ab18a721760b8a4b61c0feec8fa6724ef2990a86 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue Nov 28 14:04:48 2017 +0200 api: pktio: add checksum insert enable bits Added bits to control if checksum insertion is enabled / disabled at packet output. Current configuration options control if checksum is inserted / not inserted by default, but leaves it open for application to request checksum always with override functions. Explicit disable allows implementation to optimize performance (e.g. DPDK does this). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bogdan Pricope <bogdan.pricope(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 b897c9d3..1dbbfafe 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -1531,7 +1531,7 @@ odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt); * * Calling this function is always allowed but the checksum will not be * inserted if the packet is output through a pktio that does not have - * the relevant pktout chksum bit set in the pktio capability. + * the relevant checksum insertion enabled. * * @param pkt Packet handle * @param insert 0: do not insert L3 checksum @@ -1548,7 +1548,7 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert); * * Calling this function is always allowed but the checksum will not be * inserted if the packet is output through a pktio that does not have - * the relevant pktout chksum bit set in the pktio capability. + * the relevant checksum insertion enabled. * * @param pkt Packet handle * @param insert 0: do not insert L4 checksum diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 60d13043..d25afa3e 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -329,15 +329,29 @@ typedef union odp_pktin_config_opt_t { * Packet output configuration options bit field * * Packet output configuration options listed in a bit field structure. Packet - * output checksum insertion may be enabled or disabled. When it is enabled, - * implementation will calculate and insert checksum into every outgoing packet - * by default. Application may disable checksum insertion (e.g. - * odp_packet_l4_chksum_insert()) on per packet basis. For correct operation, - * packet metadata must provide valid offsets for the appropriate protocols. - * For example, UDP checksum calculation needs both L3 and L4 offsets (to access - * IP and UDP headers). When application (e.g. a switch) does not modify L3/L4 - * data and thus checksum does not need to be updated, output checksum insertion - * should be disabled for optimal performance. + * output checksum insertion may be enabled or disabled (e.g. ipv4_chksum_ena): + * + * 0: Disable checksum insertion. Application will not request checksum + * insertion for any packet. This is the default value for xxx_chksum_ena + * bits. + * 1: Enable checksum insertion. Application will request checksum insertion + * for some packets. + * + * When checksum insertion is enabled, application may use configuration options + * to set the default behaviour on packet output (e.g. ipv4_chksum): + * + * 0: Do not insert checksum by default. This is the default value for + * xxx_chksum bits. + * 1: Calculate and insert checksum by default. + * + * These defaults may be overridden on per packet basis using e.g. + * odp_packet_l4_chksum_insert(). + * + * For correct operation, packet metadata must provide valid offsets for the + * appropriate protocols. For example, UDP checksum calculation needs both L3 + * and L4 offsets (to access IP and UDP headers). When application + * (e.g. a switch) does not modify L3/L4 data and thus checksum does not need + * to be updated, checksum insertion should be disabled for optimal performance. * * Packet flags (odp_packet_has_*()) are ignored for the purpose of checksum * insertion in packet output. @@ -354,19 +368,31 @@ typedef union odp_pktin_config_opt_t { * insertion. */ typedef union odp_pktout_config_opt_t { - /** Option flags */ + /** Option flags for packet output */ struct { - /** Insert IPv4 header checksum on packet output */ - uint64_t ipv4_chksum : 1; + /** Enable IPv4 header checksum insertion. */ + uint64_t ipv4_chksum_ena : 1; + + /** Enable UDP checksum insertion */ + uint64_t udp_chksum_ena : 1; + + /** Enable TCP checksum insertion */ + uint64_t tcp_chksum_ena : 1; + + /** Enable SCTP checksum insertion */ + uint64_t sctp_chksum_ena : 1; + + /** Insert IPv4 header checksum by default */ + uint64_t ipv4_chksum : 1; - /** Insert UDP checksum on packet output */ - uint64_t udp_chksum : 1; + /** Insert UDP checksum on packet by default */ + uint64_t udp_chksum : 1; - /** Insert TCP checksum on packet output */ - uint64_t tcp_chksum : 1; + /** Insert TCP checksum on packet by default */ + uint64_t tcp_chksum : 1; - /** Insert SCTP checksum on packet output */ - uint64_t sctp_chksum : 1; + /** Insert SCTP checksum on packet by default */ + uint64_t sctp_chksum : 1; } bit; ----------------------------------------------------------------------- Summary of changes: example/generator/odp_generator.c | 4 + include/odp/api/spec/packet.h | 4 +- include/odp/api/spec/packet_io.h | 62 ++++++++---- .../linux-generic/include/odp_packet_io_internal.h | 3 +- platform/linux-generic/pktio/dpdk.c | 59 +++++++++++- test/performance/odp_l2fwd.c | 105 +++++++++++++++------ 6 files changed, 182 insertions(+), 55 deletions(-) hooks/post-receive --

6 years, 6 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp December 2017