Hi Ankur,
> -----Original Message-----
> From: Ankur Dwivedi <adwiv...@marvell.com>
> Sent: Monday, 23 January 2023 11:02
>
> Adds trace points for rte_flow specific functions in ethdev lib.
>
> Signed-off-by: Ankur Dwivedi <adwiv...@marvell.com>
> ---
> lib/ethdev/ethdev_trace_points.c | 117 ++++++++++
> lib/ethdev/rte_ethdev_trace.h | 383
> +++++++++++++++++++++++++++++++
> lib/ethdev/rte_ethdev_trace_fp.h | 113 +++++++++
> lib/ethdev/rte_flow.c | 314 +++++++++++++++++++------
> lib/ethdev/version.map | 37 +++
> 5 files changed, 898 insertions(+), 66 deletions(-)
>
> diff --git a/lib/ethdev/ethdev_trace_points.c
> b/lib/ethdev/ethdev_trace_points.c
> index 102a18fcc1..1953d90a5a 100644
> --- a/lib/ethdev/ethdev_trace_points.c
> +++ b/lib/ethdev/ethdev_trace_points.c
> @@ -474,3 +474,120 @@
> RTE_TRACE_POINT_REGISTER(rte_eth_trace_cman_config_set,
>
> RTE_TRACE_POINT_REGISTER(rte_eth_trace_cman_config_get,
> lib.ethdev.cman_config_get)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_copy,
> + lib.ethdev.flow.copy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_create,
> + lib.ethdev.flow.create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_destroy,
> + lib.ethdev.flow.destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_flush,
> + lib.ethdev.flow.flush)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_isolate,
> + lib.ethdev.flow.isolate)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_query,
> + lib.ethdev.flow.query)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_validate,
> + lib.ethdev.flow.validate)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_conv,
> + lib.ethdev.flow.conv)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_dynf_metadata_register,
> + lib.ethdev.dynf_metadata_register)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_get_aged_flows,
> + lib.ethdev.flow.get_aged_flows)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_get_q_aged_flows,
> + lib.ethdev.flow.get_q_aged_flows)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_tunnel_decap_set,
> + lib.ethdev.flow.tunnel_decap_set)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_tunnel_match,
> + lib.ethdev.flow.tunnel_match)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_get_restore_info,
> + lib.ethdev.flow.get_restore_info)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_tunnel_action_decap_releas
> e,
> + lib.ethdev.flow.tunnel_action_decap_release)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_tunnel_item_release,
> + lib.ethdev.flow.tunnel_item_release)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_action_handle_create,
> + lib.ethdev.flow.action_handle_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_action_handle_destroy,
> + lib.ethdev.flow.action_handle_destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_action_handle_update,
> + lib.ethdev.flow.action_handle_update)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_action_handle_query,
> + lib.ethdev.flow.action_handle_query)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_flex_item_create,
> + lib.ethdev.flow.flex_item_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_flex_item_release,
> + lib.ethdev.flow.flex_item_release)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_pick_transfer_proxy,
> + lib.ethdev.flow.pick_transfer_proxy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_info_get,
> + lib.ethdev.flow.info_get)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_configure,
> + lib.ethdev.flow.configure)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_pattern_template_create,
> + lib.ethdev.flow.pattern_template_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_pattern_template_destroy,
> + lib.ethdev.flow.pattern_template_destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_actions_template_create,
> + lib.ethdev.flow.actions_template_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_actions_template_destroy,
> + lib.ethdev.flow.actions_template_destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_template_table_create,
> + lib.ethdev.flow.template_table_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_template_table_destroy,
> + lib.ethdev.flow.template_table_destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_create,
> + lib.ethdev.flow.async_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_destroy,
> + lib.ethdev.flow.async_destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_push,
> + lib.ethdev.flow.push)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_pull,
> + lib.ethdev.flow.pull)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_creat
> e,
> + lib.ethdev.flow.async_action_handle_create)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_destr
> oy,
> + lib.ethdev.flow.async_action_handle_destroy)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_updat
> e,
> + lib.ethdev.flow.async_action_handle_update)
> +
> +RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_query
> ,
> + lib.ethdev.flow.async.action.handle.query)
> diff --git a/lib/ethdev/rte_ethdev_trace.h b/lib/ethdev/rte_ethdev_trace.h
> index fa195c5cde..fd4fbaf6de 100644
> --- a/lib/ethdev/rte_ethdev_trace.h
> +++ b/lib/ethdev/rte_ethdev_trace.h
> @@ -902,6 +902,389 @@ RTE_TRACE_POINT(
> rte_trace_point_emit_int(ret);
> )
>
> +RTE_TRACE_POINT(
> + rte_flow_trace_copy,
> + RTE_TRACE_POINT_ARGS(struct rte_flow_desc *fd, size_t len,
> + const struct rte_flow_attr *attr,
> + const struct rte_flow_item *items,
> + const struct rte_flow_action *actions, int ret),
> + rte_trace_point_emit_ptr(fd);
> + rte_trace_point_emit_size_t(len);
> + rte_trace_point_emit_u32(attr->group);
> + rte_trace_point_emit_u32(attr->priority);
> + rte_trace_point_emit_ptr(items);
> + rte_trace_point_emit_int(items->type);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_int(actions->type);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
Part of the datapath should be _FP
> + rte_flow_trace_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, const struct
> rte_flow_attr *attr,
> + const struct rte_flow_item *pattern,
> + const struct rte_flow_action *actions, struct rte_flow *flow),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(attr->group);
> + rte_trace_point_emit_u32(attr->priority);
> + rte_trace_point_emit_ptr(pattern);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_ptr(flow);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_destroy,
Part of the datapath should be _FP
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, struct rte_flow *flow, int
> ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(flow);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_flush,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_validate,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_attr *attr,
> + const struct rte_flow_item *pattern,
> + const struct rte_flow_action *actions, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(attr->group);
> + rte_trace_point_emit_u32(attr->priority);
> + rte_trace_point_emit_ptr(pattern);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_conv,
> + RTE_TRACE_POINT_ARGS(enum rte_flow_conv_op op, void *dst,
> + size_t size, const void *src),
> + rte_trace_point_emit_int(op);
> + rte_trace_point_emit_ptr(dst);
> + rte_trace_point_emit_size_t(size);
> + rte_trace_point_emit_ptr(src);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_dynf_metadata_register,
> + RTE_TRACE_POINT_ARGS(int offset, uint64_t flag),
> + rte_trace_point_emit_int(offset);
> + rte_trace_point_emit_u64(flag);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_tunnel_decap_set,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_tunnel *tunnel,
> + struct rte_flow_action **actions,
> + uint32_t *num_of_actions, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(tunnel);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_ptr(num_of_actions);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_tunnel_match,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_tunnel *tunnel,
> + struct rte_flow_item **items,
> + uint32_t *num_of_items, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(tunnel);
> + rte_trace_point_emit_ptr(items);
> + rte_trace_point_emit_ptr(num_of_items);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_tunnel_action_decap_release,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_action *actions,
> + uint32_t num_of_actions, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_u32(num_of_actions);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_tunnel_item_release,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_item *items,
> + uint32_t num_of_items, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(items);
> + rte_trace_point_emit_u32(num_of_items);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
Part of the datapath should be _FP
> + rte_flow_trace_action_handle_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_indir_action_conf *conf,
> + const struct rte_flow_action *action,
> + struct rte_flow_action_handle *handle),
> + uint32_t ingress = conf->ingress;
> + uint32_t egress = conf->egress;
> + uint32_t transfer = conf->transfer;
> +
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(conf);
> + rte_trace_point_emit_u32(ingress);
> + rte_trace_point_emit_u32(egress);
> + rte_trace_point_emit_u32(transfer);
> + rte_trace_point_emit_ptr(action);
> + rte_trace_point_emit_int(action->type);
> + rte_trace_point_emit_ptr(handle);
> +)
> +
> +RTE_TRACE_POINT(
Part of the datapath should be _FP
> + rte_flow_trace_action_handle_destroy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_action_handle *handle, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(handle);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_flex_item_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_item_flex_conf *conf,
> + struct rte_flow_item_flex_handle *handle),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(conf);
> + rte_trace_point_emit_int(conf->tunnel);
> + rte_trace_point_emit_int(conf->nb_samples);
> + rte_trace_point_emit_int(conf->nb_inputs);
> + rte_trace_point_emit_int(conf->nb_outputs);
> + rte_trace_point_emit_ptr(handle);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_flex_item_release,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_item_flex_handle *handle, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(handle);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_info_get,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_port_info *port_info,
> + struct rte_flow_queue_info *queue_info, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(port_info);
> + rte_trace_point_emit_u32(port_info->max_nb_queues);
> + rte_trace_point_emit_u32(port_info->max_nb_counters);
> + rte_trace_point_emit_u32(port_info->max_nb_aging_objects);
> + rte_trace_point_emit_u32(port_info->max_nb_meters);
> + rte_trace_point_emit_u32(port_info->max_nb_conn_tracks);
> + rte_trace_point_emit_u32(port_info->supported_flags);
> + rte_trace_point_emit_ptr(queue_info);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_configure,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_port_attr *port_attr,
> + uint16_t nb_queue,
> + const struct rte_flow_queue_attr **queue_attr, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(port_attr);
> + rte_trace_point_emit_u32(port_attr->nb_counters);
> + rte_trace_point_emit_u32(port_attr->nb_aging_objects);
> + rte_trace_point_emit_u32(port_attr->nb_meters);
> + rte_trace_point_emit_u32(port_attr->nb_conn_tracks);
> + rte_trace_point_emit_u32(port_attr->flags);
> + rte_trace_point_emit_u16(nb_queue);
> + rte_trace_point_emit_ptr(queue_attr);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_pattern_template_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_pattern_template_attr
> *template_attr,
> + const struct rte_flow_item *pattern,
> + void *tmplate),
> + uint32_t relaxed_matching = template_attr->relaxed_matching;
> + uint32_t ingress = template_attr->ingress;
> + uint32_t egress = template_attr->egress;
> + uint32_t transfer = template_attr->transfer;
> +
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(template_attr);
> + rte_trace_point_emit_u32(relaxed_matching);
> + rte_trace_point_emit_u32(ingress);
> + rte_trace_point_emit_u32(egress);
> + rte_trace_point_emit_u32(transfer);
> + rte_trace_point_emit_ptr(pattern);
> + rte_trace_point_emit_ptr(tmplate);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_pattern_template_destroy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_pattern_template *pattern_template, int
> ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(pattern_template);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_actions_template_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_actions_template_attr *template_attr,
> + const struct rte_flow_action *actions,
> + const struct rte_flow_action *masks,
> + void *tmplate),
> + uint32_t ingress = template_attr->ingress;
> + uint32_t egress = template_attr->egress;
> + uint32_t transfer = template_attr->transfer;
> +
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(template_attr);
> + rte_trace_point_emit_u32(ingress);
> + rte_trace_point_emit_u32(egress);
> + rte_trace_point_emit_u32(transfer);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_ptr(masks);
> + rte_trace_point_emit_ptr(tmplate);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_actions_template_destroy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_actions_template *actions_template, int
> ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(actions_template);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_template_table_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_template_table_attr *table_attr,
> + struct rte_flow_pattern_template **pattern_templates,
> + uint8_t nb_pattern_templates,
> + struct rte_flow_actions_template **actions_templates,
> + uint8_t nb_actions_templates,
> + struct rte_flow_template_table *table),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(table_attr);
> + rte_trace_point_emit_u32(table_attr->nb_flows);
> + rte_trace_point_emit_ptr(pattern_templates);
> + rte_trace_point_emit_u8(nb_pattern_templates);
> + rte_trace_point_emit_ptr(actions_templates);
> + rte_trace_point_emit_u8(nb_actions_templates);
> + rte_trace_point_emit_ptr(table);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_template_table_destroy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_template_table *template_table, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(template_table);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_async_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + const struct rte_flow_op_attr *op_attr,
> + struct rte_flow_template_table *template_table,
> + const struct rte_flow_item *pattern,
> + uint8_t pattern_template_index,
> + const struct rte_flow_action *actions,
> + uint8_t actions_template_index,
> + void *user_data, struct rte_flow *flow),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(op_attr);
> + rte_trace_point_emit_ptr(template_table);
> + rte_trace_point_emit_ptr(pattern);
> + rte_trace_point_emit_u8(pattern_template_index);
> + rte_trace_point_emit_ptr(actions);
> + rte_trace_point_emit_u8(actions_template_index);
> + rte_trace_point_emit_ptr(user_data);
> + rte_trace_point_emit_ptr(flow);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_async_destroy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + const struct rte_flow_op_attr *op_attr,
> + struct rte_flow *flow, void *user_data, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(op_attr);
> + rte_trace_point_emit_ptr(flow);
> + rte_trace_point_emit_ptr(user_data);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_push,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id, int
> ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_pull,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + struct rte_flow_op_result *res, uint16_t n_res, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(res);
> + rte_trace_point_emit_u16(n_res);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_async_action_handle_create,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + const struct rte_flow_op_attr *op_attr,
> + const struct rte_flow_indir_action_conf *indir_action_conf,
> + const struct rte_flow_action *action,
> + void *user_data, struct rte_flow_action_handle *handle),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(op_attr);
> + rte_trace_point_emit_ptr(indir_action_conf);
> + rte_trace_point_emit_ptr(action);
> + rte_trace_point_emit_ptr(user_data);
> + rte_trace_point_emit_ptr(handle);
> +)
> +
> +RTE_TRACE_POINT(
> + rte_flow_trace_async_action_handle_destroy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + const struct rte_flow_op_attr *op_attr,
> + struct rte_flow_action_handle *action_handle,
> + void *user_data, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(op_attr);
> + rte_trace_point_emit_ptr(action_handle);
> + rte_trace_point_emit_ptr(user_data);
> + rte_trace_point_emit_int(ret);
> +)
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/lib/ethdev/rte_ethdev_trace_fp.h
> b/lib/ethdev/rte_ethdev_trace_fp.h
> index d4b2e4b312..c5b8083de2 100644
> --- a/lib/ethdev/rte_ethdev_trace_fp.h
> +++ b/lib/ethdev/rte_ethdev_trace_fp.h
> @@ -646,6 +646,119 @@ RTE_TRACE_POINT_FP(
> rte_trace_point_emit_int(ret);
> )
>
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_query,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, struct rte_flow *flow,
> + const struct rte_flow_action *action, void *data, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(flow);
> + rte_trace_point_emit_ptr(action);
> + rte_trace_point_emit_int(action->type);
> + rte_trace_point_emit_ptr(data);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_isolate,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, int set, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_int(set);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_get_restore_info,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_mbuf *m, struct rte_flow_restore_info *info,
> + int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(m);
> + rte_trace_point_emit_ptr(info);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_get_aged_flows,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, void **contexts,
> + uint32_t nb_contexts, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(contexts);
> + rte_trace_point_emit_u32(nb_contexts);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_get_q_aged_flows,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id, void
> **contexts,
> + uint32_t nb_contexts, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(contexts);
> + rte_trace_point_emit_u32(nb_contexts);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_action_handle_update,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + struct rte_flow_action_handle *handle,
> + const void *update, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(handle);
> + rte_trace_point_emit_ptr(update);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_action_handle_query,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id,
> + const struct rte_flow_action_handle *handle,
> + void *data, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(handle);
> + rte_trace_point_emit_ptr(data);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_pick_transfer_proxy,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint16_t
> *proxy_port_id,
> + int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_ptr(proxy_port_id);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_async_action_handle_update,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + const struct rte_flow_op_attr *op_attr,
> + struct rte_flow_action_handle *action_handle,
> + const void *update, void *user_data, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(op_attr);
> + rte_trace_point_emit_ptr(action_handle);
> + rte_trace_point_emit_ptr(update);
> + rte_trace_point_emit_ptr(user_data);
> + rte_trace_point_emit_int(ret);
> +)
> +
> +RTE_TRACE_POINT_FP(
> + rte_flow_trace_async_action_handle_query,
> + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id,
> + const struct rte_flow_op_attr *op_attr,
> + const struct rte_flow_action_handle *action_handle,
> + void *data, void *user_data, int ret),
> + rte_trace_point_emit_u16(port_id);
> + rte_trace_point_emit_u32(queue_id);
> + rte_trace_point_emit_ptr(op_attr);
> + rte_trace_point_emit_ptr(action_handle);
> + rte_trace_point_emit_ptr(data);
> + rte_trace_point_emit_ptr(user_data);
> + rte_trace_point_emit_int(ret);
> +)
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
> index 7d0c24366c..43f13f79b4 100644
> --- a/lib/ethdev/rte_flow.c
> +++ b/lib/ethdev/rte_flow.c
> @@ -13,6 +13,8 @@
> #include <rte_string_fns.h>
> #include <rte_mbuf_dyn.h>
> #include "rte_ethdev.h"
> +#include "rte_ethdev_trace.h"
> +#include "rte_ethdev_trace_fp.h"
> #include "rte_flow_driver.h"
> #include "rte_flow.h"
>
> @@ -276,6 +278,9 @@ rte_flow_dynf_metadata_register(void)
> goto error;
> rte_flow_dynf_metadata_offs = offset;
> rte_flow_dynf_metadata_mask = RTE_BIT64(flag);
> +
> + rte_flow_trace_dynf_metadata_register(offset, RTE_BIT64(flag));
> +
> return 0;
>
> error:
> @@ -362,7 +367,11 @@ rte_flow_validate(uint16_t port_id,
> fts_enter(dev);
> ret = ops->validate(dev, attr, pattern, actions, error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_validate(port_id, attr, pattern, actions, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOSYS,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -389,6 +398,9 @@ rte_flow_create(uint16_t port_id,
> fts_exit(dev);
> if (flow == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_create(port_id, attr, pattern, actions, flow);
> +
> return flow;
> }
> rte_flow_error_set(error, ENOSYS,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -412,7 +424,11 @@ rte_flow_destroy(uint16_t port_id,
> fts_enter(dev);
> ret = ops->destroy(dev, flow, error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_destroy(port_id, flow, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOSYS,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -434,7 +450,11 @@ rte_flow_flush(uint16_t port_id,
> fts_enter(dev);
> ret = ops->flush(dev, error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_flush(port_id, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOSYS,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -459,7 +479,11 @@ rte_flow_query(uint16_t port_id,
> fts_enter(dev);
> ret = ops->query(dev, flow, action, data, error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_query(port_id, flow, action, data, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOSYS,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -482,7 +506,11 @@ rte_flow_isolate(uint16_t port_id,
> fts_enter(dev);
> ret = ops->isolate(dev, set, error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_isolate(port_id, set, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOSYS,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1003,6 +1031,8 @@ rte_flow_conv(enum rte_flow_conv_op op,
> const void *src,
> struct rte_flow_error *error)
> {
> + rte_flow_trace_conv(op, dst, size, src);
> +
> switch (op) {
> const struct rte_flow_attr *attr;
>
> @@ -1087,6 +1117,9 @@ rte_flow_copy(struct rte_flow_desc *desc, size_t
> len,
> .actions = dst_size ? dst->actions : NULL,
> }),
> len > sizeof(*desc) ? sizeof(*desc) : len);
> +
> + rte_flow_trace_copy(desc, len, attr, items, actions, ret);
> +
> return ret;
> }
>
> @@ -1125,7 +1158,11 @@ rte_flow_get_aged_flows(uint16_t port_id, void
> **contexts,
> fts_enter(dev);
> ret = ops->get_aged_flows(dev, contexts, nb_contexts,
> error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_get_aged_flows(port_id, contexts,
> nb_contexts, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1147,7 +1184,12 @@ rte_flow_get_q_aged_flows(uint16_t port_id,
> uint32_t queue_id, void **contexts,
> ret = ops->get_q_aged_flows(dev, queue_id, contexts,
> nb_contexts, error);
> fts_exit(dev);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_get_q_aged_flows(port_id, queue_id,
> contexts,
> + nb_contexts, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1175,6 +1217,9 @@ rte_flow_action_handle_create(uint16_t port_id,
> conf, action, error);
> if (handle == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_action_handle_create(port_id, conf, action, handle);
> +
> return handle;
> }
>
> @@ -1194,7 +1239,11 @@ rte_flow_action_handle_destroy(uint16_t
> port_id,
> NULL, rte_strerror(ENOSYS));
> ret = ops->action_handle_destroy(&rte_eth_devices[port_id],
> handle, error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_action_handle_destroy(port_id, handle, ret);
> +
> + return ret;
> }
>
> int
> @@ -1214,7 +1263,11 @@ rte_flow_action_handle_update(uint16_t port_id,
> NULL, rte_strerror(ENOSYS));
> ret = ops->action_handle_update(&rte_eth_devices[port_id],
> handle,
> update, error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_action_handle_update(port_id, handle, update,
> ret);
> +
> + return ret;
> }
>
> int
> @@ -1234,7 +1287,11 @@ rte_flow_action_handle_query(uint16_t port_id,
> NULL, rte_strerror(ENOSYS));
> ret = ops->action_handle_query(&rte_eth_devices[port_id], handle,
> data, error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_action_handle_query(port_id, handle, data, ret);
> +
> + return ret;
> }
>
> int
> @@ -1246,14 +1303,20 @@ rte_flow_tunnel_decap_set(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (likely(!!ops->tunnel_decap_set)) {
> - return flow_err(port_id,
> - ops->tunnel_decap_set(dev, tunnel, actions,
> - num_of_actions, error),
> - error);
> + ret = flow_err(port_id,
> + ops->tunnel_decap_set(dev, tunnel, actions,
> + num_of_actions, error),
> + error);
> +
> + rte_flow_trace_tunnel_decap_set(port_id, tunnel, actions,
> + num_of_actions, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1269,14 +1332,20 @@ rte_flow_tunnel_match(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (likely(!!ops->tunnel_match)) {
> - return flow_err(port_id,
> - ops->tunnel_match(dev, tunnel, items,
> - num_of_items, error),
> - error);
> + ret = flow_err(port_id,
> + ops->tunnel_match(dev, tunnel, items,
> + num_of_items, error),
> + error);
> +
> + rte_flow_trace_tunnel_match(port_id, tunnel, items,
> num_of_items,
> + ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1291,14 +1360,19 @@ rte_flow_get_restore_info(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (likely(!!ops->get_restore_info)) {
> - return flow_err(port_id,
> - ops->get_restore_info(dev, m, restore_info,
> - error),
> - error);
> + ret = flow_err(port_id,
> + ops->get_restore_info(dev, m, restore_info,
> + error),
> + error);
> +
> + rte_flow_trace_get_restore_info(port_id, m, restore_info,
> ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1313,15 +1387,21 @@ rte_flow_tunnel_action_decap_release(uint16_t
> port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (likely(!!ops->tunnel_action_decap_release)) {
> - return flow_err(port_id,
> - ops->tunnel_action_decap_release(dev,
> actions,
> -
> num_of_actions,
> - error),
> - error);
> + ret = flow_err(port_id,
> + ops->tunnel_action_decap_release(dev, actions,
> +
> num_of_actions,
> + error),
> + error);
> +
> + rte_flow_trace_tunnel_action_decap_release(port_id,
> actions,
> + num_of_actions,
> ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1336,14 +1416,19 @@ rte_flow_tunnel_item_release(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (likely(!!ops->tunnel_item_release)) {
> - return flow_err(port_id,
> - ops->tunnel_item_release(dev, items,
> - num_of_items,
> error),
> - error);
> + ret = flow_err(port_id,
> + ops->tunnel_item_release(dev, items,
> + num_of_items,
> error),
> + error);
> +
> + rte_flow_trace_tunnel_item_release(port_id, items,
> num_of_items, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1356,6 +1441,7 @@ rte_flow_pick_transfer_proxy(uint16_t port_id,
> uint16_t *proxy_port_id,
> {
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> struct rte_eth_dev *dev;
> + int ret;
>
> if (unlikely(ops == NULL))
> return -rte_errno;
> @@ -1367,9 +1453,13 @@ rte_flow_pick_transfer_proxy(uint16_t port_id,
> uint16_t *proxy_port_id,
>
> dev = &rte_eth_devices[port_id];
>
> - return flow_err(port_id,
> - ops->pick_transfer_proxy(dev, proxy_port_id,
> error),
> - error);
> + ret = flow_err(port_id,
> + ops->pick_transfer_proxy(dev, proxy_port_id, error),
> + error);
> +
> + rte_flow_trace_pick_transfer_proxy(port_id, proxy_port_id, ret);
> +
> + return ret;
> }
>
> struct rte_flow_item_flex_handle *
> @@ -1392,6 +1482,9 @@ rte_flow_flex_item_create(uint16_t port_id,
> handle = ops->flex_item_create(dev, conf, error);
> if (handle == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_flex_item_create(port_id, conf, handle);
> +
> return handle;
> }
>
> @@ -1409,7 +1502,11 @@ rte_flow_flex_item_release(uint16_t port_id,
>
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, rte_strerror(ENOTSUP));
> ret = ops->flex_item_release(dev, handle, error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_flex_item_release(port_id, handle, ret);
> +
> + return ret;
> }
>
> int
> @@ -1420,6 +1517,7 @@ rte_flow_info_get(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> @@ -1434,9 +1532,13 @@ rte_flow_info_get(uint16_t port_id,
> return -EINVAL;
> }
> if (likely(!!ops->info_get)) {
> - return flow_err(port_id,
> - ops->info_get(dev, port_info, queue_info,
> error),
> - error);
> + ret = flow_err(port_id,
> + ops->info_get(dev, port_info, queue_info,
> error),
> + error);
> +
> + rte_flow_trace_info_get(port_id, port_info, queue_info,
> ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1480,7 +1582,11 @@ rte_flow_configure(uint16_t port_id,
> ret = ops->configure(dev, port_attr, nb_queue, queue_attr,
> error);
> if (ret == 0)
> dev->data->flow_configured = 1;
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_configure(port_id, port_attr, nb_queue,
> queue_attr, ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1531,6 +1637,10 @@ rte_flow_pattern_template_create(uint16_t
> port_id,
> pattern, error);
> if (template == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_pattern_template_create(port_id,
> template_attr,
> + pattern, template);
> +
> return template;
> }
> rte_flow_error_set(error, ENOTSUP,
> @@ -1546,17 +1656,23 @@ rte_flow_pattern_template_destroy(uint16_t
> port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (unlikely(pattern_template == NULL))
> return 0;
> if (likely(!!ops->pattern_template_destroy)) {
> - return flow_err(port_id,
> - ops->pattern_template_destroy(dev,
> - pattern_template,
> - error),
> - error);
> + ret = flow_err(port_id,
> + ops->pattern_template_destroy(dev,
> + pattern_template,
> + error),
> + error);
> +
> + rte_flow_trace_pattern_template_destroy(port_id,
> pattern_template,
> + ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1617,6 +1733,10 @@ rte_flow_actions_template_create(uint16_t
> port_id,
> actions, masks,
> error);
> if (template == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_actions_template_create(port_id,
> template_attr, actions,
> + masks, template);
> +
> return template;
> }
> rte_flow_error_set(error, ENOTSUP,
> @@ -1632,17 +1752,23 @@ rte_flow_actions_template_destroy(uint16_t
> port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (unlikely(actions_template == NULL))
> return 0;
> if (likely(!!ops->actions_template_destroy)) {
> - return flow_err(port_id,
> - ops->actions_template_destroy(dev,
> - actions_template,
> - error),
> - error);
> + ret = flow_err(port_id,
> + ops->actions_template_destroy(dev,
> + actions_template,
> + error),
> + error);
> +
> + rte_flow_trace_actions_template_destroy(port_id,
> actions_template,
> + ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1707,6 +1833,13 @@ rte_flow_template_table_create(uint16_t
> port_id,
> error);
> if (table == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_template_table_create(port_id, table_attr,
> + pattern_templates,
> + nb_pattern_templates,
> + actions_templates,
> + nb_actions_templates,
> table);
> +
> return table;
> }
> rte_flow_error_set(error, ENOTSUP,
> @@ -1722,17 +1855,23 @@ rte_flow_template_table_destroy(uint16_t
> port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> if (unlikely(!ops))
> return -rte_errno;
> if (unlikely(template_table == NULL))
> return 0;
> if (likely(!!ops->template_table_destroy)) {
> - return flow_err(port_id,
> - ops->template_table_destroy(dev,
> - template_table,
> - error),
> - error);
> + ret = flow_err(port_id,
> + ops->template_table_destroy(dev,
> + template_table,
> + error),
> + error);
> +
> + rte_flow_trace_template_table_destroy(port_id,
> template_table,
> + ret);
> +
> + return ret;
> }
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> @@ -1762,6 +1901,11 @@ rte_flow_async_create(uint16_t port_id,
> user_data, error);
> if (flow == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_async_create(port_id, queue_id, op_attr,
> template_table,
> + pattern, pattern_template_index, actions,
> + actions_template_index, user_data, flow);
> +
> return flow;
> }
>
> @@ -1775,12 +1919,18 @@ rte_flow_async_destroy(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> - return flow_err(port_id,
> - ops->async_destroy(dev, queue_id,
> - op_attr, flow,
> - user_data, error),
> - error);
> + ret = flow_err(port_id,
> + ops->async_destroy(dev, queue_id,
> + op_attr, flow,
> + user_data, error),
> + error);
> +
> + rte_flow_trace_async_destroy(port_id, queue_id, op_attr, flow,
> + user_data, ret);
> +
> + return ret;
> }
>
> int
> @@ -1790,10 +1940,15 @@ rte_flow_push(uint16_t port_id,
> {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> + int ret;
>
> - return flow_err(port_id,
> - ops->push(dev, queue_id, error),
> - error);
> + ret = flow_err(port_id,
> + ops->push(dev, queue_id, error),
> + error);
> +
> + rte_flow_trace_push(port_id, queue_id, ret);
> +
> + return ret;
> }
>
> int
> @@ -1806,9 +1961,14 @@ rte_flow_pull(uint16_t port_id,
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> const struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);
> int ret;
> + int rc;
>
> ret = ops->pull(dev, queue_id, res, n_res, error);
> - return ret ? ret : flow_err(port_id, ret, error);
> + rc = ret ? ret : flow_err(port_id, ret, error);
> +
> + rte_flow_trace_pull(port_id, queue_id, res, n_res, rc);
> +
> + return rc;
> }
>
> struct rte_flow_action_handle *
> @@ -1828,6 +1988,11 @@ rte_flow_async_action_handle_create(uint16_t
> port_id,
> indir_action_conf, action,
> user_data, error);
> if (handle == NULL)
> flow_err(port_id, -rte_errno, error);
> +
> + rte_flow_trace_async_action_handle_create(port_id, queue_id,
> op_attr,
> + indir_action_conf, action,
> + user_data, handle);
> +
> return handle;
> }
>
> @@ -1845,7 +2010,12 @@ rte_flow_async_action_handle_destroy(uint16_t
> port_id,
>
> ret = ops->async_action_handle_destroy(dev, queue_id, op_attr,
> action_handle, user_data, error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_async_action_handle_destroy(port_id, queue_id,
> op_attr,
> + action_handle, user_data,
> ret);
> +
> + return ret;
> }
>
> int
> @@ -1863,7 +2033,13 @@ rte_flow_async_action_handle_update(uint16_t
> port_id,
>
> ret = ops->async_action_handle_update(dev, queue_id, op_attr,
> action_handle, update, user_data,
> error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_async_action_handle_update(port_id, queue_id,
> op_attr,
> + action_handle, update,
> + user_data, ret);
> +
> + return ret;
> }
>
> int
> @@ -1881,5 +2057,11 @@ rte_flow_async_action_handle_query(uint16_t
> port_id,
>
> ret = ops->async_action_handle_query(dev, queue_id, op_attr,
> action_handle, data, user_data,
> error);
> - return flow_err(port_id, ret, error);
> + ret = flow_err(port_id, ret, error);
> +
> + rte_flow_trace_async_action_handle_query(port_id, queue_id,
> op_attr,
> + action_handle, data,
> user_data,
> + ret);
> +
> + return ret;
> }
> diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map
> index c7c6bcd42b..0cb8222ad9 100644
> --- a/lib/ethdev/version.map
> +++ b/lib/ethdev/version.map
> @@ -445,6 +445,43 @@ EXPERIMENTAL {
> __rte_ethdev_trace_udp_tunnel_port_add;
> __rte_ethdev_trace_udp_tunnel_port_delete;
> __rte_ethdev_trace_vlan_filter;
> + __rte_flow_trace_action_handle_create;
> + __rte_flow_trace_action_handle_destroy;
> + __rte_flow_trace_action_handle_query;
> + __rte_flow_trace_action_handle_update;
> + __rte_flow_trace_actions_template_create;
> + __rte_flow_trace_actions_template_destroy;
> + __rte_flow_trace_async_action_handle_create;
> + __rte_flow_trace_async_action_handle_destroy;
> + __rte_flow_trace_async_action_handle_update;
> + __rte_flow_trace_async_create;
> + __rte_flow_trace_async_destroy;
> + __rte_flow_trace_conv;
> + __rte_flow_trace_configure;
> + __rte_flow_trace_copy;
> + __rte_flow_trace_create;
> + __rte_flow_trace_destroy;
> + __rte_flow_trace_dynf_metadata_register;
> + __rte_flow_trace_flex_item_create;
> + __rte_flow_trace_flex_item_release;
> + __rte_flow_trace_flush;
> + __rte_flow_trace_get_aged_flows;
> + __rte_flow_trace_get_restore_info;
> + __rte_flow_trace_info_get;
> + __rte_flow_trace_isolate;
> + __rte_flow_trace_pattern_template_create;
> + __rte_flow_trace_pattern_template_destroy;
> + __rte_flow_trace_pick_transfer_proxy;
> + __rte_flow_trace_push;
> + __rte_flow_trace_pull;
> + __rte_flow_trace_query;
> + __rte_flow_trace_template_table_create;
> + __rte_flow_trace_template_table_destroy;
> + __rte_flow_trace_tunnel_action_decap_release;
> + __rte_flow_trace_tunnel_decap_set;
> + __rte_flow_trace_tunnel_item_release;
> + __rte_flow_trace_tunnel_match;
> + __rte_flow_trace_validate;
> };
>
> INTERNAL {
> --
> 2.25.1
