Commit 1ec779cc authored by Vipul Pandya's avatar Vipul Pandya Committed by Roland Dreier

RDMA/cxgb4: Fix endpoint timeout race condition

The endpoint timeout logic had a race that could cause an endpoint
object to be freed while it was still on the timedout list.  This
can happen if the timer is stopped after it had fired, but before
the timedout thread processed the endpoint timeout.
Signed-off-by: default avatarVipul Pandya <vipul@chelsio.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent e8e5b927
...@@ -159,10 +159,12 @@ static void start_ep_timer(struct c4iw_ep *ep) ...@@ -159,10 +159,12 @@ static void start_ep_timer(struct c4iw_ep *ep)
{ {
PDBG("%s ep %p\n", __func__, ep); PDBG("%s ep %p\n", __func__, ep);
if (timer_pending(&ep->timer)) { if (timer_pending(&ep->timer)) {
PDBG("%s stopped / restarted timer ep %p\n", __func__, ep); pr_err("%s timer already started! ep %p\n",
del_timer_sync(&ep->timer); __func__, ep);
} else return;
c4iw_get_ep(&ep->com); }
clear_bit(TIMEOUT, &ep->com.flags);
c4iw_get_ep(&ep->com);
ep->timer.expires = jiffies + ep_timeout_secs * HZ; ep->timer.expires = jiffies + ep_timeout_secs * HZ;
ep->timer.data = (unsigned long)ep; ep->timer.data = (unsigned long)ep;
ep->timer.function = ep_timeout; ep->timer.function = ep_timeout;
...@@ -171,14 +173,10 @@ static void start_ep_timer(struct c4iw_ep *ep) ...@@ -171,14 +173,10 @@ static void start_ep_timer(struct c4iw_ep *ep)
static void stop_ep_timer(struct c4iw_ep *ep) static void stop_ep_timer(struct c4iw_ep *ep)
{ {
PDBG("%s ep %p\n", __func__, ep); PDBG("%s ep %p stopping\n", __func__, ep);
if (!timer_pending(&ep->timer)) {
WARN(1, "%s timer stopped when its not running! "
"ep %p state %u\n", __func__, ep, ep->com.state);
return;
}
del_timer_sync(&ep->timer); del_timer_sync(&ep->timer);
c4iw_put_ep(&ep->com); if (!test_and_set_bit(TIMEOUT, &ep->com.flags))
c4iw_put_ep(&ep->com);
} }
static int c4iw_l2t_send(struct c4iw_rdev *rdev, struct sk_buff *skb, static int c4iw_l2t_send(struct c4iw_rdev *rdev, struct sk_buff *skb,
...@@ -3191,11 +3189,16 @@ static DECLARE_WORK(skb_work, process_work); ...@@ -3191,11 +3189,16 @@ static DECLARE_WORK(skb_work, process_work);
static void ep_timeout(unsigned long arg) static void ep_timeout(unsigned long arg)
{ {
struct c4iw_ep *ep = (struct c4iw_ep *)arg; struct c4iw_ep *ep = (struct c4iw_ep *)arg;
int kickit = 0;
spin_lock(&timeout_lock); spin_lock(&timeout_lock);
list_add_tail(&ep->entry, &timeout_list); if (!test_and_set_bit(TIMEOUT, &ep->com.flags)) {
list_add_tail(&ep->entry, &timeout_list);
kickit = 1;
}
spin_unlock(&timeout_lock); spin_unlock(&timeout_lock);
queue_work(workq, &skb_work); if (kickit)
queue_work(workq, &skb_work);
} }
/* /*
......
...@@ -716,6 +716,7 @@ enum c4iw_ep_flags { ...@@ -716,6 +716,7 @@ enum c4iw_ep_flags {
ABORT_REQ_IN_PROGRESS = 1, ABORT_REQ_IN_PROGRESS = 1,
RELEASE_RESOURCES = 2, RELEASE_RESOURCES = 2,
CLOSE_SENT = 3, CLOSE_SENT = 3,
TIMEOUT = 4,
QP_REFERENCED = 5, QP_REFERENCED = 5,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment