Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/100583 _apply patch failure_ Submitter: Naga Harish K S V Date: Wednesday, October 06 2021 07:55:48 Applied on: CommitID:2700326085033fd13339a8de31f58a95d1ee9c3f Apply patch set 100583-100587 failed: Checking patch doc/guides/prog_guide/event_ethernet_rx_adapter.rst... Checking patch lib/eventdev/rte_event_eth_rx_adapter.c... error: while searching for: /* Count of events in this buffer */ uint16_t count; /* Array of events in this buffer */ struct rte_event events[ETH_EVENT_BUFFER_SIZE]; /* Event enqueue happens from head */ uint16_t head; /* New packets from rte_eth_rx_burst is enqued from tail */ error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:85 error: while searching for: dropped = 0; nb_cb = dev_info->cb_fn(eth_dev_id, rx_queue_id, buf->last | (RTE_DIM(buf->events) & ~buf->last_mask), buf->count >= BATCH_SIZE ? buf->count - BATCH_SIZE : 0, &buf->events[buf->tail], error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:946 error: while searching for: uint32_t nb_req = buf->tail + BATCH_SIZE; if (!buf->last) { if (nb_req <= RTE_DIM(buf->events)) return true; if (buf->head >= BATCH_SIZE) { error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:972 Hunk #4 succeeded at 2130 (offset -78 lines). Hunk #5 succeeded at 2153 (offset -78 lines). error: while searching for: rte_free(rx_adapter); return -ENOMEM; } rte_spinlock_init(&rx_adapter->rx_lock); for (i = 0; i < RTE_MAX_ETHPORTS; i++) rx_adapter->eth_devices[i].dev = &rte_eth_devices[i]; event_eth_rx_adapter[id] = rx_adapter; if (conf_cb == rxa_default_conf_cb) rx_adapter->default_cb_arg = 1; error: patch failed: lib/eventdev/rte_event_eth_rx_adapter.c:2273 Hunk #7 succeeded at 2213 (offset -105 lines). Hunk #8 succeeded at 2277 (offset -105 lines). Hunk #9 succeeded at 2313 (offset -105 lines). Hunk #10 succeeded at 2729 (offset -65 lines). Checking patch lib/eventdev/rte_event_eth_rx_adapter.h... Hunk #2 succeeded at 37 (offset -1 lines). Hunk #3 succeeded at 260 (offset 2 lines). Hunk #4 succeeded at 371 (offset 2 lines). Checking patch lib/eventdev/version.map... Applied patch doc/guides/prog_guide/event_ethernet_rx_adapter.rst cleanly. Applying patch lib/eventdev/rte_event_eth_rx_adapter.c with 4 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Rejected hunk #6. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Applied patch lib/eventdev/rte_event_eth_rx_adapter.h cleanly. Applied patch lib/eventdev/version.map cleanly. diff a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c (rejected hunks) @@ -85,7 +85,9 @@ struct rte_eth_event_enqueue_buffer { /* Count of events in this buffer */ uint16_t count; /* Array of events in this buffer */ - struct rte_event events[ETH_EVENT_BUFFER_SIZE]; + struct rte_event *events; + /* size of event buffer */ + uint16_t events_size; /* Event enqueue happens from head */ uint16_t head; /* New packets from rte_eth_rx_burst is enqued from tail */ @@ -946,7 +948,7 @@ rxa_buffer_mbufs(struct rte_event_eth_rx_adapter *rx_adapter, dropped = 0; nb_cb = dev_info->cb_fn(eth_dev_id, rx_queue_id, buf->last | - (RTE_DIM(buf->events) & ~buf->last_mask), + (buf->events_size & ~buf->last_mask), buf->count >= BATCH_SIZE ? buf->count - BATCH_SIZE : 0, &buf->events[buf->tail], @@ -972,7 +974,7 @@ rxa_pkt_buf_available(struct rte_eth_event_enqueue_buffer *buf) uint32_t nb_req = buf->tail + BATCH_SIZE; if (!buf->last) { - if (nb_req <= RTE_DIM(buf->events)) + if (nb_req <= buf->events_size) return true; if (buf->head >= BATCH_SIZE) { @@ -2273,11 +2279,30 @@ rte_event_eth_rx_adapter_create_ext(uint8_t id, uint8_t dev_id, rte_free(rx_adapter); return -ENOMEM; } + rte_spinlock_init(&rx_adapter->rx_lock); + for (i = 0; i < RTE_MAX_ETHPORTS; i++) rx_adapter->eth_devices[i].dev = &rte_eth_devices[i]; + /* Rx adapter event buffer allocation */ + buf = &rx_adapter->event_enqueue_buffer; + buf->events_size = rxa_params->event_buf_size; + + events = rte_zmalloc_socket(rx_adapter->mem_name, + buf->events_size * sizeof(*events), + 0, socket_id); + if (events == NULL) { + RTE_EDEV_LOG_ERR("Failed to allocate mem for event buffer\n"); + rte_free(rx_adapter->eth_devices); + rte_free(rx_adapter); + return -ENOMEM; + } + + rx_adapter->event_enqueue_buffer.events = events; + event_eth_rx_adapter[id] = rx_adapter; + if (conf_cb == rxa_default_conf_cb) rx_adapter->default_cb_arg = 1; Checking patch doc/guides/prog_guide/event_ethernet_rx_adapter.rst... error: doc/guides/prog_guide/event_ethernet_rx_adapter.rst: does not match index Checking patch lib/eventdev/rte_event_eth_rx_adapter.h... error: lib/eventdev/rte_event_eth_rx_adapter.h: 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 app/test/test_event_eth_rx_adapter.c... error: while searching for: TEST_CASE_ST(adapter_create, adapter_free, adapter_start_stop), TEST_CASE_ST(adapter_create, adapter_free, adapter_stats), TEST_CASE_ST(adapter_create, adapter_free, adapter_queue_conf), TEST_CASES_END() /**< NULL terminate unit test array */ } }; error: patch failed: app/test/test_event_eth_rx_adapter.c:826 Applying patch app/test/test_event_eth_rx_adapter.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. diff a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c (rejected hunks) @@ -826,6 +910,8 @@ static struct unit_test_suite event_eth_rx_tests = { TEST_CASE_ST(adapter_create, adapter_free, adapter_start_stop), TEST_CASE_ST(adapter_create, adapter_free, adapter_stats), TEST_CASE_ST(adapter_create, adapter_free, adapter_queue_conf), + TEST_CASE_ST(adapter_create_with_params, adapter_free, + adapter_queue_event_buf_test), TEST_CASES_END() /**< NULL terminate unit test array */ } }; https://lab.dpdk.org/results/dashboard/patchsets/19195/ UNH-IOL DPDK Community Lab