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

test/reorder: fix freeing mbuf twice

Browse Source 
mbufs are being freed twice in error, once in rte_mempool_put_bulk()
and then in rte_reorder_free(). Refactor the code so that we use
rte_reorder_free() to free mbufs in the reorder buffer, and use
rte_pktmbuf_free() to free any unused or drained mbufs.

Fixes: d0c9b58d71 ("app/test: new reorder unit test")
Cc: stable@dpdk.org

Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
Reviewed-by: David Hunt <david.hunt@intel.com>
This commit is contained in:
Reshma Pattan 2018-05-04 11:47:06 +01:00 committed by Thomas Monjalon
parent c981825388
commit ecd867faa8
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/test/test_reorder.c
View File

@ -146,11 +146,11 @@ test_reorder_insert(void)
b = rte_reorder_create("test_insert", rte_socket_id(), size); b = rte_reorder_create("test_insert", rte_socket_id(), size);
TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer"); TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer");
ret = rte_mempool_get_bulk(p, (void *)bufs, num_bufs); for (i = 0; i < num_bufs; i++) {
TEST_ASSERT_SUCCESS(ret, "Error getting mbuf from pool"); bufs[i] = rte_pktmbuf_alloc(p);
TEST_ASSERT_NOT_NULL(bufs[i], "Packet allocation failed\n");
for (i = 0; i < num_bufs; i++)
bufs[i]->seqn = i; bufs[i]->seqn = i;
}
/* This should fill up order buffer: /* This should fill up order buffer:
* reorder_seq = 0 * reorder_seq = 0
@ -165,6 +165,7 @@ test_reorder_insert(void)
ret = -1; ret = -1;
goto exit; goto exit;
} }
bufs[i] = NULL;
} }
/* early packet - should move mbufs to ready buf and move sequence window /* early packet - should move mbufs to ready buf and move sequence window
@ -179,6 +180,7 @@ test_reorder_insert(void)
ret = -1; ret = -1;
goto exit; goto exit;
} }
bufs[4] = NULL;
/* early packet from current sequence window - full ready buffer */ /* early packet from current sequence window - full ready buffer */
bufs[5]->seqn = 2 * size; bufs[5]->seqn = 2 * size;
@ -189,6 +191,7 @@ test_reorder_insert(void)
ret = -1; ret = -1;
goto exit; goto exit;
} }
bufs[5] = NULL;
/* late packet */ /* late packet */
bufs[6]->seqn = 3 * size; bufs[6]->seqn = 3 * size;
@ -199,11 +202,15 @@ test_reorder_insert(void)
ret = -1; ret = -1;
goto exit; goto exit;
} }
bufs[6] = NULL;
ret = 0; ret = 0;
exit: exit:
rte_mempool_put_bulk(p, (void *)bufs, num_bufs);
rte_reorder_free(b); rte_reorder_free(b);
for (i = 0; i < num_bufs; i++) {
if (bufs[i] != NULL)
rte_pktmbuf_free(bufs[i]);
}
return ret; return ret;
} }
@ -219,6 +226,10 @@ test_reorder_drain(void)
int ret = 0; int ret = 0;
unsigned i, cnt; unsigned i, cnt;
/* initialize all robufs to NULL */
for (i = 0; i < num_bufs; i++)
robufs[i] = NULL;
/* This would create a reorder buffer instance consisting of: /* This would create a reorder buffer instance consisting of:
* reorder_seq = 0 * reorder_seq = 0
* ready_buf: RB[size] = {NULL, NULL, NULL, NULL} * ready_buf: RB[size] = {NULL, NULL, NULL, NULL}
@ -227,9 +238,6 @@ test_reorder_drain(void)
b = rte_reorder_create("test_drain", rte_socket_id(), size); b = rte_reorder_create("test_drain", rte_socket_id(), size);
TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer"); TEST_ASSERT_NOT_NULL(b, "Failed to create reorder buffer");
ret = rte_mempool_get_bulk(p, (void *)bufs, num_bufs);
TEST_ASSERT_SUCCESS(ret, "Error getting mbuf from pool");
/* Check no drained packets if reorder is empty */ /* Check no drained packets if reorder is empty */
cnt = rte_reorder_drain(b, robufs, 1); cnt = rte_reorder_drain(b, robufs, 1);
if (cnt != 0) { if (cnt != 0) {
@ -239,8 +247,11 @@ test_reorder_drain(void)
goto exit; goto exit;
} }
for (i = 0; i < num_bufs; i++) for (i = 0; i < num_bufs; i++) {
bufs[i] = rte_pktmbuf_alloc(p);
TEST_ASSERT_NOT_NULL(bufs[i], "Packet allocation failed\n");
bufs[i]->seqn = i; bufs[i]->seqn = i;
}
/* Insert packet with seqn 1: /* Insert packet with seqn 1:
* reorder_seq = 0 * reorder_seq = 0
@ -248,6 +259,7 @@ test_reorder_drain(void)
* OB[] = {1, NULL, NULL, NULL} * OB[] = {1, NULL, NULL, NULL}
*/ */
rte_reorder_insert(b, bufs[1]); rte_reorder_insert(b, bufs[1]);
bufs[1] = NULL;
cnt = rte_reorder_drain(b, robufs, 1); cnt = rte_reorder_drain(b, robufs, 1);
if (cnt != 1) { if (cnt != 1) {
@ -256,6 +268,8 @@ test_reorder_drain(void)
ret = -1; ret = -1;
goto exit; goto exit;
} }
if (robufs[0] != NULL)
rte_pktmbuf_free(robufs[i]);
/* Insert more packets /* Insert more packets
* RB[] = {NULL, NULL, NULL, NULL} * RB[] = {NULL, NULL, NULL, NULL}
@ -263,18 +277,22 @@ test_reorder_drain(void)
*/ */
rte_reorder_insert(b, bufs[2]); rte_reorder_insert(b, bufs[2]);
rte_reorder_insert(b, bufs[3]); rte_reorder_insert(b, bufs[3]);
bufs[2] = NULL;
bufs[3] = NULL;
/* Insert more packets /* Insert more packets
* RB[] = {NULL, NULL, NULL, NULL} * RB[] = {NULL, NULL, NULL, NULL}
* OB[] = {NULL, 2, 3, 4} * OB[] = {NULL, 2, 3, 4}
*/ */
rte_reorder_insert(b, bufs[4]); rte_reorder_insert(b, bufs[4]);
bufs[4] = NULL;
/* Insert more packets /* Insert more packets
* RB[] = {2, 3, 4, NULL} * RB[] = {2, 3, 4, NULL}
* OB[] = {NULL, NULL, 7, NULL} * OB[] = {NULL, NULL, 7, NULL}
*/ */
rte_reorder_insert(b, bufs[7]); rte_reorder_insert(b, bufs[7]);
bufs[7] = NULL;
/* drained expected packets */ /* drained expected packets */
cnt = rte_reorder_drain(b, robufs, 4); cnt = rte_reorder_drain(b, robufs, 4);
@ -284,6 +302,10 @@ test_reorder_drain(void)
ret = -1; ret = -1;
goto exit; goto exit;
} }
for (i = 0; i < 3; i++) {
if (robufs[i] != NULL)
rte_pktmbuf_free(robufs[i]);
}
/* /*
* RB[] = {NULL, NULL, NULL, NULL} * RB[] = {NULL, NULL, NULL, NULL}
@ -298,8 +320,13 @@ test_reorder_drain(void)
} }
ret = 0; ret = 0;
exit: exit:
rte_mempool_put_bulk(p, (void *)bufs, num_bufs);
rte_reorder_free(b); rte_reorder_free(b);
for (i = 0; i < num_bufs; i++) {
if (bufs[i] != NULL)
rte_pktmbuf_free(bufs[i]);
if (robufs[i] != NULL)
rte_pktmbuf_free(robufs[i]);
}
return ret; return ret;
} }