X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest%2Ftest_flow_classify.c;h=fc83b69aeeebd3c0fe07c528411e6fa9759a2424;hb=9aa8c7c855a82db086c866d7c1c5d49bfaffef0c;hp=9f331cd8e5d6dceb11f3cef1a4d6b4cace7e541d;hpb=169a9de21e263aa6599cdc2d87a45ae158d9f509;p=deb_dpdk.git diff --git a/test/test/test_flow_classify.c b/test/test/test_flow_classify.c index 9f331cd8..fc83b69a 100644 --- a/test/test/test_flow_classify.c +++ b/test/test/test_flow_classify.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2017 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Intel Corporation */ #include @@ -51,16 +22,198 @@ #define FLOW_CLASSIFY_MAX_RULE_NUM 100 -struct flow_classifier *cls; +#define MAX_PKT_BURST 32 +#define NB_SOCKETS 1 +#define MEMPOOL_CACHE_SIZE 256 +#define MBUF_SIZE 512 +#define NB_MBUF 512 + +/* test UDP, TCP and SCTP packets */ +static struct rte_mempool *mbufpool[NB_SOCKETS]; +static struct rte_mbuf *bufs[MAX_PKT_BURST]; + +static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = { + /* first input field - always one byte long. */ + { + .type = RTE_ACL_FIELD_TYPE_BITMASK, + .size = sizeof(uint8_t), + .field_index = PROTO_FIELD_IPV4, + .input_index = PROTO_INPUT_IPV4, + .offset = sizeof(struct ether_hdr) + + offsetof(struct ipv4_hdr, next_proto_id), + }, + /* next input field (IPv4 source address) - 4 consecutive bytes. */ + { + /* rte_flow uses a bit mask for IPv4 addresses */ + .type = RTE_ACL_FIELD_TYPE_BITMASK, + .size = sizeof(uint32_t), + .field_index = SRC_FIELD_IPV4, + .input_index = SRC_INPUT_IPV4, + .offset = sizeof(struct ether_hdr) + + offsetof(struct ipv4_hdr, src_addr), + }, + /* next input field (IPv4 destination address) - 4 consecutive bytes. */ + { + /* rte_flow uses a bit mask for IPv4 addresses */ + .type = RTE_ACL_FIELD_TYPE_BITMASK, + .size = sizeof(uint32_t), + .field_index = DST_FIELD_IPV4, + .input_index = DST_INPUT_IPV4, + .offset = sizeof(struct ether_hdr) + + offsetof(struct ipv4_hdr, dst_addr), + }, + /* + * Next 2 fields (src & dst ports) form 4 consecutive bytes. + * They share the same input index. + */ + { + /* rte_flow uses a bit mask for protocol ports */ + .type = RTE_ACL_FIELD_TYPE_BITMASK, + .size = sizeof(uint16_t), + .field_index = SRCP_FIELD_IPV4, + .input_index = SRCP_DESTP_INPUT_IPV4, + .offset = sizeof(struct ether_hdr) + + sizeof(struct ipv4_hdr) + + offsetof(struct tcp_hdr, src_port), + }, + { + /* rte_flow uses a bit mask for protocol ports */ + .type = RTE_ACL_FIELD_TYPE_BITMASK, + .size = sizeof(uint16_t), + .field_index = DSTP_FIELD_IPV4, + .input_index = SRCP_DESTP_INPUT_IPV4, + .offset = sizeof(struct ether_hdr) + + sizeof(struct ipv4_hdr) + + offsetof(struct tcp_hdr, dst_port), + }, +}; -struct flow_classifier { - struct rte_flow_classifier *cls; - uint32_t table_id[RTE_FLOW_CLASSIFY_TABLE_MAX]; - uint32_t n_tables; +/* parameters for rte_flow_classify_validate and rte_flow_classify_create */ + +/* test UDP pattern: + * "eth / ipv4 src spec 2.2.2.3 src mask 255.255.255.00 dst spec 2.2.2.7 + * dst mask 255.255.255.00 / udp src is 32 dst is 33 / end" + */ +static struct rte_flow_item_ipv4 ipv4_udp_spec_1 = { + { 0, 0, 0, 0, 0, 0, IPPROTO_UDP, 0, IPv4(2, 2, 2, 3), IPv4(2, 2, 2, 7)} +}; +static const struct rte_flow_item_ipv4 ipv4_mask_24 = { + .hdr = { + .next_proto_id = 0xff, + .src_addr = 0xffffff00, + .dst_addr = 0xffffff00, + }, +}; +static struct rte_flow_item_udp udp_spec_1 = { + { 32, 33, 0, 0 } +}; + +static struct rte_flow_item eth_item = { RTE_FLOW_ITEM_TYPE_ETH, + 0, 0, 0 }; +static struct rte_flow_item eth_item_bad = { -1, 0, 0, 0 }; + +static struct rte_flow_item ipv4_udp_item_1 = { RTE_FLOW_ITEM_TYPE_IPV4, + &ipv4_udp_spec_1, 0, &ipv4_mask_24}; +static struct rte_flow_item ipv4_udp_item_bad = { RTE_FLOW_ITEM_TYPE_IPV4, + NULL, 0, NULL}; + +static struct rte_flow_item udp_item_1 = { RTE_FLOW_ITEM_TYPE_UDP, + &udp_spec_1, 0, &rte_flow_item_udp_mask}; +static struct rte_flow_item udp_item_bad = { RTE_FLOW_ITEM_TYPE_UDP, + NULL, 0, NULL}; + +static struct rte_flow_item end_item = { RTE_FLOW_ITEM_TYPE_END, + 0, 0, 0 }; +static struct rte_flow_item end_item_bad = { -1, 0, 0, 0 }; + +/* test TCP pattern: + * "eth / ipv4 src spec 1.2.3.4 src mask 255.255.255.00 dst spec 5.6.7.8 + * dst mask 255.255.255.00 / tcp src is 16 dst is 17 / end" + */ +static struct rte_flow_item_ipv4 ipv4_tcp_spec_1 = { + { 0, 0, 0, 0, 0, 0, IPPROTO_TCP, 0, IPv4(1, 2, 3, 4), IPv4(5, 6, 7, 8)} +}; + +static struct rte_flow_item_tcp tcp_spec_1 = { + { 16, 17, 0, 0, 0, 0, 0, 0, 0} +}; + +static struct rte_flow_item ipv4_tcp_item_1 = { RTE_FLOW_ITEM_TYPE_IPV4, + &ipv4_tcp_spec_1, 0, &ipv4_mask_24}; + +static struct rte_flow_item tcp_item_1 = { RTE_FLOW_ITEM_TYPE_TCP, + &tcp_spec_1, 0, &rte_flow_item_tcp_mask}; + +/* test SCTP pattern: + * "eth / ipv4 src spec 1.2.3.4 src mask 255.255.255.00 dst spec 5.6.7.8 + * dst mask 255.255.255.00 / sctp src is 16 dst is 17/ end" + */ +static struct rte_flow_item_ipv4 ipv4_sctp_spec_1 = { + { 0, 0, 0, 0, 0, 0, IPPROTO_SCTP, 0, IPv4(11, 12, 13, 14), + IPv4(15, 16, 17, 18)} +}; + +static struct rte_flow_item_sctp sctp_spec_1 = { + { 10, 11, 0, 0} }; +static struct rte_flow_item ipv4_sctp_item_1 = { RTE_FLOW_ITEM_TYPE_IPV4, + &ipv4_sctp_spec_1, 0, &ipv4_mask_24}; + +static struct rte_flow_item sctp_item_1 = { RTE_FLOW_ITEM_TYPE_SCTP, + &sctp_spec_1, 0, &rte_flow_item_sctp_mask}; + + +/* test actions: + * "actions count / end" + */ +static struct rte_flow_query_count count = { + .reset = 1, + .hits_set = 1, + .bytes_set = 1, + .hits = 0, + .bytes = 0, +}; +static struct rte_flow_action count_action = { RTE_FLOW_ACTION_TYPE_COUNT, + &count}; +static struct rte_flow_action count_action_bad = { -1, 0}; + +static struct rte_flow_action end_action = { RTE_FLOW_ACTION_TYPE_END, 0}; +static struct rte_flow_action end_action_bad = { -1, 0}; + +static struct rte_flow_action actions[2]; + +/* test attributes */ +static struct rte_flow_attr attr; + +/* test error */ +static struct rte_flow_error error; + +/* test pattern */ +static struct rte_flow_item pattern[4]; + +/* flow classify data for UDP burst */ +static struct rte_flow_classify_ipv4_5tuple_stats udp_ntuple_stats; +static struct rte_flow_classify_stats udp_classify_stats = { + .stats = (void *)&udp_ntuple_stats +}; + +/* flow classify data for TCP burst */ +static struct rte_flow_classify_ipv4_5tuple_stats tcp_ntuple_stats; +static struct rte_flow_classify_stats tcp_classify_stats = { + .stats = (void *)&tcp_ntuple_stats +}; + +/* flow classify data for SCTP burst */ +static struct rte_flow_classify_ipv4_5tuple_stats sctp_ntuple_stats; +static struct rte_flow_classify_stats sctp_classify_stats = { + .stats = (void *)&sctp_ntuple_stats +}; + +struct flow_classifier_acl *cls; + struct flow_classifier_acl { - struct flow_classifier cls; + struct rte_flow_classifier *cls; } __rte_cache_aligned; /* @@ -73,7 +226,15 @@ test_invalid_parameters(void) struct rte_flow_classify_rule *rule; int ret; - rule = rte_flow_classify_table_entry_add(NULL, 1, NULL, NULL, NULL, + ret = rte_flow_classify_validate(NULL, NULL, NULL, NULL, NULL); + if (!ret) { + printf("Line %i: rte_flow_classify_validate", + __LINE__); + printf(" with NULL param should have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(NULL, NULL, NULL, NULL, NULL, NULL); if (rule) { printf("Line %i: flow_classifier_table_entry_add", __LINE__); @@ -81,7 +242,7 @@ test_invalid_parameters(void) return -1; } - ret = rte_flow_classify_table_entry_delete(NULL, 1, NULL); + ret = rte_flow_classify_table_entry_delete(NULL, NULL); if (!ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -89,14 +250,14 @@ test_invalid_parameters(void) return -1; } - ret = rte_flow_classifier_query(NULL, 1, NULL, 0, NULL, NULL); + ret = rte_flow_classifier_query(NULL, NULL, 0, NULL, NULL); if (!ret) { printf("Line %i: flow_classifier_query", __LINE__); printf(" with NULL param should have failed!\n"); return -1; } - rule = rte_flow_classify_table_entry_add(NULL, 1, NULL, NULL, NULL, + rule = rte_flow_classify_table_entry_add(NULL, NULL, NULL, NULL, NULL, &error); if (rule) { printf("Line %i: flow_classify_table_entry_add ", __LINE__); @@ -104,7 +265,7 @@ test_invalid_parameters(void) return -1; } - ret = rte_flow_classify_table_entry_delete(NULL, 1, NULL); + ret = rte_flow_classify_table_entry_delete(NULL, NULL); if (!ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -112,7 +273,7 @@ test_invalid_parameters(void) return -1; } - ret = rte_flow_classifier_query(NULL, 1, NULL, 0, NULL, NULL); + ret = rte_flow_classifier_query(NULL, NULL, 0, NULL, NULL); if (!ret) { printf("Line %i: flow_classifier_query", __LINE__); printf(" with NULL param should have failed!\n"); @@ -129,7 +290,8 @@ test_valid_parameters(void) int key_found; /* - * set up parameters for rte_flow_classify_table_entry_add and + * set up parameters for rte_flow_classify_validate, + * rte_flow_classify_table_entry_add and * rte_flow_classify_table_entry_delete */ @@ -142,15 +304,24 @@ test_valid_parameters(void) actions[0] = count_action; actions[1] = end_action; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (ret) { + printf("Line %i: rte_flow_classify_validate", + __LINE__); + printf(" should not have failed!\n"); + return -1; + } + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); + if (!rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should not have failed!\n"); return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -168,7 +339,8 @@ test_invalid_patterns(void) int key_found; /* - * set up parameters for rte_flow_classify_table_entry_add and + * set up parameters for rte_flow_classify_validate, + * rte_flow_classify_table_entry_add and * rte_flow_classify_table_entry_delete */ @@ -183,15 +355,24 @@ test_invalid_patterns(void) pattern[0] = eth_item; pattern[1] = ipv4_udp_item_bad; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (!ret) { + printf("Line %i: rte_flow_classify_validate", __LINE__); + printf(" should have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should have failed!\n"); return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (!ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -202,15 +383,24 @@ test_invalid_patterns(void) pattern[1] = ipv4_udp_item_1; pattern[2] = udp_item_bad; pattern[3] = end_item_bad; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (!ret) { + printf("Line %i: rte_flow_classify_validate", __LINE__); + printf(" should have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should have failed!\n"); return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (!ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -228,7 +418,8 @@ test_invalid_actions(void) int key_found; /* - * set up parameters for rte_flow_classify_table_entry_add and + * set up parameters for rte_flow_classify_validate, + * rte_flow_classify_table_entry_add and * rte_flow_classify_table_entry_delete */ @@ -241,15 +432,23 @@ test_invalid_actions(void) actions[0] = count_action_bad; actions[1] = end_action; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (!ret) { + printf("Line %i: rte_flow_classify_validate", __LINE__); + printf(" should have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should have failed!\n"); return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (!ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -260,15 +459,23 @@ test_invalid_actions(void) actions[0] = count_action; actions[1] = end_action_bad; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (!ret) { + printf("Line %i: rte_flow_classify_validate", __LINE__); + printf(" should have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should have failed!\n"); return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (!ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -449,7 +656,8 @@ test_query_udp(void) bufs[i]->packet_type = RTE_PTYPE_L3_IPV4; /* - * set up parameters for rte_flow_classify_table_entry_add and + * set up parameters for rte_flow_classify_validate, + * rte_flow_classify_table_entry_add and * rte_flow_classify_table_entry_delete */ @@ -462,15 +670,23 @@ test_query_udp(void) actions[0] = count_action; actions[1] = end_action; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (ret) { + printf("Line %i: rte_flow_classify_validate", __LINE__); + printf(" should not have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (!rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should not have failed!\n"); return -1; } - ret = rte_flow_classifier_query(cls->cls, 0, bufs, MAX_PKT_BURST, + ret = rte_flow_classifier_query(cls->cls, bufs, MAX_PKT_BURST, rule, &udp_classify_stats); if (ret) { printf("Line %i: flow_classifier_query", __LINE__); @@ -478,7 +694,7 @@ test_query_udp(void) return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -507,7 +723,8 @@ test_query_tcp(void) bufs[i]->packet_type = RTE_PTYPE_L3_IPV4; /* - * set up parameters for rte_flow_classify_table_entry_add and + * set up parameters for rte_flow_classify_validate, + * rte_flow_classify_table_entry_add and * rte_flow_classify_table_entry_delete */ @@ -520,15 +737,23 @@ test_query_tcp(void) actions[0] = count_action; actions[1] = end_action; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (ret) { + printf("Line %i: flow_classifier_query", __LINE__); + printf(" should not have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (!rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should not have failed!\n"); return -1; } - ret = rte_flow_classifier_query(cls->cls, 0, bufs, MAX_PKT_BURST, + ret = rte_flow_classifier_query(cls->cls, bufs, MAX_PKT_BURST, rule, &tcp_classify_stats); if (ret) { printf("Line %i: flow_classifier_query", __LINE__); @@ -536,7 +761,7 @@ test_query_tcp(void) return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -565,7 +790,8 @@ test_query_sctp(void) bufs[i]->packet_type = RTE_PTYPE_L3_IPV4; /* - * set up parameters rte_flow_classify_table_entry_add and + * set up parameters rte_flow_classify_validate, + * rte_flow_classify_table_entry_add and * rte_flow_classify_table_entry_delete */ @@ -578,15 +804,23 @@ test_query_sctp(void) actions[0] = count_action; actions[1] = end_action; - rule = rte_flow_classify_table_entry_add(cls->cls, 0, &key_found, - &attr, pattern, actions, &error); + ret = rte_flow_classify_validate(cls->cls, &attr, pattern, + actions, &error); + if (ret) { + printf("Line %i: flow_classifier_query", __LINE__); + printf(" should not have failed!\n"); + return -1; + } + + rule = rte_flow_classify_table_entry_add(cls->cls, &attr, pattern, + actions, &key_found, &error); if (!rule) { printf("Line %i: flow_classify_table_entry_add", __LINE__); printf(" should not have failed!\n"); return -1; } - ret = rte_flow_classifier_query(cls->cls, 0, bufs, MAX_PKT_BURST, + ret = rte_flow_classifier_query(cls->cls, bufs, MAX_PKT_BURST, rule, &sctp_classify_stats); if (ret) { printf("Line %i: flow_classifier_query", __LINE__); @@ -594,7 +828,7 @@ test_query_sctp(void) return -1; } - ret = rte_flow_classify_table_entry_delete(cls->cls, 0, rule); + ret = rte_flow_classify_table_entry_delete(cls->cls, rule); if (ret) { printf("Line %i: rte_flow_classify_table_entry_delete", __LINE__); @@ -610,19 +844,15 @@ test_flow_classify(void) struct rte_table_acl_params table_acl_params; struct rte_flow_classify_table_params cls_table_params; struct rte_flow_classifier_params cls_params; - int socket_id; int ret; uint32_t size; - socket_id = rte_eth_dev_socket_id(0); - /* Memory allocation */ size = RTE_CACHE_LINE_ROUNDUP(sizeof(struct flow_classifier_acl)); cls = rte_zmalloc(NULL, size, RTE_CACHE_LINE_SIZE); cls_params.name = "flow_classifier"; - cls_params.socket_id = socket_id; - cls_params.type = RTE_FLOW_CLASSIFY_TABLE_TYPE_ACL; + cls_params.socket_id = 0; cls->cls = rte_flow_classifier_create(&cls_params); /* initialise ACL table params */ @@ -632,11 +862,11 @@ test_flow_classify(void) memcpy(table_acl_params.field_format, ipv4_defs, sizeof(ipv4_defs)); /* initialise table create params */ - cls_table_params.ops = &rte_table_acl_ops, - cls_table_params.arg_create = &table_acl_params, + cls_table_params.ops = &rte_table_acl_ops; + cls_table_params.arg_create = &table_acl_params; + cls_table_params.type = RTE_FLOW_CLASSIFY_TABLE_ACL_IP4_5TUPLE; - ret = rte_flow_classify_table_create(cls->cls, &cls_table_params, - &cls->table_id[0]); + ret = rte_flow_classify_table_create(cls->cls, &cls_table_params); if (ret) { printf("Line %i: f_create has failed!\n", __LINE__); rte_flow_classifier_free(cls->cls);