diff mbox

[dpdk-dev,v5,04/12] mbuf: fix rte_pktmbuf_init when mbuf private size is not zero

Message ID 1429610122-30943-5-git-send-email-olivier.matz@6wind.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Olivier Matz April 21, 2015, 9:55 a.m. UTC 
  Allow the user to use the default rte_pktmbuf_init() function even
if the mbuf private size is not 0.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_mbuf/rte_mbuf.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Comments

Ananyev, Konstantin April 21, 2015, 3:07 p.m. UTC | #1 
> -----Original Message-----
> From: Olivier Matz [mailto:olivier.matz@6wind.com]
> Sent: Tuesday, April 21, 2015 10:55 AM
> To: dev@dpdk.org
> Cc: Ananyev, Konstantin; zoltan.kiss@linaro.org; Richardson, Bruce; nhorman@tuxdriver.com; olivier.matz@6wind.com
> Subject: [PATCH v5 04/12] mbuf: fix rte_pktmbuf_init when mbuf private size is not zero
> 
> Allow the user to use the default rte_pktmbuf_init() function even
> if the mbuf private size is not 0.
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  lib/librte_mbuf/rte_mbuf.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
> index 231cfb8..d7f0380 100644
> --- a/lib/librte_mbuf/rte_mbuf.c
> +++ b/lib/librte_mbuf/rte_mbuf.c
> @@ -119,16 +119,19 @@ rte_pktmbuf_init(struct rte_mempool *mp,
>  		 __attribute__((unused)) unsigned i)
>  {
>  	struct rte_mbuf *m = _m;
> -	uint32_t buf_len = mp->elt_size - sizeof(struct rte_mbuf);
> +	uint32_t mbuf_size, buf_len;
> 
> -	RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf));
> +	mbuf_size = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(mp);
> +	buf_len = rte_pktmbuf_data_room_size(mp);
> +
> +	RTE_MBUF_ASSERT(mp->elt_size >= mbuf_size);
> +	RTE_MBUF_ASSERT(buf_len <= 0xffff);

As a nit: s/0xfff/UINT16_MAX/.
Konstantin

> 
>  	memset(m, 0, mp->elt_size);
> 
>  	/* start of buffer is just after mbuf structure */
> -	m->buf_addr = (char *)m + sizeof(struct rte_mbuf);
> -	m->buf_physaddr = rte_mempool_virt2phy(mp, m) +
> -			sizeof(struct rte_mbuf);
> +	m->buf_addr = (char *)m + mbuf_size;
> +	m->buf_physaddr = rte_mempool_virt2phy(mp, m) + mbuf_size;
>  	m->buf_len = (uint16_t)buf_len;
> 
>  	/* keep some headroom between start of buffer and data */
> --
> 2.1.4
diff mbox

Patch

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 231cfb8..d7f0380 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -119,16 +119,19 @@  rte_pktmbuf_init(struct rte_mempool *mp,
 		 __attribute__((unused)) unsigned i)
 {
 	struct rte_mbuf *m = _m;
-	uint32_t buf_len = mp->elt_size - sizeof(struct rte_mbuf);
+	uint32_t mbuf_size, buf_len;
 
-	RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf));
+	mbuf_size = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(mp);
+	buf_len = rte_pktmbuf_data_room_size(mp);
+
+	RTE_MBUF_ASSERT(mp->elt_size >= mbuf_size);
+	RTE_MBUF_ASSERT(buf_len <= 0xffff);
 
 	memset(m, 0, mp->elt_size);
 
 	/* start of buffer is just after mbuf structure */
-	m->buf_addr = (char *)m + sizeof(struct rte_mbuf);
-	m->buf_physaddr = rte_mempool_virt2phy(mp, m) +
-			sizeof(struct rte_mbuf);
+	m->buf_addr = (char *)m + mbuf_size;
+	m->buf_physaddr = rte_mempool_virt2phy(mp, m) + mbuf_size;
 	m->buf_len = (uint16_t)buf_len;
 
 	/* keep some headroom between start of buffer and data */