From 6a82d3ef7985e4cd7646bcc1bbc8f2b3f50b8ec3 Mon Sep 17 00:00:00 2001 From: Chien-Hua Yen Date: Mon, 31 Mar 2014 14:47:41 -0700 Subject: [PATCH] RDS: looping to reap cq recv queue in rds_conn_shutdown Orabug: 18501034 Signed-off-by: Chien-Hua Yen Signed-off-by: Bang Nguyen (cherry picked from commit e1bab7c0e9af8e56e973c1c65f4f3f7474979c66) Signed-off-by: Jerry Snitselaar (cherry picked from commit a148e65e2d97a3e4327103b1e49c7cf74533f46d) --- net/rds/ib_cm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index f3892f459f54..7707306bf1fe 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -371,6 +371,10 @@ void rds_ib_tasklet_fn_send(unsigned long data) memset(&ack_state, 0, sizeof(ack_state)); rds_ib_stats_inc(s_ib_tasklet_call); + /* if send cq has been destroyed, ignore incoming cq event */ + if (!ic->i_scq) + return; + poll_cq(ic, ic->i_scq, ic->i_send_wc, &ack_state, 0); ib_req_notify_cq(ic->i_scq, IB_CQ_NEXT_COMP); poll_cq(ic, ic->i_scq, ic->i_send_wc, &ack_state, 0); -- 2.50.1