git-lng-odp October 2019

git-lng-odp@lists.linaro.org

1 participants
12 discussions

[COMMIT] branch master updated. v1.21.0.0-293-g810bc2ee9

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 810bc2ee9b5285e1692a6b0c7457ca503f381e1e (commit) via bd2aea3186fd4e2d3ba6ec91f2a6ba72f0443941 (commit) via b904314ec95e4e680a739a5f98b6fd814b9a6fef (commit) via 2376fa5b4b5f5b7b9d2c11cb08438f11883bfe50 (commit) via 55ea0298a7cf917b466d2154d79d00fd86f3c936 (commit) via d688a269562ff9efc2ff03411c385a2bd1228d2c (commit) via 13b478eaa76ee8461341b114d447835e3906748d (commit) via 4c4145f8c9c73665c9f834f8ca639b9f0525e30f (commit) via 4c58ce0cd530c59907164f2fa7ae78800c494151 (commit) via 65891255eec4884e941aece9808ad684155feac8 (commit) via d4eb0481e1dd40a0d0b70486cdf8f9b676862b2f (commit) via f15da1c0ee13dd0e342944dccdd9014c16d4d5be (commit) via 6f855d843b1d87013908998a050e16c435b89e07 (commit) via 35a6b2e5c369e81196f6c288085990eaaf83f360 (commit) via 0e2ee113fcc0e7383d9e465c11a8495a65f7a171 (commit) via 0cfdb2c5a6b3afe0e4b0eee2b3749a0cfca3917d (commit) via b7a8fd47362a3853db8cc3ea56fe1d268defa574 (commit) via 0df7a38e2b9be4ad72528d43551e56ac4d152b96 (commit) via 139b28399d3bd1f53624908c9fd99c1f14283cdd (commit) from 86745e999aa2bf644fd72775df55042289e07b2b (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 810bc2ee9b5285e1692a6b0c7457ca503f381e1e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 14:49:26 2019 +0200 api: increment version to 1.23 Increment API version number to reflect API changes: * cls: PMR values for protocol fields are defined in big endian * cls: ODP_PMR_CUSTOM_L3 term has been added * coding style: use 'unsigned int' instead of 'unsigned' Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/configure.ac b/configure.ac index 81123cbc6..4cff42913 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.5]) # ODP API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [22]) +m4_define([odpapi_major_version], [23]) m4_define([odpapi_minor_version], [0]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], commit bd2aea3186fd4e2d3ba6ec91f2a6ba72f0443941 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 15:33:05 2019 +0200 api: clean up coding style warnings Clean checkpatch warnings on include/odp/api/spec files. Current checkpatch version warns about 'unsigned' type name usage. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index eadcaa2d8..1db85e8b7 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -175,17 +175,17 @@ typedef struct odp_cls_capability_t { odp_cls_pmr_terms_t supported_terms; /** Maximum number of PMR terms */ - unsigned max_pmr_terms; + unsigned int max_pmr_terms; /** Number of PMR terms available for use now */ - unsigned available_pmr_terms; + unsigned int available_pmr_terms; /** Maximum number of CoS supported */ - unsigned max_cos; + unsigned int max_cos; /** Maximun number of queue supported per CoS * if the value is 1, then hashing is not supported*/ - unsigned max_hash_queues; + unsigned int max_hash_queues; /** Protocol header combination supported for Hashing */ odp_pktin_hash_proto_t hash_protocols; diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 5d5ca2bc4..cddacecc5 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -201,7 +201,7 @@ typedef struct odp_pktin_queue_param_t { * More than one input queues require flow hashing configured. * The maximum value is defined by pktio capability 'max_input_queues'. * Queue type is defined by the input mode. The default value is 1. */ - unsigned num_queues; + unsigned int num_queues; /** Queue parameters * @@ -243,7 +243,7 @@ typedef struct odp_pktout_queue_param_t { /** Number of output queues to be created. The value must be between * 1 and interface capability. The default value is 1. */ - unsigned num_queues; + unsigned int num_queues; } odp_pktout_queue_param_t; @@ -551,10 +551,10 @@ typedef union odp_pktio_set_op_t { */ typedef struct odp_pktio_capability_t { /** Maximum number of input queues */ - unsigned max_input_queues; + unsigned int max_input_queues; /** Maximum number of output queues */ - unsigned max_output_queues; + unsigned int max_output_queues; /** Supported pktio configuration options */ odp_pktio_config_t config; @@ -650,7 +650,7 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa); * * @return Maximum packet IO interface index */ -unsigned odp_pktio_max_index(void); +unsigned int odp_pktio_max_index(void); /** * Configure packet IO interface options @@ -947,8 +947,8 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], * @return Number of packets received * @retval <0 on failure */ -int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, - unsigned *from, odp_packet_t packets[], int num, +int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned int num_q, + unsigned int *from, odp_packet_t packets[], int num, uint64_t wait); /** diff --git a/include/odp/api/spec/pool.h b/include/odp/api/spec/pool.h index d4cf088f1..69e99605c 100644 --- a/include/odp/api/spec/pool.h +++ b/include/odp/api/spec/pool.h @@ -48,12 +48,12 @@ extern "C" { */ typedef struct odp_pool_capability_t { /** Maximum number of pools of any type */ - unsigned max_pools; + unsigned int max_pools; /** Buffer pool capabilities */ struct { /** Maximum number of buffer pools */ - unsigned max_pools; + unsigned int max_pools; /** Maximum buffer data alignment in bytes */ uint32_t max_align; @@ -74,7 +74,7 @@ typedef struct odp_pool_capability_t { /** Packet pool capabilities */ struct { /** Maximum number of packet pools */ - unsigned max_pools; + unsigned int max_pools; /** Maximum packet data length in bytes * @@ -147,7 +147,7 @@ typedef struct odp_pool_capability_t { /** Timeout pool capabilities */ struct { /** Maximum number of timeout pools */ - unsigned max_pools; + unsigned int max_pools; /** Maximum number of timeout events in a pool * diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 0882c4a1c..425e6c77a 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -106,7 +106,7 @@ typedef struct odp_shm_capability_t { * * This number of separate shared memory blocks can be * reserved concurrently. */ - unsigned max_blocks; + unsigned int max_blocks; /** Maximum memory block size in bytes * diff --git a/include/odp/api/spec/version.h.in b/include/odp/api/spec/version.h.in index 35df9ba26..4c3cbfee8 100644 --- a/include/odp/api/spec/version.h.in +++ b/include/odp/api/spec/version.h.in @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - /** * @file * commit b904314ec95e4e680a739a5f98b6fd814b9a6fef Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 14:36:13 2019 +0200 example: cls: update help text Updated help text with changes to application options. Also, avoid shm memory leak when command line options have errors, or when --help option is used. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index ecfa732a9..3af418704 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -95,9 +95,9 @@ static appl_args_t *appl_args_gbl; static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len); static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len); -static void parse_args(int argc, char *argv[], appl_args_t *appl_args); +static int parse_args(int argc, char *argv[], appl_args_t *appl_args); static void print_info(char *progname, appl_args_t *appl_args); -static void usage(char *progname); +static void usage(void); static inline void print_cls_statistics(appl_args_t *args) { @@ -568,7 +568,8 @@ int main(int argc, char *argv[]) appl_args_gbl = args; memset(args, 0, sizeof(*args)); /* Parse and store the application arguments */ - parse_args(argc, argv, args); + if (parse_args(argc, argv, args)) + goto args_error; /* Print both system and application information */ print_info(NO_PATH(argv[0]), args); @@ -662,13 +663,14 @@ int main(int argc, char *argv[]) ODPH_ERR("err: odp_pool_destroy for %d\n", i); } - free(args->if_name); - odp_shm_free(shm); if (odp_pktio_close(pktio)) ODPH_ERR("err: close pktio error\n"); if (odp_pool_destroy(pool)) ODPH_ERR("err: odp_pool_destroy error\n"); +args_error: + odp_shm_free(shm); + ret = odp_term_local(); if (ret) ODPH_ERR("odp_term_local error %d\n", ret); @@ -772,7 +774,7 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) return -1; } -static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) +static int parse_pmr_policy(appl_args_t *appl_args, char *optarg) { int policy_count; char *token, *cos0, *cos1; @@ -889,7 +891,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) return -1; break; default: - usage(argv[0]); + usage(); exit(EXIT_FAILURE); } @@ -923,7 +925,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) * @param argv[] argument vector * @param appl_args Store application arguments here */ -static void parse_args(int argc, char *argv[], appl_args_t *appl_args) +static int parse_args(int argc, char *argv[], appl_args_t *appl_args) { int opt; int long_index; @@ -931,6 +933,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) int i; int interface = 0; int policy = 0; + int ret = 0; static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, @@ -960,7 +963,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->cpu_count = atoi(optarg); break; case 'p': - if (0 > parse_pmr_policy(appl_args, argv, optarg)) + if (0 > parse_pmr_policy(appl_args, optarg)) continue; policy = 1; break; @@ -970,15 +973,15 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) case 'i': len = strlen(optarg); if (len == 0) { - usage(argv[0]); - exit(EXIT_FAILURE); + ret = -1; + break; } len += 1; /* add room for '\0' */ appl_args->if_name = malloc(len); if (appl_args->if_name == NULL) { - usage(argv[0]); - exit(EXIT_FAILURE); + ret = -1; + break; } strcpy(appl_args->if_name, optarg); @@ -995,24 +998,30 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->verbose = 1; break; case 'h': - usage(argv[0]); - exit(EXIT_SUCCESS); + ret = -1; break; default: break; } } - if (!interface || !policy) { - usage(argv[0]); - exit(EXIT_FAILURE); - } - if (appl_args->if_name == NULL) { - usage(argv[0]); - exit(EXIT_FAILURE); + if (!interface || !policy) + ret = -1; + + if (appl_args->if_name == NULL) + ret = -1; + + if (ret) { + usage(); + + if (appl_args->if_name) + free(appl_args->if_name); } - optind = 1; /* reset 'extern optind' from the getopt lib */ + /* reset optind from the getopt lib */ + optind = 1; + + return ret; } /** @@ -1033,45 +1042,44 @@ static void print_info(char *progname, appl_args_t *appl_args) /** * Prinf usage information */ -static void usage(char *progname) +static void usage(void) { printf("\n" - "OpenDataPlane Classifier example.\n" - "Usage: %s OPTIONS\n" - " E.g. %s -i eth1 -m 0 -p \"ODP_PMR_SIP_ADDR:10.10.10.5:FFFFFFFF:queue1\" \\\n" - "\t\t\t-p \"ODP_PMR_SIP_ADDR:10.10.10.7:000000FF:queue2\" \\\n" - "\t\t\t-p \"ODP_PMR_SIP_ADDR:10.5.5.10:FFFFFF00:queue3\"\n" - "\n" - "For the above example configuration the following will be the packet distribution\n" - "queue1\t\tPackets with source ip address 10.10.10.5\n" - "queue2\t\tPackets with source ip address whose last 8 bits match 7\n" - "queue3\t\tPackets with source ip address in the subnet 10.5.5.0\n" - "\n" - "Mandatory OPTIONS:\n" - " -i, --interface Eth interface\n" - " -p, --policy [<odp_cls_pmr_term_t>|<offset>]:<value>:<mask bits>:<queue name>\n" - "\n" - "<odp_cls_pmr_term_t> Packet Matching Rule defined with odp_cls_pmr_term_t " - "for the policy\n" - "<offset> Absolute offset in bytes from frame start to define a " - "ODP_PMR_CUSTOM_FRAME Packet Matching Rule for the policy\n" - "\n" - "<value> PMR value to be matched.\n" - "\n" - "<mask bits> PMR mask bits to be applied on the PMR term value\n" - "\n" - "Optional OPTIONS\n" - " -c, --count <number> CPU count, 0=all available, default=1\n" - "\n" - " -m, --mode 0: Packet Drop mode. Received packets will be dropped\n" - " !0: Packet ICMP mode. Received packets will be sent back\n" - " default: Packet Drop mode\n" - "\n" - " -t, --timeout !0: Time for which the classifier will be run in seconds\n" - " 0: Runs in infinite loop\n" - " default: Runs in infinite loop\n" - "\n" - " -h, --help Display help and exit.\n" - "\n", NO_PATH(progname), NO_PATH(progname) - ); + "ODP Classifier example.\n" + "Usage: odp_classifier OPTIONS\n" + " E.g. odp_classifier -i eth1 -m 0 -p \"ODP_PMR_SIP_ADDR:10.10.10.0:0xFFFFFF00:queue1\" \\\n" + " -p \"ODP_PMR_SIP_ADDR:10.10.10.10:0xFFFFFFFF:queue1:queue2\"\n" + "\n" + "The above example would classify:\n" + " 1) Packets from source IP address 10.10.10.0/24 to queue1, except ...\n" + " 2) Packets from source IP address 10.10.10.10 to queue2\n" + " 3) All other packets to DefaultCos\n" + "\n" + "Mandatory OPTIONS:\n" + " -i, --interface <interface name>\n" + " -p, --policy <PMR term>:<offset>:<value>:<mask>:<src queue>:<dst queue>\n" + "\n" + " <PMR term> PMR term name defined in odp_cls_pmr_term_t\n" + " <offset> If term is ODP_PMR_CUSTOM_FRAME or _CUSTOM_L3, offset in bytes is used\n" + " <value> PMR value to be matched\n" + " <mask> PMR mask bits to be applied on the PMR value.\n" + " CUSTOM PMR terms accept plain hex string, other PMR terms require\n" + " hex string with '0x' prefix.\n" + " <src queue> Optional name of the source queue (CoS). The default CoS is used when\n" + " this is not defined.\n" + " <dst queue> Name of the destination queue (CoS).\n" + "\n" + "Optional OPTIONS\n" + " -c, --count <num> CPU count, 0=all available, default=1\n" + "\n" + " -m, --mode <mode> 0: Packet Drop mode. Received packets will be dropped\n" + " !0: Packet ICMP mode. Received packets will be sent back\n" + " default: Packet Drop mode\n" + "\n" + " -t, --timeout <sec> !0: Time for which the classifier will be run in seconds\n" + " 0: Runs in infinite loop\n" + " default: Runs in infinite loop\n" + "\n" + " -h, --help Display help and exit.\n" + "\n"); } commit 2376fa5b4b5f5b7b9d2c11cb08438f11883bfe50 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 11:04:59 2019 +0200 example: cls: add ODP_PMR_CUSTOM_L3 support Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 47c689f6e..ecfa732a9 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -764,6 +764,9 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) } else if (strcasecmp(token, "ODP_PMR_CUSTOM_FRAME") == 0) { *term = ODP_PMR_CUSTOM_FRAME; return 0; + } else if (strcasecmp(token, "ODP_PMR_CUSTOM_L3") == 0) { + *term = ODP_PMR_CUSTOM_L3; + return 0; } return -1; @@ -856,6 +859,8 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) stats[policy_count].rule.val_sz = 4; break; case ODP_PMR_CUSTOM_FRAME: + /* Fall through */ + case ODP_PMR_CUSTOM_L3: /* :<offset>:<value>:<mask> */ token = strtok(NULL, ":"); errno = 0; commit 55ea0298a7cf917b466d2154d79d00fd86f3c936 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 28 10:20:43 2019 +0200 linux-gen: cls: add ODP_PMR_CUSTOM_L3 support Added support for ODP_PMR_CUSTOM_L3 PMR term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 60171cc5e..1b5337ff6 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -174,6 +174,7 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->supported_terms.bit.sip6_addr = 1; capability->supported_terms.bit.dip6_addr = 1; capability->supported_terms.bit.custom_frame = 1; + capability->supported_terms.bit.custom_l3 = 1; capability->random_early_detection = ODP_SUPPORT_NO; capability->back_pressure = ODP_SUPPORT_NO; capability->threshold_red.all_bits = 0; @@ -631,6 +632,8 @@ static int pmr_create_term(pmr_term_value_t *value, break; case ODP_PMR_CUSTOM_FRAME: + /* Fall through */ + case ODP_PMR_CUSTOM_L3: custom = 1; size = MAX_PMR_TERM_SIZE; break; @@ -1050,7 +1053,8 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr, pmr_term_value_t *term_value) { - uint64_t val = 0; + uint32_t i; + uint8_t val; uint32_t offset = term_value->offset; uint32_t val_sz = term_value->val_sz; @@ -1059,11 +1063,46 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, if (packet_len(pkt_hdr) <= offset + val_sz) return 0; - memcpy(&val, pkt_addr + offset, val_sz); - if (term_value->match.value == (val & term_value->match.mask)) - return 1; + pkt_addr += offset; - return 0; + for (i = 0; i < val_sz; i++) { + val = pkt_addr[i] & term_value->match.mask_u8[i]; + + if (val != term_value->match.value_u8[i]) + return 0; + } + + return 1; +} + +static inline int verify_pmr_custom_l3(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint32_t i; + uint8_t val; + uint32_t l3_offset = pkt_hdr->p.l3_offset; + uint32_t offset = l3_offset + term_value->offset; + uint32_t val_sz = term_value->val_sz; + + ODP_ASSERT(val_sz <= MAX_PMR_TERM_SIZE); + + if (!pkt_hdr->p.input_flags.l3) + return 0; + + if (packet_len(pkt_hdr) <= offset + val_sz) + return 0; + + pkt_addr += offset; + + for (i = 0; i < val_sz; i++) { + val = pkt_addr[i] & term_value->match.mask_u8[i]; + + if (val != term_value->match.value_u8[i]) + return 0; + } + + return 1; } static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, @@ -1222,6 +1261,11 @@ static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, term_value)) pmr_failure = 1; break; + case ODP_PMR_CUSTOM_L3: + if (!verify_pmr_custom_l3(pkt_addr, pkt_hdr, + term_value)) + pmr_failure = 1; + break; case ODP_PMR_INNER_HDR_OFF: break; default: commit d688a269562ff9efc2ff03411c385a2bd1228d2c Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 14 14:13:33 2019 +0300 linux-gen: cls: add custom frame PMR capability Mark custom frame as a supported PMR. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 164daf3fc..60171cc5e 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -173,6 +173,7 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->supported_terms.bit.dip_addr = 1; capability->supported_terms.bit.sip6_addr = 1; capability->supported_terms.bit.dip6_addr = 1; + capability->supported_terms.bit.custom_frame = 1; capability->random_early_detection = ODP_SUPPORT_NO; capability->back_pressure = ODP_SUPPORT_NO; capability->threshold_red.all_bits = 0; commit 13b478eaa76ee8461341b114d447835e3906748d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 14 14:12:42 2019 +0300 validation: cls: add custom PMR test cases Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 46bbdf4b1..d4a3110e3 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -2037,6 +2037,147 @@ static void classification_test_pmr_term_tcp_dport_multi(void) _classification_test_pmr_term_tcp_dport(SHM_PKT_NUM_BUFS / 4); } +static void test_pmr_term_custom(int custom_l3) +{ + odp_packet_t pkt; + uint32_t seqno; + int retval; + odp_pktio_t pktio; + odp_queue_t queue; + odp_queue_t retqueue; + odp_queue_t default_queue; + odp_pool_t pool; + odp_pool_t default_pool; + odp_pmr_t pmr; + odp_cos_t cos; + odp_cos_t default_cos; + uint32_t dst_addr, src_addr; + uint32_t addr_be, mask_be; + uint32_t dst_mask, src_mask; + char cosname[ODP_QUEUE_NAME_LEN]; + odp_pmr_param_t pmr_param; + odp_cls_cos_param_t cls_param; + odph_ipv4hdr_t *ip; + odph_ethhdr_t *eth; + const char *pmr_src_str = "10.0.8.0/24"; + const char *pmr_dst_str = "10.0.9.0/24"; + const char *pkt_src_str = "10.0.8.88/32"; + const char *pkt_dst_str = "10.0.9.99/32"; + + pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); + retval = start_pktio(pktio); + CU_ASSERT(retval == 0); + + configure_default_cos(pktio, &default_cos, + &default_queue, &default_pool); + + queue = queue_create("ipv4 addr", true); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + pool = pool_create("ipv4 addr"); + CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); + + sprintf(cosname, "ipv4 addr"); + odp_cls_cos_param_init(&cls_param); + cls_param.pool = pool; + cls_param.queue = queue; + cls_param.drop_policy = ODP_COS_DROP_POOL; + + cos = odp_cls_cos_create(cosname, &cls_param); + CU_ASSERT_FATAL(cos != ODP_COS_INVALID); + + /* Match values for custom PRM rules are passed in network endian */ + parse_ipv4_string(pmr_src_str, &src_addr, &src_mask); + parse_ipv4_string(pmr_dst_str, &dst_addr, &dst_mask); + + odp_cls_pmr_param_init(&pmr_param); + + if (custom_l3) { + addr_be = odp_cpu_to_be_32(dst_addr); + mask_be = odp_cpu_to_be_32(dst_mask); + pmr_param.term = ODP_PMR_CUSTOM_L3; + pmr_param.match.value = &addr_be; + pmr_param.match.mask = &mask_be; + pmr_param.val_sz = sizeof(addr_be); + /* Offset from start of L3 to IPv4 dst address */ + pmr_param.offset = 16; + } else { + addr_be = odp_cpu_to_be_32(src_addr); + mask_be = odp_cpu_to_be_32(src_mask); + pmr_param.term = ODP_PMR_CUSTOM_FRAME; + pmr_param.match.value = &addr_be; + pmr_param.match.mask = &mask_be; + pmr_param.val_sz = sizeof(addr_be); + /* Offset from start of ethernet/IPv4 frame to IPv4 + * src address */ + pmr_param.offset = 26; + } + + pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); + CU_ASSERT_FATAL(pmr != ODP_PMR_INVALID); + + /* IPv4 packet with matching addresses */ + parse_ipv4_string(pkt_src_str, &src_addr, NULL); + parse_ipv4_string(pkt_dst_str, &dst_addr, NULL); + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); + ip->src_addr = odp_cpu_to_be_32(src_addr); + ip->dst_addr = odp_cpu_to_be_32(dst_addr); + odph_ipv4_csum_update(pkt); + + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == queue); + odp_packet_free(pkt); + + /* Other packets delivered to default queue */ + pkt = create_packet(default_pkt_info); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + seqno = cls_pkt_get_seq(pkt); + CU_ASSERT(seqno != TEST_SEQ_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); + odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); + + enqueue_pktio_interface(pkt, pktio); + + pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); + CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + CU_ASSERT(seqno == cls_pkt_get_seq(pkt)); + CU_ASSERT(retqueue == default_queue); + + odp_cos_destroy(cos); + odp_cos_destroy(default_cos); + odp_cls_pmr_destroy(pmr); + odp_packet_free(pkt); + stop_pktio(pktio); + odp_pool_destroy(default_pool); + odp_pool_destroy(pool); + odp_queue_destroy(queue); + odp_queue_destroy(default_queue); + odp_pktio_close(pktio); +} + +static void classification_test_pmr_term_custom_frame(void) +{ + test_pmr_term_custom(0); +} + +static void classification_test_pmr_term_custom_l3(void) +{ + test_pmr_term_custom(1); +} + static int check_capa_tcp_dport(void) { return cls_capa.supported_terms.bit.tcp_dport; @@ -2112,6 +2253,16 @@ static int check_capa_ethtype_x(void) return cls_capa.supported_terms.bit.ethtype_x; } +static int check_capa_custom_frame(void) +{ + return cls_capa.supported_terms.bit.custom_frame; +} + +static int check_capa_custom_l3(void) +{ + return cls_capa.supported_terms.bit.custom_l3; +} + odp_testinfo_t classification_suite_pmr[] = { ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_tcp_dport, check_capa_tcp_dport), @@ -2145,6 +2296,10 @@ odp_testinfo_t classification_suite_pmr[] = { check_capa_ethtype_0), ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_eth_type_x, check_capa_ethtype_x), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_custom_frame, + check_capa_custom_frame), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_custom_l3, + check_capa_custom_l3), ODP_TEST_INFO(classification_test_pktin_classifier_flag), ODP_TEST_INFO(classification_test_pmr_term_tcp_dport_multi), ODP_TEST_INFO_NULL, commit 4c4145f8c9c73665c9f834f8ca639b9f0525e30f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 25 15:07:25 2019 +0300 api: cls: add ODP_PMR_CUSTOM_L3 term Added new term to match custom layer 3 protocol fields. PMR offset refers to the start of layer 3 in the packet. Other PMR rules (e.g. L2 classification rules) may precede custom L3 rules. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 67fdd20aa..eadcaa2d8 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -97,11 +97,12 @@ typedef union odp_cls_pmr_terms_t { uint64_t ipsec_spi:1; /** NVGRE/VXLAN network identifier */ uint64_t ld_vni:1; - /** Custom match rule, offset from start of - * frame. The match is defined by the offset, the - * expected value, and its size. - */ - uint64_t custom_frame:1; + /** Custom frame match rule. PMR offset is counted from + * the start of the packet. */ + uint64_t custom_frame:1; + /** Custom layer 3 match rule. PMR offset is counted from + * the start of layer 3 in the packet. */ + uint64_t custom_l3:1; } bit; /** All bits of the bit field structure */ @@ -535,6 +536,15 @@ typedef enum { */ ODP_PMR_CUSTOM_FRAME, + /** + * Custom layer 3 match rule + * + * PMR offset is counted from the start of layer 3 in the packet. + * The match is defined by the offset, the expected value, and its size. + * Custom L3 rules may be combined with other PMRs. + */ + ODP_PMR_CUSTOM_L3, + /** Inner header may repeat above values with this offset */ ODP_PMR_INNER_HDR_OFF = 32 @@ -578,11 +588,18 @@ typedef struct odp_pmr_param_t { const void *val_end; } range; }; - uint32_t val_sz; /**< Size of the term value */ - uint32_t offset; /**< User-defined offset in packet - Used if term == ODP_PMR_CUSTOM_FRAME only, - ignored otherwise */ + /** Size of the value to be matched */ + uint32_t val_sz; + + /** Offset to the value + * + * Byte offset to the value to be matched in a packet. PMR term defines + * starting point for the offset. Used only with custom PMR terms, + * ignored with other terms. + */ + uint32_t offset; + } odp_pmr_param_t; /** commit 4c58ce0cd530c59907164f2fa7ae78800c494151 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 25 14:36:08 2019 +0300 example: cls: change PMR values and masks to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 691fec297..47c689f6e 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -44,6 +44,9 @@ */ #define DISPLAY_STRING_LEN 32 +/** Maximum PMR value size */ +#define MAX_VAL_SIZE 16 + /** Get rid of path in filename - only for unix-type paths using '/' */ #define NO_PATH(file_name) (strrchr((file_name), '/') ? \ strrchr((file_name), '/') + 1 : (file_name)) @@ -59,8 +62,8 @@ typedef struct { char src_cos_name[ODP_COS_NAME_LEN]; /**< source cos name */ struct { odp_cls_pmr_term_t term; /**< odp pmr term value */ - uint64_t val; /**< pmr term value */ - uint64_t mask; /**< pmr term mask */ + uint8_t value_be[MAX_VAL_SIZE]; /**< value in big endian */ + uint8_t mask_be[MAX_VAL_SIZE]; /**< mask in big endian */ uint32_t val_sz; /**< size of the pmr term */ uint32_t offset; /**< pmr term offset */ } rule; @@ -166,39 +169,20 @@ static inline void print_cls_statistics(appl_args_t *args) printf("\n"); } -static inline int parse_mask(const char *str, uint64_t *mask) -{ - uint64_t b; - int ret; - - ret = sscanf(str, "%" SCNx64, &b); - *mask = b; - return ret != 1; -} - -static int parse_value(const char *str, uint64_t *val, uint32_t *val_sz) +static int parse_custom(const char *str, uint8_t *buf_be, int max_size) { - size_t len; - size_t i; - int converted; - union { - uint64_t u64; - uint8_t u8[8]; - } buf = {.u64 = 0}; + int i, len; + /* hex string without 0x prefix */ len = strlen(str); - if (len > 2 * sizeof(buf)) + if (len > 2 * max_size) return -1; - for (i = 0; i < len; i += 2) { - converted = sscanf(&str[i], "%2" SCNx8, &buf.u8[i / 2]); - if (1 != converted) + for (i = 0; i < len; i += 2) + if (sscanf(&str[i], "%2" SCNx8, &buf_be[i / 2]) != 1) return -1; - } - *val = buf.u64; - *val_sz = len / 2; - return 0; + return len / 2; } /** @@ -494,8 +478,8 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) odp_cls_pmr_param_init(&pmr_param); pmr_param.term = stats->rule.term; - pmr_param.match.value = &stats->rule.val; - pmr_param.match.mask = &stats->rule.mask; + pmr_param.match.value = stats->rule.value_be; + pmr_param.match.mask = stats->rule.mask_be; pmr_param.val_sz = stats->rule.val_sz; pmr_param.offset = stats->rule.offset; @@ -793,9 +777,10 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) odp_cls_pmr_term_t term; global_statistics *stats; char *pmr_str; - uint32_t offset; - uint32_t ip_addr; - unsigned long int value; + uint32_t offset, ip_addr, u32; + unsigned long int value, mask; + uint16_t u16; + int val_sz, mask_sz; policy_count = appl_args->policy_count; stats = appl_args->stats; @@ -832,12 +817,18 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); value = strtoul(token, NULL, 0); - stats[policy_count].rule.val = value; + u16 = value; + u16 = odp_cpu_to_be_16(u16); + memcpy(stats[policy_count].rule.value_be, &u16, sizeof(u16)); token = strtok(NULL, ":"); strncpy(stats[policy_count].mask, token, DISPLAY_STRING_LEN - 1); - parse_mask(token, &stats[policy_count].rule.mask); + mask = strtoul(token, NULL, 0); + u16 = mask; + u16 = odp_cpu_to_be_16(u16); + memcpy(stats[policy_count].rule.mask_be, &u16, sizeof(u16)); + stats[policy_count].rule.val_sz = 2; break; case ODP_PMR_SIP_ADDR: @@ -851,12 +842,17 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) exit(EXIT_FAILURE); } - stats[policy_count].rule.val = ip_addr; + u32 = odp_cpu_to_be_32(ip_addr); + memcpy(stats[policy_count].rule.value_be, &u32, sizeof(u32)); token = strtok(NULL, ":"); strncpy(stats[policy_count].mask, token, DISPLAY_STRING_LEN - 1); - parse_mask(token, &stats[policy_count].rule.mask); + mask = strtoul(token, NULL, 0); + u32 = mask; + u32 = odp_cpu_to_be_32(u32); + memcpy(stats[policy_count].rule.mask_be, &u32, sizeof(u32)); + stats[policy_count].rule.val_sz = 4; break; case ODP_PMR_CUSTOM_FRAME: @@ -864,19 +860,28 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) token = strtok(NULL, ":"); errno = 0; offset = strtoul(token, NULL, 0); + stats[policy_count].rule.offset = offset; if (errno) return -1; token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); - parse_value(token, &stats[policy_count].rule.val, - &stats[policy_count].rule.val_sz); + val_sz = parse_custom(token, + stats[policy_count].rule.value_be, + MAX_VAL_SIZE); + stats[policy_count].rule.val_sz = val_sz; + if (val_sz <= 0) + return -1; + token = strtok(NULL, ":"); strncpy(stats[policy_count].mask, token, DISPLAY_STRING_LEN - 1); - parse_mask(token, &stats[policy_count].rule.mask); - stats[policy_count].rule.offset = offset; + mask_sz = parse_custom(token, + stats[policy_count].rule.mask_be, + MAX_VAL_SIZE); + if (mask_sz != val_sz) + return -1; break; default: usage(argv[0]); commit 65891255eec4884e941aece9808ad684155feac8 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 25 11:08:03 2019 +0300 linux-gen: cls: clean up IPv6 match implementation Use the same range data structure for all terms (removed IPv6 specific fields). Range terms are not currently supported. Return failure on PMR create if range is used. Removed other range related code as has not been tested and is not needed currently. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index 1032a1c0b..9ebb2a509 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -42,8 +42,8 @@ extern "C" { #define CLS_COS_L3_QOS_BITS 6 /* Max L3 QoS Value */ #define CLS_COS_MAX_L3_QOS (1 << CLS_COS_L3_QOS_BITS) -/* Max PMR Term bits */ -#define CLS_PMR_TERM_BYTES_MAX 16 +/* Max PMR Term size */ +#define MAX_PMR_TERM_SIZE 16 /* Max queue per Class of service */ #define CLS_COS_QUEUE_MAX 32 /* Max number of implementation created queues */ @@ -61,39 +61,62 @@ typedef union { }; } odp_cls_hash_proto_t; -/** -Packet Matching Rule Term Value - -Stores the Term and Value mapping for a PMR. -The maximum size of value currently supported in 64 bits -**/ +/* + * Term and value mapping for a PMR + */ typedef struct pmr_term_value { - odp_cls_pmr_term_t term; /* PMR Term */ - odp_bool_t range_term; /* True if range, false if match */ + /* PMR Term */ + odp_cls_pmr_term_t term; + + /* True if range, false if match */ + odp_bool_t range_term; + union { + /* Match value and mask */ struct { - /** Value to be matched */ - uint64_t value; - /** Masked set of bits to be matched */ - uint64_t mask; + /* Value to be matched. Arrays are used with custom and + * IPv6 address terms. */ + union { + uint64_t value; + uint8_t value_u8[MAX_PMR_TERM_SIZE]; + uint64_t value_u64[2]; + }; + + /* Mask for the data to be matched */ + union { + uint64_t mask; + uint8_t mask_u8[MAX_PMR_TERM_SIZE]; + uint64_t mask_u64[2]; + }; + } match; + + /* Range values */ struct { - /** Start value of the range */ - uint64_t val_start; - /** End value of the range */ - uint64_t val_end; + /* Start value of the range */ + union { + uint64_t start; + uint8_t start_u8[MAX_PMR_TERM_SIZE]; + uint64_t start_u64[2]; + }; + + /* End value of the range */ + union { + uint64_t end; + uint8_t end_u8[MAX_PMR_TERM_SIZE]; + uint64_t end_u64[2]; + }; + } range; - struct { - _odp_ipv6_addr_t addr; - _odp_ipv6_addr_t mask; - } match_ipv6; - struct { - _odp_ipv6_addr_t addr_start; - _odp_ipv6_addr_t addr_end; - } range_ipv6; + }; - uint32_t offset; /**< Offset if term == ODP_PMR_CUSTOM_FRAME */ - uint32_t val_sz; /**< Size of the value to be matched */ + + /* Offset used with custom PMR */ + uint32_t offset; + + /* Size of the value to be matched */ + uint32_t val_sz; + } pmr_term_value_t; /* diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index e85e8d00c..164daf3fc 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -576,6 +576,11 @@ static int pmr_create_term(pmr_term_value_t *value, int custom = 0; odp_cls_pmr_term_t term = param->term; + if (param->range_term) { + ODP_ERR("PRM value range not supported\n"); + return -1; + } + value->term = term; value->range_term = param->range_term; @@ -626,7 +631,7 @@ static int pmr_create_term(pmr_term_value_t *value, case ODP_PMR_CUSTOM_FRAME: custom = 1; - size = CLS_PMR_TERM_BYTES_MAX; + size = MAX_PMR_TERM_SIZE; break; default: @@ -640,45 +645,14 @@ static int pmr_create_term(pmr_term_value_t *value, return -1; } - switch (value->term) { - case ODP_PMR_SIP6_ADDR: - case ODP_PMR_DIP6_ADDR: - if (!value->range_term) { - memset(value->match_ipv6.addr.u8, 0, 16); - memset(value->match_ipv6.mask.u8, 0, 16); - memcpy(&value->match_ipv6.addr.u8, param->match.value, - param->val_sz); - memcpy(&value->match_ipv6.mask.u8, param->match.mask, - param->val_sz); - for (i = 0; i < 2; i++) - value->match_ipv6.addr.u64[i] &= - value->match_ipv6.mask.u64[i]; - } else { - memset(value->range_ipv6.addr_start.u8, 0, 16); - memset(value->range_ipv6.addr_end.u8, 0, 16); - memcpy(&value->range_ipv6.addr_start.u8, param->range.val_start, - param->val_sz); - memcpy(&value->range_ipv6.addr_end.u8, param->range.val_end, - param->val_sz); - } + memset(&value->match.value, 0, MAX_PMR_TERM_SIZE); + memset(&value->match.mask, 0, MAX_PMR_TERM_SIZE); + memcpy(&value->match.value, param->match.value, param->val_sz); + memcpy(&value->match.mask, param->match.mask, param->val_sz); + + for (i = 0; i < param->val_sz; i++) + value->match.value_u8[i] &= value->match.mask_u8[i]; - break; - default: - if (!value->range_term) { - value->match.value = 0; - value->match.mask = 0; - memcpy(&value->match.value, param->match.value, param->val_sz); - memcpy(&value->match.mask, param->match.mask, param->val_sz); - value->match.value &= value->match.mask; - } else { - value->range.val_start = 0; - value->range.val_end = 0; - memcpy(&value->range.val_start, param->range.val_start, - param->val_sz); - memcpy(&value->range.val_end, param->range.val_end, - param->val_sz); - } - } value->offset = param->offset; value->val_sz = param->val_sz; return 0; @@ -952,16 +926,13 @@ static inline int verify_pmr_ipv6_saddr(const uint8_t *pkt_addr, return 0; ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + memcpy(addr, ipv6->src_addr.u64, _ODP_IPV6ADDR_LEN); - addr[0] = ipv6->src_addr.u64[0]; - addr[1] = ipv6->src_addr.u64[1]; - - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + addr[0] = addr[0] & term_value->match.mask_u64[0]; + addr[1] = addr[1] & term_value->match.mask_u64[1]; - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + if (addr[0] == term_value->match.value_u64[0] && + addr[1] == term_value->match.value_u64[1]) return 1; return 0; @@ -976,16 +947,15 @@ static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, if (!packet_hdr_has_ipv6(pkt_hdr)) return 0; + ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - addr[0] = ipv6->dst_addr.u64[0]; - addr[1] = ipv6->dst_addr.u64[1]; + memcpy(addr, ipv6->dst_addr.u64, _ODP_IPV6ADDR_LEN); - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + addr[0] = addr[0] & term_value->match.mask_u64[0]; + addr[1] = addr[1] & term_value->match.mask_u64[1]; - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + if (addr[0] == term_value->match.value_u64[0] && + addr[1] == term_value->match.value_u64[1]) return 1; return 0; @@ -1083,7 +1053,7 @@ static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, uint32_t offset = term_value->offset; uint32_t val_sz = term_value->val_sz; - ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); + ODP_ASSERT(val_sz <= MAX_PMR_TERM_SIZE); if (packet_len(pkt_hdr) <= offset + val_sz) return 0; commit d4eb0481e1dd40a0d0b70486cdf8f9b676862b2f Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 16:16:12 2019 +0300 linux-gen: cls: change ODP_PMR_ IPv4 addresses to big endian Change ODP_PMR_SIP_ADDR and ODP_PMR_DIP_ADDR to big endian. Both are changed simultaneously as some tests use both terms. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ae90ee82a..e85e8d00c 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -825,7 +825,7 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->src_addr); + ipaddr = ip->src_addr; if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; @@ -842,7 +842,7 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.ipv4) return 0; ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->dst_addr); + ipaddr = ip->dst_addr; if (term_value->match.value == (ipaddr & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index a939bdbee..46bbdf4b1 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1722,6 +1722,10 @@ static void test_pmr_term_ipv4_addr(int dst) parse_ipv4_string(src_str, &src_addr, &src_mask); parse_ipv4_string(dst_str, &dst_addr, &dst_mask); + src_addr = odp_cpu_to_be_32(src_addr); + src_mask = odp_cpu_to_be_32(src_mask); + dst_addr = odp_cpu_to_be_32(dst_addr); + dst_mask = odp_cpu_to_be_32(dst_mask); odp_cls_pmr_param_init(&pmr_param); @@ -1748,8 +1752,8 @@ static void test_pmr_term_ipv4_addr(int dst) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); - ip->src_addr = odp_cpu_to_be_32(src_addr); - ip->dst_addr = odp_cpu_to_be_32(dst_addr); + ip->src_addr = src_addr; + ip->dst_addr = dst_addr; odph_ipv4_csum_update(pkt); seqno = cls_pkt_get_seq(pkt); diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 3a97023cf..b86bfe272 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -213,6 +213,9 @@ void configure_cls_pmr_chain(void) CU_ASSERT_FATAL(cos_list[CLS_PMR_CHAIN_DST] != ODP_COS_INVALID); parse_ipv4_string(CLS_PMR_CHAIN_SADDR, &addr, &mask); + addr = odp_cpu_to_be_32(addr); + mask = odp_cpu_to_be_32(mask); + odp_cls_pmr_param_init(&pmr_param); pmr_param.term = ODP_PMR_SIP_ADDR; pmr_param.match.value = &addr; @@ -649,6 +652,9 @@ void configure_pktio_pmr_composite(void) CU_ASSERT_FATAL(cos_list[CLS_PMR_SET] != ODP_COS_INVALID); parse_ipv4_string(CLS_PMR_SET_SADDR, &addr, &mask); + addr = odp_cpu_to_be_32(addr); + mask = odp_cpu_to_be_32(mask); + odp_cls_pmr_param_init(&pmr_params[0]); pmr_params[0].term = ODP_PMR_SIP_ADDR; pmr_params[0].match.value = &addr; commit f15da1c0ee13dd0e342944dccdd9014c16d4d5be Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 15:22:38 2019 +0300 linux-gen: cls: change ODP_PMR_UDP/TCP ports to big endian Change ODP_PMR_UDP_DPORT, ODP_PMR_TCP_DPORT, ODP_PMR_UDP_SPORT and ODP_PMR_TCP_SPORT terms to big endian. All four needs to be changed simultaneously in order not to break some validation tests. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 9ad3380e5..ae90ee82a 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -859,7 +859,7 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(tcp->src_port); + sport = tcp->src_port; if (term_value->match.value == (sport & term_value->match.mask)) return 1; @@ -876,7 +876,7 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.tcp) return 0; tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(tcp->dst_port); + dport = tcp->dst_port; if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -893,7 +893,7 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(udp->dst_port); + dport = udp->dst_port; if (term_value->match.value == (dport & term_value->match.mask)) return 1; @@ -910,7 +910,7 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, if (!pkt_hdr->p.input_flags.udp) return 0; udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(udp->src_port); + sport = udp->src_port; if (term_value->match.value == (sport & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 9ac735020..a939bdbee 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -121,8 +121,8 @@ static void classification_test_pktin_classifier_flag(void) odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; - val = CLS_DEFAULT_DPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; /* classifier is disabled in pktin queue configuration */ @@ -167,7 +167,7 @@ static void classification_test_pktin_classifier_flag(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); - tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + tcp->dst_port = val; enqueue_pktio_interface(pkt, pktio); @@ -217,8 +217,8 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) odp_pool_t pool_recv; odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; - val = CLS_DEFAULT_DPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + mask = odp_cpu_to_be_16(0xffff); pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID); @@ -262,7 +262,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); - tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + tcp->dst_port = val; enqueue_pktio_interface(pkt, pktio); } @@ -320,7 +320,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) if ((i % 5) < 2) { sent_queue++; - tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + tcp->dst_port = val; } else { sent_default++; tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT + 1); @@ -341,8 +341,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt) if (retqueue == queue) { recv_queue++; - CU_ASSERT(tcp->dst_port == - odp_cpu_to_be_16(CLS_DEFAULT_DPORT)); + CU_ASSERT(tcp->dst_port == val); } else if (retqueue == default_queue) { recv_default++; CU_ASSERT(tcp->dst_port == @@ -388,8 +387,8 @@ static void classification_test_pmr_term_tcp_sport(void) odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; - val = CLS_DEFAULT_SPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -433,7 +432,7 @@ static void classification_test_pmr_term_tcp_sport(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); tcp = (odph_tcphdr_t *)odp_packet_l4_ptr(pkt, NULL); - tcp->src_port = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + tcp->src_port = val; enqueue_pktio_interface(pkt, pktio); @@ -501,8 +500,8 @@ static void classification_test_pmr_term_udp_dport(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = CLS_DEFAULT_DPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -548,7 +547,7 @@ static void classification_test_pmr_term_udp_dport(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); + udp->dst_port = val; enqueue_pktio_interface(pkt, pktio); @@ -617,8 +616,8 @@ static void classification_test_pmr_term_udp_sport(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = CLS_DEFAULT_SPORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -664,7 +663,7 @@ static void classification_test_pmr_term_udp_sport(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); udp = (odph_udphdr_t *)odp_packet_l4_ptr(pkt, NULL); - udp->src_port = odp_cpu_to_be_16(CLS_DEFAULT_SPORT); + udp->src_port = val; enqueue_pktio_interface(pkt, pktio); diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 9df869ece..3a97023cf 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -223,8 +223,8 @@ void configure_cls_pmr_chain(void) cos_list[CLS_PMR_CHAIN_SRC]); CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_SRC] != ODP_PMR_INVALID); - val = CLS_PMR_CHAIN_PORT; - maskport = 0xffff; + val = odp_cpu_to_be_16(CLS_PMR_CHAIN_PORT); + maskport = odp_cpu_to_be_16(0xffff); odp_cls_pmr_param_init(&pmr_param); pmr_param.term = find_first_supported_l3_pmr(); pmr_param.match.value = &val; @@ -573,8 +573,8 @@ void configure_pmr_cos(void) cos_list[CLS_PMR] = odp_cls_cos_create(cosname, &cls_param); CU_ASSERT_FATAL(cos_list[CLS_PMR] != ODP_COS_INVALID); - val = CLS_PMR_PORT; - mask = 0xffff; + val = odp_cpu_to_be_16(CLS_PMR_PORT); + mask = odp_cpu_to_be_16(0xffff); odp_cls_pmr_param_init(&pmr_param); pmr_param.term = find_first_supported_l3_pmr(); pmr_param.match.value = &val; @@ -655,8 +655,8 @@ void configure_pktio_pmr_composite(void) pmr_params[0].match.mask = &mask; pmr_params[0].val_sz = sizeof(addr); - val = CLS_PMR_SET_PORT; - maskport = 0xffff; + val = odp_cpu_to_be_16(CLS_PMR_SET_PORT); + maskport = odp_cpu_to_be_16(0xffff); odp_cls_pmr_param_init(&pmr_params[1]); pmr_params[1].term = find_first_supported_l3_pmr(); pmr_params[1].match.value = &val; commit 6f855d843b1d87013908998a050e16c435b89e07 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 15:10:01 2019 +0300 linux-gen: cls: change ODP_PMR_DMAC to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 1d717f413..9ad3380e5 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -921,24 +921,23 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr, pmr_term_value_t *term_value) { - uint64_t dmac = 0; - uint64_t dmac_be = 0; const _odp_ethhdr_t *eth; + uint16_t dmac[3]; + uint16_t *mask = (uint16_t *)&term_value->match.mask; + uint16_t *value = (uint16_t *)&term_value->match.value; if (!packet_hdr_has_eth(pkt_hdr)) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = odp_be_to_cpu_64(dmac_be); - /* since we are converting a 48 bit ethernet address from BE to cpu - format using odp_be_to_cpu_64() the last 16 bits needs to be right - shifted */ - if (dmac_be != dmac) - dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); - - if (term_value->match.value == (dmac & term_value->match.mask)) + memcpy(dmac, eth->dst.addr, _ODP_ETHADDR_LEN); + dmac[0] &= mask[0]; + dmac[1] &= mask[1]; + dmac[2] &= mask[2]; + + if (value[0] == dmac[0] && value[1] == dmac[1] && value[2] == dmac[2]) return 1; + return 0; } diff --git a/test/validation/api/classification/classification.h b/test/validation/api/classification/classification.h index ae8d57221..c16b340c9 100644 --- a/test/validation/api/classification/classification.h +++ b/test/validation/api/classification/classification.h @@ -19,8 +19,8 @@ #define CLS_DEFAULT_DADDR "10.0.0.100/32" #define CLS_DEFAULT_SPORT 1024 #define CLS_DEFAULT_DPORT 2048 -#define CLS_DEFAULT_DMAC 0x010203040506 -#define CLS_DEFAULT_SMAC 0x060504030201 +#define CLS_DEFAULT_DMAC {0x01, 0x02, 0x03, 0x04, 0x05, 0x06} +#define CLS_DEFAULT_SMAC {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c} /* Config values for Error CoS */ #define TEST_ERROR 1 diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index ad64b9d4a..851f949cc 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -240,9 +240,6 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) odph_ipv4hdr_t *ip; odph_ipv6hdr_t *ipv6; uint16_t payload_len; - uint64_t src_mac = CLS_DEFAULT_SMAC; - uint64_t dst_mac = CLS_DEFAULT_DMAC; - uint64_t dst_mac_be; uint32_t addr = 0; uint32_t mask; odp_packet_t pkt; @@ -257,12 +254,8 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) uint16_t eth_type; odp_u16be_t *vlan_type; odph_vlanhdr_t *vlan_hdr; - - /* 48 bit ethernet address needs to be left shifted for proper - value after changing to be*/ - dst_mac_be = odp_cpu_to_be_64(dst_mac); - if (dst_mac != dst_mac_be) - dst_mac_be = dst_mac_be >> (64 - 8 * ODPH_ETHADDR_LEN); + uint8_t src_mac[] = CLS_DEFAULT_SMAC; + uint8_t dst_mac[] = CLS_DEFAULT_DMAC; payload_len = sizeof(cls_test_packet_t) + pkt_info.len; seqno = odp_atomic_fetch_inc_u32(pkt_info.seq); @@ -287,7 +280,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) odp_packet_l2_offset_set(pkt, 0); ethhdr = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); memcpy(ethhdr->src.addr, &src_mac, ODPH_ETHADDR_LEN); - memcpy(ethhdr->dst.addr, &dst_mac_be, ODPH_ETHADDR_LEN); + memcpy(ethhdr->dst.addr, &dst_mac, ODPH_ETHADDR_LEN); vlan_type = (odp_u16be_t *)(void *)&ethhdr->type; vlan_hdr = (odph_vlanhdr_t *)(ethhdr + 1); diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index abb1a743b..9ac735020 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -821,8 +821,6 @@ static void classification_test_pmr_term_dmac(void) { odp_packet_t pkt; uint32_t seqno; - uint64_t val; - uint64_t mask; int retval; odp_pktio_t pktio; odp_queue_t queue; @@ -839,9 +837,8 @@ static void classification_test_pmr_term_dmac(void) odp_pmr_param_t pmr_param; odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - - val = CLS_DEFAULT_DMAC; /* 48 bit Ethernet Mac address */ - mask = 0xffffffffffff; + uint8_t val[] = {0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee}; + uint8_t mask[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -880,6 +877,8 @@ static void classification_test_pmr_term_dmac(void) pkt_info.udp = true; pkt = create_packet(pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); + eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + memcpy(eth->dst.addr, val, ODPH_ETHADDR_LEN); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); @@ -896,9 +895,6 @@ static void classification_test_pmr_term_dmac(void) /* Other packets delivered to default queue */ pkt = create_packet(default_pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); - memset(eth->dst.addr, 0, ODPH_ETHADDR_LEN); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); CU_ASSERT(seqno != TEST_SEQ_INVALID); commit 35a6b2e5c369e81196f6c288085990eaaf83f360 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 14:41:59 2019 +0300 linux-gen: cls: change ODP_PMR_VLAN_ID_X to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 308f060b1..1d717f413 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1033,8 +1033,8 @@ static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.vlan_qinq) vlan++; - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; + tci = vlan->tci; + vlan_id = tci & odp_cpu_to_be_16(0x0fff); if (term_value->match.value == (vlan_id & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 7111595c5..abb1a743b 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1170,8 +1170,8 @@ static void classification_test_pmr_term_vlan_id_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 0x345; - mask = 0xfff; + val = odp_cpu_to_be_16(0x345); + mask = odp_cpu_to_be_16(0xfff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1218,7 +1218,7 @@ static void classification_test_pmr_term_vlan_id_x(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_x = (odph_vlanhdr_t *)(eth + 1); vlan_x++; - vlan_x->tci = odp_cpu_to_be_16(val); + vlan_x->tci = val; enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); commit 0e2ee113fcc0e7383d9e465c11a8495a65f7a171 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 14:38:47 2019 +0300 linux-gen: cls: change ODP_PMR_VLAN_ID_0 to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 91d04640f..308f060b1 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1006,8 +1006,8 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; + tci = vlan->tci; + vlan_id = tci & odp_cpu_to_be_16(0x0fff); if (term_value->match.value == (vlan_id & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 5dd16c321..7111595c5 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1059,8 +1059,8 @@ static void classification_test_pmr_term_vlan_id_0(void) odph_vlanhdr_t *vlan_0; cls_packet_info_t pkt_info; - val = 0x123; - mask = 0xfff; + val = odp_cpu_to_be_16(0x123); + mask = odp_cpu_to_be_16(0xfff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1105,7 +1105,7 @@ static void classification_test_pmr_term_vlan_id_0(void) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_0 = (odph_vlanhdr_t *)(eth + 1); - vlan_0->tci = odp_cpu_to_be_16(val); + vlan_0->tci = val; enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); commit 0cfdb2c5a6b3afe0e4b0eee2b3749a0cfca3917d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 14:27:09 2019 +0300 linux-gen: cls: change ODP_PMR_ETHTYPE_X to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index e640ede2e..91d04640f 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1132,7 +1132,7 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, if (pkt_hdr->p.input_flags.vlan_qinq) vlan++; - ethtype = odp_be_to_cpu_16(vlan->type); + ethtype = vlan->type; if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index abcc73e07..5dd16c321 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1391,8 +1391,8 @@ static void classification_test_pmr_term_eth_type_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 0x0800; - mask = 0xffff; + val = odp_cpu_to_be_16(0x0800); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1440,7 +1440,7 @@ static void classification_test_pmr_term_eth_type_x(void) vlan_x = (odph_vlanhdr_t *)(eth + 1); vlan_x++; vlan_x->tci = odp_cpu_to_be_16(0x123); - vlan_x->type = odp_cpu_to_be_16(val); + vlan_x->type = val; enqueue_pktio_interface(pkt, pktio); commit b7a8fd47362a3853db8cc3ea56fe1d268defa574 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 24 13:55:29 2019 +0300 linux-gen: cls: change ODP_PMR_ETHTYPE_0 to big endian Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 0119f7537..e640ede2e 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1107,7 +1107,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = odp_be_to_cpu_16(eth->type); + ethtype = eth->type; if (term_value->match.value == (ethtype & term_value->match.mask)) return 1; diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 44942de98..abcc73e07 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1282,8 +1282,8 @@ static void classification_test_pmr_term_eth_type_0(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = ODPH_ETHTYPE_IPV6; - mask = 0xffff; + val = odp_cpu_to_be_16(ODPH_ETHTYPE_IPV6); + mask = odp_cpu_to_be_16(0xffff); seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); commit 0df7a38e2b9be4ad72528d43551e56ac4d152b96 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 23 17:21:13 2019 +0300 linux-gen: cls: check PMR value size Check that PMR value size matches API specification. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 907d68481..0119f7537 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -568,12 +568,77 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, return 0; } -static int odp_pmr_create_term(pmr_term_value_t *value, - const odp_pmr_param_t *param) +static int pmr_create_term(pmr_term_value_t *value, + const odp_pmr_param_t *param) { - value->term = param->term; - value->range_term = param->range_term; + uint32_t size; uint8_t i; + int custom = 0; + odp_cls_pmr_term_t term = param->term; + + value->term = term; + value->range_term = param->range_term; + + switch (term) { + case ODP_PMR_IPPROTO: + size = 1; + break; + + case ODP_PMR_ETHTYPE_0: + /* Fall through */ + case ODP_PMR_ETHTYPE_X: + /* Fall through */ + case ODP_PMR_VLAN_ID_0: + /* Fall through */ + case ODP_PMR_VLAN_ID_X: + /* Fall through */ + case ODP_PMR_UDP_DPORT: + /* Fall through */ + case ODP_PMR_TCP_DPORT: + /* Fall through */ + case ODP_PMR_UDP_SPORT: + /* Fall through */ + case ODP_PMR_TCP_SPORT: + size = 2; + break; + + case ODP_PMR_LEN: + /* Fall through */ + case ODP_PMR_SIP_ADDR: + /* Fall through */ + case ODP_PMR_DIP_ADDR: + /* Fall through */ + case ODP_PMR_IPSEC_SPI: + /* Fall through */ + case ODP_PMR_LD_VNI: + size = 4; + break; + + case ODP_PMR_DMAC: + size = 6; + break; + + case ODP_PMR_SIP6_ADDR: + /* Fall through */ + case ODP_PMR_DIP6_ADDR: + size = 16; + break; + + case ODP_PMR_CUSTOM_FRAME: + custom = 1; + size = CLS_PMR_TERM_BYTES_MAX; + break; + + default: + ODP_ERR("Bad PRM term\n"); + return -1; + } + + if ((!custom && param->val_sz != size) || + (custom && param->val_sz > size)) { + ODP_ERR("Bad PMR value size: %u\n", param->val_sz); + return -1; + } switch (value->term) { case ODP_PMR_SIP6_ADDR: @@ -655,7 +720,6 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, pmr_t *pmr; int i; odp_pmr_t id; - int val_sz; uint32_t loc; cos_t *cos_src = get_cos_entry(src_cos); cos_t *cos_dst = get_cos_entry(dst_cos); @@ -680,13 +744,8 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, pmr->s.num_pmr = num_terms; for (i = 0; i < num_terms; i++) { - val_sz = terms[i].val_sz; - if (val_sz > CLS_PMR_TERM_BYTES_MAX) { + if (pmr_create_term(&pmr->s.pmr_term_value[i], &terms[i])) { pmr->s.valid = 0; - return ODP_PMR_INVALID; - } - if (0 > odp_pmr_create_term(&pmr->s.pmr_term_value[i], - &terms[i])) { UNLOCK(&pmr->s.lock); return ODP_PMR_INVALID; } diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index a01c0a403..44942de98 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -927,8 +927,8 @@ static void classification_test_pmr_term_packet_len(void) { odp_packet_t pkt; uint32_t seqno; - uint16_t val; - uint16_t mask; + uint32_t val; + uint32_t mask; int retval; odp_pktio_t pktio; odp_queue_t queue; commit 139b28399d3bd1f53624908c9fd99c1f14283cdd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 23 16:36:40 2019 +0300 api: cls: PMR value in big endian format PMR term documentation was not explicit about endianness of value and mask fields. Most terms assumed CPU endian, but terms with larger data sizes assumed big endian (MAC, IPv6 address and custom). Harmonize term specification so that all terms expect value/mask data to be in big endian format, have fixed size and allow free memory alignment. Packet length term is an exception to this as it does not represent a field in a packet. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Stanislaw Kardach <skardach(a)marvell.com> diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h index 043059fa1..67fdd20aa 100644 --- a/include/odp/api/spec/classification.h +++ b/include/odp/api/spec/classification.h @@ -461,44 +461,92 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, */ /** - * Packet Matching Rule field enumeration - * for fields that may be used to calculate - * the PMR, if present in a packet. + * Packet Matching Rule terms + * + * This enumeration selects the protocol field that is matched against PMR + * value/mask or value range. Protocol field values and masks are passed in big + * endian (network endian) format. However, ODP_PMR_LEN value and range are + * passed in CPU native endian (uint32_t words), as the term does not represent + * a protocol field. + * + * PMR value/mask data size is term specific. This size must be set into val_sz + * field of odp_pmr_param_t. There is no alignment requirement for PMR + * value/mask data. */ typedef enum { - ODP_PMR_LEN, /**< Total length of received packet*/ - ODP_PMR_ETHTYPE_0, /**< Initial (outer) - Ethertype only (*val=uint16_t)*/ - ODP_PMR_ETHTYPE_X, /**< Ethertype of most inner VLAN tag - (*val=uint16_t)*/ - ODP_PMR_VLAN_ID_0, /**< First VLAN ID (outer) (*val=uint16_t) */ - ODP_PMR_VLAN_ID_X, /**< Last VLAN ID (inner) (*val=uint16_t) */ - ODP_PMR_DMAC, /**< destination MAC address (*val=uint64_t)*/ - ODP_PMR_IPPROTO, /**< IP Protocol or IPv6 Next Header - (*val=uint8_t) */ - ODP_PMR_UDP_DPORT, /**< Destination UDP port, implies IPPROTO=17*/ - ODP_PMR_TCP_DPORT, /**< Destination TCP port implies IPPROTO=6*/ - ODP_PMR_UDP_SPORT, /**< Source UDP Port (*val=uint16_t)*/ - ODP_PMR_TCP_SPORT, /**< Source TCP port (*val=uint16_t)*/ - ODP_PMR_SIP_ADDR, /**< Source IP address (uint32_t)*/ - ODP_PMR_DIP_ADDR, /**< Destination IP address (uint32_t)*/ - ODP_PMR_SIP6_ADDR, /**< Source IP address (uint8_t[16])*/ - ODP_PMR_DIP6_ADDR, /**< Destination IP address (uint8_t[16])*/ - ODP_PMR_IPSEC_SPI, /**< IPsec session identifier(*val=uint32_t)*/ - ODP_PMR_LD_VNI, /**< NVGRE/VXLAN network identifier - (*val=uint32_t)*/ - ODP_PMR_CUSTOM_FRAME, /**< Custom match rule, offset from start of - frame. The match is defined by the offset, the - expected value, and its size. They must be - applied before any other PMR. - (*val=uint8_t[val_sz])*/ + /** Total length of received packet. Exceptionally, value and mask are + * uint32_t (val_sz = 4) in CPU endian. */ + ODP_PMR_LEN, + + /** Initial (outer) Ethertype only (val_sz = 2) */ + ODP_PMR_ETHTYPE_0, + + /** Ethertype of most inner VLAN tag (val_sz = 2) */ + ODP_PMR_ETHTYPE_X, + + /** First (outer) VLAN ID (val_sz = 2) */ + ODP_PMR_VLAN_ID_0, + + /** Last (most inner) VLAN ID (val_sz = 2) */ + ODP_PMR_VLAN_ID_X, + + /** Destination MAC address (val_sz = 6) */ + ODP_PMR_DMAC, + + /** IPv4 Protocol or IPv6 Next Header (val_sz = 1) */ + ODP_PMR_IPPROTO, + + /** Destination UDP port (val_sz = 2) */ + ODP_PMR_UDP_DPORT, + + /** Destination TCP port (val_sz = 2) */ + ODP_PMR_TCP_DPORT, + + /** Source UDP port (val_sz = 2) */ + ODP_PMR_UDP_SPORT, + + /** Source TCP port (val_sz = 2) */ + ODP_PMR_TCP_SPORT, + + /** Source IPv4 address (val_sz = 4) */ + ODP_PMR_SIP_ADDR, + + /** Destination IPv4 address (val_sz = 4) */ + ODP_PMR_DIP_ADDR, + + /** Source IPv6 address (val_sz = 16) */ + ODP_PMR_SIP6_ADDR, + + /** Destination IPv6 address (val_sz = 16) */ + ODP_PMR_DIP6_ADDR, + + /** IPsec session identifier (val_sz = 4)*/ + ODP_PMR_IPSEC_SPI, + + /** NVGRE/VXLAN network identifier (val_sz = 4) */ + ODP_PMR_LD_VNI, + + /** + * Custom frame match rule + * + * PMR offset is counted from the start of the packet. The match is + * defined by the offset, the expected value, and its size. Custom frame + * rules must be applied before any other PMR. + */ + ODP_PMR_CUSTOM_FRAME, /** Inner header may repeat above values with this offset */ ODP_PMR_INNER_HDR_OFF = 32 + } odp_cls_pmr_term_t; /** * Packet Matching Rule parameter structure + * + * Match value/mask size and endianness are defined in PMR term documentation + * (@see odp_cls_pmr_term_t). Most values and masks are passed in big + * endian format without data alignment requirement. ODP_PMR_LEN is + * an exception to this (uint32_t in CPU endian). */ typedef struct odp_pmr_param_t { odp_cls_pmr_term_t term; /**< Packet Matching Rule term */ @@ -510,21 +558,24 @@ typedef struct odp_pmr_param_t { union { /** Parameters for single-valued matches */ struct { - /** Value to be matched */ - const void *value; - - /** Masked set of bits to be matched */ - const void *mask; + /** Points to the value to be matched. Value size and + * endianness are defined by the term used. Values of + * protocol fields are defined in big endian format. + */ + const void *value; + + /** Mask of the bits to be matched. The same size and + * endianness is used than with the value. */ + const void *mask; } match; /** Parameter for range value matches */ struct { - /** Start and End values are included in the range */ - /** start value of range */ - const void *val_start; + /** Start value of the range */ + const void *val_start; - /** End value of range */ - const void *val_end; + /** End value of the range */ + const void *val_end; } range; }; uint32_t val_sz; /**< Size of the term value */ ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- example/classifier/odp_classifier.c | 224 +++++++++--------- include/odp/api/spec/classification.h | 172 +++++++++----- include/odp/api/spec/packet_io.h | 14 +- include/odp/api/spec/pool.h | 8 +- include/odp/api/spec/shared_memory.h | 2 +- include/odp/api/spec/version.h.in | 1 - .../include/odp_classification_datamodel.h | 79 ++++--- platform/linux-generic/odp_classification.c | 249 +++++++++++++-------- .../validation/api/classification/classification.h | 4 +- .../api/classification/odp_classification_common.c | 13 +- .../classification/odp_classification_test_pmr.c | 236 +++++++++++++++---- .../api/classification/odp_classification_tests.c | 18 +- 13 files changed, 678 insertions(+), 344 deletions(-) hooks/post-receive --

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-274-g86745e999

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 86745e999aa2bf644fd72775df55042289e07b2b (commit) via b11ca4c8889eef7444253003eec531377c7167f6 (commit) via f4b03adaf872f8c2e593d94a8619aa23bfecd51f (commit) via c723055094546df3890efb0f6a5f02b59cb4cb34 (commit) via 7610aab45d2a307d883c62ee56fbc0430fabf2b2 (commit) via 11353856ea2c1add12ec941bdb2a2e5854bdeb6d (commit) via 77dbff3c7054c607ff0c3371f62b226742f08aec (commit) via cc4e3434ca806736fd0c586ed36bc34f3d3b2bd4 (commit) via 916bfae5098242dd7e5121c789b1dbe20c8453ea (commit) via 65e5ee3c37c28a9365385516e5279f917a6ff41a (commit) from f0f83828a483f90edcf320ec2cf0107cb1e9362e (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 86745e999aa2bf644fd72775df55042289e07b2b Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 9 10:38:15 2019 +0300 linux-gen: packet: clean up internal naming Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index adaf877ca..e491d2512 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -383,20 +383,18 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) link_segments(pkt_hdr, num); } -static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int num) +static inline void reset_segments(odp_packet_hdr_t *pkt_hdr) { - odp_packet_hdr_t *hdr = pkt_hdr; void *base; - int i; - uint32_t seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len; + uint32_t seg_len = ((pool_t *)(pkt_hdr->buf_hdr.pool_ptr))->seg_len; - for (i = 0; i < num; i++) { - base = hdr->buf_hdr.base_data; + while (pkt_hdr != NULL) { + base = pkt_hdr->buf_hdr.base_data; - hdr->seg_len = seg_len; - hdr->seg_data = base; + pkt_hdr->seg_len = seg_len; + pkt_hdr->seg_data = base; - hdr = hdr->seg_next; + pkt_hdr = pkt_hdr->seg_next; } } @@ -559,11 +557,11 @@ static inline void free_all_segments(odp_packet_hdr_t *pkt_hdr, int num) { int i; odp_buffer_hdr_t *buf_hdr[num]; - odp_packet_hdr_t *seg = pkt_hdr; + odp_packet_hdr_t *seg_hdr = pkt_hdr; for (i = 0; i < num; i++) { - buf_hdr[i] = &seg->buf_hdr; - seg = seg->seg_next; + buf_hdr[i] = &seg_hdr->buf_hdr; + seg_hdr = seg_hdr->seg_next; } packet_free_multi(buf_hdr, num); @@ -573,7 +571,7 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, int num, uint32_t free_len, uint32_t pull_len, int head) { - odp_packet_hdr_t *seg; + odp_packet_hdr_t *seg_hdr; int i; int num_remain = pkt_hdr->seg_count - num; odp_packet_hdr_t *hdr = pkt_hdr; @@ -584,8 +582,8 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, odp_packet_hdr_t *new_hdr; for (i = 0; i < num; i++) { - seg = packet_seg_step(&hdr); - buf_hdr[i] = &seg->buf_hdr; + seg_hdr = packet_seg_step(&hdr); + buf_hdr[i] = &seg_hdr->buf_hdr; } /* The first remaining header is the new packet descriptor. @@ -619,8 +617,8 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, packet_seg_step(&hdr); for (i = 0; i < num; i++) { - seg = packet_seg_step(&hdr); - buf_hdr[i] = &seg->buf_hdr; + seg_hdr = packet_seg_step(&hdr); + buf_hdr[i] = &seg_hdr->buf_hdr; } packet_free_multi(buf_hdr, num); @@ -770,9 +768,7 @@ void odp_packet_free(odp_packet_t pkt) void odp_packet_free_multi(const odp_packet_t pkt[], int num) { odp_buffer_hdr_t *buf_hdr[num]; - odp_buffer_hdr_t *buf_hdr2[num]; int i; - int links = 0; int num_freed = 0; for (i = 0; i < num; i++) { @@ -790,9 +786,6 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) buf_hdr[i - num_freed] = &pkt_hdr->buf_hdr; } - if (odp_unlikely(links)) - packet_free_multi(buf_hdr2, links); - if (odp_likely(num - num_freed)) packet_free_multi(buf_hdr, num - num_freed); } @@ -816,7 +809,7 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) num_req = num_segments(len, pool->seg_len); if (odp_unlikely(num_req < num)) free_segments(pkt_hdr, num - num_req, 0, 0, 0); - reset_seg(pkt_hdr, num_req); + reset_segments(pkt_hdr); packet_init(pkt_hdr, len); commit b11ca4c8889eef7444253003eec531377c7167f6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 9 10:11:05 2019 +0300 linux-gen: packet: make sure max segment count is not exceeded Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index bdff0875b..adaf877ca 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -894,6 +894,9 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, return -1; num = num_segments(len - headroom, pool->seg_len); + if (odp_unlikely(pkt_hdr->seg_count + num > PKT_MAX_SEGS)) + return -1; + push_head(pkt_hdr, headroom); ptr = add_segments(pkt_hdr, pool, len - headroom, num, 1); @@ -1000,6 +1003,9 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, return -1; num = num_segments(len - tailroom, pool->seg_len); + if (odp_unlikely(pkt_hdr->seg_count + num > PKT_MAX_SEGS)) + return -1; + push_tail(pkt_hdr, tailroom); ptr = add_segments(pkt_hdr, pool, len - tailroom, num, 0); @@ -1356,6 +1362,10 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) return -1; } + if (odp_unlikely(dst_hdr->seg_count + src_hdr->seg_count > + PKT_MAX_SEGS)) + return -1; + add_all_segs(dst_hdr, src_hdr); dst_hdr->frame_len = dst_len + src_len; commit f4b03adaf872f8c2e593d94a8619aa23bfecd51f Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 9 09:00:27 2019 +0300 linux-gen: dpdk: optimize performance Minor performance tweaks. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 93cec349d..039c38d36 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -804,7 +804,7 @@ static inline void prefetch_pkt(struct rte_mbuf *mbuf) void *data = rte_pktmbuf_mtod(mbuf, char *); odp_prefetch(pkt_hdr); - odp_prefetch(&pkt_hdr->p); + odp_prefetch_store((uint8_t *)pkt_hdr + ODP_CACHE_LINE_SIZE); odp_prefetch(data); } @@ -920,6 +920,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; odp_pktout_config_opt_t *pktout_capa = &pktio_entry->s.capa.config.pktout; + uint16_t mtu = pkt_dpdk->mtu; int i; *copy_count = 0; @@ -929,7 +930,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf = mbuf_from_pkt_hdr(pkt_hdr); uint16_t pkt_len = odp_packet_len(pkt); - if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) + if (odp_unlikely(pkt_len > mtu)) goto fail; if (odp_likely(pkt_hdr->seg_count == 1)) { commit c723055094546df3890efb0f6a5f02b59cb4cb34 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 8 13:38:21 2019 +0300 linux-gen: dpdk: make storing packet flow hash configurable Make saving RX RSS hash as ODP flow hash optional (disabled by default). This improves performance by removing a write operation to an additional cache line. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf index 4fec05047..4e24ef82d 100644 --- a/config/odp-linux-generic.conf +++ b/config/odp-linux-generic.conf @@ -16,7 +16,7 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.8" +config_file_version = "0.1.9" # Shared memory options shm: { @@ -70,6 +70,9 @@ pktio_dpdk: { num_tx_desc = 512 rx_drop_en = 0 + # Store RX RSS hash result as ODP flow hash + set_flow_hash = 0 + # Driver specific options (use PMD names from DPDK) net_ixgbe: { rx_drop_en = 1 diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index cc0a4368c..93cec349d 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -92,7 +92,8 @@ ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) && typedef struct { int num_rx_desc; int num_tx_desc; - int rx_drop_en; + uint8_t rx_drop_en; + uint8_t set_flow_hash; } dpdk_opt_t; struct pkt_cache_t { @@ -169,6 +170,7 @@ static int init_options(pktio_entry_t *pktio_entry, const struct rte_eth_dev_info *dev_info) { dpdk_opt_t *opt = &pkt_priv(pktio_entry)->opt; + int val; if (!lookup_opt("num_rx_desc", dev_info->driver_name, &opt->num_rx_desc)) @@ -190,10 +192,13 @@ static int init_options(pktio_entry_t *pktio_entry, return -1; } - if (!lookup_opt("rx_drop_en", dev_info->driver_name, - &opt->rx_drop_en)) + if (!lookup_opt("rx_drop_en", dev_info->driver_name, &val)) return -1; - opt->rx_drop_en = !!opt->rx_drop_en; + opt->rx_drop_en = !!val; + + if (!lookup_opt("set_flow_hash", NULL, &val)) + return -1; + opt->set_flow_hash = !!val; ODP_PRINT("DPDK interface (%s): %" PRIu16 "\n", dev_info->driver_name, pkt_priv(pktio_entry)->port_id); @@ -810,6 +815,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, { odp_packet_hdr_t *pkt_hdr; uint16_t pkt_len; + uint8_t set_flow_hash; struct rte_mbuf *mbuf; void *data; int i, nb_pkts; @@ -824,6 +830,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, pkt_dpdk = pkt_priv(pktio_entry); nb_pkts = 0; pool = pkt_dpdk->pool; + set_flow_hash = pkt_dpdk->opt.set_flow_hash; pktin_cfg = pktio_entry->s.config.pktin; parse_layer = pktio_entry->s.config.parser.layer; input = pktio_entry->s.handle; @@ -893,8 +900,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, continue; } } - - if (mbuf->ol_flags & PKT_RX_RSS_HASH) + if (set_flow_hash && (mbuf->ol_flags & PKT_RX_RSS_HASH)) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); packet_set_ts(pkt_hdr, ts); diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf index 03998f5f5..435f51e6d 100644 --- a/platform/linux-generic/test/inline-timer.conf +++ b/platform/linux-generic/test/inline-timer.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.8" +config_file_version = "0.1.9" timer: { # Enable inline timer implementation diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf index dbf2acb81..708b9b4a8 100644 --- a/platform/linux-generic/test/process-mode.conf +++ b/platform/linux-generic/test/process-mode.conf @@ -1,6 +1,6 @@ # Mandatory fields odp_implementation = "linux-generic" -config_file_version = "0.1.8" +config_file_version = "0.1.9" # Shared memory options shm: { commit 7610aab45d2a307d883c62ee56fbc0430fabf2b2 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Oct 1 14:40:36 2019 +0300 linux-gen: packet: prefetch packet metadata in packet_alloc() Improve packet alloc performance by prefetching required metadata. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 8d06e8fcc..bdff0875b 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -646,6 +646,8 @@ static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt, int num = max_pkt; int max_buf = max_pkt * num_seg; odp_packet_hdr_t *pkt_hdr[max_buf]; + odp_packet_hdr_t *hdr_next; + odp_packet_hdr_t *hdr; num_buf = buffer_alloc_multi(pool, (odp_buffer_hdr_t **)pkt_hdr, max_buf); @@ -668,17 +670,29 @@ static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt, return 0; } - for (i = 0; i < num; i++) { - odp_packet_hdr_t *hdr; + hdr_next = pkt_hdr[0]; + odp_prefetch(hdr_next); + odp_prefetch((uint8_t *)hdr_next + ODP_CACHE_LINE_SIZE); + + for (i = 0; i < num - 1; i++) { + hdr = hdr_next; + hdr_next = pkt_hdr[(i + 1) * num_seg]; + + odp_prefetch(hdr_next); + odp_prefetch((uint8_t *)hdr_next + ODP_CACHE_LINE_SIZE); /* First buffer is the packet descriptor */ - hdr = pkt_hdr[i * num_seg]; pkt[i] = packet_handle(hdr); init_segments(&pkt_hdr[i * num_seg], num_seg); packet_init(hdr, len); } + /* Last packet */ + pkt[i] = packet_handle(hdr_next); + init_segments(&pkt_hdr[i * num_seg], num_seg); + packet_init(hdr_next, len); + return num; } commit 11353856ea2c1add12ec941bdb2a2e5854bdeb6d Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Sep 27 12:24:54 2019 +0300 linux-gen: packet: inline packet segment functions Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 0f9dea38b..fd18488fd 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -31,6 +31,7 @@ extern "C" { typedef struct _odp_packet_inline_offset_t { uint16_t seg_data; uint16_t seg_len; + uint16_t seg_next; uint16_t frame_len; uint16_t headroom; uint16_t tailroom; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 5232fb1e3..08048a993 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -57,6 +57,9 @@ #define odp_packet_head __odp_packet_head #define odp_packet_is_segmented __odp_packet_is_segmented #define odp_packet_first_seg __odp_packet_first_seg + #define odp_packet_seg_data __odp_packet_seg_data + #define odp_packet_seg_data_len __odp_packet_seg_data_len + #define odp_packet_next_seg __odp_packet_next_seg #define odp_packet_prefetch __odp_packet_prefetch #define odp_packet_copy_from_mem __odp_packet_copy_from_mem #define odp_packet_copy_to_mem __odp_packet_copy_to_mem @@ -256,6 +259,29 @@ _ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) return (odp_packet_seg_t)pkt; } +_ODP_INLINE void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + return _odp_pkt_get((odp_packet_t)seg, void *, seg_data); +} + +_ODP_INLINE uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + return _odp_pkt_get((odp_packet_t)seg, uint32_t, seg_len); +} + +_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + void *next_seg = _odp_pkt_get((odp_packet_t)seg, void *, seg_next); + + if (odp_unlikely(next_seg == NULL)) + return ODP_PACKET_SEG_INVALID; + + return (odp_packet_seg_t)next_seg; +} + _ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, uint32_t len) { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 4b0a4d8d3..8d06e8fcc 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -38,6 +38,7 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .seg_data = offsetof(odp_packet_hdr_t, seg_data), .seg_len = offsetof(odp_packet_hdr_t, seg_len), + .seg_next = offsetof(odp_packet_hdr_t, seg_next), .frame_len = offsetof(odp_packet_hdr_t, frame_len), .headroom = offsetof(odp_packet_hdr_t, headroom), .tailroom = offsetof(odp_packet_hdr_t, tailroom), @@ -1194,37 +1195,11 @@ void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) * */ -void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, odp_packet_seg_t seg) -{ - odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); - - return seg_hdr->seg_data; -} - -uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, - odp_packet_seg_t seg) -{ - odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); - - return seg_hdr->seg_len; -} - odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { return (odp_packet_seg_t)packet_last_seg(packet_hdr(pkt)); } -odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt ODP_UNUSED, - odp_packet_seg_t seg) -{ - odp_packet_hdr_t *pkt_hdr = packet_seg_to_hdr(seg); - - if (odp_unlikely(pkt_hdr->seg_next == NULL)) - return ODP_PACKET_SEG_INVALID; - - return (odp_packet_seg_t)pkt_hdr->seg_next; -} - /* * * Manipulation commit 77dbff3c7054c607ff0c3371f62b226742f08aec Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Sep 26 16:30:58 2019 +0300 linux-gen: packet: free possible extra segments in odp_packet_reset() Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e2d768a23..4b0a4d8d3 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -792,11 +792,16 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; int num = pkt_hdr->seg_count; + int num_req; if (odp_unlikely(len > (pool->seg_len * num))) return -1; - reset_seg(pkt_hdr, num); + /* Free possible extra segments */ + num_req = num_segments(len, pool->seg_len); + if (odp_unlikely(num_req < num)) + free_segments(pkt_hdr, num - num_req, 0, 0, 0); + reset_seg(pkt_hdr, num_req); packet_init(pkt_hdr, len); commit cc4e3434ca806736fd0c586ed36bc34f3d3b2bd4 Author: Matias Elo <matias.elo(a)nokia.com> Date: Tue Sep 17 14:58:07 2019 +0300 linux-gen: packet: reimplement segmentation using linked list Packet segmentation has been reimplemented using a linked list. The new implementation is more simple and has the added benefit of reducing packet and buffer header sizes: odp_packet_hdr_t: 384B -> 256B odp_buffer_hdr_t: 256B -> 64B The dynamic packet reference implementation has been temporarily downgraded to a simple packet copy. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h index e11aed978..0967f1ec6 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/packet.h +++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -30,22 +31,11 @@ typedef ODP_HANDLE_T(odp_packet_t); #define ODP_PACKET_OFFSET_INVALID 0xffff -typedef uint8_t odp_packet_seg_t; +typedef ODP_HANDLE_T(odp_packet_seg_t); -/* or it will be provided by packet_inlines.h */ -#define _ODP_HAVE_PACKET_SEG_NDX 1 +#define ODP_PACKET_SEG_INVALID _odp_cast_scalar(odp_packet_seg_t, 0) -static inline uint8_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) -{ - return (uint8_t)seg; -} - -static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint8_t ndx) -{ - return (odp_packet_seg_t)ndx; -} - -#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)-1) +#define ODP_PACKET_OFFSET_INVALID 0xffff typedef uint8_t odp_proto_l2_type_t; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 71065172d..0f9dea38b 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -28,14 +29,14 @@ extern "C" { /* Packet header field offsets for inline functions */ typedef struct _odp_packet_inline_offset_t { - uint16_t data; + uint16_t seg_data; uint16_t seg_len; uint16_t frame_len; uint16_t headroom; uint16_t tailroom; uint16_t pool; uint16_t input; - uint16_t segcount; + uint16_t seg_count; uint16_t user_ptr; uint16_t user_area; uint16_t l2_offset; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 3851af4c7..5232fb1e3 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -1,4 +1,5 @@ /* Copyright (c) 2017-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -56,8 +57,6 @@ #define odp_packet_head __odp_packet_head #define odp_packet_is_segmented __odp_packet_is_segmented #define odp_packet_first_seg __odp_packet_first_seg - #define odp_packet_last_seg __odp_packet_last_seg - #define odp_packet_next_seg __odp_packet_next_seg #define odp_packet_prefetch __odp_packet_prefetch #define odp_packet_copy_from_mem __odp_packet_copy_from_mem #define odp_packet_copy_to_mem __odp_packet_copy_to_mem @@ -72,7 +71,7 @@ #endif void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, - int *seg_idx); + odp_packet_seg_t *seg); int _odp_packet_copy_from_mem_seg(odp_packet_t pkt, uint32_t offset, uint32_t len, const void *src); @@ -83,22 +82,9 @@ int _odp_packet_copy_to_mem_seg(odp_packet_t pkt, uint32_t offset, extern const _odp_packet_inline_offset_t _odp_packet_inline; extern const _odp_pool_inline_offset_t _odp_pool_inline; -#ifndef _ODP_HAVE_PACKET_SEG_NDX -#include <odp/api/plat/strong_types.h> -static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg) -{ - return _odp_typeval(seg) - 1; -} - -static inline odp_packet_seg_t _odp_packet_seg_from_ndx(uint32_t ndx) -{ - return _odp_cast_scalar(odp_packet_seg_t, ndx + 1); -} -#endif - _ODP_INLINE void *odp_packet_data(odp_packet_t pkt) { - return _odp_pkt_get(pkt, void *, data); + return _odp_pkt_get(pkt, void *, seg_data); } _ODP_INLINE uint32_t odp_packet_seg_len(odp_packet_t pkt) @@ -149,7 +135,7 @@ _ODP_INLINE int odp_packet_input_index(odp_packet_t pkt) _ODP_INLINE int odp_packet_num_segs(odp_packet_t pkt) { - return _odp_pkt_get(pkt, uint8_t, segcount); + return _odp_pkt_get(pkt, uint8_t, seg_count); } _ODP_INLINE void *odp_packet_user_ptr(odp_packet_t pkt) @@ -262,29 +248,12 @@ _ODP_INLINE void *odp_packet_head(odp_packet_t pkt) _ODP_INLINE int odp_packet_is_segmented(odp_packet_t pkt) { - return _odp_pkt_get(pkt, uint8_t, segcount) > 1; + return _odp_pkt_get(pkt, uint8_t, seg_count) > 1; } _ODP_INLINE odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) { - (void)pkt; - - return _odp_packet_seg_from_ndx(0); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) -{ - return _odp_packet_seg_from_ndx(odp_packet_num_segs(pkt) - 1); -} - -_ODP_INLINE odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, - odp_packet_seg_t seg) -{ - if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - _odp_packet_seg_to_ndx(odp_packet_last_seg(pkt)))) - return ODP_PACKET_SEG_INVALID; - - return seg + 1; + return (odp_packet_seg_t)pkt; } _ODP_INLINE void odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index f759aac35..1c52b028f 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -32,12 +33,6 @@ extern "C" { #include <odp_schedule_if.h> #include <stddef.h> -typedef struct seg_entry_t { - void *hdr; - uint8_t *data; - uint32_t len; -} seg_entry_t; - typedef union buffer_index_t { uint32_t u32; @@ -58,47 +53,15 @@ ODP_STATIC_ASSERT(CONFIG_POOL_MAX_NUM <= (0xFFFFFF + 1), "TOO_LARGE_POOL"); /* Common buffer header */ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { - /* Combined pool and buffer index */ - buffer_index_t index; - - /* Total segment count */ - uint16_t segcount; - - /* Pool type */ - int8_t type; - - /* Number of seg[] entries used */ - uint8_t num_seg; - - /* Next header which continues the segment list */ - void *next_seg; - - /* Last header of the segment list */ - void *last_seg; - /* Initial buffer data pointer */ uint8_t *base_data; /* Pool pointer */ - void *pool_ptr; - - /* --- 40 bytes --- */ - - /* Segments */ - seg_entry_t seg[CONFIG_PACKET_SEGS_PER_HDR]; + void *pool_ptr; /* --- Mostly read only data --- */ const void *user_ptr; - /* Reference count */ - odp_atomic_u32_t ref_cnt; - - /* Event type. Maybe different than pool type (crypto compl event) */ - int8_t event_type; - - /* Event flow id */ - uint8_t flow_id; - /* Initial buffer tail pointer */ uint8_t *buf_end; @@ -109,13 +72,25 @@ struct ODP_ALIGNED_CACHE odp_buffer_hdr_t { * offset has to be used */ uint64_t ipc_data_offset; + /* Combined pool and buffer index */ + buffer_index_t index; + + /* Reference count */ + odp_atomic_u32_t ref_cnt; + + /* Pool type */ + int8_t type; + + /* Event type. Maybe different than pool type (crypto compl event) */ + int8_t event_type; + + /* Event flow id */ + uint8_t flow_id; + /* Data or next header */ uint8_t data[0]; }; -ODP_STATIC_ASSERT(CONFIG_PACKET_SEGS_PER_HDR < 256, - "CONFIG_PACKET_SEGS_PER_HDR_TOO_LARGE"); - odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 2e1d61d36..e283472a0 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -88,21 +89,6 @@ extern "C" { */ #define CONFIG_PACKET_TAILROOM 0 -/* - * Maximum number of segments per packet - */ -#define CONFIG_PACKET_MAX_SEGS 255 - -/* - * Packet segmentation disabled - */ -#define CONFIG_PACKET_SEG_DISABLED (CONFIG_PACKET_MAX_SEGS == 1) - -/* - * Number of segments stored in a packet header - */ -#define CONFIG_PACKET_SEGS_PER_HDR 6 - /* * Maximum packet data length in bytes */ diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 2b6b859c4..970b97fca 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -51,8 +52,8 @@ static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, uint32_t supported_ptypes, odp_pktin_config_opt_t pktin_cfg) { - uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len; - void *base = pkt_hdr->buf_hdr.seg[0].data; + uint32_t seg_len = pkt_hdr->seg_len; + void *base = pkt_hdr->seg_data; return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, seg_len, mbuf, diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 2e5ef30b8..a0e33222e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -30,6 +31,8 @@ extern "C" { #include <odp/api/abi/packet.h> #include <odp_queue_if.h> +#include <stdint.h> + /** Minimum segment length expected by packet_parse_common() */ #define PACKET_PARSE_SEG_LEN 96 @@ -65,6 +68,11 @@ typedef struct { /* Packet extra data types */ #define PKT_EXTRA_TYPE_DPDK 1 +/* Maximum number of segments per packet */ +#define PKT_MAX_SEGS 255 + +ODP_STATIC_ASSERT(PKT_MAX_SEGS < UINT16_MAX, "PACKET_MAX_SEGS_ERROR"); + /** * Internal Packet header * @@ -72,32 +80,39 @@ typedef struct { * packet_init(). Because of this any new fields added must be reviewed for * initialization requirements. */ -typedef struct { - /* common buffer header */ +typedef struct odp_packet_hdr_t { + /* Common buffer header */ odp_buffer_hdr_t buf_hdr; - /* - * Following members are initialized by packet_init() - */ + /* --- 64 bytes --- */ + + /* Segment data start */ + uint8_t *seg_data; packet_parser_t p; odp_pktio_t input; + /* Next header which continues the segment list */ + struct odp_packet_hdr_t *seg_next; + + /* Total packet length */ uint32_t frame_len; + /* Segment data length */ + uint32_t seg_len; + + /* Total segment count */ + uint16_t seg_count; + uint16_t headroom; + uint16_t tailroom; /* Event subtype */ - int8_t subtype; + int8_t subtype; - /* - * Members below are not initialized by packet_init() - */ - - /* Flow hash value */ - uint32_t flow_hash; + /* --- 128 bytes --- */ /* Timestamp value */ odp_time_t timestamp; @@ -105,6 +120,9 @@ typedef struct { /* Classifier destination queue */ odp_queue_t dst_queue; + /* Flow hash value */ + uint32_t flow_hash; + union { struct { /* Result for crypto packet op */ @@ -145,14 +163,12 @@ static inline odp_packet_t packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) return (odp_packet_t)(odp_packet_hdr_t *)buf_hdr; } -static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr) +static inline odp_packet_hdr_t *packet_last_seg(odp_packet_hdr_t *hdr) { - odp_packet_hdr_t *last; - uint8_t last_seg; + while (hdr->seg_next != NULL) + hdr = hdr->seg_next; - last = hdr->buf_hdr.last_seg; - last_seg = last->buf_hdr.num_seg - 1; - return &last->buf_hdr.seg[last_seg]; + return hdr; } static inline void packet_subtype_set(odp_packet_t pkt, int ev) @@ -167,19 +183,19 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; uint32_t seg_len; - int num = pkt_hdr->buf_hdr.segcount; + int num = pkt_hdr->seg_count; - if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num == 1)) { + if (odp_likely(num == 1)) { seg_len = len; - pkt_hdr->buf_hdr.seg[0].len = len; + pkt_hdr->seg_len = len; } else { - seg_entry_t *last; + odp_packet_hdr_t *last; seg_len = len - ((num - 1) * pool->seg_len); /* Last segment data length */ - last = seg_entry_last(pkt_hdr); - last->len = seg_len; + last = packet_last_seg(pkt_hdr); + last->seg_len = seg_len; } pkt_hdr->p.input_flags.all = 0; @@ -221,11 +237,11 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { - seg_entry_t *last = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last = packet_last_seg(pkt_hdr); pkt_hdr->tailroom += len; pkt_hdr->frame_len -= len; - last->len -= len; + last->seg_len -= len; } static inline uint32_t packet_len(odp_packet_hdr_t *pkt_hdr) diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 67f0d4e26..f39f76a57 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -38,7 +39,7 @@ void *odp_buffer_addr(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf); - return hdr->seg[0].data; + return hdr->base_data; } uint32_t odp_buffer_size(odp_buffer_t buf) @@ -69,7 +70,7 @@ int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf) " pool %" PRIu64 "\n", odp_pool_to_u64(pool->pool_hdl)); len += snprintf(&str[len], n - len, - " addr %p\n", hdr->seg[0].data); + " addr %p\n", hdr->base_data); len += snprintf(&str[len], n - len, " size %" PRIu32 "\n", odp_buffer_size(buf)); len += snprintf(&str[len], n - len, diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index a785ecef9..e2d768a23 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1,4 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -35,14 +36,14 @@ /* Fill in packet header field offsets for inline functions */ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { - .data = offsetof(odp_packet_hdr_t, buf_hdr.seg[0].data), - .seg_len = offsetof(odp_packet_hdr_t, buf_hdr.seg[0].len), + .seg_data = offsetof(odp_packet_hdr_t, seg_data), + .seg_len = offsetof(odp_packet_hdr_t, seg_len), .frame_len = offsetof(odp_packet_hdr_t, frame_len), .headroom = offsetof(odp_packet_hdr_t, headroom), .tailroom = offsetof(odp_packet_hdr_t, tailroom), .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_ptr), .input = offsetof(odp_packet_hdr_t, input), - .segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount), + .seg_count = offsetof(odp_packet_hdr_t, seg_count), .user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.user_ptr), .user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr), .l2_offset = offsetof(odp_packet_hdr_t, p.l2_offset), @@ -72,155 +73,80 @@ static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) return (odp_buffer_t)pkt; } -static inline seg_entry_t *seg_entry(odp_packet_hdr_t *hdr, - uint32_t seg_idx) +static inline odp_packet_hdr_t *packet_seg_to_hdr(odp_packet_seg_t seg) { - uint32_t idx = 0; - uint8_t num_seg = hdr->buf_hdr.num_seg; - - while (odp_unlikely(idx + num_seg - 1 < seg_idx)) { - idx += num_seg; - hdr = hdr->buf_hdr.next_seg; - num_seg = hdr->buf_hdr.num_seg; - } - - idx = seg_idx - idx; - - return &hdr->buf_hdr.seg[idx]; + return (odp_packet_hdr_t *)(uintptr_t)seg; } -static inline void seg_entry_find_idx(odp_packet_hdr_t **p_hdr, - uint8_t *p_idx, - uint32_t find_idx) +static inline odp_packet_seg_t packet_hdr_to_seg(odp_packet_hdr_t *pkt_hdr) { - odp_packet_hdr_t *hdr = *p_hdr; - uint32_t idx = 0; - uint8_t num_seg = hdr->buf_hdr.num_seg; - - while (odp_unlikely(idx + num_seg - 1 < find_idx)) { - idx += num_seg; - hdr = hdr->buf_hdr.next_seg; - num_seg = hdr->buf_hdr.num_seg; - } - - idx = find_idx - idx; - *p_hdr = hdr; - *p_idx = idx; + return (odp_packet_seg_t)pkt_hdr; } -/* Return pointer to the current segment entry and step cur_hdr / cur_idx - * forward. +/* + * Return pointer to the current segment and step cur_hdr forward. */ -static inline seg_entry_t *seg_entry_next(odp_packet_hdr_t **cur_hdr, - uint8_t *cur_idx) +static inline odp_packet_hdr_t *packet_seg_step(odp_packet_hdr_t **cur_hdr) { odp_packet_hdr_t *hdr = *cur_hdr; - uint8_t idx = *cur_idx; - uint8_t num_seg = hdr->buf_hdr.num_seg; - if (idx == num_seg - 1) { - *cur_hdr = hdr->buf_hdr.next_seg; - *cur_idx = 0; - } else { - *cur_idx = idx + 1; - } + *cur_hdr = hdr->seg_next; - return &hdr->buf_hdr.seg[idx]; + return hdr; } -static inline void seg_entry_find_offset(odp_packet_hdr_t **p_hdr, - uint8_t *p_idx, - uint32_t *seg_offset, - uint32_t *seg_idx, - uint32_t offset) +static inline void packet_seg_find_idx(odp_packet_hdr_t **pkt_hdr, + uint32_t find_idx) { - int i; - odp_packet_hdr_t *hdr, *cur_hdr; - uint8_t idx, cur_idx; - seg_entry_t *seg = NULL; - uint32_t seg_start = 0, seg_end = 0; - int seg_count; - - hdr = *p_hdr; - cur_hdr = hdr; - idx = 0; - cur_idx = 0; - seg_count = hdr->buf_hdr.segcount; - - for (i = 0; i < seg_count; i++) { - cur_hdr = hdr; - cur_idx = idx; - seg = seg_entry_next(&hdr, &idx); - seg_end += seg->len; - - if (odp_likely(offset < seg_end)) - break; + odp_packet_hdr_t *hdr = *pkt_hdr; + uint32_t idx = 0; - seg_start = seg_end; + while (odp_unlikely(idx < find_idx)) { + idx++; + hdr = hdr->seg_next; } - *p_hdr = cur_hdr; - *p_idx = cur_idx; - *seg_offset = offset - seg_start; - *seg_idx = i; + *pkt_hdr = hdr; } static inline uint32_t packet_seg_len(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) { - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - - return seg->len; -} - -static inline void *packet_seg_data(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) -{ - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - - return seg->data; -} + packet_seg_find_idx(&pkt_hdr, seg_idx); -static inline uint16_t packet_last_seg(odp_packet_hdr_t *pkt_hdr) -{ - if (CONFIG_PACKET_SEG_DISABLED) - return 0; - else - return pkt_hdr->buf_hdr.segcount - 1; + return pkt_hdr->seg_len; } static inline uint32_t packet_first_seg_len(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->buf_hdr.seg[0].len; + return pkt_hdr->seg_len; } static inline void *packet_data(odp_packet_hdr_t *pkt_hdr) { - return pkt_hdr->buf_hdr.seg[0].data; + return pkt_hdr->seg_data; } static inline void *packet_tail(odp_packet_hdr_t *pkt_hdr) { - seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); - return last_seg->data + last_seg->len; + return last_seg->seg_data + last_seg->seg_len; } -static inline uint32_t seg_headroom(odp_packet_hdr_t *pkt_hdr, int seg_idx) +static inline uint32_t seg_headroom(odp_packet_hdr_t *pkt_seg) { - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - odp_buffer_hdr_t *hdr = seg->hdr; + odp_buffer_hdr_t *hdr = &pkt_seg->buf_hdr; uint8_t *base = hdr->base_data; - uint8_t *head = seg->data; + uint8_t *head = pkt_seg->seg_data; return CONFIG_PACKET_HEADROOM + (head - base); } -static inline uint32_t seg_tailroom(odp_packet_hdr_t *pkt_hdr, int seg_idx) +static inline uint32_t seg_tailroom(odp_packet_hdr_t *pkt_seg) { - seg_entry_t *seg = seg_entry(pkt_hdr, seg_idx); - - odp_buffer_hdr_t *hdr = seg->hdr; - uint8_t *tail = seg->data + seg->len; + odp_buffer_hdr_t *hdr = &pkt_seg->buf_hdr; + uint8_t *tail = pkt_seg->seg_data + pkt_seg->seg_len; return hdr->buf_end - tail; } @@ -229,25 +155,25 @@ static inline void push_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom -= len; pkt_hdr->frame_len += len; - pkt_hdr->buf_hdr.seg[0].data -= len; - pkt_hdr->buf_hdr.seg[0].len += len; + pkt_hdr->seg_data -= len; + pkt_hdr->seg_len += len; } static inline void pull_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom += len; pkt_hdr->frame_len -= len; - pkt_hdr->buf_hdr.seg[0].data += len; - pkt_hdr->buf_hdr.seg[0].len -= len; + pkt_hdr->seg_data += len; + pkt_hdr->seg_len -= len; } static inline void push_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { - seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); pkt_hdr->tailroom -= len; pkt_hdr->frame_len += len; - last_seg->len += len; + last_seg->seg_len += len; } /* Copy all metadata for segmentation modification. Segment data and lengths @@ -273,39 +199,34 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr; /* segmentation data is not copied: - * buf_hdr.seg[] - * buf_hdr.segcount - * buf_hdr.num_seg - * buf_hdr.next_seg - * buf_hdr.last_seg + * seg_next + * seg_data + * seg_len + * seg_count */ } static inline void *packet_map(void *pkt_ptr, uint32_t offset, - uint32_t *seg_len, int *seg_idx) + uint32_t *seg_len, odp_packet_seg_t *seg) { void *addr; uint32_t len; odp_packet_hdr_t *pkt_hdr = pkt_ptr; - int seg_id = 0; - int seg_count = pkt_hdr->buf_hdr.segcount; + int seg_count = pkt_hdr->seg_count; if (odp_unlikely(offset >= pkt_hdr->frame_len)) return NULL; - if (odp_likely(CONFIG_PACKET_SEG_DISABLED || seg_count == 1)) { - addr = pkt_hdr->buf_hdr.seg[0].data + offset; - len = pkt_hdr->buf_hdr.seg[0].len - offset; + if (odp_likely(seg_count == 1)) { + addr = pkt_hdr->seg_data + offset; + len = pkt_hdr->seg_len - offset; } else { - int i; - seg_entry_t *seg = NULL; + odp_packet_hdr_t *next_hdr = pkt_hdr; uint32_t seg_start = 0, seg_end = 0; - odp_packet_hdr_t *hdr = pkt_hdr; - uint8_t idx = 0; - for (i = 0; i < seg_count; i++) { - seg = seg_entry_next(&hdr, &idx); - seg_end += seg->len; + while (next_hdr != NULL) { + pkt_hdr = packet_seg_step(&next_hdr); + seg_end += pkt_hdr->seg_len; if (odp_likely(offset < seg_end)) break; @@ -313,16 +234,15 @@ static inline void *packet_map(void *pkt_ptr, uint32_t offset, seg_start = seg_end; } - addr = seg->data + (offset - seg_start); - len = seg->len - (offset - seg_start); - seg_id = i; + addr = pkt_hdr->seg_data + (offset - seg_start); + len = pkt_hdr->seg_len - (offset - seg_start); } if (seg_len) *seg_len = len; - if (seg_idx) - *seg_idx = seg_id; + if (seg) + *seg = packet_hdr_to_seg(pkt_hdr); return addr; } @@ -332,9 +252,9 @@ static inline void *packet_map(void *pkt_ptr, uint32_t offset, /* This file uses the inlined version directly. Inlined API calls use this when * offset does not point to the first segment. */ void *_odp_packet_map(void *pkt_ptr, uint32_t offset, uint32_t *seg_len, - int *seg_idx) + odp_packet_seg_t *seg) { - return packet_map(pkt_ptr, offset, seg_len, seg_idx); + return packet_map(pkt_ptr, offset, seg_len, seg); } int _odp_packet_copy_from_mem_seg(odp_packet_t pkt, uint32_t offset, @@ -399,46 +319,38 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) { - int cur, i; + int cur = 0; odp_packet_hdr_t *hdr; odp_packet_hdr_t *head = pkt_hdr[0]; uint32_t seg_len = ((pool_t *)(head->buf_hdr.pool_ptr))->seg_len; - cur = 0; - while (1) { - hdr = pkt_hdr[cur]; + odp_buffer_hdr_t *buf_hdr = &pkt_hdr[cur]->buf_hdr; - for (i = 0; i < CONFIG_PACKET_SEGS_PER_HDR; i++) { - odp_buffer_hdr_t *buf_hdr; + hdr = pkt_hdr[cur]; + hdr->seg_data = buf_hdr->base_data; + hdr->seg_len = seg_len; - buf_hdr = &pkt_hdr[cur]->buf_hdr; - hdr->buf_hdr.seg[i].hdr = buf_hdr; - hdr->buf_hdr.seg[i].data = buf_hdr->base_data; - hdr->buf_hdr.seg[i].len = seg_len; + /* init_segments() handles first seg ref_cnt init */ + if (ODP_DEBUG == 1 && cur > 0) { + uint32_t prev_ref; + odp_atomic_u32_t *ref_cnt; - /* init_segments() handles first seg ref_cnt init */ - if (ODP_DEBUG == 1 && cur > 0) { - uint32_t prev_ref = - odp_atomic_fetch_inc_u32( - &pkt_hdr[cur]->buf_hdr.ref_cnt); + ref_cnt = &pkt_hdr[cur]->buf_hdr.ref_cnt; + prev_ref = odp_atomic_fetch_inc_u32(ref_cnt); - ODP_ASSERT(prev_ref == 0); - } + ODP_ASSERT(prev_ref == 0); + } - cur++; + cur++; - if (cur == num) { - /* Last segment */ - hdr->buf_hdr.num_seg = i + 1; - hdr->buf_hdr.next_seg = NULL; - head->buf_hdr.last_seg = &hdr->buf_hdr; - return; - } + if (cur == num) { + /* Last segment */ + hdr->seg_next = NULL; + return; } - hdr->buf_hdr.num_seg = CONFIG_PACKET_SEGS_PER_HDR; - hdr->buf_hdr.next_seg = pkt_hdr[cur]; + hdr->seg_next = pkt_hdr[cur]; } } @@ -452,8 +364,11 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len; /* Defaults for single segment packet */ - hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; - hdr->buf_hdr.seg[0].len = seg_len; + hdr->seg_data = hdr->buf_hdr.base_data; + hdr->seg_len = seg_len; + hdr->seg_next = NULL; + + hdr->seg_count = num; if (ODP_DEBUG == 1) { uint32_t prev_ref = @@ -462,46 +377,32 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) ODP_ASSERT(prev_ref == 0); } - if (!CONFIG_PACKET_SEG_DISABLED) { - hdr->buf_hdr.segcount = num; - hdr->buf_hdr.num_seg = 1; - hdr->buf_hdr.next_seg = NULL; - hdr->buf_hdr.last_seg = &hdr->buf_hdr; - - /* Link segments */ - if (odp_unlikely(num > 1)) - link_segments(pkt_hdr, num); - } + /* Link segments */ + if (odp_unlikely(num > 1)) + link_segments(pkt_hdr, num); } -static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) +static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int num) { odp_packet_hdr_t *hdr = pkt_hdr; void *base; int i; - seg_entry_t *seg; uint32_t seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len; - uint8_t idx; - - seg_entry_find_idx(&hdr, &idx, first); for (i = 0; i < num; i++) { base = hdr->buf_hdr.base_data; - seg = seg_entry_next(&hdr, &idx); - seg->len = seg_len; - seg->data = base; + + hdr->seg_len = seg_len; + hdr->seg_data = base; + + hdr = hdr->seg_next; } } /* Calculate the number of segments */ static inline int num_segments(uint32_t len, uint32_t seg_len) { - int num; - - if (CONFIG_PACKET_SEG_DISABLED) - return 1; - - num = 1; + int num = 1; if (odp_unlikely(len > seg_len)) { num = len / seg_len; @@ -515,11 +416,10 @@ static inline int num_segments(uint32_t len, uint32_t seg_len) static inline void add_all_segs(odp_packet_hdr_t *to, odp_packet_hdr_t *from) { - odp_packet_hdr_t *last = to->buf_hdr.last_seg; + odp_packet_hdr_t *last = packet_last_seg(to); - last->buf_hdr.next_seg = from; - to->buf_hdr.last_seg = from->buf_hdr.last_seg; - to->buf_hdr.segcount += from->buf_hdr.segcount; + last->seg_next = from; + to->seg_count += from->seg_count; } static inline odp_packet_hdr_t *alloc_segments(pool_t *pool, int num) @@ -561,8 +461,8 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, add_all_segs(new_hdr, pkt_hdr); /* adjust first segment length */ - new_hdr->buf_hdr.seg[0].data += offset; - new_hdr->buf_hdr.seg[0].len = seg_len; + new_hdr->seg_data += offset; + new_hdr->seg_len = seg_len; packet_seg_copy_md(new_hdr, pkt_hdr); new_hdr->frame_len = pkt_hdr->frame_len + len; @@ -571,14 +471,14 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, pkt_hdr = new_hdr; } else { - seg_entry_t *last_seg; + odp_packet_hdr_t *last_seg; /* add into the tail */ add_all_segs(pkt_hdr, new_hdr); /* adjust last segment length */ - last_seg = seg_entry_last(pkt_hdr); - last_seg->len = seg_len; + last_seg = packet_last_seg(pkt_hdr); + last_seg->seg_len = seg_len; pkt_hdr->frame_len += len; pkt_hdr->tailroom = pool->tailroom + offset; @@ -587,13 +487,6 @@ static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, return pkt_hdr; } -static inline int seg_is_link(void *hdr) -{ - odp_packet_hdr_t *pkt_hdr = hdr; - - return pkt_hdr != pkt_hdr->buf_hdr.seg[0].hdr; -} - static inline void buffer_ref_inc(odp_buffer_hdr_t *buf_hdr) { uint32_t ref_cnt = odp_atomic_load_u32(&buf_hdr->ref_cnt); @@ -622,15 +515,11 @@ static inline int is_multi_ref(uint32_t ref_cnt) static inline void packet_ref_inc(odp_packet_hdr_t *pkt_hdr) { - seg_entry_t *seg; - int i; - int seg_count = pkt_hdr->buf_hdr.segcount; odp_packet_hdr_t *hdr = pkt_hdr; - uint8_t idx = 0; - for (i = 0; i < seg_count; i++) { - seg = seg_entry_next(&hdr, &idx); - buffer_ref_inc(seg->hdr); + while (hdr != NULL) { + buffer_ref_inc(&hdr->buf_hdr); + hdr = hdr->seg_next; } } @@ -653,10 +542,6 @@ static inline void packet_free_multi(odp_buffer_hdr_t *hdr[], int num) } } - /* Reset link header back to normal header */ - if (odp_unlikely(seg_is_link(hdr[i]))) - hdr[i]->seg[0].hdr = hdr[i]; - /* Skip references and pack to be freed headers to array head */ if (odp_unlikely(num_ref)) hdr[i - num_ref] = hdr[i]; @@ -672,35 +557,12 @@ static inline void packet_free_multi(odp_buffer_hdr_t *hdr[], int num) static inline void free_all_segments(odp_packet_hdr_t *pkt_hdr, int num) { int i; - odp_buffer_hdr_t *buf_hdr[num + 1]; - - if (odp_likely(pkt_hdr->buf_hdr.num_seg == num)) { - for (i = 0; i < num; i++) - buf_hdr[i] = pkt_hdr->buf_hdr.seg[i].hdr; - - if (odp_unlikely(seg_is_link(pkt_hdr))) { - buf_hdr[num] = &pkt_hdr->buf_hdr; - num++; - } - } else { - seg_entry_t *seg; - odp_buffer_hdr_t *link_hdr[num]; - uint8_t idx = 0; - int links = 0; - - for (i = 0; i < num; i++) { - /* Free also link headers */ - if (odp_unlikely(idx == 0 && seg_is_link(pkt_hdr))) { - link_hdr[links] = &pkt_hdr->buf_hdr; - links++; - } - - seg = seg_entry_next(&pkt_hdr, &idx); - buf_hdr[i] = seg->hdr; - } + odp_buffer_hdr_t *buf_hdr[num]; + odp_packet_hdr_t *seg = pkt_hdr; - if (odp_unlikely(links)) - packet_free_multi(link_hdr, links); + for (i = 0; i < num; i++) { + buf_hdr[i] = &seg->buf_hdr; + seg = seg->seg_next; } packet_free_multi(buf_hdr, num); @@ -710,65 +572,35 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, int num, uint32_t free_len, uint32_t pull_len, int head) { - seg_entry_t *seg; + odp_packet_hdr_t *seg; int i; - int num_remain = pkt_hdr->buf_hdr.segcount - num; + int num_remain = pkt_hdr->seg_count - num; odp_packet_hdr_t *hdr = pkt_hdr; - odp_packet_hdr_t *last_hdr = pkt_hdr->buf_hdr.last_seg; - uint8_t idx; - uint8_t num_seg; + odp_packet_hdr_t *last_hdr = packet_last_seg(pkt_hdr); odp_buffer_hdr_t *buf_hdr[num]; - odp_buffer_hdr_t *link_hdr[num]; - odp_packet_hdr_t *tmp_hdr; - int links = 0; if (head) { odp_packet_hdr_t *new_hdr; - idx = 0; for (i = 0; i < num; i++) { - tmp_hdr = hdr; - seg = seg_entry_next(&hdr, &idx); - buf_hdr[i] = seg->hdr; - - /* Free link headers, if those become empty */ - if (odp_unlikely(idx == 0 && seg_is_link(tmp_hdr))) { - link_hdr[links] = &tmp_hdr->buf_hdr; - links++; - } + seg = packet_seg_step(&hdr); + buf_hdr[i] = &seg->buf_hdr; } /* The first remaining header is the new packet descriptor. * Copy remaining segments from the last to-be-removed header * to the new header. */ - new_hdr = hdr->buf_hdr.seg[idx].hdr; - num_seg = hdr->buf_hdr.num_seg - idx; - - new_hdr->buf_hdr.next_seg = hdr->buf_hdr.next_seg; - - if (hdr == last_hdr) - new_hdr->buf_hdr.last_seg = new_hdr; - else - new_hdr->buf_hdr.last_seg = last_hdr; - - new_hdr->buf_hdr.num_seg = num_seg; - new_hdr->buf_hdr.segcount = num_remain; + new_hdr = hdr; - for (i = 0; i < num_seg; i++) { - seg = seg_entry_next(&hdr, &idx); - new_hdr->buf_hdr.seg[i] = *seg; - } + new_hdr->seg_next = hdr->seg_next; + new_hdr->seg_count = num_remain; packet_seg_copy_md(new_hdr, pkt_hdr); /* Tailroom not changed */ new_hdr->tailroom = pkt_hdr->tailroom; - /* Link header does not have headroom */ - if (seg_is_link(new_hdr)) - new_hdr->headroom = 0; - else - new_hdr->headroom = seg_headroom(new_hdr, 0); + new_hdr->headroom = seg_headroom(new_hdr); new_hdr->frame_len = pkt_hdr->frame_len - free_len; @@ -776,45 +608,29 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, pkt_hdr = new_hdr; - if (odp_unlikely(links)) - packet_free_multi(link_hdr, links); - packet_free_multi(buf_hdr, num); } else { /* Free last 'num' bufs. * First, find the last remaining header. */ - seg_entry_find_idx(&hdr, &idx, num_remain - 1); + packet_seg_find_idx(&hdr, num_remain - 1); last_hdr = hdr; - num_seg = idx + 1; - seg_entry_next(&hdr, &idx); + packet_seg_step(&hdr); for (i = 0; i < num; i++) { - tmp_hdr = hdr; - seg = seg_entry_next(&hdr, &idx); - buf_hdr[i] = seg->hdr; - - /* Free link headers, if those become empty */ - if (odp_unlikely(idx == 0 && seg_is_link(tmp_hdr))) { - link_hdr[links] = &tmp_hdr->buf_hdr; - links++; - } + seg = packet_seg_step(&hdr); + buf_hdr[i] = &seg->buf_hdr; } - if (odp_unlikely(links)) - packet_free_multi(link_hdr, links); - packet_free_multi(buf_hdr, num); /* Head segment remains, no need to copy or update majority * of the metadata. */ - last_hdr->buf_hdr.num_seg = num_seg; - last_hdr->buf_hdr.next_seg = NULL; + last_hdr->seg_next = NULL; - pkt_hdr->buf_hdr.last_seg = last_hdr; - pkt_hdr->buf_hdr.segcount = num_remain; + pkt_hdr->seg_count = num_remain; pkt_hdr->frame_len -= free_len; - pkt_hdr->tailroom = seg_tailroom(pkt_hdr, num_remain - 1); + pkt_hdr->tailroom = seg_tailroom(pkt_hdr); pull_tail(pkt_hdr, pull_len); } @@ -923,22 +739,14 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, void odp_packet_free(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - int num_seg = pkt_hdr->buf_hdr.segcount; + int num_seg = pkt_hdr->seg_count; ODP_ASSERT(buffer_ref(&pkt_hdr->buf_hdr) > 0); - if (odp_likely(CONFIG_PACKET_SEG_DISABLED || num_seg == 1)) { - odp_buffer_hdr_t *buf_hdr[2]; - int num = 1; - - buf_hdr[0] = &pkt_hdr->buf_hdr; + if (odp_likely(num_seg == 1)) { + odp_buffer_hdr_t *buf_hdr = &pkt_hdr->buf_hdr; - if (odp_unlikely(seg_is_link(pkt_hdr))) { - num = 2; - buf_hdr[1] = pkt_hdr->buf_hdr.seg[0].hdr; - } - - packet_free_multi(buf_hdr, num); + packet_free_multi(&buf_hdr, 1); } else { free_all_segments(pkt_hdr, num_seg); } @@ -954,7 +762,7 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) for (i = 0; i < num; i++) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt[i]); - int num_seg = pkt_hdr->buf_hdr.segcount; + int num_seg = pkt_hdr->seg_count; ODP_ASSERT(buffer_ref(&pkt_hdr->buf_hdr) > 0); @@ -964,11 +772,6 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) continue; } - if (odp_unlikely(seg_is_link(pkt_hdr))) { - buf_hdr2[links] = pkt_hdr->buf_hdr.seg[0].hdr; - links++; - } - buf_hdr[i - num_freed] = &pkt_hdr->buf_hdr; } @@ -988,12 +791,12 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; - int num = pkt_hdr->buf_hdr.segcount; + int num = pkt_hdr->seg_count; if (odp_unlikely(len > (pool->seg_len * num))) return -1; - reset_seg(pkt_hdr, 0, num); + reset_seg(pkt_hdr, num); packet_init(pkt_hdr, len); @@ -1033,7 +836,7 @@ uint32_t odp_packet_buf_len(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; - return pool->max_seg_len * pkt_hdr->buf_hdr.segcount; + return pool->max_seg_len * pkt_hdr->seg_count; } void *odp_packet_tail(odp_packet_t pkt) @@ -1117,7 +920,7 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, if (len < seg_len) { pull_head(pkt_hdr, len); - } else if (!CONFIG_PACKET_SEG_DISABLED) { + } else { int num = 0; uint32_t pull_len = 0; @@ -1198,11 +1001,11 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + odp_packet_hdr_t *last_seg = packet_last_seg(pkt_hdr); ODP_ASSERT(odp_packet_has_ref(pkt) == 0); - if (len > last_seg->len) + if (len > last_seg->seg_len) return NULL; pull_tail(pkt_hdr, len); @@ -1215,7 +1018,7 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, { int last; uint32_t seg_len; - seg_entry_t *last_seg; + odp_packet_hdr_t *last_seg; odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); if (len > pkt_hdr->frame_len) @@ -1223,16 +1026,17 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); - last = packet_last_seg(pkt_hdr); - last_seg = seg_entry_last(pkt_hdr); - seg_len = last_seg->len; + last = pkt_hdr->seg_count - 1; + last_seg = packet_last_seg(pkt_hdr); + seg_len = last_seg->seg_len; if (len < seg_len) { pull_tail(pkt_hdr, len); - } else if (!CONFIG_PACKET_SEG_DISABLED) { + } else { int num = 0; uint32_t pull_len = 0; + /* Reverse order */ while (seg_len <= len) { pull_len = len - seg_len; num++; @@ -1253,12 +1057,9 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, odp_packet_seg_t *seg) { - int seg_idx; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - void *addr = packet_map(pkt_hdr, offset, len, &seg_idx); - if (addr != NULL && seg != NULL) - *seg = _odp_packet_seg_from_ndx(seg_idx); + void *addr = packet_map(pkt_hdr, offset, len, seg); return addr; } @@ -1388,26 +1189,35 @@ void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) * */ -void *odp_packet_seg_data(odp_packet_t pkt, odp_packet_seg_t seg) +void *odp_packet_seg_data(odp_packet_t pkt ODP_UNUSED, odp_packet_seg_t seg) { - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); - if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - pkt_hdr->buf_hdr.segcount)) - return NULL; + return seg_hdr->seg_data; +} - return packet_seg_data(pkt_hdr, _odp_packet_seg_to_ndx(seg)); +uint32_t odp_packet_seg_data_len(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); + + return seg_hdr->seg_len; } -uint32_t odp_packet_seg_data_len(odp_packet_t pkt, odp_packet_seg_t seg) +odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + return (odp_packet_seg_t)packet_last_seg(packet_hdr(pkt)); +} - if (odp_unlikely(_odp_packet_seg_to_ndx(seg) >= - pkt_hdr->buf_hdr.segcount)) - return 0; +odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt ODP_UNUSED, + odp_packet_seg_t seg) +{ + odp_packet_hdr_t *pkt_hdr = packet_seg_to_hdr(seg); + + if (odp_unlikely(pkt_hdr->seg_next == NULL)) + return ODP_PACKET_SEG_INVALID; - return packet_seg_len(pkt_hdr, _odp_packet_seg_to_ndx(seg)); + return (odp_packet_seg_t)pkt_hdr->seg_next; } /* @@ -1778,10 +1588,7 @@ static int packet_print_input_flags(odp_packet_hdr_t *hdr, char *str, int max) void odp_packet_print(odp_packet_t pkt) { odp_packet_seg_t seg; - seg_entry_t *seg_entry; - odp_packet_hdr_t *seg_hdr; - uint8_t idx; - int max_len = 1024; + int max_len = 4096; char str[max_len]; int len = 0; int n = max_len - 1; @@ -1819,32 +1626,27 @@ void odp_packet_print(odp_packet_t pkt) len += snprintf(&str[len], n - len, " num_segs %i\n", odp_packet_num_segs(pkt)); - seg_hdr = hdr; - idx = 0; seg = odp_packet_first_seg(pkt); while (seg != ODP_PACKET_SEG_INVALID) { - odp_buffer_hdr_t *buf_hdr; - odp_packet_hdr_t *tmp_hdr; - - tmp_hdr = seg_hdr; - seg_entry = seg_entry_next(&seg_hdr, &idx); - buf_hdr = seg_entry->hdr; - - len += snprintf(&str[len], n - len, - " seg_len %-4" PRIu32 " seg_data %p ", - odp_packet_seg_data_len(pkt, seg), - odp_packet_seg_data(pkt, seg)); - len += snprintf(&str[len], n - len, "ref_cnt %u", - buffer_ref(buf_hdr)); - if (seg_is_link(tmp_hdr)) { - uint32_t ref; - - ref = buffer_ref(&tmp_hdr->buf_hdr); - len += snprintf(&str[len], n - len, "L(%u)\n", ref); - } else { - len += snprintf(&str[len], n - len, "\n"); + odp_packet_hdr_t *seg_hdr = packet_seg_to_hdr(seg); + odp_buffer_hdr_t *buf_hdr = &seg_hdr->buf_hdr; + char seg_str[max_len]; + int str_len; + + str_len = snprintf(&seg_str[0], max_len, + " seg_len %-4" PRIu32 " seg_data %p " + "ref_cnt %u\n", + odp_packet_seg_data_len(pkt, seg), + odp_packet_seg_data(pkt, seg), + buffer_ref(buf_hdr)); + + /* Prevent print buffer overflow */ + if (n - len - str_len < 10) { + len += snprintf(&str[len], n - len, " ...\n"); + break; } + len += snprintf(&str[len], n - len, "%s", seg_str); seg = odp_packet_next_seg(pkt, seg); } @@ -1872,7 +1674,7 @@ void odp_packet_print_data(odp_packet_t pkt, uint32_t offset, " buf index %" PRIu32 "\n", hdr->buf_hdr.index.buffer); len += snprintf(&str[len], n - len, - " segcount %" PRIu16 "\n", hdr->buf_hdr.segcount); + " seg_count %" PRIu16 "\n", hdr->seg_count); len += snprintf(&str[len], n - len, " data len %" PRIu32 "\n", data_len); len += snprintf(&str[len], n - len, @@ -2953,90 +2755,25 @@ odp_packet_t odp_packet_ref_static(odp_packet_t pkt) odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset) { - odp_packet_t ref; - odp_packet_hdr_t *link_hdr; - odp_packet_hdr_t *next_hdr; - odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - odp_packet_hdr_t *hdr = pkt_hdr; - seg_entry_t *seg; - uint32_t seg_idx = 0; - uint8_t idx = 0; - uint32_t seg_offset = 0; - int i, num_copy, segcount; - uint32_t len; + odp_packet_t new; + int ret; - if (offset >= pkt_hdr->frame_len) { - ODP_DBG("offset too large\n"); - return ODP_PACKET_INVALID; - } + new = odp_packet_copy(pkt, odp_packet_pool(pkt)); - /* Allocate link segment */ - if (packet_alloc(pkt_hdr->buf_hdr.pool_ptr, 0, 1, 1, &ref) != 1) { - ODP_DBG("segment alloc failed\n"); + if (new == ODP_PACKET_INVALID) { + ODP_ERR("copy failed\n"); return ODP_PACKET_INVALID; } - link_hdr = packet_hdr(ref); - - seg_entry_find_offset(&hdr, &idx, &seg_offset, &seg_idx, offset); - num_copy = hdr->buf_hdr.num_seg - idx; - segcount = pkt_hdr->buf_hdr.segcount; - - /* In addition to segments, update reference count of - * an existing link header. */ - if (seg_is_link(hdr)) - buffer_ref_inc((odp_buffer_hdr_t *)hdr); - - seg = seg_entry_next(&hdr, &idx); - link_hdr->buf_hdr.num_seg = 1; - link_hdr->buf_hdr.seg[0].hdr = seg->hdr; - link_hdr->buf_hdr.seg[0].data = seg->data + seg_offset; - link_hdr->buf_hdr.seg[0].len = seg->len - seg_offset; - buffer_ref_inc(seg->hdr); + ret = odp_packet_trunc_head(&new, offset, NULL, NULL); - /* The 'CONFIG_PACKET_SEGS_PER_HDR > 1' condition is required to fix an - * invalid error ('array subscript is above array bounds') thrown by - * gcc (5.4.0). */ - for (i = 1; CONFIG_PACKET_SEGS_PER_HDR > 1 && i < num_copy; i++) { - /* Update link header reference count */ - if (idx == 0 && seg_is_link(hdr)) - buffer_ref_inc((odp_buffer_hdr_t *)hdr); - - seg = seg_entry_next(&hdr, &idx); - - link_hdr->buf_hdr.num_seg++; - link_hdr->buf_hdr.seg[i].hdr = seg->hdr; - link_hdr->buf_hdr.seg[i].data = seg->data; - link_hdr->buf_hdr.seg[i].len = seg->len; - buffer_ref_inc(seg->hdr); - } - - next_hdr = hdr; - - /* Increment ref count for remaining segments */ - for (i = seg_idx + num_copy; i < segcount; i++) { - /* Update link header reference count */ - if (idx == 0 && seg_is_link(hdr)) - buffer_ref_inc((odp_buffer_hdr_t *)hdr); - - seg = seg_entry_next(&hdr, &idx); - buffer_ref_inc(seg->hdr); + if (ret < 0) { + ODP_ERR("trunk_head failed\n"); + odp_packet_free(new); + return ODP_PACKET_INVALID; } - len = pkt_hdr->frame_len - offset; - link_hdr->buf_hdr.next_seg = next_hdr; - link_hdr->buf_hdr.last_seg = pkt_hdr->buf_hdr.last_seg; - link_hdr->buf_hdr.segcount = segcount - seg_idx; - link_hdr->frame_len = len; - link_hdr->tailroom = pkt_hdr->tailroom; - - /* Link header does not have headroom, it just points to other - * buffers. Zero length headroom ensures that head of the other buffer - * is not pushed through a reference. */ - link_hdr->headroom = 0; - - return ref; - + return new; } odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, @@ -3066,21 +2803,18 @@ odp_packet_t odp_packet_ref_pkt(odp_packet_t pkt, uint32_t offset, int odp_packet_has_ref(odp_packet_t pkt) { odp_buffer_hdr_t *buf_hdr; - seg_entry_t *seg; - int i; - uint32_t ref_cnt; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - int seg_count = pkt_hdr->buf_hdr.segcount; - odp_packet_hdr_t *hdr = pkt_hdr; - uint8_t idx = 0; + uint32_t ref_cnt; + + while (pkt_hdr != NULL) { + buf_hdr = &pkt_hdr->buf_hdr; - for (i = 0; i < seg_count; i++) { - seg = seg_entry_next(&hdr, &idx); - buf_hdr = seg->hdr; ref_cnt = buffer_ref(buf_hdr); if (is_multi_ref(ref_cnt)) return 1; + + pkt_hdr = pkt_hdr->seg_next; } return 0; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 17504a2a7..e98027eb6 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2019, Nokia - * Copyright (c) 2013-2018, Linaro Limited +/* Copyright (c) 2013-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -410,20 +410,19 @@ static void init_buffers(pool_t *pool) buf_hdr->event_type = type; buf_hdr->pool_ptr = pool; buf_hdr->uarea_addr = uarea; - buf_hdr->segcount = 1; - buf_hdr->num_seg = 1; - buf_hdr->next_seg = NULL; - buf_hdr->last_seg = buf_hdr; - /* Pointer to data start (of the first segment) */ - buf_hdr->seg[0].hdr = buf_hdr; - buf_hdr->seg[0].data = &data[offset]; - buf_hdr->seg[0].len = pool->seg_len; + /* Initialize segmentation metadata */ + if (type == ODP_POOL_PACKET) { + pkt_hdr->seg_data = &data[offset]; + pkt_hdr->seg_len = pool->seg_len; + pkt_hdr->seg_count = 1; + pkt_hdr->seg_next = NULL; + } odp_atomic_init_u32(&buf_hdr->ref_cnt, 0); /* Store base values for fast init */ - buf_hdr->base_data = buf_hdr->seg[0].data; + buf_hdr->base_data = &data[offset]; buf_hdr->buf_end = &data[offset + pool->seg_len + pool->tailroom]; @@ -512,9 +511,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, * pool. */ if (params->pkt.max_len != 0) max_len = params->pkt.max_len; - if ((max_len + seg_len - 1) / seg_len > CONFIG_PACKET_MAX_SEGS) - seg_len = (max_len + CONFIG_PACKET_MAX_SEGS - 1) / - CONFIG_PACKET_MAX_SEGS; + if ((max_len + seg_len - 1) / seg_len > PKT_MAX_SEGS) + seg_len = (max_len + PKT_MAX_SEGS - 1) / PKT_MAX_SEGS; if (seg_len > CONFIG_PACKET_MAX_SEG_LEN) { ODP_ERR("Pool unable to store 'max_len' packet"); return ODP_POOL_INVALID; @@ -1068,7 +1066,7 @@ int odp_pool_capability(odp_pool_capability_t *capa) capa->pkt.min_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.max_headroom = CONFIG_PACKET_HEADROOM; capa->pkt.min_tailroom = CONFIG_PACKET_TAILROOM; - capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS; + capa->pkt.max_segs_per_pkt = PKT_MAX_SEGS; capa->pkt.min_seg_len = CONFIG_PACKET_SEG_LEN_MIN; capa->pkt.max_seg_len = max_seg_len; capa->pkt.max_uarea_size = MAX_SIZE; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index c38747d3c..cc0a4368c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -1,4 +1,5 @@ /* Copyright (c) 2016-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -233,8 +234,7 @@ static unsigned cache_size(uint32_t num) static inline uint16_t mbuf_data_off(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr) { - return (uintptr_t)pkt_hdr->buf_hdr.seg[0].data - - (uintptr_t)mbuf->buf_addr; + return (uintptr_t)pkt_hdr->seg_data - (uintptr_t)mbuf->buf_addr; } /** @@ -250,8 +250,7 @@ static inline void mbuf_update(struct rte_mbuf *mbuf, odp_packet_hdr_t *pkt_hdr, mbuf->refcnt = 1; mbuf->ol_flags = 0; - if (odp_unlikely(pkt_hdr->buf_hdr.base_data != - pkt_hdr->buf_hdr.seg[0].data)) + if (odp_unlikely(pkt_hdr->buf_hdr.base_data != pkt_hdr->seg_data)) mbuf->data_off = mbuf_data_off(mbuf, pkt_hdr); } @@ -876,7 +875,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, /* Init buffer segments. Currently, only single segment packets * are supported. */ - pkt_hdr->buf_hdr.seg[0].data = data; + pkt_hdr->seg_data = data; packet_init(pkt_hdr, pkt_len); pkt_hdr->input = input; @@ -927,7 +926,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, if (odp_unlikely(pkt_len > pkt_dpdk->mtu)) goto fail; - if (odp_likely(pkt_hdr->buf_hdr.segcount == 1)) { + if (odp_likely(pkt_hdr->seg_count == 1)) { mbuf_update(mbuf, pkt_hdr, pkt_len); if (odp_unlikely(pktio_entry->s.chksum_insert_ena)) @@ -1919,7 +1918,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt = pkt_table[i]; odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); - if (pkt_hdr->buf_hdr.segcount > 1) { + if (pkt_hdr->seg_count > 1) { if (odp_likely(i < tx_pkts)) odp_packet_free(pkt); else diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 45d95bc11..1090d760c 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -685,7 +685,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, offsets[i] = (uint8_t *)pkt_hdr - (uint8_t *)odp_shm_addr(pool->shm); - data_pool_off = (uint8_t *)pkt_hdr->buf_hdr.seg[0].data - + data_pool_off = (uint8_t *)pkt_hdr->seg_data - (uint8_t *)odp_shm_addr(pool->shm); /* compile all function code even if ipc disabled with config */ diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index a6b399b50..76fee0ad7 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -216,7 +216,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_time_t *ts = NULL; const int sockfd = pkt_sock->sockfd; struct mmsghdr msgvec[num]; - struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; + struct iovec iovecs[num][PKT_MAX_SEGS]; int nb_rx = 0; int nb_pkts; int recv_msgs; @@ -421,7 +421,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, { pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); struct mmsghdr msgvec[num]; - struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; + struct iovec iovecs[num][PKT_MAX_SEGS]; int ret; int sockfd = pkt_sock->sockfd; int i; commit 916bfae5098242dd7e5121c789b1dbe20c8453ea Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Sep 25 14:57:24 2019 +0300 linux-gen: packet: check resulting packet length in odp_packet_concat() Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 4518706f0..a785ecef9 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -1533,6 +1533,11 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) ODP_ASSERT(odp_packet_has_ref(*dst) == 0); + if (odp_unlikely(dst_len + src_len > dst_pool->max_len)) { + ODP_ERR("concat would result oversized packet\n"); + return -1; + } + /* Do a copy if packets are from different pools. */ if (odp_unlikely(dst_pool != src_pool)) { if (odp_packet_extend_tail(dst, src_len, NULL, NULL) >= 0) { commit 65e5ee3c37c28a9365385516e5279f917a6ff41a Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Sep 25 17:04:06 2019 +0300 validation: packet: initialize output variable of odp_packet_offset() Fixes invalid variable may be used uninitialized error. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index a12ad13eb..b3001693c 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -1383,7 +1384,8 @@ static void packet_test_copy(void) odp_packet_t pkt; odp_packet_t pkt_copy, pkt_part; odp_pool_t pool; - uint32_t i, plen, seg_len, src_offset, dst_offset; + uint32_t i, plen, src_offset, dst_offset; + uint32_t seg_len = 0; void *pkt_data; pkt = odp_packet_copy(test_packet, packet_pool_no_uarea); @@ -1462,7 +1464,7 @@ static void packet_test_copy(void) /* Test segment crossing if we support segments */ pkt_data = odp_packet_offset(pkt, 0, &seg_len, NULL); - CU_ASSERT(pkt_data != NULL); + CU_ASSERT_FATAL(pkt_data != NULL); if (seg_len < plen) { src_offset = seg_len - 15; @@ -2166,7 +2168,8 @@ static void packet_test_extend_ref(void) static void packet_test_align(void) { odp_packet_t pkt; - uint32_t pkt_len, seg_len, offset, aligned_seglen; + uint32_t pkt_len, offset; + uint32_t seg_len = 0, aligned_seglen = 0; void *pkt_data, *aligned_data; const uint32_t max_align = 32; @@ -2224,7 +2227,8 @@ static void packet_test_align(void) static void packet_test_offset(void) { odp_packet_t pkt = test_packet; - uint32_t seg_len, full_seg_len; + uint32_t seg_len = 0; + uint32_t full_seg_len; uint8_t *ptr, *start_ptr; uint32_t offset; odp_packet_seg_t seg = ODP_PACKET_SEG_INVALID; ----------------------------------------------------------------------- Summary of changes: config/odp-linux-generic.conf | 5 +- .../linux-generic/include-abi/odp/api/abi/packet.h | 18 +- .../include/odp/api/plat/packet_inline_types.h | 6 +- .../include/odp/api/plat/packet_inlines.h | 49 +- .../linux-generic/include/odp_buffer_internal.h | 59 +- .../linux-generic/include/odp_config_internal.h | 16 +- platform/linux-generic/include/odp_packet_dpdk.h | 5 +- .../linux-generic/include/odp_packet_internal.h | 68 +- platform/linux-generic/odp_buffer.c | 5 +- platform/linux-generic/odp_packet.c | 704 +++++++-------------- platform/linux-generic/odp_pool.c | 28 +- platform/linux-generic/pktio/dpdk.c | 36 +- platform/linux-generic/pktio/ipc.c | 2 +- platform/linux-generic/pktio/socket.c | 4 +- platform/linux-generic/test/inline-timer.conf | 2 +- platform/linux-generic/test/process-mode.conf | 2 +- test/validation/api/packet/packet.c | 12 +- 17 files changed, 367 insertions(+), 654 deletions(-) hooks/post-receive --

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-264-gf0f83828a

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 f0f83828a483f90edcf320ec2cf0107cb1e9362e (commit) via 446476b61b1b747cd1e78bcbc2ce8a8a1949a41b (commit) via e47683d428084f9cacf72f1691d30b96c53804c1 (commit) via ce35815639996bb2832c298c7d5d40eff6c175d0 (commit) via 66e459c9f841932818acd423ddeda65f2ad1c2de (commit) via 0b63c8154a779ba20010bcd9ae7ee6bf610d755b (commit) via e7117fb0ecc8440dd1b8ef5845b14c82cd2f2ace (commit) via 95eb732efd42e889e280120f504c4c3e50348cab (commit) from e30d10a42db4083b53c5a85ee91d3bcda1bb80db (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 f0f83828a483f90edcf320ec2cf0107cb1e9362e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 21 16:55:28 2019 +0300 linux-gen: cls: fix vlan match bugs and tests Vlan_id_0, vlan_id_x and ethtype_x implementation required packets to be VLAN qinq, while those could be also single VLAN packets. Vlan_id_x matched always against outter VLAN, while it should match against the inner most VLAN. PMR test code generated always VLAN qinq packets, also when not needed. Ethtype_x test did set wrong inner most ethernet type. Corrected mask sizes in VLAN and ethtype_x tests (0xfff for VLAN ID, 0xffff for ethernet type). Removed erroneous comments about packet length. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 93e086e84..907d68481 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -942,7 +942,7 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, uint16_t tci; uint16_t vlan_id; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!packet_hdr_has_eth(pkt_hdr) || !pkt_hdr->p.input_flags.vlan) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); @@ -956,21 +956,24 @@ static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, return 0; } -static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) +static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) { const _odp_ethhdr_t *eth; const _odp_vlanhdr_t *vlan; uint16_t tci; uint16_t vlan_id; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!pkt_hdr->p.input_flags.vlan && !pkt_hdr->p.input_flags.vlan_qinq) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); - vlan++; + + if (pkt_hdr->p.input_flags.vlan_qinq) + vlan++; + tci = odp_be_to_cpu_16(vlan->tci); vlan_id = tci & 0x0fff; @@ -1061,11 +1064,15 @@ static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, uint16_t ethtype; const _odp_vlanhdr_t *vlan; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!pkt_hdr->p.input_flags.vlan && !pkt_hdr->p.input_flags.vlan_qinq) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); vlan = (const _odp_vlanhdr_t *)(eth + 1); + + if (pkt_hdr->p.input_flags.vlan_qinq) + vlan++; + ethtype = odp_be_to_cpu_16(vlan->type); if (term_value->match.value == (ethtype & term_value->match.mask)) diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index c8cf0077d..a01c0a403 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1059,8 +1059,8 @@ static void classification_test_pmr_term_vlan_id_0(void) odph_vlanhdr_t *vlan_0; cls_packet_info_t pkt_info; - val = 1024; - mask = 0xff00; + val = 0x123; + mask = 0xfff; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1095,10 +1095,8 @@ static void classification_test_pmr_term_vlan_id_0(void) pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT(pmr != ODP_PMR_INVALID); - /* create packet of payload length 1024 */ pkt_info = default_pkt_info; pkt_info.vlan = true; - pkt_info.vlan_qinq = true; pkt = create_packet(pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); @@ -1107,7 +1105,7 @@ static void classification_test_pmr_term_vlan_id_0(void) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_0 = (odph_vlanhdr_t *)(eth + 1); - vlan_0->tci = odp_cpu_to_be_16(1024); + vlan_0->tci = odp_cpu_to_be_16(val); enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); @@ -1172,8 +1170,8 @@ static void classification_test_pmr_term_vlan_id_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 1024; - mask = 0xff00; + val = 0x345; + mask = 0xfff; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1208,7 +1206,6 @@ static void classification_test_pmr_term_vlan_id_x(void) pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT(pmr != ODP_PMR_INVALID); - /* create packet of payload length 1024 */ pkt_info = default_pkt_info; pkt_info.vlan = true; pkt_info.vlan_qinq = true; @@ -1221,7 +1218,7 @@ static void classification_test_pmr_term_vlan_id_x(void) odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_x = (odph_vlanhdr_t *)(eth + 1); vlan_x++; - vlan_x->tci = odp_cpu_to_be_16(1024); + vlan_x->tci = odp_cpu_to_be_16(val); enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); @@ -1394,8 +1391,8 @@ static void classification_test_pmr_term_eth_type_x(void) odph_vlanhdr_t *vlan_x; cls_packet_info_t pkt_info; - val = 0x8100; - mask = 0xff00; + val = 0x0800; + mask = 0xffff; seqno = 0; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1430,7 +1427,6 @@ static void classification_test_pmr_term_eth_type_x(void) pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT(pmr != ODP_PMR_INVALID); - /* create packet of payload length 1024 */ pkt_info = default_pkt_info; pkt_info.vlan = true; pkt_info.vlan_qinq = true; @@ -1442,7 +1438,10 @@ static void classification_test_pmr_term_eth_type_x(void) odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); vlan_x = (odph_vlanhdr_t *)(eth + 1); - vlan_x->tci = odp_cpu_to_be_16(1024); + vlan_x++; + vlan_x->tci = odp_cpu_to_be_16(0x123); + vlan_x->type = odp_cpu_to_be_16(val); + enqueue_pktio_interface(pkt, pktio); pkt = receive_packet(&retqueue, ODP_TIME_SEC_IN_NS); commit 446476b61b1b747cd1e78bcbc2ce8a8a1949a41b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 21 14:32:51 2019 +0300 linux-gen: dpdk: check supported ptypes in L2 parse DPDK ethernet devices do not support all ptype flags, but usually only a subset (e.g. i40e does not support RTE_PTYPE_L2_ETHER_VLAN by default). Save supported ptypes of L2 and trust only those types that are supported. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 1b660babf..2b6b859c4 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -16,6 +16,15 @@ struct rte_mbuf; +/* Flags for pkt_dpdk_t.supported_ptypes */ +#define PTYPE_VLAN 0x01 +#define PTYPE_VLAN_QINQ 0x02 +#define PTYPE_ARP 0x04 +#define PTYPE_IPV4 0x08 +#define PTYPE_IPV6 0x10 +#define PTYPE_UDP 0x20 +#define PTYPE_TCP 0x40 + /** * Calculate size of zero-copy DPDK packet pool object */ @@ -33,11 +42,13 @@ int _odp_dpdk_packet_parse_common(packet_parser_t *pkt_hdr, uint32_t seg_len, struct rte_mbuf *mbuf, int layer, + uint32_t supported_ptypes, odp_pktin_config_opt_t pktin_cfg); static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, struct rte_mbuf *mbuf, odp_pktio_parser_layer_t layer, + uint32_t supported_ptypes, odp_pktin_config_opt_t pktin_cfg) { uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len; @@ -45,6 +56,7 @@ static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr, return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len, seg_len, mbuf, - layer, pktin_cfg); + layer, supported_ptypes, + pktin_cfg); } #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 593f02813..c38747d3c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -113,6 +113,8 @@ typedef struct ODP_ALIGNED_CACHE { uint32_t data_room; /**< maximum packet length */ unsigned int min_rx_burst; /**< minimum RX burst size */ odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */ + /* Supported RTE_PTYPE_XXX flags in a mask */ + uint32_t supported_ptypes; uint16_t mtu; /**< maximum transmission unit */ uint16_t port_id; /**< DPDK port identifier */ /** Use system call to get/set vdev promisc mode */ @@ -533,15 +535,16 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf; void *data; int i, j; - int nb_pkts = 0; int alloc_len, num; - odp_pool_t pool = pkt_priv(pktio_entry)->pool; + int nb_pkts = 0; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); + odp_pool_t pool = pkt_dpdk->pool; odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; /* Allocate maximum sized packets */ - alloc_len = pkt_priv(pktio_entry)->data_room; + alloc_len = pkt_dpdk->data_room; num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); if (num != mbuf_num) { @@ -566,12 +569,15 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_len = rte_pktmbuf_pkt_len(mbuf); if (pktio_cls_enabled(pktio_entry)) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + packet_parse_reset(&parsed_hdr); packet_set_len(&parsed_hdr, pkt_len); if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data, pkt_len, pkt_len, mbuf, ODP_PROTO_LAYER_ALL, + supported_ptypes, pktin_cfg)) { odp_packet_free(pkt_table[i]); rte_pktmbuf_free(mbuf); @@ -593,16 +599,20 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, pkt_hdr->input = input; - if (pktio_cls_enabled(pktio_entry)) + if (pktio_cls_enabled(pktio_entry)) { copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); - else if (parse_layer != ODP_PROTO_LAYER_NONE) + } else if (parse_layer != ODP_PROTO_LAYER_NONE) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer, + supported_ptypes, pktin_cfg)) { odp_packet_free(pkt); rte_pktmbuf_free(mbuf); continue; } + } if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); @@ -808,11 +818,13 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, odp_pktin_config_opt_t pktin_cfg; odp_proto_layer_t parse_layer; odp_pktio_t input; + pkt_dpdk_t *pkt_dpdk; prefetch_pkt(mbuf_table[0]); + pkt_dpdk = pkt_priv(pktio_entry); nb_pkts = 0; - pool = pkt_priv(pktio_entry)->pool; + pool = pkt_dpdk->pool; pktin_cfg = pktio_entry->s.config.pktin; parse_layer = pktio_entry->s.config.parser.layer; input = pktio_entry->s.handle; @@ -839,12 +851,15 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, pkt_hdr = pkt_hdr_from_mbuf(mbuf); if (pktio_cls_enabled(pktio_entry)) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + packet_parse_reset(&parsed_hdr); packet_set_len(&parsed_hdr, pkt_len); if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data, pkt_len, pkt_len, mbuf, ODP_PROTO_LAYER_ALL, + supported_ptypes, pktin_cfg)) { rte_pktmbuf_free(mbuf); continue; @@ -866,15 +881,19 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, packet_init(pkt_hdr, pkt_len); pkt_hdr->input = input; - if (pktio_cls_enabled(pktio_entry)) + if (pktio_cls_enabled(pktio_entry)) { copy_packet_cls_metadata(&parsed_hdr, pkt_hdr); - else if (parse_layer != ODP_PROTO_LAYER_NONE) + } else if (parse_layer != ODP_PROTO_LAYER_NONE) { + uint32_t supported_ptypes = pkt_dpdk->supported_ptypes; + if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer, + supported_ptypes, pktin_cfg)) { rte_pktmbuf_free(mbuf); continue; } + } if (mbuf->ol_flags & PKT_RX_RSS_HASH) packet_set_flow_hash(pkt_hdr, mbuf->hash.rss); @@ -1696,6 +1715,49 @@ static int dpdk_setup_eth_rx(const pktio_entry_t *pktio_entry, return 0; } +static void dpdk_ptype_support_set(pktio_entry_t *pktio_entry, uint16_t port_id) +{ + int max_num, num, i; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); + uint32_t mask = RTE_PTYPE_L2_MASK | RTE_PTYPE_L3_MASK | + RTE_PTYPE_L4_MASK; + + pkt_dpdk->supported_ptypes = 0; + + max_num = rte_eth_dev_get_supported_ptypes(port_id, mask, NULL, 0); + if (max_num <= 0) { + ODP_ERR("Device does not support any ptype flags\n"); + return; + } + + uint32_t ptype[max_num]; + + num = rte_eth_dev_get_supported_ptypes(port_id, mask, ptype, max_num); + if (num <= 0) { + ODP_ERR("Device does not support any ptype flags\n"); + return; + } + + for (i = 0; i < num; i++) { + ODP_DBG(" supported ptype: 0x%x\n", ptype[i]); + + if (ptype[i] == RTE_PTYPE_L2_ETHER_VLAN) + pkt_dpdk->supported_ptypes |= PTYPE_VLAN; + else if (ptype[i] == RTE_PTYPE_L2_ETHER_QINQ) + pkt_dpdk->supported_ptypes |= PTYPE_VLAN_QINQ; + else if (ptype[i] == RTE_PTYPE_L2_ETHER_ARP) + pkt_dpdk->supported_ptypes |= PTYPE_ARP; + else if (RTE_ETH_IS_IPV4_HDR(ptype[i])) + pkt_dpdk->supported_ptypes |= PTYPE_IPV4; + else if (RTE_ETH_IS_IPV6_HDR(ptype[i])) + pkt_dpdk->supported_ptypes |= PTYPE_IPV6; + else if (ptype[i] == RTE_PTYPE_L4_UDP) + pkt_dpdk->supported_ptypes |= PTYPE_UDP; + else if (ptype[i] == RTE_PTYPE_L4_TCP) + pkt_dpdk->supported_ptypes |= PTYPE_TCP; + } +} + static int dpdk_start(pktio_entry_t *pktio_entry) { struct rte_eth_dev_info dev_info; @@ -1733,6 +1795,9 @@ static int dpdk_start(pktio_entry_t *pktio_entry) return -1; } + /* Record supported parser ptype flags */ + dpdk_ptype_support_set(pktio_entry, port_id); + return 0; } diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index ef3065df7..9dad1a7ae 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -27,14 +27,18 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, const uint8_t **parseptr, uint32_t *offset, uint32_t frame_len, - uint32_t mbuf_packet_type) + uint32_t mbuf_packet_type, + uint32_t supported_ptypes) { uint16_t ethtype; const _odp_ethhdr_t *eth; uint16_t macaddr0, macaddr2, macaddr4; const _odp_vlanhdr_t *vlan; _odp_packet_input_flags_t input_flags; - uint32_t l2_packet_type; + uint32_t l2_ptype; + int vlan_supported = supported_ptypes & PTYPE_VLAN; + int qinq_supported = supported_ptypes & PTYPE_VLAN_QINQ; + int arp_supported = supported_ptypes & PTYPE_ARP; input_flags.all = 0; input_flags.l2 = 1; @@ -64,22 +68,19 @@ static inline uint16_t dpdk_parse_eth(packet_parser_t *prs, } /* Get Ethertype */ - l2_packet_type = mbuf_packet_type & RTE_PTYPE_L2_MASK; - switch (l2_packet_type) { - case RTE_PTYPE_L2_ETHER: - if (RTE_ETH_IS_IPV4_HDR(mbuf_packet_type)) - ethtype = _ODP_ETHTYPE_IPV4; - else if (RTE_ETH_IS_IPV6_HDR(mbuf_packet_type)) - ethtype = _ODP_ETHTYPE_IPV6; - else - ethtype = odp_be_to_cpu_16(eth->type); - break; - case RTE_PTYPE_L2_ETHER_VLAN: + l2_ptype = mbuf_packet_type & RTE_PTYPE_L2_MASK; + + /* RTE_PTYPE_L2_ETHER type cannot be trusted when some L2 types are + * not supported. E.g. if VLAN is not supported, both VLAN and non-VLAN + * packets are marked as RTE_PTYPE_L2_ETHER. */ + ethtype = odp_be_to_cpu_16(eth->type); + + if (vlan_supported && l2_ptype == RTE_PTYPE_L2_ETHER_VLAN) ethtype = _ODP_ETHTYPE_VLAN; - break; - default: - ethtype = odp_be_to_cpu_16(eth->type); - } + else if (qinq_supported && l2_ptype == RTE_PTYPE_L2_ETHER_QINQ) + ethtype = _ODP_ETHTYPE_VLAN_OUTER; + else if (arp_supported && l2_ptype == RTE_PTYPE_L2_ETHER_ARP) + ethtype = _ODP_ETHTYPE_ARP; *offset += sizeof(*eth); *parseptr += sizeof(*eth); @@ -460,6 +461,7 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs, int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, uint32_t frame_len, uint32_t seg_len, struct rte_mbuf *mbuf, int layer, + uint32_t supported_ptype, odp_pktin_config_opt_t pktin_cfg) { uint32_t offset; @@ -481,7 +483,7 @@ int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->l2_offset = offset; ethtype = dpdk_parse_eth(prs, &parseptr, &offset, frame_len, - mbuf_packet_type); + mbuf_packet_type, supported_ptype); return dpdk_packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, seg_len, layer, ethtype, commit e47683d428084f9cacf72f1691d30b96c53804c1 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 18 15:14:26 2019 +0300 example: cls: add support for ODP_PMR_VLAN_ID_0 Added support for ODP_PMR_VLAN_ID_0 term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 8cbc5a289..691fec297 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -771,6 +771,9 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) if (strcasecmp(token, "ODP_PMR_ETHTYPE_0") == 0) { *term = ODP_PMR_ETHTYPE_0; return 0; + } else if (strcasecmp(token, "ODP_PMR_VLAN_ID_0") == 0) { + *term = ODP_PMR_VLAN_ID_0; + return 0; } else if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; @@ -822,6 +825,9 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) switch (term) { case ODP_PMR_ETHTYPE_0: /* :<type>:<mask> */ + /* Fall through */ + case ODP_PMR_VLAN_ID_0: + /* :<vlan_id>:<mask> */ token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); commit ce35815639996bb2832c298c7d5d40eff6c175d0 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 17 09:26:36 2019 +0300 example: cls: add support for ODP_PMR_ETHTYPE_0 Added support for ODP_PMR_ETHTYPE_0 term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 578109e6c..8cbc5a289 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -768,7 +768,10 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) if (NULL == token) return -1; - if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { + if (strcasecmp(token, "ODP_PMR_ETHTYPE_0") == 0) { + *term = ODP_PMR_ETHTYPE_0; + return 0; + } else if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; } else if (strcasecmp(token, "ODP_PMR_CUSTOM_FRAME") == 0) { @@ -789,6 +792,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) char *pmr_str; uint32_t offset; uint32_t ip_addr; + unsigned long int value; policy_count = appl_args->policy_count; stats = appl_args->stats; @@ -812,9 +816,24 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) exit(EXIT_FAILURE); } stats[policy_count].rule.term = term; + stats[policy_count].rule.offset = 0; /* PMR value */ - switch (term) { + switch (term) { + case ODP_PMR_ETHTYPE_0: + /* :<type>:<mask> */ + token = strtok(NULL, ":"); + strncpy(stats[policy_count].value, token, + DISPLAY_STRING_LEN - 1); + value = strtoul(token, NULL, 0); + stats[policy_count].rule.val = value; + + token = strtok(NULL, ":"); + strncpy(stats[policy_count].mask, token, + DISPLAY_STRING_LEN - 1); + parse_mask(token, &stats[policy_count].rule.mask); + stats[policy_count].rule.val_sz = 2; + break; case ODP_PMR_SIP_ADDR: /* :<IP addr>:<mask> */ token = strtok(NULL, ":"); @@ -833,7 +852,6 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) DISPLAY_STRING_LEN - 1); parse_mask(token, &stats[policy_count].rule.mask); stats[policy_count].rule.val_sz = 4; - stats[policy_count].rule.offset = 0; break; case ODP_PMR_CUSTOM_FRAME: /* :<offset>:<value>:<mask> */ commit 66e459c9f841932818acd423ddeda65f2ad1c2de Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 16 15:58:42 2019 +0300 example: cls: add source cos parameter Add source CoS name into the parameter list of -p option. This enables linking classification rules together. When a source CoS is not defined, the default CoS is used as the source CoS. Option -p parameter list format is now: <term>:<xxx>:<yyy>:<src_cos>:<dst_cos> Where <src_cos> is optional and number of "xxx", "yyy", etc parameters is term depend. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 3ee1cde76..578109e6c 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -56,6 +56,7 @@ typedef struct { odp_atomic_u64_t queue_pkt_count; /**< count of received packets */ odp_atomic_u64_t pool_pkt_count; /**< count of received packets */ char cos_name[ODP_COS_NAME_LEN]; /**< cos name */ + char src_cos_name[ODP_COS_NAME_LEN]; /**< source cos name */ struct { odp_cls_pmr_term_t term; /**< odp pmr term value */ uint64_t val; /**< pmr term value */ @@ -65,6 +66,8 @@ typedef struct { } rule; char value[DISPLAY_STRING_LEN]; /**< Display string for value */ char mask[DISPLAY_STRING_LEN]; /**< Display string for mask */ + int has_src_cos; + } global_statistics; typedef struct { @@ -87,17 +90,11 @@ enum packet_mode { static appl_args_t *appl_args_gbl; -/* helper funcs */ static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len); static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len); static void parse_args(int argc, char *argv[], appl_args_t *appl_args); static void print_info(char *progname, appl_args_t *appl_args); static void usage(char *progname); -static void configure_cos(odp_cos_t default_cos, appl_args_t *args); -static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args); -static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, - uint32_t *offset); -static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg); static inline void print_cls_statistics(appl_args_t *args) { @@ -410,6 +407,23 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) return cos_default; } +static int find_cos(appl_args_t *args, const char *name, odp_cos_t *cos) +{ + global_statistics *stats; + int i; + + for (i = 0; i < args->policy_count - 1; i++) { + stats = &args->stats[i]; + + if (strcmp(stats->cos_name, name) == 0) { + *cos = stats->cos; + return 0; + } + } + + return -1; +} + static void configure_cos(odp_cos_t default_cos, appl_args_t *args) { char cos_name[ODP_COS_NAME_LEN]; @@ -417,7 +431,6 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) const char *queue_name; odp_pool_param_t pool_params; odp_cls_cos_param_t cls_param; - odp_pmr_param_t pmr_param; int i; global_statistics *stats; odp_queue_param_t qparam; @@ -462,6 +475,23 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) cls_param.drop_policy = ODP_COS_DROP_POOL; stats->cos = odp_cls_cos_create(cos_name, &cls_param); + odp_atomic_init_u64(&stats->queue_pkt_count, 0); + odp_atomic_init_u64(&stats->pool_pkt_count, 0); + } + + for (i = 0; i < args->policy_count - 1; i++) { + odp_pmr_param_t pmr_param; + odp_cos_t src_cos = default_cos; + + stats = &args->stats[i]; + + if (stats->has_src_cos) { + if (find_cos(args, stats->src_cos_name, &src_cos)) { + ODPH_ERR("find_cos failed\n"); + exit(EXIT_FAILURE); + } + } + odp_cls_pmr_param_init(&pmr_param); pmr_param.term = stats->rule.term; pmr_param.match.value = &stats->rule.val; @@ -469,16 +499,14 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) pmr_param.val_sz = stats->rule.val_sz; pmr_param.offset = stats->rule.offset; - stats->pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, + stats->pmr = odp_cls_pmr_create(&pmr_param, 1, src_cos, stats->cos); if (stats->pmr == ODP_PMR_INVALID) { ODPH_ERR("odp_pktio_pmr_cos failed\n"); exit(EXIT_FAILURE); } - - odp_atomic_init_u64(&stats->queue_pkt_count, 0); - odp_atomic_init_u64(&stats->pool_pkt_count, 0); } + } static void sig_handler(int signo) @@ -735,30 +763,26 @@ static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len) } } -static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, - uint32_t *offset) +static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term) { if (NULL == token) return -1; - if (0 == strcasecmp(token, "ODP_PMR_SIP_ADDR")) { + if (strcasecmp(token, "ODP_PMR_SIP_ADDR") == 0) { *term = ODP_PMR_SIP_ADDR; return 0; - } else { - errno = 0; - *offset = strtoul(token, NULL, 0); - if (errno) - return -1; + } else if (strcasecmp(token, "ODP_PMR_CUSTOM_FRAME") == 0) { *term = ODP_PMR_CUSTOM_FRAME; return 0; } + return -1; } static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) { int policy_count; - char *token; + char *token, *cos0, *cos1; size_t len; odp_cls_pmr_term_t term; global_statistics *stats; @@ -781,8 +805,9 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) strcpy(pmr_str, optarg); /* PMR TERM */ + /* <term>:<xxx>:<yyy>:<src_cos>:<dst_cos> */ token = strtok(pmr_str, ":"); - if (convert_str_to_pmr_enum(token, &term, &offset)) { + if (convert_str_to_pmr_enum(token, &term)) { ODPH_ERR("Invalid ODP_PMR_TERM string\n"); exit(EXIT_FAILURE); } @@ -791,6 +816,7 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) /* PMR value */ switch (term) { case ODP_PMR_SIP_ADDR: + /* :<IP addr>:<mask> */ token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); @@ -810,6 +836,13 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) stats[policy_count].rule.offset = 0; break; case ODP_PMR_CUSTOM_FRAME: + /* :<offset>:<value>:<mask> */ + token = strtok(NULL, ":"); + errno = 0; + offset = strtoul(token, NULL, 0); + if (errno) + return -1; + token = strtok(NULL, ":"); strncpy(stats[policy_count].value, token, DISPLAY_STRING_LEN - 1); @@ -826,10 +859,24 @@ static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) exit(EXIT_FAILURE); } - /* Queue Name */ - token = strtok(NULL, ":"); + /* Optional source CoS name and name of this CoS + * :<src_cos>:<cos> */ + cos0 = strtok(NULL, ":"); + cos1 = strtok(NULL, ":"); + if (cos0 == NULL) + return -1; + + if (cos1) { + stats[policy_count].has_src_cos = 1; + strncpy(stats[policy_count].src_cos_name, cos0, + ODP_COS_NAME_LEN - 1); + strncpy(stats[policy_count].cos_name, cos1, + ODP_COS_NAME_LEN - 1); + } else { + strncpy(stats[policy_count].cos_name, cos0, + ODP_COS_NAME_LEN - 1); + } - strncpy(stats[policy_count].cos_name, token, ODP_QUEUE_NAME_LEN - 1); appl_args->policy_count++; free(pmr_str); return 0; commit 0b63c8154a779ba20010bcd9ae7ee6bf610d755b Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 16 11:16:50 2019 +0300 example: cls: add verbose option Added -v option which prints received packet with CoS queue name. This can be used for debugging classification rules. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index c38c6dfd8..3ee1cde76 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -9,6 +10,7 @@ #include <getopt.h> #include <unistd.h> #include <inttypes.h> +#include <signal.h> #include <odp_api.h> #include <odp/helper/odph_api.h> @@ -74,6 +76,8 @@ typedef struct { uint32_t time; /**< Number of seconds to run */ char *if_name; /**< pointer to interface names */ int shutdown; /**< Shutdown threads if !0 */ + int shutdown_sig; + int verbose; } appl_args_t; enum packet_mode { @@ -81,6 +85,8 @@ enum packet_mode { APPL_MODE_REPLY /**< Packet is sent back */ }; +static appl_args_t *appl_args_gbl; + /* helper funcs */ static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len); static void swap_pkt_addrs(odp_packet_t pkt_tbl[], unsigned len); @@ -93,8 +99,7 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, uint32_t *offset); static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg); -static inline -void print_cls_statistics(appl_args_t *args) +static inline void print_cls_statistics(appl_args_t *args) { int i; uint32_t timeout; @@ -153,6 +158,9 @@ void print_cls_statistics(appl_args_t *args) printf("%-" PRIu64, odp_atomic_load_u64(&args-> total_packets)); + if (args->shutdown_sig) + break; + sleep(1); printf("\r"); fflush(stdout); @@ -161,8 +169,7 @@ void print_cls_statistics(appl_args_t *args) printf("\n"); } -static inline -int parse_mask(const char *str, uint64_t *mask) +static inline int parse_mask(const char *str, uint64_t *mask) { uint64_t b; int ret; @@ -172,8 +179,7 @@ int parse_mask(const char *str, uint64_t *mask) return ret != 1; } -static -int parse_value(const char *str, uint64_t *val, uint32_t *val_sz) +static int parse_value(const char *str, uint64_t *val, uint32_t *val_sz) { size_t len; size_t i; @@ -260,12 +266,13 @@ static int pktio_receive_thread(void *arg) odp_packet_t pkt; odp_pool_t pool; odp_event_t ev; - unsigned long err_cnt = 0; odp_queue_t queue; int i; + global_statistics *stats; + unsigned long err_cnt = 0; thr = odp_thread_id(); appl_args_t *appl = (appl_args_t *)arg; - global_statistics *stats; + uint64_t wait_time = odp_schedule_wait_time(100 * ODP_TIME_MSEC_IN_NS); /* Loop packets */ for (;;) { @@ -275,8 +282,7 @@ static int pktio_receive_thread(void *arg) break; /* Use schedule to get buf from any input queue */ - ev = odp_schedule(&queue, - odp_schedule_wait_time(ODP_TIME_SEC_IN_NS)); + ev = odp_schedule(&queue, wait_time); /* Loop back to receive packets incase of invalid event */ if (odp_unlikely(ev == ODP_EVENT_INVALID)) @@ -284,6 +290,19 @@ static int pktio_receive_thread(void *arg) pkt = odp_packet_from_event(ev); + if (appl->verbose) { + odp_queue_info_t info; + uint32_t len = odp_packet_len(pkt); + + if (odp_queue_info(queue, &info) == 0) + printf("Queue: %s\n", info.name); + + if (len > 96) + len = 96; + + odp_packet_print_data(pkt, 0, len); + } + /* Total packets received */ odp_atomic_inc_u64(&appl->total_packets); @@ -394,8 +413,8 @@ static odp_cos_t configure_default_cos(odp_pktio_t pktio, appl_args_t *args) static void configure_cos(odp_cos_t default_cos, appl_args_t *args) { char cos_name[ODP_COS_NAME_LEN]; - char queue_name[ODP_QUEUE_NAME_LEN]; char pool_name[ODP_POOL_NAME_LEN]; + const char *queue_name; odp_pool_param_t pool_params; odp_cls_cos_param_t cls_param; odp_pmr_param_t pmr_param; @@ -412,8 +431,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL; qparam.sched.group = ODP_SCHED_GROUP_ALL; - snprintf(queue_name, sizeof(queue_name), "%sQueue%d", - args->stats[i].cos_name, i); + queue_name = args->stats[i].cos_name; stats->queue = odp_queue_create(queue_name, &qparam); if (ODP_QUEUE_INVALID == stats->queue) { ODPH_ERR("odp_queue_create failed\n"); @@ -463,6 +481,15 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args) } } +static void sig_handler(int signo) +{ + (void)signo; + + if (appl_args_gbl == NULL) + return; + appl_args_gbl->shutdown_sig = 1; +} + /** * ODP Classifier example main function */ @@ -486,6 +513,8 @@ int main(int argc, char *argv[]) odph_thread_common_param_t thr_common; odph_thread_param_t thr_param; + signal(SIGINT, sig_handler); + /* Let helper collect its own arguments (e.g. --odph_proc) */ argc = odph_parse_options(argc, argv); if (odph_options(&helper_options)) { @@ -524,6 +553,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + appl_args_gbl = args; memset(args, 0, sizeof(*args)); /* Parse and store the application arguments */ parse_args(argc, argv, args); @@ -591,7 +621,18 @@ int main(int argc, char *argv[]) odph_thread_create(thread_tbl, &thr_common, &thr_param, num_workers); - print_cls_statistics(args); + if (args->verbose == 0) { + print_cls_statistics(args); + } else { + int timeout = args->time; + + for (i = 0; timeout == 0 || i < timeout; i++) { + if (args->shutdown_sig) + break; + + sleep(1); + } + } odp_pktio_stop(pktio); args->shutdown = 1; @@ -714,7 +755,6 @@ static int convert_str_to_pmr_enum(char *token, odp_cls_pmr_term_t *term, return -1; } - static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg) { int policy_count; @@ -813,17 +853,19 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, - {"interface", required_argument, NULL, 'i'}, /* return 'i' */ - {"policy", required_argument, NULL, 'p'}, /* return 'p' */ - {"mode", required_argument, NULL, 'm'}, /* return 'm' */ - {"time", required_argument, NULL, 't'}, /* return 't' */ - {"help", no_argument, NULL, 'h'}, /* return 'h' */ + {"interface", required_argument, NULL, 'i'}, + {"policy", required_argument, NULL, 'p'}, + {"mode", required_argument, NULL, 'm'}, + {"time", required_argument, NULL, 't'}, + {"verbose", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:t:i:p:m:t:h"; + static const char *shortopts = "+c:t:i:p:m:t:vh"; appl_args->cpu_count = 1; /* Use one worker by default */ + appl_args->verbose = 0; while (1) { opt = getopt_long(argc, argv, shortopts, @@ -861,11 +903,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) strcpy(appl_args->if_name, optarg); interface = 1; break; - - case 'h': - usage(argv[0]); - exit(EXIT_SUCCESS); - break; case 'm': i = atoi(optarg); if (i == 0) @@ -873,7 +910,13 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) else appl_args->appl_mode = APPL_MODE_REPLY; break; - + case 'v': + appl_args->verbose = 1; + break; + case 'h': + usage(argv[0]); + exit(EXIT_SUCCESS); + break; default: break; } commit e7117fb0ecc8440dd1b8ef5845b14c82cd2f2ace Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 11 17:28:39 2019 +0300 linux-gen: cls: fix eth_type_0 match bug Eth_type_0 match required packet to be a VLAN qinq frame, when packet needs to be just ethernet. Also, eth_type_0 test case produced a VLAN qinq frame. Use an IPv6 packet instead. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 6f4b02c2f..93e086e84 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1041,7 +1041,7 @@ static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, const _odp_ethhdr_t *eth; uint16_t ethtype; - if (!pkt_hdr->p.input_flags.vlan_qinq) + if (!packet_hdr_has_eth(pkt_hdr)) return 0; eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 47cdeaa76..c8cf0077d 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1285,7 +1285,7 @@ static void classification_test_pmr_term_eth_type_0(void) odph_ethhdr_t *eth; cls_packet_info_t pkt_info; - val = 0x88A8; + val = ODPH_ETHTYPE_IPV6; mask = 0xffff; seqno = 0; @@ -1322,8 +1322,7 @@ static void classification_test_pmr_term_eth_type_0(void) CU_ASSERT(pmr != ODP_PMR_INVALID); pkt_info = default_pkt_info; - pkt_info.vlan = true; - pkt_info.vlan_qinq = true; + pkt_info.ipv6 = true; pkt = create_packet(pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); seqno = cls_pkt_get_seq(pkt); commit 95eb732efd42e889e280120f504c4c3e50348cab Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Fri Oct 11 17:02:58 2019 +0300 linux-gen: cls: remove odp_classification_inlines.h Content of this header is needed only in odp_classification.c file. Copy content there and remove the header file. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9f24bc829..0d4d905f9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -90,7 +90,6 @@ noinst_HEADERS = \ include/odp_bitset.h \ include/odp_buffer_internal.h \ include/odp_classification_datamodel.h \ - include/odp_classification_inlines.h \ include/odp_classification_internal.h \ include/odp_config_internal.h \ include/odp_debug_internal.h \ diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h deleted file mode 100644 index 36fffc1dc..000000000 --- a/platform/linux-generic/include/odp_classification_inlines.h +++ /dev/null @@ -1,385 +0,0 @@ -/* Copyright (c) 2014-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/** - * @file - * - * ODP Classification Inlines - * Classification Inlines Functions - */ -#ifndef __ODP_CLASSIFICATION_INLINES_H_ -#define __ODP_CLASSIFICATION_INLINES_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <odp/api/debug.h> -#include <odp/api/byteorder.h> -#include <odp/api/plat/byteorder_inlines.h> -#include <protocols/eth.h> -#include <protocols/ip.h> -#include <protocols/ipsec.h> -#include <protocols/udp.h> -#include <protocols/tcp.h> -#include <odp_packet_internal.h> -#include <stdio.h> -#include <inttypes.h> - -/* PMR term value verification function -These functions verify the given PMR term value with the value in the packet -These following functions return 1 on success and 0 on failure -*/ - -static inline int verify_pmr_packet_len(odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - if (term_value->match.value == (packet_len(pkt_hdr) & - term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ip_proto(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv4hdr_t *ip; - uint8_t proto; - - if (!pkt_hdr->p.input_flags.ipv4) - return 0; - ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - proto = ip->proto; - if (term_value->match.value == (proto & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv4hdr_t *ip; - uint32_t ipaddr; - - if (!pkt_hdr->p.input_flags.ipv4) - return 0; - ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->src_addr); - if (term_value->match.value == (ipaddr & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv4hdr_t *ip; - uint32_t ipaddr; - - if (!pkt_hdr->p.input_flags.ipv4) - return 0; - ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - ipaddr = odp_be_to_cpu_32(ip->dst_addr); - if (term_value->match.value == (ipaddr & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t sport; - const _odp_tcphdr_t *tcp; - - if (!pkt_hdr->p.input_flags.tcp) - return 0; - tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(tcp->src_port); - if (term_value->match.value == (sport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t dport; - const _odp_tcphdr_t *tcp; - - if (!pkt_hdr->p.input_flags.tcp) - return 0; - tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(tcp->dst_port); - if (term_value->match.value == (dport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t dport; - const _odp_udphdr_t *udp; - - if (!pkt_hdr->p.input_flags.udp) - return 0; - udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - dport = odp_be_to_cpu_16(udp->dst_port); - if (term_value->match.value == (dport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint16_t sport; - const _odp_udphdr_t *udp; - - if (!pkt_hdr->p.input_flags.udp) - return 0; - udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); - sport = odp_be_to_cpu_16(udp->src_port); - if (term_value->match.value == (sport & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_dmac(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint64_t dmac = 0; - uint64_t dmac_be = 0; - const _odp_ethhdr_t *eth; - - if (!packet_hdr_has_eth(pkt_hdr)) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); - dmac = odp_be_to_cpu_64(dmac_be); - /* since we are converting a 48 bit ethernet address from BE to cpu - format using odp_be_to_cpu_64() the last 16 bits needs to be right - shifted */ - if (dmac_be != dmac) - dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); - - if (term_value->match.value == (dmac & term_value->match.mask)) - return 1; - return 0; -} - -static inline int verify_pmr_ipv6_saddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv6hdr_t *ipv6; - uint64_t addr[2]; - - if (!packet_hdr_has_ipv6(pkt_hdr)) - return 0; - - ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - - addr[0] = ipv6->src_addr.u64[0]; - addr[1] = ipv6->src_addr.u64[1]; - - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; - - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ipv6hdr_t *ipv6; - uint64_t addr[2]; - - if (!packet_hdr_has_ipv6(pkt_hdr)) - return 0; - ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); - addr[0] = ipv6->dst_addr.u64[0]; - addr[1] = ipv6->dst_addr.u64[1]; - - /* 128 bit address is processed as two 64 bit value - * for bitwise AND operation */ - addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; - addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; - - if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) - return 1; - - return 0; -} - -static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ethhdr_t *eth; - const _odp_vlanhdr_t *vlan; - uint16_t tci; - uint16_t vlan_id; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - vlan = (const _odp_vlanhdr_t *)(eth + 1); - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; - - if (term_value->match.value == (vlan_id & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) -{ - const _odp_ethhdr_t *eth; - const _odp_vlanhdr_t *vlan; - uint16_t tci; - uint16_t vlan_id; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - vlan = (const _odp_vlanhdr_t *)(eth + 1); - vlan++; - tci = odp_be_to_cpu_16(vlan->tci); - vlan_id = tci & 0x0fff; - - if (term_value->match.value == (vlan_id & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint32_t spi; - - pkt_addr += pkt_hdr->p.l4_offset; - - if (pkt_hdr->p.input_flags.ipsec_ah) { - const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; - - spi = odp_be_to_cpu_32(ahhdr->spi); - } else if (pkt_hdr->p.input_flags.ipsec_esp) { - const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; - - spi = odp_be_to_cpu_32(esphdr->spi); - } else { - return 0; - } - - if (term_value->match.value == (spi & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_ld_vni(const uint8_t *pkt_addr ODP_UNUSED, - odp_packet_hdr_t *pkt_hdr ODP_UNUSED, - pmr_term_value_t *term_value ODP_UNUSED) -{ - ODP_UNIMPLEMENTED(); - return 0; -} - -static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - uint64_t val = 0; - uint32_t offset = term_value->offset; - uint32_t val_sz = term_value->val_sz; - - ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); - - if (packet_len(pkt_hdr) <= offset + val_sz) - return 0; - - memcpy(&val, pkt_addr + offset, val_sz); - if (term_value->match.value == (val & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ethhdr_t *eth; - uint16_t ethtype; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - ethtype = odp_be_to_cpu_16(eth->type); - - if (term_value->match.value == (ethtype & term_value->match.mask)) - return 1; - - return 0; -} - -static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, - odp_packet_hdr_t *pkt_hdr, - pmr_term_value_t *term_value) -{ - const _odp_ethhdr_t *eth; - uint16_t ethtype; - const _odp_vlanhdr_t *vlan; - - if (!pkt_hdr->p.input_flags.vlan_qinq) - return 0; - - eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); - vlan = (const _odp_vlanhdr_t *)(eth + 1); - ethtype = odp_be_to_cpu_16(vlan->type); - - if (term_value->match.value == (ethtype & term_value->match.mask)) - return 1; - - return 0; -} - -#ifdef __cplusplus -} -#endif -#endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index b3d91b3fe..6f4b02c2f 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -15,12 +15,14 @@ #include <odp/api/packet_io.h> #include <odp_packet_io_internal.h> #include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/shared_memory.h> -#include <protocols/thash.h> #include <protocols/eth.h> #include <protocols/ip.h> +#include <protocols/ipsec.h> +#include <protocols/udp.h> +#include <protocols/tcp.h> +#include <protocols/thash.h> #include <string.h> #include <errno.h> #include <stdbool.h> @@ -727,12 +729,357 @@ odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id) return cos->s.pool; } +static inline int verify_pmr_packet_len(odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + if (term_value->match.value == (packet_len(pkt_hdr) & + term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ip_proto(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv4hdr_t *ip; + uint8_t proto; + + if (!pkt_hdr->p.input_flags.ipv4) + return 0; + ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + proto = ip->proto; + if (term_value->match.value == (proto & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv4hdr_t *ip; + uint32_t ipaddr; + + if (!pkt_hdr->p.input_flags.ipv4) + return 0; + ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + ipaddr = odp_be_to_cpu_32(ip->src_addr); + if (term_value->match.value == (ipaddr & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv4hdr_t *ip; + uint32_t ipaddr; + + if (!pkt_hdr->p.input_flags.ipv4) + return 0; + ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + ipaddr = odp_be_to_cpu_32(ip->dst_addr); + if (term_value->match.value == (ipaddr & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t sport; + const _odp_tcphdr_t *tcp; + + if (!pkt_hdr->p.input_flags.tcp) + return 0; + tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + sport = odp_be_to_cpu_16(tcp->src_port); + if (term_value->match.value == (sport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t dport; + const _odp_tcphdr_t *tcp; + + if (!pkt_hdr->p.input_flags.tcp) + return 0; + tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + dport = odp_be_to_cpu_16(tcp->dst_port); + if (term_value->match.value == (dport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t dport; + const _odp_udphdr_t *udp; + + if (!pkt_hdr->p.input_flags.udp) + return 0; + udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + dport = odp_be_to_cpu_16(udp->dst_port); + if (term_value->match.value == (dport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint16_t sport; + const _odp_udphdr_t *udp; + + if (!pkt_hdr->p.input_flags.udp) + return 0; + udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset); + sport = odp_be_to_cpu_16(udp->src_port); + if (term_value->match.value == (sport & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_dmac(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint64_t dmac = 0; + uint64_t dmac_be = 0; + const _odp_ethhdr_t *eth; + + if (!packet_hdr_has_eth(pkt_hdr)) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN); + dmac = odp_be_to_cpu_64(dmac_be); + /* since we are converting a 48 bit ethernet address from BE to cpu + format using odp_be_to_cpu_64() the last 16 bits needs to be right + shifted */ + if (dmac_be != dmac) + dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8)); + + if (term_value->match.value == (dmac & term_value->match.mask)) + return 1; + return 0; +} + +static inline int verify_pmr_ipv6_saddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv6hdr_t *ipv6; + uint64_t addr[2]; + + if (!packet_hdr_has_ipv6(pkt_hdr)) + return 0; + + ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + + addr[0] = ipv6->src_addr.u64[0]; + addr[1] = ipv6->src_addr.u64[1]; + + /* 128 bit address is processed as two 64 bit value + * for bitwise AND operation */ + addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; + addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + + if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipv6_daddr(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ipv6hdr_t *ipv6; + uint64_t addr[2]; + + if (!packet_hdr_has_ipv6(pkt_hdr)) + return 0; + ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset); + addr[0] = ipv6->dst_addr.u64[0]; + addr[1] = ipv6->dst_addr.u64[1]; + + /* 128 bit address is processed as two 64 bit value + * for bitwise AND operation */ + addr[0] = addr[0] & term_value->match_ipv6.mask.u64[0]; + addr[1] = addr[1] & term_value->match_ipv6.mask.u64[1]; + + if (!memcmp(addr, term_value->match_ipv6.addr.u8, _ODP_IPV6ADDR_LEN)) + return 1; + + return 0; +} + +static inline int verify_pmr_vlan_id_0(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ethhdr_t *eth; + const _odp_vlanhdr_t *vlan; + uint16_t tci; + uint16_t vlan_id; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + tci = odp_be_to_cpu_16(vlan->tci); + vlan_id = tci & 0x0fff; + + if (term_value->match.value == (vlan_id & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_vlan_id_x(const uint8_t *pkt_addr ODP_UNUSED, + odp_packet_hdr_t *pkt_hdr ODP_UNUSED, + pmr_term_value_t *term_value ODP_UNUSED) +{ + const _odp_ethhdr_t *eth; + const _odp_vlanhdr_t *vlan; + uint16_t tci; + uint16_t vlan_id; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + vlan++; + tci = odp_be_to_cpu_16(vlan->tci); + vlan_id = tci & 0x0fff; + + if (term_value->match.value == (vlan_id & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint32_t spi; + + pkt_addr += pkt_hdr->p.l4_offset; + + if (pkt_hdr->p.input_flags.ipsec_ah) { + const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr; + + spi = odp_be_to_cpu_32(ahhdr->spi); + } else if (pkt_hdr->p.input_flags.ipsec_esp) { + const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr; + + spi = odp_be_to_cpu_32(esphdr->spi); + } else { + return 0; + } + + if (term_value->match.value == (spi & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_ld_vni(const uint8_t *pkt_addr ODP_UNUSED, + odp_packet_hdr_t *pkt_hdr ODP_UNUSED, + pmr_term_value_t *term_value ODP_UNUSED) +{ + ODP_UNIMPLEMENTED(); + return 0; +} + +static inline int verify_pmr_custom_frame(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + uint64_t val = 0; + uint32_t offset = term_value->offset; + uint32_t val_sz = term_value->val_sz; + + ODP_ASSERT(val_sz <= CLS_PMR_TERM_BYTES_MAX); + + if (packet_len(pkt_hdr) <= offset + val_sz) + return 0; + + memcpy(&val, pkt_addr + offset, val_sz); + if (term_value->match.value == (val & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_eth_type_0(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ethhdr_t *eth; + uint16_t ethtype; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + ethtype = odp_be_to_cpu_16(eth->type); + + if (term_value->match.value == (ethtype & term_value->match.mask)) + return 1; + + return 0; +} + +static inline int verify_pmr_eth_type_x(const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr, + pmr_term_value_t *term_value) +{ + const _odp_ethhdr_t *eth; + uint16_t ethtype; + const _odp_vlanhdr_t *vlan; + + if (!pkt_hdr->p.input_flags.vlan_qinq) + return 0; + + eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset); + vlan = (const _odp_vlanhdr_t *)(eth + 1); + ethtype = odp_be_to_cpu_16(vlan->type); + + if (term_value->match.value == (ethtype & term_value->match.mask)) + return 1; + + return 0; +} + /* * This function goes through each PMR_TERM value in pmr_t structure and calls * verification function for each term.Returns 1 if PMR matches or 0 otherwise. */ -static -int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) +static int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, + odp_packet_hdr_t *pkt_hdr) { int pmr_failure = 0; int num_pmr; diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 230a9a76b..313ebd5ec 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -31,7 +31,6 @@ #include <linux/ethtool.h> #include <linux/sockios.h> #include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp_libconfig_internal.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 17bebe9a0..6ae0e295f 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -34,7 +34,6 @@ #include <odp_debug_internal.h> #include <odp_errno_define.h> #include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> #include <odp_global_data.h> ----------------------------------------------------------------------- Summary of changes: example/classifier/odp_classifier.c | 222 +++++++++--- platform/linux-generic/Makefile.am | 1 - .../include/odp_classification_inlines.h | 385 --------------------- platform/linux-generic/include/odp_packet_dpdk.h | 14 +- platform/linux-generic/odp_classification.c | 362 ++++++++++++++++++- platform/linux-generic/pktio/dpdk.c | 81 ++++- platform/linux-generic/pktio/dpdk_parse.c | 38 +- platform/linux-generic/pktio/netmap.c | 1 - platform/linux-generic/pktio/socket_mmap.c | 1 - .../classification/odp_classification_test_pmr.c | 30 +- 10 files changed, 646 insertions(+), 489 deletions(-) delete mode 100644 platform/linux-generic/include/odp_classification_inlines.h hooks/post-receive --

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-256-ge30d10a42

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 e30d10a42db4083b53c5a85ee91d3bcda1bb80db (commit) via 8dcebe1c93786641649b1a1957fa4b54cf1e4d55 (commit) via 3cbc1462e8c79f7c0ce21c33ffa0365538f672e5 (commit) from dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b (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 e30d10a42db4083b53c5a85ee91d3bcda1bb80db Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 21 16:28:52 2019 +0300 linux-gen: timer: add placeholder functions for local init/term Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 853ef1064..7a6a8bcaa 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -61,7 +61,9 @@ int _odp_comp_init_global(void); int _odp_comp_term_global(void); int _odp_timer_init_global(const odp_init_t *params); +int _odp_timer_init_local(void); int _odp_timer_term_global(void); +int _odp_timer_term_local(void); int _odp_time_init_global(void); int _odp_time_term_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index e09b2879c..8a5b884b5 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -487,6 +487,13 @@ static int term_local(enum init_stage stage) } /* Fall through */ + case TIMER_INIT: + if (_odp_timer_term_local()) { + ODP_ERR("ODP timer local term failed.\n"); + rc = -1; + } + /* Fall through */ + case THREAD_INIT: rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { @@ -539,6 +546,12 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = PKTIO_INIT; + if (_odp_timer_init_local()) { + ODP_ERR("ODP timer local init failed.\n"); + goto init_fail; + } + stage = TIMER_INIT; + if (_odp_random_init_local()) { ODP_ERR("ODP random local init failed.\n"); goto init_fail; diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6966726e4..1ca61e179 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1542,3 +1542,13 @@ int _odp_timer_term_global(void) return 0; } + +int _odp_timer_init_local(void) +{ + return 0; +} + +int _odp_timer_term_local(void) +{ + return 0; +} commit 8dcebe1c93786641649b1a1957fa4b54cf1e4d55 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 21 16:26:35 2019 +0300 linux-gen: init: fix local terminate function call order Local terminate functions should be called in reverse order compared to local init functions. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 8e0994734..e09b2879c 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -466,6 +466,13 @@ static int term_local(enum init_stage stage) } /* Fall through */ + case POOL_INIT: + if (_odp_pool_term_local()) { + ODP_ERR("ODP buffer pool local term failed.\n"); + rc = -1; + } + /* Fall through */ + case CRYPTO_INIT: if (_odp_crypto_term_local()) { ODP_ERR("ODP crypto local term failed.\n"); @@ -480,13 +487,6 @@ static int term_local(enum init_stage stage) } /* Fall through */ - case POOL_INIT: - if (_odp_pool_term_local()) { - ODP_ERR("ODP buffer pool local term failed.\n"); - rc = -1; - } - /* Fall through */ - case THREAD_INIT: rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { commit 3cbc1462e8c79f7c0ce21c33ffa0365538f672e5 Author: Matias Elo <matias.elo(a)nokia.com> Date: Mon Oct 21 15:44:46 2019 +0300 linux-gen: init: prefix internal init/term functions with underscore Prefix internal init/term functions with underscore to improve code readability. Unused odp_timer_disarm_all() function declaration is removed. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 204f44838..853ef1064 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -14,24 +14,24 @@ extern "C" { #include <odp/api/init.h> #include <odp/api/thread.h> -int odp_cpumask_init_global(const odp_init_t *params); -int odp_cpumask_term_global(void); +int _odp_cpumask_init_global(const odp_init_t *params); +int _odp_cpumask_term_global(void); -int odp_system_info_init(void); -int odp_system_info_term(void); +int _odp_system_info_init(void); +int _odp_system_info_term(void); -int odp_thread_init_global(void); -int odp_thread_init_local(odp_thread_type_t type); -int odp_thread_term_local(void); -int odp_thread_term_global(void); +int _odp_thread_init_global(void); +int _odp_thread_init_local(odp_thread_type_t type); +int _odp_thread_term_local(void); +int _odp_thread_term_global(void); int _odp_pcapng_init_global(void); int _odp_pcapng_term_global(void); -int odp_pool_init_global(void); -int odp_pool_init_local(void); -int odp_pool_term_global(void); -int odp_pool_term_local(void); +int _odp_pool_init_global(void); +int _odp_pool_init_local(void); +int _odp_pool_term_global(void); +int _odp_pool_term_local(void); int _odp_queue_init_global(void); int _odp_queue_term_global(void); @@ -39,36 +39,35 @@ int _odp_queue_term_global(void); int _odp_schedule_init_global(void); int _odp_schedule_term_global(void); -int odp_pktio_init_global(void); -int odp_pktio_term_global(void); -int odp_pktio_init_local(void); +int _odp_pktio_init_global(void); +int _odp_pktio_term_global(void); +int _odp_pktio_init_local(void); -int odp_classification_init_global(void); -int odp_classification_term_global(void); +int _odp_classification_init_global(void); +int _odp_classification_term_global(void); -int odp_queue_init_global(void); -int odp_queue_term_global(void); +int _odp_queue_init_global(void); +int _odp_queue_term_global(void); int _odp_random_init_local(void); int _odp_random_term_local(void); -int odp_crypto_init_global(void); -int odp_crypto_term_global(void); +int _odp_crypto_init_global(void); +int _odp_crypto_term_global(void); int _odp_crypto_init_local(void); int _odp_crypto_term_local(void); int _odp_comp_init_global(void); int _odp_comp_term_global(void); -int odp_timer_init_global(const odp_init_t *params); -int odp_timer_term_global(void); -int odp_timer_disarm_all(void); +int _odp_timer_init_global(const odp_init_t *params); +int _odp_timer_term_global(void); -int odp_time_init_global(void); -int odp_time_term_global(void); +int _odp_time_init_global(void); +int _odp_time_term_global(void); -int odp_tm_init_global(void); -int odp_tm_term_global(void); +int _odp_tm_init_global(void); +int _odp_tm_term_global(void); int _odp_int_name_tbl_init_global(void); int _odp_int_name_tbl_term_global(void); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 9a299f51b..b3d91b3fe 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -86,7 +86,7 @@ pmr_t *get_pmr_entry_internal(odp_pmr_t pmr) return &pmr_tbl->pmr[_odp_pmr_to_ndx(pmr)]; } -int odp_classification_init_global(void) +int _odp_classification_init_global(void) { odp_shm_t shm; int i; @@ -119,7 +119,7 @@ int odp_classification_init_global(void) return 0; } -int odp_classification_term_global(void) +int _odp_classification_term_global(void) { if (cls_global && odp_shm_free(cls_global->shm)) { ODP_ERR("shm free failed\n"); diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index b8b9f325c..193e1a252 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -382,7 +382,7 @@ static void init_default_worker_cpumask(int control_cpus_default) * It also allows the default cpumasks to be overridden by * externally specified cpumasks passed in as initialization parameters. */ -int odp_cpumask_init_global(const odp_init_t *params) +int _odp_cpumask_init_global(const odp_init_t *params) { odp_cpumask_t *control_mask = &odp_global_ro.control_cpus; odp_cpumask_t *worker_mask = &odp_global_ro.worker_cpus; @@ -451,7 +451,7 @@ int odp_cpumask_init_global(const odp_init_t *params) } } -int odp_cpumask_term_global(void) +int _odp_cpumask_term_global(void) { return 0; } diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c index c19cb6824..633cf4751 100644 --- a/platform/linux-generic/odp_crypto_null.c +++ b/platform/linux-generic/odp_crypto_null.c @@ -304,7 +304,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, } int -odp_crypto_init_global(void) +_odp_crypto_init_global(void) { size_t mem_size; odp_shm_t shm; @@ -337,7 +337,7 @@ odp_crypto_init_global(void) return 0; } -int odp_crypto_term_global(void) +int _odp_crypto_term_global(void) { int rc = 0; int ret; diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 3911b8f4a..29cd22c2f 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -2487,8 +2487,7 @@ static void ODP_UNUSED openssl_lock(int mode, int n, } #endif -int -odp_crypto_init_global(void) +int _odp_crypto_init_global(void) { size_t mem_size; odp_shm_t shm; @@ -2533,7 +2532,7 @@ odp_crypto_init_global(void) return 0; } -int odp_crypto_term_global(void) +int _odp_crypto_term_global(void) { int rc = 0; int ret; diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 7d2477b0b..8e0994734 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -125,14 +125,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case TRAFFIC_MNGR_INIT: - if (odp_tm_term_global()) { + if (_odp_tm_term_global()) { ODP_ERR("TM term failed.\n"); rc = -1; } /* Fall through */ case CLASSIFICATION_INIT: - if (odp_classification_term_global()) { + if (_odp_classification_term_global()) { ODP_ERR("ODP classification term failed.\n"); rc = -1; } @@ -146,7 +146,7 @@ static int term_global(enum init_stage stage) /* Fall through */ case CRYPTO_INIT: - if (odp_crypto_term_global()) { + if (_odp_crypto_term_global()) { ODP_ERR("ODP crypto term failed.\n"); rc = -1; } @@ -156,14 +156,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case TIMER_INIT: - if (odp_timer_term_global()) { + if (_odp_timer_term_global()) { ODP_ERR("ODP timer term failed.\n"); rc = -1; } /* Fall through */ case PKTIO_INIT: - if (odp_pktio_term_global()) { + if (_odp_pktio_term_global()) { ODP_ERR("ODP pktio term failed.\n"); rc = -1; } @@ -184,14 +184,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case POOL_INIT: - if (odp_pool_term_global()) { + if (_odp_pool_term_global()) { ODP_ERR("ODP buffer pool term failed.\n"); rc = -1; } /* Fall through */ case THREAD_INIT: - if (odp_thread_term_global()) { + if (_odp_thread_term_global()) { ODP_ERR("ODP thread term failed.\n"); rc = -1; } @@ -226,14 +226,14 @@ static int term_global(enum init_stage stage) /* Fall through */ case SYSINFO_INIT: - if (odp_system_info_term()) { + if (_odp_system_info_term()) { ODP_ERR("ODP system info term failed.\n"); rc = -1; } /* Fall through */ case TIME_INIT: - if (odp_time_term_global()) { + if (_odp_time_term_global()) { ODP_ERR("ODP time term failed.\n"); rc = -1; } @@ -242,7 +242,7 @@ static int term_global(enum init_stage stage) case CPU_CYCLES_INIT: /* Fall through */ case CPUMASK_INIT: - if (odp_cpumask_term_global()) { + if (_odp_cpumask_term_global()) { ODP_ERR("ODP cpumask term failed.\n"); rc = -1; } @@ -291,7 +291,7 @@ int odp_init_global(odp_instance_t *instance, } stage = LIBCONFIG_INIT; - if (odp_cpumask_init_global(params)) { + if (_odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; } @@ -303,13 +303,13 @@ int odp_init_global(odp_instance_t *instance, } stage = CPU_CYCLES_INIT; - if (odp_time_init_global()) { + if (_odp_time_init_global()) { ODP_ERR("ODP time init failed.\n"); goto init_failed; } stage = TIME_INIT; - if (odp_system_info_init()) { + if (_odp_system_info_init()) { ODP_ERR("ODP system_info init failed.\n"); goto init_failed; } @@ -339,13 +339,13 @@ int odp_init_global(odp_instance_t *instance, } stage = HASH_INIT; - if (odp_thread_init_global()) { + if (_odp_thread_init_global()) { ODP_ERR("ODP thread init failed.\n"); goto init_failed; } stage = THREAD_INIT; - if (odp_pool_init_global()) { + if (_odp_pool_init_global()) { ODP_ERR("ODP pool init failed.\n"); goto init_failed; } @@ -363,13 +363,13 @@ int odp_init_global(odp_instance_t *instance, } stage = SCHED_INIT; - if (odp_pktio_init_global()) { + if (_odp_pktio_init_global()) { ODP_ERR("ODP packet io init failed.\n"); goto init_failed; } stage = PKTIO_INIT; - if (odp_timer_init_global(params)) { + if (_odp_timer_init_global(params)) { ODP_ERR("ODP timer init failed.\n"); goto init_failed; } @@ -378,7 +378,7 @@ int odp_init_global(odp_instance_t *instance, /* No init neeeded */ stage = RANDOM_INIT; - if (odp_crypto_init_global()) { + if (_odp_crypto_init_global()) { ODP_ERR("ODP crypto init failed.\n"); goto init_failed; } @@ -390,13 +390,13 @@ int odp_init_global(odp_instance_t *instance, } stage = COMP_INIT; - if (odp_classification_init_global()) { + if (_odp_classification_init_global()) { ODP_ERR("ODP classification init failed.\n"); goto init_failed; } stage = CLASSIFICATION_INIT; - if (odp_tm_init_global()) { + if (_odp_tm_init_global()) { ODP_ERR("ODP traffic manager init failed\n"); goto init_failed; } @@ -481,14 +481,14 @@ static int term_local(enum init_stage stage) /* Fall through */ case POOL_INIT: - if (odp_pool_term_local()) { + if (_odp_pool_term_local()) { ODP_ERR("ODP buffer pool local term failed.\n"); rc = -1; } /* Fall through */ case THREAD_INIT: - rc_thd = odp_thread_term_local(); + rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { ODP_ERR("ODP thread local term failed.\n"); rc = -1; @@ -527,13 +527,13 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = ISHM_INIT; - if (odp_thread_init_local(thr_type)) { + if (_odp_thread_init_local(thr_type)) { ODP_ERR("ODP thread local init failed.\n"); goto init_fail; } stage = THREAD_INIT; - if (odp_pktio_init_local()) { + if (_odp_pktio_init_local()) { ODP_ERR("ODP packet io local init failed.\n"); goto init_fail; } @@ -551,7 +551,7 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = CRYPTO_INIT; - if (odp_pool_init_local()) { + if (_odp_pool_init_local()) { ODP_ERR("ODP pool local init failed.\n"); goto init_fail; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 22e9c1b21..6e4f36569 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -58,7 +58,7 @@ static inline pktio_entry_t *pktio_entry_by_index(int index) return pktio_entry_ptr[index]; } -int odp_pktio_init_global(void) +int _odp_pktio_init_global(void) { pktio_entry_t *pktio_entry; int i; @@ -107,7 +107,7 @@ int odp_pktio_init_global(void) return 0; } -int odp_pktio_init_local(void) +int _odp_pktio_init_local(void) { int pktio_if; @@ -1311,7 +1311,7 @@ void odp_pktio_print(odp_pktio_t hdl) ODP_PRINT("\n"); } -int odp_pktio_term_global(void) +int _odp_pktio_term_global(void) { int ret = 0; int i; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 67b1e7fb9..17504a2a7 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -208,7 +208,7 @@ static int read_config_file(pool_table_t *pool_tbl) return 0; } -int odp_pool_init_global(void) +int _odp_pool_init_global(void) { uint32_t i; odp_shm_t shm; @@ -246,7 +246,7 @@ int odp_pool_init_global(void) return 0; } -int odp_pool_term_global(void) +int _odp_pool_term_global(void) { int i; pool_t *pool; @@ -273,7 +273,7 @@ int odp_pool_term_global(void) return rc; } -int odp_pool_init_local(void) +int _odp_pool_init_local(void) { pool_t *pool; int i; @@ -291,7 +291,7 @@ int odp_pool_init_local(void) return 0; } -int odp_pool_term_local(void) +int _odp_pool_term_local(void) { int i; diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 028ef8668..599e21db2 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -334,7 +334,7 @@ static int system_hp(hugepage_info_t *hugeinfo) /* * System info initialisation */ -int odp_system_info_init(void) +int _odp_system_info_init(void) { int i; FILE *file; @@ -374,7 +374,7 @@ int odp_system_info_init(void) /* * System info termination */ -int odp_system_info_term(void) +int _odp_system_info_term(void) { free(odp_global_ro.hugepage_info.default_huge_page_dir); diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 0ff0dc821..d88e6da5c 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -48,7 +48,7 @@ __thread _odp_thread_state_t *_odp_this_thread; #include <odp/visibility_end.h> -int odp_thread_init_global(void) +int _odp_thread_init_global(void) { odp_shm_t shm; @@ -67,7 +67,7 @@ int odp_thread_init_global(void) return 0; } -int odp_thread_term_global(void) +int _odp_thread_term_global(void) { int ret; @@ -130,7 +130,7 @@ static int free_id(int thr) return thread_globals->num; } -int odp_thread_init_local(odp_thread_type_t type) +int _odp_thread_init_local(odp_thread_type_t type) { int id; int cpu; @@ -183,7 +183,7 @@ int odp_thread_init_local(odp_thread_type_t type) return 0; } -int odp_thread_term_local(void) +int _odp_thread_term_local(void) { int num; int group_all, group_worker, group_control; diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 87ee6adc9..b033a733c 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -223,7 +223,7 @@ void odp_time_wait_until(odp_time_t time) return time_wait_until(time); } -int odp_time_init_global(void) +int _odp_time_init_global(void) { struct timespec *timespec; int ret = 0; @@ -254,7 +254,7 @@ int odp_time_init_global(void) return ret; } -int odp_time_term_global(void) +int _odp_time_term_global(void) { return 0; } diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index bd35e5b42..6966726e4 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1464,7 +1464,7 @@ void odp_timeout_free(odp_timeout_t tmo) odp_buffer_free(odp_buffer_from_event(ev)); } -int odp_timer_init_global(const odp_init_t *params) +int _odp_timer_init_global(const odp_init_t *params) { odp_shm_t shm; const char *conf_str; @@ -1533,7 +1533,7 @@ int odp_timer_init_global(const odp_init_t *params) return 0; } -int odp_timer_term_global(void) +int _odp_timer_term_global(void) { if (timer_global && odp_shm_free(timer_global->shm)) { ODP_ERR("Shm free failed for odp_timer\n"); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 9d19ac3c2..9a40d0716 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -4720,7 +4720,7 @@ void odp_tm_stats_print(odp_tm_t odp_tm) } } -int odp_tm_init_global(void) +int _odp_tm_init_global(void) { odp_shm_t shm; @@ -4756,7 +4756,7 @@ int odp_tm_init_global(void) return 0; } -int odp_tm_term_global(void) +int _odp_tm_term_global(void) { if (odp_global_ro.init_param.not_used.feat.tm) return 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_init_internal.h | 57 +++++++++--------- platform/linux-generic/odp_classification.c | 4 +- platform/linux-generic/odp_cpumask.c | 4 +- platform/linux-generic/odp_crypto_null.c | 4 +- platform/linux-generic/odp_crypto_openssl.c | 5 +- platform/linux-generic/odp_init.c | 67 +++++++++++++--------- platform/linux-generic/odp_packet_io.c | 6 +- platform/linux-generic/odp_pool.c | 8 +-- platform/linux-generic/odp_system_info.c | 4 +- platform/linux-generic/odp_thread.c | 8 +-- platform/linux-generic/odp_time.c | 4 +- platform/linux-generic/odp_timer.c | 14 ++++- platform/linux-generic/odp_traffic_mngr.c | 4 +- 13 files changed, 106 insertions(+), 83 deletions(-) hooks/post-receive --

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-253-gdda80b5e5

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 dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b (commit) from 50c2f41996707fb112feff9f044feddbbe762b78 (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 dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 18 10:24:05 2019 +0300 configure: disable static test applications without static odp lib Trying to build static test applications without static ODP library would fail. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/configure.ac b/configure.ac index 76e736c50..81123cbc6 100644 --- a/configure.ac +++ b/configure.ac @@ -294,6 +294,9 @@ AC_ARG_ENABLE([static-applications], [disable static linking of examples and tests] [ with ODP])], [], [enable_static_applications=yes]) +AS_IF([test "x$enable_static" != "xno" -a "x$enable_static_applications" != "xno"], + [enable_static_applications=yes], [enable_static_applications=no]) + AM_CONDITIONAL([STATIC_APPS], [test "x$enable_static_applications" != "xno"]) if test "x$DPDK_SHARED" = "xyes" -a "x$enable_static_applications" != "xno" ; then ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive --

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-252-g50c2f4199

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 50c2f41996707fb112feff9f044feddbbe762b78 (commit) via 92b2644a8e6a480cb1fa6477d6cbbb5886d34055 (commit) via 61e1586d93493d97372a6ecd186573a7743c6b35 (commit) via 3d7b31b04083e09a29cbb9d27d2f8750e905fa25 (commit) via ec8014ff0e9aa90b91d1059ff5f2003fe1062bd6 (commit) via ee2c1f7347ae32b2cde77e81dcaffb6afd2c4409 (commit) via b5f34142e905468aedd55a90196c720ddf43341c (commit) from 4d4a1700354eb591c287f6dfad53796c683b6187 (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 50c2f41996707fb112feff9f044feddbbe762b78 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 11 14:25:06 2019 +0300 linux-gen: pktio: remove invalid break in sock_recv_mq_tmo_try_int_driven() Break in the first for loop could cause the following loop to segfault due to an uninitialized value. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reported-by: Risto Teittinen <risto.teittinen(a)nokia-bell-labs.com> diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index b19a6f647..e3d5151a7 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -85,10 +85,8 @@ int sock_recv_mq_tmo_try_int_driven(const struct odp_pktin_queue_t queues[], impl = entry[i]->s.ops->recv_mq_tmo; impl_set = 1; } else { - if (impl != entry[i]->s.ops->recv_mq_tmo) { + if (impl != entry[i]->s.ops->recv_mq_tmo) impl = NULL; - break; - } } } commit 92b2644a8e6a480cb1fa6477d6cbbb5886d34055 Author: Matias Elo <matias.elo(a)nokia.com> Date: Fri Oct 11 10:00:27 2019 +0300 linux-gen: socket: prevent receive timeout functions returning too early Make sure sock_recv_tmo() and sock_recv_mq_tmo() won't return before either packets have been received or the timeout has expired. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index a1756b274..a6b399b50 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -331,10 +331,17 @@ static int sock_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) - return 0; + while (1) { + ret = select(maxfd + 1, &readfds, NULL, NULL, &timeout); + if (ret <= 0) + return 0; + + ret = sock_mmsg_recv(pktio_entry, index, pkt_table, num); + if (odp_likely(ret)) + return ret; - return sock_mmsg_recv(pktio_entry, index, pkt_table, num); + /* If no packets, continue wait until timeout expires */ + } } static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], @@ -357,9 +364,6 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], return ret; } - timeout.tv_sec = usecs / (1000 * 1000); - timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - FD_ZERO(&readfds); for (i = 0; i < num_q; i++) { @@ -368,20 +372,27 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], maxfd = maxfd2; } - if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) - return 0; + timeout.tv_sec = usecs / (1000 * 1000); + timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - for (i = 0; i < num_q; i++) { - ret = sock_mmsg_recv(pktio_entry[i], index[i], pkt_table, num); + while (1) { + ret = select(maxfd + 1, &readfds, NULL, NULL, &timeout); + if (ret <= 0) + return ret; - if (ret > 0 && from) - *from = i; + for (i = 0; i < num_q; i++) { + ret = sock_mmsg_recv(pktio_entry[i], index[i], + pkt_table, num); - if (ret != 0) - return ret; - } + if (ret > 0 && from) + *from = i; - return 0; + if (ret) + return ret; + } + + /* If no packets, continue wait until timeout expires */ + } } static inline uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, struct iovec *iovecs) commit 61e1586d93493d97372a6ecd186573a7743c6b35 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 10 17:15:00 2019 +0300 linux-gen: socket: prevent rx/tx lock false sharing Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index efa6b8847..a1756b274 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -30,6 +30,8 @@ #include <odp_classification_internal.h> typedef struct { + odp_ticketlock_t ODP_ALIGNED_CACHE rx_lock; + odp_ticketlock_t ODP_ALIGNED_CACHE tx_lock; int sockfd; /**< socket descriptor */ odp_pool_t pool; /**< pool to alloc packets from */ uint32_t mtu; /**< maximum transmission unit */ @@ -163,6 +165,9 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, if (err != 0) goto error; + odp_ticketlock_init(&pkt_sock->rx_lock); + odp_ticketlock_init(&pkt_sock->tx_lock); + return 0; error: @@ -226,9 +231,9 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, msgvec[i].msg_hdr.msg_iov = iovecs[i]; } - odp_ticketlock_lock(&pktio_entry->s.rxl); + odp_ticketlock_lock(&pkt_sock->rx_lock); recv_msgs = recvmmsg(sockfd, msgvec, nb_pkts, MSG_DONTWAIT, NULL); - odp_ticketlock_unlock(&pktio_entry->s.rxl); + odp_ticketlock_unlock(&pkt_sock->rx_lock); if (pktio_entry->s.config.pktin.bit.ts_all || pktio_entry->s.config.pktin.bit.ts_ptp) { @@ -418,7 +423,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, iovecs[i]); } - odp_ticketlock_lock(&pktio_entry->s.txl); + odp_ticketlock_lock(&pkt_sock->tx_lock); for (i = 0; i < num; ) { ret = sendmmsg(sockfd, &msgvec[i], num - i, MSG_DONTWAIT); @@ -426,7 +431,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, if (i == 0 && SOCK_ERR_REPORT(errno)) { __odp_errno = errno; ODP_ERR("sendmmsg(): %s\n", strerror(errno)); - odp_ticketlock_unlock(&pktio_entry->s.txl); + odp_ticketlock_unlock(&pkt_sock->tx_lock); return -1; } break; @@ -435,7 +440,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, i += ret; } - odp_ticketlock_unlock(&pktio_entry->s.txl); + odp_ticketlock_unlock(&pkt_sock->tx_lock); odp_packet_free_multi(pkt_table, i); commit 3d7b31b04083e09a29cbb9d27d2f8750e905fa25 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 10 16:44:04 2019 +0300 linux-gen: socket: clean up includes Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 015239b88..efa6b8847 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -10,41 +10,24 @@ #include <sys/socket.h> #include <stdio.h> #include <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> #include <linux/if_packet.h> -#include <linux/filter.h> -#include <ctype.h> -#include <fcntl.h> #include <unistd.h> -#include <bits/wordsize.h> -#include <net/ethernet.h> -#include <netinet/ip.h> #include <arpa/inet.h> #include <stdint.h> #include <string.h> #include <net/if.h> -#include <inttypes.h> -#include <poll.h> #include <sys/ioctl.h> #include <errno.h> #include <sys/syscall.h> -#include <linux/ethtool.h> -#include <linux/sockios.h> #include <odp_api.h> #include <odp_socket_common.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_packet_io_stats.h> -#include <odp_align_internal.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> #include <odp_classification_internal.h> -#include <odp/api/hints.h> - -#include <protocols/eth.h> -#include <protocols/ip.h> typedef struct { int sockfd; /**< socket descriptor */ commit ec8014ff0e9aa90b91d1059ff5f2003fe1062bd6 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 10 15:32:34 2019 +0300 linux-gen: socket: optimize rx path performance Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 281a8a06d..015239b88 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -199,31 +199,26 @@ static int sock_mmsg_open(odp_pktio_t id ODP_UNUSED, static inline uint32_t _rx_pkt_to_iovec(odp_packet_t pkt, struct iovec *iovecs) { - odp_packet_seg_t seg = odp_packet_first_seg(pkt); + odp_packet_seg_t seg; uint32_t seg_count = odp_packet_num_segs(pkt); - uint32_t seg_id = 0; - uint32_t iov_count = 0; - uint8_t *ptr; - uint32_t seglen; - - for (seg_id = 0; seg_id < seg_count; ++seg_id) { - ptr = odp_packet_seg_data(pkt, seg); - seglen = odp_packet_seg_data_len(pkt, seg); - - if (ptr) { - iovecs[iov_count].iov_base = ptr; - iovecs[iov_count].iov_len = seglen; - iov_count++; - } - seg = odp_packet_next_seg(pkt, seg); + uint32_t i; + + if (odp_likely(seg_count) == 1) { + iovecs[0].iov_base = odp_packet_data(pkt); + iovecs[0].iov_len = odp_packet_len(pkt); + return 1; } - return iov_count; + seg = odp_packet_first_seg(pkt); + + for (i = 0; i < seg_count; i++) { + iovecs[i].iov_base = odp_packet_seg_data(pkt, seg); + iovecs[i].iov_len = odp_packet_seg_data_len(pkt, seg); + seg = odp_packet_next_seg(pkt, seg); + } + return i; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int num) { @@ -239,12 +234,6 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, int recv_msgs; int i; - odp_ticketlock_lock(&pktio_entry->s.rxl); - - if (pktio_entry->s.config.pktin.bit.ts_all || - pktio_entry->s.config.pktin.bit.ts_ptp) - ts = &ts_val; - memset(msgvec, 0, sizeof(msgvec)); nb_pkts = packet_alloc_multi(pool, pkt_sock->mtu, pkt_table, num); @@ -254,10 +243,15 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, msgvec[i].msg_hdr.msg_iov = iovecs[i]; } + odp_ticketlock_lock(&pktio_entry->s.rxl); recv_msgs = recvmmsg(sockfd, msgvec, nb_pkts, MSG_DONTWAIT, NULL); + odp_ticketlock_unlock(&pktio_entry->s.rxl); - if (ts != NULL) + if (pktio_entry->s.config.pktin.bit.ts_all || + pktio_entry->s.config.pktin.bit.ts_ptp) { ts_val = odp_time_global(); + ts = &ts_val; + } for (i = 0; i < recv_msgs; i++) { void *base = msgvec[i].msg_hdr.msg_iov->iov_base; @@ -309,17 +303,14 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, pktio_entry->s.config.parser.layer, pktio_entry->s.in_chksums); - pkt_hdr->input = pktio_entry->s.handle; packet_set_ts(pkt_hdr, ts); pkt_table[nb_rx++] = pkt; } /* Free unused pkt buffers */ - for (; i < nb_pkts; i++) - odp_packet_free(pkt_table[i]); - - odp_ticketlock_unlock(&pktio_entry->s.rxl); + if (i < nb_pkts) + odp_packet_free_multi(&pkt_table[i], nb_pkts - i); return nb_rx; } commit ee2c1f7347ae32b2cde77e81dcaffb6afd2c4409 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 10 15:32:13 2019 +0300 linux-gen: socket: optimize tx path performance Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 04c0cc788..281a8a06d 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -407,24 +407,25 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], static inline uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, struct iovec *iovecs) { - uint32_t pkt_len = odp_packet_len(pkt); - uint32_t offset = 0; - uint32_t iov_count = 0; - uint32_t seglen = 0; - - while (offset < pkt_len) { - iovecs[iov_count].iov_base = odp_packet_offset(pkt, offset, - &seglen, NULL); - iovecs[iov_count].iov_len = seglen; - iov_count++; - offset += seglen; + odp_packet_seg_t seg; + int seg_count = odp_packet_num_segs(pkt); + int i; + + if (odp_likely(seg_count == 1)) { + iovecs[0].iov_base = odp_packet_data(pkt); + iovecs[0].iov_len = odp_packet_len(pkt); + return 1; } - return iov_count; + + seg = odp_packet_first_seg(pkt); + for (i = 0; i < seg_count; i++) { + iovecs[i].iov_base = odp_packet_seg_data(pkt, seg); + iovecs[i].iov_len = odp_packet_seg_data_len(pkt, seg); + seg = odp_packet_next_seg(pkt, seg); + } + return i; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_table[], int num) { @@ -432,20 +433,19 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, struct mmsghdr msgvec[num]; struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; int ret; - int sockfd; - int n, i; - - odp_ticketlock_lock(&pktio_entry->s.txl); + int sockfd = pkt_sock->sockfd; + int i; - sockfd = pkt_sock->sockfd; memset(msgvec, 0, sizeof(msgvec)); for (i = 0; i < num; i++) { msgvec[i].msg_hdr.msg_iov = iovecs[i]; msgvec[i].msg_hdr.msg_iovlen = _tx_pkt_to_iovec(pkt_table[i], - iovecs[i]); + iovecs[i]); } + odp_ticketlock_lock(&pktio_entry->s.txl); + for (i = 0; i < num; ) { ret = sendmmsg(sockfd, &msgvec[i], num - i, MSG_DONTWAIT); if (odp_unlikely(ret <= -1)) { @@ -463,8 +463,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_unlock(&pktio_entry->s.txl); - for (n = 0; n < i; ++n) - odp_packet_free(pkt_table[n]); + odp_packet_free_multi(pkt_table, i); return i; } commit b5f34142e905468aedd55a90196c720ddf43341c Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 10 15:30:16 2019 +0300 linux-gen: socket: clean up standard socket pktio implementation Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index e7e0971c9..04c0cc788 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -1,5 +1,5 @@ /* Copyright (c) 2013-2018, Linaro Limited - * Copyright (c) 2013, Nokia Solutions and Networks + * Copyright (c) 2013-2019, Nokia Solutions and Networks * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -40,17 +40,12 @@ #include <odp_align_internal.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> -#include <odp_classification_datamodel.h> -#include <odp_classification_inlines.h> #include <odp_classification_internal.h> #include <odp/api/hints.h> #include <protocols/eth.h> #include <protocols/ip.h> -#define MAX_SEGS CONFIG_PACKET_MAX_SEGS -#define PACKET_JUMBO_LEN (9 * 1024) - typedef struct { int sockfd; /**< socket descriptor */ odp_pool_t pool; /**< pool to alloc packets from */ @@ -102,22 +97,6 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) #endif } - -/** Eth buffer start offset from u32-aligned address to make sure the following - * header (e.g. IP) starts at a 32-bit aligned address. - */ -#define ETHBUF_OFFSET (ODP_ALIGN_ROUNDUP(_ODP_ETHHDR_LEN, sizeof(uint32_t)) \ - - _ODP_ETHHDR_LEN) - -/** Round up buffer address to get a properly aliged eth buffer, i.e. aligned - * so that the next header always starts at a 32bit aligned address. - */ -#define ETHBUF_ALIGN(buf_ptr) ((uint8_t *)ODP_ALIGN_ROUNDUP_PTR((buf_ptr), \ - sizeof(uint32_t)) + ETHBUF_OFFSET) - -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_close(pktio_entry_t *pktio_entry) { pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); @@ -131,9 +110,6 @@ static int sock_close(pktio_entry_t *pktio_entry) return 0; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, odp_pool_t pool) { @@ -212,9 +188,6 @@ error: return -1; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_mmsg_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool) @@ -224,8 +197,7 @@ static int sock_mmsg_open(odp_pktio_t id ODP_UNUSED, return sock_setup_pkt(pktio_entry, devname, pool); } -static uint32_t _rx_pkt_to_iovec(odp_packet_t pkt, - struct iovec iovecs[MAX_SEGS]) +static inline uint32_t _rx_pkt_to_iovec(odp_packet_t pkt, struct iovec *iovecs) { odp_packet_seg_t seg = odp_packet_first_seg(pkt); uint32_t seg_count = odp_packet_num_segs(pkt); @@ -261,7 +233,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_time_t *ts = NULL; const int sockfd = pkt_sock->sockfd; struct mmsghdr msgvec[num]; - struct iovec iovecs[num][MAX_SEGS]; + struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; int nb_rx = 0; int nb_pkts; int recv_msgs; @@ -433,8 +405,7 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], return 0; } -static uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, - struct iovec iovecs[MAX_SEGS]) +static inline uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, struct iovec *iovecs) { uint32_t pkt_len = odp_packet_len(pkt); uint32_t offset = 0; @@ -459,7 +430,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, { pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); struct mmsghdr msgvec[num]; - struct iovec iovecs[num][MAX_SEGS]; + struct iovec iovecs[num][CONFIG_PACKET_MAX_SEGS]; int ret; int sockfd; int n, i; @@ -498,17 +469,11 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, return i; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) { return pkt_priv(pktio_entry)->mtu; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { @@ -516,9 +481,6 @@ static int sock_mac_addr_get(pktio_entry_t *pktio_entry, return ETH_ALEN; } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { @@ -526,9 +488,6 @@ static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, pktio_entry->s.name, enable); } -/* - * ODP_PACKET_SOCKET_MMSG: - */ static int sock_promisc_mode_get(pktio_entry_t *pktio_entry) { return promisc_mode_get_fd(pkt_priv(pktio_entry)->sockfd, @@ -564,9 +523,7 @@ static int sock_stats(pktio_entry_t *pktio_entry, return 0; } - return sock_stats_fd(pktio_entry, - stats, - pkt_priv(pktio_entry)->sockfd); + return sock_stats_fd(pktio_entry, stats, pkt_priv(pktio_entry)->sockfd); } static int sock_stats_reset(pktio_entry_t *pktio_entry) @@ -577,8 +534,7 @@ static int sock_stats_reset(pktio_entry_t *pktio_entry) return 0; } - return sock_stats_reset_fd(pktio_entry, - pkt_priv(pktio_entry)->sockfd); + return sock_stats_reset_fd(pktio_entry, pkt_priv(pktio_entry)->sockfd); } static int sock_init_global(void) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/pktio/pktio_common.c | 4 +- platform/linux-generic/pktio/socket.c | 227 +++++++++++----------------- 2 files changed, 87 insertions(+), 144 deletions(-) hooks/post-receive --

5 years, 3 months

[COMMIT] branch master updated. v1.21.0.0-245-g4d4a17003

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 4d4a1700354eb591c287f6dfad53796c683b6187 (commit) via 80ed0d187bb177f755720a02dd90d2a88b06a6d6 (commit) via e18bdce1546b4d68e891d5b697c784e1cbfaa33e (commit) via 94e56db4ab77bf0ac1ef6eae97b82f9fd9076ae9 (commit) via c2456cec47e3c0dc275074598b94ec8167e299f4 (commit) via 6fdd54e9ee04f350d31f3c93df3f100e47907625 (commit) via a1678f04d5c3af8f3c540a4c70f6ea726295ea7a (commit) via cf5c4d8ffab08baac185ab8d08d56201b33be198 (commit) via 5b540ecaf9a6ed3f9730c605367afd6fc7cc8d1d (commit) via 03c9d6d7ef29470067c2caef41c891b15a4d887d (commit) via 5536a1d38ad4aa827074fab400e6078408725996 (commit) via 774bd2784cb90c1d059c6dd35611a7e7adf149b9 (commit) via 51563bcb4d1d3cf84e8e4832626eed25363b89dd (commit) from 6ab6aa876354b68922e3fa038492a01beeb687a7 (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 4d4a1700354eb591c287f6dfad53796c683b6187 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 14:23:21 2019 +0300 linux-gen: cls: add supported terms into capability These 8 terms were implemented and tested, but not reported as supported by the capability call. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 24e35d2bc..9a299f51b 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -155,6 +156,12 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->max_cos = CLS_COS_MAX_ENTRY; capability->pmr_range_supported = false; capability->supported_terms.all_bits = 0; + capability->supported_terms.bit.len = 1; + capability->supported_terms.bit.ethtype_0 = 1; + capability->supported_terms.bit.ethtype_x = 1; + capability->supported_terms.bit.vlan_id_0 = 1; + capability->supported_terms.bit.vlan_id_x = 1; + capability->supported_terms.bit.dmac = 1; capability->supported_terms.bit.ip_proto = 1; capability->supported_terms.bit.udp_dport = 1; capability->supported_terms.bit.udp_sport = 1; @@ -162,6 +169,8 @@ int odp_cls_capability(odp_cls_capability_t *capability) capability->supported_terms.bit.tcp_sport = 1; capability->supported_terms.bit.sip_addr = 1; capability->supported_terms.bit.dip_addr = 1; + capability->supported_terms.bit.sip6_addr = 1; + capability->supported_terms.bit.dip6_addr = 1; capability->random_early_detection = ODP_SUPPORT_NO; capability->back_pressure = ODP_SUPPORT_NO; capability->threshold_red.all_bits = 0; commit 80ed0d187bb177f755720a02dd90d2a88b06a6d6 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 10:25:13 2019 +0300 validation: cls: test only supported PRM terms Check classifier capability and run PRM term tests only for supported terms. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 474c62dcf..47cdeaa76 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -14,9 +14,17 @@ static odp_pool_t pkt_pool; odp_atomic_u32_t seq; static cls_packet_info_t default_pkt_info; +static odp_cls_capability_t cls_capa; int classification_suite_pmr_init(void) { + memset(&cls_capa, 0, sizeof(odp_cls_capability_t)); + + if (odp_cls_capability(&cls_capa)) { + fprintf(stderr, "Classifier capability call failed.\n"); + return -1; + } + pkt_pool = pool_create("classification_pmr_pool"); if (ODP_POOL_INVALID == pkt_pool) { fprintf(stderr, "Packet pool creation failed.\n"); @@ -77,14 +85,17 @@ void configure_default_cos(odp_pktio_t pktio, odp_cos_t *cos, int classification_suite_pmr_term(void) { - int retcode = 0; + int ret = 0; if (0 != odp_pool_destroy(pkt_pool)) { fprintf(stderr, "pkt_pool destroy failed.\n"); - retcode = -1; + ret += -1; } - return retcode; + if (odp_cunit_print_inactive()) + ret += -1; + + return ret; } static void classification_test_pktin_classifier_flag(void) @@ -2029,24 +2040,114 @@ static void classification_test_pmr_term_tcp_dport_multi(void) _classification_test_pmr_term_tcp_dport(SHM_PKT_NUM_BUFS / 4); } +static int check_capa_tcp_dport(void) +{ + return cls_capa.supported_terms.bit.tcp_dport; +} + +static int check_capa_tcp_sport(void) +{ + return cls_capa.supported_terms.bit.tcp_sport; +} + +static int check_capa_udp_dport(void) +{ + return cls_capa.supported_terms.bit.udp_dport; +} + +static int check_capa_udp_sport(void) +{ + return cls_capa.supported_terms.bit.udp_sport; +} + +static int check_capa_ip_proto(void) +{ + return cls_capa.supported_terms.bit.ip_proto; +} + +static int check_capa_dmac(void) +{ + return cls_capa.supported_terms.bit.dmac; +} + +static int check_capa_ipv4_saddr(void) +{ + return cls_capa.supported_terms.bit.sip_addr; +} + +static int check_capa_ipv4_daddr(void) +{ + return cls_capa.supported_terms.bit.dip_addr; +} + +static int check_capa_ipv6_saddr(void) +{ + return cls_capa.supported_terms.bit.sip6_addr; +} + +static int check_capa_ipv6_daddr(void) +{ + return cls_capa.supported_terms.bit.dip6_addr; +} + +static int check_capa_packet_len(void) +{ + return cls_capa.supported_terms.bit.len; +} + +static int check_capa_vlan_id_0(void) +{ + return cls_capa.supported_terms.bit.vlan_id_0; +} + +static int check_capa_vlan_id_x(void) +{ + return cls_capa.supported_terms.bit.vlan_id_x; +} + +static int check_capa_ethtype_0(void) +{ + return cls_capa.supported_terms.bit.ethtype_0; +} + +static int check_capa_ethtype_x(void) +{ + return cls_capa.supported_terms.bit.ethtype_x; +} + odp_testinfo_t classification_suite_pmr[] = { - ODP_TEST_INFO(classification_test_pmr_term_tcp_dport), - ODP_TEST_INFO(classification_test_pmr_term_tcp_sport), - ODP_TEST_INFO(classification_test_pmr_term_udp_dport), - ODP_TEST_INFO(classification_test_pmr_term_udp_sport), - ODP_TEST_INFO(classification_test_pmr_term_ipproto), - ODP_TEST_INFO(classification_test_pmr_term_dmac), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_tcp_dport, + check_capa_tcp_dport), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_tcp_sport, + check_capa_tcp_sport), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_udp_dport, + check_capa_udp_dport), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_udp_sport, + check_capa_udp_sport), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipproto, + check_capa_ip_proto), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_dmac, + check_capa_dmac), ODP_TEST_INFO(classification_test_pmr_pool_set), ODP_TEST_INFO(classification_test_pmr_queue_set), - ODP_TEST_INFO(classification_test_pmr_term_ipv4_saddr), - ODP_TEST_INFO(classification_test_pmr_term_ipv4_daddr), - ODP_TEST_INFO(classification_test_pmr_term_ipv6saddr), - ODP_TEST_INFO(classification_test_pmr_term_ipv6daddr), - ODP_TEST_INFO(classification_test_pmr_term_packet_len), - ODP_TEST_INFO(classification_test_pmr_term_vlan_id_0), - ODP_TEST_INFO(classification_test_pmr_term_vlan_id_x), - ODP_TEST_INFO(classification_test_pmr_term_eth_type_0), - ODP_TEST_INFO(classification_test_pmr_term_eth_type_x), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv4_saddr, + check_capa_ipv4_saddr), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv4_daddr, + check_capa_ipv4_daddr), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv6saddr, + check_capa_ipv6_saddr), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_ipv6daddr, + check_capa_ipv6_daddr), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_packet_len, + check_capa_packet_len), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_vlan_id_0, + check_capa_vlan_id_0), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_vlan_id_x, + check_capa_vlan_id_x), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_eth_type_0, + check_capa_ethtype_0), + ODP_TEST_INFO_CONDITIONAL(classification_test_pmr_term_eth_type_x, + check_capa_ethtype_x), ODP_TEST_INFO(classification_test_pktin_classifier_flag), ODP_TEST_INFO(classification_test_pmr_term_tcp_dport_multi), ODP_TEST_INFO_NULL, diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index c58f5e68f..9df869ece 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -137,6 +137,9 @@ int classification_suite_term(void) odp_pool_destroy(pool_list[i]); } + if (odp_cunit_print_inactive()) + retcode = -1; + return retcode; } commit e18bdce1546b4d68e891d5b697c784e1cbfaa33e Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 15:08:54 2019 +0300 validation: tm: print inactive tests on terminate Print inactive tests on suite terminate. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index ff35b7b91..2b0b99325 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -2104,6 +2104,9 @@ static int traffic_mngr_suite_term(void) return -1; } + if (odp_cunit_print_inactive()) + return -1; + return 0; } commit 94e56db4ab77bf0ac1ef6eae97b82f9fd9076ae9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 15:06:24 2019 +0300 validation: sched: print inactive tests on terminate Print inactive tests on suite terminate. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 6332302b9..da87deaef 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -2135,6 +2135,9 @@ static int scheduler_suite_term(void) if (odp_shm_free(shm) != 0) fprintf(stderr, "error: failed to free shm\n"); + if (odp_cunit_print_inactive()) + return -1; + return 0; } commit c2456cec47e3c0dc275074598b94ec8167e299f4 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 14:59:45 2019 +0300 validation: pktio: print inactive tests on terminate Print inactive tests on suite terminate. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index e23e7d0c4..896855006 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -577,6 +577,9 @@ int parser_suite_term(void) ret = -1; } + if (odp_cunit_print_inactive()) + ret = -1; + return ret; } diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index f035b8cd4..f8796c7da 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -2830,6 +2830,9 @@ static int pktio_suite_term(void) } default_pkt_pool = ODP_POOL_INVALID; + if (odp_cunit_print_inactive()) + ret = -1; + return ret; } commit 6fdd54e9ee04f350d31f3c93df3f100e47907625 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 12:39:32 2019 +0300 validation: ipsec: use odp_cunit_print_inactive on term Use the common function to print inactive tests on suite terminate. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 580190502..6a6a3be96 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -883,36 +883,25 @@ int ipsec_suite_init(void) return rc < 0 ? -1 : 0; } -static int ipsec_suite_term(odp_testinfo_t *suite) +static int ipsec_suite_term(void) { - int i; - int first = 1; - if (suite_context.pktio != ODP_PKTIO_INVALID) pktio_stop(suite_context.pktio); - for (i = 0; suite[i].name; i++) { - if (suite[i].check_active && - suite[i].check_active() == ODP_TEST_INACTIVE) { - if (first) { - first = 0; - printf("\n\n Inactive tests:\n"); - } - printf(" %s\n", suite[i].name); - } - } + if (odp_cunit_print_inactive()) + return -1; return 0; } int ipsec_in_term(void) { - return ipsec_suite_term(ipsec_in_suite); + return ipsec_suite_term(); } int ipsec_out_term(void) { - return ipsec_suite_term(ipsec_out_suite); + return ipsec_suite_term(); } int ipsec_init(odp_instance_t *inst) commit a1678f04d5c3af8f3c540a4c70f6ea726295ea7a Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 12:35:01 2019 +0300 validation: comp: remove suite terminate function Suite terminate function is not needed anymore as the default terminate function prints all skipped tests. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/comp/comp.c b/test/validation/api/comp/comp.c index 490d5577e..88a61da95 100644 --- a/test/validation/api/comp/comp.c +++ b/test/validation/api/comp/comp.c @@ -455,33 +455,15 @@ static odp_testinfo_t comp_suite[] = { ODP_TEST_INFO_NULL, }; -static int comp_suite_term(void) -{ - int i; - int first = 1; - - for (i = 0; comp_suite[i].name; i++) { - if (comp_suite[i].check_active && - comp_suite[i].check_active() == ODP_TEST_INACTIVE) { - if (first) { - first = 0; - printf("\n\n Inactive tests:\n"); - } - printf(" %s\n", comp_suite[i].name); - } - } - return 0; -} - /* Suite names */ #define ODP_COMP_SYNC_TEST "Comp/decomp sync test" #define ODP_COMP_ASYNC_TEST "Comp/decomp async test" static odp_suiteinfo_t comp_suites[] = { {ODP_COMP_SYNC_TEST, comp_suite_sync_init, - comp_suite_term, comp_suite}, + NULL, comp_suite}, {ODP_COMP_ASYNC_TEST, comp_suite_async_init, - comp_suite_term, comp_suite}, + NULL, comp_suite}, ODP_SUITE_INFO_NULL, }; commit cf5c4d8ffab08baac185ab8d08d56201b33be198 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 12:31:57 2019 +0300 validation: crypto: remove suite terminate function Suite terminate function is not needed anymore as the default terminate function prints all skipped tests. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index f0aa366cb..1710c23e2 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -2664,24 +2664,6 @@ odp_testinfo_t crypto_suite[] = { ODP_TEST_INFO_NULL, }; -static int crypto_suite_term(void) -{ - int i; - int first = 1; - - for (i = 0; crypto_suite[i].name; i++) { - if (crypto_suite[i].check_active && - crypto_suite[i].check_active() == ODP_TEST_INACTIVE) { - if (first) { - first = 0; - printf("\n\n Inactive tests:\n"); - } - printf(" %s\n", crypto_suite[i].name); - } - } - return 0; -} - /* Suite names */ #define ODP_CRYPTO_SYNC_INP "odp_crypto_sync_inp" #define ODP_CRYPTO_ASYNC_INP "odp_crypto_async_inp" @@ -2690,13 +2672,13 @@ static int crypto_suite_term(void) odp_suiteinfo_t crypto_suites[] = { {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, - crypto_suite_term, crypto_suite}, + NULL, crypto_suite}, {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, - crypto_suite_term, crypto_suite}, + NULL, crypto_suite}, {ODP_CRYPTO_PACKET_SYNC_INP, crypto_suite_packet_sync_init, - crypto_suite_term, crypto_suite}, + NULL, crypto_suite}, {ODP_CRYPTO_PACKET_ASYNC_INP, crypto_suite_packet_async_init, - crypto_suite_term, crypto_suite}, + NULL, crypto_suite}, ODP_SUITE_INFO_NULL, }; commit 5b540ecaf9a6ed3f9730c605367afd6fc7cc8d1d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 10 12:18:08 2019 +0300 validation: print names of inactive tests Print inactive tests by default on suite terminate. Use ODP_TEST_INFO_CONDITIONAL and a test case check function to mark a test active or inactive. By default, all tests are active. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index f6e7a0490..25895d628 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -1,4 +1,5 @@ /* Copyright (c) 2014-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -226,6 +227,52 @@ static int _cunit_suite_init(void) return ret; } +/* Print names of all inactive tests of the suite. This should be called by + * every suite terminate function. Otherwise, inactive tests are not listed in + * test suite results. */ +int odp_cunit_print_inactive(void) +{ + CU_pSuite cur_suite; + CU_pTest ptest; + odp_suiteinfo_t *sinfo; + odp_testinfo_t *tinfo; + int first = 1; + + cur_suite = CU_get_current_suite(); + if (cur_suite == NULL) + return -1; + + sinfo = cunit_get_suite_info(cur_suite->pName); + if (sinfo == NULL) + return -1; + + for (tinfo = sinfo->testinfo_tbl; tinfo->name; tinfo++) { + ptest = CU_get_test_by_name(tinfo->name, cur_suite); + if (ptest == NULL) { + fprintf(stderr, "%s: test not found: %s\n", + __func__, tinfo->name); + return -1; + } + + if (ptest->fActive) + continue; + + if (first) { + printf("\n\n Inactive tests:\n"); + first = 0; + } + + printf(" %s\n", tinfo->name); + } + + return 0; +} + +static int default_term_func(void) +{ + return odp_cunit_print_inactive(); +} + /* * Register suites and tests with CUnit. * @@ -238,10 +285,14 @@ static int cunit_register_suites(odp_suiteinfo_t testsuites[]) odp_testinfo_t *tinfo; CU_pSuite suite; CU_pTest test; + CU_CleanupFunc term_func; for (sinfo = testsuites; sinfo->name; sinfo++) { - suite = CU_add_suite(sinfo->name, - _cunit_suite_init, sinfo->term_func); + term_func = default_term_func; + if (sinfo->term_func) + term_func = sinfo->term_func; + + suite = CU_add_suite(sinfo->name, _cunit_suite_init, term_func); if (!suite) return CU_get_error(); diff --git a/test/common/odp_cunit_common.h b/test/common/odp_cunit_common.h index 52a8c1891..e8f14daa6 100644 --- a/test/common/odp_cunit_common.h +++ b/test/common/odp_cunit_common.h @@ -103,5 +103,6 @@ void odp_cunit_register_global_init(int (*func_init_ptr)(odp_instance_t *inst)); void odp_cunit_register_global_term(int (*func_term_ptr)(odp_instance_t inst)); int odp_cunit_ret(int val); +int odp_cunit_print_inactive(void); #endif /* ODP_CUNICT_COMMON_H */ commit 03c9d6d7ef29470067c2caef41c891b15a4d887d Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 9 15:51:20 2019 +0300 validation: cls: add ipv4 source address test Add test case for ODP_PMR_SIP_ADDR term. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index bdf9ccf45..474c62dcf 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -1,4 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited + * Copyright (c) 2019, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -1669,7 +1670,7 @@ static void classification_test_pmr_queue_set(void) odp_pktio_close(pktio); } -static void classification_test_pmr_term_daddr(void) +static void test_pmr_term_ipv4_addr(int dst) { odp_packet_t pkt; uint32_t seqno; @@ -1683,13 +1684,14 @@ static void classification_test_pmr_term_daddr(void) odp_pmr_t pmr; odp_cos_t cos; odp_cos_t default_cos; - uint32_t addr; - uint32_t mask; + uint32_t dst_addr, src_addr; + uint32_t dst_mask, src_mask; char cosname[ODP_QUEUE_NAME_LEN]; odp_pmr_param_t pmr_param; odp_cls_cos_param_t cls_param; odph_ipv4hdr_t *ip; - const char *dst_addr = "10.0.0.99/32"; + const char *src_str = "10.0.0.88/32"; + const char *dst_str = "10.0.0.99/32"; odph_ethhdr_t *eth; pktio = create_pktio(ODP_QUEUE_TYPE_SCHED, pkt_pool, true); @@ -1699,13 +1701,13 @@ static void classification_test_pmr_term_daddr(void) configure_default_cos(pktio, &default_cos, &default_queue, &default_pool); - queue = queue_create("daddr", true); + queue = queue_create("ipv4 addr", true); CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); - pool = pool_create("daddr"); + pool = pool_create("ipv4 addr"); CU_ASSERT_FATAL(pool != ODP_POOL_INVALID); - sprintf(cosname, "daddr"); + sprintf(cosname, "ipv4 addr"); odp_cls_cos_param_init(&cls_param); cls_param.pool = pool; cls_param.queue = queue; @@ -1714,25 +1716,36 @@ static void classification_test_pmr_term_daddr(void) cos = odp_cls_cos_create(cosname, &cls_param); CU_ASSERT_FATAL(cos != ODP_COS_INVALID); - parse_ipv4_string(dst_addr, &addr, &mask); + parse_ipv4_string(src_str, &src_addr, &src_mask); + parse_ipv4_string(dst_str, &dst_addr, &dst_mask); + odp_cls_pmr_param_init(&pmr_param); - pmr_param.term = ODP_PMR_DIP_ADDR; - pmr_param.match.value = &addr; - pmr_param.match.mask = &mask; - pmr_param.val_sz = sizeof(addr); + + if (dst) { + pmr_param.term = ODP_PMR_DIP_ADDR; + pmr_param.match.value = &dst_addr; + pmr_param.match.mask = &dst_mask; + pmr_param.val_sz = sizeof(dst_addr); + } else { + pmr_param.term = ODP_PMR_SIP_ADDR; + pmr_param.match.value = &src_addr; + pmr_param.match.mask = &src_mask; + pmr_param.val_sz = sizeof(src_addr); + } pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos); CU_ASSERT_FATAL(pmr != ODP_PMR_INVALID); - /* packet with dst ip address matching PMR rule to be - received in the CoS queue*/ + /* packet with IP address matching PMR rule to be + * received in the CoS queue */ pkt = create_packet(default_pkt_info); CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); odp_pktio_mac_addr(pktio, eth->src.addr, ODPH_ETHADDR_LEN); odp_pktio_mac_addr(pktio, eth->dst.addr, ODPH_ETHADDR_LEN); ip = (odph_ipv4hdr_t *)odp_packet_l3_ptr(pkt, NULL); - ip->dst_addr = odp_cpu_to_be_32(addr); + ip->src_addr = odp_cpu_to_be_32(src_addr); + ip->dst_addr = odp_cpu_to_be_32(dst_addr); odph_ipv4_csum_update(pkt); seqno = cls_pkt_get_seq(pkt); @@ -1774,6 +1787,16 @@ static void classification_test_pmr_term_daddr(void) odp_pktio_close(pktio); } +static void classification_test_pmr_term_ipv4_saddr(void) +{ + test_pmr_term_ipv4_addr(0); +} + +static void classification_test_pmr_term_ipv4_daddr(void) +{ + test_pmr_term_ipv4_addr(1); +} + static void classification_test_pmr_term_ipv6daddr(void) { odp_packet_t pkt; @@ -2015,7 +2038,8 @@ odp_testinfo_t classification_suite_pmr[] = { ODP_TEST_INFO(classification_test_pmr_term_dmac), ODP_TEST_INFO(classification_test_pmr_pool_set), ODP_TEST_INFO(classification_test_pmr_queue_set), - ODP_TEST_INFO(classification_test_pmr_term_daddr), + ODP_TEST_INFO(classification_test_pmr_term_ipv4_saddr), + ODP_TEST_INFO(classification_test_pmr_term_ipv4_daddr), ODP_TEST_INFO(classification_test_pmr_term_ipv6saddr), ODP_TEST_INFO(classification_test_pmr_term_ipv6daddr), ODP_TEST_INFO(classification_test_pmr_term_packet_len), commit 5536a1d38ad4aa827074fab400e6078408725996 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 9 16:30:10 2019 +0300 linux-gen: cls: add line feeds to error reports Add missing line feeds to ODP_ERR macro calls. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index eda283f4e..24e35d2bc 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -121,7 +121,7 @@ int odp_classification_init_global(void) int odp_classification_term_global(void) { if (cls_global && odp_shm_free(cls_global->shm)) { - ODP_ERR("shm free failed"); + ODP_ERR("shm free failed\n"); return -1; } @@ -260,7 +260,7 @@ odp_cos_t odp_cls_cos_create(const char *name, odp_cls_cos_param_t *param) UNLOCK(&cos->s.lock); } - ODP_ERR("CLS_COS_MAX_ENTRY reached"); + ODP_ERR("CLS_COS_MAX_ENTRY reached\n"); return ODP_COS_INVALID; } @@ -284,7 +284,7 @@ odp_pmr_t alloc_pmr(pmr_t **pmr) } UNLOCK(&pmr_tbl->pmr[i].s.lock); } - ODP_ERR("CLS_PMR_MAX_ENTRY reached"); + ODP_ERR("CLS_PMR_MAX_ENTRY reached\n"); return ODP_PMR_INVALID; } @@ -318,7 +318,7 @@ int odp_cos_destroy(odp_cos_t cos_id) cos_t *cos = get_cos_entry(cos_id); if (NULL == cos) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } @@ -331,12 +331,12 @@ int odp_cos_queue_set(odp_cos_t cos_id, odp_queue_t queue_id) cos_t *cos = get_cos_entry(cos_id); if (cos == NULL) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } if (cos->s.num_queue != 1) { - ODP_ERR("Hashing enabled, cannot set queue"); + ODP_ERR("Hashing enabled, cannot set queue\n"); return -1; } @@ -351,7 +351,7 @@ odp_queue_t odp_cos_queue(odp_cos_t cos_id) cos_t *cos = get_cos_entry(cos_id); if (!cos) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return ODP_QUEUE_INVALID; } @@ -363,7 +363,7 @@ uint32_t odp_cls_cos_num_queue(odp_cos_t cos_id) cos_t *cos = get_cos_entry(cos_id); if (!cos) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return 0; } @@ -380,7 +380,7 @@ uint32_t odp_cls_cos_queues(odp_cos_t cos_id, odp_queue_t queue[], cos = get_cos_entry(cos_id); if (!cos) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return 0; } @@ -409,7 +409,7 @@ int odp_cos_drop_set(odp_cos_t cos_id, odp_cls_drop_t drop_policy) cos_t *cos = get_cos_entry(cos_id); if (!cos) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } @@ -423,7 +423,7 @@ odp_cls_drop_t odp_cos_drop(odp_cos_t cos_id) cos_t *cos = get_cos_entry(cos_id); if (!cos) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } @@ -437,12 +437,12 @@ int odp_pktio_default_cos_set(odp_pktio_t pktio_in, odp_cos_t default_cos) entry = get_pktio_entry(pktio_in); if (entry == NULL) { - ODP_ERR("Invalid odp_pktio_t handle"); + ODP_ERR("Invalid odp_pktio_t handle\n"); return -1; } cos = get_cos_entry(default_cos); if (cos == NULL) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } @@ -457,13 +457,13 @@ int odp_pktio_error_cos_set(odp_pktio_t pktio_in, odp_cos_t error_cos) entry = get_pktio_entry(pktio_in); if (entry == NULL) { - ODP_ERR("Invalid odp_pktio_t handle"); + ODP_ERR("Invalid odp_pktio_t handle\n"); return -1; } cos = get_cos_entry(error_cos); if (cos == NULL) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } @@ -489,7 +489,7 @@ int odp_pktio_headroom_set(odp_pktio_t pktio_in, uint32_t headroom) pktio_entry_t *entry = get_pktio_entry(pktio_in); if (entry == NULL) { - ODP_ERR("Invalid odp_pktio_t handle"); + ODP_ERR("Invalid odp_pktio_t handle\n"); return -1; } entry->s.cls.headroom = headroom; @@ -507,7 +507,7 @@ int odp_cos_with_l2_priority(odp_pktio_t pktio_in, pktio_entry_t *entry = get_pktio_entry(pktio_in); if (entry == NULL) { - ODP_ERR("Invalid odp_pktio_t handle"); + ODP_ERR("Invalid odp_pktio_t handle\n"); return -1; } l2_cos = &entry->s.cls.l2_cos_table; @@ -537,7 +537,7 @@ int odp_cos_with_l3_qos(odp_pktio_t pktio_in, cos_t *cos; if (entry == NULL) { - ODP_ERR("Invalid odp_pktio_t handle"); + ODP_ERR("Invalid odp_pktio_t handle\n"); return -1; } @@ -655,7 +655,7 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, } if (num_terms > CLS_PMRTERM_MAX) { - ODP_ERR("no of terms greater than supported CLS_PMRTERM_MAX"); + ODP_ERR("no of terms greater than supported CLS_PMRTERM_MAX\n"); return ODP_PMR_INVALID; } @@ -696,7 +696,7 @@ int odp_cls_cos_pool_set(odp_cos_t cos_id, odp_pool_t pool) cos = get_cos_entry(cos_id); if (cos == NULL) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return -1; } @@ -711,7 +711,7 @@ odp_pool_t odp_cls_cos_pool(odp_cos_t cos_id) cos = get_cos_entry(cos_id); if (cos == NULL) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return ODP_POOL_INVALID; } commit 774bd2784cb90c1d059c6dd35611a7e7adf149b9 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 9 16:22:39 2019 +0300 linux-gen: cls: correct error message text Message text had a wrong error reported. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index ec4d2dc2f..eda283f4e 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -476,7 +476,7 @@ int odp_pktio_skip_set(odp_pktio_t pktio_in, uint32_t offset) pktio_entry_t *entry = get_pktio_entry(pktio_in); if (entry == NULL) { - ODP_ERR("Invalid odp_cos_t handle"); + ODP_ERR("Invalid odp_pktio_t handle\n"); return -1; } @@ -650,7 +650,7 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms, cos_t *cos_dst = get_cos_entry(dst_cos); if (NULL == cos_src || NULL == cos_dst) { - ODP_ERR("Invalid input handle"); + ODP_ERR("Invalid odp_cos_t handle\n"); return ODP_PMR_INVALID; } commit 51563bcb4d1d3cf84e8e4832626eed25363b89dd Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Mon Oct 7 17:16:00 2019 +0300 linux-gen: cls: switch-case missing default Add missing default case to the PMR term switch-case. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 9bf104e3b..ec4d2dc2f 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -832,6 +832,9 @@ int verify_pmr(pmr_t *pmr, const uint8_t *pkt_addr, odp_packet_hdr_t *pkt_hdr) break; case ODP_PMR_INNER_HDR_OFF: break; + default: + pmr_failure = 1; + break; } if (pmr_failure) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_classification.c | 58 ++++--- test/common/odp_cunit_common.c | 55 +++++- test/common/odp_cunit_common.h | 1 + .../classification/odp_classification_test_pmr.c | 189 +++++++++++++++++---- .../api/classification/odp_classification_tests.c | 3 + test/validation/api/comp/comp.c | 22 +-- test/validation/api/crypto/odp_crypto_test_inp.c | 26 +-- test/validation/api/ipsec/ipsec.c | 21 +-- test/validation/api/pktio/parser.c | 3 + test/validation/api/pktio/pktio.c | 3 + test/validation/api/scheduler/scheduler.c | 3 + test/validation/api/traffic_mngr/traffic_mngr.c | 3 + 12 files changed, 272 insertions(+), 115 deletions(-) hooks/post-receive --

5 years, 4 months

[COMMIT] branch master updated. v1.21.0.0-232-g6ab6aa876

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 6ab6aa876354b68922e3fa038492a01beeb687a7 (commit) from d766eab7821e292f112b9e80b430656cfa7027d1 (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 6ab6aa876354b68922e3fa038492a01beeb687a7 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 9 12:30:17 2019 +0300 example: ping: initialize len allways Initialize len allways to make an older compiler happy. It complains about potentially uninitialized variable, but this should happen only when odp_packet_l4_ptr() returns NULL (which is checked first). Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/ping/odp_ping.c b/example/ping/odp_ping.c index 819d4dd82..750f3a9e3 100644 --- a/example/ping/odp_ping.c +++ b/example/ping/odp_ping.c @@ -492,11 +492,11 @@ static uint16_t update_chksum(uint16_t chksum, uint16_t old, uint16_t new) static void icmp_reply(test_global_t *global, odp_packet_t pkt) { - uint32_t len; uint32_t dst_ip; odph_ipv4hdr_t *ip_hdr; odph_ethhdr_t *eth_hdr; uint16_t old, new; + uint32_t len = 0; int index = odp_packet_input_index(pkt); odp_pktout_queue_t pktout = global->pktio[index].pktout; odph_ethaddr_t *eth_addr = &global->pktio[index].eth_addr; ----------------------------------------------------------------------- Summary of changes: example/ping/odp_ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

5 years, 4 months

[COMMIT] branch master updated. v1.21.0.0-231-gd766eab78

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 d766eab7821e292f112b9e80b430656cfa7027d1 (commit) via 2901a9d3809a173e5ec2e377e86a3e4fcc4c4179 (commit) from c0b92b4bd2e27117afbaa4622c80f4dff549b4b1 (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 d766eab7821e292f112b9e80b430656cfa7027d1 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Thu Oct 3 16:08:30 2019 +0300 example: odp_ping: add new example application This application replies to IPv4 ping requests. It can be used to test connectivity with standard ping utility. ARP table needs to be setup manually on the sender side as the application does not reply to ARP requests. Test uses pcap packet IO to send 100 ICMP echo requests and receive the same number of echo replies. Pcap file sizes are compared to check that all packets were received. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/doc/application-api-guide/examples.dox b/doc/application-api-guide/examples.dox index ec982519f..93491a993 100644 --- a/doc/application-api-guide/examples.dox +++ b/doc/application-api-guide/examples.dox @@ -54,6 +54,11 @@ * L3 forwarding example application */ +/** + *@example odp_ping.c + * Example application which replies to ICMPv4 echo requests (ping) + */ + /** *@example odp_pktio.c * Basic packet IO loopback test application diff --git a/example/Makefile.am b/example/Makefile.am index 6115c1982..28362f2c1 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -8,6 +8,7 @@ SUBDIRS = classifier \ l2fwd_simple \ l3fwd \ packet \ + ping \ simple_pipeline \ switch \ sysinfo \ diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index 39f01d418..ab8b8b04d 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -27,6 +27,7 @@ AC_CONFIG_FILES([example/classifier/Makefile example/l2fwd_simple/Makefile example/l3fwd/Makefile example/packet/Makefile + example/ping/Makefile example/simple_pipeline/Makefile example/switch/Makefile example/sysinfo/Makefile diff --git a/example/ping/.gitignore b/example/ping/.gitignore new file mode 100644 index 000000000..12b2bef41 --- /dev/null +++ b/example/ping/.gitignore @@ -0,0 +1,4 @@ +odp_ping +*.log +*.trs +pcapout.pcap diff --git a/example/ping/Makefile.am b/example/ping/Makefile.am new file mode 100644 index 000000000..c5d59342c --- /dev/null +++ b/example/ping/Makefile.am @@ -0,0 +1,12 @@ +include $(top_srcdir)/example/Makefile.inc + +bin_PROGRAMS = odp_ping + +odp_ping_SOURCES = odp_ping.c + +if test_example +if HAVE_PCAP +TESTS = ping_run.sh +endif +endif +EXTRA_DIST = ping_run.sh icmp_echo_req.pcap diff --git a/example/ping/icmp_echo_req.pcap b/example/ping/icmp_echo_req.pcap new file mode 100644 index 000000000..1164a11c9 Binary files /dev/null and b/example/ping/icmp_echo_req.pcap differ diff --git a/example/ping/odp_ping.c b/example/ping/odp_ping.c new file mode 100644 index 000000000..819d4dd82 --- /dev/null +++ b/example/ping/odp_ping.c @@ -0,0 +1,694 @@ +/* Copyright (c) 2019, Nokia + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <string.h> +#include <signal.h> +#include <stdlib.h> +#include <stdint.h> +#include <inttypes.h> +#include <getopt.h> + +#include <odp_api.h> +#include <odp/helper/odph_api.h> + +#define MAX_PKTIOS 32 +#define MAX_PKTIO_NAME 255 +#define MAX_PKT_NUM 1024 + +typedef struct test_options_t { + uint64_t num_packet; + int verbose; + int num_pktio; + char pktio_name[MAX_PKTIOS][MAX_PKTIO_NAME + 1]; + +} test_options_t; + +typedef struct test_global_t { + test_options_t opt; + uint64_t rx_packets; + uint64_t tx_replies; + odp_pool_t pool; + int stop; + + struct { + odph_ethaddr_t eth_addr; + odp_pktio_t pktio; + odp_pktout_queue_t pktout; + int started; + + } pktio[MAX_PKTIOS]; + +} test_global_t; + +static test_global_t test_global; + +static void sig_handler(int signo) +{ + (void)signo; + + test_global.stop = 1; + odp_mb_full(); +} + +static void print_usage(void) +{ + printf("\n" + "ODP ping example. Replies to ICMPv4 ping requests.\n" + "\n" + "OPTIONS:\n" + " -i, --interface <name> Packet IO interfaces (comma-separated, no spaces)\n" + " -n, --num_packet <number> Exit after this many packets. Use 0 to run infinitely. Default 0.\n" + " -v, --verbose Print extra packet information.\n" + " -h, --help Display help and exit.\n\n"); +} + +static int parse_options(int argc, char *argv[], test_global_t *global) +{ + int i, opt, long_index; + char *name, *str; + int len, str_len; + + const struct option longopts[] = { + {"interface", required_argument, NULL, 'i'}, + {"num_packet", required_argument, NULL, 'n'}, + {"verbose", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + const char *shortopts = "+i:n:vh"; + int ret = 0; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; /* No more options */ + + switch (opt) { + case 'i': + i = 0; + str = optarg; + str_len = strlen(str); + + while (str_len > 0) { + len = strcspn(str, ","); + str_len -= len + 1; + + if (i == MAX_PKTIOS) { + printf("Error: Too many interfaces\n"); + ret = -1; + break; + } + + if (len > MAX_PKTIO_NAME) { + printf("Error: Too long interface name %s\n", + str); + ret = -1; + break; + } + + name = global->opt.pktio_name[i]; + memcpy(name, str, len); + str += len + 1; + i++; + } + + global->opt.num_pktio = i; + + break; + case 'n': + global->opt.num_packet = atoll(optarg); + break; + case 'v': + global->opt.verbose = 1; + break; + case 'h': + default: + print_usage(); + return -1; + } + } + + if (global->opt.num_pktio == 0) { + printf("Error: At least one pktio interface needed.\n"); + ret = -1; + } + + return ret; +} + +static int open_pktios(test_global_t *global) +{ + odp_pool_param_t pool_param; + odp_pktio_param_t pktio_param; + odp_pool_t pool; + odp_pool_capability_t pool_capa; + odp_pktio_t pktio; + odp_pktio_config_t pktio_config; + odp_pktin_queue_param_t pktin_param; + odp_pktout_queue_param_t pktout_param; + odp_pktout_queue_t pktout; + char *name; + int i, num_pktio; + uint32_t num_pkt = MAX_PKT_NUM; + + num_pktio = global->opt.num_pktio; + + if (odp_pool_capability(&pool_capa)) { + printf("Error: Pool capability failed.\n"); + return -1; + } + + if (pool_capa.pkt.max_num < MAX_PKT_NUM) + num_pkt = pool_capa.pkt.max_num; + + odp_pool_param_init(&pool_param); + pool_param.pkt.num = num_pkt; + pool_param.type = ODP_POOL_PACKET; + + pool = odp_pool_create("packet pool", &pool_param); + + global->pool = pool; + + if (pool == ODP_POOL_INVALID) { + printf("Error: Pool create.\n"); + return -1; + } + + odp_pktio_param_init(&pktio_param); + pktio_param.in_mode = ODP_PKTIN_MODE_SCHED; + pktio_param.out_mode = ODP_PKTOUT_MODE_DIRECT; + + for (i = 0; i < num_pktio; i++) + global->pktio[i].pktio = ODP_PKTIO_INVALID; + + /* Open and configure interfaces */ + for (i = 0; i < num_pktio; i++) { + name = global->opt.pktio_name[i]; + pktio = odp_pktio_open(name, pool, &pktio_param); + + if (pktio == ODP_PKTIO_INVALID) { + printf("Error (%s): Pktio open failed.\n", name); + return -1; + } + + global->pktio[i].pktio = pktio; + + odp_pktio_print(pktio); + + if (odp_pktio_mac_addr(pktio, + &global->pktio[i].eth_addr.addr, + ODPH_ETHADDR_LEN) != ODPH_ETHADDR_LEN) { + printf("Error (%s): MAC address read failed.\n", name); + return -1; + } + + odp_pktio_config_init(&pktio_config); + pktio_config.pktin.bit.ts_all = 1; + pktio_config.parser.layer = ODP_PROTO_LAYER_ALL; + + odp_pktio_config(pktio, &pktio_config); + + odp_pktin_queue_param_init(&pktin_param); + + pktin_param.queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT; + pktin_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC; + pktin_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL; + pktin_param.num_queues = 1; + + if (odp_pktin_queue_config(pktio, &pktin_param)) { + printf("Error (%s): Pktin config failed.\n", name); + return -1; + } + + odp_pktout_queue_param_init(&pktout_param); + pktout_param.num_queues = 1; + + if (odp_pktout_queue_config(pktio, &pktout_param)) { + printf("Error (%s): Pktout config failed.\n", name); + return -1; + } + + if (odp_pktout_queue(pktio, &pktout, 1) != 1) { + printf("Error (%s): Pktout queue request failed.\n", + name); + return -1; + } + + global->pktio[i].pktout = pktout; + } + + return 0; +} + +static int start_pktios(test_global_t *global) +{ + int i; + + for (i = 0; i < global->opt.num_pktio; i++) { + if (odp_pktio_start(global->pktio[i].pktio)) { + printf("Error (%s): Pktio start failed.\n", + global->opt.pktio_name[i]); + + return -1; + } + + global->pktio[i].started = 1; + } + + return 0; +} + +static int stop_pktios(test_global_t *global) +{ + odp_pktio_t pktio; + int i, ret = 0; + + for (i = 0; i < global->opt.num_pktio; i++) { + pktio = global->pktio[i].pktio; + + if (pktio == ODP_PKTIO_INVALID || global->pktio[i].started == 0) + continue; + + if (odp_pktio_stop(pktio)) { + printf("Error (%s): Pktio stop failed.\n", + global->opt.pktio_name[i]); + ret = -1; + } + } + + return ret; +} + +static void empty_queues(void) +{ + odp_event_t ev; + uint64_t wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS / 2); + + /* Drop all events from all queues */ + while (1) { + ev = odp_schedule(NULL, wait_time); + + if (ev == ODP_EVENT_INVALID) + break; + + odp_event_free(ev); + } +} + +static int close_pktios(test_global_t *global) +{ + odp_pktio_t pktio; + odp_pool_t pool; + int i, ret = 0; + + for (i = 0; i < global->opt.num_pktio; i++) { + pktio = global->pktio[i].pktio; + + if (pktio == ODP_PKTIO_INVALID) + continue; + + if (odp_pktio_close(pktio)) { + printf("Error (%s): Pktio close failed.\n", + global->opt.pktio_name[i]); + ret = -1; + } + } + + pool = global->pool; + + if (pool == ODP_POOL_INVALID) + return ret; + + if (odp_pool_destroy(pool)) { + printf("Error: Pool destroy failed.\n"); + ret = -1; + } + + return ret; +} + +static void print_mac_addr(uint8_t *addr) +{ + printf("%02x:%02x:%02x:%02x:%02x:%02x\n", + addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); +} + +static void print_ipv4_addr(uint8_t *addr) +{ + printf("%u.%u.%u.%u\n", + addr[0], addr[1], addr[2], addr[3]); +} + +static void print_data(odp_packet_t pkt, uint32_t offset, uint32_t len) +{ + const uint32_t bytes_per_row = 16; + const uint32_t num_char = 1 + (bytes_per_row * 3) + 1; + uint8_t data[bytes_per_row]; + char row[num_char]; + uint32_t copy_len, i, j; + uint32_t data_len = odp_packet_len(pkt); + + if (offset > data_len) + return; + + if (offset + len > data_len) + len = data_len - offset; + + while (len) { + i = 0; + + if (len > bytes_per_row) + copy_len = bytes_per_row; + else + copy_len = len; + + odp_packet_copy_to_mem(pkt, offset, copy_len, data); + + i += snprintf(&row[i], num_char - i, " "); + + for (j = 0; j < copy_len; j++) + i += snprintf(&row[i], num_char - i, " %02x", data[j]); + + row[i] = 0; + printf("%s\n", row); + + len -= copy_len; + offset += copy_len; + } +} + +static void print_packet(odp_packet_t pkt, uint64_t num_packet) +{ + odp_pktio_t pktio; + odp_pktio_info_t pktio_info; + odp_time_t time; + uint64_t sec, nsec; + uint32_t offset; + uint8_t *data = odp_packet_data(pkt); + uint32_t seg_len = odp_packet_seg_len(pkt); + uint32_t l2_offset = odp_packet_l2_offset(pkt); + uint32_t l3_offset = odp_packet_l3_offset(pkt); + uint32_t l4_offset = odp_packet_l4_offset(pkt); + uint32_t data_len = odp_packet_len(pkt); + int icmp = odp_packet_has_icmp(pkt); + int ipv4 = odp_packet_has_ipv4(pkt); + + if (odp_packet_has_ts(pkt)) + time = odp_packet_ts(pkt); + else + time = odp_time_local(); + + nsec = odp_time_to_ns(time); + sec = nsec / ODP_TIME_SEC_IN_NS; + nsec = nsec - (sec * ODP_TIME_SEC_IN_NS); + pktio = odp_packet_input(pkt); + + odp_pktio_info(pktio, &pktio_info); + + printf("PACKET [%" PRIu64 "]\n", num_packet); + printf(" time: %" PRIu64 ".%09" PRIu64 " sec\n", sec, nsec); + printf(" interface name: %s\n", pktio_info.name); + printf(" packet length: %u bytes\n", odp_packet_len(pkt)); + + /* L2 */ + if (odp_packet_has_eth(pkt)) { + printf(" Ethernet offset: %u bytes\n", l2_offset); + offset = l2_offset; + if (offset + 6 <= seg_len) { + printf(" dst address: "); + print_mac_addr(data + offset); + } + + offset = l2_offset + 6; + if (offset + 6 <= seg_len) { + printf(" src address: "); + print_mac_addr(data + offset); + } + } else if (odp_packet_has_l2(pkt)) { + printf(" L2 (%i) offset: %u bytes\n", + odp_packet_l2_type(pkt), l2_offset); + } + + /* L3 */ + if (ipv4) { + printf(" IPv4 offset: %u bytes\n", l3_offset); + offset = l3_offset + 12; + if (offset + 4 <= seg_len) { + printf(" src address: "); + print_ipv4_addr(data + offset); + } + + offset = l3_offset + 16; + if (offset + 4 <= seg_len) { + printf(" dst address: "); + print_ipv4_addr(data + offset); + } + } else if (odp_packet_has_ipv6(pkt)) { + printf(" IPv6 offset: %u bytes\n", l3_offset); + } else if (odp_packet_has_l3(pkt)) { + printf(" L3 (%i) offset: %u bytes\n", + odp_packet_l3_type(pkt), l3_offset); + } + + /* L4 */ + if (icmp) { + printf(" ICMP offset: %u bytes\n", l4_offset); + if (ipv4) { + uint32_t len; + uint8_t *u8 = odp_packet_l4_ptr(pkt, &len); + + if (u8 && len >= 2) { + printf(" type: %u\n", u8[0]); + printf(" code: %u\n", u8[1]); + } + } + } else if (odp_packet_has_l4(pkt)) { + printf(" L4 (%i) offset: %u bytes\n", + odp_packet_l4_type(pkt), l4_offset); + } + + print_data(pkt, 0, data_len); + + printf("\n"); +} + +/* Updated checksum when a 16 bit word has been changed from old to new */ +static uint16_t update_chksum(uint16_t chksum, uint16_t old, uint16_t new) +{ + uint16_t chksum_comp = ~chksum; + uint16_t old_comp = ~old; + uint32_t sum = chksum_comp + old_comp + new; + + while (sum >> 16) + sum = (sum & 0xffff) + (sum >> 16); + + return ~sum; +} + +static void icmp_reply(test_global_t *global, odp_packet_t pkt) +{ + uint32_t len; + uint32_t dst_ip; + odph_ipv4hdr_t *ip_hdr; + odph_ethhdr_t *eth_hdr; + uint16_t old, new; + int index = odp_packet_input_index(pkt); + odp_pktout_queue_t pktout = global->pktio[index].pktout; + odph_ethaddr_t *eth_addr = &global->pktio[index].eth_addr; + int icmp = odp_packet_has_icmp(pkt); + int ipv4 = odp_packet_has_ipv4(pkt); + int eth = odp_packet_has_eth(pkt); + odph_icmphdr_t *icmp_hdr = odp_packet_l4_ptr(pkt, &len); + + if (odp_packet_has_error(pkt)) + goto error; + + if (eth == 0 || ipv4 == 0 || icmp == 0) + goto error; + + /* ICMP type, code and chksum fields are located in the first 4 bytes */ + if (icmp_hdr == NULL || len < 4) + goto error; + + if (icmp_hdr->type != 8 || icmp_hdr->code != 0) + goto error; + + /* Echo reply */ + old = *(uint16_t *)(uintptr_t)icmp_hdr; + icmp_hdr->type = 0; + new = *(uint16_t *)(uintptr_t)icmp_hdr; + icmp_hdr->chksum = update_chksum(icmp_hdr->chksum, old, new); + + /* Swap IP addresses */ + ip_hdr = odp_packet_l3_ptr(pkt, &len); + if (ip_hdr == NULL || len < 20) + goto error; + + dst_ip = ip_hdr->dst_addr; + ip_hdr->dst_addr = ip_hdr->src_addr; + ip_hdr->src_addr = dst_ip; + + /* Swap Ethernet addresses */ + eth_hdr = odp_packet_l2_ptr(pkt, &len); + if (eth_hdr == NULL || len < 14) + goto error; + + eth_hdr->dst = eth_hdr->src; + eth_hdr->src = *eth_addr; + + if (odp_pktout_send(pktout, &pkt, 1) != 1) + goto error; + + global->tx_replies++; + return; + +error: + odp_packet_free(pkt); +} + +static void print_stat(test_global_t *global, uint64_t rx_packets, + uint64_t diff_ns) +{ + uint64_t prev = global->rx_packets; + double per_sec = 1000000000.0 * (rx_packets - prev) / diff_ns; + + printf("Received %" PRIu64 " packets (%.1f / sec). " + "Sent %" PRIu64 " replies.\n", + rx_packets, per_sec, global->tx_replies); + + global->rx_packets = rx_packets; +} + +static int receive_packets(test_global_t *global) +{ + odp_event_t ev; + odp_packet_t pkt; + uint64_t diff_ns; + int print = 0; + uint64_t num_packet = 0; + uint64_t wait = odp_schedule_wait_time(ODP_TIME_MSEC_IN_NS); + odp_time_t cur = odp_time_local(); + odp_time_t prev = cur; + + while (!global->stop) { + ev = odp_schedule(NULL, wait); + + cur = odp_time_local(); + diff_ns = odp_time_diff_ns(cur, prev); + if (diff_ns >= ODP_TIME_SEC_IN_NS) { + prev = cur; + print = 1; + } + + if (ev == ODP_EVENT_INVALID) { + if (print) { + print_stat(global, num_packet, diff_ns); + print = 0; + } + continue; + } + + if (odp_event_type(ev) != ODP_EVENT_PACKET) { + printf("Bad event type: %i\n", odp_event_type(ev)); + odp_event_free(ev); + continue; + } + + pkt = odp_packet_from_event(ev); + + if (global->opt.verbose) + print_packet(pkt, num_packet); + + /* Reply or drop packet */ + icmp_reply(global, pkt); + + num_packet++; + if (print) { + print_stat(global, num_packet, diff_ns); + print = 0; + } + + if (global->opt.num_packet && + num_packet >= global->opt.num_packet) + break; + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + odp_instance_t instance; + test_global_t *global; + int ret = 0; + + global = &test_global; + memset(global, 0, sizeof(test_global_t)); + + signal(SIGINT, sig_handler); + + if (parse_options(argc, argv, global)) + return -1; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, NULL, NULL)) { + printf("Error: Global init failed.\n"); + return -1; + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { + printf("Error: Local init failed.\n"); + return -1; + } + + global->pool = ODP_POOL_INVALID; + + odp_schedule_config(NULL); + + odp_sys_info_print(); + + if (open_pktios(global)) { + printf("Error: pktio open failed\n"); + return -1; + } + + if (start_pktios(global)) { + printf("Error: pktio start failed\n"); + return -1; + } + + if (receive_packets(global)) { + printf("Error: packet receive failed\n"); + return -1; + } + + if (stop_pktios(global)) { + printf("Error: pktio stop failed\n"); + return -1; + } + + empty_queues(); + + if (close_pktios(global)) { + printf("Error: pktio close failed\n"); + return -1; + } + + if (odp_term_local()) { + printf("Error: term local failed.\n"); + return -1; + } + + if (odp_term_global(instance)) { + printf("Error: term global failed.\n"); + return -1; + } + + return ret; +} diff --git a/example/ping/ping_run.sh b/example/ping/ping_run.sh new file mode 100755 index 000000000..d61a352d0 --- /dev/null +++ b/example/ping/ping_run.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Copyright (c) 2019, Nokia +# All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name icmp_echo_req.pcap -print -quit` +PCAP_OUT="pcapout.pcap" +PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` +echo "using PCAP in=${PCAP_IN}:out=${PCAP_OUT} size %${PCAP_IN_SIZE}" + +# Ping test with 100 ICMP echo request packets (verbose mode) +./odp_ping${EXEEXT} -v -n 100 -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} +STATUS=$? +PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` +rm -f ${PCAP_OUT} + +if [ ${STATUS} -ne 0 ] || [ ${PCAP_IN_SIZE} -ne ${PCAP_OUT_SIZE} ]; then + echo "Error: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" + exit 1 +fi +echo "Pass: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}" + +exit 0 commit 2901a9d3809a173e5ec2e377e86a3e4fcc4c4179 Author: Petri Savolainen <petri.savolainen(a)nokia.com> Date: Wed Oct 2 16:17:25 2019 +0300 example: packet_dump: add icmp support Print ICMP offset and ICMPv4 type/code. This helps to verify that ping requests are received. Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com> Reviewed-by: Matias Elo <matias.elo(a)nokia.com> diff --git a/example/packet/odp_packet_dump.c b/example/packet/odp_packet_dump.c index 4e3aec8f1..69987c596 100644 --- a/example/packet/odp_packet_dump.c +++ b/example/packet/odp_packet_dump.c @@ -446,6 +446,8 @@ static int print_packet(test_global_t *global, odp_packet_t pkt, int tcp = odp_packet_has_tcp(pkt); int udp = odp_packet_has_udp(pkt); int sctp = odp_packet_has_sctp(pkt); + int icmp = odp_packet_has_icmp(pkt); + int ipv4 = odp_packet_has_ipv4(pkt); if (odp_packet_has_ts(pkt)) time = odp_packet_ts(pkt); @@ -518,7 +520,7 @@ static int print_packet(test_global_t *global, odp_packet_t pkt, } /* L3 */ - if (odp_packet_has_ipv4(pkt)) { + if (ipv4) { printf(" IPv4 offset: %u bytes\n", l3_offset); offset = l3_offset + 12; if (offset + 4 <= seg_len) { @@ -558,6 +560,17 @@ static int print_packet(test_global_t *global, odp_packet_t pkt, printf(" dst port: "); print_port(data + offset); } + } else if (icmp) { + printf(" ICMP offset: %u bytes\n", l4_offset); + if (ipv4) { + uint32_t len; + uint8_t *u8 = odp_packet_l4_ptr(pkt, &len); + + if (u8 && len >= 2) { + printf(" type: %u\n", u8[0]); + printf(" code: %u\n", u8[1]); + } + } } else if (odp_packet_has_l4(pkt)) { printf(" L4 (%i) offset: %u bytes\n", odp_packet_l4_type(pkt), l4_offset); ----------------------------------------------------------------------- Summary of changes: doc/application-api-guide/examples.dox | 5 + example/Makefile.am | 1 + example/m4/configure.m4 | 1 + example/packet/odp_packet_dump.c | 15 +- example/ping/.gitignore | 4 + example/ping/Makefile.am | 12 + example/ping/icmp_echo_req.pcap | Bin 0 -> 11424 bytes .../{packet/odp_packet_dump.c => ping/odp_ping.c} | 321 +++++++++++---------- .../{l3fwd/odp_l3fwd_run.sh => ping/ping_run.sh} | 12 +- 9 files changed, 207 insertions(+), 164 deletions(-) create mode 100644 example/ping/.gitignore create mode 100644 example/ping/Makefile.am create mode 100644 example/ping/icmp_echo_req.pcap copy example/{packet/odp_packet_dump.c => ping/odp_ping.c} (72%) copy example/{l3fwd/odp_l3fwd_run.sh => ping/ping_run.sh} (59%) hooks/post-receive --

5 years, 4 months

[COMMIT] branch master updated. v1.21.0.0-229-gc0b92b4bd

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 c0b92b4bd2e27117afbaa4622c80f4dff549b4b1 (commit) via 18abf931651e3f21bc858efc2f1df50f24821611 (commit) via 60a830b9e000053caab24a0befb578551ba1766b (commit) from 8d6733aad3e23cbb3813ee7161edb7ae7f9402df (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 c0b92b4bd2e27117afbaa4622c80f4dff549b4b1 Author: Matias Elo <matias.elo(a)nokia.com> Date: Thu Oct 3 10:16:48 2019 +0300 linux-gen: rename implementation internal autoheader defines Rename implementation internal defines so that they stand out from the API defines. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/configure.ac b/configure.ac index e665c10c6..76e736c50 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,7 @@ AS_IF([test "${with_platform}" = "linux-generic"], [m4_include([./platform/linux-generic/m4/configure.m4])], [AC_MSG_ERROR([UNSUPPORTED PLATFORM: ${with_platform}])]) -AC_DEFINE_UNQUOTED([ODP_IMPLEMENTATION_NAME], ["$ODP_IMPLEMENTATION_NAME"], +AC_DEFINE_UNQUOTED([_ODP_IMPLEMENTATION_NAME], ["$ODP_IMPLEMENTATION_NAME"], [Define to the name of the implementation]) AM_CONDITIONAL([ODP_USE_CONFIG], [test "x$odp_use_config" = "xtrue"]) diff --git a/include/odp/autoheader_internal.h.in b/include/odp/autoheader_internal.h.in index 4d1d17f4f..d8db90ec4 100644 --- a/include/odp/autoheader_internal.h.in +++ b/include/odp/autoheader_internal.h.in @@ -3,22 +3,22 @@ #define ODP_AUTOHEADER_INTERNAL_H_ /* Define to the name of the implementation */ -#undef ODP_IMPLEMENTATION_NAME +#undef _ODP_IMPLEMENTATION_NAME /* Define to name default scheduler */ -#undef ODP_SCHEDULE_DEFAULT +#undef _ODP_SCHEDULE_DEFAULT /* Define to 1 if numa library is usable */ #undef _ODP_HAVE_NUMA_LIBRARY -/* Define to 1 to enable DPDK zero copy support */ -#undef ODP_DPDK_ZERO_COPY +/* Define to 1 to enable DPDK packet I/O support */ +#undef _ODP_PKTIO_DPDK -/* Define to 1 to enable netmap IO support */ -#undef ODP_NETMAP +/* Define to 1 to enable DPDK zero copy support */ +#undef _ODP_DPDK_ZERO_COPY -/* Define to 1 to enable DPDK packet I/O support */ -#undef ODP_PKTIO_DPDK +/* Define to 1 to enable netmap packet I/O support */ +#undef _ODP_PKTIO_NETMAP /* Define to 1 to enable pcap packet I/O support */ #undef _ODP_PKTIO_PCAP diff --git a/m4/odp_scheduler.m4 b/m4/odp_scheduler.m4 index 23cc7da39..1d4071394 100644 --- a/m4/odp_scheduler.m4 +++ b/m4/odp_scheduler.m4 @@ -6,6 +6,6 @@ AC_ARG_ENABLE([scheduler-default], [AS_HELP_STRING([enable-scheduler-default], [Choose default scheduler (default is basic)])], [], [enable_scheduler_default=basic]) -AC_DEFINE_UNQUOTED([ODP_SCHEDULE_DEFAULT], ["$enable_scheduler_default"], +AC_DEFINE_UNQUOTED([_ODP_SCHEDULE_DEFAULT], ["$enable_scheduler_default"], [Define to name default scheduler]) ]) # ODP_SCHEDULER diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 00b0fca36..d12db8339 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -54,11 +54,11 @@ extern "C" { /* Forward declaration */ struct pktio_if_ops; -#if defined(ODP_NETMAP) +#if defined(_ODP_PKTIO_NETMAP) #define PKTIO_PRIVATE_SIZE 74752 -#elif defined(ODP_PKTIO_DPDK) && ODP_CACHE_LINE_SIZE == 128 +#elif defined(_ODP_PKTIO_DPDK) && ODP_CACHE_LINE_SIZE == 128 #define PKTIO_PRIVATE_SIZE 10240 -#elif defined(ODP_PKTIO_DPDK) +#elif defined(_ODP_PKTIO_DPDK) #define PKTIO_PRIVATE_SIZE 5632 #else #define PKTIO_PRIVATE_SIZE 384 diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 7cbbf01c0..93b419bc4 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -41,9 +41,9 @@ then esac ODP_CHECK_CFLAG([-Wno-error=cast-align]) - AC_DEFINE([ODP_PKTIO_DPDK], [1], + AC_DEFINE([_ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) - AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], + AC_DEFINE_UNQUOTED([_ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) else pktio_dpdk_support=no diff --git a/platform/linux-generic/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index 85462c92e..b9c7bcbfe 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -31,8 +31,8 @@ if test x$netmap_support = xyes then AC_CHECK_HEADERS([net/netmap_user.h], [], [AC_MSG_FAILURE(["can't find netmap header"])]) - AC_DEFINE([ODP_NETMAP], [1], - [Define to 1 to enable netmap IO support]) + AC_DEFINE([_ODP_PKTIO_NETMAP], [1], + [Define to 1 to enable netmap packet I/O support]) AC_SUBST([NETMAP_CPPFLAGS]) else netmap_support=no diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c index 421766a30..f8af2c51f 100644 --- a/platform/linux-generic/odp_impl.c +++ b/platform/linux-generic/odp_impl.c @@ -9,7 +9,7 @@ #define ODP_VERSION_IMPL 0 #define ODP_VERSION_IMPL_STR \ - ODP_IMPLEMENTATION_NAME " " \ + _ODP_IMPLEMENTATION_NAME " " \ ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \ ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \ ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) "-" \ @@ -26,5 +26,5 @@ const char *odp_version_impl_str(void) const char *odp_version_impl_name(void) { - return ODP_IMPLEMENTATION_NAME; + return _ODP_IMPLEMENTATION_NAME; } diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 720a7f7bc..37c586df2 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -101,7 +101,7 @@ int _odp_queue_init_global(void) const char *sched = getenv("ODP_SCHEDULER"); if (sched == NULL || !strcmp(sched, "default")) - sched = ODP_SCHEDULE_DEFAULT; + sched = _ODP_SCHEDULE_DEFAULT; if (!strcmp(sched, "basic") || !strcmp(sched, "sp")) { queue_fn = &queue_basic_fn; diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 82a712d27..5ffa0a417 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -206,7 +206,7 @@ int _odp_schedule_init_global(void) const char *sched = getenv("ODP_SCHEDULER"); if (sched == NULL || !strcmp(sched, "default")) - sched = ODP_SCHEDULE_DEFAULT; + sched = _ODP_SCHEDULE_DEFAULT; ODP_PRINT("Using scheduler '%s'\n", sched); diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 13052286e..593f02813 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -6,7 +6,7 @@ #include <odp/autoheader_internal.h> -#ifdef ODP_PKTIO_DPDK +#ifdef _ODP_PKTIO_DPDK #include <odp_posix_extensions.h> @@ -65,7 +65,7 @@ #define rte_log_set_global_level rte_set_log_level #endif -#if ODP_DPDK_ZERO_COPY +#if _ODP_DPDK_ZERO_COPY ODP_STATIC_ASSERT(CONFIG_PACKET_HEADROOM == RTE_PKTMBUF_HEADROOM, "ODP and DPDK headroom sizes not matching!"); #endif @@ -465,7 +465,7 @@ int _odp_dpdk_pool_create(pool_t *pool) struct rte_mempool *pkt_pool; char pool_name[RTE_MEMPOOL_NAMESIZE]; - if (!ODP_DPDK_ZERO_COPY) + if (!_ODP_DPDK_ZERO_COPY) return 0; pool->pool_in_use = 0; @@ -492,7 +492,7 @@ uint32_t _odp_dpdk_pool_obj_size(pool_t *pool, uint32_t block_size) struct rte_mempool_objsz sz; uint32_t total_size; - if (!ODP_DPDK_ZERO_COPY) + if (!_ODP_DPDK_ZERO_COPY) return block_size; if (odp_global_rw->dpdk_initialized == 0) { @@ -1296,7 +1296,7 @@ static int dpdk_pktio_term(void) } #endif - if (!ODP_DPDK_ZERO_COPY) + if (!_ODP_DPDK_ZERO_COPY) rte_mempool_walk(dpdk_mempool_free, NULL); return 0; @@ -1569,7 +1569,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, else pkt_dpdk->min_rx_burst = 0; - if (ODP_DPDK_ZERO_COPY) { + if (_ODP_DPDK_ZERO_COPY) { pkt_pool = (struct rte_mempool *)pool_entry->ext_desc; } else { snprintf(pool_name, sizeof(pool_name), "pktpool_%s", netdev); @@ -1806,7 +1806,7 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, ts_val = odp_time_global(); ts = &ts_val; } - if (ODP_DPDK_ZERO_COPY) + if (_ODP_DPDK_ZERO_COPY) nb_rx = mbuf_to_pkt_zero(pktio_entry, pkt_table, rx_mbufs, nb_rx, ts); else @@ -1830,7 +1830,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, if (odp_unlikely(pktio_entry->s.state != PKTIO_STATE_STARTED)) return 0; - if (ODP_DPDK_ZERO_COPY) + if (_ODP_DPDK_ZERO_COPY) mbufs = pkt_to_mbuf_zero(pktio_entry, tx_mbufs, pkt_table, num, &copy_count); else @@ -1845,7 +1845,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, if (!pkt_dpdk->lockless_tx) odp_ticketlock_unlock(&pkt_dpdk->tx_lock[index]); - if (ODP_DPDK_ZERO_COPY) { + if (_ODP_DPDK_ZERO_COPY) { /* Free copied packets */ if (odp_unlikely(copy_count)) { uint16_t freed = 0; @@ -2014,4 +2014,4 @@ int _odp_dpdk_pool_create(pool_t *pool ODP_UNUSED) return 0; } -#endif /* ODP_PKTIO_DPDK */ +#endif /* _ODP_PKTIO_DPDK */ diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index c7f9d1901..ef3065df7 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -6,7 +6,7 @@ #include <odp/autoheader_internal.h> -#ifdef ODP_PKTIO_DPDK +#ifdef _ODP_PKTIO_DPDK #include <odp_packet_io_internal.h> #include <odp_packet_dpdk.h> @@ -489,4 +489,4 @@ int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, pktin_cfg); } -#endif /* ODP_PKTIO_DPDK */ +#endif /* _ODP_PKTIO_DPDK */ diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index e5cffd73a..c12146b5f 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -13,10 +13,10 @@ * Array must be NULL terminated */ const pktio_if_ops_t * const pktio_if_ops[] = { &loopback_pktio_ops, -#ifdef ODP_PKTIO_DPDK +#ifdef _ODP_PKTIO_DPDK &dpdk_pktio_ops, #endif -#ifdef ODP_NETMAP +#ifdef _ODP_PKTIO_NETMAP &netmap_pktio_ops, #endif #ifdef _ODP_PKTIO_PCAP diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 7925c78eb..230a9a76b 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -7,7 +7,7 @@ #include <odp/autoheader_internal.h> -#ifdef ODP_NETMAP +#ifdef _ODP_PKTIO_NETMAP #include <odp_posix_extensions.h> @@ -1253,4 +1253,4 @@ const pktio_if_ops_t netmap_pktio_ops = { .fd_set = netmap_fd_set }; -#endif /* ODP_NETMAP */ +#endif /* _ODP_PKTIO_NETMAP */ commit 18abf931651e3f21bc858efc2f1df50f24821611 Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 2 15:48:59 2019 +0300 linux-gen: include only ODP defines in autogenerated header files The config.h file has been split into three parts: autoheader_build.h: should NOT be included by ANY source file autoheader_external.h: can be included by any source file, including public headers autoheader_internal.h: can be included by any internal source file, but NOT by public headers autoheader_external.h and autoheader_internal.h are generated based on matching template files (*.in) and include only ODP defines. autoheader_build.h includes all build defines and should not be included by any source file. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/.gitignore b/.gitignore index b5856a50c..772c551f4 100644 --- a/.gitignore +++ b/.gitignore @@ -38,9 +38,11 @@ depcomp doc/output dpdk/ install-sh -include/odp/config.h.in -include/odp/config.h -include/odp/stamp-h1 +include/odp/autoheader_build.h.in +include/odp/autoheader_build.h +include/odp/autoheader_external.h +include/odp/autoheader_internal.h +include/odp/stamp-h* lib/ libtool ltmain.sh diff --git a/configure.ac b/configure.ac index 69474878d..e665c10c6 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AS_IF([test "$ac_cv_env_CFLAGS_set" = ""], [user_cflags=0], [user_cflags=1]) # Initialize automake AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc -Wall -Werror]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) -AM_CONFIG_HEADER([include/odp/config.h]) +AM_CONFIG_HEADER([include/odp/autoheader_build.h include/odp/autoheader_external.h include/odp/autoheader_internal.h]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE diff --git a/helper/include/odp/helper/odph_debug.h b/helper/include/odp/helper/odph_debug.h index 370a0fa12..2fa89d8ab 100644 --- a/helper/include/odp/helper/odph_debug.h +++ b/helper/include/odp/helper/odph_debug.h @@ -15,7 +15,7 @@ #ifndef ODPH_DEBUG_H_ #define ODPH_DEBUG_H_ -#include <odp/config.h> +#include <odp/autoheader_external.h> #include <stdio.h> #include <stdlib.h> diff --git a/helper/test/debug.c b/helper/test/debug.c index 48d4462c9..2431b0ecd 100644 --- a/helper/test/debug.c +++ b/helper/test/debug.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_external.h> #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/include/Makefile.am b/include/Makefile.am index ed33e7c8e..c3e42b96e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -4,7 +4,7 @@ include_HEADERS = \ odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ - odp/config.h \ + odp/autoheader_external.h \ odp/visibility_begin.h \ odp/visibility_end.h diff --git a/include/odp/autoheader_external.h.in b/include/odp/autoheader_external.h.in new file mode 100644 index 000000000..15626898d --- /dev/null +++ b/include/odp/autoheader_external.h.in @@ -0,0 +1,17 @@ + +#ifndef ODP_AUTOHEADER_EXTERNAL_H_ +#define ODP_AUTOHEADER_EXTERNAL_H_ + +/* Define to 1 to include additional debug code */ +#undef ODP_DEBUG + +/* Define to 1 to display debug information */ +#undef ODP_DEBUG_PRINT + +/* Define to 1 to include additional helper debug code */ +#undef ODPH_DEBUG + +/* Define to 1 to display helper debug information */ +#undef ODPH_DEBUG_PRINT + +#endif diff --git a/include/odp/autoheader_internal.h.in b/include/odp/autoheader_internal.h.in new file mode 100644 index 000000000..4d1d17f4f --- /dev/null +++ b/include/odp/autoheader_internal.h.in @@ -0,0 +1,29 @@ + +#ifndef ODP_AUTOHEADER_INTERNAL_H_ +#define ODP_AUTOHEADER_INTERNAL_H_ + +/* Define to the name of the implementation */ +#undef ODP_IMPLEMENTATION_NAME + +/* Define to name default scheduler */ +#undef ODP_SCHEDULE_DEFAULT + +/* Define to 1 if numa library is usable */ +#undef _ODP_HAVE_NUMA_LIBRARY + +/* Define to 1 to enable DPDK zero copy support */ +#undef ODP_DPDK_ZERO_COPY + +/* Define to 1 to enable netmap IO support */ +#undef ODP_NETMAP + +/* Define to 1 to enable DPDK packet I/O support */ +#undef ODP_PKTIO_DPDK + +/* Define to 1 to enable pcap packet I/O support */ +#undef _ODP_PKTIO_PCAP + +/* Define to 1 to enable pcapng support */ +#undef _ODP_PCAPNG + +#endif diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 2ef5a24a8..e1395c19f 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -16,7 +16,7 @@ #ifndef ODP_DEBUG_INTERNAL_H_ #define ODP_DEBUG_INTERNAL_H_ -#include <odp/config.h> +#include <odp/autoheader_external.h> #include <odp/api/debug.h> #include <odp_global_data.h> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index b36000d78..00b0fca36 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -18,7 +18,7 @@ extern "C" { #endif -#include <odp/config.h> +#include <odp/autoheader_internal.h> #include <odp/api/packet_io.h> #include <odp/api/plat/pktio_inlines.h> diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c index 855f29358..421766a30 100644 --- a/platform/linux-generic/odp_impl.c +++ b/platform/linux-generic/odp_impl.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #include <odp/api/version.h> #define ODP_VERSION_IMPL 0 diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index d2327cff1..4518706f0 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_external.h> #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 0710b718a..22e9c1b21 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -7,7 +7,7 @@ #include <odp_posix_extensions.h> -#include <odp/config.h> +#include <odp/autoheader_internal.h> #include <odp/api/packet_io.h> #include <odp/api/plat/pktio_inlines.h> #include <odp_packet_io_internal.h> diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c index 09cb91b1d..92fe3933c 100644 --- a/platform/linux-generic/odp_pcapng.c +++ b/platform/linux-generic/odp_pcapng.c @@ -5,7 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp_posix_extensions.h> + +#include <odp/autoheader_internal.h> #if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1 diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index f9df5c763..720a7f7bc 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #include <odp_queue_if.h> #include <odp_init_internal.h> diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 083950844..82a712d27 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #include <odp_schedule_if.h> #include <odp_init_internal.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 948ffda8f..13052286e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #ifdef ODP_PKTIO_DPDK diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c index 3dee44b87..c7f9d1901 100644 --- a/platform/linux-generic/pktio/dpdk_parse.c +++ b/platform/linux-generic/pktio/dpdk_parse.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #ifdef ODP_PKTIO_DPDK diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index 9e1ab74ce..e5cffd73a 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #include <odp_packet_io_internal.h> /* Ops for all implementation of pktio. diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 9767de2f2..7925c78eb 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp/config.h> +#include <odp/autoheader_internal.h> #ifdef ODP_NETMAP commit 60a830b9e000053caab24a0befb578551ba1766b Author: Matias Elo <matias.elo(a)nokia.com> Date: Wed Oct 2 15:42:11 2019 +0300 linux-gen: rename ODP implementation internal configure defines Rename implementation internal defines so that they stand out from the autoheader defines. Signed-off-by: Matias Elo <matias.elo(a)nokia.com> Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com> diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 07acb8fcf..320d6c8f5 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -54,7 +54,7 @@ AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl OLD_LIBS=$LIBS LIBS="-lnuma" AC_TRY_LINK_FUNC([numa_num_configured_nodes], - [AC_DEFINE([HAVE_NUMA_LIBRARY], [1], + [AC_DEFINE([_ODP_HAVE_NUMA_LIBRARY], [1], [Define to 1 if numa library is usable]) AS_VAR_APPEND([DPDK_LIBS_LIBODP], [" -lnuma"])]) LIBS=$OLD_LIBS diff --git a/m4/odp_pcap.m4 b/m4/odp_pcap.m4 index 239ce385f..dd1c16e69 100644 --- a/m4/odp_pcap.m4 +++ b/m4/odp_pcap.m4 @@ -13,7 +13,8 @@ AC_CHECK_HEADER(pcap/pcap.h, []) if test "$have_pcap" = "yes"; then - AC_DEFINE([HAVE_PCAP], 1, [Define to 1 if you have pcap library]) + AC_DEFINE([_ODP_PKTIO_PCAP], 1, + [Define to 1 to enable pcap packet I/O support]) PCAP_LIBS="-lpcap" else PCAP_LIBS="" diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 645b27907..b36000d78 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -216,7 +216,7 @@ extern const pktio_if_ops_t dpdk_pktio_ops; extern const pktio_if_ops_t sock_mmsg_pktio_ops; extern const pktio_if_ops_t sock_mmap_pktio_ops; extern const pktio_if_ops_t loopback_pktio_ops; -#ifdef HAVE_PCAP +#ifdef _ODP_PKTIO_PCAP extern const pktio_if_ops_t pcap_pktio_ops; #endif extern const pktio_if_ops_t tap_pktio_ops; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 23fae748b..948ffda8f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -55,7 +55,7 @@ #include <rte_version.h> /* NUMA is not supported on all platforms */ -#ifdef HAVE_NUMA_LIBRARY +#ifdef _ODP_HAVE_NUMA_LIBRARY #include <numa.h> #else #define numa_num_configured_nodes() 1 diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index e183058d8..9e1ab74ce 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -19,7 +19,7 @@ const pktio_if_ops_t * const pktio_if_ops[] = { #ifdef ODP_NETMAP &netmap_pktio_ops, #endif -#ifdef HAVE_PCAP +#ifdef _ODP_PKTIO_PCAP &pcap_pktio_ops, #endif &ipc_pktio_ops, ----------------------------------------------------------------------- Summary of changes: .gitignore | 8 +++--- configure.ac | 4 +-- helper/include/odp/helper/odph_debug.h | 2 +- helper/test/debug.c | 2 +- include/Makefile.am | 2 +- include/odp/autoheader_external.h.in | 17 +++++++++++++ include/odp/autoheader_internal.h.in | 29 ++++++++++++++++++++++ m4/odp_dpdk.m4 | 2 +- m4/odp_pcap.m4 | 3 ++- m4/odp_scheduler.m4 | 2 +- .../linux-generic/include/odp_debug_internal.h | 2 +- .../linux-generic/include/odp_packet_io_internal.h | 10 ++++---- platform/linux-generic/m4/odp_dpdk.m4 | 4 +-- platform/linux-generic/m4/odp_netmap.m4 | 4 +-- platform/linux-generic/odp_impl.c | 6 ++--- platform/linux-generic/odp_packet.c | 2 +- platform/linux-generic/odp_packet_io.c | 2 +- platform/linux-generic/odp_pcapng.c | 4 ++- platform/linux-generic/odp_queue_if.c | 4 +-- platform/linux-generic/odp_schedule_if.c | 4 +-- platform/linux-generic/pktio/dpdk.c | 24 +++++++++--------- platform/linux-generic/pktio/dpdk_parse.c | 6 ++--- platform/linux-generic/pktio/io_ops.c | 8 +++--- platform/linux-generic/pktio/netmap.c | 6 ++--- 24 files changed, 104 insertions(+), 53 deletions(-) create mode 100644 include/odp/autoheader_external.h.in create mode 100644 include/odp/autoheader_internal.h.in hooks/post-receive --

5 years, 4 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp October 2019