From: Konstantin Ananyev <konstantin.ananyev@huawei.com>
To: <dev@dpdk.org>
Cc: <honnappa.nagarahalli@arm.com>, <jerinj@marvell.com>,
<hemant.agrawal@nxp.com>, <drc@linux.ibm.com>
Subject: [PATCH v1 1/4] ring: introduce extra run-time checks
Date: Wed, 21 May 2025 12:14:29 +0100 [thread overview]
Message-ID: <20250521111432.207936-2-konstantin.ananyev@huawei.com> (raw)
In-Reply-To: <20250521111432.207936-1-konstantin.ananyev@huawei.com>
Add RTE_ASSERT() to check that different move_tail() flavors
return meaningful *entries value.
It also helps to ensure that inside move_tail(), it uses correct
head/tail values.
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
---
lib/ring/rte_ring_c11_pvt.h | 2 +-
lib/ring/rte_ring_elem_pvt.h | 8 ++++++--
lib/ring/rte_ring_hts_elem_pvt.h | 8 ++++++--
lib/ring/rte_ring_rts_elem_pvt.h | 8 ++++++--
lib/ring/soring.c | 2 ++
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h
index b9388af0da..0845cd6dcf 100644
--- a/lib/ring/rte_ring_c11_pvt.h
+++ b/lib/ring/rte_ring_c11_pvt.h
@@ -104,10 +104,10 @@ __rte_ring_headtail_move_head(struct rte_ring_headtail *d,
n = (behavior == RTE_RING_QUEUE_FIXED) ?
0 : *entries;
+ *new_head = *old_head + n;
if (n == 0)
return 0;
- *new_head = *old_head + n;
if (is_st) {
d->head = *new_head;
success = 1;
diff --git a/lib/ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h
index 6eafae121f..2e71040830 100644
--- a/lib/ring/rte_ring_elem_pvt.h
+++ b/lib/ring/rte_ring_elem_pvt.h
@@ -341,8 +341,10 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp,
uint32_t *old_head, uint32_t *new_head,
uint32_t *free_entries)
{
- return __rte_ring_headtail_move_head(&r->prod, &r->cons, r->capacity,
+ n = __rte_ring_headtail_move_head(&r->prod, &r->cons, r->capacity,
is_sp, n, behavior, old_head, new_head, free_entries);
+ RTE_ASSERT(*free_entries <= r->capacity);
+ return n;
}
/**
@@ -374,8 +376,10 @@ __rte_ring_move_cons_head(struct rte_ring *r, unsigned int is_sc,
uint32_t *old_head, uint32_t *new_head,
uint32_t *entries)
{
- return __rte_ring_headtail_move_head(&r->cons, &r->prod, 0,
+ n = __rte_ring_headtail_move_head(&r->cons, &r->prod, 0,
is_sc, n, behavior, old_head, new_head, entries);
+ RTE_ASSERT(*entries <= r->capacity);
+ return n;
}
/**
diff --git a/lib/ring/rte_ring_hts_elem_pvt.h b/lib/ring/rte_ring_hts_elem_pvt.h
index e2b82dd1e6..c59e5f6420 100644
--- a/lib/ring/rte_ring_hts_elem_pvt.h
+++ b/lib/ring/rte_ring_hts_elem_pvt.h
@@ -136,8 +136,10 @@ __rte_ring_hts_move_prod_head(struct rte_ring *r, unsigned int num,
enum rte_ring_queue_behavior behavior, uint32_t *old_head,
uint32_t *free_entries)
{
- return __rte_ring_hts_move_head(&r->hts_prod, &r->cons,
+ num = __rte_ring_hts_move_head(&r->hts_prod, &r->cons,
r->capacity, num, behavior, old_head, free_entries);
+ RTE_ASSERT(*free_entries <= r->capacity);
+ return num;
}
/**
@@ -148,8 +150,10 @@ __rte_ring_hts_move_cons_head(struct rte_ring *r, unsigned int num,
enum rte_ring_queue_behavior behavior, uint32_t *old_head,
uint32_t *entries)
{
- return __rte_ring_hts_move_head(&r->hts_cons, &r->prod,
+ num = __rte_ring_hts_move_head(&r->hts_cons, &r->prod,
0, num, behavior, old_head, entries);
+ RTE_ASSERT(*entries <= r->capacity);
+ return num;
}
/**
diff --git a/lib/ring/rte_ring_rts_elem_pvt.h b/lib/ring/rte_ring_rts_elem_pvt.h
index 96825931f8..509fa674fb 100644
--- a/lib/ring/rte_ring_rts_elem_pvt.h
+++ b/lib/ring/rte_ring_rts_elem_pvt.h
@@ -152,8 +152,10 @@ __rte_ring_rts_move_prod_head(struct rte_ring *r, uint32_t num,
enum rte_ring_queue_behavior behavior, uint32_t *old_head,
uint32_t *free_entries)
{
- return __rte_ring_rts_move_head(&r->rts_prod, &r->cons,
+ num = __rte_ring_rts_move_head(&r->rts_prod, &r->cons,
r->capacity, num, behavior, old_head, free_entries);
+ RTE_ASSERT(*free_entries <= r->capacity);
+ return num;
}
/**
@@ -164,8 +166,10 @@ __rte_ring_rts_move_cons_head(struct rte_ring *r, uint32_t num,
enum rte_ring_queue_behavior behavior, uint32_t *old_head,
uint32_t *entries)
{
- return __rte_ring_rts_move_head(&r->rts_cons, &r->prod,
+ num = __rte_ring_rts_move_head(&r->rts_cons, &r->prod,
0, num, behavior, old_head, entries);
+ RTE_ASSERT(*entries <= r->capacity);
+ return num;
}
/**
diff --git a/lib/ring/soring.c b/lib/ring/soring.c
index 797484d6bf..21a1a27e24 100644
--- a/lib/ring/soring.c
+++ b/lib/ring/soring.c
@@ -156,6 +156,7 @@ __rte_soring_move_prod_head(struct rte_soring *r, uint32_t num,
n = 0;
}
+ RTE_ASSERT(*free <= r->capacity);
return n;
}
@@ -190,6 +191,7 @@ __rte_soring_move_cons_head(struct rte_soring *r, uint32_t stage, uint32_t num,
n = 0;
}
+ RTE_ASSERT(*avail <= r->capacity);
return n;
}
--
2.43.0
next prev parent reply other threads:[~2025-05-21 11:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-21 11:14 [PATCH v1 0/4] ring: some fixes and improvements Konstantin Ananyev
2025-05-21 11:14 ` Konstantin Ananyev [this message]
2025-05-21 12:14 ` [PATCH v1 1/4] ring: introduce extra run-time checks Morten Brørup
2025-05-21 12:34 ` Konstantin Ananyev
2025-05-21 18:36 ` Morten Brørup
2025-05-21 19:38 ` Konstantin Ananyev
2025-05-21 22:02 ` Morten Brørup
2025-05-21 11:14 ` [PATCH v1 2/4] ring/soring: fix head-tail synchronization issue Konstantin Ananyev
2025-05-21 11:14 ` [PATCH v1 3/4] ring: fix potential sync issue between head and tail values Konstantin Ananyev
2025-05-21 20:26 ` Morten Brørup
2025-05-21 11:14 ` [PATCH v1 4/4] config/x86: enable RTE_USE_C11_MEM_MODEL by default Konstantin Ananyev
2025-05-21 19:47 ` Morten Brørup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250521111432.207936-2-konstantin.ananyev@huawei.com \
--to=konstantin.ananyev@huawei.com \
--cc=dev@dpdk.org \
--cc=drc@linux.ibm.com \
--cc=hemant.agrawal@nxp.com \
--cc=honnappa.nagarahalli@arm.com \
--cc=jerinj@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).