diff mbox series

[ovs-dev,V2,02/14] netdev-dpdk: Introduce DPDK tunnel APIs

Message ID 20210210152702.4898-3-elibr@nvidia.com
State New
Headers show
Series Netdev vxlan-decap offload | expand

Commit Message

Eli Britstein Feb. 10, 2021, 3:26 p.m. UTC
As a pre-step towards tunnel offloads, introduce DPDK APIs.

Signed-off-by: Eli Britstein <elibr@nvidia.com>
Reviewed-by: Gaetan Rivet <gaetanr@nvidia.com>
---
 lib/netdev-dpdk.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/netdev-dpdk.h | 102 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 208 insertions(+), 6 deletions(-)

Comments

0-day Robot Feb. 10, 2021, 9:08 p.m. UTC | #1
Bleep bloop.  Greetings Eli Britstein, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
WARNING: Line is 80 characters long (recommended limit is 79)
#202 FILE: lib/netdev-dpdk.h:96:
                                      struct rte_flow_tunnel *tunnel OVS_UNUSED,

WARNING: Line is 82 characters long (recommended limit is 79)
#203 FILE: lib/netdev-dpdk.h:97:
                                      struct rte_flow_action **actions OVS_UNUSED,

WARNING: Line is 84 characters long (recommended limit is 79)
#225 FILE: lib/netdev-dpdk.h:119:
                                      struct rte_flow_restore_info *info OVS_UNUSED,

WARNING: Line is 80 characters long (recommended limit is 79)
#245 FILE: lib/netdev-dpdk.h:139:
                                         struct rte_flow_item *items OVS_UNUSED,

Lines checked: 260, Warnings: 4, Errors: 0


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
diff mbox series

Patch

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index 9d8096668..aa8716fb3 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -5291,6 +5291,118 @@  netdev_dpdk_rte_flow_query_count(struct netdev *netdev,
     return ret;
 }
 
+#ifdef ALLOW_EXPERIMENTAL_API
+
+int
+netdev_dpdk_rte_flow_tunnel_decap_set(struct netdev *netdev,
+                                      struct rte_flow_tunnel *tunnel,
+                                      struct rte_flow_action **actions,
+                                      uint32_t *num_of_actions,
+                                      struct rte_flow_error *error)
+{
+    struct netdev_dpdk *dev;
+    int ret;
+
+    if (!is_dpdk_class(netdev->netdev_class)) {
+        return -1;
+    }
+
+    dev = netdev_dpdk_cast(netdev);
+    ovs_mutex_lock(&dev->mutex);
+    ret = rte_flow_tunnel_decap_set(dev->port_id, tunnel, actions,
+                                    num_of_actions, error);
+    ovs_mutex_unlock(&dev->mutex);
+    return ret;
+}
+
+int
+netdev_dpdk_rte_flow_tunnel_match(struct netdev *netdev,
+                                  struct rte_flow_tunnel *tunnel,
+                                  struct rte_flow_item **items,
+                                  uint32_t *num_of_items,
+                                  struct rte_flow_error *error)
+{
+    struct netdev_dpdk *dev;
+    int ret;
+
+    if (!is_dpdk_class(netdev->netdev_class)) {
+        return -1;
+    }
+
+    dev = netdev_dpdk_cast(netdev);
+    ovs_mutex_lock(&dev->mutex);
+    ret = rte_flow_tunnel_match(dev->port_id, tunnel, items, num_of_items,
+                                error);
+    ovs_mutex_unlock(&dev->mutex);
+    return ret;
+}
+
+int
+netdev_dpdk_rte_flow_get_restore_info(struct netdev *netdev,
+                                      struct dp_packet *p,
+                                      struct rte_flow_restore_info *info,
+                                      struct rte_flow_error *error)
+{
+    struct rte_mbuf *m = (struct rte_mbuf *) p;
+    struct netdev_dpdk *dev;
+    int ret;
+
+    if (!is_dpdk_class(netdev->netdev_class)) {
+        return -1;
+    }
+
+    dev = netdev_dpdk_cast(netdev);
+    ovs_mutex_lock(&dev->mutex);
+    ret = rte_flow_get_restore_info(dev->port_id, m, info, error);
+    ovs_mutex_unlock(&dev->mutex);
+    return ret;
+}
+
+int
+netdev_dpdk_rte_flow_tunnel_action_decap_release
+    (struct netdev *netdev,
+     struct rte_flow_action *actions,
+     uint32_t num_of_actions,
+     struct rte_flow_error *error)
+{
+    struct netdev_dpdk *dev;
+    int ret;
+
+    if (!is_dpdk_class(netdev->netdev_class)) {
+        return -1;
+    }
+
+    dev = netdev_dpdk_cast(netdev);
+    ovs_mutex_lock(&dev->mutex);
+    ret = rte_flow_tunnel_action_decap_release(dev->port_id, actions,
+                                               num_of_actions, error);
+    ovs_mutex_unlock(&dev->mutex);
+    return ret;
+}
+
+int
+netdev_dpdk_rte_flow_tunnel_item_release(struct netdev *netdev,
+                                         struct rte_flow_item *items,
+                                         uint32_t num_of_items,
+                                         struct rte_flow_error *error)
+{
+    struct netdev_dpdk *dev;
+    int ret;
+
+    if (!is_dpdk_class(netdev->netdev_class)) {
+        return -1;
+    }
+
+    dev = netdev_dpdk_cast(netdev);
+    ovs_mutex_lock(&dev->mutex);
+    ret = rte_flow_tunnel_item_release(dev->port_id, items, num_of_items,
+                                       error);
+    ovs_mutex_unlock(&dev->mutex);
+    return ret;
+}
+
+#endif /* ALLOW_EXPERIMENTAL_API */
+
 #define NETDEV_DPDK_CLASS_COMMON                            \
     .is_pmd = true,                                         \
     .alloc = netdev_dpdk_alloc,                             \
diff --git a/lib/netdev-dpdk.h b/lib/netdev-dpdk.h
index 848346cb4..0bbbd6927 100644
--- a/lib/netdev-dpdk.h
+++ b/lib/netdev-dpdk.h
@@ -26,12 +26,7 @@  struct netdev;
 
 #ifdef DPDK_NETDEV
 
-struct rte_flow;
-struct rte_flow_error;
-struct rte_flow_attr;
-struct rte_flow_item;
-struct rte_flow_action;
-struct rte_flow_query_count;
+#include <rte_flow.h>
 
 void netdev_dpdk_register(void);
 void free_dpdk_buf(struct dp_packet *);
@@ -56,6 +51,101 @@  netdev_dpdk_rte_flow_query_count(struct netdev *netdev,
 int
 netdev_dpdk_get_port_id(struct netdev *netdev);
 
+#ifdef ALLOW_EXPERIMENTAL_API
+
+int
+netdev_dpdk_rte_flow_tunnel_decap_set(struct netdev *,
+                                      struct rte_flow_tunnel *,
+                                      struct rte_flow_action **,
+                                      uint32_t *,
+                                      struct rte_flow_error *);
+int
+netdev_dpdk_rte_flow_tunnel_match(struct netdev *,
+                                  struct rte_flow_tunnel *,
+                                  struct rte_flow_item **,
+                                  uint32_t *,
+                                  struct rte_flow_error *);
+int
+netdev_dpdk_rte_flow_get_restore_info(struct netdev *,
+                                      struct dp_packet *,
+                                      struct rte_flow_restore_info *,
+                                      struct rte_flow_error *);
+int
+netdev_dpdk_rte_flow_tunnel_action_decap_release(struct netdev *,
+                                                 struct rte_flow_action *,
+                                                 uint32_t,
+                                                 struct rte_flow_error *);
+int
+netdev_dpdk_rte_flow_tunnel_item_release(struct netdev *,
+                                         struct rte_flow_item *,
+                                         uint32_t,
+                                         struct rte_flow_error *);
+
+#else
+
+static inline void
+set_error(struct rte_flow_error *error, enum rte_flow_error_type type)
+{
+    error->type = type;
+    error->cause = NULL;
+    error->message = NULL;
+}
+
+static inline int
+netdev_dpdk_rte_flow_tunnel_decap_set(struct netdev *netdev OVS_UNUSED,
+                                      struct rte_flow_tunnel *tunnel OVS_UNUSED,
+                                      struct rte_flow_action **actions OVS_UNUSED,
+                                      uint32_t *num_of_actions OVS_UNUSED,
+                                      struct rte_flow_error *error)
+{
+    set_error(error, RTE_FLOW_ERROR_TYPE_ACTION);
+    return -1;
+}
+
+static inline int
+netdev_dpdk_rte_flow_tunnel_match(struct netdev *netdev OVS_UNUSED,
+                                  struct rte_flow_tunnel *tunnel OVS_UNUSED,
+                                  struct rte_flow_item **items OVS_UNUSED,
+                                  uint32_t *num_of_items OVS_UNUSED,
+                                  struct rte_flow_error *error)
+{
+    set_error(error, RTE_FLOW_ERROR_TYPE_ITEM);
+    return -1;
+}
+
+static inline int
+netdev_dpdk_rte_flow_get_restore_info(struct netdev *netdev OVS_UNUSED,
+                                      struct dp_packet *p OVS_UNUSED,
+                                      struct rte_flow_restore_info *info OVS_UNUSED,
+                                      struct rte_flow_error *error)
+{
+    set_error(error, RTE_FLOW_ERROR_TYPE_ATTR);
+    return -1;
+}
+
+static inline int
+netdev_dpdk_rte_flow_tunnel_action_decap_release
+    (struct netdev *netdev OVS_UNUSED,
+     struct rte_flow_action *actions OVS_UNUSED,
+     uint32_t num_of_actions OVS_UNUSED,
+     struct rte_flow_error *error)
+{
+    set_error(error, RTE_FLOW_ERROR_TYPE_NONE);
+    return 0;
+}
+
+static inline int
+netdev_dpdk_rte_flow_tunnel_item_release(struct netdev *netdev OVS_UNUSED,
+                                         struct rte_flow_item *items OVS_UNUSED,
+                                         uint32_t num_of_items OVS_UNUSED,
+                                         struct rte_flow_error *error)
+{
+    set_error(error, RTE_FLOW_ERROR_TYPE_NONE);
+    return 0;
+}
+
+#endif /* ALLOW_EXPERIMENTAL_API */
+
 #else
 
 static inline void