common/sfc_efx/base: match on recirc ID in action rules

Currently, there is an API for setting recirculation ID in
outer rules. Add an API to let action rules match on it.

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>

diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h
index c835b67..8975c6e 100644 (file)
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -4203,6 +4203,11 @@ typedef enum efx_mae_field_id_e {
        EFX_MAE_FIELD_ENC_HAS_OVLAN,
        EFX_MAE_FIELD_ENC_HAS_IVLAN,
 
+       /*
+        * Fields which can be set by efx_mae_match_spec_field_set()
+        * or by using dedicated field-specific helper APIs.
+        */
+       EFX_MAE_FIELD_RECIRC_ID,
        EFX_MAE_FIELD_NIDS
 } efx_mae_field_id_t;
 
@@ -4373,6 +4378,12 @@ efx_mae_match_spec_mport_set(
        __in                            const efx_mport_sel_t *valuep,
        __in_opt                        const efx_mport_sel_t *maskp);
 
+LIBEFX_API
+extern __checkReturn                   efx_rc_t
+efx_mae_match_spec_recirc_id_set(
+       __in                            efx_mae_match_spec_t *spec,
+       __in                            uint8_t recirc_id);
+
 LIBEFX_API
 extern __checkReturn                   boolean_t
 efx_mae_match_specs_equal(
@@ -4509,6 +4520,8 @@ typedef struct efx_mae_rule_id_s {
 
 /*
  * Set the initial recirculation ID. It goes to action rule (AR) lookup.
+ *
+ * To match on this ID in an AR, use efx_mae_match_spec_recirc_id_set().
  */
 LIBEFX_API
 extern __checkReturn                   efx_rc_t

diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c
index d87949a..154b6e1 100644 (file)
--- a/drivers/common/sfc_efx/base/efx_mae.c
+++ b/drivers/common/sfc_efx/base/efx_mae.c
@@ -473,6 +473,7 @@ typedef enum efx_mae_field_cap_id_e {
        EFX_MAE_FIELD_ID_HAS_IVLAN = MAE_FIELD_HAS_IVLAN,
        EFX_MAE_FIELD_ID_ENC_HAS_OVLAN = MAE_FIELD_ENC_HAS_OVLAN,
        EFX_MAE_FIELD_ID_ENC_HAS_IVLAN = MAE_FIELD_ENC_HAS_IVLAN,
+       EFX_MAE_FIELD_ID_RECIRC_ID = MAE_FIELD_RECIRC_ID,
 
        EFX_MAE_FIELD_CAP_NIDS
 } efx_mae_field_cap_id_t;
@@ -519,10 +520,10 @@ static const efx_mae_mv_desc_t __efx_mae_action_rule_mv_desc_set[] = {
        [EFX_MAE_FIELD_##_name] =                                       \
        {                                                               \
                EFX_MAE_FIELD_ID_##_name,                               \
-               MAE_FIELD_MASK_VALUE_PAIRS_##_name##_LEN,               \
-               MAE_FIELD_MASK_VALUE_PAIRS_##_name##_OFST,              \
-               MAE_FIELD_MASK_VALUE_PAIRS_##_name##_MASK_LEN,          \
-               MAE_FIELD_MASK_VALUE_PAIRS_##_name##_MASK_OFST,         \
+               MAE_FIELD_MASK_VALUE_PAIRS_V2_##_name##_LEN,            \
+               MAE_FIELD_MASK_VALUE_PAIRS_V2_##_name##_OFST,           \
+               MAE_FIELD_MASK_VALUE_PAIRS_V2_##_name##_MASK_LEN,       \
+               MAE_FIELD_MASK_VALUE_PAIRS_V2_##_name##_MASK_OFST,      \
                0, 0 /* no alternative field */,                        \
                _endianness                                             \
        }
@@ -547,6 +548,7 @@ static const efx_mae_mv_desc_t __efx_mae_action_rule_mv_desc_set[] = {
        EFX_MAE_MV_DESC(TCP_FLAGS_BE, EFX_MAE_FIELD_BE),
        EFX_MAE_MV_DESC(ENC_VNET_ID_BE, EFX_MAE_FIELD_BE),
        EFX_MAE_MV_DESC(OUTER_RULE_ID, EFX_MAE_FIELD_LE),
+       EFX_MAE_MV_DESC(RECIRC_ID, EFX_MAE_FIELD_LE),
 
 #undef EFX_MAE_MV_DESC
 };
@@ -882,6 +884,32 @@ efx_mae_mport_id_by_selector(
 
 fail2:
        EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+
+       __checkReturn                   efx_rc_t
+efx_mae_match_spec_recirc_id_set(
+       __in                            efx_mae_match_spec_t *spec,
+       __in                            uint8_t recirc_id)
+{
+       uint8_t full_mask = UINT8_MAX;
+       const uint8_t *vp;
+       const uint8_t *mp;
+       efx_rc_t rc;
+
+       vp = (const uint8_t *)&recirc_id;
+       mp = (const uint8_t *)&full_mask;
+
+       rc = efx_mae_match_spec_field_set(spec, EFX_MAE_FIELD_RECIRC_ID,
+                                         sizeof (recirc_id), vp,
+                                         sizeof (full_mask), mp);
+       if (rc != 0)
+               goto fail1;
+
+       return (0);
+
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
        return (rc);

diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index e728ea3..642a62e 100644 (file)
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -122,6 +122,7 @@ INTERNAL {
        efx_mae_match_spec_is_valid;
        efx_mae_match_spec_mport_set;
        efx_mae_match_spec_outer_rule_id_set;
+       efx_mae_match_spec_recirc_id_set;
        efx_mae_match_specs_class_cmp;
        efx_mae_match_specs_equal;
        efx_mae_mport_by_pcie_function;