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

net/octeontx: fix failures when available ports > queues

Browse Source 
When eth_octeontx is initialized before event_octeontx, eth_octeontx
would initiate setting up of the event device with the max ports and
queues available. If number of ports is more than the number of queues,
some ports would be left unused when the ports and queues are mapped
1:1. But even in that case the ports need to be setup, or otherwise it
would lead to a segmentation fault when event device is started.

Fixes: f7be70e513 ("net/octeontx: add net device probe and remove")
Cc: stable@dpdk.org

Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
This commit is contained in:
Anoob Joseph 2018-11-14 09:22:03 +00:00 committed by Ferruh Yigit
parent 778677dcb2
commit 7efd5202f7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/octeontx/octeontx_ethdev.c
View File

@ -1238,15 +1238,8 @@ octeontx_probe(struct rte_vdev_device *dev)
res = -EINVAL;
goto parse_error;
}
if (pnum > qnum) {
/*
* We don't poll on event ports
* that do not have any queues assigned.
*/
pnum = qnum;
PMD_INIT_LOG(INFO,
"reducing number of active event ports to %d", pnum);
}
/* Enable all queues available */
for (i = 0; i < qnum; i++) {
res = rte_event_queue_setup(evdev, i, NULL);
if (res < 0) {
@ -1256,6 +1249,7 @@ octeontx_probe(struct rte_vdev_device *dev)
}
}
/* Enable all ports available */
for (i = 0; i < pnum; i++) {
res = rte_event_port_setup(evdev, i, NULL);
if (res < 0) {
@ -1264,6 +1258,14 @@ octeontx_probe(struct rte_vdev_device *dev)
i, res);
goto parse_error;
}
}
/*
* Do 1:1 links for ports & queues. All queues would be mapped to
* one port. If there are more ports than queues, then some ports
* won't be linked to any queue.
*/
for (i = 0; i < qnum; i++) {
/* Link one queue to one event port */
qlist = i;
res = rte_event_port_link(evdev, i, &qlist, NULL, 1);