shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "net: inet: Remove count from inet_listen_hashbucket"

Browse Source 
This reverts commit bb9bcf47fb which is
commit 8ea1eebb49 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I7312d7514465b14b40fbc96f35d15a3af057168e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-12-18 19:32:36 +00:00
parent 483e9067b5
commit 32edfbff66
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/inet_hashtables.h
View File

@@ -111,6 +111,7 @@ struct inet_bind_hashbucket {
#define LISTENING_NULLS_BASE (1U << 29) #define LISTENING_NULLS_BASE (1U << 29)
struct inet_listen_hashbucket { struct inet_listen_hashbucket {
spinlock_t lock; spinlock_t lock;
unsigned int count;
union { union {
struct hlist_head head; struct hlist_head head;
struct hlist_nulls_head nulls_head; struct hlist_nulls_head nulls_head;

6
net/ipv4/inet_hashtables.c
View File

@@ -209,6 +209,7 @@ static void inet_hash2(struct inet_hashinfo *h, struct sock *sk)
else else
hlist_add_head_rcu(&inet_csk(sk)->icsk_listen_portaddr_node, hlist_add_head_rcu(&inet_csk(sk)->icsk_listen_portaddr_node,
&ilb2->head); &ilb2->head);
ilb2->count++;
spin_unlock(&ilb2->lock); spin_unlock(&ilb2->lock);
} }
@@ -224,6 +225,7 @@ static void inet_unhash2(struct inet_hashinfo *h, struct sock *sk)
spin_lock(&ilb2->lock); spin_lock(&ilb2->lock);
hlist_del_init_rcu(&inet_csk(sk)->icsk_listen_portaddr_node); hlist_del_init_rcu(&inet_csk(sk)->icsk_listen_portaddr_node);
ilb2->count--;
spin_unlock(&ilb2->lock); spin_unlock(&ilb2->lock);
} }
@@ -650,6 +652,7 @@ int __inet_hash(struct sock *sk, struct sock *osk)
else else
__sk_nulls_add_node_rcu(sk, &ilb->nulls_head); __sk_nulls_add_node_rcu(sk, &ilb->nulls_head);
inet_hash2(hashinfo, sk); inet_hash2(hashinfo, sk);
ilb->count++;
sock_set_flag(sk, SOCK_RCU_FREE); sock_set_flag(sk, SOCK_RCU_FREE);
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
unlock: unlock:
@@ -681,6 +684,7 @@ static void __inet_unhash(struct sock *sk, struct inet_listen_hashbucket *ilb)
struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
inet_unhash2(hashinfo, sk); inet_unhash2(hashinfo, sk);
ilb->count--;
} }
__sk_nulls_del_node_init_rcu(sk); __sk_nulls_del_node_init_rcu(sk);
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
@@ -863,6 +867,7 @@ void inet_hashinfo_init(struct inet_hashinfo *h)
spin_lock_init(&h->listening_hash[i].lock); spin_lock_init(&h->listening_hash[i].lock);
INIT_HLIST_NULLS_HEAD(&h->listening_hash[i].nulls_head, INIT_HLIST_NULLS_HEAD(&h->listening_hash[i].nulls_head,
i + LISTENING_NULLS_BASE); i + LISTENING_NULLS_BASE);
h->listening_hash[i].count = 0;
} }
h->lhash2 = NULL; h->lhash2 = NULL;
@@ -876,6 +881,7 @@ static void init_hashinfo_lhash2(struct inet_hashinfo *h)
for (i = 0; i <= h->lhash2_mask; i++) { for (i = 0; i <= h->lhash2_mask; i++) {
spin_lock_init(&h->lhash2[i].lock); spin_lock_init(&h->lhash2[i].lock);
INIT_HLIST_HEAD(&h->lhash2[i].head); INIT_HLIST_HEAD(&h->lhash2[i].head);
h->lhash2[i].count = 0;
} }
} }