mlx5: DR, Fix ASO CT action applying in cross domain

[ Upstream commit e692a54 ] Fix ASO CT action applying in cross domain, instead of checking if the GVMI's of the domains are different, check if the domains are different, since we can have both domains on the same GVMI. This fix will allow two different domains on the same GVMI to share the same ASO CT action. Fixes: 730329f ("mlx5: DR, Support ASO CT cross domain") Signed-off-by: Hamdan Igbaria <[email protected]> Reviewed-by: Erez Shitrit <[email protected]> Signed-off-by: Yishai Hadas <[email protected]> Signed-off-by: Nicolas Morey <[email protected]>
linux-rdma · Jan 17, 2024 · 1e34390 · 1e34390
1 parent e539eb6
commit 1e34390
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/providers/mlx5/dr_action.c b/providers/mlx5/dr_action.c
@@ -614,6 +614,7 @@ int dr_actions_build_ste_arr(struct mlx5dv_dr_matcher *matcher,
 	uint8_t *last_ste;
 	int i;
 
+	attr.dmn = dmn;
 	attr.gvmi = dmn->info.caps.gvmi;
 	attr.hit_gvmi = dmn->info.caps.gvmi;
 	attr.final_icm_addr = nic_dmn->default_icm_addr;

diff --git a/providers/mlx5/dr_ste_v1.c b/providers/mlx5/dr_ste_v1.c
@@ -727,7 +727,7 @@ static void dr_ste_v1_set_actions_tx(uint8_t *action_type_set,
 	}
 
 	if (action_type_set[DR_ACTION_TYP_ASO_CT]) {
-		if (attr->aso->dmn->info.caps.gvmi != attr->gvmi ||
+		if (attr->aso->dmn != attr->dmn ||
 		    action_sz < DR_STE_ACTION_DOUBLE_SZ) {
 			dr_ste_v1_arr_init_next_match(&last_ste, added_stes,
 						      attr->gvmi);
@@ -736,7 +736,7 @@ static void dr_ste_v1_set_actions_tx(uint8_t *action_type_set,
 			action_sz = DR_STE_ACTION_TRIPLE_SZ;
 		}
 
-		if (attr->aso->dmn->info.caps.gvmi != attr->gvmi) {
+		if (attr->aso->dmn != attr->dmn) {
 			attr->aso_ste_loc = ste_loc;
 		} else {
 			dr_ste_v1_set_aso_ct(action,
@@ -991,7 +991,7 @@ static void dr_ste_v1_set_actions_rx(uint8_t *action_type_set,
 	}
 
 	if (action_type_set[DR_ACTION_TYP_ASO_CT]) {
-		if (attr->aso->dmn->info.caps.gvmi != attr->gvmi ||
+		if (attr->aso->dmn != attr->dmn ||
 		    action_sz < DR_STE_ACTION_DOUBLE_SZ) {
 			dr_ste_v1_arr_init_next_match(&last_ste, added_stes,
 						      attr->gvmi);
@@ -1001,7 +1001,7 @@ static void dr_ste_v1_set_actions_rx(uint8_t *action_type_set,
 			allow_ctr = true;
 		}
 
-		if (attr->aso->dmn->info.caps.gvmi != attr->gvmi) {
+		if (attr->aso->dmn != attr->dmn) {
 			attr->aso_ste_loc = ste_loc;
 		} else {
 			dr_ste_v1_set_aso_ct(action,

diff --git a/providers/mlx5/mlx5dv_dr.h b/providers/mlx5/mlx5dv_dr.h
@@ -387,6 +387,7 @@ struct dr_ste_actions_attr {
 	} vlans;
 	struct dr_action_aso *aso;
 	uint32_t aso_ste_loc;
+	struct mlx5dv_dr_domain *dmn;
 };
 
 struct cross_dmn_params {