From: Steffen Klassert <steffen.klassert@secunet•com>
To: Fan Du <fan.du@windriver•com>
Cc: davem@davemloft•net, netdev@vger•kernel.org
Subject: Re: [PATCHv2 net-next] xfrm: Make xfrm_state timer monotonic
Date: Wed, 14 Aug 2013 13:34:36 +0200 [thread overview]
Message-ID: <20130814113436.GI26773@secunet.com> (raw)
In-Reply-To: <52087537.6060200@windriver.com>
On Mon, Aug 12, 2013 at 01:40:07PM +0800, Fan Du wrote:
>
>
> On 2013年08月06日 17:22, Steffen Klassert wrote:
> >On Tue, Aug 06, 2013 at 02:57:05PM +0800, Fan Du wrote:
> >>xfrm_state timer should be independent of system clock change,
> >>so switch to monotonic clock base.
> >>
> >
> >I think a monotonic timer will reintroduce a bug on suspend/resume
> >that was fixed by commit 9e0d57fd6
> >(xfrm: SAD entries do not expire correctly after suspend-resume)
> >
> >Please make sure that this does not happen.
>
> What about using CLOCK_BOOTTIME? it's monotonic, but includes suspend time as well.
>
>
> From 1dae5a22c203224ee46e2a2f95b569a04b74117b Mon Sep 17 00:00:00 2001
> From: Fan Du <fan.du@windriver•com>
> Date: Mon, 12 Aug 2013 13:33:45 +0800
> Subject: [PATCHv2 net-next] xfrm: Make xfrm_state timer monotonic
>
> xfrm_state timer should be independent of system clock change,
> so switch to CLOCK_BOOTTIME base which is not only monotonic but
> also counting suspend time.
>
> Signed-off-by: Fan Du <fan.du@windriver•com>
> ---
> net/xfrm/xfrm_state.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
> index 78f66fa..1df4436 100644
> --- a/net/xfrm/xfrm_state.c
> +++ b/net/xfrm/xfrm_state.c
> @@ -499,7 +499,7 @@ 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_REALTIME, HRTIMER_MODE_ABS);
> + tasklet_hrtimer_init(&x->mtimer, xfrm_timer_handler, CLOCK_BOOTTIME, HRTIMER_MODE_ABS);
> setup_timer(&x->rtimer, xfrm_replay_timer_handler,
> (unsigned long)x);
> x->curlft.add_time = get_seconds();
This does not apply to my tree, looks like your patch is whitespace damaged.
next prev parent reply other threads:[~2013-08-14 11:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-06 6:57 [PATCH net-next] xfrm: Make xfrm_state timer monotonic Fan Du
2013-08-06 9:22 ` Steffen Klassert
2013-08-12 5:40 ` [PATCHv2 " Fan Du
2013-08-13 7:55 ` Steffen Klassert
2013-08-13 8:37 ` Fan Du
2013-08-13 10:59 ` Steffen Klassert
2013-08-14 11:34 ` Steffen Klassert [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-15 7:49 Fan Du
2013-08-15 21:23 ` David Miller
2013-08-16 9:30 ` Steffen Klassert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130814113436.GI26773@secunet.com \
--to=steffen.klassert@secunet$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=fan.du@windriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox