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

Commit 671422b2 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

xfrm: Replace hrtimer tasklet with softirq hrtimer 



Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
callback in softirq context and remove the hrtimer_tasklet.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Link: https://lkml.kernel.org/r/20190301224821.29843-3-bigeasy@linutronix.de
parent 77dcc623

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ struct xfrm_state { 
	struct xfrm_stats	stats;



	struct xfrm_lifetime_cur curlft;

	struct tasklet_hrtimer	mtimer;

	struct hrtimer		mtimer;



	struct xfrm_state_offload xso;

net/xfrm/xfrm_state.c

+18 −12
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ EXPORT_SYMBOL(xfrm_state_free); 


static void ___xfrm_state_destroy(struct xfrm_state *x)

{

	tasklet_hrtimer_cancel(&x->mtimer);

	hrtimer_cancel(&x->mtimer);

	del_timer_sync(&x->rtimer);

	kfree(x->aead);

	kfree(x->aalg);
@@ -479,8 +479,8 @@ static void xfrm_state_gc_task(struct work_struct *work) 


static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)

{

	struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer);

	struct xfrm_state *x = container_of(thr, struct xfrm_state, mtimer);

	struct xfrm_state *x = container_of(me, struct xfrm_state, mtimer);

	enum hrtimer_restart ret = HRTIMER_NORESTART;

	time64_t now = ktime_get_real_seconds();

	time64_t next = TIME64_MAX;

	int warn = 0;
@@ -544,7 +544,8 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me) 
		km_state_expired(x, 0, 0);

resched:

	if (next != TIME64_MAX) {

		tasklet_hrtimer_start(&x->mtimer, ktime_set(next, 0), HRTIMER_MODE_REL);

		hrtimer_forward_now(&x->mtimer, ktime_set(next, 0));

		ret = HRTIMER_RESTART;

	}



	goto out;
@@ -561,7 +562,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me) 


out:

	spin_unlock(&x->lock);

	return HRTIMER_NORESTART;

	return ret;

}



static void xfrm_replay_timer_handler(struct timer_list *t);
@@ -580,8 +581,8 @@ struct xfrm_state *xfrm_state_alloc(struct net *net) 
		INIT_HLIST_NODE(&x->bydst);

		INIT_HLIST_NODE(&x->bysrc);

		INIT_HLIST_NODE(&x->byspi);

		tasklet_hrtimer_init(&x->mtimer, xfrm_timer_handler,

					CLOCK_BOOTTIME, HRTIMER_MODE_ABS);

		hrtimer_init(&x->mtimer, CLOCK_BOOTTIME, HRTIMER_MODE_ABS_SOFT);

		x->mtimer.function = xfrm_timer_handler;

		timer_setup(&x->rtimer, xfrm_replay_timer_handler, 0);

		x->curlft.add_time = ktime_get_real_seconds();

		x->lft.soft_byte_limit = XFRM_INF;
@@ -1047,7 +1048,9 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, 
				hlist_add_head_rcu(&x->byspi, net->xfrm.state_byspi + h);

			}

			x->lft.hard_add_expires_seconds = net->xfrm.sysctl_acq_expires;

			tasklet_hrtimer_start(&x->mtimer, ktime_set(net->xfrm.sysctl_acq_expires, 0), HRTIMER_MODE_REL);

			hrtimer_start(&x->mtimer,

				      ktime_set(net->xfrm.sysctl_acq_expires, 0),

				      HRTIMER_MODE_REL_SOFT);

			net->xfrm.state_num++;

			xfrm_hash_grow_check(net, x->bydst.next != NULL);

			spin_unlock_bh(&net->xfrm.xfrm_state_lock);
@@ -1159,7 +1162,7 @@ static void __xfrm_state_insert(struct xfrm_state *x) 
		hlist_add_head_rcu(&x->byspi, net->xfrm.state_byspi + h);

	}



	tasklet_hrtimer_start(&x->mtimer, ktime_set(1, 0), HRTIMER_MODE_REL);

	hrtimer_start(&x->mtimer, ktime_set(1, 0), HRTIMER_MODE_REL_SOFT);

	if (x->replay_maxage)

		mod_timer(&x->rtimer, jiffies + x->replay_maxage);
@@ -1266,7 +1269,9 @@ static struct xfrm_state *__find_acq_core(struct net *net, 
		x->mark.m = m->m;

		x->lft.hard_add_expires_seconds = net->xfrm.sysctl_acq_expires;

		xfrm_state_hold(x);

		tasklet_hrtimer_start(&x->mtimer, ktime_set(net->xfrm.sysctl_acq_expires, 0), HRTIMER_MODE_REL);

		hrtimer_start(&x->mtimer,

			      ktime_set(net->xfrm.sysctl_acq_expires, 0),

			      HRTIMER_MODE_REL_SOFT);

		list_add(&x->km.all, &net->xfrm.state_all);

		hlist_add_head_rcu(&x->bydst, net->xfrm.state_bydst + h);

		h = xfrm_src_hash(net, daddr, saddr, family);
@@ -1571,7 +1576,8 @@ int xfrm_state_update(struct xfrm_state *x) 
		memcpy(&x1->lft, &x->lft, sizeof(x1->lft));

		x1->km.dying = 0;



		tasklet_hrtimer_start(&x1->mtimer, ktime_set(1, 0), HRTIMER_MODE_REL);

		hrtimer_start(&x1->mtimer, ktime_set(1, 0),

			      HRTIMER_MODE_REL_SOFT);

		if (x1->curlft.use_time)

			xfrm_state_check_expire(x1);
@@ -1610,7 +1616,7 @@ int xfrm_state_check_expire(struct xfrm_state *x) 
	if (x->curlft.bytes >= x->lft.hard_byte_limit ||

	    x->curlft.packets >= x->lft.hard_packet_limit) {

		x->km.state = XFRM_STATE_EXPIRED;

		tasklet_hrtimer_start(&x->mtimer, 0, HRTIMER_MODE_REL);

		hrtimer_start(&x->mtimer, 0, HRTIMER_MODE_REL_SOFT);

		return -EINVAL;

	}