diff mbox

[dpdk-dev,1/2] net/bnxt: fix headroom initialization

Message ID 20171214142825.28176-1-olivier.matz@6wind.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Olivier Matz Dec. 14, 2017, 2:28 p.m. UTC 
  When allocating a new mbuf for Rx, the value of m->data_off should not
be reset to its default value (RTE_PKTMBUF_HEADROOM), instead of reusing
the previous undefined value, which could cause the packet to have a too
small or too high headroom.

Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code")
Cc: stable@dpdk.org

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 drivers/net/bnxt/bnxt_rxr.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Ajit Khaparde Dec. 14, 2017, 5:47 p.m. UTC | #1 
On Thu, Dec 14, 2017 at 6:28 AM, Olivier Matz <olivier.matz@6wind.com>
wrote:

> When allocating a new mbuf for Rx, the value of m->data_off should not
> be reset to its default value (RTE_PKTMBUF_HEADROOM), instead of reusing
> the previous undefined value, which could cause the packet to have a too
> small or too high headroom.
>
> Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code")
> Cc: stable@dpdk.org
>
> ​​
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
>

Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
​​
Ferruh Yigit Dec. 16, 2017, 2:30 a.m. UTC | #2 
On 12/14/2017 6:28 AM, Olivier Matz wrote:
> When allocating a new mbuf for Rx, the value of m->data_off should not
> be reset to its default value (RTE_PKTMBUF_HEADROOM), instead of reusing
> the previous undefined value, which could cause the packet to have a too
> small or too high headroom.
> 
> Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  drivers/net/bnxt/bnxt_rxr.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
> index 188df362e..3fff4d437 100644
> --- a/drivers/net/bnxt/bnxt_rxr.c
> +++ b/drivers/net/bnxt/bnxt_rxr.c
> @@ -75,7 +75,7 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
>  
>  	rx_buf->mbuf = data;
>  
> -	rxbd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf));
> +	rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(data));

Hi Olivier,

Using deprecated rte_mbuf_data_dma_addr_default() breaks build for this commit.

What do you think using directly rte_mbuf_data_iova_default() in this patch?

Thanks,
ferruh
Olivier Matz Dec. 16, 2017, 5:25 p.m. UTC | #3 
Hi Ferruh,

On Fri, Dec 15, 2017 at 06:30:58PM -0800, Ferruh Yigit wrote:
> On 12/14/2017 6:28 AM, Olivier Matz wrote:
> > When allocating a new mbuf for Rx, the value of m->data_off should not
> > be reset to its default value (RTE_PKTMBUF_HEADROOM), instead of reusing
> > the previous undefined value, which could cause the packet to have a too
> > small or too high headroom.
> > 
> > Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> > ---
> >  drivers/net/bnxt/bnxt_rxr.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
> > index 188df362e..3fff4d437 100644
> > --- a/drivers/net/bnxt/bnxt_rxr.c
> > +++ b/drivers/net/bnxt/bnxt_rxr.c
> > @@ -75,7 +75,7 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
> >  
> >  	rx_buf->mbuf = data;
> >  
> > -	rxbd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf));
> > +	rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(data));
> 
> Hi Olivier,
> 
> Using deprecated rte_mbuf_data_dma_addr_default() breaks build for this commit.
> 
> What do you think using directly rte_mbuf_data_iova_default() in this patch?

No problem. It was initially split in 2 patches to ease the backport for
stable versions.
diff mbox

Patch

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 188df362e..3fff4d437 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -75,7 +75,7 @@  static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
 
 	rx_buf->mbuf = data;
 
-	rxbd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf));
+	rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(data));
 
 	return 0;
 }
@@ -102,7 +102,7 @@  static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
 
 	rx_buf->mbuf = data;
 
-	rxbd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf));
+	rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(data));
 
 	return 0;
 }
@@ -123,7 +123,7 @@  static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr,
 
 	prod_bd = &rxr->rx_desc_ring[prod];
 
-	prod_bd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(mbuf));
+	prod_bd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(mbuf));
 
 	rxr->rx_prod = prod;
 }
@@ -442,6 +442,7 @@  static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 
 	rte_prefetch0(mbuf);
 
+	mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 	mbuf->nb_segs = 1;
 	mbuf->next = NULL;
 	mbuf->pkt_len = rxcmp->len;