Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/101825 _apply patch failure_ Submitter: Pavan Nikhilesh Bhagavatula Date: Friday, October 15 2021 19:02:21 Applied on: CommitID:b95af1946ab4fde8489f8a91199d3b5579918997 Apply patch set 101825-101838 failed: Checking patch drivers/event/cnxk/cn10k_eventdev.c... Hunk #3 succeeded at 863 (offset 75 lines). Checking patch drivers/event/cnxk/cn9k_eventdev.c... Checking patch drivers/event/dlb2/dlb2.c... Checking patch drivers/event/dpaa/dpaa_eventdev.c... Checking patch drivers/event/dpaa2/dpaa2_eventdev.c... Checking patch drivers/event/dsw/dsw_evdev.c... Checking patch drivers/event/octeontx/ssovf_evdev.c... Checking patch drivers/event/octeontx/ssovf_worker.c... Checking patch drivers/event/octeontx2/otx2_evdev.c... Checking patch drivers/event/opdl/opdl_evdev.c... Checking patch drivers/event/skeleton/skeleton_eventdev.c... Checking patch drivers/event/sw/sw_evdev.c... Checking patch lib/eventdev/eventdev_pmd.h... Hunk #4 succeeded at 1176 (offset 1 line). Hunk #5 succeeded at 1188 (offset 1 line). Checking patch lib/eventdev/eventdev_pmd_pci.h... Checking patch lib/eventdev/eventdev_pmd_vdev.h... Checking patch lib/eventdev/meson.build... Checking patch lib/eventdev/rte_event_crypto_adapter.h... Checking patch lib/eventdev/rte_eventdev.h... Checking patch lib/eventdev/version.map... error: while searching for: # changed in 20.11 __rte_eventdev_trace_port_setup; # added in 20.11 rte_event_pmd_pci_probe_named; # added in 21.11 rte_event_eth_rx_adapter_create_with_params; error: patch failed: lib/eventdev/version.map:136 Applied patch drivers/event/cnxk/cn10k_eventdev.c cleanly. Applied patch drivers/event/cnxk/cn9k_eventdev.c cleanly. Applied patch drivers/event/dlb2/dlb2.c cleanly. Applied patch drivers/event/dpaa/dpaa_eventdev.c cleanly. Applied patch drivers/event/dpaa2/dpaa2_eventdev.c cleanly. Applied patch drivers/event/dsw/dsw_evdev.c cleanly. Applied patch drivers/event/octeontx/ssovf_evdev.c cleanly. Applied patch drivers/event/octeontx/ssovf_worker.c cleanly. Applied patch drivers/event/octeontx2/otx2_evdev.c cleanly. Applied patch drivers/event/opdl/opdl_evdev.c cleanly. Applied patch drivers/event/skeleton/skeleton_eventdev.c cleanly. Applied patch drivers/event/sw/sw_evdev.c cleanly. Applied patch lib/eventdev/eventdev_pmd.h cleanly. Applied patch lib/eventdev/eventdev_pmd_pci.h cleanly. Applied patch lib/eventdev/eventdev_pmd_vdev.h cleanly. Applied patch lib/eventdev/meson.build cleanly. Applied patch lib/eventdev/rte_event_crypto_adapter.h cleanly. Applied patch lib/eventdev/rte_eventdev.h cleanly. Applying patch lib/eventdev/version.map with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. diff a/lib/eventdev/version.map b/lib/eventdev/version.map (rejected hunks) @@ -136,8 +130,6 @@ EXPERIMENTAL { # changed in 20.11 __rte_eventdev_trace_port_setup; - # added in 20.11 - rte_event_pmd_pci_probe_named; # added in 21.11 rte_event_eth_rx_adapter_create_with_params; Checking patch lib/eventdev/eventdev_pmd.h... error: lib/eventdev/eventdev_pmd.h: does not match index Checking patch lib/eventdev/meson.build... error: lib/eventdev/meson.build: does not match index Checking patch lib/eventdev/rte_eventdev.h... error: lib/eventdev/rte_eventdev.h: does not match index Checking patch lib/eventdev/rte_eventdev_core.h... Applied patch lib/eventdev/rte_eventdev_core.h cleanly. Checking patch config/rte_config.h... Checking patch lib/eventdev/rte_eventdev.c... Checking patch lib/eventdev/rte_eventdev_core.h... error: lib/eventdev/rte_eventdev_core.h: does not exist in index Applied patch config/rte_config.h cleanly. Applied patch lib/eventdev/rte_eventdev.c cleanly. Checking patch lib/eventdev/eventdev_pmd.h... error: lib/eventdev/eventdev_pmd.h: does not match index Checking patch lib/eventdev/eventdev_pmd_pci.h... error: lib/eventdev/eventdev_pmd_pci.h: does not match index Checking patch lib/eventdev/eventdev_private.c... Checking patch lib/eventdev/meson.build... error: lib/eventdev/meson.build: does not match index Checking patch lib/eventdev/rte_eventdev.c... error: lib/eventdev/rte_eventdev.c: does not match index Checking patch lib/eventdev/rte_eventdev_core.h... error: lib/eventdev/rte_eventdev_core.h: does not exist in index Checking patch lib/eventdev/version.map... error: lib/eventdev/version.map: does not match index Applied patch lib/eventdev/eventdev_private.c cleanly. Checking patch drivers/event/dpaa/dpaa_eventdev.c... error: drivers/event/dpaa/dpaa_eventdev.c: does not match index Checking patch drivers/event/dpaa2/dpaa2_eventdev.c... error: drivers/event/dpaa2/dpaa2_eventdev.c: does not match index Checking patch drivers/event/dsw/dsw_evdev.c... error: drivers/event/dsw/dsw_evdev.c: does not match index Checking patch drivers/event/octeontx/ssovf_evdev.c... error: drivers/event/octeontx/ssovf_evdev.c: does not match index Checking patch drivers/event/opdl/opdl_evdev.c... error: drivers/event/opdl/opdl_evdev.c: does not match index Checking patch drivers/event/skeleton/skeleton_eventdev.c... error: drivers/event/skeleton/skeleton_eventdev.c: does not match index Checking patch drivers/event/sw/sw_evdev.c... error: drivers/event/sw/sw_evdev.c: does not match index Checking patch lib/eventdev/rte_event_crypto_adapter.h... error: lib/eventdev/rte_event_crypto_adapter.h: does not match index Checking patch lib/eventdev/rte_event_eth_tx_adapter.h... Checking patch lib/eventdev/rte_eventdev.h... error: lib/eventdev/rte_eventdev.h: does not match index Applied patch lib/eventdev/rte_event_eth_tx_adapter.h cleanly. Checking patch drivers/event/dlb2/dlb2_inline_fns.h... Checking patch drivers/event/dsw/dsw_evdev.h... Checking patch drivers/event/octeontx/timvf_worker.h... Checking patch drivers/net/octeontx/octeontx_ethdev.c... Checking patch lib/eventdev/eventdev_pmd.h... error: lib/eventdev/eventdev_pmd.h: does not match index Checking patch lib/eventdev/rte_eventdev.c... error: lib/eventdev/rte_eventdev.c: does not match index Checking patch lib/eventdev/rte_eventdev_core.h... error: lib/eventdev/rte_eventdev_core.h: does not exist in index Checking patch lib/eventdev/version.map... error: lib/eventdev/version.map: does not match index Applied patch drivers/event/dlb2/dlb2_inline_fns.h cleanly. Applied patch drivers/event/dsw/dsw_evdev.h cleanly. Applied patch drivers/event/octeontx/timvf_worker.h cleanly. Applied patch drivers/net/octeontx/octeontx_ethdev.c cleanly. Checking patch drivers/event/cnxk/cnxk_tim_evdev.c... Checking patch drivers/event/cnxk/cnxk_tim_evdev.h... Hunk #1 succeeded at 267 (offset -1 lines). Checking patch drivers/event/dsw/dsw_evdev.c... error: drivers/event/dsw/dsw_evdev.c: does not match index Checking patch drivers/event/octeontx/ssovf_evdev.c... error: drivers/event/octeontx/ssovf_evdev.c: does not match index Checking patch drivers/event/octeontx/timvf_evdev.c... Checking patch drivers/event/octeontx/timvf_evdev.h... Checking patch drivers/event/octeontx2/otx2_tim_evdev.c... Checking patch drivers/event/octeontx2/otx2_tim_evdev.h... Checking patch drivers/event/sw/sw_evdev.c... error: drivers/event/sw/sw_evdev.c: does not match index Checking patch lib/eventdev/rte_event_timer_adapter_pmd.h => lib/eventdev/event_timer_adapter_pmd.h... Checking patch lib/eventdev/eventdev_pmd.h... error: lib/eventdev/eventdev_pmd.h: does not match index Checking patch lib/eventdev/meson.build... error: lib/eventdev/meson.build: does not match index Checking patch lib/eventdev/rte_event_timer_adapter.c... Checking patch lib/eventdev/rte_event_timer_adapter.h... Checking patch lib/eventdev/rte_eventdev.c... error: lib/eventdev/rte_eventdev.c: does not match index Applied patch drivers/event/cnxk/cnxk_tim_evdev.c cleanly. Applied patch drivers/event/cnxk/cnxk_tim_evdev.h cleanly. Applied patch drivers/event/octeontx/timvf_evdev.c cleanly. Applied patch drivers/event/octeontx/timvf_evdev.h cleanly. Applied patch drivers/event/octeontx2/otx2_tim_evdev.c cleanly. Applied patch drivers/event/octeontx2/otx2_tim_evdev.h cleanly. Applied patch lib/eventdev/rte_event_timer_adapter_pmd.h => lib/eventdev/event_timer_adapter_pmd.h cleanly. Applied patch lib/eventdev/rte_event_timer_adapter.c cleanly. Applied patch lib/eventdev/rte_event_timer_adapter.h cleanly. Checking patch lib/eventdev/rte_event_crypto_adapter.c... Checking patch lib/eventdev/rte_event_eth_rx_adapter.c... Hunk #1 succeeded at 78 (offset -4 lines). error: while searching for: uint16_t last_mask; }; struct rte_event_eth_rx_adapter { /* RSS key */ uint8_t rss_key_be[RSS_KEY_SIZE]; /* Event device identifier */ error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:98 Hunk #3 succeeded at 109 (offset -15 lines). error: while searching for: uint32_t flow_id_mask; /* Set to ~0 if app provides flow id else 0 */ uint64_t event; struct eth_rx_vector_data vector_data; struct rte_eth_event_enqueue_buffer *event_buf; }; static struct rte_event_eth_rx_adapter **event_eth_rx_adapter; /* Enable dynamic timestamp field in mbuf */ static uint64_t event_eth_rx_timestamp_dynflag; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:244 error: while searching for: return id < RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; } static inline struct rte_eth_event_enqueue_buffer * rxa_event_buf_get(struct rte_event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, uint16_t rx_queue_id) { if (rx_adapter->use_queue_event_buf) { struct eth_device_info *dev_info = error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:266 Hunk #6 succeeded at 247 (offset -39 lines). Hunk #7 succeeded at 265 (offset -39 lines). Hunk #8 succeeded at 372 (offset -39 lines). Hunk #9 succeeded at 390 (offset -39 lines). Hunk #10 succeeded at 420 (offset -39 lines). Hunk #11 succeeded at 443 (offset -39 lines). Hunk #12 succeeded at 473 (offset -39 lines). Hunk #13 succeeded at 488 (offset -39 lines). Hunk #14 succeeded at 503 (offset -39 lines). Hunk #15 succeeded at 519 (offset -39 lines). Hunk #16 succeeded at 532 (offset -39 lines). Hunk #17 succeeded at 559 (offset -39 lines). Hunk #18 succeeded at 687 (offset -39 lines). Hunk #19 succeeded at 706 (offset -39 lines). error: while searching for: /* Enqueue buffered events to event device */ static inline uint16_t rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter, struct rte_eth_event_enqueue_buffer *buf) { struct rte_event_eth_rx_adapter_stats *stats = &rx_adapter->stats; uint16_t count = buf->last ? buf->last - buf->head : buf->count; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:783 Hunk #21 succeeded at 756 (offset -54 lines). Hunk #22 succeeded at 767 (offset -54 lines). error: while searching for: } static inline void rxa_buffer_mbufs(struct rte_event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, uint16_t rx_queue_id, struct rte_mbuf **mbufs, uint16_t num, struct rte_eth_event_enqueue_buffer *buf) { uint32_t i; struct eth_device_info *dev_info = error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:899 error: while searching for: } static inline bool rxa_pkt_buf_available(struct rte_eth_event_enqueue_buffer *buf) { uint32_t nb_req = buf->tail + BATCH_SIZE; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:983 error: while searching for: /* Enqueue packets from to event buffer */ static inline uint32_t rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter, uint16_t port_id, uint16_t queue_id, uint32_t rx_count, uint32_t max_rx, int *rxq_empty, struct rte_eth_event_enqueue_buffer *buf) { struct rte_mbuf *mbufs[BATCH_SIZE]; struct rte_event_eth_rx_adapter_stats *stats = error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:1004 Hunk #26 succeeded at 935 (offset -87 lines). Hunk #27 succeeded at 975 (offset -87 lines). Hunk #28 succeeded at 991 (offset -87 lines). Hunk #29 succeeded at 1026 (offset -87 lines). Hunk #30 succeeded at 1049 (offset -87 lines). error: while searching for: * it. */ static inline uint32_t rxa_poll(struct rte_event_eth_rx_adapter *rx_adapter) { uint32_t num_queue; uint32_t nb_rx = 0; struct rte_eth_event_enqueue_buffer *buf = NULL; uint32_t wrr_pos; uint32_t max_nb_rx; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:1282 error: while searching for: static void rxa_vector_expire(struct eth_rx_vector_data *vec, void *arg) { struct rte_event_eth_rx_adapter *rx_adapter = arg; struct rte_eth_event_enqueue_buffer *buf = NULL; struct rte_event *ev; buf = rxa_event_buf_get(rx_adapter, vec->port, vec->queue); error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:1333 Hunk #33 succeeded at 1238 (offset -94 lines). Hunk #34 succeeded at 1299 (offset -109 lines). Hunk #35 succeeded at 1316 (offset -109 lines). Hunk #36 succeeded at 1365 (offset -109 lines). Hunk #37 succeeded at 1382 (offset -109 lines). Hunk #38 succeeded at 1426 (offset -109 lines). Hunk #39 succeeded at 1447 (offset -109 lines). Hunk #40 succeeded at 1465 (offset -109 lines). Hunk #41 succeeded at 1494 (offset -109 lines). Hunk #42 succeeded at 1552 (offset -109 lines). Hunk #43 succeeded at 1641 (offset -109 lines). Hunk #44 succeeded at 1690 (offset -109 lines). Hunk #45 succeeded at 1734 (offset -109 lines). Hunk #46 succeeded at 1786 (offset -109 lines). error: while searching for: dev_info->nb_rx_intr -= intrq; dev_info->nb_shared_intr -= intrq && sintrq; if (rx_adapter->use_queue_event_buf) { struct rte_eth_event_enqueue_buffer *event_buf = dev_info->rx_queue[rx_queue_id].event_buf; rte_free(event_buf->events); rte_free(event_buf); error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:1968 error: while searching for: } static int rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, struct eth_device_info *dev_info, int32_t rx_queue_id, const struct rte_event_eth_rx_adapter_queue_conf *conf) { struct eth_rx_queue_info *queue_info; const struct rte_event *ev = &conf->ev; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:1977 error: while searching for: int intrq; int sintrq; struct rte_event *qi_ev; struct rte_eth_event_enqueue_buffer *new_rx_buf = NULL; uint16_t eth_dev_id = dev_info->dev->data->port_id; int ret; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:1988 error: while searching for: return 0; } static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, int rx_queue_id, const struct rte_event_eth_rx_adapter_queue_conf *queue_conf) { struct eth_device_info *dev_info = &rx_adapter->eth_devices[eth_dev_id]; struct rte_event_eth_rx_adapter_queue_conf temp_conf; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:2098 Hunk #51 succeeded at 2062 (offset -146 lines). error: while searching for: rte_event_eth_rx_adapter_conf_cb conf_cb, void *conf_arg) { struct rte_event_eth_rx_adapter *rx_adapter; struct rte_eth_event_enqueue_buffer *buf; struct rte_event *events; int ret; int socket_id; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:2290 Hunk #53 succeeded at 2209 (offset -245 lines). error: while searching for: { int ret; uint32_t cap; struct rte_event_eth_rx_adapter *rx_adapter; struct rte_eventdev *dev; struct eth_device_info *dev_info; struct rte_event_eth_rx_adapter_vector_limits limits; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:2522 Hunk #55 succeeded at 2359 (offset -289 lines). error: while searching for: rte_event_eth_rx_adapter_stats_get(uint8_t id, struct rte_event_eth_rx_adapter_stats *stats) { struct rte_event_eth_rx_adapter *rx_adapter; struct rte_eth_event_enqueue_buffer *buf; struct rte_event_eth_rx_adapter_stats dev_stats_sum = { 0 }; struct rte_event_eth_rx_adapter_stats dev_stats; struct rte_eventdev *dev; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:2852 Hunk #57 succeeded at 2647 (offset -226 lines). error: while searching for: int rte_event_eth_rx_adapter_service_id_get(uint8_t id, uint32_t *service_id) { struct rte_event_eth_rx_adapter *rx_adapter; if (rxa_memzone_lookup()) return -ENOMEM; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:2938 Hunk #59 succeeded at 2695 (offset -232 lines). error: while searching for: struct rte_event_eth_rx_adapter_queue_conf *queue_conf) { struct rte_eventdev *dev; struct rte_event_eth_rx_adapter *rx_adapter; struct eth_device_info *dev_info; struct eth_rx_queue_info *queue_info; struct rte_event *qi_ev; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:3007 Checking patch lib/eventdev/rte_eventdev.h... error: lib/eventdev/rte_eventdev.h: does not match index Applied patch lib/eventdev/rte_event_crypto_adapter.c cleanly. Applying patch lib/eventdev/rte_event_eth_rx_adapter.c with 18 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Rejected hunk #4. Rejected hunk #5. 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. Rejected hunk #20. Hunk #21 applied cleanly. Hunk #22 applied cleanly. Rejected hunk #23. Rejected hunk #24. Rejected hunk #25. Hunk #26 applied cleanly. Hunk #27 applied cleanly. Hunk #28 applied cleanly. Hunk #29 applied cleanly. Hunk #30 applied cleanly. Rejected hunk #31. Rejected hunk #32. 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. Hunk #40 applied cleanly. Hunk #41 applied cleanly. Hunk #42 applied cleanly. Hunk #43 applied cleanly. Hunk #44 applied cleanly. Hunk #45 applied cleanly. Hunk #46 applied cleanly. Rejected hunk #47. Rejected hunk #48. Rejected hunk #49. Rejected hunk #50. Hunk #51 applied cleanly. Rejected hunk #52. Hunk #53 applied cleanly. Rejected hunk #54. Hunk #55 applied cleanly. Rejected hunk #56. Hunk #57 applied cleanly. Rejected hunk #58. Hunk #59 applied cleanly. Rejected hunk #60. diff a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c (rejected hunks) @@ -98,7 +98,7 @@ struct rte_eth_event_enqueue_buffer { uint16_t last_mask; }; -struct rte_event_eth_rx_adapter { +struct event_eth_rx_adapter { /* RSS key */ uint8_t rss_key_be[RSS_KEY_SIZE]; /* Event device identifier */ @@ -244,10 +244,10 @@ struct eth_rx_queue_info { uint32_t flow_id_mask; /* Set to ~0 if app provides flow id else 0 */ uint64_t event; struct eth_rx_vector_data vector_data; - struct rte_eth_event_enqueue_buffer *event_buf; + struct eth_event_enqueue_buffer *event_buf; }; -static struct rte_event_eth_rx_adapter **event_eth_rx_adapter; +static struct event_eth_rx_adapter **event_eth_rx_adapter; /* Enable dynamic timestamp field in mbuf */ static uint64_t event_eth_rx_timestamp_dynflag; @@ -266,9 +266,9 @@ rxa_validate_id(uint8_t id) return id < RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; } -static inline struct rte_eth_event_enqueue_buffer * -rxa_event_buf_get(struct rte_event_eth_rx_adapter *rx_adapter, - uint16_t eth_dev_id, uint16_t rx_queue_id) +static inline struct eth_event_enqueue_buffer * +rxa_event_buf_get(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, + uint16_t rx_queue_id) { if (rx_adapter->use_queue_event_buf) { struct eth_device_info *dev_info = @@ -783,8 +765,8 @@ rxa_enq_block_end_ts(struct rte_event_eth_rx_adapter *rx_adapter, /* Enqueue buffered events to event device */ static inline uint16_t -rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter, - struct rte_eth_event_enqueue_buffer *buf) +rxa_flush_event_buffer(struct event_eth_rx_adapter *rx_adapter, + struct eth_event_enqueue_buffer *buf) { struct rte_event_eth_rx_adapter_stats *stats = &rx_adapter->stats; uint16_t count = buf->last ? buf->last - buf->head : buf->count; @@ -899,12 +881,9 @@ rxa_create_event_vector(struct rte_event_eth_rx_adapter *rx_adapter, } static inline void -rxa_buffer_mbufs(struct rte_event_eth_rx_adapter *rx_adapter, - uint16_t eth_dev_id, - uint16_t rx_queue_id, - struct rte_mbuf **mbufs, - uint16_t num, - struct rte_eth_event_enqueue_buffer *buf) +rxa_buffer_mbufs(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, + uint16_t rx_queue_id, struct rte_mbuf **mbufs, uint16_t num, + struct eth_event_enqueue_buffer *buf) { uint32_t i; struct eth_device_info *dev_info = @@ -983,7 +962,7 @@ rxa_buffer_mbufs(struct rte_event_eth_rx_adapter *rx_adapter, } static inline bool -rxa_pkt_buf_available(struct rte_eth_event_enqueue_buffer *buf) +rxa_pkt_buf_available(struct eth_event_enqueue_buffer *buf) { uint32_t nb_req = buf->tail + BATCH_SIZE; @@ -1004,13 +983,9 @@ rxa_pkt_buf_available(struct rte_eth_event_enqueue_buffer *buf) /* Enqueue packets from to event buffer */ static inline uint32_t -rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter, - uint16_t port_id, - uint16_t queue_id, - uint32_t rx_count, - uint32_t max_rx, - int *rxq_empty, - struct rte_eth_event_enqueue_buffer *buf) +rxa_eth_rx(struct event_eth_rx_adapter *rx_adapter, uint16_t port_id, + uint16_t queue_id, uint32_t rx_count, uint32_t max_rx, + int *rxq_empty, struct eth_event_enqueue_buffer *buf) { struct rte_mbuf *mbufs[BATCH_SIZE]; struct rte_event_eth_rx_adapter_stats *stats = @@ -1282,11 +1256,11 @@ rxa_intr_ring_dequeue(struct rte_event_eth_rx_adapter *rx_adapter) * it. */ static inline uint32_t -rxa_poll(struct rte_event_eth_rx_adapter *rx_adapter) +rxa_poll(struct event_eth_rx_adapter *rx_adapter) { uint32_t num_queue; uint32_t nb_rx = 0; - struct rte_eth_event_enqueue_buffer *buf = NULL; + struct eth_event_enqueue_buffer *buf = NULL; uint32_t wrr_pos; uint32_t max_nb_rx; @@ -1333,8 +1307,8 @@ rxa_poll(struct rte_event_eth_rx_adapter *rx_adapter) static void rxa_vector_expire(struct eth_rx_vector_data *vec, void *arg) { - struct rte_event_eth_rx_adapter *rx_adapter = arg; - struct rte_eth_event_enqueue_buffer *buf = NULL; + struct event_eth_rx_adapter *rx_adapter = arg; + struct eth_event_enqueue_buffer *buf = NULL; struct rte_event *ev; buf = rxa_event_buf_get(rx_adapter, vec->port, vec->queue); @@ -1968,7 +1935,7 @@ rxa_sw_del(struct rte_event_eth_rx_adapter *rx_adapter, dev_info->nb_rx_intr -= intrq; dev_info->nb_shared_intr -= intrq && sintrq; if (rx_adapter->use_queue_event_buf) { - struct rte_eth_event_enqueue_buffer *event_buf = + struct eth_event_enqueue_buffer *event_buf = dev_info->rx_queue[rx_queue_id].event_buf; rte_free(event_buf->events); rte_free(event_buf); @@ -1977,10 +1944,9 @@ rxa_sw_del(struct rte_event_eth_rx_adapter *rx_adapter, } static int -rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, - struct eth_device_info *dev_info, - int32_t rx_queue_id, - const struct rte_event_eth_rx_adapter_queue_conf *conf) +rxa_add_queue(struct event_eth_rx_adapter *rx_adapter, + struct eth_device_info *dev_info, int32_t rx_queue_id, + const struct rte_event_eth_rx_adapter_queue_conf *conf) { struct eth_rx_queue_info *queue_info; const struct rte_event *ev = &conf->ev; @@ -1988,7 +1954,7 @@ rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, int intrq; int sintrq; struct rte_event *qi_ev; - struct rte_eth_event_enqueue_buffer *new_rx_buf = NULL; + struct eth_event_enqueue_buffer *new_rx_buf = NULL; uint16_t eth_dev_id = dev_info->dev->data->port_id; int ret; @@ -2098,10 +2064,10 @@ rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, return 0; } -static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter, - uint16_t eth_dev_id, - int rx_queue_id, - const struct rte_event_eth_rx_adapter_queue_conf *queue_conf) +static int +rxa_sw_add(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, + int rx_queue_id, + const struct rte_event_eth_rx_adapter_queue_conf *queue_conf) { struct eth_device_info *dev_info = &rx_adapter->eth_devices[eth_dev_id]; struct rte_event_eth_rx_adapter_queue_conf temp_conf; @@ -2290,8 +2256,8 @@ rxa_create(uint8_t id, uint8_t dev_id, rte_event_eth_rx_adapter_conf_cb conf_cb, void *conf_arg) { - struct rte_event_eth_rx_adapter *rx_adapter; - struct rte_eth_event_enqueue_buffer *buf; + struct event_eth_rx_adapter *rx_adapter; + struct eth_event_enqueue_buffer *buf; struct rte_event *events; int ret; int socket_id; @@ -2522,7 +2488,7 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, { int ret; uint32_t cap; - struct rte_event_eth_rx_adapter *rx_adapter; + struct event_eth_rx_adapter *rx_adapter; struct rte_eventdev *dev; struct eth_device_info *dev_info; struct rte_event_eth_rx_adapter_vector_limits limits; @@ -2852,8 +2818,8 @@ int rte_event_eth_rx_adapter_stats_get(uint8_t id, struct rte_event_eth_rx_adapter_stats *stats) { - struct rte_event_eth_rx_adapter *rx_adapter; - struct rte_eth_event_enqueue_buffer *buf; + struct event_eth_rx_adapter *rx_adapter; + struct eth_event_enqueue_buffer *buf; struct rte_event_eth_rx_adapter_stats dev_stats_sum = { 0 }; struct rte_event_eth_rx_adapter_stats dev_stats; struct rte_eventdev *dev; @@ -2938,7 +2904,7 @@ rte_event_eth_rx_adapter_stats_reset(uint8_t id) int rte_event_eth_rx_adapter_service_id_get(uint8_t id, uint32_t *service_id) { - struct rte_event_eth_rx_adapter *rx_adapter; + struct event_eth_rx_adapter *rx_adapter; if (rxa_memzone_lookup()) return -ENOMEM; @@ -3007,7 +2973,7 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id, struct rte_event_eth_rx_adapter_queue_conf *queue_conf) { struct rte_eventdev *dev; - struct rte_event_eth_rx_adapter *rx_adapter; + struct event_eth_rx_adapter *rx_adapter; struct eth_device_info *dev_info; struct eth_rx_queue_info *queue_info; struct rte_event *qi_ev; Checking patch lib/eventdev/rte_event_timer_adapter.h... error: lib/eventdev/rte_event_timer_adapter.h: does not match index Checking patch lib/eventdev/rte_event_timer_adapter.c... error: lib/eventdev/rte_event_timer_adapter.c: does not match index Checking patch lib/eventdev/rte_event_eth_rx_adapter.h... Hunk #1 succeeded at 543 (offset -45 lines). Checking patch lib/eventdev/rte_eventdev.h... error: lib/eventdev/rte_eventdev.h: does not match index Checking patch lib/eventdev/version.map... error: lib/eventdev/version.map: does not match index Applied patch lib/eventdev/rte_event_eth_rx_adapter.h cleanly. Checking patch lib/eventdev/rte_eventdev_trace.h => lib/eventdev/eventdev_trace.h... Checking patch lib/eventdev/eventdev_trace_points.c... Checking patch lib/eventdev/meson.build... error: lib/eventdev/meson.build: does not match index Checking patch lib/eventdev/rte_event_crypto_adapter.c... error: lib/eventdev/rte_event_crypto_adapter.c: does not match index Checking patch lib/eventdev/rte_event_eth_rx_adapter.c... error: lib/eventdev/rte_event_eth_rx_adapter.c: does not match index Checking patch lib/eventdev/rte_event_eth_tx_adapter.c... Checking patch lib/eventdev/rte_event_timer_adapter.c... error: lib/eventdev/rte_event_timer_adapter.c: does not match index Checking patch lib/eventdev/rte_eventdev.c... error: lib/eventdev/rte_eventdev.c: does not match index Applied patch lib/eventdev/rte_eventdev_trace.h => lib/eventdev/eventdev_trace.h cleanly. Applied patch lib/eventdev/eventdev_trace_points.c cleanly. Applied patch lib/eventdev/rte_event_eth_tx_adapter.c cleanly. Checking patch doc/guides/rel_notes/release_21_11.rst... Hunk #1 succeeded at 229 (offset 3 lines). error: while searching for: were added in structure ``rte_event_eth_rx_adapter_stats`` to get additional status. Known Issues ------------ error: patch failed: doc/guides/rel_notes/release_21_11.rst:277 Checking patch lib/eventdev/version.map... error: lib/eventdev/version.map: does not match index Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -277,6 +280,15 @@ ABI Changes were added in structure ``rte_event_eth_rx_adapter_stats`` to get additional status. +* eventdev: A new structure ``rte_event_fp_ops`` has been added which is now used + by the fastpath inline functions. The structures ``rte_eventdev``, + ``rte_eventdev_data`` have been made internal. ``rte_eventdevs[]`` can't be + accessed directly by user any more. This change is transparent to both + applications and PMDs. + +* eventdev: Re-arrange fields in ``rte_event_timer`` to remove holes. + ``rte_event_timer_adapter_pmd.h`` has been made internal. + Known Issues ------------ https://lab.dpdk.org/results/dashboard/patchsets/19465/ UNH-IOL DPDK Community Lab