mlx5: Fix incorrect wc pkey_index assignment for GSI messages
Since patch series "Demux IB CM requests in the rdma_cm module" the
P_Key index is taken from the work completion rather than the message
itself.
The HCA provides us with the message P_Key. In order to provide the
P_Key index, we need to look it up. Given that this is relevant only
for GSI messages (session establishments) which is less performance critical,
micro-optimize against the GSI (is_qp1) branch.
Fixes: 4c21b5bcef
("IB/cma: Add net_dev and private data checks to
RDMA CM")
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
parent
11d748045c
commit
b636401f0e
|
@ -33,6 +33,7 @@
|
|||
#include <linux/kref.h>
|
||||
#include <rdma/ib_umem.h>
|
||||
#include <rdma/ib_user_verbs.h>
|
||||
#include <rdma/ib_cache.h>
|
||||
#include "mlx5_ib.h"
|
||||
#include "user.h"
|
||||
|
||||
|
@ -227,7 +228,14 @@ static void handle_responder(struct ib_wc *wc, struct mlx5_cqe64 *cqe,
|
|||
wc->dlid_path_bits = cqe->ml_path;
|
||||
g = (be32_to_cpu(cqe->flags_rqpn) >> 28) & 3;
|
||||
wc->wc_flags |= g ? IB_WC_GRH : 0;
|
||||
wc->pkey_index = be32_to_cpu(cqe->imm_inval_pkey) & 0xffff;
|
||||
if (unlikely(is_qp1(qp->ibqp.qp_type))) {
|
||||
u16 pkey = be32_to_cpu(cqe->imm_inval_pkey) & 0xffff;
|
||||
|
||||
ib_find_cached_pkey(&dev->ib_dev, qp->port, pkey,
|
||||
&wc->pkey_index);
|
||||
} else {
|
||||
wc->pkey_index = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void dump_cqe(struct mlx5_ib_dev *dev, struct mlx5_err_cqe *cqe)
|
||||
|
|
|
@ -680,6 +680,11 @@ static inline u8 convert_access(int acc)
|
|||
MLX5_PERM_LOCAL_READ;
|
||||
}
|
||||
|
||||
static inline int is_qp1(enum ib_qp_type qp_type)
|
||||
{
|
||||
return qp_type == IB_QPT_GSI;
|
||||
}
|
||||
|
||||
#define MLX5_MAX_UMR_SHIFT 16
|
||||
#define MLX5_MAX_UMR_PAGES (1 << MLX5_MAX_UMR_SHIFT)
|
||||
|
||||
|
|
|
@ -76,11 +76,6 @@ static int is_qp0(enum ib_qp_type qp_type)
|
|||
return qp_type == IB_QPT_SMI;
|
||||
}
|
||||
|
||||
static int is_qp1(enum ib_qp_type qp_type)
|
||||
{
|
||||
return qp_type == IB_QPT_GSI;
|
||||
}
|
||||
|
||||
static int is_sqp(enum ib_qp_type qp_type)
|
||||
{
|
||||
return is_qp0(qp_type) || is_qp1(qp_type);
|
||||
|
|
Loading…
Reference in a new issue