ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmemif: fix for memif_init_queues slot math

Browse Source 
Increase slot variable to u32 to address combinations of num-queues and queue-size that cause slot variable to wrap when declared as u16, e.g. num-queues > 8 && queue-size is 2^12

Type: fix
Change-Id: I5bd6198d60395156a06f1a280ea2594824ceaa9d
Signed-off-by: mbly <mbly@ciena.com>
This commit is contained in:
mbly
2023-12-06 12:22:14 -08:00
committed by Dave Wallace
parent a908779820
commit 00e9fe6ca7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extras/libmemif/src/main.c
View File

@ -1258,6 +1258,7 @@ memif_init_queues (memif_connection_t *conn)
int i, j;
memif_ring_t *ring;
memif_socket_t *ms = (memif_socket_t *) conn->args.socket;
uint32_t ring_size = 1 << conn->run_args.log2_ring_size;
for (i = 0; i < conn->run_args.num_s2m_rings; i++)
{
@ -1266,9 +1267,11 @@ memif_init_queues (memif_connection_t *conn)
ring->head = ring->tail = 0;
ring->cookie = MEMIF_COOKIE;
ring->flags = 0;
for (j = 0; j < (1 << conn->run_args.log2_ring_size); j++)
uint32_t base = i;
uint32_t ring_offset = base * ring_size;
for (j = 0; j < ring_size; j++)
{
uint16_t slot = i * (1 << conn->run_args.log2_ring_size) + j;
uint32_t slot = ring_offset + j;
ring->desc[j].region = 1;
ring->desc[j].offset =
conn->regions[1].buffer_offset +
@ -1283,10 +1286,11 @@ memif_init_queues (memif_connection_t *conn)
ring->head = ring->tail = 0;
ring->cookie = MEMIF_COOKIE;
ring->flags = 0;
for (j = 0; j < (1 << conn->run_args.log2_ring_size); j++)
uint32_t base = conn->run_args.num_s2m_rings + i;
uint32_t ring_offset = base * ring_size;
for (j = 0; j < ring_size; j++)
{
uint16_t slot = (i + conn->run_args.num_s2m_rings) *
(1 << conn->run_args.log2_ring_size) + j;
uint32_t slot = ring_offset + j;
ring->desc[j].region = 1;
ring->desc[j].offset =
conn->regions[1].buffer_offset +