This patch fixes the possible duplicated ring names in multi-core
scheduler. Originally two or more multi-core schedulers may have
same worker ring names thus will cause initialization error.
Fixes: 4c07e0552f0a ("crypto/scheduler: add multicore scheduling mode")
Signed-off-by: Fan Zhang <[email protected]>
---
v2:
- changed fix line location
- used device id and index to generate unique pool name
drivers/crypto/scheduler/scheduler_multicore.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/scheduler/scheduler_multicore.c
b/drivers/crypto/scheduler/scheduler_multicore.c
index 644426e93..d49e53681 100644
--- a/drivers/crypto/scheduler/scheduler_multicore.c
+++ b/drivers/crypto/scheduler/scheduler_multicore.c
@@ -347,14 +347,16 @@ scheduler_create_private_ctx(struct rte_cryptodev *dev)
for (i = 0; i < sched_ctx->nb_wc; i++) {
char r_name[16];
- snprintf(r_name, sizeof(r_name), MC_SCHED_ENQ_RING_NAME_PREFIX
"%u", i);
+ snprintf(r_name, sizeof(r_name), MC_SCHED_ENQ_RING_NAME_PREFIX
+ "%u_%u", dev->data->dev_id, i);
mc_ctx->sched_enq_ring[i] = rte_ring_create(r_name,
PER_SLAVE_BUFF_SIZE,
rte_socket_id(), RING_F_SC_DEQ |
RING_F_SP_ENQ);
if (!mc_ctx->sched_enq_ring[i]) {
CS_LOG_ERR("Cannot create ring for worker %u", i);
goto exit;
}
- snprintf(r_name, sizeof(r_name), MC_SCHED_DEQ_RING_NAME_PREFIX
"%u", i);
+ snprintf(r_name, sizeof(r_name), MC_SCHED_DEQ_RING_NAME_PREFIX
+ "%u_%u", dev->data->dev_id, i);
mc_ctx->sched_deq_ring[i] = rte_ring_create(r_name,
PER_SLAVE_BUFF_SIZE,
rte_socket_id(), RING_F_SC_DEQ |
RING_F_SP_ENQ);
if (!mc_ctx->sched_deq_ring[i]) {
--
2.13.6