When removing the IPv6 routing extension header from the
packets, the destination address should be updated to the
last one in the segment list.
Enlarge the hardware sample scope to cover the last segment.
Signed-off-by: Rongwei Liu <rongw...@nvidia.com>
---
drivers/net/mlx5/mlx5.c | 42 +++++++++++++++++++++++++-----------
drivers/net/mlx5/mlx5.h | 1 +
drivers/net/mlx5/mlx5_flow.h | 15 +++++++++++++
3 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index f24e20a2ef..1418ffdea7 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1054,7 +1054,7 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev)
struct mlx5_devx_graph_node_attr node = {
.modify_field_select = 0,
};
- uint32_t ids[MLX5_GRAPH_NODE_SAMPLE_NUM];
+ uint32_t i, ids[MLX5_GRAPH_NODE_SAMPLE_NUM];
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_common_dev_config *config = &priv->sh->cdev->config;
void *fp = NULL, *ibv_ctx = priv->sh->cdev->ctx;
@@ -1084,10 +1084,18 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev)
node.next_header_field_size = 0x8;
node.in[0].arc_parse_graph_node = MLX5_GRAPH_ARC_NODE_IP;
node.in[0].compare_condition_value = IPPROTO_ROUTING;
- node.sample[0].flow_match_sample_en = 1;
- /* First come first serve no matter inner or outer. */
- node.sample[0].flow_match_sample_tunnel_mode =
MLX5_GRAPH_SAMPLE_TUNNEL_FIRST;
- node.sample[0].flow_match_sample_offset_mode =
MLX5_GRAPH_SAMPLE_OFFSET_FIXED;
+ /* Final IPv6 address. */
+ for (i = 0; i <= 4 && i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) {
+ node.sample[i].flow_match_sample_en = 1;
+ node.sample[i].flow_match_sample_offset_mode =
+ MLX5_GRAPH_SAMPLE_OFFSET_FIXED;
+ /* First come first serve no matter inner or outer. */
+ node.sample[i].flow_match_sample_tunnel_mode =
+ MLX5_GRAPH_SAMPLE_TUNNEL_FIRST;
+ node.sample[i].flow_match_sample_field_base_offset =
+ (i + 1) * sizeof(uint32_t); /* in bytes
*/
+ }
+ node.sample[0].flow_match_sample_field_base_offset = 0;
node.out[0].arc_parse_graph_node = MLX5_GRAPH_ARC_NODE_TCP;
node.out[0].compare_condition_value = IPPROTO_TCP;
node.out[1].arc_parse_graph_node = MLX5_GRAPH_ARC_NODE_UDP;
@@ -1100,8 +1108,8 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev)
goto error;
}
priv->sh->srh_flex_parser.flex.devx_fp->devx_obj = fp;
- priv->sh->srh_flex_parser.flex.mapnum = 1;
- priv->sh->srh_flex_parser.flex.devx_fp->num_samples = 1;
+ priv->sh->srh_flex_parser.flex.mapnum = 5;
+ priv->sh->srh_flex_parser.flex.devx_fp->num_samples = 5;
ret = mlx5_devx_cmd_query_parse_samples(fp, ids,
priv->sh->srh_flex_parser.flex.mapnum,
&priv->sh->srh_flex_parser.flex.devx_fp->anchor_id);
@@ -1109,12 +1117,22 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev)
DRV_LOG(ERR, "Failed to query sample IDs.");
goto error;
}
- ret = mlx5_devx_cmd_match_sample_info_query(ibv_ctx, ids[0],
-
&priv->sh->srh_flex_parser.flex.devx_fp->sample_info[0]);
- if (ret) {
- DRV_LOG(ERR, "Failed to query sample id information.");
- goto error;
+ for (i = 0; i <= 4 && i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) {
+ ret = mlx5_devx_cmd_match_sample_info_query(ibv_ctx, ids[i],
+
&priv->sh->srh_flex_parser.flex.devx_fp->sample_info[i]);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to query sample id %u
information.", ids[i]);
+ goto error;
+ }
+ }
+ for (i = 0; i <= 4 && i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) {
+ priv->sh->srh_flex_parser.flex.devx_fp->sample_ids[i] = ids[i];
+ priv->sh->srh_flex_parser.flex.map[i].width = sizeof(uint32_t)
* CHAR_BIT;
+ priv->sh->srh_flex_parser.flex.map[i].reg_id = i;
+ priv->sh->srh_flex_parser.flex.map[i].shift =
+ (i + 1) * sizeof(uint32_t) *
CHAR_BIT;
}
+ priv->sh->srh_flex_parser.flex.map[0].shift = 0;
return 0;
error:
if (fp)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 9eae692037..3fbec4db9e 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1323,6 +1323,7 @@ struct mlx5_flex_pattern_field {
uint16_t shift:5;
uint16_t reg_id:5;
};
+
#define MLX5_INVALID_SAMPLE_REG_ID 0x1F
/* Port flex item context. */
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 1d116ea0f6..821c6ca281 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -2666,4 +2666,19 @@ flow_hw_get_srh_flex_parser_byte_off_from_ctx(void
*dr_ctx __rte_unused)
#endif
return UINT32_MAX;
}
+
+static __rte_always_inline void *
+flow_hw_get_dev_from_ctx(void *dr_ctx)
+{
+ uint16_t port;
+ struct mlx5_priv *priv;
+
+ MLX5_ETH_FOREACH_DEV(port, NULL) {
+ priv = rte_eth_devices[port].data->dev_private;
+ if (priv->dr_ctx == dr_ctx)
+ return &rte_eth_devices[port];
+ }
+ return NULL;
+}
+
#endif /* RTE_PMD_MLX5_FLOW_H_ */
--
2.27.0
