iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/qib: Remove s_lock around header validation

Browse Source 
Review of qib_ruc_check_hdr() shows that the s_lock is not required in
the normal case.  The r_lock is held in all cases, and protects the qp
fields that are read.

The s_lock will be needed to around the call to qib_migrate_qp() to
insure that the send engine sees a consistent set of fields.

Signed-off-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Mike Marciniszyn 2011-09-23 13:17:00 -04:00 committed by Roland Dreier
parent d0f2faf72d
commit 9fd5473deb
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/infiniband/hw/qib/qib_driver.c
View File

@ -310,7 +310,6 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd,
u32 opcode; u32 opcode;
u32 psn; u32 psn;
int diff; int diff;
unsigned long flags;
/* Sanity check packet */ /* Sanity check packet */
if (tlen < 24) if (tlen < 24)
@ -365,7 +364,6 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd,
switch (qp->ibqp.qp_type) { switch (qp->ibqp.qp_type) {
case IB_QPT_RC: case IB_QPT_RC:
spin_lock_irqsave(&qp->s_lock, flags);
ruc_res = ruc_res =
qib_ruc_check_hdr( qib_ruc_check_hdr(
ibp, hdr, ibp, hdr,
@ -373,11 +371,8 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd,
qp, qp,
be32_to_cpu(ohdr->bth[0])); be32_to_cpu(ohdr->bth[0]));
if (ruc_res) { if (ruc_res) {
spin_unlock_irqrestore(&qp->s_lock,
flags);
goto unlock; goto unlock;
} }
spin_unlock_irqrestore(&qp->s_lock, flags);
/* Only deal with RDMA Writes for now */ /* Only deal with RDMA Writes for now */
if (opcode < if (opcode <

4
drivers/infiniband/hw/qib/qib_rc.c
View File

@ -1889,10 +1889,8 @@ void qib_rc_rcv(struct qib_ctxtdata *rcd, struct qib_ib_header *hdr,
} }
opcode = be32_to_cpu(ohdr->bth[0]); opcode = be32_to_cpu(ohdr->bth[0]);
spin_lock_irqsave(&qp->s_lock, flags);
if (qib_ruc_check_hdr(ibp, hdr, has_grh, qp, opcode)) if (qib_ruc_check_hdr(ibp, hdr, has_grh, qp, opcode))
goto sunlock; return;
spin_unlock_irqrestore(&qp->s_lock, flags);
psn = be32_to_cpu(ohdr->bth[2]); psn = be32_to_cpu(ohdr->bth[2]);
opcode >>= 24; opcode >>= 24;

7
drivers/infiniband/hw/qib/qib_ruc.c
View File

@ -260,12 +260,15 @@ static int gid_ok(union ib_gid *gid, __be64 gid_prefix, __be64 id)
/* /*
* *
* This should be called with the QP s_lock held. * This should be called with the QP r_lock held.
*
* The s_lock will be acquired around the qib_migrate_qp() call.
*/ */
int qib_ruc_check_hdr(struct qib_ibport *ibp, struct qib_ib_header *hdr, int qib_ruc_check_hdr(struct qib_ibport *ibp, struct qib_ib_header *hdr,
int has_grh, struct qib_qp *qp, u32 bth0) int has_grh, struct qib_qp *qp, u32 bth0)
{ {
__be64 guid; __be64 guid;
unsigned long flags;
if (qp->s_mig_state == IB_MIG_ARMED && (bth0 & IB_BTH_MIG_REQ)) { if (qp->s_mig_state == IB_MIG_ARMED && (bth0 & IB_BTH_MIG_REQ)) {
if (!has_grh) { if (!has_grh) {
@ -295,7 +298,9 @@ int qib_ruc_check_hdr(struct qib_ibport *ibp, struct qib_ib_header *hdr,
if (be16_to_cpu(hdr->lrh[3]) != qp->alt_ah_attr.dlid || if (be16_to_cpu(hdr->lrh[3]) != qp->alt_ah_attr.dlid ||
ppd_from_ibp(ibp)->port != qp->alt_ah_attr.port_num) ppd_from_ibp(ibp)->port != qp->alt_ah_attr.port_num)
goto err; goto err;
spin_lock_irqsave(&qp->s_lock, flags);
qib_migrate_qp(qp); qib_migrate_qp(qp);
spin_unlock_irqrestore(&qp->s_lock, flags);
} else { } else {
if (!has_grh) { if (!has_grh) {
if (qp->remote_ah_attr.ah_flags & IB_AH_GRH) if (qp->remote_ah_attr.ah_flags & IB_AH_GRH)

7
drivers/infiniband/hw/qib/qib_uc.c
View File

@ -243,7 +243,6 @@ void qib_uc_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
int has_grh, void *data, u32 tlen, struct qib_qp *qp) int has_grh, void *data, u32 tlen, struct qib_qp *qp)
{ {
struct qib_other_headers *ohdr; struct qib_other_headers *ohdr;
unsigned long flags;
u32 opcode; u32 opcode;
u32 hdrsize; u32 hdrsize;
u32 psn; u32 psn;
@ -263,10 +262,8 @@ void qib_uc_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
} }
opcode = be32_to_cpu(ohdr->bth[0]); opcode = be32_to_cpu(ohdr->bth[0]);
spin_lock_irqsave(&qp->s_lock, flags);
if (qib_ruc_check_hdr(ibp, hdr, has_grh, qp, opcode)) if (qib_ruc_check_hdr(ibp, hdr, has_grh, qp, opcode))
goto sunlock; return;
spin_unlock_irqrestore(&qp->s_lock, flags);
psn = be32_to_cpu(ohdr->bth[2]); psn = be32_to_cpu(ohdr->bth[2]);
opcode >>= 24; opcode >>= 24;
@ -554,6 +551,4 @@ op_err:
qib_rc_error(qp, IB_WC_LOC_QP_OP_ERR); qib_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
return; return;
sunlock:
spin_unlock_irqrestore(&qp->s_lock, flags);
} }