Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102306 _apply patch failure_ Submitter: Michael Baum Date: Tuesday, October 19 2021 20:56:02 Applied on: CommitID:821f60c7f4337d74a0c8e4add4095be524d77600 Apply patch set 102306-102323 failed: Checking patch drivers/common/mlx5/mlx5_common.c... Checking patch drivers/common/mlx5/mlx5_common.h... Checking patch drivers/common/mlx5/mlx5_malloc.h... Checking patch drivers/common/mlx5/version.map... Checking patch drivers/net/mlx5/linux/mlx5_mp_os.c... Hunk #1 succeeded at 29 (offset -39 lines). Hunk #2 succeeded at 42 (offset -44 lines). Checking patch drivers/net/mlx5/linux/mlx5_os.c... Hunk #1 succeeded at 1073 (offset 1 line). error: while searching for: { memset(config, 0, sizeof(*config)); config->mps = MLX5_ARG_UNSET; config->dbnc = MLX5_ARG_UNSET; config->rx_vec_en = 1; config->txq_inline_max = MLX5_ARG_UNSET; config->txq_inline_min = MLX5_ARG_UNSET; config->txq_inline_mpw = MLX5_ARG_UNSET; config->txqs_inline = MLX5_ARG_UNSET; config->vf_nl_en = 1; config->mr_ext_memseg_en = 1; config->mr_mempool_reg_en = 1; config->mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN; config->mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS; config->dv_esw_en = 1; error: patch failed: drivers/net/mlx5/linux/mlx5_os.c:2124 Hunk #3 succeeded at 2795 (offset 3 lines). Hunk #4 succeeded at 2865 (offset 3 lines). Hunk #5 succeeded at 2873 (offset 3 lines). Hunk #6 succeeded at 2885 (offset 3 lines). Checking patch drivers/net/mlx5/mlx5.c... Hunk #1 succeeded at 965 (offset -3 lines). error: while searching for: int ret; /* Check if we only need to track Rx mempool destruction. */ if (!priv->config.mr_mempool_reg_en) { ret = rte_mempool_event_callback_register (mlx5_dev_ctx_shared_rx_mempool_event_cb, sh); return ret == 0 || rte_errno == EEXIST ? 0 : ret; error: patch failed: drivers/net/mlx5/mlx5.c:1210 Hunk #3 succeeded at 1145 (offset -138 lines). Hunk #4 succeeded at 1194 (offset -138 lines). Hunk #5 succeeded at 1867 (offset -149 lines). Hunk #6 succeeded at 1923 (offset -149 lines). Hunk #7 succeeded at 1966 (offset -149 lines). error: while searching for: return -rte_errno; } config->reclaim_mode = tmp; } else if (strcmp(MLX5_SYS_MEM_EN, key) == 0) { config->sys_mem_en = !!tmp; } else if (strcmp(MLX5_DECAP_EN, key) == 0) { config->decap_en = !!tmp; } else if (strcmp(MLX5_ALLOW_DUPLICATE_PATTERN, key) == 0) { config->allow_duplicate_pattern = !!tmp; } else if (strcmp(MLX5_MR_MEMPOOL_REG_EN, key) == 0) { config->mr_mempool_reg_en = !!tmp; } else { DRV_LOG(WARNING, "%s: unknown parameter", key); rte_errno = EINVAL; error: patch failed: drivers/net/mlx5/mlx5.c:2141 Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 249 (offset -7 lines). error: while searching for: unsigned int dest_tir:1; /* Whether advanced DR API is available. */ unsigned int reclaim_mode:2; /* Memory reclaim mode. */ unsigned int rt_timestamp:1; /* realtime timestamp format. */ unsigned int sys_mem_en:1; /* The default memory allocator. */ unsigned int decap_en:1; /* Whether decap will be used or not. */ unsigned int dv_miss_info:1; /* restore packet after partial hw miss */ unsigned int allow_duplicate_pattern:1; /* Allow/Prevent the duplicate rules pattern. */ unsigned int mr_mempool_reg_en:1; /* Allow/prevent implicit mempool memory registration. */ struct { unsigned int enabled:1; /* Whether MPRQ is enabled. */ unsigned int stride_num_n; /* Number of strides. */ error: patch failed: drivers/net/mlx5/mlx5.h:270 Hunk #3 succeeded at 278 (offset -6 lines). Hunk #4 succeeded at 1765 (offset -7 lines). Checking patch drivers/net/mlx5/mlx5_mr.c... error: while searching for: uintptr_t addr = (uintptr_t)mb->buf_addr; uint32_t lkey; if (priv->config.mr_mempool_reg_en) { struct rte_mempool *mp = NULL; struct mlx5_mprq_buf *buf; error: patch failed: drivers/net/mlx5/mlx5_mr.c:111 Hunk #3 succeeded at 193 (offset -3 lines). Checking patch drivers/net/mlx5/mlx5_txq.c... Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: while searching for: memset(&dev_config, 0, sizeof(struct mlx5_dev_config)); dev_config.vf = dev_config_vf; dev_config.mps = 0; dev_config.dbnc = MLX5_ARG_UNSET; dev_config.rx_vec_en = 1; dev_config.txq_inline_max = MLX5_ARG_UNSET; dev_config.txq_inline_min = MLX5_ARG_UNSET; dev_config.txq_inline_mpw = MLX5_ARG_UNSET; dev_config.txqs_inline = MLX5_ARG_UNSET; dev_config.vf_nl_en = 0; dev_config.mr_ext_memseg_en = 1; dev_config.mr_mempool_reg_en = 1; dev_config.mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN; dev_config.mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS; dev_config.dv_esw_en = 0; error: patch failed: drivers/net/mlx5/windows/mlx5_os.c:1122 Applied patch drivers/common/mlx5/mlx5_common.c cleanly. Applied patch drivers/common/mlx5/mlx5_common.h cleanly. Applied patch drivers/common/mlx5/mlx5_malloc.h cleanly. Applied patch drivers/common/mlx5/version.map cleanly. Applied patch drivers/net/mlx5/linux/mlx5_mp_os.c cleanly. Applying patch drivers/net/mlx5/linux/mlx5_os.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Applying patch drivers/net/mlx5/mlx5.c with 2 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Rejected hunk #8. Applying patch drivers/net/mlx5/mlx5.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Applying patch drivers/net/mlx5/mlx5_mr.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Applied patch drivers/net/mlx5/mlx5_txq.c cleanly. Applying patch drivers/net/mlx5/windows/mlx5_os.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. diff a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c (rejected hunks) @@ -2124,15 +2123,12 @@ mlx5_os_config_default(struct mlx5_dev_config *config) { memset(config, 0, sizeof(*config)); config->mps = MLX5_ARG_UNSET; - config->dbnc = MLX5_ARG_UNSET; config->rx_vec_en = 1; config->txq_inline_max = MLX5_ARG_UNSET; config->txq_inline_min = MLX5_ARG_UNSET; config->txq_inline_mpw = MLX5_ARG_UNSET; config->txqs_inline = MLX5_ARG_UNSET; config->vf_nl_en = 1; - config->mr_ext_memseg_en = 1; - config->mr_mempool_reg_en = 1; config->mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN; config->mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS; config->dv_esw_en = 1; diff a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c (rejected hunks) @@ -1210,7 +1210,7 @@ mlx5_dev_ctx_shared_mempool_subscribe(struct rte_eth_dev *dev) int ret; /* Check if we only need to track Rx mempool destruction. */ - if (!priv->config.mr_mempool_reg_en) { + if (!sh->cdev->config.mr_mempool_reg_en) { ret = rte_mempool_event_callback_register (mlx5_dev_ctx_shared_rx_mempool_event_cb, sh); return ret == 0 || rte_errno == EEXIST ? 0 : ret; @@ -2141,14 +2132,10 @@ mlx5_args_check(const char *key, const char *val, void *opaque) return -rte_errno; } config->reclaim_mode = tmp; - } else if (strcmp(MLX5_SYS_MEM_EN, key) == 0) { - config->sys_mem_en = !!tmp; } else if (strcmp(MLX5_DECAP_EN, key) == 0) { config->decap_en = !!tmp; } else if (strcmp(MLX5_ALLOW_DUPLICATE_PATTERN, key) == 0) { config->allow_duplicate_pattern = !!tmp; - } else if (strcmp(MLX5_MR_MEMPOOL_REG_EN, key) == 0) { - config->mr_mempool_reg_en = !!tmp; } else { DRV_LOG(WARNING, "%s: unknown parameter", key); rte_errno = EINVAL; diff a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h (rejected hunks) @@ -270,13 +268,10 @@ struct mlx5_dev_config { unsigned int dest_tir:1; /* Whether advanced DR API is available. */ unsigned int reclaim_mode:2; /* Memory reclaim mode. */ unsigned int rt_timestamp:1; /* realtime timestamp format. */ - unsigned int sys_mem_en:1; /* The default memory allocator. */ unsigned int decap_en:1; /* Whether decap will be used or not. */ unsigned int dv_miss_info:1; /* restore packet after partial hw miss */ unsigned int allow_duplicate_pattern:1; /* Allow/Prevent the duplicate rules pattern. */ - unsigned int mr_mempool_reg_en:1; - /* Allow/prevent implicit mempool memory registration. */ struct { unsigned int enabled:1; /* Whether MPRQ is enabled. */ unsigned int stride_num_n; /* Number of strides. */ diff a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c (rejected hunks) @@ -111,7 +111,7 @@ mlx5_tx_mb2mr_bh(struct mlx5_txq_data *txq, struct rte_mbuf *mb) uintptr_t addr = (uintptr_t)mb->buf_addr; uint32_t lkey; - if (priv->config.mr_mempool_reg_en) { + if (priv->sh->cdev->config.mr_mempool_reg_en) { struct rte_mempool *mp = NULL; struct mlx5_mprq_buf *buf; diff a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c (rejected hunks) @@ -1122,15 +1117,12 @@ mlx5_os_net_probe(struct mlx5_common_device *cdev) memset(&dev_config, 0, sizeof(struct mlx5_dev_config)); dev_config.vf = dev_config_vf; dev_config.mps = 0; - dev_config.dbnc = MLX5_ARG_UNSET; dev_config.rx_vec_en = 1; dev_config.txq_inline_max = MLX5_ARG_UNSET; dev_config.txq_inline_min = MLX5_ARG_UNSET; dev_config.txq_inline_mpw = MLX5_ARG_UNSET; dev_config.txqs_inline = MLX5_ARG_UNSET; dev_config.vf_nl_en = 0; - dev_config.mr_ext_memseg_en = 1; - dev_config.mr_mempool_reg_en = 1; dev_config.mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN; dev_config.mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS; dev_config.dv_esw_en = 0; Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Checking patch drivers/common/mlx5/linux/mlx5_common_os.c... Checking patch drivers/common/mlx5/linux/mlx5_common_os.h... Checking patch drivers/common/mlx5/linux/mlx5_common_verbs.c... Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/common/mlx5/windows/mlx5_common_os.c... Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Applied patch drivers/common/mlx5/linux/mlx5_common_os.c cleanly. Applied patch drivers/common/mlx5/linux/mlx5_common_os.h cleanly. Applied patch drivers/common/mlx5/linux/mlx5_common_verbs.c cleanly. Applied patch drivers/common/mlx5/windows/mlx5_common_os.c cleanly. Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Checking patch drivers/net/mlx5/mlx5_trigger.c... Hunk #1 succeeded at 1064 (offset -48 lines). Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Applied patch drivers/net/mlx5/mlx5_flow_dv.c cleanly. Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly. Checking patch drivers/common/mlx5/linux/mlx5_common_os.c... error: drivers/common/mlx5/linux/mlx5_common_os.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.c... error: drivers/common/mlx5/mlx5_common.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/common/mlx5/windows/mlx5_common_os.c... error: drivers/common/mlx5/windows/mlx5_common_os.c: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... Checking patch drivers/crypto/mlx5/mlx5_crypto.c... Checking patch drivers/crypto/mlx5/mlx5_crypto.h... Checking patch drivers/crypto/mlx5/mlx5_crypto_dek.c... Checking patch drivers/net/mlx5/linux/mlx5_ethdev_os.c... Checking patch drivers/net/mlx5/linux/mlx5_mp_os.c... error: drivers/net/mlx5/linux/mlx5_mp_os.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_verbs.c... Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_devx.c... Checking patch drivers/net/mlx5/mlx5_flow.c... Checking patch drivers/net/mlx5/mlx5_flow_aso.c... Checking patch drivers/net/mlx5/mlx5_flow_dv.c... error: drivers/net/mlx5/mlx5_flow_dv.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_verbs.c... Checking patch drivers/net/mlx5/mlx5_txpp.c... Checking patch drivers/net/mlx5/windows/mlx5_ethdev_os.c... Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.c... Checking patch drivers/regex/mlx5/mlx5_regex.h... Checking patch drivers/regex/mlx5/mlx5_regex_control.c... Checking patch drivers/regex/mlx5/mlx5_regex_fastpath.c... Checking patch drivers/regex/mlx5/mlx5_rxp.c... Applied patch drivers/compress/mlx5/mlx5_compress.c cleanly. Applied patch drivers/crypto/mlx5/mlx5_crypto.c cleanly. Applied patch drivers/crypto/mlx5/mlx5_crypto.h cleanly. Applied patch drivers/crypto/mlx5/mlx5_crypto_dek.c cleanly. Applied patch drivers/net/mlx5/linux/mlx5_ethdev_os.c cleanly. Applied patch drivers/net/mlx5/linux/mlx5_verbs.c cleanly. Applied patch drivers/net/mlx5/mlx5_devx.c cleanly. Applied patch drivers/net/mlx5/mlx5_flow.c cleanly. Applied patch drivers/net/mlx5/mlx5_flow_aso.c cleanly. Applied patch drivers/net/mlx5/mlx5_flow_verbs.c cleanly. Applied patch drivers/net/mlx5/mlx5_txpp.c cleanly. Applied patch drivers/net/mlx5/windows/mlx5_ethdev_os.c cleanly. Applied patch drivers/regex/mlx5/mlx5_regex.c cleanly. Applied patch drivers/regex/mlx5/mlx5_regex.h cleanly. Applied patch drivers/regex/mlx5/mlx5_regex_control.c cleanly. Applied patch drivers/regex/mlx5/mlx5_regex_fastpath.c cleanly. Applied patch drivers/regex/mlx5/mlx5_rxp.c cleanly. Checking patch drivers/common/mlx5/linux/mlx5_common_os.c... error: drivers/common/mlx5/linux/mlx5_common_os.c: does not match index Checking patch drivers/common/mlx5/linux/mlx5_common_os.h... error: drivers/common/mlx5/linux/mlx5_common_os.h: does not match index Checking patch drivers/common/mlx5/linux/mlx5_common_verbs.c... error: drivers/common/mlx5/linux/mlx5_common_verbs.c: does not match index Checking patch drivers/common/mlx5/linux/mlx5_nl.c... Checking patch drivers/common/mlx5/linux/mlx5_nl.h... Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/mlx5_common_defs.h... Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa.h... Checking patch drivers/vdpa/mlx5/mlx5_vdpa_event.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa_lm.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa_mem.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa_steer.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa_virtq.c... Applied patch drivers/common/mlx5/linux/mlx5_nl.c cleanly. Applied patch drivers/common/mlx5/linux/mlx5_nl.h cleanly. Applied patch drivers/common/mlx5/mlx5_common_defs.h cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa.h cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_event.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_lm.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_mem.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_steer.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_virtq.c cleanly. Checking patch drivers/common/mlx5/linux/mlx5_common_os.c... error: drivers/common/mlx5/linux/mlx5_common_os.c: does not match index Checking patch drivers/common/mlx5/linux/mlx5_common_os.h... error: drivers/common/mlx5/linux/mlx5_common_os.h: does not match index Checking patch drivers/common/mlx5/mlx5_common.c... error: drivers/common/mlx5/mlx5_common.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/common/mlx5/windows/mlx5_common_os.c... error: drivers/common/mlx5/windows/mlx5_common_os.c: does not match index Checking patch drivers/common/mlx5/windows/mlx5_common_os.h... Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.h... error: drivers/crypto/mlx5/mlx5_crypto.h: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto_dek.c... error: drivers/crypto/mlx5/mlx5_crypto_dek.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_mp_os.c... error: drivers/net/mlx5/linux/mlx5_mp_os.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_verbs.c... error: drivers/net/mlx5/linux/mlx5_verbs.c: does not match index Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_devx.c... error: drivers/net/mlx5/mlx5_devx.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_aso.c... error: drivers/net/mlx5/mlx5_flow_aso.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_dv.c... error: drivers/net/mlx5/mlx5_flow_dv.c: does not match index Checking patch drivers/net/mlx5/mlx5_mr.c... error: drivers/net/mlx5/mlx5_mr.c: does not match index Checking patch drivers/net/mlx5/mlx5_rxq.c... error: while searching for: rte_errno = ENOMEM; return -rte_errno; } ret = mlx5_mr_mempool_register(&priv->sh->share_cache, priv->sh->pd, mp, &priv->mp_id); if (ret < 0 && rte_errno != EEXIST) { ret = rte_errno; DRV_LOG(ERR, "port %u failed to register a mempool for Multi-Packet RQ", error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1242 Checking patch drivers/net/mlx5/mlx5_trigger.c... error: drivers/net/mlx5/mlx5_trigger.c: does not match index Checking patch drivers/net/mlx5/mlx5_txpp.c... error: drivers/net/mlx5/mlx5_txpp.c: does not match index Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.c... error: drivers/regex/mlx5/mlx5_regex.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.h... error: drivers/regex/mlx5/mlx5_regex.h: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_control.c... error: drivers/regex/mlx5/mlx5_regex_control.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_fastpath.c... error: drivers/regex/mlx5/mlx5_regex_fastpath.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa.c... error: drivers/vdpa/mlx5/mlx5_vdpa.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa.h... error: drivers/vdpa/mlx5/mlx5_vdpa.h: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa_event.c... error: drivers/vdpa/mlx5/mlx5_vdpa_event.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa_lm.c... error: drivers/vdpa/mlx5/mlx5_vdpa_lm.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa_mem.c... error: drivers/vdpa/mlx5/mlx5_vdpa_mem.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa_virtq.c... error: drivers/vdpa/mlx5/mlx5_vdpa_virtq.c: does not match index Applied patch drivers/common/mlx5/windows/mlx5_common_os.h cleanly. Applying patch drivers/net/mlx5/mlx5_rxq.c with 1 reject... Rejected hunk #1. diff a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c (rejected hunks) @@ -1242,8 +1242,8 @@ mlx5_mprq_alloc_mp(struct rte_eth_dev *dev) rte_errno = ENOMEM; return -rte_errno; } - ret = mlx5_mr_mempool_register(&priv->sh->share_cache, priv->sh->pd, - mp, &priv->mp_id); + ret = mlx5_mr_mempool_register(&priv->sh->share_cache, + priv->sh->cdev->pd, mp, &priv->mp_id); if (ret < 0 && rte_errno != EEXIST) { ret = rte_errno; DRV_LOG(ERR, "port %u failed to register a mempool for Multi-Packet RQ", Checking patch drivers/common/mlx5/mlx5_common.c... error: drivers/common/mlx5/mlx5_common.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.h... error: drivers/crypto/mlx5/mlx5_crypto.h: does not match index Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_devx.c... error: drivers/net/mlx5/mlx5_devx.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_aso.c... error: drivers/net/mlx5/mlx5_flow_aso.c: does not match index Checking patch drivers/net/mlx5/mlx5_txpp.c... error: drivers/net/mlx5/mlx5_txpp.c: does not match index Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.c... error: drivers/regex/mlx5/mlx5_regex.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.h... error: drivers/regex/mlx5/mlx5_regex.h: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_control.c... error: drivers/regex/mlx5/mlx5_regex_control.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa.c... error: drivers/vdpa/mlx5/mlx5_vdpa.c: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa.h... error: drivers/vdpa/mlx5/mlx5_vdpa.h: does not match index Checking patch drivers/vdpa/mlx5/mlx5_vdpa_event.c... error: drivers/vdpa/mlx5/mlx5_vdpa_event.c: does not match index Checking patch drivers/net/mlx5/mlx5_mr.c... error: drivers/net/mlx5/mlx5_mr.c: does not match index Checking patch drivers/net/mlx5/mlx5_tx.h... Applied patch drivers/net/mlx5/mlx5_tx.h cleanly. Checking patch drivers/common/mlx5/mlx5_common_mr.c... Hunk #1 succeeded at 245 (offset -26 lines). Checking patch drivers/common/mlx5/mlx5_common_mr.h... Hunk #1 succeeded at 121 (offset -3 lines). Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/net/mlx5/mlx5_rxq.c... error: while searching for: goto error; } tmpl->type = MLX5_RXQ_TYPE_STANDARD; if (mlx5_mr_btree_init(&tmpl->rxq.mr_ctrl.cache_bh, MLX5_MR_BTREE_CACHE_N, socket)) { /* rte_errno is already set. */ goto error; } /* Rx queues don't use this pointer, but we want a valid structure. */ tmpl->rxq.mr_ctrl.dev_gen_ptr = &priv->sh->share_cache.dev_gen; tmpl->socket = socket; if (dev->data->dev_conf.intr_conf.rxq) tmpl->irq = 1; error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1449 Checking patch drivers/net/mlx5/mlx5_txq.c... error: drivers/net/mlx5/mlx5_txq.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_control.c... error: drivers/regex/mlx5/mlx5_regex_control.c: does not match index Applied patch drivers/common/mlx5/mlx5_common_mr.c cleanly. Applied patch drivers/common/mlx5/mlx5_common_mr.h cleanly. Applying patch drivers/net/mlx5/mlx5_rxq.c with 1 reject... Rejected hunk #1. diff a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c (rejected hunks) @@ -1449,13 +1449,11 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, goto error; } tmpl->type = MLX5_RXQ_TYPE_STANDARD; - if (mlx5_mr_btree_init(&tmpl->rxq.mr_ctrl.cache_bh, - MLX5_MR_BTREE_CACHE_N, socket)) { + if (mlx5_mr_ctrl_init(&tmpl->rxq.mr_ctrl, + &priv->sh->share_cache.dev_gen, socket)) { /* rte_errno is already set. */ goto error; } - /* Rx queues don't use this pointer, but we want a valid structure. */ - tmpl->rxq.mr_ctrl.dev_gen_ptr = &priv->sh->share_cache.dev_gen; tmpl->socket = socket; if (dev->data->dev_conf.intr_conf.rxq) tmpl->irq = 1; Checking patch drivers/common/mlx5/linux/mlx5_common_verbs.c... error: drivers/common/mlx5/linux/mlx5_common_verbs.c: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: drivers/common/mlx5/mlx5_common_mr.c: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.h... error: drivers/common/mlx5/mlx5_common_mr.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/common/mlx5/windows/mlx5_common_os.c... error: drivers/common/mlx5/windows/mlx5_common_os.c: does not match index Checking patch drivers/common/mlx5/windows/mlx5_common_os.h... error: drivers/common/mlx5/windows/mlx5_common_os.h: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_verbs.c... error: drivers/net/mlx5/linux/mlx5_verbs.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_verbs.h... Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.c... error: drivers/regex/mlx5/mlx5_regex.c: does not match index Applied patch drivers/net/mlx5/linux/mlx5_verbs.h cleanly. Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: drivers/common/mlx5/mlx5_common_mr.c: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_fastpath.c... error: drivers/regex/mlx5/mlx5_regex_fastpath.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.c... error: drivers/common/mlx5/mlx5_common.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: drivers/common/mlx5/mlx5_common_mr.c: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.h... error: drivers/common/mlx5/mlx5_common_mr.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.h... error: drivers/crypto/mlx5/mlx5_crypto.h: does not match index Checking patch drivers/net/mlx5/linux/mlx5_mp_os.c... error: drivers/net/mlx5/linux/mlx5_mp_os.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_aso.c... error: drivers/net/mlx5/mlx5_flow_aso.c: does not match index Checking patch drivers/net/mlx5/mlx5_mr.c... error: drivers/net/mlx5/mlx5_mr.c: does not match index Checking patch drivers/net/mlx5/mlx5_mr.h... error: while searching for: /* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018 6WIND S.A. * Copyright 2018 Mellanox Technologies, Ltd */ #ifndef RTE_PMD_MLX5_MR_H_ #define RTE_PMD_MLX5_MR_H_ #include #include #include #include #include #include #include #include /* First entry must be NULL for comparison. */ #define mlx5_mr_btree_len(bt) ((bt)->len - 1) void mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr, size_t len, void *arg); #endif /* RTE_PMD_MLX5_MR_H_ */ error: patch failed: drivers/net/mlx5/mlx5_mr.h:1 error: removal patch leaves file contents error: drivers/net/mlx5/mlx5_mr.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_rx.c... Checking patch drivers/net/mlx5/mlx5_rx.h... error: while searching for: */ rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq); mp = mlx5_rxq_mprq_enabled(rxq) ? rxq->mprq_mp : rxq->mp; return mlx5_mr_mempool2mr_bh(&rxq_ctrl->priv->sh->share_cache, mr_ctrl, mp, addr); } error: patch failed: drivers/net/mlx5/mlx5_rx.h:309 Checking patch drivers/net/mlx5/mlx5_rxq.c... error: while searching for: rte_errno = ENOMEM; return -rte_errno; } ret = mlx5_mr_mempool_register(&priv->sh->share_cache, priv->sh->cdev->pd, mp, &priv->mp_id); if (ret < 0 && rte_errno != EEXIST) { ret = rte_errno; error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1242 error: while searching for: } tmpl->type = MLX5_RXQ_TYPE_STANDARD; if (mlx5_mr_ctrl_init(&tmpl->rxq.mr_ctrl, &priv->sh->share_cache.dev_gen, socket)) { /* rte_errno is already set. */ goto error; } error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1450 Checking patch drivers/net/mlx5/mlx5_rxtx.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... Checking patch drivers/net/mlx5/mlx5_rxtx_vec.h... Checking patch drivers/net/mlx5/mlx5_trigger.c... error: drivers/net/mlx5/mlx5_trigger.c: does not match index Checking patch drivers/net/mlx5/mlx5_tx.c... Checking patch drivers/net/mlx5/mlx5_tx.h... error: drivers/net/mlx5/mlx5_tx.h: does not match index Checking patch drivers/net/mlx5/mlx5_txq.c... error: drivers/net/mlx5/mlx5_txq.c: does not match index Checking patch drivers/net/mlx5/windows/mlx5_os.c... error: drivers/net/mlx5/windows/mlx5_os.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.c... error: drivers/regex/mlx5/mlx5_regex.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.h... error: drivers/regex/mlx5/mlx5_regex.h: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_control.c... error: drivers/regex/mlx5/mlx5_regex_control.c: does not match index Checking patch drivers/regex/mlx5/mlx5_regex_fastpath.c... error: drivers/regex/mlx5/mlx5_regex_fastpath.c: does not match index Applied patch drivers/net/mlx5/mlx5_rx.c cleanly. Applying patch drivers/net/mlx5/mlx5_rx.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applying patch drivers/net/mlx5/mlx5_rxq.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applied patch drivers/net/mlx5/mlx5_rxtx.c cleanly. Applied patch drivers/net/mlx5/mlx5_rxtx.h cleanly. Applied patch drivers/net/mlx5/mlx5_rxtx_vec.h cleanly. Applied patch drivers/net/mlx5/mlx5_tx.c cleanly. diff a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h (rejected hunks) @@ -309,7 +311,7 @@ mlx5_rx_addr2mr(struct mlx5_rxq_data *rxq, uintptr_t addr) */ rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq); mp = mlx5_rxq_mprq_enabled(rxq) ? rxq->mprq_mp : rxq->mp; - return mlx5_mr_mempool2mr_bh(&rxq_ctrl->priv->sh->share_cache, + return mlx5_mr_mempool2mr_bh(&rxq_ctrl->priv->sh->cdev->mr_scache, mr_ctrl, mp, addr); } diff a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c (rejected hunks) @@ -1242,7 +1242,7 @@ mlx5_mprq_alloc_mp(struct rte_eth_dev *dev) rte_errno = ENOMEM; return -rte_errno; } - ret = mlx5_mr_mempool_register(&priv->sh->share_cache, + ret = mlx5_mr_mempool_register(&priv->sh->cdev->mr_scache, priv->sh->cdev->pd, mp, &priv->mp_id); if (ret < 0 && rte_errno != EEXIST) { ret = rte_errno; @@ -1450,7 +1450,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, } tmpl->type = MLX5_RXQ_TYPE_STANDARD; if (mlx5_mr_ctrl_init(&tmpl->rxq.mr_ctrl, - &priv->sh->share_cache.dev_gen, socket)) { + &priv->sh->cdev->mr_scache.dev_gen, socket)) { /* rte_errno is already set. */ goto error; } Checking patch drivers/common/mlx5/mlx5_common.c... error: drivers/common/mlx5/mlx5_common.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: drivers/common/mlx5/mlx5_common_mr.c: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.h... error: drivers/common/mlx5/mlx5_common_mr.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5_mr.c... error: drivers/net/mlx5/mlx5_mr.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.c... error: drivers/common/mlx5/mlx5_common.c: does not match index Checking patch drivers/common/mlx5/mlx5_common.h... error: drivers/common/mlx5/mlx5_common.h: does not match index Checking patch drivers/common/mlx5/mlx5_common_mp.h... Hunk #1 succeeded at 54 (offset -10 lines). Checking patch drivers/common/mlx5/mlx5_common_mr.c... error: drivers/common/mlx5/mlx5_common_mr.c: does not match index Checking patch drivers/common/mlx5/mlx5_common_mr.h... error: drivers/common/mlx5/mlx5_common_mr.h: does not match index Checking patch drivers/common/mlx5/version.map... error: drivers/common/mlx5/version.map: does not match index Checking patch drivers/compress/mlx5/mlx5_compress.c... error: drivers/compress/mlx5/mlx5_compress.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_mp_os.c... error: drivers/net/mlx5/linux/mlx5_mp_os.c: does not match index Checking patch drivers/net/mlx5/meson.build... Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_mr.c... error: drivers/net/mlx5/mlx5_mr.c: does not match index Checking patch drivers/net/mlx5/mlx5_rx.c... error: drivers/net/mlx5/mlx5_rx.c: does not match index Checking patch drivers/net/mlx5/mlx5_rx.h... error: drivers/net/mlx5/mlx5_rx.h: does not match index Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... error: drivers/net/mlx5/mlx5_rxtx.h: does not match index Checking patch drivers/net/mlx5/mlx5_tx.h... error: drivers/net/mlx5/mlx5_tx.h: does not match index Checking patch drivers/regex/mlx5/mlx5_regex.c... error: drivers/regex/mlx5/mlx5_regex.c: does not match index Applied patch drivers/common/mlx5/mlx5_common_mp.h cleanly. Applied patch drivers/net/mlx5/meson.build cleanly. Applied patch drivers/net/mlx5/mlx5_rxq.c cleanly. https://lab.dpdk.org/results/dashboard/patchsets/19562/ UNH-IOL DPDK Community Lab