common/cnxk: check BPHY IRQ availability
[dpdk.git] / drivers / common / sfc_efx / base / efx_mae.c
index eb91753..c178421 100644 (file)
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2019 Xilinx, Inc. All rights reserved.
- * All rights reserved.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
  */
 
 #include "efx.h"
@@ -47,17 +46,20 @@ efx_mae_get_capabilities(
 
        maep->em_encap_types_supported = 0;
 
-       if (MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_ENCAP_TYPE_VXLAN) == 1) {
+       if (MCDI_OUT_DWORD_FIELD(req, MAE_GET_CAPS_OUT_ENCAP_TYPES_SUPPORTED,
+           MAE_GET_CAPS_OUT_ENCAP_TYPE_VXLAN) != 0) {
                maep->em_encap_types_supported |=
                    (1U << EFX_TUNNEL_PROTOCOL_VXLAN);
        }
 
-       if (MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_ENCAP_TYPE_GENEVE) == 1) {
+       if (MCDI_OUT_DWORD_FIELD(req, MAE_GET_CAPS_OUT_ENCAP_TYPES_SUPPORTED,
+           MAE_GET_CAPS_OUT_ENCAP_TYPE_GENEVE) != 0) {
                maep->em_encap_types_supported |=
                    (1U << EFX_TUNNEL_PROTOCOL_GENEVE);
        }
 
-       if (MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_ENCAP_TYPE_NVGRE) == 1) {
+       if (MCDI_OUT_DWORD_FIELD(req, MAE_GET_CAPS_OUT_ENCAP_TYPES_SUPPORTED,
+           MAE_GET_CAPS_OUT_ENCAP_TYPE_NVGRE) != 0) {
                maep->em_encap_types_supported |=
                    (1U << EFX_TUNNEL_PROTOCOL_NVGRE);
        }
@@ -107,17 +109,22 @@ efx_mae_get_outer_rule_caps(
                goto fail2;
        }
 
+       if (req.emr_out_length_used < MC_CMD_MAE_GET_OR_CAPS_OUT_LENMIN) {
+               rc = EMSGSIZE;
+               goto fail3;
+       }
+
        mcdi_field_ncaps = MCDI_OUT_DWORD(req, MAE_GET_OR_CAPS_OUT_COUNT);
 
        if (req.emr_out_length_used <
            MC_CMD_MAE_GET_OR_CAPS_OUT_LEN(mcdi_field_ncaps)) {
                rc = EMSGSIZE;
-               goto fail3;
+               goto fail4;
        }
 
        if (mcdi_field_ncaps > field_ncaps) {
                rc = EMSGSIZE;
-               goto fail4;
+               goto fail5;
        }
 
        for (i = 0; i < mcdi_field_ncaps; ++i) {
@@ -145,6 +152,8 @@ efx_mae_get_outer_rule_caps(
 
        return (0);
 
+fail5:
+       EFSYS_PROBE(fail5);
 fail4:
        EFSYS_PROBE(fail4);
 fail3:
@@ -189,17 +198,22 @@ efx_mae_get_action_rule_caps(
                goto fail2;
        }
 
-       mcdi_field_ncaps = MCDI_OUT_DWORD(req, MAE_GET_OR_CAPS_OUT_COUNT);
+       if (req.emr_out_length_used < MC_CMD_MAE_GET_AR_CAPS_OUT_LENMIN) {
+               rc = EMSGSIZE;
+               goto fail3;
+       }
+
+       mcdi_field_ncaps = MCDI_OUT_DWORD(req, MAE_GET_AR_CAPS_OUT_COUNT);
 
        if (req.emr_out_length_used <
            MC_CMD_MAE_GET_AR_CAPS_OUT_LEN(mcdi_field_ncaps)) {
                rc = EMSGSIZE;
-               goto fail3;
+               goto fail4;
        }
 
        if (mcdi_field_ncaps > field_ncaps) {
                rc = EMSGSIZE;
-               goto fail4;
+               goto fail5;
        }
 
        for (i = 0; i < mcdi_field_ncaps; ++i) {
@@ -227,6 +241,8 @@ efx_mae_get_action_rule_caps(
 
        return (0);
 
+fail5:
+       EFSYS_PROBE(fail5);
 fail4:
        EFSYS_PROBE(fail4);
 fail3:
@@ -353,6 +369,8 @@ efx_mae_get_limits(
        emlp->eml_max_n_outer_prios = maep->em_max_n_outer_prios;
        emlp->eml_max_n_action_prios = maep->em_max_n_action_prios;
        emlp->eml_encap_types_supported = maep->em_encap_types_supported;
+       emlp->eml_encap_header_size_limit =
+           MC_CMD_MAE_ENCAP_HEADER_ALLOC_IN_HDR_DATA_MAXNUM_MCDI2;
 
        return (0);
 
@@ -690,23 +708,49 @@ efx_mae_match_spec_field_set(
                goto fail2;
        }
 
-       if (value_size != descp->emmd_value_size) {
+       if (descp->emmd_mask_size == 0) {
+               /* The ID points to a gap in the array of field descriptors. */
                rc = EINVAL;
                goto fail3;
        }
 
-       if (mask_size != descp->emmd_mask_size) {
+       if (value_size != descp->emmd_value_size) {
                rc = EINVAL;
                goto fail4;
        }
 
+       if (mask_size != descp->emmd_mask_size) {
+               rc = EINVAL;
+               goto fail5;
+       }
+
        if (descp->emmd_endianness == EFX_MAE_FIELD_BE) {
+               unsigned int i;
+
                /*
                 * The mask/value are in network (big endian) order.
                 * The MCDI request field is also big endian.
                 */
-               memcpy(mvp + descp->emmd_value_offset, value, value_size);
-               memcpy(mvp + descp->emmd_mask_offset, mask, mask_size);
+
+               EFSYS_ASSERT3U(value_size, ==, mask_size);
+
+               for (i = 0; i < value_size; ++i) {
+                       uint8_t *v_bytep = mvp + descp->emmd_value_offset + i;
+                       uint8_t *m_bytep = mvp + descp->emmd_mask_offset + i;
+
+                       /*
+                        * Apply the mask (which may be all-zeros) to the value.
+                        *
+                        * If this API is provided with some value to set for a
+                        * given field in one specification and with some other
+                        * value to set for this field in another specification,
+                        * then, if the two masks are all-zeros, the field will
+                        * avoid being counted as a mismatch when comparing the
+                        * specifications using efx_mae_match_specs_equal() API.
+                        */
+                       *v_bytep = value[i] & mask[i];
+                       *m_bytep = mask[i];
+               }
        } else {
                efx_dword_t dword;
 
@@ -741,6 +785,8 @@ efx_mae_match_spec_field_set(
 
        return (0);
 
+fail5:
+       EFSYS_PROBE(fail5);
 fail4:
        EFSYS_PROBE(fail4);
 fail3:
@@ -964,6 +1010,8 @@ efx_mae_action_set_spec_init(
                goto fail1;
        }
 
+       spec->ema_rsrc.emar_eh_id.id = EFX_MAE_RSRC_ID_INVALID;
+
        *specp = spec;
 
        return (0);
@@ -981,6 +1029,37 @@ efx_mae_action_set_spec_fini(
        EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec), spec);
 }
 
+static __checkReturn                   efx_rc_t
+efx_mae_action_set_add_decap(
+       __in                            efx_mae_actions_t *spec,
+       __in                            size_t arg_size,
+       __in_bcount(arg_size)           const uint8_t *arg)
+{
+       efx_rc_t rc;
+
+       _NOTE(ARGUNUSED(spec))
+
+       if (arg_size != 0) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (arg != NULL) {
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       /* This action does not have any arguments, so do nothing here. */
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+
 static __checkReturn                   efx_rc_t
 efx_mae_action_set_add_vlan_pop(
        __in                            efx_mae_actions_t *spec,
@@ -1055,6 +1134,50 @@ fail1:
        return (rc);
 }
 
+static __checkReturn                   efx_rc_t
+efx_mae_action_set_add_encap(
+       __in                            efx_mae_actions_t *spec,
+       __in                            size_t arg_size,
+       __in_bcount(arg_size)           const uint8_t *arg)
+{
+       efx_rc_t rc;
+
+       /*
+        * Adding this specific action to an action set spec and setting encap.
+        * header ID in the spec are two individual steps. This design allows
+        * the client driver to avoid encap. header allocation when it simply
+        * needs to check the order of actions submitted by user ("validate"),
+        * without actually allocating an action set and inserting a rule.
+        *
+        * For now, mark encap. header ID as invalid; the caller will invoke
+        * efx_mae_action_set_fill_in_eh_id() to override the field prior
+        * to action set allocation; otherwise, the allocation will fail.
+        */
+       spec->ema_rsrc.emar_eh_id.id = EFX_MAE_RSRC_ID_INVALID;
+
+       /*
+        * As explained above, there are no arguments to handle here.
+        * efx_mae_action_set_fill_in_eh_id() will take care of them.
+        */
+       if (arg_size != 0) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (arg != NULL) {
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+
 static __checkReturn                   efx_rc_t
 efx_mae_action_set_add_flag(
        __in                            efx_mae_actions_t *spec,
@@ -1151,12 +1274,18 @@ typedef struct efx_mae_action_desc_s {
 } efx_mae_action_desc_t;
 
 static const efx_mae_action_desc_t efx_mae_actions[EFX_MAE_NACTIONS] = {
+       [EFX_MAE_ACTION_DECAP] = {
+               .emad_add = efx_mae_action_set_add_decap
+       },
        [EFX_MAE_ACTION_VLAN_POP] = {
                .emad_add = efx_mae_action_set_add_vlan_pop
        },
        [EFX_MAE_ACTION_VLAN_PUSH] = {
                .emad_add = efx_mae_action_set_add_vlan_push
        },
+       [EFX_MAE_ACTION_ENCAP] = {
+               .emad_add = efx_mae_action_set_add_encap
+       },
        [EFX_MAE_ACTION_FLAG] = {
                .emad_add = efx_mae_action_set_add_flag
        },
@@ -1169,8 +1298,10 @@ static const efx_mae_action_desc_t efx_mae_actions[EFX_MAE_NACTIONS] = {
 };
 
 static const uint32_t efx_mae_action_ordered_map =
+       (1U << EFX_MAE_ACTION_DECAP) |
        (1U << EFX_MAE_ACTION_VLAN_POP) |
        (1U << EFX_MAE_ACTION_VLAN_PUSH) |
+       (1U << EFX_MAE_ACTION_ENCAP) |
        (1U << EFX_MAE_ACTION_FLAG) |
        (1U << EFX_MAE_ACTION_MARK) |
        (1U << EFX_MAE_ACTION_DELIVER);
@@ -1263,6 +1394,14 @@ fail1:
        return (rc);
 }
 
+       __checkReturn                   efx_rc_t
+efx_mae_action_set_populate_decap(
+       __in                            efx_mae_actions_t *spec)
+{
+       return (efx_mae_action_set_spec_populate(spec,
+           EFX_MAE_ACTION_DECAP, 0, NULL));
+}
+
        __checkReturn                   efx_rc_t
 efx_mae_action_set_populate_vlan_pop(
        __in                            efx_mae_actions_t *spec)
@@ -1287,6 +1426,20 @@ efx_mae_action_set_populate_vlan_push(
            EFX_MAE_ACTION_VLAN_PUSH, sizeof (action), arg));
 }
 
+       __checkReturn                   efx_rc_t
+efx_mae_action_set_populate_encap(
+       __in                            efx_mae_actions_t *spec)
+{
+       /*
+        * There is no argument to pass encap. header ID, thus, one does not
+        * need to allocate an encap. header while parsing application input.
+        * This is useful since building an action set may be done simply to
+        * validate a rule, whilst resource allocation usually consumes time.
+        */
+       return (efx_mae_action_set_spec_populate(spec,
+           EFX_MAE_ACTION_ENCAP, 0, NULL));
+}
+
        __checkReturn                   efx_rc_t
 efx_mae_action_set_populate_flag(
        __in                            efx_mae_actions_t *spec)
@@ -1359,7 +1512,22 @@ efx_mae_action_set_specs_equal(
        __in                            const efx_mae_actions_t *left,
        __in                            const efx_mae_actions_t *right)
 {
-       return ((memcmp(left, right, sizeof (*left)) == 0) ? B_TRUE : B_FALSE);
+       size_t cmp_size = EFX_FIELD_OFFSET(efx_mae_actions_t, ema_rsrc);
+
+       /*
+        * An action set specification consists of two parts. The first part
+        * indicates what actions are included in the action set, as well as
+        * extra quantitative values (in example, the number of VLAN tags to
+        * push). The second part comprises resource IDs used by the actions.
+        *
+        * A resource, in example, a counter, is allocated from the hardware
+        * by the client, and it's the client who is responsible for keeping
+        * track of allocated resources and comparing resource IDs if needed.
+        *
+        * In this API, don't compare resource IDs in the two specifications.
+        */
+
+       return ((memcmp(left, right, cmp_size) == 0) ? B_TRUE : B_FALSE);
 }
 
        __checkReturn                   efx_rc_t
@@ -1619,15 +1787,22 @@ efx_mae_outer_rule_remove(
                goto fail2;
        }
 
+       if (req.emr_out_length_used < MC_CMD_MAE_OUTER_RULE_REMOVE_OUT_LENMIN) {
+               rc = EMSGSIZE;
+               goto fail3;
+       }
+
        if (MCDI_OUT_DWORD(req, MAE_OUTER_RULE_REMOVE_OUT_REMOVED_OR_ID) !=
            or_idp->id) {
                /* Firmware failed to remove the outer rule. */
                rc = EAGAIN;
-               goto fail3;
+               goto fail4;
        }
 
        return (0);
 
+fail4:
+       EFSYS_PROBE(fail4);
 fail3:
        EFSYS_PROBE(fail3);
 fail2:
@@ -1663,6 +1838,199 @@ efx_mae_match_spec_outer_rule_id_set(
 
        return (0);
 
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+
+        __checkReturn                  efx_rc_t
+efx_mae_encap_header_alloc(
+       __in                            efx_nic_t *enp,
+       __in                            efx_tunnel_protocol_t encap_type,
+       __in_bcount(header_size)        uint8_t *header_data,
+       __in                            size_t header_size,
+       __out                           efx_mae_eh_id_t *eh_idp)
+{
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(enp);
+       efx_mcdi_req_t req;
+       EFX_MCDI_DECLARE_BUF(payload,
+           MC_CMD_MAE_ENCAP_HEADER_ALLOC_IN_LENMAX_MCDI2,
+           MC_CMD_MAE_ENCAP_HEADER_ALLOC_OUT_LEN);
+       uint32_t encap_type_mcdi;
+       efx_mae_eh_id_t eh_id;
+       efx_rc_t rc;
+
+       EFX_STATIC_ASSERT(sizeof (eh_idp->id) ==
+           MC_CMD_MAE_ENCAP_HEADER_ALLOC_OUT_ENCAP_HEADER_ID_LEN);
+
+       EFX_STATIC_ASSERT(EFX_MAE_RSRC_ID_INVALID ==
+           MC_CMD_MAE_ENCAP_HEADER_ALLOC_OUT_ENCAP_HEADER_ID_NULL);
+
+       if (encp->enc_mae_supported == B_FALSE) {
+               rc = ENOTSUP;
+               goto fail1;
+       }
+
+       switch (encap_type) {
+       case EFX_TUNNEL_PROTOCOL_NONE:
+               encap_type_mcdi = MAE_MCDI_ENCAP_TYPE_NONE;
+               break;
+       case EFX_TUNNEL_PROTOCOL_VXLAN:
+               encap_type_mcdi = MAE_MCDI_ENCAP_TYPE_VXLAN;
+               break;
+       case EFX_TUNNEL_PROTOCOL_GENEVE:
+               encap_type_mcdi = MAE_MCDI_ENCAP_TYPE_GENEVE;
+               break;
+       case EFX_TUNNEL_PROTOCOL_NVGRE:
+               encap_type_mcdi = MAE_MCDI_ENCAP_TYPE_NVGRE;
+               break;
+       default:
+               rc = ENOTSUP;
+               goto fail2;
+       }
+
+       if (header_size >
+           MC_CMD_MAE_ENCAP_HEADER_ALLOC_IN_HDR_DATA_MAXNUM_MCDI2) {
+               rc = EINVAL;
+               goto fail3;
+       }
+
+       req.emr_cmd = MC_CMD_MAE_ENCAP_HEADER_ALLOC;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_MAE_ENCAP_HEADER_ALLOC_IN_LEN(header_size);
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_MAE_ENCAP_HEADER_ALLOC_OUT_LEN;
+
+       MCDI_IN_SET_DWORD(req,
+           MAE_ENCAP_HEADER_ALLOC_IN_ENCAP_TYPE, encap_type_mcdi);
+
+       memcpy(payload + MC_CMD_MAE_ENCAP_HEADER_ALLOC_IN_HDR_DATA_OFST,
+           header_data, header_size);
+
+       efx_mcdi_execute(enp, &req);
+
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               goto fail4;
+       }
+
+       if (req.emr_out_length_used < MC_CMD_MAE_ENCAP_HEADER_ALLOC_OUT_LEN) {
+               rc = EMSGSIZE;
+               goto fail5;
+       }
+
+       eh_id.id = MCDI_OUT_DWORD(req,
+           MAE_ENCAP_HEADER_ALLOC_OUT_ENCAP_HEADER_ID);
+
+       if (eh_id.id == EFX_MAE_RSRC_ID_INVALID) {
+               rc = ENOENT;
+               goto fail6;
+       }
+
+       eh_idp->id = eh_id.id;
+
+       return (0);
+
+fail6:
+       EFSYS_PROBE(fail6);
+fail5:
+       EFSYS_PROBE(fail5);
+fail4:
+       EFSYS_PROBE(fail4);
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+
+       __checkReturn                   efx_rc_t
+efx_mae_encap_header_free(
+       __in                            efx_nic_t *enp,
+       __in                            const efx_mae_eh_id_t *eh_idp)
+{
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(enp);
+       efx_mcdi_req_t req;
+       EFX_MCDI_DECLARE_BUF(payload,
+           MC_CMD_MAE_ENCAP_HEADER_FREE_IN_LEN(1),
+           MC_CMD_MAE_ENCAP_HEADER_FREE_OUT_LEN(1));
+       efx_rc_t rc;
+
+       if (encp->enc_mae_supported == B_FALSE) {
+               rc = ENOTSUP;
+               goto fail1;
+       }
+
+       req.emr_cmd = MC_CMD_MAE_ENCAP_HEADER_FREE;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_MAE_ENCAP_HEADER_FREE_IN_LEN(1);
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_MAE_ENCAP_HEADER_FREE_OUT_LEN(1);
+
+       MCDI_IN_SET_DWORD(req, MAE_ENCAP_HEADER_FREE_IN_EH_ID, eh_idp->id);
+
+       efx_mcdi_execute(enp, &req);
+
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               goto fail2;
+       }
+
+       if (MCDI_OUT_DWORD(req, MAE_ENCAP_HEADER_FREE_OUT_FREED_EH_ID) !=
+           eh_idp->id) {
+               /* Firmware failed to remove the encap. header. */
+               rc = EAGAIN;
+               goto fail3;
+       }
+
+       return (0);
+
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+
+       __checkReturn                   efx_rc_t
+efx_mae_action_set_fill_in_eh_id(
+       __in                            efx_mae_actions_t *spec,
+       __in                            const efx_mae_eh_id_t *eh_idp)
+{
+       efx_rc_t rc;
+
+       if ((spec->ema_actions & (1U << EFX_MAE_ACTION_ENCAP)) == 0) {
+               /*
+                * The caller has not intended to have action ENCAP originally,
+                * hence, this attempt to indicate encap. header ID is invalid.
+                */
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (spec->ema_rsrc.emar_eh_id.id != EFX_MAE_RSRC_ID_INVALID) {
+               /* The caller attempts to indicate encap. header ID twice. */
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       if (eh_idp->id == EFX_MAE_RSRC_ID_INVALID) {
+               rc = EINVAL;
+               goto fail3;
+       }
+
+       spec->ema_rsrc.emar_eh_id.id = eh_idp->id;
+
+       return (0);
+
 fail3:
        EFSYS_PROBE(fail3);
 fail2:
@@ -1706,8 +2074,11 @@ efx_mae_action_set_alloc(
            MAE_ACTION_SET_ALLOC_IN_COUNTER_LIST_ID, EFX_MAE_RSRC_ID_INVALID);
        MCDI_IN_SET_DWORD(req,
            MAE_ACTION_SET_ALLOC_IN_COUNTER_ID, EFX_MAE_RSRC_ID_INVALID);
-       MCDI_IN_SET_DWORD(req,
-           MAE_ACTION_SET_ALLOC_IN_ENCAP_HEADER_ID, EFX_MAE_RSRC_ID_INVALID);
+
+       if ((spec->ema_actions & (1U << EFX_MAE_ACTION_DECAP)) != 0) {
+               MCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,
+                   MAE_ACTION_SET_ALLOC_IN_DECAP, 1);
+       }
 
        MCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,
            MAE_ACTION_SET_ALLOC_IN_VLAN_POP, spec->ema_n_vlan_tags_to_pop);
@@ -1737,6 +2108,9 @@ efx_mae_action_set_alloc(
                    spec->ema_vlan_push_descs[outer_tag_idx].emavp_tci_be);
        }
 
+       MCDI_IN_SET_DWORD(req, MAE_ACTION_SET_ALLOC_IN_ENCAP_HEADER_ID,
+           spec->ema_rsrc.emar_eh_id.id);
+
        if ((spec->ema_actions & (1U << EFX_MAE_ACTION_FLAG)) != 0) {
                MCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,
                    MAE_ACTION_SET_ALLOC_IN_FLAG, 1);
@@ -1823,15 +2197,22 @@ efx_mae_action_set_free(
                goto fail2;
        }
 
+       if (req.emr_out_length_used < MC_CMD_MAE_ACTION_SET_FREE_OUT_LENMIN) {
+               rc = EMSGSIZE;
+               goto fail3;
+       }
+
        if (MCDI_OUT_DWORD(req, MAE_ACTION_SET_FREE_OUT_FREED_AS_ID) !=
            aset_idp->id) {
                /* Firmware failed to free the action set. */
                rc = EAGAIN;
-               goto fail3;
+               goto fail4;
        }
 
        return (0);
 
+fail4:
+       EFSYS_PROBE(fail4);
 fail3:
        EFSYS_PROBE(fail3);
 fail2:
@@ -1973,15 +2354,23 @@ efx_mae_action_rule_remove(
                goto fail2;
        }
 
+       if (req.emr_out_length_used <
+           MC_CMD_MAE_ACTION_RULE_DELETE_OUT_LENMIN) {
+               rc = EMSGSIZE;
+               goto fail3;
+       }
+
        if (MCDI_OUT_DWORD(req, MAE_ACTION_RULE_DELETE_OUT_DELETED_AR_ID) !=
            ar_idp->id) {
                /* Firmware failed to delete the action rule. */
                rc = EAGAIN;
-               goto fail3;
+               goto fail4;
        }
 
        return (0);
 
+fail4:
+       EFSYS_PROBE(fail4);
 fail3:
        EFSYS_PROBE(fail3);
 fail2: