net/mlx5: Add IPsec related Flow steering entry's fields

Add FTE actions IPsec ENCRYPT/DECRYPT
Add ipsec_obj_id field in FTE
Add new action field MLX5_ACTION_IN_FIELD_IPSEC_SYNDROME

Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Reviewed-by: Raed Salem <raeds@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index 6c5aa0a214251c3f8f2a5c61318bbc247bc33959..92d991d93757bf1cbebfa8a544ce41a48b5b05c6 100644 (file)
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -207,7 +207,10 @@ struct mlx5_flow_act {
        u32 action;
        struct mlx5_modify_hdr  *modify_hdr;
        struct mlx5_pkt_reformat *pkt_reformat;
-       uintptr_t esp_id;
+       union {
+               u32 ipsec_obj_id;
+               uintptr_t esp_id;
+       };
        u32 flags;
        struct mlx5_fs_vlan vlan[MLX5_FS_VLAN_DEPTH];
        struct ib_counters *counters;

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 791766e15d5cf81465905e35561e7b2af2a2a147..9e64710bc54f41c15ba689814fcf05086178f5eb 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -416,7 +416,11 @@ struct mlx5_ifc_flow_table_prop_layout_bits {
        u8         table_miss_action_domain[0x1];
        u8         termination_table[0x1];
        u8         reformat_and_fwd_to_table[0x1];
-       u8         reserved_at_1a[0x6];
+       u8         reserved_at_1a[0x2];
+       u8         ipsec_encrypt[0x1];
+       u8         ipsec_decrypt[0x1];
+       u8         reserved_at_1e[0x2];
+
        u8         termination_table_raw_traffic[0x1];
        u8         reserved_at_21[0x1];
        u8         log_max_ft_size[0x6];
@@ -2965,6 +2969,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,
 };
 
 enum {
@@ -3006,7 +3012,8 @@ struct mlx5_ifc_flow_context_bits {
 
        struct mlx5_ifc_vlan_bits push_vlan_2;
 
-       u8         reserved_at_120[0xe0];
+       u8         ipsec_obj_id[0x20];
+       u8         reserved_at_140[0xc0];
 
        struct mlx5_ifc_fte_match_param_bits match_value;
 
@@ -5752,6 +5759,7 @@ enum {
        MLX5_ACTION_IN_FIELD_METADATA_REG_C_7  = 0x58,
        MLX5_ACTION_IN_FIELD_OUT_TCP_SEQ_NUM   = 0x59,
        MLX5_ACTION_IN_FIELD_OUT_TCP_ACK_NUM   = 0x5B,
+       MLX5_ACTION_IN_FIELD_IPSEC_SYNDROME    = 0x5D,
 };
 
 struct mlx5_ifc_alloc_modify_header_context_out_bits {