Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9346abe authored by Kees Cook's avatar Kees Cook Committed by Doug Ledford
Browse files

RDMA/cxgb4: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Also removes an unused timer and
drops a redundant initialization.

Cc: Steve Wise <swise@chelsio.com>
Cc: Doug Ledford <dledford@redhat.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: linux-rdma@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 2ec46d68

drivers/infiniband/hw/cxgb4/cm.c

+5 −8
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct workqueue_struct *workq; 
static struct sk_buff_head rxq;



static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp);

static void ep_timeout(unsigned long arg);

static void ep_timeout(struct timer_list *t);

static void connect_reply_upcall(struct c4iw_ep *ep, int status);

static int sched(struct c4iw_dev *dev, struct sk_buff *skb);
@@ -189,8 +189,6 @@ static void start_ep_timer(struct c4iw_ep *ep) 
	clear_bit(TIMEOUT, &ep->com.flags);

	c4iw_get_ep(&ep->com);

	ep->timer.expires = jiffies + ep_timeout_secs * HZ;

	ep->timer.data = (unsigned long)ep;

	ep->timer.function = ep_timeout;

	add_timer(&ep->timer);

}
@@ -2101,7 +2099,6 @@ static int c4iw_reconnect(struct c4iw_ep *ep) 
	__u8 *ra;



	pr_debug("%s qp %p cm_id %p\n", __func__, ep->com.qp, ep->com.cm_id);

	init_timer(&ep->timer);

	c4iw_init_wr_wait(&ep->com.wr_wait);



	/* When MPA revision is different on nodes, the node with MPA_rev=2
@@ -2579,7 +2576,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
	pr_debug("%s tx_chan %u smac_idx %u rss_qid %u\n", __func__,

		 child_ep->tx_chan, child_ep->smac_idx, child_ep->rss_qid);



	init_timer(&child_ep->timer);

	timer_setup(&child_ep->timer, ep_timeout, 0);

	cxgb4_insert_tid(t, child_ep, hwtid,

			 child_ep->com.local_addr.ss_family);

	insert_ep_tid(child_ep);
@@ -3204,7 +3201,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		goto fail1;

	}



	init_timer(&ep->timer);

	timer_setup(&ep->timer, ep_timeout, 0);

	ep->plen = conn_param->private_data_len;

	if (ep->plen)

		memcpy(ep->mpa_pkt + sizeof(struct mpa_message),
@@ -4119,9 +4116,9 @@ static void process_work(struct work_struct *work) 


static DECLARE_WORK(skb_work, process_work);



static void ep_timeout(unsigned long arg)

static void ep_timeout(struct timer_list *t)

{

	struct c4iw_ep *ep = (struct c4iw_ep *)arg;

	struct c4iw_ep *ep = from_timer(ep, t, timer);

	int kickit = 0;



	spin_lock(&timeout_lock);

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −1
Original line number Diff line number Diff line
@@ -480,7 +480,6 @@ struct c4iw_qp { 
	struct mutex mutex;

	struct kref kref;

	wait_queue_head_t wait;

	struct timer_list timer;

	int sq_sig_all;

	struct work_struct free_work;

	struct c4iw_ucontext *ucontext;

drivers/infiniband/hw/cxgb4/qp.c

+0 −1
Original line number Diff line number Diff line
@@ -1935,7 +1935,6 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, 
		qhp->ucontext = ucontext;

	}

	qhp->ibqp.qp_num = qhp->wq.sq.qid;

	init_timer(&(qhp->timer));

	INIT_LIST_HEAD(&qhp->db_fc_entry);

	pr_debug("%s sq id %u size %u memsize %zu num_entries %u rq id %u size %u memsize %zu num_entries %u\n",

		 __func__,