Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mlx5: DR, Few fixes #1418

Merged
merged 2 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
mlx5: DR, Fix ASO CT action applying in cross domain
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]>
  • Loading branch information
hamdanigbaria authored and Yishai Hadas committed Jan 11, 2024
commit e692a549428d5f8253955acc0597b5d3160d9d5c
1 change: 1 addition & 0 deletions providers/mlx5/dr_action.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,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;
Expand Down
8 changes: 4 additions & 4 deletions providers/mlx5/dr_ste_v1.c
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,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);
Expand All @@ -764,7 +764,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,
Expand Down Expand Up @@ -1023,7 +1023,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);
Expand All @@ -1033,7 +1033,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,
Expand Down
1 change: 1 addition & 0 deletions providers/mlx5/mlx5dv_dr.h
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,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 {
Expand Down