diff options
| author |   Yury Polyanskiy <polyanskiy@gmail.com> | 2009-11-08 20:58:41 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-11-08 20:58:41 -0800 |
| commit | 9e0d57fd6dad37d72a3ca6db00ca8c76f2215454 (patch) | |
| tree | 89693eb2e093da06e2228c12b43bde23e95049ad /include/net/xfrm.h | |
| parent | net/compat_ioctl: support SIOCWANDEV (diff) | |
| download | linux-dev-9e0d57fd6dad37d72a3ca6db00ca8c76f2215454.tar.xz linux-dev-9e0d57fd6dad37d72a3ca6db00ca8c76f2215454.zip | |
xfrm: SAD entries do not expire correctly after suspend-resume
This fixes the following bug in the current implementation of
net/xfrm: SAD entries timeouts do not count the time spent by the machine
in the suspended state. This leads to the connectivity problems because
after resuming local machine thinks that the SAD entry is still valid, while
it has already been expired on the remote server.
The cause of this is very simple: the timeouts in the net/xfrm are bound to
the old mod_timer() timers. This patch reassigns them to the
CLOCK_REALTIME hrtimer.
I have been using this version of the patch for a few months on my
machines without any problems. Also run a few stress tests w/o any
issues.
This version of the patch uses tasklet_hrtimer by Peter Zijlstra
(commit 9ba5f0).
This patch is against 2.6.31.4. Please CC me.
Signed-off-by: Yury Polyanskiy <polyanskiy@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 7f38ef509957..93d184b91a8c 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -19,6 +19,9 @@ #include <net/route.h> #include <net/ipv6.h> #include <net/ip6_fib.h> + +#include <linux/interrupt.h> + #ifdef CONFIG_XFRM_STATISTICS #include <net/snmp.h> #endif @@ -198,7 +201,7 @@ struct xfrm_state { struct xfrm_stats stats; struct xfrm_lifetime_cur curlft; - struct timer_list timer; + struct tasklet_hrtimer mtimer; /* Last used time */ unsigned long lastused; |