Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-19 06:47:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IB/srp: Report receive errors correctly

Browse Source 
The IB spec does not guarantee that the opcode is available in error
completions.  Hence do not rely on it.  See also commit 948d1e889e5b
("IB/srp: Introduce srp_handle_qp_err()").

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: <stable@vger.kernel.org> # v3.8
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Bart Van Assche 2013-10-10 13:53:25 +02:00 committed by Roland Dreier
parent 99b6697a50
commit cd4e38542a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/infiniband/ulp/srp/ib_srp.c
View File

@ -1449,14 +1449,13 @@ static void srp_tl_err_work(struct work_struct *work)
srp_start_tl_fail_timers(target->rport); srp_start_tl_fail_timers(target->rport);
} }
static void srp_handle_qp_err(enum ib_wc_status wc_status, static void srp_handle_qp_err(enum ib_wc_status wc_status, bool send_err,
enum ib_wc_opcode wc_opcode,
struct srp_target_port *target) struct srp_target_port *target)
{ {
if (target->connected && !target->qp_in_error) { if (target->connected && !target->qp_in_error) {
shost_printk(KERN_ERR, target->scsi_host, shost_printk(KERN_ERR, target->scsi_host,
PFX "failed %s status %d\n", PFX "failed %s status %d\n",
wc_opcode & IB_WC_RECV ? "receive" : "send", send_err ? "send" : "receive",
wc_status); wc_status);
queue_work(system_long_wq, &target->tl_err_work); queue_work(system_long_wq, &target->tl_err_work);
} }
@ -1473,7 +1472,7 @@ static void srp_recv_completion(struct ib_cq *cq, void *target_ptr)
if (likely(wc.status == IB_WC_SUCCESS)) { if (likely(wc.status == IB_WC_SUCCESS)) {
srp_handle_recv(target, &wc); srp_handle_recv(target, &wc);
} else { } else {
srp_handle_qp_err(wc.status, wc.opcode, target); srp_handle_qp_err(wc.status, false, target);
} }
} }
} }
@ -1489,7 +1488,7 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr)
iu = (struct srp_iu *) (uintptr_t) wc.wr_id; iu = (struct srp_iu *) (uintptr_t) wc.wr_id;
list_add(&iu->list, &target->free_tx); list_add(&iu->list, &target->free_tx);
} else { } else {
srp_handle_qp_err(wc.status, wc.opcode, target); srp_handle_qp_err(wc.status, true, target);
} }
} }
} }