Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inetpeer: remove create argument of inet_getpeer() 

All callers of inet_getpeer() want to create an inetpeer.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241215175629.1248773-3-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet 2024-12-15 17:56:27 +00:00 committed by Jakub Kicinski
parent 661cd8fc8e
commit 7a596a50c4
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/inetpeer.h
View File

@ -96,8 +96,7 @@ static inline struct in6_addr *inetpeer_get_addr_v6(struct inetpeer_addr *iaddr)
/* can be called with or without local BH being disabled */ /* can be called with or without local BH being disabled */
struct inet_peer *inet_getpeer(struct inet_peer_base *base, struct inet_peer *inet_getpeer(struct inet_peer_base *base,
const struct inetpeer_addr *daddr, const struct inetpeer_addr *daddr);
int create);
static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base, static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
__be32 v4daddr, __be32 v4daddr,
@ -108,7 +107,7 @@ static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
daddr.a4.addr = v4daddr; daddr.a4.addr = v4daddr;
daddr.a4.vif = vif; daddr.a4.vif = vif;
daddr.family = AF_INET; daddr.family = AF_INET;
return inet_getpeer(base, &daddr, 1); return inet_getpeer(base, &daddr);
} }
static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base, static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
@ -118,7 +117,7 @@ static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
daddr.a6 = *v6daddr; daddr.a6 = *v6daddr;
daddr.family = AF_INET6; daddr.family = AF_INET6;
return inet_getpeer(base, &daddr, 1); return inet_getpeer(base, &daddr);
} }
static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a, static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a,

11
net/ipv4/inetpeer.c
View File

@ -169,13 +169,11 @@ static void inet_peer_gc(struct inet_peer_base *base,
} }
struct inet_peer *inet_getpeer(struct inet_peer_base *base, struct inet_peer *inet_getpeer(struct inet_peer_base *base,
const struct inetpeer_addr *daddr, const struct inetpeer_addr *daddr)
int create)
{ {
struct inet_peer *p, *gc_stack[PEER_MAX_GC]; struct inet_peer *p, *gc_stack[PEER_MAX_GC];
struct rb_node **pp, *parent; struct rb_node **pp, *parent;
unsigned int gc_cnt, seq; unsigned int gc_cnt, seq;
int invalidated;
/* Attempt a lockless lookup first. /* Attempt a lockless lookup first.
* Because of a concurrent writer, we might not find an existing entry. * Because of a concurrent writer, we might not find an existing entry.
@ -183,16 +181,11 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
rcu_read_lock(); rcu_read_lock();
seq = read_seqbegin(&base->lock); seq = read_seqbegin(&base->lock);
p = lookup(daddr, base, seq, NULL, &gc_cnt, &parent, &pp); p = lookup(daddr, base, seq, NULL, &gc_cnt, &parent, &pp);
invalidated = read_seqretry(&base->lock, seq);
rcu_read_unlock(); rcu_read_unlock();
if (p) if (p)
return p; return p;
/* If no writer did a change during our lookup, we can return early. */
if (!create && !invalidated)
return NULL;
/* retry an exact lookup, taking the lock before. /* retry an exact lookup, taking the lock before.
* At least, nodes should be hot in our cache. * At least, nodes should be hot in our cache.
*/ */
@ -201,7 +194,7 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
gc_cnt = 0; gc_cnt = 0;
p = lookup(daddr, base, seq, gc_stack, &gc_cnt, &parent, &pp); p = lookup(daddr, base, seq, gc_stack, &gc_cnt, &parent, &pp);
if (!p && create) { if (!p) {
p = kmem_cache_alloc(peer_cachep, GFP_ATOMIC); p = kmem_cache_alloc(peer_cachep, GFP_ATOMIC);
if (p) { if (p) {
p->daddr = *daddr; p->daddr = *daddr;