Commit e227ee99 authored by Lior Nahmanson's avatar Lior Nahmanson Committed by David S. Miller
Browse files

net/mlx5: Generalize Flow Context for new crypto fields 



In order to support MACsec offload (and maybe some other crypto features
in the future), generalize flow action parameters / defines to be used by
crypto offlaods other than IPsec.
The following changes made:
ipsec_obj_id field at flow action context was changed to crypto_obj_id,
intreduced a new crypto_type field where IPsec is the default zero type
for backward compatibility.
Action ipsec_decrypt was changed to crypto_decrypt.
Action ipsec_encrypt was changed to crypto_encrypt.

IPsec offload code was updated accordingly for backward compatibility.

Signed-off-by: default avatarLior Nahmanson <liorna@nvidia.com>
Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1b2234b

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c

+4 −3
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ static void setup_fte_common(struct mlx5_accel_esp_xfrm_attrs *attrs, 
		       0xff, 16);

	}



	flow_act->ipsec_obj_id = ipsec_obj_id;

	flow_act->crypto.type = MLX5_FLOW_CONTEXT_ENCRYPT_DECRYPT_TYPE_IPSEC;

	flow_act->crypto.obj_id = ipsec_obj_id;

	flow_act->flags |= FLOW_ACT_NO_APPEND;

}
@@ -444,7 +445,7 @@ static int rx_add_rule(struct mlx5e_priv *priv, 
	}



	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

			  MLX5_FLOW_CONTEXT_ACTION_IPSEC_DECRYPT |

			  MLX5_FLOW_CONTEXT_ACTION_CRYPTO_DECRYPT |

			  MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;

	dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

	flow_act.modify_hdr = modify_hdr;
@@ -500,7 +501,7 @@ static int tx_add_rule(struct mlx5e_priv *priv, 
		 MLX5_ETH_WQE_FT_META_IPSEC);



	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_ALLOW |

			  MLX5_FLOW_CONTEXT_ACTION_IPSEC_ENCRYPT;

			  MLX5_FLOW_CONTEXT_ACTION_CRYPTO_ENCRYPT;

	rule = mlx5_add_flow_rules(priv->ipsec->tx_fs->ft, spec, &flow_act, NULL, 0);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c

+4 −1
Original line number Diff line number Diff line
@@ -577,7 +577,10 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev, 
		MLX5_SET(flow_context, in_flow_context, modify_header_id,

			 fte->action.modify_hdr->id);



	MLX5_SET(flow_context, in_flow_context, ipsec_obj_id, fte->action.ipsec_obj_id);

	MLX5_SET(flow_context, in_flow_context, encrypt_decrypt_type,

		 fte->action.crypto.type);

	MLX5_SET(flow_context, in_flow_context, encrypt_decrypt_obj_id,

		 fte->action.crypto.obj_id);



	vlan = MLX5_ADDR_OF(flow_context, in_flow_context, push_vlan);

include/linux/mlx5/fs.h

+4 −3
Original line number Diff line number Diff line
@@ -243,9 +243,10 @@ struct mlx5_flow_act { 
	u32 action;

	struct mlx5_modify_hdr  *modify_hdr;

	struct mlx5_pkt_reformat *pkt_reformat;

	union {

		u32 ipsec_obj_id;

	};

	struct mlx5_flow_act_crypto_params {

		u8 type;

		u32 obj_id;

	} crypto;

	u32 flags;

	struct mlx5_fs_vlan vlan[MLX5_FS_VLAN_DEPTH];

	struct ib_counters *counters;

include/linux/mlx5/mlx5_ifc.h

+8 −4
Original line number Diff line number Diff line
@@ -3310,8 +3310,8 @@ enum { 
	MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH = 0x100,

	MLX5_FLOW_CONTEXT_ACTION_VLAN_POP_2  = 0x400,

	MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH_2 = 0x800,

	MLX5_FLOW_CONTEXT_ACTION_IPSEC_DECRYPT = 0x1000,

	MLX5_FLOW_CONTEXT_ACTION_IPSEC_ENCRYPT = 0x2000,

	MLX5_FLOW_CONTEXT_ACTION_CRYPTO_DECRYPT = 0x1000,

	MLX5_FLOW_CONTEXT_ACTION_CRYPTO_ENCRYPT = 0x2000,

	MLX5_FLOW_CONTEXT_ACTION_EXECUTE_ASO = 0x4000,

};
@@ -3321,6 +3321,10 @@ enum { 
	MLX5_FLOW_CONTEXT_FLOW_SOURCE_LOCAL_VPORT       = 0x2,

};



enum {

	MLX5_FLOW_CONTEXT_ENCRYPT_DECRYPT_TYPE_IPSEC   = 0x0,

};



struct mlx5_ifc_vlan_bits {

	u8         ethtype[0x10];

	u8         prio[0x3];
@@ -3374,7 +3378,7 @@ struct mlx5_ifc_flow_context_bits { 
	u8         extended_destination[0x1];

	u8         reserved_at_81[0x1];

	u8         flow_source[0x2];

	u8         reserved_at_84[0x4];

	u8         encrypt_decrypt_type[0x4];

	u8         destination_list_size[0x18];



	u8         reserved_at_a0[0x8];
@@ -3386,7 +3390,7 @@ struct mlx5_ifc_flow_context_bits { 


	struct mlx5_ifc_vlan_bits push_vlan_2;



	u8         ipsec_obj_id[0x20];

	u8         encrypt_decrypt_obj_id[0x20];

	u8         reserved_at_140[0xc0];



	struct mlx5_ifc_fte_match_param_bits match_value;