History

net/mlx5: DR, Rename list field in matcher struct to list_node

In dr_types structs, some list fields are list heads, and some are just list nodes that are stored on the other structs' lists. Rename the appropriate list field to reflect this distinction.

Yevgeny Kliteynik committed 4 years ago

Commit 08fac101 parent 32e9bd53 files · +15 −15Browse files

Unified · Split

3 files
  1. drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c +13 −13
  2. drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c +1 −1
  3. drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h +1 −1
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c+13−13
@@ -721,7 +721,7 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) · 720 unmodified lines
721 int ret;721 int ret;
722 722
723 next_matcher = NULL;723 next_matcher = NULL;
724 list_for_each_entry(tmp_matcher, &tbl->matcher_list, matcher_list) {724 list_for_each_entry(tmp_matcher, &tbl->matcher_list, list_node) {
725 if (tmp_matcher->prio >= matcher->prio) {725 if (tmp_matcher->prio >= matcher->prio) {
726 next_matcher = tmp_matcher;726 next_matcher = tmp_matcher;
727 break;727 break;
@@ -731,11 +731,11 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) · 3 unmodified lines
731 731
732 prev_matcher = NULL;732 prev_matcher = NULL;
733 if (next_matcher && !first)733 if (next_matcher && !first)
734 prev_matcher = list_prev_entry(next_matcher, matcher_list);734 prev_matcher = list_prev_entry(next_matcher, list_node);
735 else if (!first)735 else if (!first)
736 prev_matcher = list_last_entry(&tbl->matcher_list,736 prev_matcher = list_last_entry(&tbl->matcher_list,
737 struct mlx5dr_matcher,737 struct mlx5dr_matcher,
738 matcher_list);738 list_node);
739 739
740 if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||740 if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||
741 dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {741 dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {
@@ -756,12 +756,12 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) · 14 unmodified lines
756 }756 }
757 757
758 if (prev_matcher)758 if (prev_matcher)
759 list_add(&matcher->matcher_list, &prev_matcher->matcher_list);759 list_add(&matcher->list_node, &prev_matcher->list_node);
760 else if (next_matcher)760 else if (next_matcher)
761 list_add_tail(&matcher->matcher_list,761 list_add_tail(&matcher->list_node,
762 &next_matcher->matcher_list);762 &next_matcher->list_node);
763 else763 else
764 list_add(&matcher->matcher_list, &tbl->matcher_list);764 list_add(&matcher->list_node, &tbl->matcher_list);
765 765
766 return 0;766 return 0;
767}767}
@@ -968,7 +968,7 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl, · 200 unmodified lines
968 matcher->prio = priority;968 matcher->prio = priority;
969 matcher->match_criteria = match_criteria_enable;969 matcher->match_criteria = match_criteria_enable;
970 refcount_set(&matcher->refcount, 1);970 refcount_set(&matcher->refcount, 1);
971 INIT_LIST_HEAD(&matcher->matcher_list);971 INIT_LIST_HEAD(&matcher->list_node);
972 972
973 mlx5dr_domain_lock(tbl->dmn);973 mlx5dr_domain_lock(tbl->dmn);
974 974
@@ -1031,15 +1031,15 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher) · 56 unmodified lines
1031 struct mlx5dr_domain *dmn = tbl->dmn;1031 struct mlx5dr_domain *dmn = tbl->dmn;
1032 int ret = 0;1032 int ret = 0;
1033 1033
1034 if (list_is_last(&matcher->matcher_list, &tbl->matcher_list))1034 if (list_is_last(&matcher->list_node, &tbl->matcher_list))
1035 next_matcher = NULL;1035 next_matcher = NULL;
1036 else1036 else
1037 next_matcher = list_next_entry(matcher, matcher_list);1037 next_matcher = list_next_entry(matcher, list_node);
1038 1038
1039 if (matcher->matcher_list.prev == &tbl->matcher_list)1039 if (matcher->list_node.prev == &tbl->matcher_list)
1040 prev_matcher = NULL;1040 prev_matcher = NULL;
1041 else1041 else
1042 prev_matcher = list_prev_entry(matcher, matcher_list);1042 prev_matcher = list_prev_entry(matcher, list_node);
1043 1043
1044 if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||1044 if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||
1045 dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {1045 dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {
@@ -1059,7 +1059,7 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher) · 13 unmodified lines
1059 return ret;1059 return ret;
1060 }1060 }
1061 1061
1062 list_del(&matcher->matcher_list);1062 list_del(&matcher->list_node);
1063 1063
1064 return 0;1064 return 0;
1065}1065}
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c+1−1
@@ -19,7 +19,7 @@ int mlx5dr_table_set_miss_action(struct mlx5dr_table *tbl, · 18 unmodified lines
19 if (!list_empty(&tbl->matcher_list))19 if (!list_empty(&tbl->matcher_list))
20 last_matcher = list_last_entry(&tbl->matcher_list,20 last_matcher = list_last_entry(&tbl->matcher_list,
21 struct mlx5dr_matcher,21 struct mlx5dr_matcher,
22 matcher_list);22 list_node);
23 23
24 if (tbl->dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX ||24 if (tbl->dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX ||
25 tbl->dmn->type == MLX5DR_DOMAIN_TYPE_FDB) {25 tbl->dmn->type == MLX5DR_DOMAIN_TYPE_FDB) {
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h+1−1
@@ -881,7 +881,7 @@ struct mlx5dr_matcher { · 880 unmodified lines
881 struct mlx5dr_table *tbl;881 struct mlx5dr_table *tbl;
882 struct mlx5dr_matcher_rx_tx rx;882 struct mlx5dr_matcher_rx_tx rx;
883 struct mlx5dr_matcher_rx_tx tx;883 struct mlx5dr_matcher_rx_tx tx;
884 struct list_head matcher_list;884 struct list_head list_node;
885 u32 prio;885 u32 prio;
886 struct mlx5dr_match_param mask;886 struct mlx5dr_match_param mask;
887 u8 match_criteria;887 u8 match_criteria;