common/mlx5: fix MPRQ mempool registration

Mempool registration code had a wrong assumption that it is always
dealing with packet mempools and always called rte_pktmbuf_priv_flags(),
which returned a random value for different types of mempools.
In particular, it could consider MPRQ mempools as having externally
pinned buffers, which is wrong.
Packet mempools cannot be reliably recognized, but it is sufficient to
check that the mempool is not a packet one, so it cannot have externally
pinned buffers.
Compare mempool private data size to that of packet mempools to check.

Fixes: 690b2a88c2f7 ("common/mlx5: add mempool registration facilities")
Fixes: fec28ca0e3a9 ("net/mlx5: support mempool registration")
Signed-off-by: Dmitry Kozlyuk <dkozlyuk@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index b9ed5ee6764c5d7d3dc580bb635c5b56e340f21c..66c2c08b7dce4da74823a673c0e1b123f5901bd7 100644 (file)
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -390,8 +390,7 @@ mlx5_dev_mempool_event_cb(enum rte_mempool_event event, struct rte_mempool *mp,
                          void *arg)
 {
        struct mlx5_common_device *cdev = arg;
-       bool extmem = rte_pktmbuf_priv_flags(mp) &
-                     RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF;
+       bool extmem = mlx5_mempool_is_extmem(mp);
 
        switch (event) {
        case RTE_MEMPOOL_EVENT_READY:

diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 1d2a107597c1ae197f5f232156bbaa4fdffb0dc7..70365e1466c239d3ffa9496354b44b3e09d56789 100644 (file)
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -1305,6 +1305,7 @@ mlx5_mempool_get_chunks(struct rte_mempool *mp, struct mlx5_range **out,
        struct mlx5_range *chunks;
        unsigned int n;
 
+       DRV_LOG(DEBUG, "Collecting chunks of regular mempool %s", mp->name);
        n = mp->nb_mem_chunks;
        chunks = calloc(sizeof(chunks[0]), n);
        if (chunks == NULL)
@@ -1385,6 +1386,8 @@ mlx5_mempool_get_extmem(struct rte_mempool *mp, struct mlx5_range **out,
 {
        struct mlx5_mempool_get_extmem_data data;
 
+       DRV_LOG(DEBUG, "Recovering external pinned pages of mempool %s",
+               mp->name);
        memset(&data, 0, sizeof(data));
        rte_mempool_obj_iter(mp, mlx5_mempool_get_extmem_cb, &data);
        if (data.ret < 0)
@@ -1417,7 +1420,7 @@ mlx5_get_mempool_ranges(struct rte_mempool *mp, struct mlx5_range **out,
        int ret;
 
        /* Collect the pool underlying memory. */
-       ret = (rte_pktmbuf_priv_flags(mp) & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF) ?
+       ret = mlx5_mempool_is_extmem(mp) ?
              mlx5_mempool_get_extmem(mp, &chunks, &chunks_n) :
              mlx5_mempool_get_chunks(mp, &chunks, &chunks_n);
        if (ret < 0)

diff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h
index cc885c45217957273b4907b4faa2c275196882ed..de0cab29cceadb37a2a5bf7c379b29f44c3e7dfe 100644 (file)
--- a/drivers/common/mlx5/mlx5_common_mr.h
+++ b/drivers/common/mlx5/mlx5_common_mr.h
@@ -261,4 +261,14 @@ int
 mlx5_mr_mempool_unregister(struct mlx5_common_device *cdev,
                           struct rte_mempool *mp);
 
+/** Check if @p mp has buffers pinned in external memory. */
+static inline bool
+mlx5_mempool_is_extmem(struct rte_mempool *mp)
+{
+       return (mp->private_data_size ==
+               sizeof(struct rte_pktmbuf_pool_private)) &&
+              (mp->elt_size >= sizeof(struct rte_mbuf)) &&
+              (rte_pktmbuf_priv_flags(mp) & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF);
+}
+
 #endif /* RTE_PMD_MLX5_COMMON_MR_H_ */

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 65caa5ac14d51e81ee59317ea24bac922f0f1909..e2bfde19c77290463e702eff01fafc339651c5c8 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -149,13 +149,14 @@ mlx5_rxq_mempool_register(struct mlx5_rxq_ctrl *rxq_ctrl)
                uint32_t flags;
 
                mp = rxq_ctrl->rxq.rxseg[s].mp;
-               flags = rte_pktmbuf_priv_flags(mp);
+               flags = mp != rxq_ctrl->rxq.mprq_mp ?
+                       rte_pktmbuf_priv_flags(mp) : 0;
                ret = mlx5_mr_mempool_register(rxq_ctrl->sh->cdev, mp);
                if (ret < 0 && rte_errno != EEXIST)
                        return ret;
                if ((flags & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF) == 0)
                        rte_mempool_mem_iter(mp, mlx5_rxq_mempool_register_cb,
-                                       &rxq_ctrl->rxq);
+                                            &rxq_ctrl->rxq);
        }
        return 0;
 }