From patchwork Thu Mar 29 18:31:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasvinder Singh X-Patchwork-Id: 36698 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E6B5CA48F; Thu, 29 Mar 2018 20:33:05 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 5F8B24D3A for ; Thu, 29 Mar 2018 20:32:29 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Mar 2018 11:32:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,378,1517904000"; d="scan'208";a="216058922" Received: from silpixa00381635.ir.intel.com (HELO silpixa00381635.ger.corp.intel.com) ([10.237.222.149]) by fmsmga005.fm.intel.com with ESMTP; 29 Mar 2018 11:32:27 -0700 From: Jasvinder Singh To: dev@dpdk.org Cc: cristian.dumitrescu@intel.com Date: Thu, 29 Mar 2018 19:31:34 +0100 Message-Id: <20180329183208.103844-16-jasvinder.singh@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180329183208.103844-1-jasvinder.singh@intel.com> References: <20180316175906.159198-2-jasvinder.singh@intel.com> <20180329183208.103844-1-jasvinder.singh@intel.com> Subject: [dpdk-dev] [PATCH v4 15/49] ip_pipeline: remove flow classification pipeline X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Remove flow classification pipeline. Signed-off-by: Cristian Dumitrescu Signed-off-by: Jasvinder Singh --- examples/ip_pipeline/Makefile | 2 - examples/ip_pipeline/init.c | 2 - examples/ip_pipeline/meson.build | 2 - .../pipeline/pipeline_flow_classification.c | 1878 -------------------- .../pipeline/pipeline_flow_classification.h | 106 -- .../pipeline/pipeline_flow_classification_be.c | 723 -------- .../pipeline/pipeline_flow_classification_be.h | 113 -- 7 files changed, 2826 deletions(-) delete mode 100644 examples/ip_pipeline/pipeline/pipeline_flow_classification.c delete mode 100644 examples/ip_pipeline/pipeline/pipeline_flow_classification.h delete mode 100644 examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c delete mode 100644 examples/ip_pipeline/pipeline/pipeline_flow_classification_be.h diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index f67cfe6..e43001f 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -21,8 +21,6 @@ SRCS-y += pipeline_master_be.c SRCS-y += pipeline_master.c SRCS-y += pipeline_firewall_be.c SRCS-y += pipeline_firewall.c -SRCS-y += pipeline_flow_classification_be.c -SRCS-y += pipeline_flow_classification.c SRCS-y += pipeline_flow_actions_be.c SRCS-y += pipeline_flow_actions.c diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c index 241d80a..4780bb1 100644 --- a/examples/ip_pipeline/init.c +++ b/examples/ip_pipeline/init.c @@ -27,7 +27,6 @@ #include "pipeline_common_fe.h" #include "pipeline_master.h" #include "pipeline_firewall.h" -#include "pipeline_flow_classification.h" #include "pipeline_flow_actions.h" #include "thread_fe.h" @@ -1820,7 +1819,6 @@ int app_init(struct app_params *app) app_pipeline_common_cmd_push(app); app_pipeline_thread_cmd_push(app); app_pipeline_type_register(app, &pipeline_master); - app_pipeline_type_register(app, &pipeline_flow_classification); app_pipeline_type_register(app, &pipeline_flow_actions); app_pipeline_type_register(app, &pipeline_firewall); diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build index f9eab1b..dd12870 100644 --- a/examples/ip_pipeline/meson.build +++ b/examples/ip_pipeline/meson.build @@ -25,8 +25,6 @@ sources = files( 'pipeline/pipeline_firewall.c', 'pipeline/pipeline_flow_actions_be.c', 'pipeline/pipeline_flow_actions.c', - 'pipeline/pipeline_flow_classification_be.c', - 'pipeline/pipeline_flow_classification.c', 'pipeline/pipeline_master_be.c', 'pipeline/pipeline_master.c', ) diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification.c b/examples/ip_pipeline/pipeline/pipeline_flow_classification.c deleted file mode 100644 index d39e0fb..0000000 --- a/examples/ip_pipeline/pipeline/pipeline_flow_classification.c +++ /dev/null @@ -1,1878 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2010-2016 Intel Corporation - */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "app.h" -#include "pipeline_common_fe.h" -#include "pipeline_flow_classification.h" -#include "hash_func.h" -#include "parser.h" - -/* - * Key conversion - */ - -struct pkt_key_qinq { - uint16_t ethertype_svlan; - uint16_t svlan; - uint16_t ethertype_cvlan; - uint16_t cvlan; -} __attribute__((__packed__)); - -struct pkt_key_ipv4_5tuple { - uint8_t ttl; - uint8_t proto; - uint16_t checksum; - uint32_t ip_src; - uint32_t ip_dst; - uint16_t port_src; - uint16_t port_dst; -} __attribute__((__packed__)); - -struct pkt_key_ipv6_5tuple { - uint16_t payload_length; - uint8_t proto; - uint8_t hop_limit; - uint8_t ip_src[16]; - uint8_t ip_dst[16]; - uint16_t port_src; - uint16_t port_dst; -} __attribute__((__packed__)); - -static int -app_pipeline_fc_key_convert(struct pipeline_fc_key *key_in, - uint8_t *key_out, - uint32_t *signature) -{ - uint8_t buffer[PIPELINE_FC_FLOW_KEY_MAX_SIZE]; - uint8_t m[PIPELINE_FC_FLOW_KEY_MAX_SIZE]; /* key mask */ - void *key_buffer = (key_out) ? key_out : buffer; - - memset(m, 0xFF, sizeof(m)); - switch (key_in->type) { - case FLOW_KEY_QINQ: - { - struct pkt_key_qinq *qinq = key_buffer; - - qinq->ethertype_svlan = 0; - qinq->svlan = rte_cpu_to_be_16(key_in->key.qinq.svlan); - qinq->ethertype_cvlan = 0; - qinq->cvlan = rte_cpu_to_be_16(key_in->key.qinq.cvlan); - - if (signature) - *signature = (uint32_t) hash_default_key8(qinq, m, 8, 0); - return 0; - } - - case FLOW_KEY_IPV4_5TUPLE: - { - struct pkt_key_ipv4_5tuple *ipv4 = key_buffer; - - ipv4->ttl = 0; - ipv4->proto = key_in->key.ipv4_5tuple.proto; - ipv4->checksum = 0; - ipv4->ip_src = rte_cpu_to_be_32(key_in->key.ipv4_5tuple.ip_src); - ipv4->ip_dst = rte_cpu_to_be_32(key_in->key.ipv4_5tuple.ip_dst); - ipv4->port_src = rte_cpu_to_be_16(key_in->key.ipv4_5tuple.port_src); - ipv4->port_dst = rte_cpu_to_be_16(key_in->key.ipv4_5tuple.port_dst); - - if (signature) - *signature = (uint32_t) hash_default_key16(ipv4, m, 16, 0); - return 0; - } - - case FLOW_KEY_IPV6_5TUPLE: - { - struct pkt_key_ipv6_5tuple *ipv6 = key_buffer; - - memset(ipv6, 0, 64); - ipv6->payload_length = 0; - ipv6->proto = key_in->key.ipv6_5tuple.proto; - ipv6->hop_limit = 0; - memcpy(&ipv6->ip_src, &key_in->key.ipv6_5tuple.ip_src, 16); - memcpy(&ipv6->ip_dst, &key_in->key.ipv6_5tuple.ip_dst, 16); - ipv6->port_src = rte_cpu_to_be_16(key_in->key.ipv6_5tuple.port_src); - ipv6->port_dst = rte_cpu_to_be_16(key_in->key.ipv6_5tuple.port_dst); - - if (signature) - *signature = (uint32_t) hash_default_key64(ipv6, m, 64, 0); - return 0; - } - - default: - return -1; - } -} - -/* - * Flow classification pipeline - */ - -struct app_pipeline_fc_flow { - struct pipeline_fc_key key; - uint32_t port_id; - uint32_t flow_id; - uint32_t signature; - void *entry_ptr; - - TAILQ_ENTRY(app_pipeline_fc_flow) node; -}; - -#define N_BUCKETS 65536 - -struct app_pipeline_fc { - /* Parameters */ - uint32_t n_ports_in; - uint32_t n_ports_out; - - /* Flows */ - TAILQ_HEAD(, app_pipeline_fc_flow) flows[N_BUCKETS]; - uint32_t n_flows; - - /* Default flow */ - uint32_t default_flow_present; - uint32_t default_flow_port_id; - void *default_flow_entry_ptr; -}; - -static struct app_pipeline_fc_flow * -app_pipeline_fc_flow_find(struct app_pipeline_fc *p, - struct pipeline_fc_key *key) -{ - struct app_pipeline_fc_flow *f; - uint32_t signature, bucket_id; - - app_pipeline_fc_key_convert(key, NULL, &signature); - bucket_id = signature & (N_BUCKETS - 1); - - TAILQ_FOREACH(f, &p->flows[bucket_id], node) - if ((signature == f->signature) && - (memcmp(key, - &f->key, - sizeof(struct pipeline_fc_key)) == 0)) - return f; - - return NULL; -} - -static void* -app_pipeline_fc_init(struct pipeline_params *params, - __rte_unused void *arg) -{ - struct app_pipeline_fc *p; - uint32_t size, i; - - /* Check input arguments */ - if ((params == NULL) || - (params->n_ports_in == 0) || - (params->n_ports_out == 0)) - return NULL; - - /* Memory allocation */ - size = RTE_CACHE_LINE_ROUNDUP(sizeof(struct app_pipeline_fc)); - p = rte_zmalloc(NULL, size, RTE_CACHE_LINE_SIZE); - if (p == NULL) - return NULL; - - /* Initialization */ - p->n_ports_in = params->n_ports_in; - p->n_ports_out = params->n_ports_out; - - for (i = 0; i < N_BUCKETS; i++) - TAILQ_INIT(&p->flows[i]); - p->n_flows = 0; - - return (void *) p; -} - -static int -app_pipeline_fc_free(void *pipeline) -{ - struct app_pipeline_fc *p = pipeline; - uint32_t i; - - /* Check input arguments */ - if (p == NULL) - return -1; - - /* Free resources */ - for (i = 0; i < N_BUCKETS; i++) - while (!TAILQ_EMPTY(&p->flows[i])) { - struct app_pipeline_fc_flow *flow; - - flow = TAILQ_FIRST(&p->flows[i]); - TAILQ_REMOVE(&p->flows[i], flow, node); - rte_free(flow); - } - - rte_free(p); - return 0; -} - -static int -app_pipeline_fc_key_check(struct pipeline_fc_key *key) -{ - switch (key->type) { - case FLOW_KEY_QINQ: - { - uint16_t svlan = key->key.qinq.svlan; - uint16_t cvlan = key->key.qinq.cvlan; - - if ((svlan & 0xF000) || - (cvlan & 0xF000)) - return -1; - - return 0; - } - - case FLOW_KEY_IPV4_5TUPLE: - return 0; - - case FLOW_KEY_IPV6_5TUPLE: - return 0; - - default: - return -1; - } -} - -int -app_pipeline_fc_load_file_qinq(char *filename, - struct pipeline_fc_key *keys, - uint32_t *port_ids, - uint32_t *flow_ids, - uint32_t *n_keys, - uint32_t *line) -{ - FILE *f = NULL; - char file_buf[1024]; - uint32_t i, l; - - /* Check input arguments */ - if ((filename == NULL) || - (keys == NULL) || - (port_ids == NULL) || - (flow_ids == NULL) || - (n_keys == NULL) || - (*n_keys == 0) || - (line == NULL)) { - if (line) - *line = 0; - return -1; - } - - /* Open input file */ - f = fopen(filename, "r"); - if (f == NULL) { - *line = 0; - return -1; - } - - /* Read file */ - for (i = 0, l = 1; i < *n_keys; l++) { - char *tokens[32]; - uint32_t n_tokens = RTE_DIM(tokens); - - uint16_t svlan, cvlan; - uint32_t portid, flowid; - int status; - - if (fgets(file_buf, sizeof(file_buf), f) == NULL) - break; - - status = parse_tokenize_string(file_buf, tokens, &n_tokens); - if (status) - goto error1; - - if ((n_tokens == 0) || (tokens[0][0] == '#')) - continue; - - if ((n_tokens != 7) || - strcmp(tokens[0], "qinq") || - parser_read_uint16(&svlan, tokens[1]) || - parser_read_uint16(&cvlan, tokens[2]) || - strcmp(tokens[3], "port") || - parser_read_uint32(&portid, tokens[4]) || - strcmp(tokens[5], "id") || - parser_read_uint32(&flowid, tokens[6])) - goto error1; - - keys[i].type = FLOW_KEY_QINQ; - keys[i].key.qinq.svlan = svlan; - keys[i].key.qinq.cvlan = cvlan; - - port_ids[i] = portid; - flow_ids[i] = flowid; - - if (app_pipeline_fc_key_check(&keys[i])) - goto error1; - - i++; - } - - /* Close file */ - *n_keys = i; - fclose(f); - return 0; - -error1: - *line = l; - fclose(f); - return -1; -} - -int -app_pipeline_fc_load_file_ipv4(char *filename, - struct pipeline_fc_key *keys, - uint32_t *port_ids, - uint32_t *flow_ids, - uint32_t *n_keys, - uint32_t *line) -{ - FILE *f = NULL; - char file_buf[1024]; - uint32_t i, l; - - /* Check input arguments */ - if ((filename == NULL) || - (keys == NULL) || - (port_ids == NULL) || - (flow_ids == NULL) || - (n_keys == NULL) || - (*n_keys == 0) || - (line == NULL)) { - if (line) - *line = 0; - return -1; - } - - /* Open input file */ - f = fopen(filename, "r"); - if (f == NULL) { - *line = 0; - return -1; - } - - /* Read file */ - for (i = 0, l = 1; i < *n_keys; l++) { - char *tokens[32]; - uint32_t n_tokens = RTE_DIM(tokens); - - struct in_addr sipaddr, dipaddr; - uint16_t sport, dport; - uint8_t proto; - uint32_t portid, flowid; - int status; - - if (fgets(file_buf, sizeof(file_buf), f) == NULL) - break; - - status = parse_tokenize_string(file_buf, tokens, &n_tokens); - if (status) - goto error2; - - if ((n_tokens == 0) || (tokens[0][0] == '#')) - continue; - - if ((n_tokens != 10) || - strcmp(tokens[0], "ipv4") || - parse_ipv4_addr(tokens[1], &sipaddr) || - parse_ipv4_addr(tokens[2], &dipaddr) || - parser_read_uint16(&sport, tokens[3]) || - parser_read_uint16(&dport, tokens[4]) || - parser_read_uint8(&proto, tokens[5]) || - strcmp(tokens[6], "port") || - parser_read_uint32(&portid, tokens[7]) || - strcmp(tokens[8], "id") || - parser_read_uint32(&flowid, tokens[9])) - goto error2; - - keys[i].type = FLOW_KEY_IPV4_5TUPLE; - keys[i].key.ipv4_5tuple.ip_src = rte_be_to_cpu_32(sipaddr.s_addr); - keys[i].key.ipv4_5tuple.ip_dst = rte_be_to_cpu_32(dipaddr.s_addr); - keys[i].key.ipv4_5tuple.port_src = sport; - keys[i].key.ipv4_5tuple.port_dst = dport; - keys[i].key.ipv4_5tuple.proto = proto; - - port_ids[i] = portid; - flow_ids[i] = flowid; - - if (app_pipeline_fc_key_check(&keys[i])) - goto error2; - - i++; - } - - /* Close file */ - *n_keys = i; - fclose(f); - return 0; - -error2: - *line = l; - fclose(f); - return -1; -} - -int -app_pipeline_fc_load_file_ipv6(char *filename, - struct pipeline_fc_key *keys, - uint32_t *port_ids, - uint32_t *flow_ids, - uint32_t *n_keys, - uint32_t *line) -{ - FILE *f = NULL; - char file_buf[1024]; - uint32_t i, l; - - /* Check input arguments */ - if ((filename == NULL) || - (keys == NULL) || - (port_ids == NULL) || - (flow_ids == NULL) || - (n_keys == NULL) || - (*n_keys == 0) || - (line == NULL)) { - if (line) - *line = 0; - return -1; - } - - /* Open input file */ - f = fopen(filename, "r"); - if (f == NULL) { - *line = 0; - return -1; - } - - /* Read file */ - for (i = 0, l = 1; i < *n_keys; l++) { - char *tokens[32]; - uint32_t n_tokens = RTE_DIM(tokens); - - struct in6_addr sipaddr, dipaddr; - uint16_t sport, dport; - uint8_t proto; - uint32_t portid, flowid; - int status; - - if (fgets(file_buf, sizeof(file_buf), f) == NULL) - break; - - status = parse_tokenize_string(file_buf, tokens, &n_tokens); - if (status) - goto error3; - - if ((n_tokens == 0) || (tokens[0][0] == '#')) - continue; - - if ((n_tokens != 10) || - strcmp(tokens[0], "ipv6") || - parse_ipv6_addr(tokens[1], &sipaddr) || - parse_ipv6_addr(tokens[2], &dipaddr) || - parser_read_uint16(&sport, tokens[3]) || - parser_read_uint16(&dport, tokens[4]) || - parser_read_uint8(&proto, tokens[5]) || - strcmp(tokens[6], "port") || - parser_read_uint32(&portid, tokens[7]) || - strcmp(tokens[8], "id") || - parser_read_uint32(&flowid, tokens[9])) - goto error3; - - keys[i].type = FLOW_KEY_IPV6_5TUPLE; - memcpy(keys[i].key.ipv6_5tuple.ip_src, - sipaddr.s6_addr, - sizeof(sipaddr.s6_addr)); - memcpy(keys[i].key.ipv6_5tuple.ip_dst, - dipaddr.s6_addr, - sizeof(dipaddr.s6_addr)); - keys[i].key.ipv6_5tuple.port_src = sport; - keys[i].key.ipv6_5tuple.port_dst = dport; - keys[i].key.ipv6_5tuple.proto = proto; - - port_ids[i] = portid; - flow_ids[i] = flowid; - - if (app_pipeline_fc_key_check(&keys[i])) - goto error3; - - i++; - } - - /* Close file */ - *n_keys = i; - fclose(f); - return 0; - -error3: - *line = l; - fclose(f); - return -1; -} - - - -int -app_pipeline_fc_add(struct app_params *app, - uint32_t pipeline_id, - struct pipeline_fc_key *key, - uint32_t port_id, - uint32_t flow_id) -{ - struct app_pipeline_fc *p; - struct app_pipeline_fc_flow *flow; - - struct pipeline_fc_add_msg_req *req; - struct pipeline_fc_add_msg_rsp *rsp; - - uint32_t signature; - int new_flow; - - /* Check input arguments */ - if ((app == NULL) || - (key == NULL)) - return -1; - - p = app_pipeline_data_fe(app, pipeline_id, &pipeline_flow_classification); - if (p == NULL) - return -1; - - if (port_id >= p->n_ports_out) - return -1; - - if (app_pipeline_fc_key_check(key) != 0) - return -1; - - /* Find existing flow or allocate new flow */ - flow = app_pipeline_fc_flow_find(p, key); - new_flow = (flow == NULL); - if (flow == NULL) { - flow = rte_malloc(NULL, sizeof(*flow), RTE_CACHE_LINE_SIZE); - - if (flow == NULL) - return -1; - } - - /* Allocate and write request */ - req = app_msg_alloc(app); - if (req == NULL) - return -1; - - req->type = PIPELINE_MSG_REQ_CUSTOM; - req->subtype = PIPELINE_FC_MSG_REQ_FLOW_ADD; - app_pipeline_fc_key_convert(key, req->key, &signature); - req->port_id = port_id; - req->flow_id = flow_id; - - /* Send request and wait for response */ - rsp = app_msg_send_recv(app, pipeline_id, req, MSG_TIMEOUT_DEFAULT); - if (rsp == NULL) { - if (new_flow) - rte_free(flow); - return -1; - } - - /* Read response and write flow */ - if (rsp->status || - (rsp->entry_ptr == NULL) || - ((new_flow == 0) && (rsp->key_found == 0)) || - ((new_flow == 1) && (rsp->key_found == 1))) { - app_msg_free(app, rsp); - if (new_flow) - rte_free(flow); - return -1; - } - - memset(&flow->key, 0, sizeof(flow->key)); - memcpy(&flow->key, key, sizeof(flow->key)); - flow->port_id = port_id; - flow->flow_id = flow_id; - flow->signature = signature; - flow->entry_ptr = rsp->entry_ptr; - - /* Commit rule */ - if (new_flow) { - uint32_t bucket_id = signature & (N_BUCKETS - 1); - - TAILQ_INSERT_TAIL(&p->flows[bucket_id], flow, node); - p->n_flows++; - } - - /* Free response */ - app_msg_free(app, rsp); - - return 0; -} - -int -app_pipeline_fc_add_bulk(struct app_params *app, - uint32_t pipeline_id, - struct pipeline_fc_key *key, - uint32_t *port_id, - uint32_t *flow_id, - uint32_t n_keys) -{ - struct app_pipeline_fc *p; - struct pipeline_fc_add_bulk_msg_req *req; - struct pipeline_fc_add_bulk_msg_rsp *rsp; - - struct app_pipeline_fc_flow **flow; - uint32_t *signature; - int *new_flow; - struct pipeline_fc_add_bulk_flow_req *flow_req; - struct pipeline_fc_add_bulk_flow_rsp *flow_rsp; - - uint32_t i; - int status; - - /* Check input arguments */ - if ((app == NULL) || - (key == NULL) || - (port_id == NULL) || - (flow_id == NULL) || - (n_keys == 0)) - return -1; - - p = app_pipeline_data_fe(app, pipeline_id, &pipeline_flow_classification); - if (p == NULL) - return -1; - - for (i = 0; i < n_keys; i++) - if (port_id[i] >= p->n_ports_out) - return -1; - - for (i = 0; i < n_keys; i++) - if (app_pipeline_fc_key_check(&key[i]) != 0) - return -1; - - /* Memory allocation */ - flow = rte_malloc(NULL, - n_keys * sizeof(struct app_pipeline_fc_flow *), - RTE_CACHE_LINE_SIZE); - if (flow == NULL) - return -1; - - signature = rte_malloc(NULL, - n_keys * sizeof(uint32_t), - RTE_CACHE_LINE_SIZE); - if (signature == NULL) { - rte_free(flow); - return -1; - } - - new_flow = rte_malloc( - NULL, - n_keys * sizeof(int), - RTE_CACHE_LINE_SIZE); - if (new_flow == NULL) { - rte_free(signature); - rte_free(flow); - return -1; - } - - flow_req = rte_malloc(NULL, - n_keys * sizeof(struct pipeline_fc_add_bulk_flow_req), - RTE_CACHE_LINE_SIZE); - if (flow_req == NULL) { - rte_free(new_flow); - rte_free(signature); - rte_free(flow); - return -1; - } - - flow_rsp = rte_malloc(NULL, - n_keys * sizeof(struct pipeline_fc_add_bulk_flow_rsp), - RTE_CACHE_LINE_SIZE); - if (flow_rsp == NULL) { - rte_free(flow_req); - rte_free(new_flow); - rte_free(signature); - rte_free(flow); - return -1; - } - - /* Find existing flow or allocate new flow */ - for (i = 0; i < n_keys; i++) { - flow[i] = app_pipeline_fc_flow_find(p, &key[i]); - new_flow[i] = (flow[i] == NULL); - if (flow[i] == NULL) { - flow[i] = rte_zmalloc(NULL, - sizeof(struct app_pipeline_fc_flow), - RTE_CACHE_LINE_SIZE); - - if (flow[i] == NULL) { - uint32_t j; - - for (j = 0; j < i; j++) - if (new_flow[j]) - rte_free(flow[j]); - - rte_free(flow_rsp); - rte_free(flow_req); - rte_free(new_flow); - rte_free(signature); - rte_free(flow); - return -1; - } - } - } - - /* Allocate and write request */ - req = app_msg_alloc(app); - if (req == NULL) { - for (i = 0; i < n_keys; i++) - if (new_flow[i]) - rte_free(flow[i]); - - rte_free(flow_rsp); - rte_free(flow_req); - rte_free(new_flow); - rte_free(signature); - rte_free(flow); - return -1; - } - - for (i = 0; i < n_keys; i++) { - app_pipeline_fc_key_convert(&key[i], - flow_req[i].key, - &signature[i]); - flow_req[i].port_id = port_id[i]; - flow_req[i].flow_id = flow_id[i]; - } - - req->type = PIPELINE_MSG_REQ_CUSTOM; - req->subtype = PIPELINE_FC_MSG_REQ_FLOW_ADD_BULK; - req->req = flow_req; - req->rsp = flow_rsp; - req->n_keys = n_keys; - - /* Send request and wait for response */ - rsp = app_msg_send_recv(app, pipeline_id, req, 10000); - if (rsp == NULL) { - for (i = 0; i < n_keys; i++) - if (new_flow[i]) - rte_free(flow[i]); - - rte_free(flow_rsp); - rte_free(flow_req); - rte_free(new_flow); - rte_free(signature); - rte_free(flow); - return -1; - } - - /* Read response */ - status = 0; - - for (i = 0; i < rsp->n_keys; i++) - if ((flow_rsp[i].entry_ptr == NULL) || - ((new_flow[i] == 0) && (flow_rsp[i].key_found == 0)) || - ((new_flow[i] == 1) && (flow_rsp[i].key_found == 1))) - status = -1; - - if (rsp->n_keys < n_keys) - status = -1; - - /* Commit flows */ - for (i = 0; i < rsp->n_keys; i++) { - memcpy(&flow[i]->key, &key[i], sizeof(flow[i]->key)); - flow[i]->port_id = port_id[i]; - flow[i]->flow_id = flow_id[i]; - flow[i]->signature = signature[i]; - flow[i]->entry_ptr = flow_rsp[i].entry_ptr; - - if (new_flow[i]) { - uint32_t bucket_id = signature[i] & (N_BUCKETS - 1); - - TAILQ_INSERT_TAIL(&p->flows[bucket_id], flow[i], node); - p->n_flows++; - } - } - - /* Free resources */ - - for (i = rsp->n_keys; i < n_keys; i++) - if (new_flow[i]) - rte_free(flow[i]); - - app_msg_free(app, rsp); - rte_free(flow_rsp); - rte_free(flow_req); - rte_free(new_flow); - rte_free(signature); - rte_free(flow); - - return status; -} - -int -app_pipeline_fc_del(struct app_params *app, - uint32_t pipeline_id, - struct pipeline_fc_key *key) -{ - struct app_pipeline_fc *p; - struct app_pipeline_fc_flow *flow; - - struct pipeline_fc_del_msg_req *req; - struct pipeline_fc_del_msg_rsp *rsp; - - uint32_t signature, bucket_id; - - /* Check input arguments */ - if ((app == NULL) || - (key == NULL)) - return -1; - - p = app_pipeline_data_fe(app, pipeline_id, &pipeline_flow_classification); - if (p == NULL) - return -1; - - if (app_pipeline_fc_key_check(key) != 0) - return -1; - - /* Find rule */ - flow = app_pipeline_fc_flow_find(p, key); - if (flow == NULL) - return 0; - - /* Allocate and write request */ - req = app_msg_alloc(app); - if (req == NULL) - return -1; - - req->type = PIPELINE_MSG_REQ_CUSTOM; - req->subtype = PIPELINE_FC_MSG_REQ_FLOW_DEL; - app_pipeline_fc_key_convert(key, req->key, &signature); - - /* Send request and wait for response */ - rsp = app_msg_send_recv(app, pipeline_id, req, MSG_TIMEOUT_DEFAULT); - if (rsp == NULL) - return -1; - - /* Read response */ - if (rsp->status || !rsp->key_found) { - app_msg_free(app, rsp); - return -1; - } - - /* Remove rule */ - bucket_id = signature & (N_BUCKETS - 1); - TAILQ_REMOVE(&p->flows[bucket_id], flow, node); - p->n_flows--; - rte_free(flow); - - /* Free response */ - app_msg_free(app, rsp); - - return 0; -} - -int -app_pipeline_fc_add_default(struct app_params *app, - uint32_t pipeline_id, - uint32_t port_id) -{ - struct app_pipeline_fc *p; - - struct pipeline_fc_add_default_msg_req *req; - struct pipeline_fc_add_default_msg_rsp *rsp; - - /* Check input arguments */ - if (app == NULL) - return -1; - - p = app_pipeline_data_fe(app, pipeline_id, &pipeline_flow_classification); - if (p == NULL) - return -1; - - if (port_id >= p->n_ports_out) - return -1; - - /* Allocate and write request */ - req = app_msg_alloc(app); - if (req == NULL) - return -1; - - req->type = PIPELINE_MSG_REQ_CUSTOM; - req->subtype = PIPELINE_FC_MSG_REQ_FLOW_ADD_DEFAULT; - req->port_id = port_id; - - /* Send request and wait for response */ - rsp = app_msg_send_recv(app, pipeline_id, req, MSG_TIMEOUT_DEFAULT); - if (rsp == NULL) - return -1; - - /* Read response and write flow */ - if (rsp->status || (rsp->entry_ptr == NULL)) { - app_msg_free(app, rsp); - return -1; - } - - p->default_flow_port_id = port_id; - p->default_flow_entry_ptr = rsp->entry_ptr; - - /* Commit route */ - p->default_flow_present = 1; - - /* Free response */ - app_msg_free(app, rsp); - - return 0; -} - -int -app_pipeline_fc_del_default(struct app_params *app, - uint32_t pipeline_id) -{ - struct app_pipeline_fc *p; - - struct pipeline_fc_del_default_msg_req *req; - struct pipeline_fc_del_default_msg_rsp *rsp; - - /* Check input arguments */ - if (app == NULL) - return -1; - - p = app_pipeline_data_fe(app, pipeline_id, &pipeline_flow_classification); - if (p == NULL) - return -EINVAL; - - /* Allocate and write request */ - req = app_msg_alloc(app); - if (req == NULL) - return -1; - - req->type = PIPELINE_MSG_REQ_CUSTOM; - req->subtype = PIPELINE_FC_MSG_REQ_FLOW_DEL_DEFAULT; - - /* Send request and wait for response */ - rsp = app_msg_send_recv(app, pipeline_id, req, MSG_TIMEOUT_DEFAULT); - if (rsp == NULL) - return -1; - - /* Read response */ - if (rsp->status) { - app_msg_free(app, rsp); - return -1; - } - - /* Commit route */ - p->default_flow_present = 0; - - /* Free response */ - app_msg_free(app, rsp); - - return 0; -} - -/* - * Flow ls - */ - -static void -print_fc_qinq_flow(struct app_pipeline_fc_flow *flow) -{ - printf("(SVLAN = %" PRIu32 ", " - "CVLAN = %" PRIu32 ") => " - "Port = %" PRIu32 ", " - "Flow ID = %" PRIu32 ", " - "(signature = 0x%08" PRIx32 ", " - "entry_ptr = %p)\n", - - flow->key.key.qinq.svlan, - flow->key.key.qinq.cvlan, - flow->port_id, - flow->flow_id, - flow->signature, - flow->entry_ptr); -} - -static void -print_fc_ipv4_5tuple_flow(struct app_pipeline_fc_flow *flow) -{ - printf("(SA = %" PRIu32 ".%" PRIu32 ".%" PRIu32 ".%" PRIu32 ", " - "DA = %" PRIu32 ".%" PRIu32 ".%" PRIu32 ".%" PRIu32 ", " - "SP = %" PRIu32 ", " - "DP = %" PRIu32 ", " - "Proto = %" PRIu32 ") => " - "Port = %" PRIu32 ", " - "Flow ID = %" PRIu32 " " - "(signature = 0x%08" PRIx32 ", " - "entry_ptr = %p)\n", - - (flow->key.key.ipv4_5tuple.ip_src >> 24) & 0xFF, - (flow->key.key.ipv4_5tuple.ip_src >> 16) & 0xFF, - (flow->key.key.ipv4_5tuple.ip_src >> 8) & 0xFF, - flow->key.key.ipv4_5tuple.ip_src & 0xFF, - - (flow->key.key.ipv4_5tuple.ip_dst >> 24) & 0xFF, - (flow->key.key.ipv4_5tuple.ip_dst >> 16) & 0xFF, - (flow->key.key.ipv4_5tuple.ip_dst >> 8) & 0xFF, - flow->key.key.ipv4_5tuple.ip_dst & 0xFF, - - flow->key.key.ipv4_5tuple.port_src, - flow->key.key.ipv4_5tuple.port_dst, - - flow->key.key.ipv4_5tuple.proto, - - flow->port_id, - flow->flow_id, - flow->signature, - flow->entry_ptr); -} - -static void -print_fc_ipv6_5tuple_flow(struct app_pipeline_fc_flow *flow) { - printf("(SA = %02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 - ":%02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 - ":%02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 - ":%02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 ", " - "DA = %02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 - ":%02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 - ":%02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 - ":%02" PRIx32 "%02" PRIx32 ":%02" PRIx32 "%02" PRIx32 ", " - "SP = %" PRIu32 ", " - "DP = %" PRIu32 " " - "Proto = %" PRIu32 " " - "=> Port = %" PRIu32 ", " - "Flow ID = %" PRIu32 " " - "(signature = 0x%08" PRIx32 ", " - "entry_ptr = %p)\n", - - flow->key.key.ipv6_5tuple.ip_src[0], - flow->key.key.ipv6_5tuple.ip_src[1], - flow->key.key.ipv6_5tuple.ip_src[2], - flow->key.key.ipv6_5tuple.ip_src[3], - flow->key.key.ipv6_5tuple.ip_src[4], - flow->key.key.ipv6_5tuple.ip_src[5], - flow->key.key.ipv6_5tuple.ip_src[6], - flow->key.key.ipv6_5tuple.ip_src[7], - flow->key.key.ipv6_5tuple.ip_src[8], - flow->key.key.ipv6_5tuple.ip_src[9], - flow->key.key.ipv6_5tuple.ip_src[10], - flow->key.key.ipv6_5tuple.ip_src[11], - flow->key.key.ipv6_5tuple.ip_src[12], - flow->key.key.ipv6_5tuple.ip_src[13], - flow->key.key.ipv6_5tuple.ip_src[14], - flow->key.key.ipv6_5tuple.ip_src[15], - - flow->key.key.ipv6_5tuple.ip_dst[0], - flow->key.key.ipv6_5tuple.ip_dst[1], - flow->key.key.ipv6_5tuple.ip_dst[2], - flow->key.key.ipv6_5tuple.ip_dst[3], - flow->key.key.ipv6_5tuple.ip_dst[4], - flow->key.key.ipv6_5tuple.ip_dst[5], - flow->key.key.ipv6_5tuple.ip_dst[6], - flow->key.key.ipv6_5tuple.ip_dst[7], - flow->key.key.ipv6_5tuple.ip_dst[8], - flow->key.key.ipv6_5tuple.ip_dst[9], - flow->key.key.ipv6_5tuple.ip_dst[10], - flow->key.key.ipv6_5tuple.ip_dst[11], - flow->key.key.ipv6_5tuple.ip_dst[12], - flow->key.key.ipv6_5tuple.ip_dst[13], - flow->key.key.ipv6_5tuple.ip_dst[14], - flow->key.key.ipv6_5tuple.ip_dst[15], - - flow->key.key.ipv6_5tuple.port_src, - flow->key.key.ipv6_5tuple.port_dst, - - flow->key.key.ipv6_5tuple.proto, - - flow->port_id, - flow->flow_id, - flow->signature, - flow->entry_ptr); -} - -static void -print_fc_flow(struct app_pipeline_fc_flow *flow) -{ - switch (flow->key.type) { - case FLOW_KEY_QINQ: - print_fc_qinq_flow(flow); - break; - - case FLOW_KEY_IPV4_5TUPLE: - print_fc_ipv4_5tuple_flow(flow); - break; - - case FLOW_KEY_IPV6_5TUPLE: - print_fc_ipv6_5tuple_flow(flow); - break; - } -} - -static int -app_pipeline_fc_ls(struct app_params *app, - uint32_t pipeline_id) -{ - struct app_pipeline_fc *p; - struct app_pipeline_fc_flow *flow; - uint32_t i; - - /* Check input arguments */ - if (app == NULL) - return -1; - - p = app_pipeline_data_fe(app, pipeline_id, &pipeline_flow_classification); - if (p == NULL) - return -1; - - for (i = 0; i < N_BUCKETS; i++) - TAILQ_FOREACH(flow, &p->flows[i], node) - print_fc_flow(flow); - - if (p->default_flow_present) - printf("Default flow: port %" PRIu32 " (entry ptr = %p)\n", - p->default_flow_port_id, - p->default_flow_entry_ptr); - else - printf("Default: DROP\n"); - - return 0; -} -/* - * flow - * - * flow add: - * p flow add qinq port id - * p flow add qinq bulk - * p flow add ipv4 port id - * p flow add ipv4 bulk - * p flow add ipv6 port id - * p flow add ipv6 bulk - * - * flow add default: - * p flow add default - * - * flow del: - * p flow del qinq - * p flow del ipv4 - * p flow del ipv6 - * - * flow del default: - * p flow del default - * - * flow ls: - * p flow ls - */ - -struct cmd_flow_result { - cmdline_fixed_string_t p_string; - uint32_t pipeline_id; - cmdline_fixed_string_t flow_string; - cmdline_multi_string_t multi_string; -}; - -static void -cmd_flow_parsed(void *parsed_result, - __attribute__((unused)) struct cmdline *cl, - void *data) -{ - struct cmd_flow_result *results = parsed_result; - struct app_params *app = data; - - char *tokens[16]; - uint32_t n_tokens = RTE_DIM(tokens); - int status; - - status = parse_tokenize_string(results->multi_string, tokens, &n_tokens); - if (status) { - printf(CMD_MSG_TOO_MANY_ARGS, "flow"); - return; - } - - /* flow add qinq */ - if ((n_tokens >= 3) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "qinq") == 0) && - strcmp(tokens[2], "bulk")) { - struct pipeline_fc_key key; - uint32_t svlan; - uint32_t cvlan; - uint32_t port_id; - uint32_t flow_id; - - memset(&key, 0, sizeof(key)); - - if (n_tokens != 8) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add qinq"); - return; - } - - if (parser_read_uint32(&svlan, tokens[2]) != 0) { - printf(CMD_MSG_INVALID_ARG, "svlan"); - return; - } - - if (parser_read_uint32(&cvlan, tokens[3]) != 0) { - printf(CMD_MSG_INVALID_ARG, "cvlan"); - return; - } - - if (strcmp(tokens[4], "port") != 0) { - printf(CMD_MSG_ARG_NOT_FOUND, "port"); - return; - } - - if (parser_read_uint32(&port_id, tokens[5]) != 0) { - printf(CMD_MSG_INVALID_ARG, "portid"); - return; - } - - if (strcmp(tokens[6], "id") != 0) { - printf(CMD_MSG_ARG_NOT_FOUND, "id"); - return; - } - - if (parser_read_uint32(&flow_id, tokens[7]) != 0) { - printf(CMD_MSG_INVALID_ARG, "flowid"); - return; - } - - key.type = FLOW_KEY_QINQ; - key.key.qinq.svlan = svlan; - key.key.qinq.cvlan = cvlan; - - status = app_pipeline_fc_add(app, - results->pipeline_id, - &key, - port_id, - flow_id); - if (status) - printf(CMD_MSG_FAIL, "flow add qinq"); - - return; - } /* flow add qinq */ - - /* flow add ipv4 */ - if ((n_tokens >= 3) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "ipv4") == 0) && - strcmp(tokens[2], "bulk")) { - struct pipeline_fc_key key; - struct in_addr sipaddr; - struct in_addr dipaddr; - uint32_t sport; - uint32_t dport; - uint32_t proto; - uint32_t port_id; - uint32_t flow_id; - - memset(&key, 0, sizeof(key)); - - if (n_tokens != 11) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add ipv4"); - return; - } - - if (parse_ipv4_addr(tokens[2], &sipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "sipv4addr"); - return; - } - if (parse_ipv4_addr(tokens[3], &dipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "dipv4addr"); - return; - } - - if (parser_read_uint32(&sport, tokens[4]) != 0) { - printf(CMD_MSG_INVALID_ARG, "sport"); - return; - } - - if (parser_read_uint32(&dport, tokens[5]) != 0) { - printf(CMD_MSG_INVALID_ARG, "dport"); - return; - } - - if (parser_read_uint32(&proto, tokens[6]) != 0) { - printf(CMD_MSG_INVALID_ARG, "proto"); - return; - } - - if (strcmp(tokens[7], "port") != 0) { - printf(CMD_MSG_ARG_NOT_FOUND, "port"); - return; - } - - if (parser_read_uint32(&port_id, tokens[8]) != 0) { - printf(CMD_MSG_INVALID_ARG, "portid"); - return; - } - - if (strcmp(tokens[9], "id") != 0) { - printf(CMD_MSG_ARG_NOT_FOUND, "id"); - return; - } - - if (parser_read_uint32(&flow_id, tokens[10]) != 0) { - printf(CMD_MSG_INVALID_ARG, "flowid"); - return; - } - - key.type = FLOW_KEY_IPV4_5TUPLE; - key.key.ipv4_5tuple.ip_src = rte_be_to_cpu_32(sipaddr.s_addr); - key.key.ipv4_5tuple.ip_dst = rte_be_to_cpu_32(dipaddr.s_addr); - key.key.ipv4_5tuple.port_src = sport; - key.key.ipv4_5tuple.port_dst = dport; - key.key.ipv4_5tuple.proto = proto; - - status = app_pipeline_fc_add(app, - results->pipeline_id, - &key, - port_id, - flow_id); - if (status) - printf(CMD_MSG_FAIL, "flow add ipv4"); - - return; - } /* flow add ipv4 */ - - /* flow add ipv6 */ - if ((n_tokens >= 3) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "ipv6") == 0) && - strcmp(tokens[2], "bulk")) { - struct pipeline_fc_key key; - struct in6_addr sipaddr; - struct in6_addr dipaddr; - uint32_t sport; - uint32_t dport; - uint32_t proto; - uint32_t port_id; - uint32_t flow_id; - - memset(&key, 0, sizeof(key)); - - if (n_tokens != 11) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add ipv6"); - return; - } - - if (parse_ipv6_addr(tokens[2], &sipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "sipv6addr"); - return; - } - if (parse_ipv6_addr(tokens[3], &dipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "dipv6addr"); - return; - } - - if (parser_read_uint32(&sport, tokens[4]) != 0) { - printf(CMD_MSG_INVALID_ARG, "sport"); - return; - } - - if (parser_read_uint32(&dport, tokens[5]) != 0) { - printf(CMD_MSG_INVALID_ARG, "dport"); - return; - } - - if (parser_read_uint32(&proto, tokens[6]) != 0) { - printf(CMD_MSG_INVALID_ARG, "proto"); - return; - } - - if (strcmp(tokens[7], "port") != 0) { - printf(CMD_MSG_ARG_NOT_FOUND, "port"); - return; - } - - if (parser_read_uint32(&port_id, tokens[8]) != 0) { - printf(CMD_MSG_INVALID_ARG, "portid"); - return; - } - - if (strcmp(tokens[9], "id") != 0) { - printf(CMD_MSG_ARG_NOT_FOUND, "id"); - return; - } - - if (parser_read_uint32(&flow_id, tokens[10]) != 0) { - printf(CMD_MSG_INVALID_ARG, "flowid"); - return; - } - - key.type = FLOW_KEY_IPV6_5TUPLE; - memcpy(key.key.ipv6_5tuple.ip_src, (void *)&sipaddr, 16); - memcpy(key.key.ipv6_5tuple.ip_dst, (void *)&dipaddr, 16); - key.key.ipv6_5tuple.port_src = sport; - key.key.ipv6_5tuple.port_dst = dport; - key.key.ipv6_5tuple.proto = proto; - - status = app_pipeline_fc_add(app, - results->pipeline_id, - &key, - port_id, - flow_id); - if (status) - printf(CMD_MSG_FAIL, "flow add ipv6"); - - return; - } /* flow add ipv6 */ - - /* flow add qinq bulk */ - if ((n_tokens >= 3) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "qinq") == 0) && - (strcmp(tokens[2], "bulk") == 0)) { - struct pipeline_fc_key *keys; - uint32_t *port_ids, *flow_ids, n_keys, line; - char *filename; - - if (n_tokens != 4) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add qinq bulk"); - return; - } - - filename = tokens[3]; - - n_keys = APP_PIPELINE_FC_MAX_FLOWS_IN_FILE; - keys = malloc(n_keys * sizeof(struct pipeline_fc_key)); - if (keys == NULL) - return; - memset(keys, 0, n_keys * sizeof(struct pipeline_fc_key)); - - port_ids = malloc(n_keys * sizeof(uint32_t)); - if (port_ids == NULL) { - free(keys); - return; - } - - flow_ids = malloc(n_keys * sizeof(uint32_t)); - if (flow_ids == NULL) { - free(port_ids); - free(keys); - return; - } - - status = app_pipeline_fc_load_file_qinq(filename, - keys, - port_ids, - flow_ids, - &n_keys, - &line); - if (status != 0) { - printf(CMD_MSG_FILE_ERR, filename, line); - free(flow_ids); - free(port_ids); - free(keys); - return; - } - - status = app_pipeline_fc_add_bulk(app, - results->pipeline_id, - keys, - port_ids, - flow_ids, - n_keys); - if (status) - printf(CMD_MSG_FAIL, "flow add qinq bulk"); - - free(flow_ids); - free(port_ids); - free(keys); - return; - } /* flow add qinq bulk */ - - /* flow add ipv4 bulk */ - if ((n_tokens >= 3) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "ipv4") == 0) && - (strcmp(tokens[2], "bulk") == 0)) { - struct pipeline_fc_key *keys; - uint32_t *port_ids, *flow_ids, n_keys, line; - char *filename; - - if (n_tokens != 4) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add ipv4 bulk"); - return; - } - - filename = tokens[3]; - - n_keys = APP_PIPELINE_FC_MAX_FLOWS_IN_FILE; - keys = malloc(n_keys * sizeof(struct pipeline_fc_key)); - if (keys == NULL) - return; - memset(keys, 0, n_keys * sizeof(struct pipeline_fc_key)); - - port_ids = malloc(n_keys * sizeof(uint32_t)); - if (port_ids == NULL) { - free(keys); - return; - } - - flow_ids = malloc(n_keys * sizeof(uint32_t)); - if (flow_ids == NULL) { - free(port_ids); - free(keys); - return; - } - - status = app_pipeline_fc_load_file_ipv4(filename, - keys, - port_ids, - flow_ids, - &n_keys, - &line); - if (status != 0) { - printf(CMD_MSG_FILE_ERR, filename, line); - free(flow_ids); - free(port_ids); - free(keys); - return; - } - - status = app_pipeline_fc_add_bulk(app, - results->pipeline_id, - keys, - port_ids, - flow_ids, - n_keys); - if (status) - printf(CMD_MSG_FAIL, "flow add ipv4 bulk"); - - free(flow_ids); - free(port_ids); - free(keys); - return; - } /* flow add ipv4 bulk */ - - /* flow add ipv6 bulk */ - if ((n_tokens >= 3) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "ipv6") == 0) && - (strcmp(tokens[2], "bulk") == 0)) { - struct pipeline_fc_key *keys; - uint32_t *port_ids, *flow_ids, n_keys, line; - char *filename; - - if (n_tokens != 4) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add ipv6 bulk"); - return; - } - - filename = tokens[3]; - - n_keys = APP_PIPELINE_FC_MAX_FLOWS_IN_FILE; - keys = malloc(n_keys * sizeof(struct pipeline_fc_key)); - if (keys == NULL) - return; - memset(keys, 0, n_keys * sizeof(struct pipeline_fc_key)); - - port_ids = malloc(n_keys * sizeof(uint32_t)); - if (port_ids == NULL) { - free(keys); - return; - } - - flow_ids = malloc(n_keys * sizeof(uint32_t)); - if (flow_ids == NULL) { - free(port_ids); - free(keys); - return; - } - - status = app_pipeline_fc_load_file_ipv6(filename, - keys, - port_ids, - flow_ids, - &n_keys, - &line); - if (status != 0) { - printf(CMD_MSG_FILE_ERR, filename, line); - free(flow_ids); - free(port_ids); - free(keys); - return; - } - - status = app_pipeline_fc_add_bulk(app, - results->pipeline_id, - keys, - port_ids, - flow_ids, - n_keys); - if (status) - printf(CMD_MSG_FAIL, "flow add ipv6 bulk"); - - free(flow_ids); - free(port_ids); - free(keys); - return; - } /* flow add ipv6 bulk */ - - /* flow add default*/ - if ((n_tokens >= 2) && - (strcmp(tokens[0], "add") == 0) && - (strcmp(tokens[1], "default") == 0)) { - uint32_t port_id; - - if (n_tokens != 3) { - printf(CMD_MSG_MISMATCH_ARGS, "flow add default"); - return; - } - - if (parser_read_uint32(&port_id, tokens[2]) != 0) { - printf(CMD_MSG_INVALID_ARG, "portid"); - return; - } - - status = app_pipeline_fc_add_default(app, - results->pipeline_id, - port_id); - if (status) - printf(CMD_MSG_FAIL, "flow add default"); - - return; - } /* flow add default */ - - /* flow del qinq */ - if ((n_tokens >= 2) && - (strcmp(tokens[0], "del") == 0) && - (strcmp(tokens[1], "qinq") == 0)) { - struct pipeline_fc_key key; - uint32_t svlan; - uint32_t cvlan; - - memset(&key, 0, sizeof(key)); - - if (n_tokens != 4) { - printf(CMD_MSG_MISMATCH_ARGS, "flow del qinq"); - return; - } - - if (parser_read_uint32(&svlan, tokens[2]) != 0) { - printf(CMD_MSG_INVALID_ARG, "svlan"); - return; - } - - if (parser_read_uint32(&cvlan, tokens[3]) != 0) { - printf(CMD_MSG_INVALID_ARG, "cvlan"); - return; - } - - key.type = FLOW_KEY_QINQ; - key.key.qinq.svlan = svlan; - key.key.qinq.cvlan = cvlan; - - status = app_pipeline_fc_del(app, - results->pipeline_id, - &key); - if (status) - printf(CMD_MSG_FAIL, "flow del qinq"); - - return; - } /* flow del qinq */ - - /* flow del ipv4 */ - if ((n_tokens >= 2) && - (strcmp(tokens[0], "del") == 0) && - (strcmp(tokens[1], "ipv4") == 0)) { - struct pipeline_fc_key key; - struct in_addr sipaddr; - struct in_addr dipaddr; - uint32_t sport; - uint32_t dport; - uint32_t proto; - - memset(&key, 0, sizeof(key)); - - if (n_tokens != 7) { - printf(CMD_MSG_MISMATCH_ARGS, "flow del ipv4"); - return; - } - - if (parse_ipv4_addr(tokens[2], &sipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "sipv4addr"); - return; - } - if (parse_ipv4_addr(tokens[3], &dipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "dipv4addr"); - return; - } - - if (parser_read_uint32(&sport, tokens[4]) != 0) { - printf(CMD_MSG_INVALID_ARG, "sport"); - return; - } - - if (parser_read_uint32(&dport, tokens[5]) != 0) { - printf(CMD_MSG_INVALID_ARG, "dport"); - return; - } - - if (parser_read_uint32(&proto, tokens[6]) != 0) { - printf(CMD_MSG_INVALID_ARG, "proto"); - return; - } - - key.type = FLOW_KEY_IPV4_5TUPLE; - key.key.ipv4_5tuple.ip_src = rte_be_to_cpu_32(sipaddr.s_addr); - key.key.ipv4_5tuple.ip_dst = rte_be_to_cpu_32(dipaddr.s_addr); - key.key.ipv4_5tuple.port_src = sport; - key.key.ipv4_5tuple.port_dst = dport; - key.key.ipv4_5tuple.proto = proto; - - status = app_pipeline_fc_del(app, - results->pipeline_id, - &key); - if (status) - printf(CMD_MSG_FAIL, "flow del ipv4"); - - return; - } /* flow del ipv4 */ - - /* flow del ipv6 */ - if ((n_tokens >= 2) && - (strcmp(tokens[0], "del") == 0) && - (strcmp(tokens[1], "ipv6") == 0)) { - struct pipeline_fc_key key; - struct in6_addr sipaddr; - struct in6_addr dipaddr; - uint32_t sport; - uint32_t dport; - uint32_t proto; - - memset(&key, 0, sizeof(key)); - - if (n_tokens != 7) { - printf(CMD_MSG_MISMATCH_ARGS, "flow del ipv6"); - return; - } - - if (parse_ipv6_addr(tokens[2], &sipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "sipv6addr"); - return; - } - - if (parse_ipv6_addr(tokens[3], &dipaddr) != 0) { - printf(CMD_MSG_INVALID_ARG, "dipv6addr"); - return; - } - - if (parser_read_uint32(&sport, tokens[4]) != 0) { - printf(CMD_MSG_INVALID_ARG, "sport"); - return; - } - - if (parser_read_uint32(&dport, tokens[5]) != 0) { - printf(CMD_MSG_INVALID_ARG, "dport"); - return; - } - - if (parser_read_uint32(&proto, tokens[6]) != 0) { - printf(CMD_MSG_INVALID_ARG, "proto"); - return; - } - - key.type = FLOW_KEY_IPV6_5TUPLE; - memcpy(key.key.ipv6_5tuple.ip_src, &sipaddr, 16); - memcpy(key.key.ipv6_5tuple.ip_dst, &dipaddr, 16); - key.key.ipv6_5tuple.port_src = sport; - key.key.ipv6_5tuple.port_dst = dport; - key.key.ipv6_5tuple.proto = proto; - - status = app_pipeline_fc_del(app, - results->pipeline_id, - &key); - if (status) - printf(CMD_MSG_FAIL, "flow del ipv6"); - - return; - } /* flow del ipv6 */ - - /* flow del default*/ - if ((n_tokens >= 2) && - (strcmp(tokens[0], "del") == 0) && - (strcmp(tokens[1], "default") == 0)) { - if (n_tokens != 2) { - printf(CMD_MSG_MISMATCH_ARGS, "flow del default"); - return; - } - - status = app_pipeline_fc_del_default(app, - results->pipeline_id); - if (status) - printf(CMD_MSG_FAIL, "flow del default"); - - return; - } /* flow del default */ - - /* flow ls */ - if ((n_tokens >= 1) && (strcmp(tokens[0], "ls") == 0)) { - if (n_tokens != 1) { - printf(CMD_MSG_MISMATCH_ARGS, "flow ls"); - return; - } - - status = app_pipeline_fc_ls(app, results->pipeline_id); - if (status) - printf(CMD_MSG_FAIL, "flow ls"); - - return; - } /* flow ls */ - - printf(CMD_MSG_MISMATCH_ARGS, "flow"); -} - -static cmdline_parse_token_string_t cmd_flow_p_string = - TOKEN_STRING_INITIALIZER(struct cmd_flow_result, p_string, "p"); - -static cmdline_parse_token_num_t cmd_flow_pipeline_id = - TOKEN_NUM_INITIALIZER(struct cmd_flow_result, pipeline_id, UINT32); - -static cmdline_parse_token_string_t cmd_flow_flow_string = - TOKEN_STRING_INITIALIZER(struct cmd_flow_result, flow_string, "flow"); - -static cmdline_parse_token_string_t cmd_flow_multi_string = - TOKEN_STRING_INITIALIZER(struct cmd_flow_result, multi_string, - TOKEN_STRING_MULTI); - -static cmdline_parse_inst_t cmd_flow = { - .f = cmd_flow_parsed, - .data = NULL, - .help_str = "flow add / add bulk / add default / del / del default / ls", - .tokens = { - (void *) &cmd_flow_p_string, - (void *) &cmd_flow_pipeline_id, - (void *) &cmd_flow_flow_string, - (void *) &cmd_flow_multi_string, - NULL, - }, -}; - -static cmdline_parse_ctx_t pipeline_cmds[] = { - (cmdline_parse_inst_t *) &cmd_flow, - NULL, -}; - -static struct pipeline_fe_ops pipeline_flow_classification_fe_ops = { - .f_init = app_pipeline_fc_init, - .f_post_init = NULL, - .f_free = app_pipeline_fc_free, - .f_track = app_pipeline_track_default, - .cmds = pipeline_cmds, -}; - -struct pipeline_type pipeline_flow_classification = { - .name = "FLOW_CLASSIFICATION", - .be_ops = &pipeline_flow_classification_be_ops, - .fe_ops = &pipeline_flow_classification_fe_ops, -}; diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification.h b/examples/ip_pipeline/pipeline/pipeline_flow_classification.h deleted file mode 100644 index 8c35498..0000000 --- a/examples/ip_pipeline/pipeline/pipeline_flow_classification.h +++ /dev/null @@ -1,106 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2010-2015 Intel Corporation - */ - -#ifndef __INCLUDE_PIPELINE_FLOW_CLASSIFICATION_H__ -#define __INCLUDE_PIPELINE_FLOW_CLASSIFICATION_H__ - -#include "pipeline.h" -#include "pipeline_flow_classification_be.h" - -enum flow_key_type { - FLOW_KEY_QINQ, - FLOW_KEY_IPV4_5TUPLE, - FLOW_KEY_IPV6_5TUPLE, -}; - -struct flow_key_qinq { - uint16_t svlan; - uint16_t cvlan; -}; - -struct flow_key_ipv4_5tuple { - uint32_t ip_src; - uint32_t ip_dst; - uint16_t port_src; - uint16_t port_dst; - uint32_t proto; -}; - -struct flow_key_ipv6_5tuple { - uint8_t ip_src[16]; - uint8_t ip_dst[16]; - uint16_t port_src; - uint16_t port_dst; - uint32_t proto; -}; - -struct pipeline_fc_key { - enum flow_key_type type; - union { - struct flow_key_qinq qinq; - struct flow_key_ipv4_5tuple ipv4_5tuple; - struct flow_key_ipv6_5tuple ipv6_5tuple; - } key; -}; - -int -app_pipeline_fc_add(struct app_params *app, - uint32_t pipeline_id, - struct pipeline_fc_key *key, - uint32_t port_id, - uint32_t flow_id); - -int -app_pipeline_fc_add_bulk(struct app_params *app, - uint32_t pipeline_id, - struct pipeline_fc_key *key, - uint32_t *port_id, - uint32_t *flow_id, - uint32_t n_keys); - -int -app_pipeline_fc_del(struct app_params *app, - uint32_t pipeline_id, - struct pipeline_fc_key *key); - -int -app_pipeline_fc_add_default(struct app_params *app, - uint32_t pipeline_id, - uint32_t port_id); - -int -app_pipeline_fc_del_default(struct app_params *app, - uint32_t pipeline_id); - -#ifndef APP_PIPELINE_FC_MAX_FLOWS_IN_FILE -#define APP_PIPELINE_FC_MAX_FLOWS_IN_FILE (16 * 1024 * 1024) -#endif - -int -app_pipeline_fc_load_file_qinq(char *filename, - struct pipeline_fc_key *keys, - uint32_t *port_ids, - uint32_t *flow_ids, - uint32_t *n_keys, - uint32_t *line); - -int -app_pipeline_fc_load_file_ipv4(char *filename, - struct pipeline_fc_key *keys, - uint32_t *port_ids, - uint32_t *flow_ids, - uint32_t *n_keys, - uint32_t *line); - -int -app_pipeline_fc_load_file_ipv6(char *filename, - struct pipeline_fc_key *keys, - uint32_t *port_ids, - uint32_t *flow_ids, - uint32_t *n_keys, - uint32_t *line); - -extern struct pipeline_type pipeline_flow_classification; - -#endif diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c deleted file mode 100644 index 097ec34..0000000 --- a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c +++ /dev/null @@ -1,723 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2010-2016 Intel Corporation - */ - -#include - -#include -#include -#include -#include -#include - -#include "pipeline_flow_classification_be.h" -#include "pipeline_actions_common.h" -#include "parser.h" -#include "hash_func.h" - -struct pipeline_flow_classification { - struct pipeline p; - pipeline_msg_req_handler custom_handlers[PIPELINE_FC_MSG_REQS]; - - uint32_t n_flows; - uint32_t key_size; - uint32_t flow_id; - - uint32_t key_offset; - uint32_t hash_offset; - uint8_t key_mask[PIPELINE_FC_FLOW_KEY_MAX_SIZE]; - uint32_t key_mask_present; - uint32_t flow_id_offset; - -} __rte_cache_aligned; - -static void * -pipeline_fc_msg_req_custom_handler(struct pipeline *p, void *msg); - -static pipeline_msg_req_handler handlers[] = { - [PIPELINE_MSG_REQ_PING] = - pipeline_msg_req_ping_handler, - [PIPELINE_MSG_REQ_STATS_PORT_IN] = - pipeline_msg_req_stats_port_in_handler, - [PIPELINE_MSG_REQ_STATS_PORT_OUT] = - pipeline_msg_req_stats_port_out_handler, - [PIPELINE_MSG_REQ_STATS_TABLE] = - pipeline_msg_req_stats_table_handler, - [PIPELINE_MSG_REQ_PORT_IN_ENABLE] = - pipeline_msg_req_port_in_enable_handler, - [PIPELINE_MSG_REQ_PORT_IN_DISABLE] = - pipeline_msg_req_port_in_disable_handler, - [PIPELINE_MSG_REQ_CUSTOM] = - pipeline_fc_msg_req_custom_handler, -}; - -static void * -pipeline_fc_msg_req_add_handler(struct pipeline *p, void *msg); - -static void * -pipeline_fc_msg_req_add_bulk_handler(struct pipeline *p, void *msg); - -static void * -pipeline_fc_msg_req_del_handler(struct pipeline *p, void *msg); - -static void * -pipeline_fc_msg_req_add_default_handler(struct pipeline *p, void *msg); - -static void * -pipeline_fc_msg_req_del_default_handler(struct pipeline *p, void *msg); - -static pipeline_msg_req_handler custom_handlers[] = { - [PIPELINE_FC_MSG_REQ_FLOW_ADD] = - pipeline_fc_msg_req_add_handler, - [PIPELINE_FC_MSG_REQ_FLOW_ADD_BULK] = - pipeline_fc_msg_req_add_bulk_handler, - [PIPELINE_FC_MSG_REQ_FLOW_DEL] = - pipeline_fc_msg_req_del_handler, - [PIPELINE_FC_MSG_REQ_FLOW_ADD_DEFAULT] = - pipeline_fc_msg_req_add_default_handler, - [PIPELINE_FC_MSG_REQ_FLOW_DEL_DEFAULT] = - pipeline_fc_msg_req_del_default_handler, -}; - -/* - * Flow table - */ -struct flow_table_entry { - struct rte_pipeline_table_entry head; - - uint32_t flow_id; - uint32_t pad; -}; - -rte_table_hash_op_hash hash_func[] = { - hash_default_key8, - hash_default_key16, - hash_default_key24, - hash_default_key32, - hash_default_key40, - hash_default_key48, - hash_default_key56, - hash_default_key64 -}; - -/* - * Flow table AH - Write flow_id to packet meta-data - */ -static inline void -pkt_work_flow_id( - struct rte_mbuf *pkt, - struct rte_pipeline_table_entry *table_entry, - void *arg) -{ - struct pipeline_flow_classification *p_fc = arg; - uint32_t *flow_id_ptr = - RTE_MBUF_METADATA_UINT32_PTR(pkt, p_fc->flow_id_offset); - struct flow_table_entry *entry = - (struct flow_table_entry *) table_entry; - - /* Read */ - uint32_t flow_id = entry->flow_id; - - /* Compute */ - - /* Write */ - *flow_id_ptr = flow_id; -} - -static inline void -pkt4_work_flow_id( - struct rte_mbuf **pkts, - struct rte_pipeline_table_entry **table_entries, - void *arg) -{ - struct pipeline_flow_classification *p_fc = arg; - - uint32_t *flow_id_ptr0 = - RTE_MBUF_METADATA_UINT32_PTR(pkts[0], p_fc->flow_id_offset); - uint32_t *flow_id_ptr1 = - RTE_MBUF_METADATA_UINT32_PTR(pkts[1], p_fc->flow_id_offset); - uint32_t *flow_id_ptr2 = - RTE_MBUF_METADATA_UINT32_PTR(pkts[2], p_fc->flow_id_offset); - uint32_t *flow_id_ptr3 = - RTE_MBUF_METADATA_UINT32_PTR(pkts[3], p_fc->flow_id_offset); - - struct flow_table_entry *entry0 = - (struct flow_table_entry *) table_entries[0]; - struct flow_table_entry *entry1 = - (struct flow_table_entry *) table_entries[1]; - struct flow_table_entry *entry2 = - (struct flow_table_entry *) table_entries[2]; - struct flow_table_entry *entry3 = - (struct flow_table_entry *) table_entries[3]; - - /* Read */ - uint32_t flow_id0 = entry0->flow_id; - uint32_t flow_id1 = entry1->flow_id; - uint32_t flow_id2 = entry2->flow_id; - uint32_t flow_id3 = entry3->flow_id; - - /* Compute */ - - /* Write */ - *flow_id_ptr0 = flow_id0; - *flow_id_ptr1 = flow_id1; - *flow_id_ptr2 = flow_id2; - *flow_id_ptr3 = flow_id3; -} - -PIPELINE_TABLE_AH_HIT(fc_table_ah_hit, - pkt_work_flow_id, pkt4_work_flow_id); - -static rte_pipeline_table_action_handler_hit -get_fc_table_ah_hit(struct pipeline_flow_classification *p) -{ - if (p->flow_id) - return fc_table_ah_hit; - - return NULL; -} - -/* - * Argument parsing - */ -static int -pipeline_fc_parse_args(struct pipeline_flow_classification *p, - struct pipeline_params *params) -{ - uint32_t n_flows_present = 0; - uint32_t key_offset_present = 0; - uint32_t key_size_present = 0; - uint32_t hash_offset_present = 0; - uint32_t key_mask_present = 0; - uint32_t flow_id_offset_present = 0; - - uint32_t i; - char key_mask_str[PIPELINE_FC_FLOW_KEY_MAX_SIZE * 2 + 1]; - - p->hash_offset = 0; - - /* default values */ - p->flow_id = 0; - - for (i = 0; i < params->n_args; i++) { - char *arg_name = params->args_name[i]; - char *arg_value = params->args_value[i]; - - /* n_flows */ - if (strcmp(arg_name, "n_flows") == 0) { - int status; - - PIPELINE_PARSE_ERR_DUPLICATE( - n_flows_present == 0, params->name, - arg_name); - n_flows_present = 1; - - status = parser_read_uint32(&p->n_flows, - arg_value); - PIPELINE_PARSE_ERR_INV_VAL(((status != -EINVAL) && - (p->n_flows != 0)), params->name, - arg_name, arg_value); - PIPELINE_PARSE_ERR_OUT_RNG((status != -ERANGE), - params->name, arg_name, arg_value); - - continue; - } - - /* key_offset */ - if (strcmp(arg_name, "key_offset") == 0) { - int status; - - PIPELINE_PARSE_ERR_DUPLICATE( - key_offset_present == 0, params->name, - arg_name); - key_offset_present = 1; - - status = parser_read_uint32(&p->key_offset, - arg_value); - PIPELINE_PARSE_ERR_INV_VAL((status != -EINVAL), - params->name, arg_name, arg_value); - PIPELINE_PARSE_ERR_OUT_RNG((status != -ERANGE), - params->name, arg_name, arg_value); - - continue; - } - - /* key_size */ - if (strcmp(arg_name, "key_size") == 0) { - int status; - - PIPELINE_PARSE_ERR_DUPLICATE( - key_size_present == 0, params->name, - arg_name); - key_size_present = 1; - - status = parser_read_uint32(&p->key_size, - arg_value); - PIPELINE_PARSE_ERR_INV_VAL(((status != -EINVAL) && - (p->key_size != 0) && - (p->key_size % 8 == 0)), - params->name, arg_name, arg_value); - PIPELINE_PARSE_ERR_OUT_RNG(((status != -ERANGE) && - (p->key_size <= - PIPELINE_FC_FLOW_KEY_MAX_SIZE)), - params->name, arg_name, arg_value); - - continue; - } - - /* key_mask */ - if (strcmp(arg_name, "key_mask") == 0) { - int mask_str_len = strlen(arg_value); - - PIPELINE_PARSE_ERR_DUPLICATE( - key_mask_present == 0, - params->name, arg_name); - key_mask_present = 1; - - PIPELINE_ARG_CHECK((mask_str_len <= - (PIPELINE_FC_FLOW_KEY_MAX_SIZE * 2)), - "Parse error in section \"%s\": entry " - "\"%s\" is too long", params->name, - arg_name); - - snprintf(key_mask_str, mask_str_len + 1, "%s", - arg_value); - - continue; - } - - /* hash_offset */ - if (strcmp(arg_name, "hash_offset") == 0) { - int status; - - PIPELINE_PARSE_ERR_DUPLICATE( - hash_offset_present == 0, params->name, - arg_name); - hash_offset_present = 1; - - status = parser_read_uint32(&p->hash_offset, - arg_value); - PIPELINE_PARSE_ERR_INV_VAL((status != -EINVAL), - params->name, arg_name, arg_value); - PIPELINE_PARSE_ERR_OUT_RNG((status != -ERANGE), - params->name, arg_name, arg_value); - - continue; - } - - /* flow_id_offset */ - if (strcmp(arg_name, "flowid_offset") == 0) { - int status; - - PIPELINE_PARSE_ERR_DUPLICATE( - flow_id_offset_present == 0, params->name, - arg_name); - flow_id_offset_present = 1; - - status = parser_read_uint32(&p->flow_id_offset, - arg_value); - PIPELINE_PARSE_ERR_INV_VAL((status != -EINVAL), - params->name, arg_name, arg_value); - PIPELINE_PARSE_ERR_OUT_RNG((status != -ERANGE), - params->name, arg_name, arg_value); - - p->flow_id = 1; - - continue; - } - - /* Unknown argument */ - PIPELINE_PARSE_ERR_INV_ENT(0, params->name, arg_name); - } - - /* Check that mandatory arguments are present */ - PIPELINE_PARSE_ERR_MANDATORY((n_flows_present), params->name, - "n_flows"); - PIPELINE_PARSE_ERR_MANDATORY((key_offset_present), params->name, - "key_offset"); - PIPELINE_PARSE_ERR_MANDATORY((key_size_present), params->name, - "key_size"); - - if (key_mask_present) { - uint32_t key_size = p->key_size; - int status; - - PIPELINE_ARG_CHECK(((key_size == 8) || (key_size == 16)), - "Parse error in section \"%s\": entry key_mask " - "only allowed for key_size of 8 or 16 bytes", - params->name); - - PIPELINE_ARG_CHECK((strlen(key_mask_str) == - (key_size * 2)), "Parse error in section " - "\"%s\": key_mask should have exactly %u hex " - "digits", params->name, (key_size * 2)); - - PIPELINE_ARG_CHECK((hash_offset_present == 0), "Parse " - "error in section \"%s\": entry hash_offset only " - "allowed when key_mask is not present", - params->name); - - status = parse_hex_string(key_mask_str, p->key_mask, - &p->key_size); - - PIPELINE_PARSE_ERR_INV_VAL(((status == 0) && - (key_size == p->key_size)), params->name, - "key_mask", key_mask_str); - } - - p->key_mask_present = key_mask_present; - - return 0; -} - -static void *pipeline_fc_init(struct pipeline_params *params, - __rte_unused void *arg) -{ - struct pipeline *p; - struct pipeline_flow_classification *p_fc; - uint32_t size, i; - - /* Check input arguments */ - if (params == NULL) - return NULL; - - /* Memory allocation */ - size = RTE_CACHE_LINE_ROUNDUP( - sizeof(struct pipeline_flow_classification)); - p = rte_zmalloc(NULL, size, RTE_CACHE_LINE_SIZE); - if (p == NULL) - return NULL; - p_fc = (struct pipeline_flow_classification *) p; - - strcpy(p->name, params->name); - p->log_level = params->log_level; - - PLOG(p, HIGH, "Flow classification"); - - /* Parse arguments */ - if (pipeline_fc_parse_args(p_fc, params)) - return NULL; - - /* Pipeline */ - { - struct rte_pipeline_params pipeline_params = { - .name = params->name, - .socket_id = params->socket_id, - .offset_port_id = 0, - }; - - p->p = rte_pipeline_create(&pipeline_params); - if (p->p == NULL) { - rte_free(p); - return NULL; - } - } - - /* Input ports */ - p->n_ports_in = params->n_ports_in; - for (i = 0; i < p->n_ports_in; i++) { - struct rte_pipeline_port_in_params port_params = { - .ops = pipeline_port_in_params_get_ops( - ¶ms->port_in[i]), - .arg_create = pipeline_port_in_params_convert( - ¶ms->port_in[i]), - .f_action = NULL, - .arg_ah = NULL, - .burst_size = params->port_in[i].burst_size, - }; - - int status = rte_pipeline_port_in_create(p->p, - &port_params, - &p->port_in_id[i]); - - if (status) { - rte_pipeline_free(p->p); - rte_free(p); - return NULL; - } - } - - /* Output ports */ - p->n_ports_out = params->n_ports_out; - for (i = 0; i < p->n_ports_out; i++) { - struct rte_pipeline_port_out_params port_params = { - .ops = pipeline_port_out_params_get_ops( - ¶ms->port_out[i]), - .arg_create = pipeline_port_out_params_convert( - ¶ms->port_out[i]), - .f_action = NULL, - .arg_ah = NULL, - }; - - int status = rte_pipeline_port_out_create(p->p, - &port_params, - &p->port_out_id[i]); - - if (status) { - rte_pipeline_free(p->p); - rte_free(p); - return NULL; - } - } - - /* Tables */ - p->n_tables = 1; - { - struct rte_table_hash_params table_hash_params = { - .name = p->name, - .key_size = p_fc->key_size, - .key_offset = p_fc->key_offset, - .key_mask = (p_fc->key_mask_present) ? - p_fc->key_mask : NULL, - .n_keys = p_fc->n_flows, - .n_buckets = rte_align32pow2(p_fc->n_flows / 4), - .f_hash = hash_func[(p_fc->key_size / 8) - 1], - .seed = 0, - }; - - struct rte_pipeline_table_params table_params = { - .ops = NULL, /* set below */ - .arg_create = NULL, /* set below */ - .f_action_hit = get_fc_table_ah_hit(p_fc), - .f_action_miss = NULL, - .arg_ah = p_fc, - .action_data_size = sizeof(struct flow_table_entry) - - sizeof(struct rte_pipeline_table_entry), - }; - - int status; - - switch (p_fc->key_size) { - case 8: - table_params.ops = &rte_table_hash_key8_ext_ops; - break; - - case 16: - table_params.ops = &rte_table_hash_key16_ext_ops; - break; - - default: - table_params.ops = &rte_table_hash_ext_ops; - } - - table_params.arg_create = &table_hash_params; - - status = rte_pipeline_table_create(p->p, - &table_params, - &p->table_id[0]); - - if (status) { - rte_pipeline_free(p->p); - rte_free(p); - return NULL; - } - } - - /* Connecting input ports to tables */ - for (i = 0; i < p->n_ports_in; i++) { - int status = rte_pipeline_port_in_connect_to_table(p->p, - p->port_in_id[i], - p->table_id[0]); - - if (status) { - rte_pipeline_free(p->p); - rte_free(p); - return NULL; - } - } - - /* Enable input ports */ - for (i = 0; i < p->n_ports_in; i++) { - int status = rte_pipeline_port_in_enable(p->p, - p->port_in_id[i]); - - if (status) { - rte_pipeline_free(p->p); - rte_free(p); - return NULL; - } - } - - /* Check pipeline consistency */ - if (rte_pipeline_check(p->p) < 0) { - rte_pipeline_free(p->p); - rte_free(p); - return NULL; - } - - /* Message queues */ - p->n_msgq = params->n_msgq; - for (i = 0; i < p->n_msgq; i++) - p->msgq_in[i] = params->msgq_in[i]; - for (i = 0; i < p->n_msgq; i++) - p->msgq_out[i] = params->msgq_out[i]; - - /* Message handlers */ - memcpy(p->handlers, handlers, sizeof(p->handlers)); - memcpy(p_fc->custom_handlers, - custom_handlers, - sizeof(p_fc->custom_handlers)); - - return p; -} - -static int -pipeline_fc_free(void *pipeline) -{ - struct pipeline *p = (struct pipeline *) pipeline; - - /* Check input arguments */ - if (p == NULL) - return -1; - - /* Free resources */ - rte_pipeline_free(p->p); - rte_free(p); - return 0; -} - -static int -pipeline_fc_timer(void *pipeline) -{ - struct pipeline *p = (struct pipeline *) pipeline; - - pipeline_msg_req_handle(p); - rte_pipeline_flush(p->p); - - return 0; -} - -static void * -pipeline_fc_msg_req_custom_handler(struct pipeline *p, void *msg) -{ - struct pipeline_flow_classification *p_fc = - (struct pipeline_flow_classification *) p; - struct pipeline_custom_msg_req *req = msg; - pipeline_msg_req_handler f_handle; - - f_handle = (req->subtype < PIPELINE_FC_MSG_REQS) ? - p_fc->custom_handlers[req->subtype] : - pipeline_msg_req_invalid_handler; - - if (f_handle == NULL) - f_handle = pipeline_msg_req_invalid_handler; - - return f_handle(p, req); -} - -static void * -pipeline_fc_msg_req_add_handler(struct pipeline *p, void *msg) -{ - struct pipeline_fc_add_msg_req *req = msg; - struct pipeline_fc_add_msg_rsp *rsp = msg; - - struct flow_table_entry entry = { - .head = { - .action = RTE_PIPELINE_ACTION_PORT, - {.port_id = p->port_out_id[req->port_id]}, - }, - .flow_id = req->flow_id, - }; - - rsp->status = rte_pipeline_table_entry_add(p->p, - p->table_id[0], - &req->key, - (struct rte_pipeline_table_entry *) &entry, - &rsp->key_found, - (struct rte_pipeline_table_entry **) &rsp->entry_ptr); - - return rsp; -} - -static void * -pipeline_fc_msg_req_add_bulk_handler(struct pipeline *p, void *msg) -{ - struct pipeline_fc_add_bulk_msg_req *req = msg; - struct pipeline_fc_add_bulk_msg_rsp *rsp = msg; - uint32_t i; - - for (i = 0; i < req->n_keys; i++) { - struct pipeline_fc_add_bulk_flow_req *flow_req = &req->req[i]; - struct pipeline_fc_add_bulk_flow_rsp *flow_rsp = &req->rsp[i]; - - struct flow_table_entry entry = { - .head = { - .action = RTE_PIPELINE_ACTION_PORT, - {.port_id = p->port_out_id[flow_req->port_id]}, - }, - .flow_id = flow_req->flow_id, - }; - - int status = rte_pipeline_table_entry_add(p->p, - p->table_id[0], - &flow_req->key, - (struct rte_pipeline_table_entry *) &entry, - &flow_rsp->key_found, - (struct rte_pipeline_table_entry **) - &flow_rsp->entry_ptr); - - if (status) - break; - } - - rsp->n_keys = i; - - return rsp; -} - -static void * -pipeline_fc_msg_req_del_handler(struct pipeline *p, void *msg) -{ - struct pipeline_fc_del_msg_req *req = msg; - struct pipeline_fc_del_msg_rsp *rsp = msg; - - rsp->status = rte_pipeline_table_entry_delete(p->p, - p->table_id[0], - &req->key, - &rsp->key_found, - NULL); - - return rsp; -} - -static void * -pipeline_fc_msg_req_add_default_handler(struct pipeline *p, void *msg) -{ - struct pipeline_fc_add_default_msg_req *req = msg; - struct pipeline_fc_add_default_msg_rsp *rsp = msg; - - struct flow_table_entry default_entry = { - .head = { - .action = RTE_PIPELINE_ACTION_PORT, - {.port_id = p->port_out_id[req->port_id]}, - }, - - .flow_id = 0, - }; - - rsp->status = rte_pipeline_table_default_entry_add(p->p, - p->table_id[0], - (struct rte_pipeline_table_entry *) &default_entry, - (struct rte_pipeline_table_entry **) &rsp->entry_ptr); - - return rsp; -} - -static void * -pipeline_fc_msg_req_del_default_handler(struct pipeline *p, void *msg) -{ - struct pipeline_fc_del_default_msg_rsp *rsp = msg; - - rsp->status = rte_pipeline_table_default_entry_delete(p->p, - p->table_id[0], - NULL); - - return rsp; -} - -struct pipeline_be_ops pipeline_flow_classification_be_ops = { - .f_init = pipeline_fc_init, - .f_free = pipeline_fc_free, - .f_run = NULL, - .f_timer = pipeline_fc_timer, -}; diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.h b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.h deleted file mode 100644 index 18f5bb4..0000000 --- a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.h +++ /dev/null @@ -1,113 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2010-2015 Intel Corporation - */ - -#ifndef __INCLUDE_PIPELINE_FLOW_CLASSIFICATION_BE_H__ -#define __INCLUDE_PIPELINE_FLOW_CLASSIFICATION_BE_H__ - -#include "pipeline_common_be.h" - -enum pipeline_fc_msg_req_type { - PIPELINE_FC_MSG_REQ_FLOW_ADD = 0, - PIPELINE_FC_MSG_REQ_FLOW_ADD_BULK, - PIPELINE_FC_MSG_REQ_FLOW_DEL, - PIPELINE_FC_MSG_REQ_FLOW_ADD_DEFAULT, - PIPELINE_FC_MSG_REQ_FLOW_DEL_DEFAULT, - PIPELINE_FC_MSG_REQS, -}; - -#ifndef PIPELINE_FC_FLOW_KEY_MAX_SIZE -#define PIPELINE_FC_FLOW_KEY_MAX_SIZE 64 -#endif - -/* - * MSG ADD - */ -struct pipeline_fc_add_msg_req { - enum pipeline_msg_req_type type; - enum pipeline_fc_msg_req_type subtype; - - uint8_t key[PIPELINE_FC_FLOW_KEY_MAX_SIZE]; - - uint32_t port_id; - uint32_t flow_id; -}; - -struct pipeline_fc_add_msg_rsp { - int status; - int key_found; - void *entry_ptr; -}; - -/* - * MSG ADD BULK - */ -struct pipeline_fc_add_bulk_flow_req { - uint8_t key[PIPELINE_FC_FLOW_KEY_MAX_SIZE]; - uint32_t port_id; - uint32_t flow_id; -}; - -struct pipeline_fc_add_bulk_flow_rsp { - int key_found; - void *entry_ptr; -}; - -struct pipeline_fc_add_bulk_msg_req { - enum pipeline_msg_req_type type; - enum pipeline_fc_msg_req_type subtype; - - struct pipeline_fc_add_bulk_flow_req *req; - struct pipeline_fc_add_bulk_flow_rsp *rsp; - uint32_t n_keys; -}; - -struct pipeline_fc_add_bulk_msg_rsp { - uint32_t n_keys; -}; - -/* - * MSG DEL - */ -struct pipeline_fc_del_msg_req { - enum pipeline_msg_req_type type; - enum pipeline_fc_msg_req_type subtype; - - uint8_t key[PIPELINE_FC_FLOW_KEY_MAX_SIZE]; -}; - -struct pipeline_fc_del_msg_rsp { - int status; - int key_found; -}; - -/* - * MSG ADD DEFAULT - */ -struct pipeline_fc_add_default_msg_req { - enum pipeline_msg_req_type type; - enum pipeline_fc_msg_req_type subtype; - - uint32_t port_id; -}; - -struct pipeline_fc_add_default_msg_rsp { - int status; - void *entry_ptr; -}; - -/* - * MSG DEL DEFAULT - */ -struct pipeline_fc_del_default_msg_req { - enum pipeline_msg_req_type type; - enum pipeline_fc_msg_req_type subtype; -}; - -struct pipeline_fc_del_default_msg_rsp { - int status; -}; - -extern struct pipeline_be_ops pipeline_flow_classification_be_ops; - -#endif