[dpdk-test-report] |WARNING| pw103740-103744 [PATCH] [4/4] doc: update the description for Rx delay drop

[dpdk-test-report] |WARNING| pw103740-103744 [PATCH] [4/4] doc: update the description for Rx delay drop

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 4973 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/103740

_apply patch failure_

Submitter: Bing Zhao <bingz@nvidia.com>
Date: Thursday, November 04 2021 11:26:44 
Applied on: CommitID:5b08ac4e4a8dbc95f52b871b62a97fda57fa477e
Apply patch set 103740-103744 failed:

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:962
Checking patch drivers/common/mlx5/mlx5_devx_cmds.h...
Hunk #1 succeeded at 117 (offset -59 lines).
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.
diff a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c	(rejected hunks)
@@ -962,6 +962,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 |
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
Hunk #1 succeeded at 1491 (offset -15 lines).
Hunk #2 succeeded at 2036 (offset -48 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:
		DRV_LOG(ERR, "Failed to create CQ.");
		goto error;
	}
	/* Create RQ using DevX API. */
	ret = mlx5_rxq_create_devx_rq_resources(dev, rxq_data);
	if (ret) {

error: patch failed: drivers/net/mlx5/mlx5_devx.c:503
error: while searching for:
	rxq_ctrl->priv = priv;
	rxq_ctrl->obj = rxq;
	rxq_data = &rxq_ctrl->rxq;
	/* Create CQ using DevX API. */
	ret = mlx5_rxq_create_devx_cq_resources(dev, rxq_data);
	if (ret != 0) {

error: patch failed: drivers/net/mlx5/mlx5_devx.c:921
Checking patch drivers/net/mlx5/mlx5_rx.h...
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 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
Applied patch drivers/net/mlx5/mlx5_rx.h cleanly.
diff a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c	(rejected hunks)
@@ -503,6 +506,7 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)
 		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(dev, rxq_data);
 	if (ret) {
@@ -921,6 +925,7 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)
 	rxq_ctrl->priv = priv;
 	rxq_ctrl->obj = rxq;
 	rxq_data = &rxq_ctrl->rxq;
+	rxq_data->delay_drop = 0;
 	/* Create CQ using DevX API. */
 	ret = mlx5_rxq_create_devx_cq_resources(dev, rxq_data);
 	if (ret != 0) {
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 -1 lines).
Applied patch drivers/net/mlx5/linux/mlx5_ethdev_os.c cleanly.
Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly.
Checking patch doc/guides/nics/mlx5.rst...
Hunk #1 succeeded at 1118 (offset -5 lines).
Hunk #2 succeeded at 1813 (offset -5 lines).
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:191
Applied patch doc/guides/nics/mlx5.rst cleanly.
Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject...
Rejected hunk #1.
diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst	(rejected hunks)
@@ -191,6 +191,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/20003/

UNH-IOL DPDK Community Lab