Switch from using an open-coded, single-word bitset to using
<rte_bitset.h> to represent which event ports are linked to a
particular event queue.
Besides the cleaner code, this also allow the user to extend the
maximum port count beyond 64, by means of changing an "event_dev.h"
Signed-off-by: Mattias Rönnblom <mattias.ronnb...@ericsson.com>
---
drivers/event/dsw/dsw_evdev.c | 19 +++++++------------
drivers/event/dsw/dsw_evdev.h | 3 ++-
drivers/event/dsw/dsw_event.c | 7 ++++---
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 0dea1091e3..961217334e 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -123,6 +123,7 @@ dsw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
queue->schedule_type = conf->schedule_type;
}
+ rte_bitset_init(queue->serving_ports, DSW_MAX_PORTS);
queue->num_serving_ports = 0;
return 0;
@@ -149,20 +150,16 @@ dsw_queue_release(struct rte_eventdev *dev __rte_unused,
static void
queue_add_port(struct dsw_queue *queue, uint16_t port_id)
{
- uint64_t port_mask = UINT64_C(1) << port_id;
-
- queue->serving_ports |= port_mask;
+ rte_bitset_set(queue->serving_ports, port_id);
queue->num_serving_ports++;
}
static bool
queue_remove_port(struct dsw_queue *queue, uint16_t port_id)
{
- uint64_t port_mask = UINT64_C(1) << port_id;
-
- if (queue->serving_ports & port_mask) {
+ if (rte_bitset_test(queue->serving_ports, port_id)) {
queue->num_serving_ports--;
- queue->serving_ports ^= port_mask;
+ rte_bitset_clear(queue->serving_ports, port_id);
return true;
}
@@ -263,14 +260,12 @@ initial_flow_to_port_assignment(struct dsw_evdev *dsw)
struct dsw_queue *queue = &dsw->queues[queue_id];
uint16_t flow_hash;
for (flow_hash = 0; flow_hash < DSW_MAX_FLOWS; flow_hash++) {
- uint8_t skip =
- rte_rand_max(queue->num_serving_ports);
+ uint8_t skip = rte_rand_max(queue->num_serving_ports);
uint8_t port_id;
for (port_id = 0;; port_id++) {
- uint64_t port_mask = UINT64_C(1) << port_id;
-
- if (queue->serving_ports & port_mask) {
+ if (rte_bitset_test(queue->serving_ports,
+ port_id)) {
if (skip == 0)
break;
skip--;
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index c9bf4f8b6b..606c1e9f8a 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -7,6 +7,7 @@
#include <eventdev_pmd.h>
+#include <rte_bitset.h>
#include <rte_event_ring.h>
#include <rte_eventdev.h>
@@ -237,7 +238,7 @@ struct __rte_cache_aligned dsw_port {
struct dsw_queue {
uint8_t schedule_type;
- uint64_t serving_ports;
+ RTE_BITSET_DECLARE(serving_ports, DSW_MAX_PORTS);
uint16_t num_serving_ports;
alignas(RTE_CACHE_LINE_SIZE) uint8_t flow_to_port_map[DSW_MAX_FLOWS];
diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index 33f741990f..f18c7e8fbc 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -457,9 +457,8 @@ static bool
dsw_is_serving_port(struct dsw_evdev *dsw, uint8_t port_id, uint8_t queue_id)
{
struct dsw_queue *queue = &dsw->queues[queue_id];
- uint64_t port_mask = UINT64_C(1) << port_id;
- return queue->serving_ports & port_mask;
+ return rte_bitset_test(queue->serving_ports, port_id);
}
static bool
@@ -583,7 +582,9 @@ dsw_schedule(struct dsw_evdev *dsw, uint8_t queue_id,
uint16_t flow_hash)
/* A single-link queue, or atomic/ordered/parallel but
* with just a single serving port.
*/
- port_id = rte_bsf64(queue->serving_ports);
+ port_id = (uint8_t)rte_bitset_find_first_set(
+ queue->serving_ports, DSW_MAX_PORTS
+ );
DSW_LOG_DP(DEBUG, "Event with queue_id %d flow_hash %d is scheduled "
"to port %d.\n", queue_id, flow_hash, port_id);
--
2.34.1
