| From 90196545bcfa84af56c4c3cfd65943913c8d6479 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Thu, 31 Aug 2017 11:03:10 +0000 |
| Subject: [PATCH] xfrm: Replace hrtimer tasklet with softirq hrtimer |
| |
| Switch the timer to CLOCK_MONOTONIC_SOFT, which executed the timer |
| callback in softirq context and remove the hrtimer_tasklet. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> |
| Cc: Steffen Klassert <steffen.klassert@secunet.com> |
| Cc: Herbert Xu <herbert@gondor.apana.org.au> |
| Cc: "David S. Miller" <davem@davemloft.net> |
| Cc: netdev@vger.kernel.org |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| |
| diff --git a/include/net/xfrm.h b/include/net/xfrm.h |
| index 6793a30c66b1..f95662f1c20f 100644 |
| --- a/include/net/xfrm.h |
| +++ b/include/net/xfrm.h |
| @@ -212,7 +212,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; |
| |
| diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c |
| index fc3c5aa38754..c4deff0bfefa 100644 |
| --- a/net/xfrm/xfrm_state.c |
| +++ b/net/xfrm/xfrm_state.c |
| @@ -418,7 +418,7 @@ static void xfrm_put_mode(struct xfrm_mode *mode) |
| |
| static void xfrm_state_gc_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); |
| @@ -463,8 +463,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; |
| unsigned long now = get_seconds(); |
| long next = LONG_MAX; |
| int warn = 0; |
| @@ -528,7 +528,8 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me) |
| km_state_expired(x, 0, 0); |
| resched: |
| if (next != LONG_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; |
| @@ -545,7 +546,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(unsigned long data); |
| @@ -564,8 +565,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_SOFT, HRTIMER_MODE_ABS); |
| + x->mtimer.function = xfrm_timer_handler; |
| setup_timer(&x->rtimer, xfrm_replay_timer_handler, |
| (unsigned long)x); |
| x->curlft.add_time = get_seconds(); |
| @@ -1021,7 +1022,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); |
| net->xfrm.state_num++; |
| xfrm_hash_grow_check(net, x->bydst.next != NULL); |
| spin_unlock_bh(&net->xfrm.xfrm_state_lock); |
| @@ -1132,7 +1135,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); |
| if (x->replay_maxage) |
| mod_timer(&x->rtimer, jiffies + x->replay_maxage); |
| |
| @@ -1236,7 +1239,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); |
| 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); |
| @@ -1525,7 +1530,7 @@ 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); |
| if (x1->curlft.use_time) |
| xfrm_state_check_expire(x1); |
| |
| @@ -1549,7 +1554,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); |
| return -EINVAL; |
| } |
| |
| -- |
| 2.1.4 |
| |