tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inetpeer: update inetpeer timestamp in inet_getpeer()

Browse Source 
[ Upstream commit 50b362f21d6c10b0f7939c1482c6a1b43da82f1a ]

inet_putpeer() will be removed in the following patch,
because we will no longer use refcounts.

Update inetpeer timestamp (p->dtime) at lookup time.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241215175629.1248773-4-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: a853c609504e ("inetpeer: do not get a refcount in inet_getpeer()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet
2024-12-15 17:56:28 +00:00
committed by Greg Kroah-Hartman
parent dc4fd82dad
commit 4622e45097
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ipv4/inetpeer.c
+4 -8
View File
@@ -95,6 +95,7 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,
{ {
struct rb_node **pp, *parent, *next; struct rb_node **pp, *parent, *next;
struct inet_peer *p; struct inet_peer *p;
u32 now;
pp = &base->rb_root.rb_node; pp = &base->rb_root.rb_node;
parent = NULL; parent = NULL;
@@ -110,6 +111,9 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,
if (cmp == 0) { if (cmp == 0) {
if (!refcount_inc_not_zero(&p->refcnt)) if (!refcount_inc_not_zero(&p->refcnt))
break; break;
now = jiffies;
if (READ_ONCE(p->dtime) != now)
WRITE_ONCE(p->dtime, now);
return p; return p;
} }
if (gc_stack) { if (gc_stack) {
@@ -155,9 +159,6 @@ static void inet_peer_gc(struct inet_peer_base *base,
for (i = 0; i < gc_cnt; i++) { for (i = 0; i < gc_cnt; i++) {
p = gc_stack[i]; p = gc_stack[i];
/* The READ_ONCE() pairs with the WRITE_ONCE()
* in inet_putpeer()
*/
delta = (__u32)jiffies - READ_ONCE(p->dtime); delta = (__u32)jiffies - READ_ONCE(p->dtime);
if (delta < ttl || !refcount_dec_if_one(&p->refcnt)) if (delta < ttl || !refcount_dec_if_one(&p->refcnt))
@@ -229,11 +230,6 @@ EXPORT_SYMBOL_GPL(inet_getpeer);
void inet_putpeer(struct inet_peer *p) void inet_putpeer(struct inet_peer *p)
{ {
/* The WRITE_ONCE() pairs with itself (we run lockless)
* and the READ_ONCE() in inet_peer_gc()
*/
WRITE_ONCE(p->dtime, (__u32)jiffies);
if (refcount_dec_and_test(&p->refcnt)) if (refcount_dec_and_test(&p->refcnt))
call_rcu(&p->rcu, inetpeer_free_rcu); call_rcu(&p->rcu, inetpeer_free_rcu);
} }