[dpdk-stable] [PATCH] net/bnxt: fix headroom initialization

[dpdk-stable] [PATCH] net/bnxt: fix headroom initialization

[Olivier Matz]

[ backported from upstream commit 35906acbf34daa32469fa63d759846057f36e6fb ]

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>
---

Hi Luca,

This patch is for the v16.11 stable branch.

Thanks,
Olivier


 drivers/net/bnxt/bnxt_rxr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 825337160..5698f02f3 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -72,7 +72,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;
 }
@@ -126,6 +126,7 @@ static uint16_t bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 	mbuf = rx_buf->mbuf;
 	rte_prefetch0(mbuf);
 
+	mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 	mbuf->nb_segs = 1;
 	mbuf->next = NULL;
 	mbuf->pkt_len = rxcmp->len;
-- 
2.11.0

Re: [dpdk-stable] [PATCH] net/bnxt: fix headroom initialization

[Luca Boccassi]

On Wed, 2018-02-14 at 09:39 +0100, Olivier Matz wrote:
> [ backported from upstream commit
> 35906acbf34daa32469fa63d759846057f36e6fb ]
> 
> 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>
> ---
> 
> Hi Luca,
> 
> This patch is for the v16.11 stable branch.
> 
> Thanks,
> Olivier

Thank you very much, applied&pushed.

-- 
Kind regards,
Luca Boccassi