net/mlx5e: Fix FW error while setting IPsec policy block action

When trying to set IPsec policy block action the following error is
generated:

 mlx5_cmd_out_err:803:(pid 3426): SET_FLOW_TABLE_ENTRY(0x936) op_mod(0x0) failed,
	status bad parameter(0x3), syndrome (0x8708c3), err(-22)

This error means that drop action is not allowed when modify action is
set, so update the code to skip modify header for XFRM_POLICY_BLOCK action.

Fixes: 6721239672fe ("net/mlx5e: Skip IPsec encryption for TX path without matching policy")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
index 5a8fcd30fcb16b28449fb4b5208b6086a52521a0..dbe87bf89c0dd86843cb65a5639f42db0ea230ab 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
@@ -1252,16 +1252,16 @@ static int tx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry)
        setup_fte_no_frags(spec);
        setup_fte_upper_proto_match(spec, &attrs->upspec);
 
-       if (attrs->reqid) {
+       switch (attrs->action) {
+       case XFRM_POLICY_ALLOW:
+               flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
+               if (!attrs->reqid)
+                       break;
+
                err = setup_modify_header(mdev, attrs->reqid,
                                          XFRM_DEV_OFFLOAD_OUT, &flow_act);
                if (err)
                        goto err_mod_header;
-       }
-
-       switch (attrs->action) {
-       case XFRM_POLICY_ALLOW:
-               flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
                break;
        case XFRM_POLICY_BLOCK:
                flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_DROP |
@@ -1273,7 +1273,7 @@ static int tx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry)
        default:
                WARN_ON(true);
                err = -EINVAL;
-               goto err_action;
+               goto err_mod_header;
        }
 
        flow_act.flags |= FLOW_ACT_NO_APPEND;
@@ -1293,7 +1293,7 @@ static int tx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry)
        return 0;
 
 err_action:
-       if (attrs->reqid)
+       if (flow_act.modify_hdr)
                mlx5_modify_header_dealloc(mdev, flow_act.modify_hdr);
 err_mod_header:
        kvfree(spec);