Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/101566 _apply patch failure_ Submitter: Andrew Rybchenko Date: Thursday, October 14 2021 08:37:04 Applied on: CommitID:b95af1946ab4fde8489f8a91199d3b5579918997 Apply patch set 101566-101570 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 Applying patch lib/ethdev/ethdev_driver.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. 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 */ Checking patch lib/ethdev/ethdev_driver.h... error: while searching for: 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; /** 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/ethdev_driver.h:46 error: while searching for: struct rte_eth_dev_data { char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */ void **rx_queues; /**< Array of pointers to RX queues. */ void **tx_queues; /**< Array of pointers to TX queues. */ uint16_t nb_rx_queues; /**< Number of RX queues. */ uint16_t nb_tx_queues; /**< Number of TX queues. */ struct rte_eth_dev_sriov sriov; /**< SRIOV data */ error: patch failed: lib/ethdev/ethdev_driver.h:92 error: while searching for: 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; 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; /** Bitmap associating MAC addresses to pools. */ error: patch failed: lib/ethdev/ethdev_driver.h:105 error: while searching for: uint16_t port_id; /**< Device [external] port identifier. */ __extension__ uint8_t /** RX promiscuous mode ON(1) / OFF(0). */ promiscuous : 1, /** RX of scattered packets is ON(1) / OFF(0) */ scattered_rx : 1, /** RX all multicast mode ON(1) / OFF(0). */ all_multicast : 1, /** Device state: STARTED(1) / STOPPED(0). */ dev_started : 1, /** RX LRO is ON(1) / OFF(0) */ lro : 1, /** * Indicates whether the device is configured. error: patch failed: lib/ethdev/ethdev_driver.h:121 Applying patch lib/ethdev/ethdev_driver.h with 4 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -46,7 +46,7 @@ struct rte_eth_dev { 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; - /** 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; @@ -92,10 +92,10 @@ struct rte_eth_dev_owner; struct rte_eth_dev_data { char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */ - void **rx_queues; /**< Array of pointers to RX queues. */ - void **tx_queues; /**< Array of pointers to TX queues. */ - uint16_t nb_rx_queues; /**< Number of RX queues. */ - uint16_t nb_tx_queues; /**< Number of TX queues. */ + void **rx_queues; /**< Array of pointers to Rx queues. */ + void **tx_queues; /**< Array of pointers to Tx queues. */ + uint16_t nb_rx_queues; /**< Number of Rx queues. */ + uint16_t nb_tx_queues; /**< Number of Tx queues. */ struct rte_eth_dev_sriov sriov; /**< SRIOV data */ @@ -105,10 +105,10 @@ struct rte_eth_dev_data { 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. */ + /** Common Rx buffer size handled by all queues. */ uint32_t min_rx_buf_size; - uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */ + 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; /** Bitmap associating MAC addresses to pools. */ @@ -121,15 +121,15 @@ struct rte_eth_dev_data { uint16_t port_id; /**< Device [external] port identifier. */ __extension__ - uint8_t /** 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) */ + /** Rx of scattered packets is ON(1) / OFF(0) */ scattered_rx : 1, - /** RX all multicast mode ON(1) / OFF(0). */ + /** Rx all multicast mode ON(1) / OFF(0). */ all_multicast : 1, /** Device state: STARTED(1) / STOPPED(0). */ dev_started : 1, - /** RX LRO is ON(1) / OFF(0) */ + /** Rx LRO is ON(1) / OFF(0) */ lro : 1, /** * Indicates whether the device is configured. Checking patch lib/ethdev/ethdev_driver.h... error: while searching for: struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; enum rte_eth_dev_state state; /**< Flag indicating the port state */ void *security_ctx; /**< Context for security ops */ uint64_t reserved_64s[4]; /**< Reserved for future fields */ void *reserved_ptrs[4]; /**< Reserved for future fields */ } __rte_cache_aligned; struct rte_eth_dev_sriov; error: patch failed: lib/ethdev/ethdev_driver.h:75 error: while searching for: uint16_t backer_port_id; pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */ uint64_t reserved_64s[4]; /**< Reserved for future fields */ void *reserved_ptrs[4]; /**< Reserved for future fields */ } __rte_cache_aligned; /** error: patch failed: lib/ethdev/ethdev_driver.h:158 Applying patch lib/ethdev/ethdev_driver.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -75,9 +75,6 @@ struct rte_eth_dev { struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; enum rte_eth_dev_state state; /**< Flag indicating the port state */ void *security_ctx; /**< Context for security ops */ - - uint64_t reserved_64s[4]; /**< Reserved for future fields */ - void *reserved_ptrs[4]; /**< Reserved for future fields */ } __rte_cache_aligned; struct rte_eth_dev_sriov; @@ -158,8 +155,6 @@ struct rte_eth_dev_data { uint16_t backer_port_id; pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */ - uint64_t reserved_64s[4]; /**< Reserved for future fields */ - void *reserved_ptrs[4]; /**< Reserved for future fields */ } __rte_cache_aligned; /** 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. */ /** Pointer to PMD transmit prepare function. */ eth_tx_prep_t tx_pkt_prepare; /** Get the number of used Rx descriptors. */ error: patch failed: lib/ethdev/ethdev_driver.h:44 error: while searching for: const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */ struct rte_device *device; /**< Backing device */ struct rte_intr_handle *intr_handle; /**< Device interrupt handle */ /** User application callbacks for NIC interrupts */ struct rte_eth_dev_cb_list link_intr_cbs; /** error: patch failed: lib/ethdev/ethdev_driver.h:61 error: while searching for: * received packets before passing them to the driver for transmission. */ struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; enum rte_eth_dev_state state; /**< Flag indicating the port state */ void *security_ctx; /**< Context for security ops */ } __rte_cache_aligned; error: patch failed: lib/ethdev/ethdev_driver.h:73 error: while searching for: 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; 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; /** Bitmap associating MAC addresses to pools. */ error: patch failed: lib/ethdev/ethdev_driver.h:102 error: while searching for: * @see rte_eth_dev_release_port() */ struct rte_ether_addr *hash_mac_addrs; uint16_t port_id; /**< Device [external] port identifier. */ __extension__ error: patch failed: lib/ethdev/ethdev_driver.h:115 error: while searching for: * 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). */ uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT]; uint32_t dev_flags; /**< Capabilities. */ int numa_node; /**< NUMA node connection. */ /** VLAN filter configuration. */ struct rte_vlan_filter_conf vlan_filter_conf; struct rte_eth_dev_owner owner; /**< The port owner. */ /** * Switch-specific identifier. * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. error: patch failed: lib/ethdev/ethdev_driver.h:133 Applying patch lib/ethdev/ethdev_driver.h with 6 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Rejected hunk #6. diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -44,6 +44,7 @@ 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; /** Get the number of used Rx descriptors. */ @@ -61,6 +62,7 @@ struct rte_eth_dev { const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */ struct rte_device *device; /**< Backing device */ struct rte_intr_handle *intr_handle; /**< Device interrupt handle */ + /** User application callbacks for NIC interrupts */ struct rte_eth_dev_cb_list link_intr_cbs; /** @@ -73,6 +75,7 @@ struct rte_eth_dev { * received packets before passing them to the driver for transmission. */ struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; + enum rte_eth_dev_state state; /**< Flag indicating the port state */ void *security_ctx; /**< Context for security ops */ } __rte_cache_aligned; @@ -102,10 +105,12 @@ struct rte_eth_dev_data { 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; 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; /** Bitmap associating MAC addresses to pools. */ @@ -115,6 +120,7 @@ struct rte_eth_dev_data { * @see rte_eth_dev_release_port() */ struct rte_ether_addr *hash_mac_addrs; + uint16_t port_id; /**< Device [external] port identifier. */ __extension__ @@ -133,15 +139,20 @@ struct rte_eth_dev_data { * 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). */ uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT]; + uint32_t dev_flags; /**< Capabilities. */ int numa_node; /**< NUMA node connection. */ + /** VLAN filter configuration. */ struct rte_vlan_filter_conf vlan_filter_conf; + struct rte_eth_dev_owner owner; /**< The port owner. */ + /** * Switch-specific identifier. * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags. Checking patch lib/ethdev/ethdev_driver.h... error: while searching for: * process, while the actual configuration data for the device is shared. */ 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; /** 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; /** Check the status of a Tx descriptor. */ eth_tx_descriptor_status_t tx_descriptor_status; /** * 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. */ const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */ struct rte_device *device; /**< Backing device */ struct rte_intr_handle *intr_handle; /**< Device interrupt handle */ error: patch failed: lib/ethdev/ethdev_driver.h:42 error: while searching for: struct rte_eth_rxtx_callback *post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; /** * User-supplied functions called from tx_burst to pre-process * received packets before passing them to the driver for transmission. */ struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; error: patch failed: lib/ethdev/ethdev_driver.h:72 error: while searching for: struct rte_eth_dev_data { char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */ void **rx_queues; /**< Array of pointers to Rx queues. */ void **tx_queues; /**< Array of pointers to Tx queues. */ uint16_t nb_rx_queues; /**< Number of Rx queues. */ uint16_t nb_tx_queues; /**< Number of Tx queues. */ struct rte_eth_dev_sriov sriov; /**< SRIOV data */ /** PMD-specific private data. @see rte_eth_dev_release_port(). */ void *dev_private; 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; 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; /** Bitmap associating MAC addresses to pools. */ uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR]; /** * Device Ethernet MAC addresses of hash filtering. error: patch failed: lib/ethdev/ethdev_driver.h:92 error: while searching for: */ struct rte_ether_addr *hash_mac_addrs; uint16_t port_id; /**< Device [external] port identifier. */ __extension__ uint8_t /** Rx promiscuous mode ON(1) / OFF(0). */ promiscuous : 1, /** Rx of scattered packets is ON(1) / OFF(0) */ scattered_rx : 1, /** Rx all multicast mode ON(1) / OFF(0). */ all_multicast : 1, /** Device state: STARTED(1) / STOPPED(0). */ dev_started : 1, /** Rx LRO is ON(1) / OFF(0) */ lro : 1, /** * 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). */ uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT]; uint32_t dev_flags; /**< Capabilities. */ int numa_node; /**< NUMA node connection. */ /** VLAN filter configuration. */ struct rte_vlan_filter_conf vlan_filter_conf; struct rte_eth_dev_owner owner; /**< The port owner. */ /** * Switch-specific identifier. error: patch failed: lib/ethdev/ethdev_driver.h:121 error: while searching for: */ uint16_t backer_port_id; pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */ } __rte_cache_aligned; /** error: patch failed: lib/ethdev/ethdev_driver.h:165 Applying patch lib/ethdev/ethdev_driver.h with 5 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -42,23 +42,23 @@ struct rte_eth_rxtx_callback { * process, while the actual configuration data for the device is shared. */ 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_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. */ + /** Pointer to PMD transmit prepare function */ eth_tx_prep_t tx_pkt_prepare; - /** 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. */ + /** Check the status of a Rx descriptor */ eth_rx_descriptor_status_t rx_descriptor_status; - /** Check the status of a Tx descriptor. */ + /** Check the status of a Tx descriptor */ eth_tx_descriptor_status_t tx_descriptor_status; /** - * 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. */ + void *process_private; /**< Pointer to per-process device data */ const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */ struct rte_device *device; /**< Backing device */ struct rte_intr_handle *intr_handle; /**< Device interrupt handle */ @@ -72,7 +72,7 @@ struct rte_eth_dev { struct rte_eth_rxtx_callback *post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; /** * User-supplied functions called from tx_burst to pre-process - * received packets before passing them to the driver for transmission. + * received packets before passing them to the driver for transmission */ struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT]; @@ -92,28 +92,28 @@ struct rte_eth_dev_owner; struct rte_eth_dev_data { char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */ - void **rx_queues; /**< Array of pointers to Rx queues. */ - void **tx_queues; /**< Array of pointers to Tx queues. */ - uint16_t nb_rx_queues; /**< Number of Rx queues. */ - uint16_t nb_tx_queues; /**< Number of Tx queues. */ + void **rx_queues; /**< Array of pointers to Rx queues */ + void **tx_queues; /**< Array of pointers to Tx queues */ + uint16_t nb_rx_queues; /**< Number of Rx queues */ + uint16_t nb_tx_queues; /**< Number of Tx queues */ struct rte_eth_dev_sriov sriov; /**< SRIOV data */ - /** PMD-specific private data. @see rte_eth_dev_release_port(). */ + /** PMD-specific private data. @see rte_eth_dev_release_port() */ void *dev_private; - 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. */ + 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. */ + /** Common Rx buffer size handled by all queues */ uint32_t min_rx_buf_size; - uint64_t rx_mbuf_alloc_failed; /**< Rx ring mbuf allocation failures. */ + uint64_t rx_mbuf_alloc_failed; /**< Rx ring mbuf allocation failures */ - /** Device Ethernet link address. @see rte_eth_dev_release_port(). */ + /** Device Ethernet link address. @see rte_eth_dev_release_port() */ struct rte_ether_addr *mac_addrs; - /** Bitmap associating MAC addresses to pools. */ + /** Bitmap associating MAC addresses to pools */ uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR]; /** * Device Ethernet MAC addresses of hash filtering. @@ -121,37 +121,37 @@ struct rte_eth_dev_data { */ struct rte_ether_addr *hash_mac_addrs; - uint16_t port_id; /**< Device [external] port identifier. */ + uint16_t port_id; /**< Device [external] port identifier */ __extension__ - uint8_t /** 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 all multicast mode ON(1) / OFF(0). */ + /** Rx all multicast mode ON(1) / OFF(0) */ all_multicast : 1, - /** Device state: STARTED(1) / STOPPED(0). */ + /** Device state: STARTED(1) / STOPPED(0) */ dev_started : 1, /** Rx LRO is ON(1) / OFF(0) */ lro : 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). */ + /** 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]; - uint32_t dev_flags; /**< Capabilities. */ - int numa_node; /**< NUMA node connection. */ + uint32_t dev_flags; /**< Capabilities */ + int numa_node; /**< NUMA node connection */ - /** VLAN filter configuration. */ + /** VLAN filter configuration */ struct rte_vlan_filter_conf vlan_filter_conf; - struct rte_eth_dev_owner owner; /**< The port owner. */ + struct rte_eth_dev_owner owner; /**< The port owner */ /** * Switch-specific identifier. @@ -165,7 +165,7 @@ struct rte_eth_dev_data { */ uint16_t backer_port_id; - pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */ + pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex */ } __rte_cache_aligned; /** https://lab.dpdk.org/results/dashboard/patchsets/19406/ UNH-IOL DPDK Community Lab