|WARNING| pw117121-117124 [PATCH] [v2, 4/4] ethdev: add trace points for tm

|WARNING| pw117121-117124 [PATCH] [v2, 4/4] ethdev: add trace points for tm

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 14185 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/117121

_apply patch failure_

Submitter: Ankur Dwivedi <adwivedi@marvell.com>
Date: Thursday, September 29 2022 10:29:36 
Applied on: CommitID:bbbe6c596b284909e4112ac9573b16da2137ffab
Apply patch set 117121-117124 failed:

Checking patch lib/ethdev/ethdev_private.c...
Checking patch lib/ethdev/ethdev_trace_points.c...
Checking patch lib/ethdev/rte_ethdev.c...
Checking patch lib/ethdev/rte_ethdev_trace.h...
Checking patch lib/ethdev/rte_ethdev_trace_fp.h...
Checking patch lib/ethdev/version.map...
error: while searching for:

	# added in 22.11
	rte_flow_async_action_handle_query;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:288
Applied patch lib/ethdev/ethdev_private.c cleanly.
Applied patch lib/ethdev/ethdev_trace_points.c cleanly.
Applied patch lib/ethdev/rte_ethdev.c cleanly.
Applied patch lib/ethdev/rte_ethdev_trace.h cleanly.
Applied patch lib/ethdev/rte_ethdev_trace_fp.h cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -288,6 +288,150 @@ EXPERIMENTAL {
 
 	# added in 22.11
 	rte_flow_async_action_handle_query;
+	__rte_eth_trace_add_first_rx_callback;
+	__rte_eth_trace_add_rx_callback;
+	__rte_eth_trace_add_tx_callback;
+	__rte_eth_trace_allmulticast_disable;
+	__rte_eth_trace_allmulticast_enable;
+	__rte_eth_trace_allmulticast_get;
+	__rte_eth_trace_call_rx_callbacks;
+	__rte_eth_trace_call_tx_callbacks;
+	__rte_ethdev_trace_count_avail;
+	__rte_ethdev_trace_count_total;
+	__rte_ethdev_trace_set_mtu;
+	__rte_ethdev_trace_adjust_nb_rx_tx_desc;
+	__rte_ethdev_trace_callback_register;
+	__rte_ethdev_trace_callback_unregister;
+	__rte_ethdev_trace_default_mac_addr_set;
+	__rte_ethdev_trace_flow_ctrl_get;
+	__rte_ethdev_trace_flow_ctrl_set;
+	__rte_ethdev_trace_fw_version_get;
+	__rte_ethdev_trace_get_dcb_info;
+	__rte_ethdev_trace_get_eeprom;
+	__rte_ethdev_trace_get_eeprom_length;
+	__rte_ethdev_trace_get_mtu;
+	__rte_ethdev_trace_get_name_by_port;
+	__rte_ethdev_trace_get_port_by_name;
+	__rte_ethdev_trace_get_reg_info;
+	__rte_ethdev_trace_get_sec_ctx;
+	__rte_ethdev_trace_get_supported_ptypes;
+	__rte_ethdev_trace_get_vlan_offload;
+	__rte_ethdev_trace_info_get;
+	__rte_ethdev_trace_is_removed;
+	__rte_ethdev_trace_is_valid_port;
+	__rte_ethdev_trace_mac_addr_add;
+	__rte_ethdev_trace_mac_addr_remove;
+	__rte_ethdev_trace_pool_ops_supported;
+	__rte_ethdev_trace_priority_flow_ctrl_set;
+	__rte_ethdev_trace_reset;
+	__rte_ethdev_trace_rss_hash_conf_get;
+	__rte_ethdev_trace_rss_hash_update;
+	__rte_ethdev_trace_rss_reta_query;
+	__rte_ethdev_trace_rss_reta_update;
+	__rte_ethdev_trace_rx_intr_ctl;
+	__rte_ethdev_trace_rx_intr_ctl_q;
+	__rte_ethdev_trace_rx_intr_ctl_q_get_fd;
+	__rte_ethdev_trace_rx_intr_disable;
+	__rte_ethdev_trace_rx_intr_enable;
+	__rte_ethdev_trace_rx_offload_name;
+	__rte_ethdev_trace_rx_queue_start;
+	__rte_ethdev_trace_rx_queue_stop;
+	__rte_ethdev_trace_set_eeprom;
+	__rte_ethdev_trace_set_link_down;
+	__rte_ethdev_trace_set_link_up;
+	__rte_ethdev_trace_set_mc_addr_list;
+	__rte_ethdev_trace_set_ptypes;
+	__rte_ethdev_trace_set_rx_queue_stats_mapping;
+	__rte_ethdev_trace_set_tx_queue_stats_mapping;
+	__rte_ethdev_trace_set_vlan_ether_type;
+	__rte_ethdev_trace_set_vlan_offload;
+	__rte_ethdev_trace_set_vlan_pvid;
+	__rte_ethdev_trace_set_vlan_strip_on_queue;
+	__rte_ethdev_trace_socket_id;
+	__rte_ethdev_trace_tx_offload_name;
+	__rte_ethdev_trace_tx_queue_start;
+	__rte_ethdev_trace_tx_queue_stop;
+	__rte_ethdev_trace_uc_all_hash_table_set;
+	__rte_ethdev_trace_uc_hash_table_set;
+	__rte_ethdev_trace_udp_tunnel_port_add;
+	__rte_ethdev_trace_udp_tunnel_port_delete;
+	__rte_ethdev_trace_vlan_filter;
+	__rte_eth_trace_find_next;
+	__rte_eth_trace_find_next_of;
+	__rte_eth_trace_find_next_owned_by;
+	__rte_eth_trace_find_next_sibling;
+	__rte_eth_trace_iterator_cleanup;
+	__rte_eth_trace_iterator_init;
+	__rte_eth_trace_iterator_next;
+	__rte_eth_trace_led_off;
+	__rte_eth_trace_led_on;
+	__rte_eth_trace_link_get;
+	__rte_eth_trace_link_get_nowait;
+	__rte_eth_trace_macaddr_get;
+	__rte_eth_trace_promiscuous_disable;
+	__rte_eth_trace_promiscuous_enable;
+	__rte_eth_trace_promiscuous_get;
+	__rte_eth_trace_remove_rx_callback;
+	__rte_eth_trace_remove_tx_callback;
+	__rte_eth_trace_rx_burst_mode_get;
+	__rte_eth_trace_rx_queue_info_get;
+	__rte_eth_trace_rx_queue_setup;
+	__rte_eth_trace_set_queue_rate_limit;
+	__rte_eth_trace_speed_bitflag;
+	__rte_eth_trace_stats_get;
+	__rte_eth_trace_stats_reset;
+	__rte_eth_trace_timesync_adjust_time;
+	__rte_eth_trace_timesync_disable;
+	__rte_eth_trace_timesync_enable;
+	__rte_eth_trace_timesync_read_rx_timestamp;
+	__rte_eth_trace_timesync_read_time;
+	__rte_eth_trace_timesync_read_tx_timestamp;
+	__rte_eth_trace_timesync_write_time;
+	__rte_eth_trace_tx_buffer_count_callback;
+	__rte_eth_trace_tx_buffer_drop_callback;
+	__rte_eth_trace_tx_buffer_init;
+	__rte_eth_trace_tx_buffer_set_err_callback;
+	__rte_eth_trace_tx_burst_mode_get;
+	__rte_eth_trace_tx_done_cleanup;
+	__rte_eth_trace_tx_queue_info_get;
+	__rte_eth_trace_xstats_get;
+	__rte_eth_trace_xstats_get_by_id;
+	__rte_eth_trace_xstats_get_id_by_name;
+	__rte_eth_trace_xstats_get_names;
+	__rte_eth_trace_xstats_get_names_by_id;
+	__rte_eth_trace_xstats_reset;
+	__rte_ethdev_trace_owner_delete;
+	__rte_ethdev_trace_owner_get;
+	__rte_ethdev_trace_owner_new;
+	__rte_ethdev_trace_owner_set;
+	__rte_ethdev_trace_owner_unset;
+	__rte_ethdev_trace_get_module_eeprom;
+	__rte_ethdev_trace_get_module_info;
+	__rte_ethdev_trace_hairpin_capability_get;
+	__rte_eth_trace_rx_hairpin_queue_setup;
+	__rte_eth_trace_tx_hairpin_queue_setup;
+	__rte_eth_trace_hairpin_bind;
+	__rte_eth_trace_hairpin_get_peer_ports;
+	__rte_eth_trace_hairpin_unbind;
+	__rte_eth_trace_link_speed_to_str;
+	__rte_eth_trace_link_to_str;
+	__rte_eth_trace_fec_get_capability;
+	__rte_eth_trace_fec_get;
+	__rte_eth_trace_fec_set;
+	__rte_eth_trace_get_monitor_addr;
+	__rte_eth_trace_representor_info_get;
+	__rte_ethdev_trace_capability_name;
+	__rte_ethdev_trace_conf_get;
+	__rte_eth_trace_macaddrs_get;
+	__rte_eth_trace_rx_metadata_negotiate;
+	__rte_ethdev_trace_priority_flow_ctrl_queue_configure;
+	__rte_ethdev_trace_priority_flow_ctrl_queue_info_get;
+	__rte_ethdev_trace_priv_dump;
+	__rte_eth_trace_ip_reassembly_capability_get;
+	__rte_eth_trace_ip_reassembly_conf_get;
+	__rte_eth_trace_ip_reassembly_conf_set;
+	__rte_eth_trace_rx_avail_thresh_query;
+	__rte_eth_trace_rx_avail_thresh_set;
 };
 
 INTERNAL {
Checking patch lib/ethdev/ethdev_trace_points.c...
error: lib/ethdev/ethdev_trace_points.c: does not match index
Checking patch lib/ethdev/rte_ethdev_trace.h...
error: lib/ethdev/rte_ethdev_trace.h: does not match index
Checking patch lib/ethdev/rte_flow.c...
error: while searching for:

	ret = ops->async_action_handle_update(dev, queue_id, op_attr,
					  action_handle, update, user_data, error);
	return flow_err(port_id, ret, error);
}


error: patch failed: lib/ethdev/rte_flow.c:1838
Checking patch lib/ethdev/version.map...
error: while searching for:
	__rte_eth_trace_ip_reassembly_conf_set;
	__rte_eth_trace_rx_avail_thresh_query;
	__rte_eth_trace_rx_avail_thresh_set;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:432
Applying patch lib/ethdev/rte_flow.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Hunk #17 applied cleanly.
Hunk #18 applied cleanly.
Hunk #19 applied cleanly.
Hunk #20 applied cleanly.
Hunk #21 applied cleanly.
Hunk #22 applied cleanly.
Hunk #23 applied cleanly.
Hunk #24 applied cleanly.
Hunk #25 applied cleanly.
Hunk #26 applied cleanly.
Hunk #27 applied cleanly.
Hunk #28 applied cleanly.
Hunk #29 applied cleanly.
Hunk #30 applied cleanly.
Hunk #31 applied cleanly.
Hunk #32 applied cleanly.
Hunk #33 applied cleanly.
Hunk #34 applied cleanly.
Hunk #35 applied cleanly.
Hunk #36 applied cleanly.
Hunk #37 applied cleanly.
Hunk #38 applied cleanly.
Hunk #39 applied cleanly.
Rejected hunk #40.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c	(rejected hunks)
@@ -1838,6 +1889,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);
 }
 
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -432,6 +432,45 @@ EXPERIMENTAL {
 	__rte_eth_trace_ip_reassembly_conf_set;
 	__rte_eth_trace_rx_avail_thresh_query;
 	__rte_eth_trace_rx_avail_thresh_set;
+	__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_dev_dump;
+	__rte_flow_trace_dynf_metadata_register;
+	__rte_flow_trace_error_set;
+	__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 {
Checking patch lib/ethdev/ethdev_trace_points.c...
error: lib/ethdev/ethdev_trace_points.c: does not match index
Checking patch lib/ethdev/rte_ethdev_trace.h...
error: lib/ethdev/rte_ethdev_trace.h: does not match index
Checking patch lib/ethdev/rte_mtr.c...
Checking patch lib/ethdev/version.map...
error: while searching for:
	__rte_flow_trace_tunnel_item_release;
	__rte_flow_trace_tunnel_match;
	__rte_flow_trace_validate;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:471
Applied patch lib/ethdev/rte_mtr.c cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -471,6 +471,25 @@ EXPERIMENTAL {
 	__rte_flow_trace_tunnel_item_release;
 	__rte_flow_trace_tunnel_match;
 	__rte_flow_trace_validate;
+	__rte_mtr_trace_capabilities_get;
+	__rte_mtr_trace_color_in_protocol_get;
+	__rte_mtr_trace_color_in_protocol_priority_get;
+	__rte_mtr_trace_color_in_protocol_set;
+	__rte_mtr_trace_create;
+	__rte_mtr_trace_destroy;
+	__rte_mtr_trace_meter_disable;
+	__rte_mtr_trace_meter_dscp_table_update;
+	__rte_mtr_trace_meter_enable;
+	__rte_mtr_trace_meter_policy_add;
+	__rte_mtr_trace_meter_policy_delete;
+	__rte_mtr_trace_meter_policy_update;
+	__rte_mtr_trace_meter_policy_validate;
+	__rte_mtr_trace_meter_profile_add;
+	__rte_mtr_trace_meter_profile_delete;
+	__rte_mtr_trace_meter_profile_update;
+	__rte_mtr_trace_meter_vlan_table_update;
+	__rte_mtr_trace_stats_read;
+	__rte_mtr_trace_stats_update;
 };
 
 INTERNAL {
Checking patch lib/ethdev/ethdev_trace_points.c...
error: lib/ethdev/ethdev_trace_points.c: does not match index
Checking patch lib/ethdev/rte_ethdev_trace.h...
error: lib/ethdev/rte_ethdev_trace.h: does not match index
Checking patch lib/ethdev/rte_tm.c...
Checking patch lib/ethdev/version.map...
error: while searching for:
	__rte_mtr_trace_meter_vlan_table_update;
	__rte_mtr_trace_stats_read;
	__rte_mtr_trace_stats_update;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:490
Applied patch lib/ethdev/rte_tm.c cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -490,6 +490,36 @@ EXPERIMENTAL {
 	__rte_mtr_trace_meter_vlan_table_update;
 	__rte_mtr_trace_stats_read;
 	__rte_mtr_trace_stats_update;
+	__rte_tm_trace_capabilities_get;
+	__rte_tm_trace_get_number_of_leaf_nodes;
+	__rte_tm_trace_hierarchy_commit;
+	__rte_tm_trace_level_capabilities_get;
+	__rte_tm_trace_mark_ip_dscp;
+	__rte_tm_trace_mark_ip_ecn;
+	__rte_tm_trace_mark_vlan_dei;
+	__rte_tm_trace_node_add;
+	__rte_tm_trace_node_capabilities_get;
+	__rte_tm_trace_node_cman_update;
+	__rte_tm_trace_node_delete;
+	__rte_tm_trace_node_parent_update;
+	__rte_tm_trace_node_resume;
+	__rte_tm_trace_node_shaper_update;
+	__rte_tm_trace_node_shared_shaper_update;
+	__rte_tm_trace_node_shared_wred_context_update;
+	__rte_tm_trace_node_stats_read;
+	__rte_tm_trace_node_stats_update;
+	__rte_tm_trace_node_suspend;
+	__rte_tm_trace_node_type_get;
+	__rte_tm_trace_node_wfq_weight_mode_update;
+	__rte_tm_trace_node_wred_context_update;
+	__rte_tm_trace_shaper_profile_add;
+	__rte_tm_trace_shaper_profile_delete;
+	__rte_tm_trace_shared_shaper_add_update;
+	__rte_tm_trace_shared_shaper_delete;
+	__rte_tm_trace_shared_wred_context_add_update;
+	__rte_tm_trace_shared_wred_context_delete;
+	__rte_tm_trace_wred_profile_add;
+	__rte_tm_trace_wred_profile_delete;
 };
 
 INTERNAL {

https://lab.dpdk.org/results/dashboard/patchsets/23706/

UNH-IOL DPDK Community Lab