test/compress: improve debug trace setup
[dpdk.git] / lib / librte_ethdev / rte_flow.c
index 4fd6cfa..3277be1 100644 (file)
@@ -11,6 +11,7 @@
 #include <rte_common.h>
 #include <rte_errno.h>
 #include <rte_branch_prediction.h>
+#include <rte_string_fns.h>
 #include "rte_ethdev.h"
 #include "rte_flow_driver.h"
 #include "rte_flow.h"
@@ -50,10 +51,15 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
        MK_FLOW_ITEM(TCP, sizeof(struct rte_flow_item_tcp)),
        MK_FLOW_ITEM(SCTP, sizeof(struct rte_flow_item_sctp)),
        MK_FLOW_ITEM(VXLAN, sizeof(struct rte_flow_item_vxlan)),
-       MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
-       MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
        MK_FLOW_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
        MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
+       MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
+       MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
+       MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)),
+       MK_FLOW_ITEM(GTP, sizeof(struct rte_flow_item_gtp)),
+       MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)),
+       MK_FLOW_ITEM(GTPU, sizeof(struct rte_flow_item_gtp)),
+       MK_FLOW_ITEM(ESP, sizeof(struct rte_flow_item_esp)),
        MK_FLOW_ITEM(GENEVE, sizeof(struct rte_flow_item_geneve)),
        MK_FLOW_ITEM(VXLAN_GPE, sizeof(struct rte_flow_item_vxlan_gpe)),
        MK_FLOW_ITEM(ARP_ETH_IPV4, sizeof(struct rte_flow_item_arp_eth_ipv4)),
@@ -66,6 +72,8 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
                     sizeof(struct rte_flow_item_icmp6_nd_opt_sla_eth)),
        MK_FLOW_ITEM(ICMP6_ND_OPT_TLA_ETH,
                     sizeof(struct rte_flow_item_icmp6_nd_opt_tla_eth)),
+       MK_FLOW_ITEM(MARK, sizeof(struct rte_flow_item_mark)),
+       MK_FLOW_ITEM(META, sizeof(struct rte_flow_item_meta)),
 };
 
 /** Generate flow_action[] entry. */
@@ -80,6 +88,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = {
        MK_FLOW_ACTION(END, 0),
        MK_FLOW_ACTION(VOID, 0),
        MK_FLOW_ACTION(PASSTHRU, 0),
+       MK_FLOW_ACTION(JUMP, sizeof(struct rte_flow_action_jump)),
        MK_FLOW_ACTION(MARK, sizeof(struct rte_flow_action_mark)),
        MK_FLOW_ACTION(FLAG, 0),
        MK_FLOW_ACTION(QUEUE, sizeof(struct rte_flow_action_queue)),
@@ -90,6 +99,8 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = {
        MK_FLOW_ACTION(VF, sizeof(struct rte_flow_action_vf)),
        MK_FLOW_ACTION(PHY_PORT, sizeof(struct rte_flow_action_phy_port)),
        MK_FLOW_ACTION(PORT_ID, sizeof(struct rte_flow_action_port_id)),
+       MK_FLOW_ACTION(METER, sizeof(struct rte_flow_action_meter)),
+       MK_FLOW_ACTION(SECURITY, sizeof(struct rte_flow_action_security)),
        MK_FLOW_ACTION(OF_SET_MPLS_TTL,
                       sizeof(struct rte_flow_action_of_set_mpls_ttl)),
        MK_FLOW_ACTION(OF_DEC_MPLS_TTL, 0),
@@ -109,6 +120,29 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = {
                       sizeof(struct rte_flow_action_of_pop_mpls)),
        MK_FLOW_ACTION(OF_PUSH_MPLS,
                       sizeof(struct rte_flow_action_of_push_mpls)),
+       MK_FLOW_ACTION(VXLAN_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)),
+       MK_FLOW_ACTION(VXLAN_DECAP, 0),
+       MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)),
+       MK_FLOW_ACTION(NVGRE_DECAP, 0),
+       MK_FLOW_ACTION(RAW_ENCAP, sizeof(struct rte_flow_action_raw_encap)),
+       MK_FLOW_ACTION(RAW_DECAP, sizeof(struct rte_flow_action_raw_decap)),
+       MK_FLOW_ACTION(SET_IPV4_SRC,
+                      sizeof(struct rte_flow_action_set_ipv4)),
+       MK_FLOW_ACTION(SET_IPV4_DST,
+                      sizeof(struct rte_flow_action_set_ipv4)),
+       MK_FLOW_ACTION(SET_IPV6_SRC,
+                      sizeof(struct rte_flow_action_set_ipv6)),
+       MK_FLOW_ACTION(SET_IPV6_DST,
+                      sizeof(struct rte_flow_action_set_ipv6)),
+       MK_FLOW_ACTION(SET_TP_SRC,
+                      sizeof(struct rte_flow_action_set_tp)),
+       MK_FLOW_ACTION(SET_TP_DST,
+                      sizeof(struct rte_flow_action_set_tp)),
+       MK_FLOW_ACTION(MAC_SWAP, 0),
+       MK_FLOW_ACTION(DEC_TTL, 0),
+       MK_FLOW_ACTION(SET_TTL, sizeof(struct rte_flow_action_set_ttl)),
+       MK_FLOW_ACTION(SET_MAC_SRC, sizeof(struct rte_flow_action_set_mac)),
+       MK_FLOW_ACTION(SET_MAC_DST, sizeof(struct rte_flow_action_set_mac)),
 };
 
 static int
@@ -406,11 +440,16 @@ rte_flow_conv_action_conf(void *buf, const size_t size,
        switch (action->type) {
                union {
                        const struct rte_flow_action_rss *rss;
+                       const struct rte_flow_action_vxlan_encap *vxlan_encap;
+                       const struct rte_flow_action_nvgre_encap *nvgre_encap;
                } src;
                union {
                        struct rte_flow_action_rss *rss;
+                       struct rte_flow_action_vxlan_encap *vxlan_encap;
+                       struct rte_flow_action_nvgre_encap *nvgre_encap;
                } dst;
                size_t tmp;
+               int ret;
 
        case RTE_FLOW_ACTION_TYPE_RSS:
                src.rss = action->conf;
@@ -444,6 +483,34 @@ rte_flow_conv_action_conf(void *buf, const size_t size,
                        off += tmp;
                }
                break;
+       case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
+       case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
+               src.vxlan_encap = action->conf;
+               dst.vxlan_encap = buf;
+               RTE_BUILD_BUG_ON(sizeof(*src.vxlan_encap) !=
+                                sizeof(*src.nvgre_encap) ||
+                                offsetof(struct rte_flow_action_vxlan_encap,
+                                         definition) !=
+                                offsetof(struct rte_flow_action_nvgre_encap,
+                                         definition));
+               off = sizeof(*dst.vxlan_encap);
+               if (src.vxlan_encap->definition) {
+                       off = RTE_ALIGN_CEIL
+                               (off, sizeof(*dst.vxlan_encap->definition));
+                       ret = rte_flow_conv
+                               (RTE_FLOW_CONV_OP_PATTERN,
+                                (void *)((uintptr_t)dst.vxlan_encap + off),
+                                size > off ? size - off : 0,
+                                src.vxlan_encap->definition, NULL);
+                       if (ret < 0)
+                               return 0;
+                       if (size >= off + ret)
+                               dst.vxlan_encap->definition =
+                                       (void *)((uintptr_t)dst.vxlan_encap +
+                                                off);
+                       off += ret;
+               }
+               break;
        default:
                off = rte_flow_desc_action[action->type].size;
                rte_memcpy(buf, action->conf, (size > off ? off : size));
@@ -679,6 +746,60 @@ rte_flow_conv_rule(struct rte_flow_conv_rule *dst,
        return off;
 }
 
+/**
+ * Retrieve the name of a pattern item/action type.
+ *
+ * @param is_action
+ *   Nonzero when @p src represents an action type instead of a pattern item
+ *   type.
+ * @param is_ptr
+ *   Nonzero to write string address instead of contents into @p dst.
+ * @param[out] dst
+ *   Destination buffer. Can be NULL if @p size is zero.
+ * @param size
+ *   Size of @p dst in bytes.
+ * @param[in] src
+ *   Depending on @p is_action, source pattern item or action type cast as a
+ *   pointer.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL.
+ *
+ * @return
+ *   A positive value representing the number of bytes needed to store the
+ *   name or its address regardless of @p size on success (@p buf contents
+ *   are truncated to @p size if not large enough), a negative errno value
+ *   otherwise and rte_errno is set.
+ */
+static int
+rte_flow_conv_name(int is_action,
+                  int is_ptr,
+                  char *dst,
+                  const size_t size,
+                  const void *src,
+                  struct rte_flow_error *error)
+{
+       struct desc_info {
+               const struct rte_flow_desc_data *data;
+               size_t num;
+       };
+       static const struct desc_info info_rep[2] = {
+               { rte_flow_desc_item, RTE_DIM(rte_flow_desc_item), },
+               { rte_flow_desc_action, RTE_DIM(rte_flow_desc_action), },
+       };
+       const struct desc_info *const info = &info_rep[!!is_action];
+       unsigned int type = (uintptr_t)src;
+
+       if (type >= info->num)
+               return rte_flow_error_set
+                       (error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                        "unknown object type to retrieve the name of");
+       if (!is_ptr)
+               return strlcpy(dst, info->data[type].name, size);
+       if (size >= sizeof(const char **))
+               *((const char **)dst) = info->data[type].name;
+       return sizeof(const char **);
+}
+
 /** Helper function to convert flow API objects. */
 int
 rte_flow_conv(enum rte_flow_conv_op op,
@@ -708,6 +829,14 @@ rte_flow_conv(enum rte_flow_conv_op op,
                return rte_flow_conv_actions(dst, size, src, 0, error);
        case RTE_FLOW_CONV_OP_RULE:
                return rte_flow_conv_rule(dst, size, src, error);
+       case RTE_FLOW_CONV_OP_ITEM_NAME:
+               return rte_flow_conv_name(0, 0, dst, size, src, error);
+       case RTE_FLOW_CONV_OP_ACTION_NAME:
+               return rte_flow_conv_name(1, 0, dst, size, src, error);
+       case RTE_FLOW_CONV_OP_ITEM_NAME_PTR:
+               return rte_flow_conv_name(0, 1, dst, size, src, error);
+       case RTE_FLOW_CONV_OP_ACTION_NAME_PTR:
+               return rte_flow_conv_name(1, 1, dst, size, src, error);
        }
        return rte_flow_error_set
                (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,