diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-22 03:13:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-22 03:13:20 +0100 |
| commit | bdd091bab8c631bd2801af838e344fad34566410 (patch) | |
| tree | 6d81457c99f041698851601e7d00ef8df9b65ccd /drivers | |
| parent | 02db34d04ecb5e4bb590eb7baf1c12c82ad68ac9 (diff) | |
| parent | ee74d9967b829232723939cb7c9b100b29f6ec98 (diff) | |
| download | linux-bdd091bab8c631bd2801af838e344fad34566410.tar.bz2 | |
Merge branch 'tun-timer-cleanups'
Eric Dumazet says:
====================
tun: timer cleanups
While working on a syzkaller issue that might have been
fixed already by Cong Wang in commit 0ad646c81b21
("tun: call dev_get_valid_name() before register_netdevice()")
I made three small changes related to flow_gc_timer.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tun.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3b41c36eae90..2a2d058cdd40 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -454,25 +454,28 @@ static void tun_flow_cleanup(unsigned long data) tun_debug(KERN_INFO, tun, "tun_flow_cleanup\n"); - spin_lock_bh(&tun->lock); + spin_lock(&tun->lock); for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) { struct tun_flow_entry *e; struct hlist_node *n; hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link) { unsigned long this_timer; - count++; + this_timer = e->updated + delay; - if (time_before_eq(this_timer, jiffies)) + if (time_before_eq(this_timer, jiffies)) { tun_flow_delete(tun, e); - else if (time_before(this_timer, next_timer)) + continue; + } + count++; + if (time_before(this_timer, next_timer)) next_timer = this_timer; } } if (count) mod_timer(&tun->flow_gc_timer, round_jiffies_up(next_timer)); - spin_unlock_bh(&tun->lock); + spin_unlock(&tun->lock); } static void tun_flow_update(struct tun_struct *tun, u32 rxhash, @@ -1194,8 +1197,6 @@ static void tun_flow_init(struct tun_struct *tun) tun->ageing_time = TUN_FLOW_EXPIRE; setup_timer(&tun->flow_gc_timer, tun_flow_cleanup, (unsigned long)tun); - mod_timer(&tun->flow_gc_timer, - round_jiffies_up(jiffies + tun->ageing_time)); } static void tun_flow_uninit(struct tun_struct *tun) |