|WARNING| pw140550-140579 [PATCH 1/6] net/mlx5: update NTA rule pattern and actions flags

[qemudev@loongson.cn]

Test-Label: loongarch-compilation
Test-Status: WARNING
http://dpdk.org/patch/140550

_apply patch failure_

Submitter: Maayan Kashani <mkashani@nvidia.com>
Date: Sun, 2 Jun 2024 13:28:40 +0300
DPDK git baseline: Repo:dpdk-next-net-mlx
  Branch: for-next-net
  CommitID: 5d185b9afaca3c98d8fd779e97d83e571660f4cf

Apply patch set 140550-140579 failed:

Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
Hunk #1 succeeded at 543 (offset -25 lines).
error: while searching for:

static int
flow_hw_translate_flow_actions(struct rte_eth_dev *dev,
			       const struct rte_flow_attr *attr,
			       const struct rte_flow_action actions[],
			       struct rte_flow_hw *flow,
			       struct mlx5_flow_hw_action_params *ap,
			       struct mlx5_hw_actions *hw_acts,
			       uint64_t item_flags,
			       bool external,
			       struct rte_flow_error *error)
{
	int ret = 0;
	uint32_t src_group = 0;
	enum mlx5dr_table_type table_type;
	struct rte_flow_template_table *table = NULL;
	struct mlx5_flow_group grp;
	uint64_t action_flags = 0;
	struct rte_flow_actions_template *at = NULL;
	struct rte_flow_actions_template_attr template_attr = {
		.egress = attr->egress,

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:12339
error: drivers/net/mlx5/mlx5_flow_hw.c: patch does not apply
Checking patch drivers/net/mlx5/hws/mlx5dr_definer.c...
Hunk #1 succeeded at 390 (offset 9 lines).
Checking patch drivers/net/mlx5/meson.build...
Checking patch drivers/net/mlx5/mlx5.c...
Checking patch drivers/net/mlx5/mlx5.h...
Hunk #1 succeeded at 1171 (offset -13 lines).
Hunk #2 succeeded at 2008 (offset -15 lines).
Checking patch drivers/net/mlx5/mlx5_flow.h...
error: while searching for:

#define MLX5_DR_RULE_SIZE 72

/** HWS non template flow data. */
struct rte_flow_nt2hws {
	/** BWC rule pointer. */

error: patch failed: drivers/net/mlx5/mlx5_flow.h:1313
error: drivers/net/mlx5/mlx5_flow.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
Hunk #1 succeeded at 467 (offset -25 lines).
error: while searching for:
static inline struct mlx5_hrxq*
flow_hw_tir_action_register(struct rte_eth_dev *dev,
			    uint32_t hws_flags,
			    const struct rte_flow_action *action,
			    uint64_t item_flags,
			    bool is_template)
{
	struct mlx5_flow_rss_desc rss_desc = {
		.hws_flags = hws_flags,

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:755
error: drivers/net/mlx5/mlx5_flow_hw.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_nta_rss.c...
/home/zhoumin/dpdk-ci/tools/../series/32049/140550.patch:1224: new blank line at EOF.
+
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
error: while searching for:
	return 0;
}

static int
flow_hw_translate_flow_actions(struct rte_eth_dev *dev,
			  const struct rte_flow_attr *attr,

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:12431
error: drivers/net/mlx5/mlx5_flow_hw.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
error: while searching for:
					NULL, "fail to register matcher");
}

static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev,
					const struct rte_flow_action actions[],
					struct rte_flow_error *error)
{
	bool actions_end = false;
	struct mlx5_priv *priv = dev->data->dev_private;
	int ret;
	uint obj_num;

	for (; !actions_end; actions++) {
		switch ((int)actions->type) {
		case RTE_FLOW_ACTION_TYPE_AGE:
			/* If no age objects were previously allocated. */
			if (!priv->hws_age_req) {
				/* If no counters were previously allocated. */
				if (!priv->hws_cpool) {
					obj_num = MLX5_CNT_NT_MAX(priv);
					ret = mlx5_hws_cnt_pool_create(dev, obj_num,
						priv->nb_queue, NULL);
					if (ret)
						goto err;
				}
				if (priv->hws_cpool) {
					/* Allocate same number of counters. */
					ret = mlx5_hws_age_pool_init(dev,
								priv->hws_cpool->cfg.request_num,
								priv->nb_queue, false);
					if (ret)
						goto err;
				}
			}
		break;
		case RTE_FLOW_ACTION_TYPE_COUNT:
			/* If no counters were previously allocated. */
			if (!priv->hws_cpool) {
				obj_num = MLX5_CNT_NT_MAX(priv);
				ret = mlx5_hws_cnt_pool_create(dev, obj_num,
					priv->nb_queue, NULL);
				if (ret)
					goto err;
			}
		break;
		case RTE_FLOW_ACTION_TYPE_CONNTRACK:
			/* If no CT were previously allocated. */
			if (!priv->hws_ctpool) {
				obj_num = MLX5_CT_NT_MAX(priv);
				ret = mlx5_flow_ct_init(dev, obj_num, priv->nb_queue);
				if (ret)
					goto err;
			}
		break;
		case RTE_FLOW_ACTION_TYPE_METER_MARK:
			/* If no meters were previously allocated. */
			if (!priv->hws_mpool) {
				obj_num = MLX5_MTR_NT_MAX(priv);
				ret = mlx5_flow_meter_init(dev, obj_num, 0, 0,
								priv->nb_queue);
				if (ret)
					goto err;
			}
		break;
		case RTE_FLOW_ACTION_TYPE_END:
			actions_end = true;
		break;
		default:
			break;
		}
	}
	return 0;
err:
	return rte_flow_error_set(error, ret,
						RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
						NULL, "fail to allocate actions");
}

/* TODO: remove dev if not used */

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:12671
error: drivers/net/mlx5/mlx5_flow_hw.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
Hunk #1 succeeded at 206 (offset -1 lines).
Hunk #2 succeeded at 11092 (offset -274 lines).
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
error: while searching for:
	return ret;
}

static int flow_hw_register_matcher(struct rte_eth_dev *dev,
				    const struct rte_flow_attr *attr,
				    const struct rte_flow_item items[],

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:12614
error: drivers/net/mlx5/mlx5_flow_hw.c: patch does not apply