[dpdk-dev] mbuf: fix for incomplete nb_segs/port types change
Checks
Commit Message
Update types of variables to correspond to nb_segs type change from
uint8_t to uint16_t. Also, use 0xffff instead of 0xff to specify
invalid port value.
Fixes: 97cb466d ("mbuf: use 2 bytes for port and nb segments")
Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
---
lib/librte_mbuf/rte_mbuf.c | 6 +++---
lib/librte_mbuf/rte_mbuf.h | 13 ++++++++-----
lib/librte_pdump/rte_pdump.c | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
--
2.7.4
Comments
On Thu, 9 Nov 2017 17:51:41 +0400
Ilya Matveychikov <matvejchikov@gmail.com> wrote:
> Update types of variables to correspond to nb_segs type change from
> uint8_t to uint16_t. Also, use 0xffff instead of 0xff to specify
> invalid port value.
>
> Fixes: 97cb466d ("mbuf: use 2 bytes for port and nb segments")
> Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
> ---
> lib/librte_mbuf/rte_mbuf.c | 6 +++---
> lib/librte_mbuf/rte_mbuf.h | 13 ++++++++-----
> lib/librte_pdump/rte_pdump.c | 2 +-
> 3 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
> index 26a62b8..f2213a4 100644
> --- a/lib/librte_mbuf/rte_mbuf.c
> +++ b/lib/librte_mbuf/rte_mbuf.c
> @@ -144,7 +144,7 @@ rte_pktmbuf_init(struct rte_mempool *mp,
> /* init some constant fields */
> m->pool = mp;
> m->nb_segs = 1;
> - m->port = 0xff;
> + m->port = 0xffff;
In current code this now uses MBUF_INVALID_PORT here
@@ -144,7 +144,7 @@ rte_pktmbuf_init(struct rte_mempool *mp,
/* init some constant fields */
m->pool = mp;
m->nb_segs = 1;
- m->port = 0xff;
+ m->port = 0xffff;
rte_mbuf_refcnt_set(m, 1);
m->next = NULL;
}
@@ -203,7 +203,7 @@ void
rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
{
const struct rte_mbuf *m_seg;
- unsigned nb_segs;
+ unsigned int nb_segs;
if (m == NULL)
rte_panic("mbuf is NULL\n");
@@ -239,7 +239,7 @@ void
rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
{
unsigned int len;
- unsigned nb_segs;
+ unsigned int nb_segs;
__rte_mbuf_sanity_check(m, 1);
@@ -546,6 +546,9 @@ struct rte_mbuf {
} __rte_cache_aligned;
+/**< Maximum number @nb_segs allowed. */
+#define RTE_MBUF_MAX_NB_SEGS 0xffff
+
/**
* Prefetch the first part of the mbuf
*
@@ -1095,7 +1098,7 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)
m->vlan_tci = 0;
m->vlan_tci_outer = 0;
m->nb_segs = 1;
- m->port = 0xff;
+ m->port = 0xffff;
m->ol_flags = 0;
m->packet_type = 0;
@@ -1392,7 +1395,7 @@ static inline struct rte_mbuf *rte_pktmbuf_clone(struct rte_mbuf *md,
{
struct rte_mbuf *mc, *mi, **prev;
uint32_t pktlen;
- uint8_t nseg;
+ uint16_t nseg;
if (unlikely ((mc = rte_pktmbuf_alloc(mp)) == NULL))
return NULL;
@@ -1745,14 +1748,14 @@ static inline const void *rte_pktmbuf_read(const struct rte_mbuf *m,
*
* @return
* - 0, on success.
- * - -EOVERFLOW, if the chain is full (256 entries)
+ * - -EOVERFLOW, if the chain segment limit exceded
*/
static inline int rte_pktmbuf_chain(struct rte_mbuf *head, struct rte_mbuf *tail)
{
struct rte_mbuf *cur_tail;
/* Check for number-of-segments-overflow */
- if (head->nb_segs + tail->nb_segs >= 1 << (sizeof(head->nb_segs) * 8))
+ if (head->nb_segs + tail->nb_segs > RTE_MBUF_MAX_NB_SEGS)
return -EOVERFLOW;
/* Chain 'tail' onto the old tail */
@@ -1760,7 +1763,7 @@ static inline int rte_pktmbuf_chain(struct rte_mbuf *head, struct rte_mbuf *tail
cur_tail->next = tail;
/* accumulate number of segments and total length. */
- head->nb_segs = (uint8_t)(head->nb_segs + tail->nb_segs);
+ head->nb_segs += tail->nb_segs;
head->pkt_len += tail->pkt_len;
/* pkt_len is only set in the head */
@@ -139,7 +139,7 @@ pdump_pktmbuf_copy(struct rte_mbuf *m, struct rte_mempool *mp)
{
struct rte_mbuf *m_dup, *seg, **prev;
uint32_t pktlen;
- uint8_t nseg;
+ uint16_t nseg;
m_dup = rte_pktmbuf_alloc(mp);
if (unlikely(m_dup == NULL))