Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102430 _apply patch failure_ Submitter: Andrew Rybchenko Date: Wednesday, October 20 2021 12:52:21 Applied on: CommitID:69a3c6319140b34fb714fa5bd6990cceb2ea2997 Apply patch set 102430-102439 failed: Checking patch lib/ethdev/ethdev_driver.h... error: while searching for: struct rte_eth_dev { eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function. */ eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */ eth_tx_prep_t tx_pkt_prepare; /**< Pointer to PMD transmit prepare function. */ eth_rx_queue_count_t rx_queue_count; /**< Get the number of used RX descriptors. */ eth_rx_descriptor_status_t rx_descriptor_status; /**< Check the status of a Rx descriptor. */ eth_tx_descriptor_status_t tx_descriptor_status; /**< Check the status of a Tx descriptor. */ /** * points to device data that is shared between * primary and secondary processes. */ struct rte_eth_dev_data *data; void *process_private; /**< Pointer to per-process device data. */ error: patch failed: lib/ethdev/ethdev_driver.h:44 error: while searching for: struct rte_eth_dev_sriov sriov; /**< SRIOV data */ void *dev_private; /**< PMD-specific private data. * @see rte_eth_dev_release_port() */ struct rte_eth_link dev_link; /**< Link-level information & status. */ struct rte_eth_conf dev_conf; /**< Configuration applied to device. */ uint16_t mtu; /**< Maximum Transmission Unit. */ uint32_t min_rx_buf_size; /**< Common RX buffer size handled by all queues. */ uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */ struct rte_ether_addr *mac_addrs; /**< Device Ethernet link address. * @see rte_eth_dev_release_port() */ uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR]; /**< Bitmap associating MAC addresses to pools. */ struct rte_ether_addr *hash_mac_addrs; /**< Device Ethernet MAC addresses of hash filtering. * @see rte_eth_dev_release_port() */ uint16_t port_id; /**< Device [external] port identifier. */ __extension__ uint8_t promiscuous : 1, /**< RX promiscuous mode ON(1) / OFF(0). */ scattered_rx : 1, /**< RX of scattered packets is ON(1) / OFF(0) */ all_multicast : 1, /**< RX all multicast mode ON(1) / OFF(0). */ dev_started : 1, /**< Device state: STARTED(1) / STOPPED(0). */ lro : 1, /**< RX LRO is ON(1) / OFF(0) */ dev_configured : 1; /**< Indicates whether the device is configured. * CONFIGURED(1) / NOT CONFIGURED(0). */ uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT]; /**< Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */ uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT]; /**< Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */ uint32_t dev_flags; /**< Capabilities. */ int numa_node; /**< NUMA node connection. */ struct rte_vlan_filter_conf vlan_filter_conf; /**< VLAN filter configuration. */ struct rte_eth_dev_owner owner; /**< The port owner. */ uint16_t representor_id; /**< Switch-specific identifier. * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. */ uint16_t backer_port_id; /**< Port ID of the backing device. * This device will be used to query representor * info and calculate representor IDs. * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. */ pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */ uint64_t reserved_64s[4]; /**< Reserved for future fields */ error: patch failed: lib/ethdev/ethdev_driver.h:100 error: while searching for: */ extern struct rte_eth_dev rte_eth_devices[]; /**< @internal Declaration of the hairpin peer queue information structure. */ struct rte_hairpin_peer_info; /* error: patch failed: lib/ethdev/ethdev_driver.h:171 Hunk #4 succeeded at 26 (offset -152 lines). Hunk #5 succeeded at 150 (offset -152 lines). Hunk #6 succeeded at 182 (offset -152 lines). Hunk #7 succeeded at 230 (offset -152 lines). Hunk #8 succeeded at 256 (offset -152 lines). Hunk #9 succeeded at 287 (offset -152 lines). Hunk #10 succeeded at 338 (offset -152 lines). Hunk #11 succeeded at 503 (offset -152 lines). Hunk #12 succeeded at 757 (offset -152 lines). Hunk #13 succeeded at 828 (offset -168 lines). Hunk #14 succeeded at 838 (offset -168 lines). Hunk #15 succeeded at 890 (offset -168 lines). error: while searching for: flow_ctrl_get_t flow_ctrl_get; /**< Get flow control. */ flow_ctrl_set_t flow_ctrl_set; /**< Setup flow control. */ priority_flow_ctrl_set_t priority_flow_ctrl_set; /**< Setup priority flow control. */ eth_uc_hash_table_set_t uc_hash_table_set; /**< Set Unicast Table Array. */ eth_uc_all_hash_table_set_t uc_all_hash_table_set; /**< Set Unicast hash bitmap. */ eth_udp_tunnel_port_add_t udp_tunnel_port_add; /** Add UDP tunnel port. */ eth_udp_tunnel_port_del_t udp_tunnel_port_del; /** Del UDP tunnel port. */ eth_set_queue_rate_limit_t set_queue_rate_limit; /**< Set queue rate limit. */ rss_hash_update_t rss_hash_update; /** Configure RSS hash protocols. */ rss_hash_conf_get_t rss_hash_conf_get; /** Get current RSS hash configuration. */ reta_update_t reta_update; /** Update redirection table. */ reta_query_t reta_query; /** Query redirection table. */ eth_get_reg_t get_reg; /**< Get registers. */ eth_get_eeprom_length_t get_eeprom_length; /**< Get eeprom length. */ eth_get_eeprom_t get_eeprom; /**< Get eeprom data. */ eth_set_eeprom_t set_eeprom; /**< Set eeprom. */ eth_get_module_info_t get_module_info; /** Get plugin module eeprom attribute. */ eth_get_module_eeprom_t get_module_eeprom; /** Get plugin module eeprom data. */ eth_flow_ops_get_t flow_ops_get; /**< Get flow operations. */ eth_get_dcb_info get_dcb_info; /** Get DCB information. */ eth_timesync_enable_t timesync_enable; /** Turn IEEE1588/802.1AS timestamping on. */ eth_timesync_disable_t timesync_disable; /** Turn IEEE1588/802.1AS timestamping off. */ eth_timesync_read_rx_timestamp_t timesync_read_rx_timestamp; /** Read the IEEE1588/802.1AS RX timestamp. */ eth_timesync_read_tx_timestamp_t timesync_read_tx_timestamp; /** Read the IEEE1588/802.1AS TX timestamp. */ eth_timesync_adjust_time timesync_adjust_time; /** Adjust the device clock. */ eth_timesync_read_time timesync_read_time; /** Get the device clock time. */ eth_timesync_write_time timesync_write_time; /** Set the device clock time. */ eth_read_clock read_clock; eth_xstats_get_by_id_t xstats_get_by_id; /**< Get extended device statistic values by ID. */ eth_xstats_get_names_by_id_t xstats_get_names_by_id; /**< Get name of extended device statistics by ID. */ eth_tm_ops_get_t tm_ops_get; /**< Get Traffic Management (TM) operations. */ eth_mtr_ops_get_t mtr_ops_get; /**< Get Traffic Metering and Policing (MTR) operations. */ eth_pool_ops_supported_t pool_ops_supported; /**< Test if a port supports specific mempool ops */ eth_hairpin_cap_get_t hairpin_cap_get; /**< Returns the hairpin capabilities. */ eth_rx_hairpin_queue_setup_t rx_hairpin_queue_setup; /**< Set up device RX hairpin queue. */ eth_tx_hairpin_queue_setup_t tx_hairpin_queue_setup; /**< Set up device TX hairpin queue. */ eth_fec_get_capability_t fec_get_capability; /**< Get Forward Error Correction(FEC) capability. */ eth_fec_get_t fec_get; /**< Get Forward Error Correction(FEC) mode. */ eth_fec_set_t fec_set; /**< Set Forward Error Correction(FEC) mode. */ hairpin_get_peer_ports_t hairpin_get_peer_ports; /**< Get hairpin peer ports list. */ eth_hairpin_bind_t hairpin_bind; /**< Bind all hairpin Tx queues of device to the peer port Rx queues. */ eth_hairpin_unbind_t hairpin_unbind; /**< Unbind all hairpin Tx queues from the peer port Rx queues. */ eth_hairpin_queue_peer_update_t hairpin_queue_peer_update; /**< Pass the current queue info and get the peer queue info. */ eth_hairpin_queue_peer_bind_t hairpin_queue_peer_bind; /**< Set up the connection between the pair of hairpin queues. */ eth_hairpin_queue_peer_unbind_t hairpin_queue_peer_unbind; /**< Disconnect the hairpin queues of a pair from each other. */ eth_get_monitor_addr_t get_monitor_addr; /**< Get power monitoring condition for Rx queue. */ eth_representor_info_get_t representor error: patch failed: lib/ethdev/ethdev_driver.h:1049 Checking patch lib/ethdev/rte_ethdev.h... Hunk #9 succeeded at 1402 (offset 1 line). Hunk #10 succeeded at 1483 (offset 1 line). Hunk #11 succeeded at 1547 (offset 1 line). Hunk #12 succeeded at 1744 (offset 1 line). Hunk #13 succeeded at 3309 (offset -41 lines). Hunk #14 succeeded at 3449 (offset -41 lines). Hunk #15 succeeded at 3466 (offset -41 lines). Hunk #16 succeeded at 3491 (offset -41 lines). Hunk #17 succeeded at 3505 (offset -41 lines). Checking patch lib/ethdev/rte_ethdev_core.h... error: while searching for: struct rte_eth_dev; typedef uint16_t (*eth_rx_burst_t)(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); /**< @internal Retrieve input packets from a receive queue of an Ethernet device. */ typedef uint16_t (*eth_tx_burst_t)(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); /**< @internal Send output packets on a transmit queue of an Ethernet device. */ typedef uint16_t (*eth_tx_prep_t)(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); /**< @internal Prepare output packets on a transmit queue of an Ethernet device. */ typedef uint32_t (*eth_rx_queue_count_t)(void *rxq); /**< @internal Get number of used descriptors on a receive queue. */ typedef int (*eth_rx_descriptor_status_t)(void *rxq, uint16_t offset); /**< @internal Check the status of a Rx descriptor */ typedef int (*eth_tx_descriptor_status_t)(void *txq, uint16_t offset); /**< @internal Check the status of a Tx descriptor */ /** * @internal error: patch failed: lib/ethdev/rte_ethdev_core.h:25 Checking patch lib/ethdev/rte_flow.h... Hunk #1 succeeded at 819 (offset -73 lines). Hunk #2 succeeded at 862 (offset -73 lines). Hunk #3 succeeded at 2466 (offset -131 lines). Hunk #4 succeeded at 2479 (offset -131 lines). Hunk #5 succeeded at 3113 (offset -129 lines). Hunk #6 succeeded at 3211 (offset -144 lines). Hunk #7 succeeded at 3316 (offset -152 lines). Hunk #8 succeeded at 3949 (offset -152 lines). Checking patch lib/ethdev/rte_mtr_driver.h... Applying patch lib/ethdev/ethdev_driver.h with 4 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. 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. Rejected hunk #16. Applied patch lib/ethdev/rte_ethdev.h cleanly. Applying patch lib/ethdev/rte_ethdev_core.h with 1 reject... Rejected hunk #1. Applied patch lib/ethdev/rte_flow.h cleanly. Applied patch lib/ethdev/rte_mtr_driver.h cleanly. diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -44,18 +44,17 @@ struct rte_eth_rxtx_callback { struct rte_eth_dev { eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function. */ eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */ + /** Pointer to PMD transmit prepare function */ eth_tx_prep_t tx_pkt_prepare; - /**< Pointer to PMD transmit prepare function. */ + /** Get the number of used Rx descriptors */ eth_rx_queue_count_t rx_queue_count; - /**< Get the number of used RX descriptors. */ + /** Check the status of a Rx descriptor */ eth_rx_descriptor_status_t rx_descriptor_status; - /**< Check the status of a Rx descriptor. */ + /** Check the status of a Tx descriptor */ eth_tx_descriptor_status_t tx_descriptor_status; - /**< Check the status of a Tx descriptor. */ /** - * points to device data that is shared between - * primary and secondary processes. + * Device data that is shared between primary and secondary processes */ struct rte_eth_dev_data *data; void *process_private; /**< Pointer to per-process device data. */ @@ -100,64 +99,63 @@ struct rte_eth_dev_data { struct rte_eth_dev_sriov sriov; /**< SRIOV data */ + /** PMD-specific private data. @see rte_eth_dev_release_port() */ void *dev_private; - /**< PMD-specific private data. - * @see rte_eth_dev_release_port() - */ struct rte_eth_link dev_link; /**< Link-level information & status. */ struct rte_eth_conf dev_conf; /**< Configuration applied to device. */ uint16_t mtu; /**< Maximum Transmission Unit. */ + /** Common Rx buffer size handled by all queues */ uint32_t min_rx_buf_size; - /**< Common RX buffer size handled by all queues. */ uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */ + /** Device Ethernet link address. @see rte_eth_dev_release_port() */ struct rte_ether_addr *mac_addrs; - /**< Device Ethernet link address. - * @see rte_eth_dev_release_port() - */ + /** Bitmap associating MAC addresses to pools */ uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR]; - /**< Bitmap associating MAC addresses to pools. */ + /** + * Device Ethernet MAC addresses of hash filtering. + * @see rte_eth_dev_release_port() + */ struct rte_ether_addr *hash_mac_addrs; - /**< Device Ethernet MAC addresses of hash filtering. - * @see rte_eth_dev_release_port() - */ uint16_t port_id; /**< Device [external] port identifier. */ __extension__ - uint8_t promiscuous : 1, - /**< RX promiscuous mode ON(1) / OFF(0). */ + uint8_t /** Rx promiscuous mode ON(1) / OFF(0) */ + promiscuous : 1, + /** Rx of scattered packets is ON(1) / OFF(0) */ scattered_rx : 1, - /**< RX of scattered packets is ON(1) / OFF(0) */ + /** Rx all multicast mode ON(1) / OFF(0) */ all_multicast : 1, - /**< RX all multicast mode ON(1) / OFF(0). */ + /** Device state: STARTED(1) / STOPPED(0) */ dev_started : 1, - /**< Device state: STARTED(1) / STOPPED(0). */ + /** Rx LRO is ON(1) / OFF(0) */ lro : 1, - /**< RX LRO is ON(1) / OFF(0) */ - dev_configured : 1; - /**< Indicates whether the device is configured. - * CONFIGURED(1) / NOT CONFIGURED(0). + /** + * Indicates whether the device is configured: + * CONFIGURED(1) / NOT CONFIGURED(0) */ + dev_configured : 1; + /** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */ uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT]; - /**< Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */ + /** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */ uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT]; - /**< Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */ uint32_t dev_flags; /**< Capabilities. */ int numa_node; /**< NUMA node connection. */ + /** VLAN filter configuration */ struct rte_vlan_filter_conf vlan_filter_conf; - /**< VLAN filter configuration. */ struct rte_eth_dev_owner owner; /**< The port owner. */ + /** + * Switch-specific identifier. + * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. + */ uint16_t representor_id; - /**< Switch-specific identifier. - * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. - */ + /** + * Port ID of the backing device. + * This device will be used to query representor info and calculate + * representor IDs. Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. + */ uint16_t backer_port_id; - /**< Port ID of the backing device. - * This device will be used to query representor - * info and calculate representor IDs. - * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. - */ pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */ uint64_t reserved_64s[4]; /**< Reserved for future fields */ @@ -171,7 +169,7 @@ struct rte_eth_dev_data { */ extern struct rte_eth_dev rte_eth_devices[]; -/**< @internal Declaration of the hairpin peer queue information structure. */ +/** @internal Declaration of the hairpin peer queue information structure. */ struct rte_hairpin_peer_info; /* @@ -1049,94 +1072,108 @@ struct eth_dev_ops { flow_ctrl_get_t flow_ctrl_get; /**< Get flow control. */ flow_ctrl_set_t flow_ctrl_set; /**< Setup flow control. */ - priority_flow_ctrl_set_t priority_flow_ctrl_set; /**< Setup priority flow control. */ - - eth_uc_hash_table_set_t uc_hash_table_set; /**< Set Unicast Table Array. */ - eth_uc_all_hash_table_set_t uc_all_hash_table_set; /**< Set Unicast hash bitmap. */ - - eth_udp_tunnel_port_add_t udp_tunnel_port_add; /** Add UDP tunnel port. */ - eth_udp_tunnel_port_del_t udp_tunnel_port_del; /** Del UDP tunnel port. */ - - eth_set_queue_rate_limit_t set_queue_rate_limit; /**< Set queue rate limit. */ - - rss_hash_update_t rss_hash_update; /** Configure RSS hash protocols. */ - rss_hash_conf_get_t rss_hash_conf_get; /** Get current RSS hash configuration. */ - reta_update_t reta_update; /** Update redirection table. */ - reta_query_t reta_query; /** Query redirection table. */ + /** Setup priority flow control */ + priority_flow_ctrl_set_t priority_flow_ctrl_set; + + /** Set Unicast Table Array */ + eth_uc_hash_table_set_t uc_hash_table_set; + /** Set Unicast hash bitmap */ + eth_uc_all_hash_table_set_t uc_all_hash_table_set; + + /** Add UDP tunnel port */ + eth_udp_tunnel_port_add_t udp_tunnel_port_add; + /** Delete UDP tunnel port */ + eth_udp_tunnel_port_del_t udp_tunnel_port_del; + + /** Set queue rate limit */ + eth_set_queue_rate_limit_t set_queue_rate_limit; + + /** Configure RSS hash protocols and hashing key */ + rss_hash_update_t rss_hash_update; + /** Get current RSS hash configuration */ + rss_hash_conf_get_t rss_hash_conf_get; + /** Update redirection table */ + reta_update_t reta_update; + /** Query redirection table */ + reta_query_t reta_query; eth_get_reg_t get_reg; /**< Get registers. */ eth_get_eeprom_length_t get_eeprom_length; /**< Get eeprom length. */ eth_get_eeprom_t get_eeprom; /**< Get eeprom data. */ eth_set_eeprom_t set_eeprom; /**< Set eeprom. */ + /** Get plugin module eeprom attribute */ eth_get_module_info_t get_module_info; - /** Get plugin module eeprom attribute. */ + /** Get plugin module eeprom data */ eth_get_module_eeprom_t get_module_eeprom; - /** Get plugin module eeprom data. */ eth_flow_ops_get_t flow_ops_get; /**< Get flow operations. */ - eth_get_dcb_info get_dcb_info; /** Get DCB information. */ + eth_get_dcb_info get_dcb_info; /**< Get DCB information */ + /** Turn IEEE1588/802.1AS timestamping on */ eth_timesync_enable_t timesync_enable; - /** Turn IEEE1588/802.1AS timestamping on. */ + /** Turn IEEE1588/802.1AS timestamping off */ eth_timesync_disable_t timesync_disable; - /** Turn IEEE1588/802.1AS timestamping off. */ + /** Read the IEEE1588/802.1AS Rx timestamp */ eth_timesync_read_rx_timestamp_t timesync_read_rx_timestamp; - /** Read the IEEE1588/802.1AS RX timestamp. */ + /** Read the IEEE1588/802.1AS Tx timestamp */ eth_timesync_read_tx_timestamp_t timesync_read_tx_timestamp; - /** Read the IEEE1588/802.1AS TX timestamp. */ - eth_timesync_adjust_time timesync_adjust_time; /** Adjust the device clock. */ - eth_timesync_read_time timesync_read_time; /** Get the device clock time. */ - eth_timesync_write_time timesync_write_time; /** Set the device clock time. */ + /** Adjust the device clock */ + eth_timesync_adjust_time timesync_adjust_time; + /** Get the device clock time */ + eth_timesync_read_time timesync_read_time; + /** Set the device clock time */ + eth_timesync_write_time timesync_write_time; eth_read_clock read_clock; + /** Get extended device statistic values by ID */ eth_xstats_get_by_id_t xstats_get_by_id; - /**< Get extended device statistic values by ID. */ + /** Get name of extended device statistics by ID */ eth_xstats_get_names_by_id_t xstats_get_names_by_id; - /**< Get name of extended device statistics by ID. */ + /** Get Traffic Management (TM) operations */ eth_tm_ops_get_t tm_ops_get; - /**< Get Traffic Management (TM) operations. */ + /** Get Traffic Metering and Policing (MTR) operations */ eth_mtr_ops_get_t mtr_ops_get; - /**< Get Traffic Metering and Policing (MTR) operations. */ + /** Test if a port supports specific mempool ops */ eth_pool_ops_supported_t pool_ops_supported; - /**< Test if a port supports specific mempool ops */ + /** Returns the hairpin capabilities */ eth_hairpin_cap_get_t hairpin_cap_get; - /**< Returns the hairpin capabilities. */ + /** Set up device Rx hairpin queue */ eth_rx_hairpin_queue_setup_t rx_hairpin_queue_setup; - /**< Set up device RX hairpin queue. */ + /** Set up device Tx hairpin queue */ eth_tx_hairpin_queue_setup_t tx_hairpin_queue_setup; - /**< Set up device TX hairpin queue. */ + /** Get Forward Error Correction(FEC) capability */ eth_fec_get_capability_t fec_get_capability; - /**< Get Forward Error Correction(FEC) capability. */ + /** Get Forward Error Correction(FEC) mode */ eth_fec_get_t fec_get; - /**< Get Forward Error Correction(FEC) mode. */ + /** Set Forward Error Correction(FEC) mode */ eth_fec_set_t fec_set; - /**< Set Forward Error Correction(FEC) mode. */ + + /** Get hairpin peer ports list */ hairpin_get_peer_ports_t hairpin_get_peer_ports; - /**< Get hairpin peer ports list. */ + /** Bind all hairpin Tx queues of device to the peer port Rx queues */ eth_hairpin_bind_t hairpin_bind; - /**< Bind all hairpin Tx queues of device to the peer port Rx queues. */ + /** Unbind all hairpin Tx queues from the peer port Rx queues */ eth_hairpin_unbind_t hairpin_unbind; - /**< Unbind all hairpin Tx queues from the peer port Rx queues. */ + /** Pass the current queue info and get the peer queue info */ eth_hairpin_queue_peer_update_t hairpin_queue_peer_update; - /**< Pass the current queue info and get the peer queue info. */ + /** Set up the connection between the pair of hairpin queues */ eth_hairpin_queue_peer_bind_t hairpin_queue_peer_bind; - /**< Set up the connection between the pair of hairpin queues. */ + /** Disconnect the hairpin queues of a pair from each other */ eth_hairpin_queue_peer_unbind_t hairpin_queue_peer_unbind; - /**< Disconnect the hairpin queues of a pair from each other. */ + /** Get power monitoring condition for Rx queue */ eth_get_monitor_addr_t get_monitor_addr; - /**< Get power monitoring condition for Rx queue. */ + /** Get representor info */ eth_representor_info_get_t representor_info_get; - /**< Get representor info. */ /** * Negotiate the NIC's ability to deliver specific diff a/lib/ethdev/rte_ethdev_core.h b/lib/ethdev/rte_ethdev_core.h (rejected hunks) @@ -25,30 +25,36 @@ RTE_TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); struct rte_eth_dev; +/** + * @internal Retrieve input packets from a receive queue of an Ethernet device. + */ typedef uint16_t (*eth_rx_burst_t)(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); -/**< @internal Retrieve input packets from a receive queue of an Ethernet device. */ +/** + * @internal Send output packets on a transmit queue of an Ethernet device. + */ typedef uint16_t (*eth_tx_burst_t)(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); -/**< @internal Send output packets on a transmit queue of an Ethernet device. */ +/** + * @internal Prepare output packets on a transmit queue of an Ethernet device. + */ typedef uint16_t (*eth_tx_prep_t)(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); -/**< @internal Prepare output packets on a transmit queue of an Ethernet device. */ +/** @internal Get number of used descriptors on a receive queue. */ typedef uint32_t (*eth_rx_queue_count_t)(void *rxq); -/**< @internal Get number of used descriptors on a receive queue. */ +/** @internal Check the status of a Rx descriptor */ typedef int (*eth_rx_descriptor_status_t)(void *rxq, uint16_t offset); -/**< @internal Check the status of a Rx descriptor */ +/** @internal Check the status of a Tx descriptor */ typedef int (*eth_tx_descriptor_status_t)(void *txq, uint16_t offset); -/**< @internal Check the status of a Tx descriptor */ /** * @internal Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/ethdev_profile.c... Checking patch lib/ethdev/rte_eth_ctrl.h... Checking patch lib/ethdev/rte_ethdev.c... Hunk #1 succeeded at 47 (offset -3 lines). Hunk #2 succeeded at 1418 (offset -22 lines). Hunk #3 succeeded at 1426 (offset -22 lines). Hunk #4 succeeded at 1567 (offset -4 lines). Hunk #5 succeeded at 2025 (offset -10 lines). Hunk #6 succeeded at 2203 (offset -17 lines). Hunk #7 succeeded at 2275 (offset -17 lines). Hunk #8 succeeded at 2369 (offset -17 lines). Hunk #9 succeeded at 4691 (offset -80 lines). Hunk #10 succeeded at 4706 (offset -80 lines). Hunk #11 succeeded at 4727 (offset -80 lines). Hunk #12 succeeded at 4913 (offset -80 lines). Hunk #13 succeeded at 4932 (offset -80 lines). Hunk #14 succeeded at 5300 (offset 10 lines). Hunk #15 succeeded at 5327 (offset -8 lines). Hunk #16 succeeded at 5210 (offset -170 lines). Hunk #17 succeeded at 5255 (offset -152 lines). Checking patch lib/ethdev/rte_ethdev.h... error: lib/ethdev/rte_ethdev.h: does not match index Checking patch lib/ethdev/rte_ethdev_core.h... error: while searching for: */ /** PMD receive function. */ eth_rx_burst_t rx_pkt_burst; /** Get the number of used RX descriptors. */ eth_rx_queue_count_t rx_queue_count; /** Check the status of a Rx descriptor. */ eth_rx_descriptor_status_t rx_descriptor_status; error: patch failed: lib/ethdev/rte_ethdev_core.h:86 Checking patch lib/ethdev/rte_tm.h... Applied patch lib/ethdev/ethdev_profile.c cleanly. Applied patch lib/ethdev/rte_eth_ctrl.h cleanly. Applied patch lib/ethdev/rte_ethdev.c cleanly. Applying patch lib/ethdev/rte_ethdev_core.h with 1 reject... Rejected hunk #1. Applied patch lib/ethdev/rte_tm.h cleanly. diff a/lib/ethdev/rte_ethdev_core.h b/lib/ethdev/rte_ethdev_core.h (rejected hunks) @@ -86,7 +86,7 @@ struct rte_eth_fp_ops { */ /** PMD receive function. */ eth_rx_burst_t rx_pkt_burst; - /** Get the number of used RX descriptors. */ + /** Get the number of used Rx descriptors. */ eth_rx_queue_count_t rx_queue_count; /** Check the status of a Rx descriptor. */ eth_rx_descriptor_status_t rx_descriptor_status; Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/ethdev_pci.h... Checking patch lib/ethdev/ethdev_profile.c... error: lib/ethdev/ethdev_profile.c: does not match index Checking patch lib/ethdev/ethdev_vdev.h... Checking patch lib/ethdev/rte_ethdev.h... error: lib/ethdev/rte_ethdev.h: does not match index Applied patch lib/ethdev/ethdev_pci.h cleanly. Applied patch lib/ethdev/ethdev_vdev.h cleanly. Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/rte_ethdev.h... error: lib/ethdev/rte_ethdev.h: does not match index Checking patch lib/ethdev/rte_ethdev.c... error: lib/ethdev/rte_ethdev.c: does not match index Checking patch lib/ethdev/rte_ethdev.h... error: lib/ethdev/rte_ethdev.h: does not match index Checking patch lib/ethdev/rte_flow.h... error: lib/ethdev/rte_flow.h: does not match index Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/ethdev_private.h... Checking patch lib/ethdev/rte_class_eth.c... Checking patch lib/ethdev/rte_ethdev.c... error: lib/ethdev/rte_ethdev.c: does not match index Checking patch lib/ethdev/rte_ethdev.h... error: lib/ethdev/rte_ethdev.h: does not match index Checking patch lib/ethdev/rte_flow.h... error: lib/ethdev/rte_flow.h: does not match index Applied patch lib/ethdev/ethdev_private.h cleanly. Applied patch lib/ethdev/rte_class_eth.c cleanly. Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/rte_dev_info.h... Applied patch lib/ethdev/rte_dev_info.h cleanly. Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index Checking patch lib/ethdev/ethdev_driver.h... error: lib/ethdev/ethdev_driver.h: does not match index https://lab.dpdk.org/results/dashboard/patchsets/19584/ UNH-IOL DPDK Community Lab