net/softnic: map flow attribute to pipeline table

Added mapping support from rte_flow attributes
to softnic pipeline and table.

So added flow attribute map set and get functions
definition to new file rte_eth_sofnic_flow.c.

Added pmd flow internals with ingress and egress
flow attribute maps.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>

diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
index ea9b65f..12515b1 100644 (file)
--- a/drivers/net/softnic/Makefile
+++ b/drivers/net/softnic/Makefile
@@ -33,6 +33,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c
 

diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index ff98227..56e5e2b 100644 (file)
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -13,6 +13,7 @@ sources = files('rte_eth_softnic_tm.c',
        'rte_eth_softnic_pipeline.c',
        'rte_eth_softnic_thread.c',
        'rte_eth_softnic_cli.c',
+       'rte_eth_softnic_flow.c',
        'parser.c',
        'conn.c')
 deps += ['pipeline', 'port', 'table', 'sched']

diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c
new file mode 100644 (file)
index 0000000..843db75
--- /dev/null
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
+ */
+
+#include "rte_eth_softnic_internals.h"
+#include "rte_eth_softnic.h"
+
+int
+flow_attr_map_set(struct pmd_internals *softnic,
+               uint32_t group_id,
+               int ingress,
+               const char *pipeline_name,
+               uint32_t table_id)
+{
+       struct pipeline *pipeline;
+       struct flow_attr_map *map;
+
+       if (group_id >= SOFTNIC_FLOW_MAX_GROUPS ||
+                       pipeline_name == NULL)
+               return -1;
+
+       pipeline = softnic_pipeline_find(softnic, pipeline_name);
+       if (pipeline == NULL ||
+                       table_id >= pipeline->n_tables)
+               return -1;
+
+       map = (ingress) ? &softnic->flow.ingress_map[group_id] :
+               &softnic->flow.egress_map[group_id];
+       strcpy(map->pipeline_name, pipeline_name);
+       map->table_id = table_id;
+       map->valid = 1;
+
+       return 0;
+}
+
+struct flow_attr_map *
+flow_attr_map_get(struct pmd_internals *softnic,
+               uint32_t group_id,
+               int ingress)
+{
+       if (group_id >= SOFTNIC_FLOW_MAX_GROUPS)
+               return NULL;
+
+       return (ingress) ? &softnic->flow.ingress_map[group_id] :
+               &softnic->flow.egress_map[group_id];
+}

diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h
index 882cfd1..d1996c4 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -51,6 +51,21 @@ struct rte_flow;
 
 TAILQ_HEAD(flow_list, rte_flow);
 
+struct flow_attr_map {
+       char pipeline_name[NAME_SIZE];
+       uint32_t table_id;
+       int valid;
+};
+
+#ifndef SOFTNIC_FLOW_MAX_GROUPS
+#define SOFTNIC_FLOW_MAX_GROUPS                            64
+#endif
+
+struct flow_internals {
+       struct flow_attr_map ingress_map[SOFTNIC_FLOW_MAX_GROUPS];
+       struct flow_attr_map egress_map[SOFTNIC_FLOW_MAX_GROUPS];
+};
+
 /**
  * MEMPOOL
  */
@@ -497,6 +512,7 @@ struct pmd_internals {
                struct tm_internals tm; /**< Traffic Management */
        } soft;
 
+       struct flow_internals flow;
        struct softnic_conn *conn;
        struct softnic_mempool_list mempool_list;
        struct softnic_swq_list swq_list;
@@ -510,6 +526,21 @@ struct pmd_internals {
        struct softnic_thread_data thread_data[RTE_MAX_LCORE];
 };
 
+/**
+ * Ethdev Flow API
+ */
+int
+flow_attr_map_set(struct pmd_internals *softnic,
+               uint32_t group_id,
+               int ingress,
+               const char *pipeline_name,
+               uint32_t table_id);
+
+struct flow_attr_map *
+flow_attr_map_get(struct pmd_internals *softnic,
+               uint32_t group_id,
+               int ingress);
+
 /**
  * MEMPOOL
  */