net/failsafe: switch to flow API object conversion function

This patch replaces rte_flow_copy() with rte_flow_conv().

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index f2512c4..884b868 100644 (file)
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -247,9 +247,9 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
                        DEBUG("Creating flow #%" PRIu32, i++);
                        flow->flows[SUB_ID(sdev)] =
                                rte_flow_create(PORT_ID(sdev),
-                                               &flow->fd->attr,
-                                               flow->fd->items,
-                                               flow->fd->actions,
+                                               flow->rule.attr,
+                                               flow->rule.pattern,
+                                               flow->rule.actions,
                                                &ferror);
                        ret = rte_errno;
                        if (ret)

diff --git a/drivers/net/failsafe/failsafe_flow.c b/drivers/net/failsafe/failsafe_flow.c
index bfe42fc..5e2b5f7 100644 (file)
--- a/drivers/net/failsafe/failsafe_flow.c
+++ b/drivers/net/failsafe/failsafe_flow.c
@@ -3,8 +3,11 @@
  * Copyright 2017 Mellanox Technologies, Ltd
  */
 
+#include <stddef.h>
+#include <string.h>
 #include <sys/queue.h>
 
+#include <rte_errno.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 #include <rte_flow.h>
@@ -18,19 +21,33 @@ fs_flow_allocate(const struct rte_flow_attr *attr,
                 const struct rte_flow_action *actions)
 {
        struct rte_flow *flow;
-       size_t fdsz;
+       const struct rte_flow_conv_rule rule = {
+               .attr_ro = attr,
+               .pattern_ro = items,
+               .actions_ro = actions,
+       };
+       struct rte_flow_error error;
+       int ret;
 
-       fdsz = rte_flow_copy(NULL, 0, attr, items, actions);
-       flow = rte_zmalloc(NULL,
-                          sizeof(struct rte_flow) + fdsz,
+       ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, NULL, 0, &rule, &error);
+       if (ret < 0) {
+               ERROR("Unable to process flow rule (%s): %s",
+                     error.message ? error.message : "unspecified",
+                     strerror(rte_errno));
+               return NULL;
+       }
+       flow = rte_zmalloc(NULL, offsetof(struct rte_flow, rule) + ret,
                           RTE_CACHE_LINE_SIZE);
        if (flow == NULL) {
                ERROR("Could not allocate new flow");
                return NULL;
        }
-       flow->fd = (void *)((uintptr_t)flow + sizeof(*flow));
-       if (rte_flow_copy(flow->fd, fdsz, attr, items, actions) != fdsz) {
-               ERROR("Failed to copy flow description");
+       ret = rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &flow->rule, ret, &rule,
+                           &error);
+       if (ret < 0) {
+               ERROR("Failed to copy flow rule (%s): %s",
+                     error.message ? error.message : "unspecified",
+                     strerror(rte_errno));
                rte_free(flow);
                return NULL;
        }

diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index abbe73e..b9d4608 100644 (file)
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -6,6 +6,7 @@
 #ifndef _RTE_ETH_FAILSAFE_PRIVATE_H_
 #define _RTE_ETH_FAILSAFE_PRIVATE_H_
 
+#include <stdint.h>
 #include <sys/queue.h>
 #include <pthread.h>
 
@@ -13,6 +14,7 @@
 #include <rte_dev.h>
 #include <rte_ethdev_driver.h>
 #include <rte_devargs.h>
+#include <rte_flow.h>
 #include <rte_interrupts.h>
 
 #define FAILSAFE_DRIVER_NAME "Fail-safe PMD"
@@ -81,7 +83,8 @@ struct rte_flow {
        /* sub_flows */
        struct rte_flow *flows[FAILSAFE_MAX_ETHPORTS];
        /* flow description for synchronization */
-       struct rte_flow_desc *fd;
+       struct rte_flow_conv_rule rule;
+       uint8_t rule_data[];
 };
 
 enum dev_state {