pipeline: add bulk adding and deleting for table

Added functions for adding/deleting multiple records to table owned by
pipeline. The LIBABIVER number is incremented.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
Signed-off-by: Marcin Kerlin <marcinx.kerlin@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index 5653179..c4c2372 100644 (file)
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -338,7 +338,7 @@ The libraries prepended with a plus sign were incremented in this version.
    + librte_mbuf.so.2
      librte_mempool.so.1
      librte_meter.so.1
-     librte_pipeline.so.1
+   + librte_pipeline.so.2
      librte_pmd_bond.so.1
    + librte_pmd_ring.so.2
    + librte_port.so.2

diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile
index 15e406b..1166d3c 100644 (file)
--- a/lib/librte_pipeline/Makefile
+++ b/lib/librte_pipeline/Makefile
@@ -41,7 +41,7 @@ CFLAGS += $(WERROR_FLAGS)
 
 EXPORT_MAP := rte_pipeline_version.map
 
-LIBABIVER := 1
+LIBABIVER := 2
 
 #
 # all source are stored in SRCS-y

diff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/librte_pipeline/rte_pipeline.c
index bd700d2..56022f4 100644 (file)
--- a/lib/librte_pipeline/rte_pipeline.c
+++ b/lib/librte_pipeline/rte_pipeline.c
@@ -587,6 +587,112 @@ rte_pipeline_table_entry_delete(struct rte_pipeline *p,
        return (table->ops.f_delete)(table->h_table, key, key_found, entry);
 }
 
+int rte_pipeline_table_entry_add_bulk(struct rte_pipeline *p,
+       uint32_t table_id,
+       void **keys,
+       struct rte_pipeline_table_entry **entries,
+       uint32_t n_keys,
+       int *key_found,
+       struct rte_pipeline_table_entry **entries_ptr)
+{
+       struct rte_table *table;
+       uint32_t i;
+
+       /* Check input arguments */
+       if (p == NULL) {
+               RTE_LOG(ERR, PIPELINE, "%s: pipeline parameter is NULL\n",
+                       __func__);
+               return -EINVAL;
+       }
+
+       if (keys == NULL) {
+               RTE_LOG(ERR, PIPELINE, "%s: keys parameter is NULL\n", __func__);
+               return -EINVAL;
+       }
+
+       if (entries == NULL) {
+               RTE_LOG(ERR, PIPELINE, "%s: entries parameter is NULL\n",
+                       __func__);
+               return -EINVAL;
+       }
+
+       if (table_id >= p->num_tables) {
+               RTE_LOG(ERR, PIPELINE,
+                       "%s: table_id %d out of range\n", __func__, table_id);
+               return -EINVAL;
+       }
+
+       table = &p->tables[table_id];
+
+       if (table->ops.f_add_bulk == NULL) {
+               RTE_LOG(ERR, PIPELINE, "%s: f_add_bulk function pointer NULL\n",
+                       __func__);
+               return -EINVAL;
+       }
+
+       for (i = 0; i < n_keys; i++) {
+               if ((entries[i]->action == RTE_PIPELINE_ACTION_TABLE) &&
+                       table->table_next_id_valid &&
+                       (entries[i]->table_id != table->table_next_id)) {
+                       RTE_LOG(ERR, PIPELINE,
+                               "%s: Tree-like topologies not allowed\n", __func__);
+                       return -EINVAL;
+               }
+       }
+
+       /* Add entry */
+       for (i = 0; i < n_keys; i++) {
+               if ((entries[i]->action == RTE_PIPELINE_ACTION_TABLE) &&
+                       (table->table_next_id_valid == 0)) {
+                       table->table_next_id = entries[i]->table_id;
+                       table->table_next_id_valid = 1;
+               }
+       }
+
+       return (table->ops.f_add_bulk)(table->h_table, keys, (void **) entries,
+               n_keys, key_found, (void **) entries_ptr);
+}
+
+int rte_pipeline_table_entry_delete_bulk(struct rte_pipeline *p,
+       uint32_t table_id,
+       void **keys,
+       uint32_t n_keys,
+       int *key_found,
+       struct rte_pipeline_table_entry **entries)
+{
+       struct rte_table *table;
+
+       /* Check input arguments */
+       if (p == NULL) {
+               RTE_LOG(ERR, PIPELINE, "%s: pipeline parameter NULL\n",
+                       __func__);
+               return -EINVAL;
+       }
+
+       if (keys == NULL) {
+               RTE_LOG(ERR, PIPELINE, "%s: key parameter is NULL\n",
+                       __func__);
+               return -EINVAL;
+       }
+
+       if (table_id >= p->num_tables) {
+               RTE_LOG(ERR, PIPELINE,
+                       "%s: table_id %d out of range\n", __func__, table_id);
+               return -EINVAL;
+       }
+
+       table = &p->tables[table_id];
+
+       if (table->ops.f_delete_bulk == NULL) {
+               RTE_LOG(ERR, PIPELINE,
+                       "%s: f_delete function pointer NULL\n", __func__);
+               return -EINVAL;
+       }
+
+       return (table->ops.f_delete_bulk)(table->h_table, keys, n_keys, key_found,
+                       (void **) entries);
+}
+
 /*
  * Port
  *

diff --git a/lib/librte_pipeline/rte_pipeline.h b/lib/librte_pipeline/rte_pipeline.h
index 59e0710..5459324 100644 (file)
--- a/lib/librte_pipeline/rte_pipeline.h
+++ b/lib/librte_pipeline/rte_pipeline.h
@@ -465,6 +465,70 @@ int rte_pipeline_table_entry_delete(struct rte_pipeline *p,
        int *key_found,
        struct rte_pipeline_table_entry *entry);
 
+/**
+ * Pipeline table entry add bulk
+ *
+ * @param p
+ *   Handle to pipeline instance
+ * @param table_id
+ *   Table ID (returned by previous invocation of pipeline table create)
+ * @param keys
+ *   Array containing table entry keys
+ * @param entries
+ *   Array containung new contents for every table entry identified by key
+ * @param n_keys
+ *   Number of keys to add
+ * @param key_found
+ *   On successful invocation, key_found for every item in the array is set to
+ *   TRUE (value different than 0) if key was already present in the table
+ *   before the add operation and to FALSE (value 0) if not
+ * @param entries_ptr
+ *   On successful invocation, array *entries_ptr stores pointer to every table
+ *   entry associated with key. This can be used for further read-write accesses
+ *   to this table entry and is valid until the key is deleted from the table or
+ *   re-added (usually for associating different actions and/or action meta-data
+ *   to the current key)
+ * @return
+ *   0 on success, error code otherwise
+ */
+int rte_pipeline_table_entry_add_bulk(struct rte_pipeline *p,
+       uint32_t table_id,
+       void **keys,
+       struct rte_pipeline_table_entry **entries,
+       uint32_t n_keys,
+       int *key_found,
+       struct rte_pipeline_table_entry **entries_ptr);
+
+/**
+ * Pipeline table entry delete bulk
+ *
+ * @param p
+ *   Handle to pipeline instance
+ * @param table_id
+ *   Table ID (returned by previous invocation of pipeline table create)
+ * @param keys
+ *   Array containing table entry keys
+ * @param n_keys
+ *   Number of keys to delete
+ * @param key_found
+ *   On successful invocation, key_found for every item in the array is set to
+ *   TRUE (value different than 0) if key was found in the table before the
+ *   delete operation and to FALSE (value 0) if not
+ * @param entries
+ *   If entries pointer is NULL, this pointer is ignored for every entry found.
+ *   Else, after successful invocation, if specific key is found in the table
+ *   and entry points to a valid buffer, the table entry contents (as it was
+ *   before the delete was performed) is copied to this buffer.
+ * @return
+ *   0 on success, error code otherwise
+ */
+int rte_pipeline_table_entry_delete_bulk(struct rte_pipeline *p,
+       uint32_t table_id,
+       void **keys,
+       uint32_t n_keys,
+       int *key_found,
+       struct rte_pipeline_table_entry **entries);
+
 /**
  * Read pipeline table stats.
  *

diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
index 8f25d0f..4cc86f6 100644 (file)
--- a/lib/librte_pipeline/rte_pipeline_version.map
+++ b/lib/librte_pipeline/rte_pipeline_version.map
@@ -29,3 +29,11 @@ DPDK_2.1 {
        rte_pipeline_table_stats_read;
 
 } DPDK_2.0;
+
+DPDK_2.2 {
+       global:
+
+       rte_pipeline_table_entry_add_bulk;
+       rte_pipeline_table_entry_delete_bulk;
+
+} DPDK_2.1;