The octeontx event device doesn't store the queues to port mapping as a
result it cannot return the exact number of queues unlinked from a port
when application wants to unlink all the queues mapped (supplies queues
param as NULL).

Using links_map we can determine the exact queues mapped to a specific
port and unlink them.

Signed-off-by: Pavan Nikhilesh <pbhagavat...@caviumnetworks.com>
---
 lib/librte_eventdev/rte_eventdev.c | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/librte_eventdev/rte_eventdev.c 
b/lib/librte_eventdev/rte_eventdev.c
index e0c2a78..b43ffbf 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -888,7 +888,8 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 {
        struct rte_eventdev *dev;
        uint8_t all_queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
-       int i, diag;
+       uint8_t linked_queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
+       int i, diag, j;
        uint16_t *links_map;
 
        RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, -EINVAL, 0);
@@ -906,13 +907,34 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
                return 0;
        }
 
+       links_map = dev->data->links_map;
+       /* Point links_map to this port specific area */
+       links_map += (port_id * RTE_EVENT_MAX_QUEUES_PER_DEV);
+
        if (queues == NULL) {
-               for (i = 0; i < dev->data->nb_queues; i++)
-                       all_queues[i] = i;
+               j = 0;
+               for (i = 0; i < dev->data->nb_queues; i++) {
+                       if (links_map[i] !=
+                                       EVENT_QUEUE_SERVICE_PRIORITY_INVALID) {
+                               all_queues[j] = i;
+                               j++;
+                       }
+               }
                queues = all_queues;
-               nb_unlinks = dev->data->nb_queues;
+       } else {
+               j = 0;
+               for (i = 0; i < nb_unlinks; i++) {
+                       if (links_map[queues[i]] ==
+                                       EVENT_QUEUE_SERVICE_PRIORITY_INVALID)
+                               break;
+
+                       linked_queues[j] = queues[i];
+                       j++;
+               }
+               queues = linked_queues;
        }
 
+       nb_unlinks = j;
        for (i = 0; i < nb_unlinks; i++)
                if (queues[i] >= dev->data->nb_queues) {
                        rte_errno = -EINVAL;
@@ -925,9 +947,6 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
        if (diag < 0)
                return diag;
 
-       links_map = dev->data->links_map;
-       /* Point links_map to this port specific area */
-       links_map += (port_id * RTE_EVENT_MAX_QUEUES_PER_DEV);
        for (i = 0; i < diag; i++)
                links_map[queues[i]] = EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
 
-- 
2.7.4

Reply via email to