* [PATCH 2/2] net/bnxt: use new API to get iova address
2017-12-14 14:28 [PATCH 1/2] net/bnxt: fix headroom initialization Olivier Matz
@ 2017-12-14 14:28 ` Olivier Matz
2017-12-14 17:47 ` Ajit Khaparde
2017-12-14 17:47 ` [PATCH 1/2] net/bnxt: fix headroom initialization Ajit Khaparde
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Olivier Matz @ 2017-12-14 14:28 UTC (permalink / raw)
To: dev, Stephen Hurd, Ajit Khaparde
The functions rte_mbuf_data_dma_addr*() are deprecated.
Replace them with their iova version. Also rename the 'data' variable
to 'mbuf' for more readability.
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
drivers/net/bnxt/bnxt_ring.h | 3 ---
drivers/net/bnxt/bnxt_rxr.c | 22 +++++++++++-----------
drivers/net/bnxt/bnxt_txr.c | 4 ++--
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h
index 164f482e3..12992f2da 100644
--- a/drivers/net/bnxt/bnxt_ring.h
+++ b/drivers/net/bnxt/bnxt_ring.h
@@ -40,9 +40,6 @@
#define RING_NEXT(ring, idx) (((idx) + 1) & (ring)->ring_mask)
-#define RTE_MBUF_DATA_DMA_ADDR(mb) \
- ((uint64_t)((mb)->buf_iova + (mb)->data_off))
-
#define DB_IDX_MASK 0xffffff
#define DB_IDX_VALID (0x1 << 26)
#define DB_IRQ_DIS (0x1 << 27)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 3fff4d437..82c93d6dc 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -65,17 +65,17 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
{
struct rx_prod_pkt_bd *rxbd = &rxr->rx_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[prod];
- struct rte_mbuf *data;
+ struct rte_mbuf *mbuf;
- data = __bnxt_alloc_rx_data(rxq->mb_pool);
- if (!data) {
+ mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
+ if (!mbuf) {
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
- rx_buf->mbuf = data;
+ rx_buf->mbuf = mbuf;
- rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(data));
+ rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
return 0;
}
@@ -86,10 +86,10 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
{
struct rx_prod_pkt_bd *rxbd = &rxr->ag_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->ag_buf_ring[prod];
- struct rte_mbuf *data;
+ struct rte_mbuf *mbuf;
- data = __bnxt_alloc_rx_data(rxq->mb_pool);
- if (!data) {
+ mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
+ if (!mbuf) {
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
@@ -100,9 +100,9 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
RTE_LOG(ERR, PMD, "Jumbo Frame. rx_buf is NULL\n");
- rx_buf->mbuf = data;
+ rx_buf->mbuf = mbuf;
- rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_dma_addr_default(data));
+ rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
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_default(mbuf));
+ prod_bd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
rxr->rx_prod = prod;
}
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 8ca4bbd80..676551e5c 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -181,7 +181,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
txbd->flags_type |= TX_BD_LONG_FLAGS_LHINT_GTE2K;
else
txbd->flags_type |= lhint_arr[txbd->len >> 9];
- txbd->addr = rte_cpu_to_le_32(RTE_MBUF_DATA_DMA_ADDR(tx_buf->mbuf));
+ txbd->addr = rte_cpu_to_le_32(rte_mbuf_data_iova(tx_buf->mbuf));
if (long_bd) {
txbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG;
@@ -257,7 +257,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
tx_buf = &txr->tx_buf_ring[txr->tx_prod];
txbd = &txr->tx_desc_ring[txr->tx_prod];
- txbd->addr = rte_cpu_to_le_32(RTE_MBUF_DATA_DMA_ADDR(m_seg));
+ txbd->addr = rte_cpu_to_le_32(rte_mbuf_data_iova(m_seg));
txbd->flags_type = TX_BD_SHORT_TYPE_TX_BD_SHORT;
txbd->len = m_seg->data_len;
--
2.11.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] net/bnxt: fix headroom initialization
2017-12-14 14:28 [PATCH 1/2] net/bnxt: fix headroom initialization Olivier Matz
2017-12-14 14:28 ` [PATCH 2/2] net/bnxt: use new API to get iova address Olivier Matz
@ 2017-12-14 17:47 ` Ajit Khaparde
2017-12-16 2:30 ` [dpdk-stable] " Ferruh Yigit
2018-01-03 10:32 ` [PATCH v2 1/2] net/bnxt: use new API to get iova address Olivier Matz
3 siblings, 0 replies; 9+ messages in thread
From: Ajit Khaparde @ 2017-12-14 17:47 UTC (permalink / raw)
To: Olivier Matz; +Cc: dev, Stephen Hurd, dpdk stable
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>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH 1/2] net/bnxt: fix headroom initialization
2017-12-14 14:28 [PATCH 1/2] net/bnxt: fix headroom initialization Olivier Matz
2017-12-14 14:28 ` [PATCH 2/2] net/bnxt: use new API to get iova address Olivier Matz
2017-12-14 17:47 ` [PATCH 1/2] net/bnxt: fix headroom initialization Ajit Khaparde
@ 2017-12-16 2:30 ` Ferruh Yigit
2017-12-16 17:25 ` Olivier MATZ
2018-01-03 10:32 ` [PATCH v2 1/2] net/bnxt: use new API to get iova address Olivier Matz
3 siblings, 1 reply; 9+ messages in thread
From: Ferruh Yigit @ 2017-12-16 2:30 UTC (permalink / raw)
To: Olivier Matz, dev, Ajit Khaparde; +Cc: stable
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [dpdk-stable] [PATCH 1/2] net/bnxt: fix headroom initialization
2017-12-16 2:30 ` [dpdk-stable] " Ferruh Yigit
@ 2017-12-16 17:25 ` Olivier MATZ
0 siblings, 0 replies; 9+ messages in thread
From: Olivier MATZ @ 2017-12-16 17:25 UTC (permalink / raw)
To: Ferruh Yigit; +Cc: dev, Ajit Khaparde, stable
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/2] net/bnxt: use new API to get iova address
2017-12-14 14:28 [PATCH 1/2] net/bnxt: fix headroom initialization Olivier Matz
` (2 preceding siblings ...)
2017-12-16 2:30 ` [dpdk-stable] " Ferruh Yigit
@ 2018-01-03 10:32 ` Olivier Matz
2018-01-03 10:32 ` [PATCH v2 2/2] net/bnxt: fix headroom initialization Olivier Matz
2018-01-10 20:49 ` [PATCH v2 1/2] net/bnxt: use new API to get iova address Ferruh Yigit
3 siblings, 2 replies; 9+ messages in thread
From: Olivier Matz @ 2018-01-03 10:32 UTC (permalink / raw)
To: dev, Ajit Khaparde; +Cc: Ferruh Yigit
Replace internal functions to get dma address them with their generic iova
version. Also rename the 'data' variable to 'mbuf' for more readability.
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
v1 -> v2:
- invert patches 1/2 and 2/2, and update commit log consequently
drivers/net/bnxt/bnxt_ring.h | 3 ---
drivers/net/bnxt/bnxt_rxr.c | 22 +++++++++++-----------
drivers/net/bnxt/bnxt_txr.c | 4 ++--
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h
index 164f482e3..12992f2da 100644
--- a/drivers/net/bnxt/bnxt_ring.h
+++ b/drivers/net/bnxt/bnxt_ring.h
@@ -40,9 +40,6 @@
#define RING_NEXT(ring, idx) (((idx) + 1) & (ring)->ring_mask)
-#define RTE_MBUF_DATA_DMA_ADDR(mb) \
- ((uint64_t)((mb)->buf_iova + (mb)->data_off))
-
#define DB_IDX_MASK 0xffffff
#define DB_IDX_VALID (0x1 << 26)
#define DB_IRQ_DIS (0x1 << 27)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 188df362e..89114ccb7 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -65,17 +65,17 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
{
struct rx_prod_pkt_bd *rxbd = &rxr->rx_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[prod];
- struct rte_mbuf *data;
+ struct rte_mbuf *mbuf;
- data = __bnxt_alloc_rx_data(rxq->mb_pool);
- if (!data) {
+ mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
+ if (!mbuf) {
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
- rx_buf->mbuf = data;
+ rx_buf->mbuf = mbuf;
- 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_iova(mbuf));
return 0;
}
@@ -86,10 +86,10 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
{
struct rx_prod_pkt_bd *rxbd = &rxr->ag_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->ag_buf_ring[prod];
- struct rte_mbuf *data;
+ struct rte_mbuf *mbuf;
- data = __bnxt_alloc_rx_data(rxq->mb_pool);
- if (!data) {
+ mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
+ if (!mbuf) {
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
@@ -100,9 +100,9 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
RTE_LOG(ERR, PMD, "Jumbo Frame. rx_buf is NULL\n");
- rx_buf->mbuf = data;
+ rx_buf->mbuf = mbuf;
- 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_iova(mbuf));
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_iova(mbuf));
rxr->rx_prod = prod;
}
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 8ca4bbd80..676551e5c 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -181,7 +181,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
txbd->flags_type |= TX_BD_LONG_FLAGS_LHINT_GTE2K;
else
txbd->flags_type |= lhint_arr[txbd->len >> 9];
- txbd->addr = rte_cpu_to_le_32(RTE_MBUF_DATA_DMA_ADDR(tx_buf->mbuf));
+ txbd->addr = rte_cpu_to_le_32(rte_mbuf_data_iova(tx_buf->mbuf));
if (long_bd) {
txbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG;
@@ -257,7 +257,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
tx_buf = &txr->tx_buf_ring[txr->tx_prod];
txbd = &txr->tx_desc_ring[txr->tx_prod];
- txbd->addr = rte_cpu_to_le_32(RTE_MBUF_DATA_DMA_ADDR(m_seg));
+ txbd->addr = rte_cpu_to_le_32(rte_mbuf_data_iova(m_seg));
txbd->flags_type = TX_BD_SHORT_TYPE_TX_BD_SHORT;
txbd->len = m_seg->data_len;
--
2.11.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/2] net/bnxt: fix headroom initialization
2018-01-03 10:32 ` [PATCH v2 1/2] net/bnxt: use new API to get iova address Olivier Matz
@ 2018-01-03 10:32 ` Olivier Matz
2018-01-10 20:49 ` [PATCH v2 1/2] net/bnxt: use new API to get iova address Ferruh Yigit
1 sibling, 0 replies; 9+ messages in thread
From: Olivier Matz @ 2018-01-03 10:32 UTC (permalink / raw)
To: dev, Ajit Khaparde; +Cc: Ferruh Yigit, stable
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>
---
v1 -> v2:
- invert patches 1/2 and 2/2
Note for backport: the first version of this patch [1] may apply more
easily.
[1] https://dpdk.org/dev/patchwork/patch/32266/
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 89114ccb7..82c93d6dc 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 = mbuf;
- rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova(mbuf));
+ rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
return 0;
}
@@ -102,7 +102,7 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
rx_buf->mbuf = mbuf;
- rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova(mbuf));
+ rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
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_iova(mbuf));
+ prod_bd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_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;
--
2.11.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/2] net/bnxt: use new API to get iova address
2018-01-03 10:32 ` [PATCH v2 1/2] net/bnxt: use new API to get iova address Olivier Matz
2018-01-03 10:32 ` [PATCH v2 2/2] net/bnxt: fix headroom initialization Olivier Matz
@ 2018-01-10 20:49 ` Ferruh Yigit
1 sibling, 0 replies; 9+ messages in thread
From: Ferruh Yigit @ 2018-01-10 20:49 UTC (permalink / raw)
To: Olivier Matz, dev, Ajit Khaparde
On 1/3/2018 10:32 AM, Olivier Matz wrote:
> Replace internal functions to get dma address them with their generic iova
> version. Also rename the 'data' variable to 'mbuf' for more readability.
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Series applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread