Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/104395 _apply patch failure_ Submitter: Dmitry Kozlyuk Date: Tuesday, November 16 2021 11:55:44 Applied on: CommitID:d4fb4eb08725a3e667042c1f5cd3ed72b94505a7 Apply patch set 104395 failed: Checking patch drivers/common/mlx5/mlx5_common.c... error: while searching for: void *arg) { struct mlx5_common_device *cdev = arg; bool extmem = rte_pktmbuf_priv_flags(mp) & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF; switch (event) { case RTE_MEMPOOL_EVENT_READY: error: patch failed: drivers/common/mlx5/mlx5_common.c:390 Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: while searching for: struct mlx5_range *chunks; unsigned int n; n = mp->nb_mem_chunks; chunks = calloc(sizeof(chunks[0]), n); if (chunks == NULL) error: patch failed: drivers/common/mlx5/mlx5_common_mr.c:1302 error: while searching for: { struct mlx5_mempool_get_extmem_data data; memset(&data, 0, sizeof(data)); rte_mempool_obj_iter(mp, mlx5_mempool_get_extmem_cb, &data); if (data.ret < 0) error: patch failed: drivers/common/mlx5/mlx5_common_mr.c:1382 error: while searching for: int ret; /* Collect the pool underlying memory. */ ret = (rte_pktmbuf_priv_flags(mp) & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF) ? mlx5_mempool_get_extmem(mp, &chunks, &chunks_n) : mlx5_mempool_get_chunks(mp, &chunks, &chunks_n); if (ret < 0) error: patch failed: drivers/common/mlx5/mlx5_common_mr.c:1414 Checking patch drivers/common/mlx5/mlx5_common_mr.h... Hunk #1 succeeded at 264 (offset 1 line). Checking patch drivers/net/mlx5/mlx5_trigger.c... error: while searching for: uint32_t flags; mp = rxq_ctrl->rxq.rxseg[s].mp; flags = rte_pktmbuf_priv_flags(mp); 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); } return 0; } error: patch failed: drivers/net/mlx5/mlx5_trigger.c:149 Applying patch drivers/common/mlx5/mlx5_common.c with 1 reject... Rejected hunk #1. Applying patch drivers/common/mlx5/mlx5_common_mr.c with 3 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Applied patch drivers/common/mlx5/mlx5_common_mr.h cleanly. Applying patch drivers/net/mlx5/mlx5_trigger.c with 1 reject... Rejected hunk #1. diff a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c (rejected hunks) @@ -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 a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c (rejected hunks) @@ -1302,6 +1302,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) @@ -1382,6 +1383,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) @@ -1414,7 +1417,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 a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c (rejected hunks) @@ -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; } https://lab.dpdk.org/results/dashboard/patchsets/20232/ UNH-IOL DPDK Community Lab