current/SOURCES/revert-xfrm-update-sa-curlft.use_time.patch

From 3e778a1a8cb85f80a331d51014e7a1a9f549e08f Mon Sep 17 00:00:00 2001
From: Sasha Levin <sashal@kernel.org>
Date: Wed, 27 Jul 2022 17:38:35 +0200
Subject: Revert "xfrm: update SA curlft.use_time"

From: Antony Antony <antony.antony@secunet.com>

[ Upstream commit 717ada9f10f2de8c4f4d72ad045f3b67a7ced715 ]

This reverts commit af734a26a1a95a9fda51f2abb0c22a7efcafd5ca.

The abvoce commit is a regression according RFC 2367. A better fix would be
use x->lastused. Which will be propsed later.

according to RFC 2367 use_time == sadb_lifetime_usetime.

"sadb_lifetime_usetime
                   For CURRENT, the time, in seconds, when association
                   was first used. For HARD and SOFT, the number of
                   seconds after the first use of the association until
                   it expires."

Fixes: af734a26a1a9 ("xfrm: update SA curlft.use_time")
Signed-off-by: Antony Antony <antony.antony@secunet.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 net/xfrm/xfrm_input.c  | 1 -
 net/xfrm/xfrm_output.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 144238a50f3d4..70a8c36f0ba6e 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -669,7 +669,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 
                x->curlft.bytes += skb->len;
                x->curlft.packets++;
-               x->curlft.use_time = ktime_get_real_seconds();
 
                spin_unlock(&x->lock);
 
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 555ab35cd119a..9a5e79a38c679 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -534,7 +534,6 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 
                x->curlft.bytes += skb->len;
                x->curlft.packets++;
-               x->curlft.use_time = ktime_get_real_seconds();
 
                spin_unlock_bh(&x->lock);
 
-- 
2.35.1

1	From 3e778a1a8cb85f80a331d51014e7a1a9f549e08f Mon Sep 17 00:00:00 2001
2	From: Sasha Levin <sashal@kernel.org>
3	Date: Wed, 27 Jul 2022 17:38:35 +0200
4	Subject: Revert "xfrm: update SA curlft.use_time"
5
6	From: Antony Antony <antony.antony@secunet.com>
7
8	[ Upstream commit 717ada9f10f2de8c4f4d72ad045f3b67a7ced715 ]
9
10	This reverts commit af734a26a1a95a9fda51f2abb0c22a7efcafd5ca.
11
12	The abvoce commit is a regression according RFC 2367. A better fix would be
13	use x->lastused. Which will be propsed later.
14
15	according to RFC 2367 use_time == sadb_lifetime_usetime.
16
17	"sadb_lifetime_usetime
18	For CURRENT, the time, in seconds, when association
19	was first used. For HARD and SOFT, the number of
20	seconds after the first use of the association until
21	it expires."
22
23	Fixes: af734a26a1a9 ("xfrm: update SA curlft.use_time")
24	Signed-off-by: Antony Antony <antony.antony@secunet.com>
25	Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
26	Signed-off-by: Sasha Levin <sashal@kernel.org>
27	---
28	net/xfrm/xfrm_input.c \| 1 -
29	net/xfrm/xfrm_output.c \| 1 -
30	2 files changed, 2 deletions(-)
31
32	diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
33	index 144238a50f3d4..70a8c36f0ba6e 100644
34	--- a/net/xfrm/xfrm_input.c
35	+++ b/net/xfrm/xfrm_input.c
36	@@ -669,7 +669,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
37
38	x->curlft.bytes += skb->len;
39	x->curlft.packets++;
40	- x->curlft.use_time = ktime_get_real_seconds();
41
42	spin_unlock(&x->lock);
43
44	diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
45	index 555ab35cd119a..9a5e79a38c679 100644
46	--- a/net/xfrm/xfrm_output.c
47	+++ b/net/xfrm/xfrm_output.c
48	@@ -534,7 +534,6 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
49
50	x->curlft.bytes += skb->len;
51	x->curlft.packets++;
52	- x->curlft.use_time = ktime_get_real_seconds();
53
54	spin_unlock_bh(&x->lock);
55
56	--
57	2.35.1
58