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

Commit 0533943c authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by David S. Miller
Browse files

mlx4_en: UDP RSS support 



Adding capability for RSS for UDP traffic, hashing is done based on
IP addresses and UDP port number.
The support depends on HW/FW capabilities.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7e1a487

drivers/net/mlx4/en_main.c

+12 −7
Original line number Diff line number Diff line
@@ -63,11 +63,12 @@ static const char mlx4_en_version[] = 
 */





/* Use a XOR rathern than Toeplitz hash function for RSS */

MLX4_EN_PARM_INT(rss_xor, 0, "Use XOR hash function for RSS");



/* RSS hash type mask - default to <saddr, daddr, sport, dport> */

MLX4_EN_PARM_INT(rss_mask, 0xf, "RSS hash type bitmask");

/* Enable RSS TCP traffic */

MLX4_EN_PARM_INT(tcp_rss, 1,

		 "Enable RSS for incomming TCP traffic or disabled (0)");

/* Enable RSS UDP traffic */

MLX4_EN_PARM_INT(udp_rss, 1,

		 "Enable RSS for incomming UDP traffic or disabled (0)");



/* Priority pausing */

MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
@@ -103,8 +104,12 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev) 
	struct mlx4_en_profile *params = &mdev->profile;

	int i;



	params->rss_xor = (rss_xor != 0);

	params->rss_mask = rss_mask & 0x1f;

	params->tcp_rss = tcp_rss;

	params->udp_rss = udp_rss;

	if (params->udp_rss && !mdev->dev->caps.udp_rss) {

		mlx4_warn(mdev, "UDP RSS is not supported on this device.\n");

		params->udp_rss = 0;

	}

	for (i = 1; i <= MLX4_MAX_PORTS; i++) {

		params->prof[i].rx_pause = 1;

		params->prof[i].rx_ppp = pfcrx;

drivers/net/mlx4/en_rx.c

+4 −4
Original line number Diff line number Diff line
@@ -859,8 +859,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv) 
	struct mlx4_qp_context context;

	struct mlx4_en_rss_context *rss_context;

	void *ptr;

	int rss_xor = mdev->profile.rss_xor;

	u8 rss_mask = mdev->profile.rss_mask;

	u8 rss_mask = 0x3f;

	int i, qpn;

	int err = 0;

	int good_qps = 0;
@@ -906,9 +905,10 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv) 
	rss_context->base_qpn = cpu_to_be32(ilog2(priv->rx_ring_num) << 24 |

					    (rss_map->base_qpn));

	rss_context->default_qpn = cpu_to_be32(rss_map->base_qpn);

	rss_context->hash_fn = rss_xor & 0x3;

	rss_context->flags = rss_mask << 2;

	rss_context->flags = rss_mask;



	if (priv->mdev->profile.udp_rss)

		rss_context->base_qpn_udp = rss_context->default_qpn;

	err = mlx4_qp_to_ready(mdev->dev, &priv->res.mtt, &context,

			       &rss_map->indir_qp, &rss_map->indir_state);

	if (err)

drivers/net/mlx4/fw.c

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
#define QUERY_DEV_CAP_MAX_GID_OFFSET		0x3b

#define QUERY_DEV_CAP_RATE_SUPPORT_OFFSET	0x3c

#define QUERY_DEV_CAP_MAX_PKEY_OFFSET		0x3f

#define QUERY_DEV_CAP_UDP_RSS_OFFSET		0x42

#define QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET	0x43

#define QUERY_DEV_CAP_FLAGS_OFFSET		0x44

#define QUERY_DEV_CAP_RSVD_UAR_OFFSET		0x48
@@ -270,6 +271,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	dev_cap->max_msg_sz = 1 << (field & 0x1f);

	MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);

	dev_cap->stat_rate_support = stat_rate;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_UDP_RSS_OFFSET);

	dev_cap->udp_rss = field & 0x1;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET);

	dev_cap->loopback_support = field & 0x1;

	MLX4_GET(dev_cap->flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);

drivers/net/mlx4/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct mlx4_dev_cap { 
	u16 wavelength[MLX4_MAX_PORTS + 1];

	u64 trans_code[MLX4_MAX_PORTS + 1];

	u16 stat_rate_support;

	int udp_rss;

	int loopback_support;

	u32 flags;

	int reserved_uars;

drivers/net/mlx4/main.c

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	dev->caps.bmme_flags	     = dev_cap->bmme_flags;

	dev->caps.reserved_lkey	     = dev_cap->reserved_lkey;

	dev->caps.stat_rate_support  = dev_cap->stat_rate_support;

	dev->caps.udp_rss	     = dev_cap->udp_rss;

	dev->caps.loopback_support   = dev_cap->loopback_support;

	dev->caps.max_gso_sz	     = dev_cap->max_gso_sz;