Re: [PATCH net-next v2] net/mlx5e: flower: check for unsupported control flags

Paolo Abeni
2024-05-02T11:30:32Z

On Tue, 2024-04-30 at 08:15 +0300, Tariq Toukan wrote:
>
> On 22/04/2024 18:27, Asbjørn Sloth Tønnesen wrote:
> > Use flow_rule_is_supp_control_flags() to reject filters
> > with unsupported control flags.
> >
> > In case any unsupported control flags are masked,
> > flow_rule_is_supp_control_flags() sets a NL extended
> > error message, and we return -EOPNOTSUPP.
> >
> > Remove FLOW_DIS_FIRST_FRAG specific error message,
> > and treat it as any other unsupported control flag.
> >
> > Only compile-tested.
> >
> > Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
> > ---
> >
> > Changelog:
> >
> > v2:
> > - remove existing FLOW_DIS_FIRST_FRAG "support" (requested by Jianbo)
> >
> > v1: https://lore.kernel.org/netdev/20240417135110.99900-1-ast@fiberby.net/
> >
> > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 10 ++++------
> > 1 file changed, 4 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> > index aeb32cb27182..30673292e15f 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> > @@ -2801,12 +2801,6 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
> > flow_rule_match_control(rule, &match);
> > addr_type = match.key->addr_type;
> >
> > - /* the HW doesn't support frag first/later */
> > - if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
> > - NL_SET_ERR_MSG_MOD(extack, "Match on frag first/later is not supported");
> > - return -EOPNOTSUPP;
> > - }
> > -
> > if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {
> > MLX5_SET(fte_match_set_lyr_2_4, headers_c, frag, 1);
> > MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag,
> > @@ -2819,6 +2813,10 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
> > else
> > *match_level = MLX5_MATCH_L3;
> > }
> > +
> > + if (!flow_rule_is_supp_control_flags(FLOW_DIS_IS_FRAGMENT,
> > + match.mask->flags, extack))
> > + return -EOPNOTSUPP;
> > }
> >
> > if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {
>
> Acked-by: Tariq Toukan <tariqt@nvidia.com>

@Tariq/@Saeed: do you want to take this patch towards your tree and
send or do you prefer we merge it directly? I tend to read the above
ack as the 2nd option, but given this is only build tested I guess the
first would be better...

Thanks,

Paolo