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

mbuf: enforce no option for dynamic fields and flags

Browse Source 
As stated in the API, dynamic field and flags should be created with no
additional flag (simply in the API for future changes).

Fix the dynamic flag register helper which was not enforcing it and add
unit tests.

Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
This commit is contained in:
David Marchand 2021-10-12 21:39:57 +02:00
parent bc1a35fb3f
commit e9123c467d
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/test/test_mbuf.c
View File

@ -2577,6 +2577,16 @@ test_mbuf_dyn(struct rte_mempool *pktmbuf_pool)
.align = 3,
.flags = 0,
};
const struct rte_mbuf_dynfield dynfield_fail_flag = {
.name = "test-dynfield",
.size = sizeof(uint8_t),
.align = __alignof__(uint8_t),
.flags = 1,
};
const struct rte_mbuf_dynflag dynflag_fail_flag = {
.name = "test-dynflag",
.flags = 1,
};
const struct rte_mbuf_dynflag dynflag = {
.name = "test-dynflag",
.flags = 0,
@ -2638,6 +2648,14 @@ test_mbuf_dyn(struct rte_mempool *pktmbuf_pool)
if (ret != -1)
GOTO_FAIL("dynamic field creation should fail (not avail)");
ret = rte_mbuf_dynfield_register(&dynfield_fail_flag);
if (ret != -1)
GOTO_FAIL("dynamic field creation should fail (invalid flag)");
ret = rte_mbuf_dynflag_register(&dynflag_fail_flag);
if (ret != -1)
GOTO_FAIL("dynamic flag creation should fail (invalid flag)");
flag = rte_mbuf_dynflag_register(&dynflag);
if (flag == -1)
GOTO_FAIL("failed to register dynamic flag, flag=%d: %s",

4
lib/mbuf/rte_mbuf_dyn.c
View File

@ -498,6 +498,10 @@ rte_mbuf_dynflag_register_bitnum(const struct rte_mbuf_dynflag *params,
{
int ret;
if (params->flags != 0) {
rte_errno = EINVAL;
return -1;
}
if (req >= RTE_SIZEOF_FIELD(struct rte_mbuf, ol_flags) * CHAR_BIT &&
req != UINT_MAX) {
rte_errno = EINVAL;