Skip to contentSkip to conversation

net/mlx5: update pattern validations

PATCH Superseded Gregory Etelson 3 participants 12 messages Feb 2, 2024 – Feb 26, 2024 Network drivers

lore
Share & tools
lore
#0 lore raw

cover net/mlx5: update pattern validations

Gregory Etelson (2):
net/mlx5/hws: definer, update pattern validations net/mlx5: improve pattern template validation

 drivers/net/mlx5/hws/mlx5dr_definer.c |   4 +-
 drivers/net/mlx5/mlx5.h               |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c       | 121 ++++++++++++++++++++++++--
 3 files changed, 120 insertions(+), 6 deletions(-)
Signature · 1 line
2.39.2
#1 lore raw

PATCH 1/2 net/mlx5/hws: definer, update pattern validations

The patch updates HWS code for upcoming extended PMD pattern template verification:
Support VOID flow item type.
Return E2BUG error code when pattern is too large for definer.

---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/mlx5/hws/mlx5dr_definer.c +3 -1
index 0b60479406..05b53e622a 100644
@@ -2537,6 +2537,8 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
 			ret = mlx5dr_definer_conv_item_ptype(&cd, items, i);
 			item_flags |= MLX5_FLOW_ITEM_PTYPE;
 			break;
+		case RTE_FLOW_ITEM_TYPE_VOID:
+			break;
 		default:
 			DR_LOG(ERR, "Unsupported item type %d", items->type);
 			rte_errno = ENOTSUP;
@@ -2843,7 +2845,7 @@ mlx5dr_definer_find_best_match_fit(struct mlx5dr_context *ctx,
 	}
 
 	DR_LOG(ERR, "Unable to find supporting match/jumbo definer combination");
-	rte_errno = ENOTSUP;
+	rte_errno = E2BIG;
 	return rte_errno;
 }
 
Signature · 1 line
2.39.2
#2 lore raw

RE: [PATCH 1/2] net/mlx5/hws: definer, update pattern validations

Hi Gregory,

Quoted 11 lines

-----Original Message-----
From: Gregory Etelson <[email protected]>
Sent: Friday, February 2, 2024 16:06
To: [email protected]
Cc: Gregory Etelson <[email protected]>; Maayan Kashani <[email protected]>; Dariusz Sosnowski <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>; Matan Azrad <[email protected]>
Subject: [PATCH 1/2] net/mlx5/hws: definer, update pattern validations

Quoted 4 lines

The patch updates HWS code for upcoming extended PMD pattern template verification:
Support VOID flow item type.
Return E2BUG error code when pattern is too large for definer.

There's a typo here: s/E2BUG/E2BIG/

Best regards,
Dariusz Sosnowski

#3 lore raw

v2 cover net/mlx5: update pattern validations

In reply to Gregory Etelson

Gregory Etelson (2):
net/mlx5/hws: definer, update pattern validations net/mlx5: improve pattern template validation

 drivers/net/mlx5/hws/mlx5dr_definer.c |   4 +-
 drivers/net/mlx5/mlx5.h               |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c       | 116 ++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)
Signature · 1 line
2.39.2
#4 lore raw

PATCH v2 1/2 net/mlx5/hws: definer, update pattern validations

The patch updates HWS code for upcoming extended PMD pattern template verification:
Support VOID flow item type.
Return E2BIG error code when pattern is too large for definer.

---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/mlx5/hws/mlx5dr_definer.c +3 -1
index 0b60479406..05b53e622a 100644
@@ -2537,6 +2537,8 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
 			ret = mlx5dr_definer_conv_item_ptype(&cd, items, i);
 			item_flags |= MLX5_FLOW_ITEM_PTYPE;
 			break;
+		case RTE_FLOW_ITEM_TYPE_VOID:
+			break;
 		default:
 			DR_LOG(ERR, "Unsupported item type %d", items->type);
 			rte_errno = ENOTSUP;
@@ -2843,7 +2845,7 @@ mlx5dr_definer_find_best_match_fit(struct mlx5dr_context *ctx,
 	}
 
 	DR_LOG(ERR, "Unable to find supporting match/jumbo definer combination");
-	rte_errno = ENOTSUP;
+	rte_errno = E2BIG;
 	return rte_errno;
 }
 
Signature · 1 line
2.39.2
#5 lore raw

PATCH v2 2/2 net/mlx5: improve pattern template validation

In reply to Gregory Etelson

Current PMD implementation validates pattern templates that will always be rejected during table template creation.

The patch adds basic HWS verifications to pattern validation to ensure that the pattern can be used in table template.

PMD updates rte_errno if pattern template validation failed:

E2BIG - pattern too big for PMD
ENOTSUP - pattern not supported by PMD
ENOMEM - PMD allocation failure

---
 drivers/net/mlx5/mlx5.h         |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c | 116 ++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+)
drivers/net/mlx5/mlx5.h +1 -0
index f2e2e04429..e98db91888 100644
@@ -1965,6 +1965,7 @@ struct mlx5_priv {
 	struct mlx5_aso_mtr_pool *hws_mpool; /* HW steering's Meter pool. */
 	struct mlx5_flow_hw_ctrl_rx *hw_ctrl_rx;
 	/**< HW steering templates used to create control flow rules. */
+	struct rte_flow_actions_template *action_template_drop[MLX5DR_TABLE_TYPE_MAX];
 #endif
 	struct rte_eth_dev *shared_host; /* Host device for HW steering. */
 	uint16_t shared_refcnt; /* HW steering host reference counter. */
drivers/net/mlx5/mlx5_flow_hw.c +116 -0

154 lines not on this page · raw message

Signature · 1 line
2.39.2
#6 lore raw

PATCH 2/2 net/mlx5: improve pattern template validation

In reply to Gregory Etelson

Current PMD implementation validates pattern templates that will always be rejected during table template creation.

The patch adds basic HWS verifications to pattern validation to ensure that the pattern can be used in table template.

PMD updates rte_errno if pattern template validation failed:

E2BIG - pattern too big for PMD
ENOTSUP - pattern not supported by PMD
ENOMEM - PMD allocation failure

---
 drivers/net/mlx5/mlx5.h         |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c | 121 ++++++++++++++++++++++++++++++--
 2 files changed, 117 insertions(+), 5 deletions(-)
drivers/net/mlx5/mlx5.h +1 -0
index f2e2e04429..e98db91888 100644
@@ -1965,6 +1965,7 @@ struct mlx5_priv {
 	struct mlx5_aso_mtr_pool *hws_mpool; /* HW steering's Meter pool. */
 	struct mlx5_flow_hw_ctrl_rx *hw_ctrl_rx;
 	/**< HW steering templates used to create control flow rules. */
+	struct rte_flow_actions_template *action_template_drop[MLX5DR_TABLE_TYPE_MAX];
 #endif
 	struct rte_eth_dev *shared_host; /* Host device for HW steering. */
 	uint16_t shared_refcnt; /* HW steering host reference counter. */
drivers/net/mlx5/mlx5_flow_hw.c +116 -5

165 lines not on this page · raw message

Signature · 1 line
2.39.2
#7 lore raw

RE: [PATCH 2/2] net/mlx5: improve pattern template validation

Hi Gregory,

Quoted 65 lines

-----Original Message-----
From: Gregory Etelson <[email protected]>
Sent: Friday, February 2, 2024 16:06
To: [email protected]
Cc: Gregory Etelson <[email protected]>; Maayan Kashani <[email protected]>; Dariusz Sosnowski <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>; Matan Azrad <[email protected]>
Subject: [PATCH 2/2] net/mlx5: improve pattern template validation

Current PMD implementation validates pattern templates that will always be rejected during table template creation.

The patch adds basic HWS verifications to pattern validation to ensure that the pattern can be used in table template.

PMD updates rte_errno if pattern template validation failed:

E2BIG - pattern too big for PMD
ENOTSUP - pattern not supported by PMD
ENOMEM - PMD allocation failure

[snip]

--git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index da873ae2e2..443aa5fcf0 100644

drivers/net/mlx5/mlx5_flow_hw.c +20 -0
@@ -6840,6 +6840,46 @@ flow_hw_pattern_has_sq_match(const struct
 rte_flow_item *items)
 	return false;
 }
 
+static int
+pattern_template_validate(struct rte_eth_dev *dev,
+			  struct rte_flow_pattern_template *pt[], uint32_t
 pt_num) {
+	uint32_t group = 0;
+	struct rte_flow_error error;
+	struct rte_flow_template_table_attr tbl_attr = {
+		.nb_flows = 64,
+		.insertion_type =
 RTE_FLOW_TABLE_INSERTION_TYPE_PATTERN,
+		.hash_func = RTE_FLOW_TABLE_HASH_FUNC_DEFAULT,
+		.flow_attr = {
+			.ingress = pt[0]->attr.ingress,
+			.egress = pt[0]->attr.egress,
+			.transfer = pt[0]->attr.transfer
+		}
+	};
+	struct mlx5_priv *priv = dev->data->dev_private;
+	struct rte_flow_actions_template *action_template;
+
+	if (pt[0]->attr.ingress)
+		action_template = priv-
Quoted 1 line

action_template_drop[MLX5DR_TABLE_TYPE_NIC_RX];

drivers/net/mlx5/mlx5_flow_hw.c +2 -0
+	else if (pt[0]->attr.egress)
+		action_template = priv-
Quoted 1 line

action_template_drop[MLX5DR_TABLE_TYPE_NIC_TX];

drivers/net/mlx5/mlx5_flow_hw.c +2 -0
+	else if (pt[0]->attr.transfer)
+		action_template = priv-
Quoted 1 line

action_template_drop[MLX5DR_TABLE_TYPE_FDB];

drivers/net/mlx5/mlx5_flow_hw.c flow_hw_pattern_has_sq_match(const struct rte_flow_item *items) · line 6874

Quoted 7 lines
drivers/net/mlx5/mlx5_flow_hw.c +7 -0
+	else
+		return EINVAL;
+	do {
+		struct rte_flow_template_table *tmpl_tbl;
+
+		tbl_attr.flow_attr.group = group;
+		tmpl_tbl = flow_hw_template_table_create(dev, &tbl_attr, pt, pt_num,

flow_hw_table_create() should be called here.
If E-Switch is enabled, flow_hw_template_table_create() will perform internal group translation for FDB and TX domain, so group 0 will be untested.

drivers/net/mlx5/mlx5_flow_hw.c flow_hw_pattern_has_sq_match(const struct rte_flow_item *items) · line 6878

Quoted 5 lines
drivers/net/mlx5/mlx5_flow_hw.c +1 -0
+							 &action_template, 1,

NULL);

drivers/net/mlx5/mlx5_flow_hw.c +3 -0
+		if (!tmpl_tbl)
+			return rte_errno;
+		flow_hw_table_destroy(dev, tmpl_tbl, &error);

I don't think that passing error struct is needed here, since this error is not propagated up.

Quoted 14 lines

[snip]

drivers/net/mlx5/mlx5_flow_hw.c +7 -0
@@ -9184,6 +9235,66 @@ flow_hw_compare_config(const struct
 mlx5_flow_hw_attr *hw_attr,
 	return true;
 }
 
+/*
+ * No need to explicitly release drop action templates on port stop.
+ * Drop action templates release with other action templates during
+ * mlx5_dev_close -> flow_hw_resource_release ->
+flow_hw_actions_template_destroy  */ static void
+action_template_drop_release(struct rte_eth_dev *dev) {
+	int i;

drivers/net/mlx5/mlx5_flow_hw.c flow_hw_compare_config(const struct · line 9255

Quoted 10 lines
drivers/net/mlx5/mlx5_flow_hw.c +9 -0
+	struct mlx5_priv *priv = dev->data->dev_private;
+
+	for (i = 0; i < MLX5DR_TABLE_TYPE_MAX; i++) {
+		if (!priv->action_template_drop[i])
+			continue;
+		flow_hw_actions_template_destroy(dev,
+						 priv-
 >action_template_drop[i],
+						 NULL);
+	}

I'd suggest adding zeroing action_template_drop array entries here.
In case of failure inside rte_flow_configure(), rollback code called on error must reset the affected fields in private data to allow safe call to rte_flow_configure() again.

drivers/net/mlx5/mlx5_flow_hw.c flow_hw_resource_release(struct rte_eth_dev · line 9739

Quoted 12 lines

[snip]

drivers/net/mlx5/mlx5_flow_hw.c +1 -4
@@ -9621,10 +9735,7 @@ flow_hw_resource_release(struct rte_eth_dev
 *dev)
 	flow_hw_flush_all_ctrl_flows(dev);
 	flow_hw_cleanup_tx_repr_tagging(dev);
 	flow_hw_cleanup_ctrl_rx_tables(dev);
-	while (!LIST_EMPTY(&priv->flow_hw_grp)) {
-		grp = LIST_FIRST(&priv->flow_hw_grp);
-		flow_hw_group_unset_miss_group(dev, grp, NULL);
-	}
+	action_template_drop_release(dev);

Why is the miss actions cleanup code removed? It does not seem related to the patch.

Best regards,
Dariusz Sosnowski

#8 lore raw

v3 cover net/mlx5: update pattern validations

In reply to Gregory Etelson

PMD updates rte_errno if pattern template validation failed:
E2BIG - pattern too big for PMD
ENOTSUP - pattern not supported by PMD
ENOMEM - PMD allocation failure

Gregory Etelson (2):
net/mlx5/hws: definer, update pattern validations net/mlx5: improve pattern template validation

 drivers/net/mlx5/hws/mlx5dr_definer.c |   4 +-
 drivers/net/mlx5/mlx5.h               |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c       | 121 ++++++++++++++++++++++++++
 3 files changed, 125 insertions(+), 1 deletion(-)
Signature · 1 line
2.39.2
#9 lore raw

PATCH v3 1/2 net/mlx5/hws: definer, update pattern validations

The patch updates HWS code for upcoming extended PMD pattern template verification:
Support VOID flow item type.
Return E2BIG error code when pattern is too large for definer.

---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/mlx5/hws/mlx5dr_definer.c +3 -1
index 0b60479406..05b53e622a 100644
@@ -2537,6 +2537,8 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
 			ret = mlx5dr_definer_conv_item_ptype(&cd, items, i);
 			item_flags |= MLX5_FLOW_ITEM_PTYPE;
 			break;
+		case RTE_FLOW_ITEM_TYPE_VOID:
+			break;
 		default:
 			DR_LOG(ERR, "Unsupported item type %d", items->type);
 			rte_errno = ENOTSUP;
@@ -2843,7 +2845,7 @@ mlx5dr_definer_find_best_match_fit(struct mlx5dr_context *ctx,
 	}
 
 	DR_LOG(ERR, "Unable to find supporting match/jumbo definer combination");
-	rte_errno = ENOTSUP;
+	rte_errno = E2BIG;
 	return rte_errno;
 }
 
Signature · 1 line
2.39.2
#10 lore raw

PATCH v3 2/2 net/mlx5: improve pattern template validation

In reply to Gregory Etelson

Current PMD implementation validates pattern templates that will always be rejected during table template creation.

The patch adds basic HWS verifications to pattern validation to ensure that the pattern can be used in table template.

PMD updates rte_errno if pattern template validation failed:

E2BIG - pattern too big for PMD
ENOTSUP - pattern not supported by PMD
ENOMEM - PMD allocation failure

---
 drivers/net/mlx5/mlx5.h         |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c | 121 ++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)
drivers/net/mlx5/mlx5.h +1 -0
index f2e2e04429..e98db91888 100644
@@ -1965,6 +1965,7 @@ struct mlx5_priv {
 	struct mlx5_aso_mtr_pool *hws_mpool; /* HW steering's Meter pool. */
 	struct mlx5_flow_hw_ctrl_rx *hw_ctrl_rx;
 	/**< HW steering templates used to create control flow rules. */
+	struct rte_flow_actions_template *action_template_drop[MLX5DR_TABLE_TYPE_MAX];
 #endif
 	struct rte_eth_dev *shared_host; /* Host device for HW steering. */
 	uint16_t shared_refcnt; /* HW steering host reference counter. */
drivers/net/mlx5/mlx5_flow_hw.c +121 -0

159 lines not on this page · raw message

Signature · 1 line
2.39.2
#11 lore raw
In reply to Gregory Etelson

Hi,

Quoted 23 lines

-----Original Message-----
From: Gregory Etelson <[email protected]>
Sent: Monday, February 12, 2024 3:59 PM
To: [email protected]
Cc: Gregory Etelson <[email protected]>; Maayan Kashani <[email protected]>; Dariusz Sosnowski <[email protected]>
Subject: [PATCH v3 0/2] net/mlx5: update pattern validations

PMD updates rte_errno if pattern template validation failed:
E2BIG - pattern too big for PMD
ENOTSUP - pattern not supported by PMD
ENOMEM - PMD allocation failure

Gregory Etelson (2):
net/mlx5/hws: definer, update pattern validations net/mlx5: improve pattern template validation

 drivers/net/mlx5/hws/mlx5dr_definer.c |   4 +-
 drivers/net/mlx5/mlx5.h               |   1 +
 drivers/net/mlx5/mlx5_flow_hw.c       | 121
++++++++++++++++++++++++++
 3 files changed, 125 insertions(+), 1 deletion(-)
Quoted 3 lines

--
2.39.2

Series applied to next-net-mlx

Kindest regards
Raslan Darawsheh