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

Commit 3346c487 authored by Boris Pismenny's avatar Boris Pismenny Committed by Saeed Mahameed
Browse files

{net,IB}/mlx5: Add flow steering helpers 



Add helper functions that check if a protocol is
part of a flow steering match criteria.

Signed-off-by: default avatarBoris Pismenny <borisp@mellanox.com>
Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarAviad Yehezkel <aviadye@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent d2ec6a35

drivers/infiniband/hw/mlx5/main.c

+3 −4
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include "mlx5_ib.h"

#include "ib_rep.h"

#include "cmd.h"

#include <linux/mlx5/fs_helpers.h>



#define DRIVER_NAME "mlx5_ib"

#define DRIVER_VERSION "5.0-0"
@@ -2312,8 +2313,6 @@ static void set_tos(void *outer_c, void *outer_v, u8 mask, u8 val) 
		   offsetof(typeof(filter), field) -\

		   sizeof(filter.field))



#define IPV4_VERSION 4

#define IPV6_VERSION 6

static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c,

			   u32 *match_v, const union ib_flow_spec *ib_spec,

			   struct mlx5_flow_act *action)
@@ -2399,7 +2398,7 @@ static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c, 
			MLX5_SET(fte_match_set_lyr_2_4, headers_c,

				 ip_version, 0xf);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v,

				 ip_version, IPV4_VERSION);

				 ip_version, MLX5_FS_IPV4_VERSION);

		} else {

			MLX5_SET(fte_match_set_lyr_2_4, headers_c,

				 ethertype, 0xffff);
@@ -2438,7 +2437,7 @@ static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c, 
			MLX5_SET(fte_match_set_lyr_2_4, headers_c,

				 ip_version, 0xf);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v,

				 ip_version, IPV6_VERSION);

				 ip_version, MLX5_FS_IPV6_VERSION);

		} else {

			MLX5_SET(fte_match_set_lyr_2_4, headers_c,

				 ethertype, 0xffff);

include/linux/mlx5/fs_helpers.h

0 → 100644
+134 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef _MLX5_FS_HELPERS_

#define _MLX5_FS_HELPERS_



#include <linux/mlx5/mlx5_ifc.h>



#define MLX5_FS_IPV4_VERSION 4

#define MLX5_FS_IPV6_VERSION 6



static inline bool _mlx5_fs_is_outer_ipproto_flow(const u32 *match_c,

						  const u32 *match_v, u8 match)

{

	const void *headers_c = MLX5_ADDR_OF(fte_match_param, match_c,

					     outer_headers);

	const void *headers_v = MLX5_ADDR_OF(fte_match_param, match_v,

					     outer_headers);



	return MLX5_GET(fte_match_set_lyr_2_4, headers_c, ip_protocol) == 0xff &&

		MLX5_GET(fte_match_set_lyr_2_4, headers_v, ip_protocol) == match;

}



static inline bool mlx5_fs_is_outer_tcp_flow(const u32 *match_c,

					     const u32 *match_v)

{

	return _mlx5_fs_is_outer_ipproto_flow(match_c, match_v, IPPROTO_TCP);

}



static inline bool mlx5_fs_is_outer_udp_flow(const u32 *match_c,

					     const u32 *match_v)

{

	return _mlx5_fs_is_outer_ipproto_flow(match_c, match_v, IPPROTO_UDP);

}



static inline bool mlx5_fs_is_vxlan_flow(const u32 *match_c)

{

	void *misc_params_c = MLX5_ADDR_OF(fte_match_param, match_c,

					   misc_parameters);



	return MLX5_GET(fte_match_set_misc, misc_params_c, vxlan_vni);

}



static inline bool _mlx5_fs_is_outer_ipv_flow(struct mlx5_core_dev *mdev,

					      const u32 *match_c,

					      const u32 *match_v, int version)

{

	int match_ipv = MLX5_CAP_FLOWTABLE_NIC_RX(mdev,

						  ft_field_support.outer_ip_version);

	const void *headers_c = MLX5_ADDR_OF(fte_match_param, match_c,

					     outer_headers);

	const void *headers_v = MLX5_ADDR_OF(fte_match_param, match_v,

					     outer_headers);



	if (!match_ipv) {

		u16 ethertype;



		switch (version) {

		case MLX5_FS_IPV4_VERSION:

			ethertype = ETH_P_IP;

			break;

		case MLX5_FS_IPV6_VERSION:

			ethertype = ETH_P_IPV6;

			break;

		default:

			return false;

		}



		return MLX5_GET(fte_match_set_lyr_2_4, headers_c,

				ethertype) == 0xffff &&

			MLX5_GET(fte_match_set_lyr_2_4, headers_v,

				 ethertype) == ethertype;

	}



	return MLX5_GET(fte_match_set_lyr_2_4, headers_c,

			ip_version) == 0xf &&

		MLX5_GET(fte_match_set_lyr_2_4, headers_v,

			 ip_version) == version;

}



static inline bool

mlx5_fs_is_outer_ipv4_flow(struct mlx5_core_dev *mdev, const u32 *match_c,

			   const u32 *match_v)

{

	return _mlx5_fs_is_outer_ipv_flow(mdev, match_c, match_v,

					  MLX5_FS_IPV4_VERSION);

}



static inline bool

mlx5_fs_is_outer_ipv6_flow(struct mlx5_core_dev *mdev, const u32 *match_c,

			   const u32 *match_v)

{

	return _mlx5_fs_is_outer_ipv_flow(mdev, match_c, match_v,

					  MLX5_FS_IPV6_VERSION);

}



static inline bool mlx5_fs_is_outer_ipsec_flow(const u32 *match_c)

{

	void *misc_params_c =

			MLX5_ADDR_OF(fte_match_param, match_c, misc_parameters);



	return MLX5_GET(fte_match_set_misc, misc_params_c, outer_esp_spi);

}



#endif

include/linux/mlx5/mlx5_ifc.h

+6 −2
Original line number Diff line number Diff line
@@ -295,7 +295,9 @@ struct mlx5_ifc_flow_table_fields_supported_bits { 
	u8         inner_tcp_dport[0x1];

	u8         inner_tcp_flags[0x1];

	u8         reserved_at_37[0x9];

	u8         reserved_at_40[0x1a];

	u8         reserved_at_40[0x17];

	u8	   outer_esp_spi[0x1];

	u8	   reserved_at_58[0x2];

	u8         bth_dst_qp[0x1];



	u8         reserved_at_5b[0x25];
@@ -437,7 +439,9 @@ struct mlx5_ifc_fte_match_set_misc_bits { 


	u8         reserved_at_120[0x28];

	u8         bth_dst_qp[0x18];

	u8         reserved_at_160[0xa0];

	u8	   reserved_at_160[0x20];

	u8	   outer_esp_spi[0x20];

	u8         reserved_at_1a0[0x60];

};



struct mlx5_ifc_cmd_pas_bits {