Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60786f09 authored by Mark Bloch's avatar Mark Bloch Committed by Leon Romanovsky
Browse files

{net, RDMA}/mlx5: Rename encap to reformat packet 



Renames all encap mlx5_{core,ib} code to use the new naming of packet
reformat. This change doesn't introduce any function change and is
needed to properly reflect the operation being done by this action.
For example not only can we encapsulate a packet, but also decapsulate it.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent e0e7a386

drivers/infiniband/hw/mlx5/devx.c

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static bool devx_is_obj_create_cmd(const void *in) 
	case MLX5_CMD_OP_CREATE_FLOW_TABLE:

	case MLX5_CMD_OP_CREATE_FLOW_GROUP:

	case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:

	case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_CREATE_SCHEDULING_ELEMENT:

	case MLX5_CMD_OP_ADD_VXLAN_UDP_DPORT:
@@ -627,9 +627,9 @@ static void devx_obj_build_destroy_cmd(void *in, void *out, void *din, 
		MLX5_SET(general_obj_in_cmd_hdr, din, opcode,

			 MLX5_CMD_OP_DEALLOC_FLOW_COUNTER);

		break;

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:

		MLX5_SET(general_obj_in_cmd_hdr, din, opcode,

			 MLX5_CMD_OP_DEALLOC_ENCAP_HEADER);

			 MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT);

		break;

	case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:

		MLX5_SET(general_obj_in_cmd_hdr, din, opcode,

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

+4 −4
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_MODIFY_FLOW_TABLE:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ROOT:

	case MLX5_CMD_OP_DEALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT:

	case MLX5_CMD_OP_DEALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_FPGA_DESTROY_QP:

	case MLX5_CMD_OP_DESTROY_GENERAL_OBJECT:
@@ -427,7 +427,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_QUERY_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:

	case MLX5_CMD_OP_QUERY_FLOW_COUNTER:

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT:

	case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:

	case MLX5_CMD_OP_FPGA_CREATE_QP:

	case MLX5_CMD_OP_FPGA_MODIFY_QP:
@@ -601,8 +601,8 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(DEALLOC_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(MODIFY_FLOW_TABLE);

	MLX5_COMMAND_STR_CASE(ALLOC_ENCAP_HEADER);

	MLX5_COMMAND_STR_CASE(DEALLOC_ENCAP_HEADER);

	MLX5_COMMAND_STR_CASE(ALLOC_PACKET_REFORMAT_CONTEXT);

	MLX5_COMMAND_STR_CASE(DEALLOC_PACKET_REFORMAT_CONTEXT);

	MLX5_COMMAND_STR_CASE(ALLOC_MODIFY_HEADER_CONTEXT);

	MLX5_COMMAND_STR_CASE(DEALLOC_MODIFY_HEADER_CONTEXT);

	MLX5_COMMAND_STR_CASE(FPGA_CREATE_QP);

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ TRACE_EVENT(mlx5_fs_del_fg, 
	{MLX5_FLOW_CONTEXT_ACTION_DROP,		 "DROP"},\

	{MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,	 "FWD"},\

	{MLX5_FLOW_CONTEXT_ACTION_COUNT,	 "CNT"},\

	{MLX5_FLOW_CONTEXT_ACTION_ENCAP,	 "ENCAP"},\

	{MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT, "REFORMAT"},\

	{MLX5_FLOW_CONTEXT_ACTION_DECAP,	 "DECAP"},\

	{MLX5_FLOW_CONTEXT_ACTION_MOD_HDR,	 "MOD_HDR"},\

	{MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH,	 "VLAN_PUSH"},\

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

+23 −20
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
		.action = attr->action,

		.has_flow_tag = true,

		.flow_tag = attr->flow_tag,

		.encap_id = 0,

		.reformat_id = 0,

	};

	struct mlx5_fc *counter = NULL;

	struct mlx5_flow_handle *rule;
@@ -829,7 +829,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
	struct mlx5e_priv *out_priv;

	int err;



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP) {

	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT) {

		out_dev = __dev_get_by_index(dev_net(priv->netdev),

					     attr->parse_attr->mirred_ifindex);

		err = mlx5e_attach_encap(priv, &parse_attr->tun_info,
@@ -885,7 +885,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
err_mod_hdr:

	mlx5_eswitch_del_vlan_action(esw, attr);

err_add_vlan:

	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP)

	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT)

		mlx5e_detach_encap(priv, flow);

err_attach_encap:

	return rule;
@@ -906,7 +906,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv, 


	mlx5_eswitch_del_vlan_action(esw, attr);



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP) {

	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT) {

		mlx5e_detach_encap(priv, flow);

		kvfree(attr->parse_attr);

	}
@@ -923,7 +923,7 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, 
	struct mlx5e_tc_flow *flow;

	int err;



	err = mlx5_encap_alloc(priv->mdev, e->tunnel_type,

	err = mlx5_packet_reformat_alloc(priv->mdev, e->tunnel_type,

					 e->encap_size, e->encap_header,

					 &e->encap_id);

	if (err) {
@@ -979,7 +979,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, 


	if (e->flags & MLX5_ENCAP_ENTRY_VALID) {

		e->flags &= ~MLX5_ENCAP_ENTRY_VALID;

		mlx5_encap_dealloc(priv->mdev, e->encap_id);

		mlx5_packet_reformat_dealloc(priv->mdev, e->encap_id);

	}

}
@@ -1048,7 +1048,7 @@ static void mlx5e_detach_encap(struct mlx5e_priv *priv, 
		mlx5e_rep_encap_entry_detach(netdev_priv(e->out_dev), e);



		if (e->flags & MLX5_ENCAP_ENTRY_VALID)

			mlx5_encap_dealloc(priv->mdev, e->encap_id);

			mlx5_packet_reformat_dealloc(priv->mdev, e->encap_id);



		hash_del_rcu(&e->encap_hlist);

		kfree(e->encap_header);
@@ -2323,7 +2323,7 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, 
		return -ENOMEM;



	switch (e->tunnel_type) {

	case MLX5_HEADER_TYPE_VXLAN:

	case MLX5_REFORMAT_TYPE_L2_TO_VXLAN:

		fl4.flowi4_proto = IPPROTO_UDP;

		fl4.fl4_dport = tun_key->tp_dst;

		break;
@@ -2367,7 +2367,7 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, 
	read_unlock_bh(&n->lock);



	switch (e->tunnel_type) {

	case MLX5_HEADER_TYPE_VXLAN:

	case MLX5_REFORMAT_TYPE_L2_TO_VXLAN:

		gen_vxlan_header_ipv4(out_dev, encap_header,

				      ipv4_encap_size, e->h_dest, tos, ttl,

				      fl4.daddr,
@@ -2387,8 +2387,9 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, 
		goto out;

	}



	err = mlx5_encap_alloc(priv->mdev, e->tunnel_type,

			       ipv4_encap_size, encap_header, &e->encap_id);

	err = mlx5_packet_reformat_alloc(priv->mdev, e->tunnel_type,

					 ipv4_encap_size, encap_header,

					 &e->encap_id);

	if (err)

		goto destroy_neigh_entry;
@@ -2432,7 +2433,7 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv, 
		return -ENOMEM;



	switch (e->tunnel_type) {

	case MLX5_HEADER_TYPE_VXLAN:

	case MLX5_REFORMAT_TYPE_L2_TO_VXLAN:

		fl6.flowi6_proto = IPPROTO_UDP;

		fl6.fl6_dport = tun_key->tp_dst;

		break;
@@ -2476,7 +2477,7 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv, 
	read_unlock_bh(&n->lock);



	switch (e->tunnel_type) {

	case MLX5_HEADER_TYPE_VXLAN:

	case MLX5_REFORMAT_TYPE_L2_TO_VXLAN:

		gen_vxlan_header_ipv6(out_dev, encap_header,

				      ipv6_encap_size, e->h_dest, tos, ttl,

				      &fl6.daddr,
@@ -2497,8 +2498,9 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv, 
		goto out;

	}



	err = mlx5_encap_alloc(priv->mdev, e->tunnel_type,

			       ipv6_encap_size, encap_header, &e->encap_id);

	err = mlx5_packet_reformat_alloc(priv->mdev, e->tunnel_type,

					 ipv6_encap_size, encap_header,

					 &e->encap_id);

	if (err)

		goto destroy_neigh_entry;
@@ -2546,7 +2548,7 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv, 


	if (mlx5_vxlan_lookup_port(priv->mdev->vxlan, be16_to_cpu(key->tp_dst)) &&

	    MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap)) {

		tunnel_type = MLX5_HEADER_TYPE_VXLAN;

		tunnel_type = MLX5_REFORMAT_TYPE_L2_TO_VXLAN;

	} else {

		netdev_warn(priv->netdev,

			    "%d isn't an offloaded vxlan udp dport\n", be16_to_cpu(key->tp_dst));
@@ -2721,7 +2723,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, 
				parse_attr->mirred_ifindex = out_dev->ifindex;

				parse_attr->tun_info = *info;

				attr->parse_attr = parse_attr;

				action |= MLX5_FLOW_CONTEXT_ACTION_ENCAP |

				action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT |

					  MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

					  MLX5_FLOW_CONTEXT_ACTION_COUNT;

				/* attr->out_rep is resolved when we handle encap */
@@ -2867,7 +2869,8 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, 
		flow->flags |= MLX5E_TC_FLOW_OFFLOADED;



	if (!(flow->flags & MLX5E_TC_FLOW_ESWITCH) ||

	    !(flow->esw_attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP))

	    !(flow->esw_attr->action &

	      MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT))

		kvfree(parse_attr);



	err = rhashtable_insert_fast(tc_ht, &flow->node, tc_ht_params);

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

+1 −1
Original line number Diff line number Diff line
@@ -1746,7 +1746,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	esw->enabled_vports = 0;

	esw->mode = SRIOV_NONE;

	esw->offloads.inline_mode = MLX5_INLINE_MODE_NONE;

	if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, encap) &&

	if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, reformat) &&

	    MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))

		esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;

	else