Patch "IB/mlx4: Fix RSS hash fields restrictions" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
IB/mlx4: Fix RSS hash fields restrictions
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ib-mlx4-fix-rss-hash-fields-restrictions.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Fri Feb 23 11:45:09 CET 2018
From: Guy Levi <[email protected]>
Date: Tue, 5 Dec 2017 22:30:03 +0200
Subject: IB/mlx4: Fix RSS hash fields restrictions
From: Guy Levi <[email protected]>
[ Upstream commit 4d02ebd9bbbdde1d524e62b540b0402cee7bbcdf ]
Mistakenly the driver didn't allow RSS hash fields combinations which involve both IPv4 and IPv6 protocols. This bug caused to failures for user's use cases for RSS.
Consequently, this patch fixes this bug and allows any combination that the HW can support.
Additionally, the patch fixes the driver to return an error in case the user provides an unsupported mask for RSS hash fields.
--- drivers/infiniband/hw/mlx4/qp.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx4/qp.c +19 -7
@@ -666,6 +666,19 @@ static int set_qp_rss(struct mlx4_ib_devreturn (-EOPNOTSUPP ); } +if (ucmd->rx_hash_fields_mask & ~(MLX4_IB_RX_HASH_SRC_IPV4 | +MLX4_IB_RX_HASH_DST_IPV4 | +MLX4_IB_RX_HASH_SRC_IPV6 | +MLX4_IB_RX_HASH_DST_IPV6 | +MLX4_IB_RX_HASH_SRC_PORT_TCP | +MLX4_IB_RX_HASH_DST_PORT_TCP | +MLX4_IB_RX_HASH_SRC_PORT_UDP | +MLX4_IB_RX_HASH_DST_PORT_UDP )) { +pr_debug ("RX Hash fields_mask has unsupported mask (0x%llx)\n" , + ucmd->rx_hash_fields_mask); +return (-EOPNOTSUPP ); + } +if ((ucmd->rx_hash_fields_mask &MLX4_IB_RX_HASH_SRC_IPV4 ) && (ucmd->rx_hash_fields_mask &MLX4_IB_RX_HASH_DST_IPV4 )) { rss_ctx->flags =MLX4_RSS_IPV4 ;
@@ -691,11 +704,11 @@ static int set_qp_rss(struct mlx4_ib_devreturn (-EOPNOTSUPP ); } -if (rss_ctx->flags &MLX4_RSS_IPV4 ) { +if (rss_ctx->flags &MLX4_RSS_IPV4 ) rss_ctx->flags |=MLX4_RSS_UDP_IPV4 ; - }else if (rss_ctx->flags &MLX4_RSS_IPV6 ) { +if (rss_ctx->flags &MLX4_RSS_IPV6 ) rss_ctx->flags |=MLX4_RSS_UDP_IPV6 ; - }else { +if (!(rss_ctx->flags & (MLX4_RSS_IPV6 |MLX4_RSS_IPV4 ))) {pr_debug ("RX Hash fields_mask is not supported - UDP must be set with IPv4 or IPv6\n" );return (-EOPNOTSUPP ); }
@@ -707,15 +720,14 @@ static int set_qp_rss(struct mlx4_ib_devif ((ucmd->rx_hash_fields_mask &MLX4_IB_RX_HASH_SRC_PORT_TCP ) && (ucmd->rx_hash_fields_mask &MLX4_IB_RX_HASH_DST_PORT_TCP )) { -if (rss_ctx->flags &MLX4_RSS_IPV4 ) { +if (rss_ctx->flags &MLX4_RSS_IPV4 ) rss_ctx->flags |=MLX4_RSS_TCP_IPV4 ; - }else if (rss_ctx->flags &MLX4_RSS_IPV6 ) { +if (rss_ctx->flags &MLX4_RSS_IPV6 ) rss_ctx->flags |=MLX4_RSS_TCP_IPV6 ; - }else { +if (!(rss_ctx->flags & (MLX4_RSS_IPV6 |MLX4_RSS_IPV4 ))) {pr_debug ("RX Hash fields_mask is not supported - TCP must be set with IPv4 or IPv6\n" );return (-EOPNOTSUPP ); } - }else if ((ucmd->rx_hash_fields_mask &MLX4_IB_RX_HASH_SRC_PORT_TCP ) || (ucmd->rx_hash_fields_mask &MLX4_IB_RX_HASH_DST_PORT_TCP )) {pr_debug ("RX Hash fields_mask is not supported - both TCP SRC and DST must be set\n" );
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/ib-mlx4-fix-rss-hash-fields-restrictions.patch