d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

event/octeontx: support device stop flush callback

Browse Source 
Add support for stop flush callback along with unit test.

Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Acked-by: Gage Eads <gage.eads@intel.com>
This commit is contained in:
Jerin Jacob 2018-03-20 17:29:55 +05:30 committed by Thomas Monjalon
parent d593a8177f
commit 8384f0e039
4 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/event/octeontx/ssovf_evdev.c
View File

@ -529,7 +529,7 @@ ssovf_start(struct rte_eventdev *dev)
for (i = 0; i < edev->nb_event_queues; i++) {
/* Consume all the events through HWS0 */
ssows_flush_events(dev->data->ports[0], i);
ssows_flush_events(dev->data->ports[0], i, NULL, NULL);
base = ssovf_bar(OCTEONTX_SSO_GROUP, i, 0);
base += SSO_VHGRP_QCTL;
@ -540,6 +540,16 @@ ssovf_start(struct rte_eventdev *dev)
return 0;
}
static void
ssows_handle_event(void *arg, struct rte_event event)
{
struct rte_eventdev *dev = arg;
if (dev->dev_ops->dev_stop_flush != NULL)
dev->dev_ops->dev_stop_flush(dev->data->dev_id, event,
dev->data->dev_stop_flush_arg);
}
static void
ssovf_stop(struct rte_eventdev *dev)
{
@ -557,7 +567,8 @@ ssovf_stop(struct rte_eventdev *dev)
for (i = 0; i < edev->nb_event_queues; i++) {
/* Consume all the events through HWS0 */
ssows_flush_events(dev->data->ports[0], i);
ssows_flush_events(dev->data->ports[0], i,
ssows_handle_event, dev);
base = ssovf_bar(OCTEONTX_SSO_GROUP, i, 0);
base += SSO_VHGRP_QCTL;

5
drivers/event/octeontx/ssovf_evdev.h
View File

@ -174,7 +174,10 @@ uint16_t ssows_deq_timeout(void *port, struct rte_event *ev,
uint64_t timeout_ticks);
uint16_t ssows_deq_timeout_burst(void *port, struct rte_event ev[],
uint16_t nb_events, uint64_t timeout_ticks);
void ssows_flush_events(struct ssows *ws, uint8_t queue_id);
typedef void (*ssows_handle_event_t)(void *arg, struct rte_event ev);
void ssows_flush_events(struct ssows *ws, uint8_t queue_id,
ssows_handle_event_t fn, void *arg);
void ssows_reset(struct ssows *ws);
int ssovf_info(struct ssovf_info *info);
void *ssovf_bar(enum ssovf_type, uint8_t id, uint8_t bar);

36
drivers/event/octeontx/ssovf_evdev_selftest.c
View File

@ -688,6 +688,40 @@ test_multi_queue_enq_multi_port_deq(void)
nr_ports, 0xff /* invalid */);
}
static
void flush(uint8_t dev_id, struct rte_event event, void *arg)
{
unsigned int *count = arg;
RTE_SET_USED(dev_id);
if (event.event_type == RTE_EVENT_TYPE_CPU)
*count = *count + 1;
}
static int
test_dev_stop_flush(void)
{
unsigned int total_events = MAX_EVENTS, count = 0;
int ret;
ret = generate_random_events(total_events);
if (ret)
return -1;
ret = rte_event_dev_stop_flush_callback_register(evdev, flush, &count);
if (ret)
return -2;
rte_event_dev_stop(evdev);
ret = rte_event_dev_stop_flush_callback_register(evdev, NULL, NULL);
if (ret)
return -3;
RTE_TEST_ASSERT_EQUAL(total_events, count,
"count mismatch total_events=%d count=%d",
total_events, count);
return 0;
}
static int
validate_queue_to_port_single_link(uint32_t index, uint8_t port,
struct rte_event *ev)
@ -1414,6 +1448,8 @@ test_eventdev_octeontx(void)
test_simple_enqdeq_parallel);
OCTEONTX_TEST_RUN(eventdev_setup, eventdev_teardown,
test_multi_queue_enq_single_port_deq);
OCTEONTX_TEST_RUN(eventdev_setup, eventdev_teardown,
test_dev_stop_flush);
OCTEONTX_TEST_RUN(eventdev_setup, eventdev_teardown,
test_multi_queue_enq_multi_port_deq);
OCTEONTX_TEST_RUN(eventdev_setup, eventdev_teardown,

15
drivers/event/octeontx/ssovf_worker.c
View File

@ -198,12 +198,12 @@ ssows_enq_fwd_burst(void *port, const struct rte_event ev[], uint16_t nb_events)
}
void
ssows_flush_events(struct ssows *ws, uint8_t queue_id)
ssows_flush_events(struct ssows *ws, uint8_t queue_id,
ssows_handle_event_t fn, void *arg)
{
uint32_t reg_off;
uint64_t aq_cnt = 1;
uint64_t cq_ds_cnt = 1;
uint64_t enable, get_work0, get_work1;
struct rte_event ev;
uint64_t enable, aq_cnt = 1, cq_ds_cnt = 1;
uint8_t *base = ssovf_bar(OCTEONTX_SSO_GROUP, queue_id, 0);
enable = ssovf_read64(base + SSO_VHGRP_QCTL);
@ -219,11 +219,10 @@ ssows_flush_events(struct ssows *ws, uint8_t queue_id)
cq_ds_cnt = ssovf_read64(base + SSO_VHGRP_INT_CNT);
/* Extract cq and ds count */
cq_ds_cnt &= 0x1FFF1FFF0000;
ssovf_load_pair(get_work0, get_work1, ws->base + reg_off);
ssows_get_work(ws, &ev);
if (fn != NULL && ev.u64 != 0)
fn(arg, ev);
}
RTE_SET_USED(get_work0);
RTE_SET_USED(get_work1);
}
void