Patch "IB/mlx4: Fix RSS's QPC attributes assignments" 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's QPC attributes assignments
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-s-qpc-attributes-assignments.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 Mon Dec 18 13:28:59 CET 2017
From: Guy Levi <[email protected]>
Date: Wed, 25 Oct 2017 22:39:35 +0300
Subject: IB/mlx4: Fix RSS's QPC attributes assignments
From: Guy Levi <[email protected]>
[ Upstream commit 108809a0571cd1e1b317c5c083a371e163e1f8f9 ]
In the modify QP handler the base_qpn_udp field in the RSS QPC is overwrite later by irrelevant value assignment. Hence, ingress packets which gets to the RSS QP will be steered then to a garbage QPN.
The patch fixes this by skipping the above assignment when a RSS QP is modified, also, the RSS context's attributes assignments are relocated just before the context is posted to avoid future issues like this.
Additionally, this patch takes the opportunity to change the code to be disciplined to the device's manual and assigns the RSS QP context just at RESET to INIT transition.
--- drivers/infiniband/hw/mlx4/qp.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx4/qp.c +9 -7
@@ -2182,11 +2182,6 @@ static int __mlx4_ib_modify_qp(void *src context->flags =cpu_to_be32 ((to_mlx4_state (new_state) <<28 ) | (to_mlx4_st (dev, qp->mlx4_ib_qp_type) <<16 )); -if (rwq_ind_tbl) { -fill_qp_rss_context (context, qp); - context->flags |=cpu_to_be32 (1 <<MLX4_RSS_QPC_FLAG_OFFSET ); - } -if (!(attr_mask &IB_QP_PATH_MIG_STATE )) context->flags |=cpu_to_be32 (MLX4_QP_PM_MIGRATED <<11 );else {
@@ -2387,6 +2382,7 @@ static int __mlx4_ib_modify_qp(void *src context->pd =cpu_to_be32 (pd->pdn);if (!rwq_ind_tbl) { + context->params1 =cpu_to_be32 (MLX4_IB_ACK_REQ_FREQ <<28 );get_cqs (qp, src_type, &send_cq, &recv_cq); }else {/* Set dummy CQs to be compatible with HV and PRM */ send_cq =to_mcq (rwq_ind_tbl->ind_tbl[0 ]->cq);
@@ -2394,7 +2390,6 @@ static int __mlx4_ib_modify_qp(void *src } context->cqn_send =cpu_to_be32 (send_cq->mcq.cqn); context->cqn_recv =cpu_to_be32 (recv_cq->mcq.cqn); - context->params1 =cpu_to_be32 (MLX4_IB_ACK_REQ_FREQ <<28 );/* Set "fast registration enabled" for all kernel QPs */ if (!ibuobject)
@@ -2513,7 +2508,7 @@ static int __mlx4_ib_modify_qp(void *srcMLX4_IB_LINK_TYPE_ETH ;if (dev->dev->caps.tunnel_offload_mode ==MLX4_TUNNEL_OFFLOAD_MODE_VXLAN ) {/* set QP to receive both tunneled & non-tunneled packets */ -if (!(context->flags &cpu_to_be32 (1 <<MLX4_RSS_QPC_FLAG_OFFSET ))) +if (!rwq_ind_tbl) context->srqn =cpu_to_be32 (7 <<28 ); } }
@@ -2562,6 +2557,13 @@ static int __mlx4_ib_modify_qp(void *src } } +if (rwq_ind_tbl && + cur_state ==IB_QPS_RESET && + new_state ==IB_QPS_INIT ) { +fill_qp_rss_context (context, qp); + context->flags |=cpu_to_be32 (1 <<MLX4_RSS_QPC_FLAG_OFFSET ); + } + err =mlx4_qp_modify (dev->dev, &qp->mtt,to_mlx4_state (cur_state),to_mlx4_state (new_state), context, optpar, sqd_event, &qp->mqp);
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/ib-mlx4-fix-rss-s-qpc-attributes-assignments.patch