net/bnxt: refactor init/uninit
[dpdk.git] / app / test-pmd / cmdline_flow.c
index 9940d4f..0618611 100644 (file)
@@ -414,6 +414,19 @@ enum index {
        ACTION_SAMPLE_INDEX_VALUE,
        ACTION_SHARED,
        SHARED_ACTION_ID2PTR,
+       ACTION_MODIFY_FIELD,
+       ACTION_MODIFY_FIELD_OP,
+       ACTION_MODIFY_FIELD_OP_VALUE,
+       ACTION_MODIFY_FIELD_DST_TYPE,
+       ACTION_MODIFY_FIELD_DST_TYPE_VALUE,
+       ACTION_MODIFY_FIELD_DST_LEVEL,
+       ACTION_MODIFY_FIELD_DST_OFFSET,
+       ACTION_MODIFY_FIELD_SRC_TYPE,
+       ACTION_MODIFY_FIELD_SRC_TYPE_VALUE,
+       ACTION_MODIFY_FIELD_SRC_LEVEL,
+       ACTION_MODIFY_FIELD_SRC_OFFSET,
+       ACTION_MODIFY_FIELD_SRC_VALUE,
+       ACTION_MODIFY_FIELD_WIDTH,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -569,6 +582,23 @@ struct rte_flow_action_queue sample_queue[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_count sample_count[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_port_id sample_port_id[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_raw_encap sample_encap[RAW_SAMPLE_CONFS_MAX_NUM];
+struct action_rss_data sample_rss_data[RAW_SAMPLE_CONFS_MAX_NUM];
+
+static const char *const modify_field_ops[] = {
+       "set", "add", "sub", NULL
+};
+
+static const char *const modify_field_ids[] = {
+       "start", "mac_dst", "mac_src",
+       "vlan_type", "vlan_id", "mac_type",
+       "ipv4_dscp", "ipv4_ttl", "ipv4_src", "ipv4_dst",
+       "ipv6_hoplimit", "ipv6_src", "ipv6_dst",
+       "tcp_port_src", "tcp_port_dst",
+       "tcp_seq_num", "tcp_ack_num", "tcp_flags",
+       "udp_port_src", "udp_port_dst",
+       "vxlan_vni", "geneve_vni", "gtp_teid",
+       "tag", "mark", "meta", "pointer", "value", NULL
+};
 
 /** Maximum number of subsequent tokens and arguments on the stack. */
 #define CTX_STACK_SIZE 16
@@ -1336,6 +1366,7 @@ static const enum index next_action[] = {
        ACTION_AGE,
        ACTION_SAMPLE,
        ACTION_SHARED,
+       ACTION_MODIFY_FIELD,
        ZERO,
 };
 
@@ -1578,6 +1609,7 @@ static const enum index action_sample[] = {
 
 static const enum index next_action_sample[] = {
        ACTION_QUEUE,
+       ACTION_RSS,
        ACTION_MARK,
        ACTION_COUNT,
        ACTION_PORT_ID,
@@ -1586,6 +1618,21 @@ static const enum index next_action_sample[] = {
        ZERO,
 };
 
+static const enum index action_modify_field_dst[] = {
+       ACTION_MODIFY_FIELD_DST_LEVEL,
+       ACTION_MODIFY_FIELD_DST_OFFSET,
+       ACTION_MODIFY_FIELD_SRC_TYPE,
+       ZERO,
+};
+
+static const enum index action_modify_field_src[] = {
+       ACTION_MODIFY_FIELD_SRC_LEVEL,
+       ACTION_MODIFY_FIELD_SRC_OFFSET,
+       ACTION_MODIFY_FIELD_SRC_VALUE,
+       ACTION_MODIFY_FIELD_WIDTH,
+       ZERO,
+};
+
 static int parse_set_raw_encap_decap(struct context *, const struct token *,
                                     const char *, unsigned int,
                                     void *, unsigned int);
@@ -1668,6 +1715,14 @@ static int
 parse_vc_action_sample_index(struct context *ctx, const struct token *token,
                                const char *str, unsigned int len, void *buf,
                                unsigned int size);
+static int
+parse_vc_modify_field_op(struct context *ctx, const struct token *token,
+                               const char *str, unsigned int len, void *buf,
+                               unsigned int size);
+static int
+parse_vc_modify_field_id(struct context *ctx, const struct token *token,
+                               const char *str, unsigned int len, void *buf,
+                               unsigned int size);
 static int parse_destroy(struct context *, const struct token *,
                         const char *, unsigned int,
                         void *, unsigned int);
@@ -1752,6 +1807,10 @@ static int comp_set_raw_index(struct context *, const struct token *,
                              unsigned int, char *, unsigned int);
 static int comp_set_sample_index(struct context *, const struct token *,
                              unsigned int, char *, unsigned int);
+static int comp_set_modify_field_op(struct context *, const struct token *,
+                             unsigned int, char *, unsigned int);
+static int comp_set_modify_field_id(struct context *, const struct token *,
+                             unsigned int, char *, unsigned int);
 
 /** Token definitions. */
 static const struct token token_list[] = {
@@ -4116,6 +4175,103 @@ static const struct token token_list[] = {
                .call = parse_vc_action_raw_decap_index,
                .comp = comp_set_raw_index,
        },
+       [ACTION_MODIFY_FIELD] = {
+               .name = "modify_field",
+               .help = "modify destination field with data from source field",
+               .priv = PRIV_ACTION(MODIFY_FIELD,
+                       sizeof(struct rte_flow_action_modify_field)),
+               .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_OP)),
+               .call = parse_vc,
+       },
+       [ACTION_MODIFY_FIELD_OP] = {
+               .name = "op",
+               .help = "operation type",
+               .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_DST_TYPE),
+                       NEXT_ENTRY(ACTION_MODIFY_FIELD_OP_VALUE)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_OP_VALUE] = {
+               .name = "{operation}",
+               .help = "operation type value",
+               .call = parse_vc_modify_field_op,
+               .comp = comp_set_modify_field_op,
+       },
+       [ACTION_MODIFY_FIELD_DST_TYPE] = {
+               .name = "dst_type",
+               .help = "destination field type",
+               .next = NEXT(action_modify_field_dst,
+                       NEXT_ENTRY(ACTION_MODIFY_FIELD_DST_TYPE_VALUE)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_DST_TYPE_VALUE] = {
+               .name = "{dst_type}",
+               .help = "destination field type value",
+               .call = parse_vc_modify_field_id,
+               .comp = comp_set_modify_field_id,
+       },
+       [ACTION_MODIFY_FIELD_DST_LEVEL] = {
+               .name = "dst_level",
+               .help = "destination field level",
+               .next = NEXT(action_modify_field_dst, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
+                                       dst.level)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_DST_OFFSET] = {
+               .name = "dst_offset",
+               .help = "destination field bit offset",
+               .next = NEXT(action_modify_field_dst, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
+                                       dst.offset)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_SRC_TYPE] = {
+               .name = "src_type",
+               .help = "source field type",
+               .next = NEXT(action_modify_field_src,
+                       NEXT_ENTRY(ACTION_MODIFY_FIELD_SRC_TYPE_VALUE)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_SRC_TYPE_VALUE] = {
+               .name = "{src_type}",
+               .help = "source field type value",
+               .call = parse_vc_modify_field_id,
+               .comp = comp_set_modify_field_id,
+       },
+       [ACTION_MODIFY_FIELD_SRC_LEVEL] = {
+               .name = "src_level",
+               .help = "source field level",
+               .next = NEXT(action_modify_field_src, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
+                                       src.level)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_SRC_OFFSET] = {
+               .name = "src_offset",
+               .help = "source field bit offset",
+               .next = NEXT(action_modify_field_src, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
+                                       src.offset)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_SRC_VALUE] = {
+               .name = "src_value",
+               .help = "source immediate value",
+               .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_WIDTH),
+                       NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
+                                       src.value)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_MODIFY_FIELD_WIDTH] = {
+               .name = "width",
+               .help = "number of bits to copy",
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT),
+                       NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
+                                       width)),
+               .call = parse_vc_conf,
+       },
        /* Top level command. */
        [SET] = {
                .name = "set",
@@ -6039,6 +6195,62 @@ parse_vc_action_sample_index(struct context *ctx, const struct token *token,
        return len;
 }
 
+/** Parse operation for modify_field command. */
+static int
+parse_vc_modify_field_op(struct context *ctx, const struct token *token,
+                        const char *str, unsigned int len, void *buf,
+                        unsigned int size)
+{
+       struct rte_flow_action_modify_field *action_modify_field;
+       unsigned int i;
+
+       (void)token;
+       (void)buf;
+       (void)size;
+       if (ctx->curr != ACTION_MODIFY_FIELD_OP_VALUE)
+               return -1;
+       for (i = 0; modify_field_ops[i]; ++i)
+               if (!strcmp_partial(modify_field_ops[i], str, len))
+                       break;
+       if (!modify_field_ops[i])
+               return -1;
+       if (!ctx->object)
+               return len;
+       action_modify_field = ctx->object;
+       action_modify_field->operation = (enum rte_flow_modify_op)i;
+       return len;
+}
+
+/** Parse id for modify_field command. */
+static int
+parse_vc_modify_field_id(struct context *ctx, const struct token *token,
+                        const char *str, unsigned int len, void *buf,
+                        unsigned int size)
+{
+       struct rte_flow_action_modify_field *action_modify_field;
+       unsigned int i;
+
+       (void)token;
+       (void)buf;
+       (void)size;
+       if (ctx->curr != ACTION_MODIFY_FIELD_DST_TYPE_VALUE &&
+               ctx->curr != ACTION_MODIFY_FIELD_SRC_TYPE_VALUE)
+               return -1;
+       for (i = 0; modify_field_ids[i]; ++i)
+               if (!strcmp_partial(modify_field_ids[i], str, len))
+                       break;
+       if (!modify_field_ids[i])
+               return -1;
+       if (!ctx->object)
+               return len;
+       action_modify_field = ctx->object;
+       if (ctx->curr == ACTION_MODIFY_FIELD_DST_TYPE_VALUE)
+               action_modify_field->dst.field = (enum rte_flow_field_id)i;
+       else
+               action_modify_field->src.field = (enum rte_flow_field_id)i;
+       return len;
+}
+
 /** Parse tokens for destroy command. */
 static int
 parse_destroy(struct context *ctx, const struct token *token,
@@ -7111,6 +7323,42 @@ comp_set_sample_index(struct context *ctx, const struct token *token,
        return nb;
 }
 
+/** Complete operation for modify_field command. */
+static int
+comp_set_modify_field_op(struct context *ctx, const struct token *token,
+                  unsigned int ent, char *buf, unsigned int size)
+{
+       uint16_t idx = 0;
+
+       RTE_SET_USED(ctx);
+       RTE_SET_USED(token);
+       for (idx = 0; modify_field_ops[idx]; ++idx)
+               ;
+       if (!buf)
+               return idx + 1;
+       if (ent < idx)
+               return strlcpy(buf, modify_field_ops[ent], size);
+       return -1;
+}
+
+/** Complete field id for modify_field command. */
+static int
+comp_set_modify_field_id(struct context *ctx, const struct token *token,
+                  unsigned int ent, char *buf, unsigned int size)
+{
+       uint16_t idx = 0;
+
+       RTE_SET_USED(ctx);
+       RTE_SET_USED(token);
+       for (idx = 0; modify_field_ids[idx]; ++idx)
+               ;
+       if (!buf)
+               return idx + 1;
+       if (ent < idx)
+               return strlcpy(buf, modify_field_ids[ent], size);
+       return -1;
+}
+
 /** Internal context. */
 static struct context cmd_flow_context;
 
@@ -7600,6 +7848,7 @@ cmd_set_raw_parsed_sample(const struct buffer *in)
        uint32_t i = 0;
        struct rte_flow_action *action = NULL;
        struct rte_flow_action *data = NULL;
+       const struct rte_flow_action_rss *rss = NULL;
        size_t size = 0;
        uint16_t idx = in->port; /* We borrow port field as index */
        uint32_t max_size = sizeof(struct rte_flow_action) *
@@ -7631,6 +7880,29 @@ cmd_set_raw_parsed_sample(const struct buffer *in)
                                (const void *)action->conf, size);
                        action->conf = &sample_queue[idx];
                        break;
+               case RTE_FLOW_ACTION_TYPE_RSS:
+                       size = sizeof(struct rte_flow_action_rss);
+                       rss = action->conf;
+                       rte_memcpy(&sample_rss_data[idx].conf,
+                                  (const void *)rss, size);
+                       if (rss->key_len) {
+                               sample_rss_data[idx].conf.key =
+                                               sample_rss_data[idx].key;
+                               rte_memcpy((void *)((uintptr_t)
+                                          sample_rss_data[idx].conf.key),
+                                          (const void *)rss->key,
+                                          sizeof(uint8_t) * rss->key_len);
+                       }
+                       if (rss->queue_num) {
+                               sample_rss_data[idx].conf.queue =
+                                               sample_rss_data[idx].queue;
+                               rte_memcpy((void *)((uintptr_t)
+                                          sample_rss_data[idx].conf.queue),
+                                          (const void *)rss->queue,
+                                          sizeof(uint16_t) * rss->queue_num);
+                       }
+                       action->conf = &sample_rss_data[idx].conf;
+                       break;
                case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
                        size = sizeof(struct rte_flow_action_raw_encap);
                        rte_memcpy(&sample_encap[idx],