Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/103871 _apply patch failure_ Submitter: Bing Zhao Date: Friday, November 05 2021 13:36:17 Applied on: CommitID:65d9b7c664cc8cc090ced1c3260d803f306a2bba Apply patch set 103871-103872 failed: Checking patch doc/guides/nics/mlx5.rst... error: while searching for: - Sub-Function representors. - Sub-Function. - Shared Rx queue. Limitations error: patch failed: doc/guides/nics/mlx5.rst:114 Hunk #2 succeeded at 597 (offset -12 lines). Checking patch drivers/common/mlx5/mlx5_devx_cmds.c... error: while searching for: attr->ct_offload = !!(MLX5_GET64(cmd_hca_cap, hcattr, general_obj_types) & MLX5_GENERAL_OBJ_TYPES_CAP_CONN_TRACK_OFFLOAD); if (attr->qos.sup) { hcattr = mlx5_devx_get_hca_cap(ctx, in, out, &rc, MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP | error: patch failed: drivers/common/mlx5/mlx5_devx_cmds.c:965 Checking patch drivers/common/mlx5/mlx5_devx_cmds.h... Hunk #1 succeeded at 117 (offset -61 lines). Checking patch drivers/net/mlx5/linux/mlx5_os.c... Hunk #1 succeeded at 1491 (offset -17 lines). Hunk #2 succeeded at 2036 (offset -50 lines). Checking patch drivers/net/mlx5/mlx5.c... Hunk #2 succeeded at 2096 (offset 2 lines). Hunk #3 succeeded at 2161 (offset 2 lines). Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 93 (offset -6 lines). Hunk #2 succeeded at 265 (offset -6 lines). Checking patch drivers/net/mlx5/mlx5_devx.c... error: while searching for: MLX5_WQ_END_PAD_MODE_NONE; rq_attr.wq_attr.pd = cdev->pdn; rq_attr.counter_set_id = priv->counter_set_id; rq_attr.user_index = rte_cpu_to_be_16(priv->dev_data->port_id); if (rxq_data->shared) /* Create RMP based RQ. */ rxq->devx_rq.rmp = &rxq_ctrl->obj->devx_rmp; error: patch failed: drivers/net/mlx5/mlx5_devx.c:277 Hunk #2 succeeded at 443 (offset 3 lines). error: while searching for: DRV_LOG(ERR, "Failed to create CQ."); goto error; } /* Create RQ using DevX API. */ ret = mlx5_rxq_create_devx_rq_resources(rxq); if (ret) { error: patch failed: drivers/net/mlx5/mlx5_devx.c:496 error: while searching for: dev->data->port_id); goto error; } /* Create RQ using DevX API. */ ret = mlx5_rxq_create_devx_rq_resources(rxq); if (ret != 0) { error: patch failed: drivers/net/mlx5/mlx5_devx.c:941 Checking patch drivers/net/mlx5/mlx5_rx.h... error: while searching for: unsigned int dynf_meta:1; /* Dynamic metadata is configured. */ unsigned int mcqe_format:3; /* CQE compression format. */ unsigned int shared:1; /* Shared RXQ. */ volatile uint32_t *rq_db; volatile uint32_t *cq_db; uint16_t port_id; error: patch failed: drivers/net/mlx5/mlx5_rx.h:97 Applying patch doc/guides/nics/mlx5.rst with 1 reject... Rejected hunk #1. Hunk #2 applied cleanly. Applying patch drivers/common/mlx5/mlx5_devx_cmds.c with 1 reject... Rejected hunk #1. Applied patch drivers/common/mlx5/mlx5_devx_cmds.h cleanly. Applied patch drivers/net/mlx5/linux/mlx5_os.c cleanly. Applied patch drivers/net/mlx5/mlx5.c cleanly. Applied patch drivers/net/mlx5/mlx5.h cleanly. Applying patch drivers/net/mlx5/mlx5_devx.c with 3 rejects... Rejected hunk #1. Hunk #2 applied cleanly. Rejected hunk #3. Rejected hunk #4. Applying patch drivers/net/mlx5/mlx5_rx.h with 1 reject... Rejected hunk #1. diff a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst (rejected hunks) @@ -114,6 +114,7 @@ Features - Sub-Function representors. - Sub-Function. - Shared Rx queue. +- Rx queue delay drop. Limitations diff a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c (rejected hunks) @@ -965,6 +965,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, attr->ct_offload = !!(MLX5_GET64(cmd_hca_cap, hcattr, general_obj_types) & MLX5_GENERAL_OBJ_TYPES_CAP_CONN_TRACK_OFFLOAD); + attr->rq_delay_drop = MLX5_GET(cmd_hca_cap, hcattr, rq_delay_drop); if (attr->qos.sup) { hcattr = mlx5_devx_get_hca_cap(ctx, in, out, &rc, MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP | diff a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c (rejected hunks) @@ -277,6 +277,7 @@ mlx5_rxq_create_devx_rq_resources(struct mlx5_rxq_priv *rxq) MLX5_WQ_END_PAD_MODE_NONE; rq_attr.wq_attr.pd = cdev->pdn; rq_attr.counter_set_id = priv->counter_set_id; + rq_attr.delay_drop_en = rxq_data->delay_drop; rq_attr.user_index = rte_cpu_to_be_16(priv->dev_data->port_id); if (rxq_data->shared) /* Create RMP based RQ. */ rxq->devx_rq.rmp = &rxq_ctrl->obj->devx_rmp; @@ -496,6 +499,7 @@ mlx5_rxq_devx_obj_new(struct mlx5_rxq_priv *rxq) DRV_LOG(ERR, "Failed to create CQ."); goto error; } + rxq_data->delay_drop = priv->config.std_delay_drop; /* Create RQ using DevX API. */ ret = mlx5_rxq_create_devx_rq_resources(rxq); if (ret) { @@ -941,6 +945,7 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev) dev->data->port_id); goto error; } + rxq_ctrl->rxq.delay_drop = 0; /* Create RQ using DevX API. */ ret = mlx5_rxq_create_devx_rq_resources(rxq); if (ret != 0) { diff a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h (rejected hunks) @@ -97,6 +97,7 @@ struct mlx5_rxq_data { unsigned int dynf_meta:1; /* Dynamic metadata is configured. */ unsigned int mcqe_format:3; /* CQE compression format. */ unsigned int shared:1; /* Shared RXQ. */ + unsigned int delay_drop:1; /* Enable delay drop. */ volatile uint32_t *rq_db; volatile uint32_t *cq_db; uint16_t port_id; Checking patch doc/guides/nics/mlx5.rst... error: doc/guides/nics/mlx5.rst: does not match index Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * Added implicit mempool registration to avoid data path hiccups (opt-out). * Added NIC offloads for the PMD on Windows (TSO, VLAN strip, CRC keep). * Added socket direct mode bonding support. * **Updated Solarflare network PMD.** error: patch failed: doc/guides/rel_notes/release_21_11.rst:192 Checking patch drivers/net/mlx5/linux/mlx5_ethdev_os.c... Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_trigger.c... Hunk #1 succeeded at 1125 (offset -4 lines). Checking patch drivers/net/mlx5/windows/mlx5_ethdev_os.c... Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applied patch drivers/net/mlx5/linux/mlx5_ethdev_os.c cleanly. Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly. Applied patch drivers/net/mlx5/windows/mlx5_ethdev_os.c cleanly. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -192,6 +192,7 @@ New Features * Added implicit mempool registration to avoid data path hiccups (opt-out). * Added NIC offloads for the PMD on Windows (TSO, VLAN strip, CRC keep). * Added socket direct mode bonding support. + * Added delay drop support for Rx queue. * **Updated Solarflare network PMD.** https://lab.dpdk.org/results/dashboard/patchsets/20033/ UNH-IOL DPDK Community Lab