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 | 367 +++++++++++++++++++++++++++++++
lib/ethdev/rte_ethdev_trace_fp.h | 109 +++++++++
lib/ethdev/rte_flow.c | 57 +++++
lib/ethdev/version.map | 37 ++++
5 files changed, 687 insertions(+)
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_release,
+ 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_create,
+ lib.ethdev.flow.async_action_handle_create)
+
+RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_destroy,
+ lib.ethdev.flow.async_action_handle_destroy)
+
+RTE_TRACE_POINT_REGISTER(rte_flow_trace_async_action_handle_update,
+ 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 72d6cdff15..c1a0f0e226 100644
--- a/lib/ethdev/rte_ethdev_trace.h
+++ b/lib/ethdev/rte_ethdev_trace.h
@@ -896,6 +896,373 @@ 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(
+ 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,
+ 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),
+ 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(
+ 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),
+ 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(
+ 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),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(actions);
+ rte_trace_point_emit_u32(num_of_actions);
+)
+
+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),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(items);
+ rte_trace_point_emit_u32(num_of_items);
+)
+
+RTE_TRACE_POINT(
+ 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(
+ 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),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(port_info);
+ rte_trace_point_emit_ptr(queue_info);
+)
+
+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,
+ struct rte_flow_pattern_template *template),
+ 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(template);
+)
+
+RTE_TRACE_POINT(
+ rte_flow_trace_pattern_template_destroy,
+ RTE_TRACE_POINT_ARGS(uint16_t port_id,
+ struct rte_flow_pattern_template *pattern_template),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(pattern_template);
+)
+
+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,
+ struct rte_flow_actions_template *template),
+ 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(template);
+)
+
+RTE_TRACE_POINT(
+ rte_flow_trace_actions_template_destroy,
+ RTE_TRACE_POINT_ARGS(uint16_t port_id,
+ struct rte_flow_actions_template *actions_template),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(actions_template);
+)
+
+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),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(template_table);
+)
+
+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),
+ 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(
+ rte_flow_trace_push,
+ RTE_TRACE_POINT_ARGS(uint16_t port_id, uint32_t queue_id),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_u32(queue_id);
+)
+
+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 3389893665..73a8e2712b 100644
--- a/lib/ethdev/rte_ethdev_trace_fp.h
+++ b/lib/ethdev/rte_ethdev_trace_fp.h
@@ -639,6 +639,115 @@ 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),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(m);
+ rte_trace_point_emit_ptr(info);
+)
+
+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),
+ rte_trace_point_emit_u16(port_id);
+ rte_trace_point_emit_ptr(proxy_port_id);
+)
+
+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),
+ 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);
+)
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
index 7d0c24366c..37ae3ff410 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,7 @@ 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,6 +365,7 @@ rte_flow_validate(uint16_t port_id,
fts_enter(dev);
ret = ops->validate(dev, attr, pattern, actions, error);
fts_exit(dev);
+ rte_flow_trace_validate(port_id, attr, pattern, actions, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOSYS,
@@ -389,6 +393,7 @@ 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,6 +417,7 @@ rte_flow_destroy(uint16_t port_id,
fts_enter(dev);
ret = ops->destroy(dev, flow, error);
fts_exit(dev);
+ rte_flow_trace_destroy(port_id, flow, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOSYS,
@@ -434,6 +440,7 @@ rte_flow_flush(uint16_t port_id,
fts_enter(dev);
ret = ops->flush(dev, error);
fts_exit(dev);
+ rte_flow_trace_flush(port_id, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOSYS,
@@ -459,6 +466,7 @@ rte_flow_query(uint16_t port_id,
fts_enter(dev);
ret = ops->query(dev, flow, action, data, error);
fts_exit(dev);
+ rte_flow_trace_query(port_id, flow, action, data, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOSYS,
@@ -482,6 +490,7 @@ rte_flow_isolate(uint16_t port_id,
fts_enter(dev);
ret = ops->isolate(dev, set, error);
fts_exit(dev);
+ rte_flow_trace_isolate(port_id, set, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOSYS,
@@ -1003,6 +1012,7 @@ 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 +1097,7 @@ 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,6 +1136,7 @@ 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);
+ rte_flow_trace_get_aged_flows(port_id, contexts, nb_contexts,
ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOTSUP,
@@ -1147,6 +1159,8 @@ 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);
+ rte_flow_trace_get_q_aged_flows(port_id, queue_id, contexts,
+ nb_contexts, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOTSUP,
@@ -1175,6 +1189,7 @@ 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,6 +1209,7 @@ 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);
+ rte_flow_trace_action_handle_destroy(port_id, handle, ret);
return flow_err(port_id, ret, error);
}
@@ -1214,6 +1230,7 @@ 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);
+ rte_flow_trace_action_handle_update(port_id, handle, update, ret);
return flow_err(port_id, ret, error);
}
@@ -1234,6 +1251,7 @@ 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);
+ rte_flow_trace_action_handle_query(port_id, handle, data, ret);
return flow_err(port_id, ret, error);
}
@@ -1249,6 +1267,7 @@ rte_flow_tunnel_decap_set(uint16_t port_id,
if (unlikely(!ops))
return -rte_errno;
+ rte_flow_trace_tunnel_decap_set(port_id, tunnel, actions,
num_of_actions);
if (likely(!!ops->tunnel_decap_set)) {
return flow_err(port_id,
ops->tunnel_decap_set(dev, tunnel, actions,
@@ -1272,6 +1291,7 @@ rte_flow_tunnel_match(uint16_t port_id,
if (unlikely(!ops))
return -rte_errno;
+ rte_flow_trace_tunnel_match(port_id, tunnel, items, num_of_items);
if (likely(!!ops->tunnel_match)) {
return flow_err(port_id,
ops->tunnel_match(dev, tunnel, items,
@@ -1294,6 +1314,7 @@ rte_flow_get_restore_info(uint16_t port_id,
if (unlikely(!ops))
return -rte_errno;
+ rte_flow_trace_get_restore_info(port_id, m, restore_info);
if (likely(!!ops->get_restore_info)) {
return flow_err(port_id,
ops->get_restore_info(dev, m, restore_info,
@@ -1316,6 +1337,7 @@ rte_flow_tunnel_action_decap_release(uint16_t port_id,
if (unlikely(!ops))
return -rte_errno;
+ rte_flow_trace_tunnel_action_decap_release(port_id, actions,
num_of_actions);
if (likely(!!ops->tunnel_action_decap_release)) {
return flow_err(port_id,
ops->tunnel_action_decap_release(dev, actions,
@@ -1339,6 +1361,7 @@ rte_flow_tunnel_item_release(uint16_t port_id,
if (unlikely(!ops))
return -rte_errno;
+ rte_flow_trace_tunnel_item_release(port_id, items, num_of_items);
if (likely(!!ops->tunnel_item_release)) {
return flow_err(port_id,
ops->tunnel_item_release(dev, items,
@@ -1367,6 +1390,7 @@ rte_flow_pick_transfer_proxy(uint16_t port_id, uint16_t
*proxy_port_id,
dev = &rte_eth_devices[port_id];
+ rte_flow_trace_pick_transfer_proxy(port_id, proxy_port_id);
return flow_err(port_id,
ops->pick_transfer_proxy(dev, proxy_port_id, error),
error);
@@ -1392,6 +1416,7 @@ 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,6 +1434,7 @@ 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);
+ rte_flow_trace_flex_item_release(port_id, handle, ret);
return flow_err(port_id, ret, error);
}
@@ -1433,6 +1459,7 @@ rte_flow_info_get(uint16_t port_id,
RTE_FLOW_LOG(ERR, "Port %"PRIu16" info is NULL.\n", port_id);
return -EINVAL;
}
+ rte_flow_trace_info_get(port_id, port_info, queue_info);
if (likely(!!ops->info_get)) {
return flow_err(port_id,
ops->info_get(dev, port_info, queue_info,
error),
@@ -1480,6 +1507,7 @@ 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;
+ rte_flow_trace_configure(port_id, port_attr, nb_queue,
queue_attr, ret);
return flow_err(port_id, ret, error);
}
return rte_flow_error_set(error, ENOTSUP,
@@ -1531,6 +1559,8 @@ 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,
@@ -1551,6 +1581,7 @@ rte_flow_pattern_template_destroy(uint16_t port_id,
return -rte_errno;
if (unlikely(pattern_template == NULL))
return 0;
+ rte_flow_trace_pattern_template_destroy(port_id, pattern_template);
if (likely(!!ops->pattern_template_destroy)) {
return flow_err(port_id,
ops->pattern_template_destroy(dev,
@@ -1617,6 +1648,8 @@ 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,
@@ -1637,6 +1670,7 @@ rte_flow_actions_template_destroy(uint16_t port_id,
return -rte_errno;
if (unlikely(actions_template == NULL))
return 0;
+ rte_flow_trace_actions_template_destroy(port_id, actions_template);
if (likely(!!ops->actions_template_destroy)) {
return flow_err(port_id,
ops->actions_template_destroy(dev,
@@ -1707,6 +1741,11 @@ 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,
@@ -1727,6 +1766,7 @@ rte_flow_template_table_destroy(uint16_t port_id,
return -rte_errno;
if (unlikely(template_table == NULL))
return 0;
+ rte_flow_trace_template_table_destroy(port_id, template_table);
if (likely(!!ops->template_table_destroy)) {
return flow_err(port_id,
ops->template_table_destroy(dev,
@@ -1762,6 +1802,9 @@ 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;
}
@@ -1776,6 +1819,8 @@ 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);
+ rte_flow_trace_async_destroy(port_id, queue_id, op_attr, flow,
+ user_data);
return flow_err(port_id,
ops->async_destroy(dev, queue_id,
op_attr, flow,
@@ -1791,6 +1836,7 @@ 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);
+ rte_flow_trace_push(port_id, queue_id);
return flow_err(port_id,
ops->push(dev, queue_id, error),
error);
@@ -1808,6 +1854,7 @@ rte_flow_pull(uint16_t port_id,
int ret;
ret = ops->pull(dev, queue_id, res, n_res, error);
+ rte_flow_trace_pull(port_id, queue_id, res, n_res, ret);
return ret ? ret : flow_err(port_id, ret, error);
}
@@ -1828,6 +1875,9 @@ 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,6 +1895,8 @@ 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);
+ rte_flow_trace_async_action_handle_destroy(port_id, queue_id, op_attr,
+ action_handle, user_data,
ret);
return flow_err(port_id, ret, error);
}
@@ -1863,6 +1915,9 @@ 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);
+ rte_flow_trace_async_action_handle_update(port_id, queue_id, op_attr,
+ action_handle, update,
+ user_data, ret);
return flow_err(port_id, ret, error);
}
@@ -1881,5 +1936,7 @@ 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);
+ rte_flow_trace_async_action_handle_query(port_id, queue_id, op_attr,
+ action_handle, data,
user_data);
return flow_err(port_id, ret, error);
}
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
