d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx4: optimize Tx external memory registration

Browse Source 
There's some performance drop due to extra condition checks on the
datapath. Checking for external memory registration should be consolidated
to the existing bottom-half.

Fixes: 31912d992403 ("net/mlx4: support externally allocated static memory")
Cc: stable@dpdk.org

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
This commit is contained in:
Yongseok Koh 2018-11-15 10:29:16 +00:00 committed by Ferruh Yigit
parent 57e1073bdc
commit 1948776360
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/mlx4/mlx4_mr.c
View File

@ -1042,7 +1042,7 @@ mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr)
* @return * @return
* Searched LKey on success, UINT32_MAX on no match. * Searched LKey on success, UINT32_MAX on no match.
*/ */
uint32_t static uint32_t
mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr) mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr)
{ {
struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl; struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl;
@ -1053,6 +1053,32 @@ mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr)
return mlx4_mr_addr2mr_bh(priv->dev, mr_ctrl, addr); return mlx4_mr_addr2mr_bh(priv->dev, mr_ctrl, addr);
} }
/**
* Bottom-half of LKey search on Tx. If it can't be searched in the memseg
* list, register the mempool of the mbuf as externally allocated memory.
*
* @param txq
* Pointer to Tx queue structure.
* @param mb
* Pointer to mbuf.
*
* @return
* Searched LKey on success, UINT32_MAX on no match.
*/
uint32_t
mlx4_tx_mb2mr_bh(struct txq *txq, struct rte_mbuf *mb)
{
uintptr_t addr = (uintptr_t)mb->buf_addr;
uint32_t lkey;
lkey = mlx4_tx_addr2mr_bh(txq, addr);
if (lkey == UINT32_MAX && rte_errno == ENXIO) {
/* Mempool may have externally allocated memory. */
return mlx4_tx_update_ext_mp(txq, addr, mlx4_mb2mp(mb));
}
return lkey;
}
/** /**
* Flush all of the local cache entries. * Flush all of the local cache entries.
* *

26
drivers/net/mlx4/mlx4_rxtx.h
View File

@ -162,7 +162,7 @@ void mlx4_tx_queue_release(void *dpdk_txq);
void mlx4_mr_flush_local_cache(struct mlx4_mr_ctrl *mr_ctrl); void mlx4_mr_flush_local_cache(struct mlx4_mr_ctrl *mr_ctrl);
uint32_t mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr); uint32_t mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr);
uint32_t mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr); uint32_t mlx4_tx_mb2mr_bh(struct txq *txq, struct rte_mbuf *mb);
uint32_t mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr, uint32_t mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr,
struct rte_mempool *mp); struct rte_mempool *mp);
@ -176,7 +176,7 @@ uint32_t mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr,
* @return * @return
* Memory pool where data is located for given mbuf. * Memory pool where data is located for given mbuf.
*/ */
static struct rte_mempool * static inline struct rte_mempool *
mlx4_mb2mp(struct rte_mbuf *buf) mlx4_mb2mp(struct rte_mbuf *buf)
{ {
if (unlikely(RTE_MBUF_INDIRECT(buf))) if (unlikely(RTE_MBUF_INDIRECT(buf)))
@ -225,9 +225,10 @@ mlx4_rx_addr2mr(struct rxq *rxq, uintptr_t addr)
* Searched LKey on success, UINT32_MAX on no match. * Searched LKey on success, UINT32_MAX on no match.
*/ */
static __rte_always_inline uint32_t static __rte_always_inline uint32_t
mlx4_tx_addr2mr(struct txq *txq, uintptr_t addr) mlx4_tx_mb2mr(struct txq *txq, struct rte_mbuf *mb)
{ {
struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl; struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl;
uintptr_t addr = (uintptr_t)mb->buf_addr;
uint32_t lkey; uint32_t lkey;
/* Check generation bit to see if there's any change on existing MRs. */ /* Check generation bit to see if there's any change on existing MRs. */
@ -238,23 +239,8 @@ mlx4_tx_addr2mr(struct txq *txq, uintptr_t addr)
MLX4_MR_CACHE_N, addr); MLX4_MR_CACHE_N, addr);
if (likely(lkey != UINT32_MAX)) if (likely(lkey != UINT32_MAX))
return lkey; return lkey;
/* Take slower bottom-half (binary search) on miss. */ /* Take slower bottom-half on miss. */
return mlx4_tx_addr2mr_bh(txq, addr); return mlx4_tx_mb2mr_bh(txq, mb);
}
static __rte_always_inline uint32_t
mlx4_tx_mb2mr(struct txq *txq, struct rte_mbuf *mb)
{
uintptr_t addr = (uintptr_t)mb->buf_addr;
uint32_t lkey = mlx4_tx_addr2mr(txq, addr);
if (likely(lkey != UINT32_MAX))
return lkey;
if (rte_errno == ENXIO) {
/* Mempool may have externally allocated memory. */
lkey = mlx4_tx_update_ext_mp(txq, addr, mlx4_mb2mp(mb));
}
return lkey;
} }
#endif /* MLX4_RXTX_H_ */ #endif /* MLX4_RXTX_H_ */