Commit d37bd5e8 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: CT: Correctly get flow rule 



The correct way is to us the flow_cls_offload_flow_rule() wrapper
instead of f->rule directly.

Fixes: 4c3844d9 ("net/mlx5e: CT: Introduce connection tracking")
Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarOz Shlomo <ozsh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 5e911e2c

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

+3 −2
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv, 
		       struct netlink_ext_ack *extack)

{

	struct mlx5_tc_ct_priv *ct_priv = mlx5_tc_ct_get_ct_priv(priv);

	struct flow_rule *rule = flow_cls_offload_flow_rule(f);

	struct flow_dissector_key_ct *mask, *key;

	bool trk, est, untrk, unest, new;

	u32 ctstate = 0, ctstate_mask = 0;
@@ -706,7 +707,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv, 
	u16 ct_state, ct_state_mask;

	struct flow_match_ct match;



	if (!flow_rule_match_key(f->rule, FLOW_DISSECTOR_KEY_CT))

	if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CT))

		return 0;



	if (!ct_priv) {
@@ -715,7 +716,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv, 
		return -EOPNOTSUPP;

	}



	flow_rule_match_ct(f->rule, &match);

	flow_rule_match_ct(rule, &match);



	key = match.key;

	mask = match.mask;

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h

+3 −1
Original line number Diff line number Diff line
@@ -130,7 +130,9 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv, 
		       struct flow_cls_offload *f,

		       struct netlink_ext_ack *extack)

{

	if (!flow_rule_match_key(f->rule, FLOW_DISSECTOR_KEY_CT))

	struct flow_rule *rule = flow_cls_offload_flow_rule(f);



	if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CT))

		return 0;



	NL_SET_ERR_MSG_MOD(extack, "mlx5 tc ct offload isn't enabled.");

CRA Git | Maintained and supported by SUSTech CRA and CCSE