octeontx2-pf: flower: check for unsupported control flags

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>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Sunil Goutham <sgoutham@marvell.com>
Link: https://lore.kernel.org/r/20240422152735.175693-1-ast@fiberby.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
index 6d4ce2ece8d022d659583b939e24e6ba515e6c77..e63cc1eb6d8917e2f090eb5dcb0b4a2467cbbf86 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
@@ -700,10 +700,6 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node,
                u32 val;
 
                flow_rule_match_control(rule, &match);
-               if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
-                       NL_SET_ERR_MSG_MOD(extack, "HW doesn't support frag first/later");
-                       return -EOPNOTSUPP;
-               }
 
                if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {
                        val = match.key->flags & FLOW_DIS_IS_FRAGMENT;
@@ -721,6 +717,10 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node,
                                return -EOPNOTSUPP;
                        }
                }
+
+               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_ETH_ADDRS)) {