Commit 235bd9d2 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp: Rename tcp_or_dccp_get_hashinfo(). 



DCCP was removed, so tcp_or_dccp_get_hashinfo() should be renamed.

Let's rename it to tcp_get_hashinfo().

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250410023921.11307-5-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 22d6c9ee

include/net/inet_hashtables.h

+1 −2
Original line number Diff line number Diff line
@@ -175,9 +175,8 @@ struct inet_hashinfo { 
	bool				pernet;

} ____cacheline_aligned_in_smp;



static inline struct inet_hashinfo *tcp_or_dccp_get_hashinfo(const struct sock *sk)

static inline struct inet_hashinfo *tcp_get_hashinfo(const struct sock *sk)

{

	/* TODO: rename function */

	return sock_net(sk)->ipv4.tcp_death_row.hashinfo;

}

net/ipv4/inet_connection_sock.c

+5 −4
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret, 
			struct inet_bind2_bucket **tb2_ret,

			struct inet_bind_hashbucket **head2_ret, int *port_ret)

{

	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);

	int i, low, high, attempt_half, port, l3mdev;

	struct inet_bind_hashbucket *head, *head2;

	struct net *net = sock_net(sk);
@@ -512,10 +512,10 @@ void inet_csk_update_fastreuse(struct inet_bind_bucket *tb, 
 */

int inet_csk_get_port(struct sock *sk, unsigned short snum)

{

	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);

	bool reuse = sk->sk_reuse && sk->sk_state != TCP_LISTEN;

	bool found_port = false, check_bind_conflict = true;

	bool bhash_created = false, bhash2_created = false;

	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);

	int ret = -EADDRINUSE, port = snum, l3mdev;

	struct inet_bind_hashbucket *head, *head2;

	struct inet_bind2_bucket *tb2 = NULL;
@@ -1022,9 +1022,10 @@ static bool reqsk_queue_unlink(struct request_sock *req) 
	bool found = false;



	if (sk_hashed(sk)) {

		struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);

		spinlock_t *lock = inet_ehash_lockp(hashinfo, req->rsk_hash);

		struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);

		spinlock_t *lock;



		lock = inet_ehash_lockp(hashinfo, req->rsk_hash);

		spin_lock(lock);

		found = __sk_nulls_del_node_init_rcu(sk);

		spin_unlock(lock);

net/ipv4/inet_hashtables.c

+7 −7
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb, 
 */

static void __inet_put_port(struct sock *sk)

{

	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);

	struct inet_bind_hashbucket *head, *head2;

	struct net *net = sock_net(sk);

	struct inet_bind_bucket *tb;
@@ -215,7 +215,7 @@ EXPORT_SYMBOL(inet_put_port); 


int __inet_inherit_port(const struct sock *sk, struct sock *child)

{

	struct inet_hashinfo *table = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *table = tcp_get_hashinfo(sk);

	unsigned short port = inet_sk(child)->inet_num;

	struct inet_bind_hashbucket *head, *head2;

	bool created_inet_bind_bucket = false;
@@ -668,7 +668,7 @@ static bool inet_ehash_lookup_by_sk(struct sock *sk, 
 */

bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)

{

	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);

	struct inet_ehash_bucket *head;

	struct hlist_nulls_head *list;

	spinlock_t *lock;
@@ -740,7 +740,7 @@ static int inet_reuseport_add_sock(struct sock *sk, 


int __inet_hash(struct sock *sk, struct sock *osk)

{

	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);

	struct inet_listen_hashbucket *ilb2;

	int err = 0;
@@ -785,7 +785,7 @@ int inet_hash(struct sock *sk) 


void inet_unhash(struct sock *sk)

{

	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);



	if (sk_unhashed(sk))

		return;
@@ -873,7 +873,7 @@ inet_bind2_bucket_find(const struct inet_bind_hashbucket *head, const struct net 
struct inet_bind_hashbucket *

inet_bhash2_addr_any_hashbucket(const struct sock *sk, const struct net *net, int port)

{

	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);

	u32 hash;



#if IS_ENABLED(CONFIG_IPV6)
@@ -901,7 +901,7 @@ static void inet_update_saddr(struct sock *sk, void *saddr, int family) 


static int __inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family, bool reset)

{

	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);

	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);

	struct inet_bind_hashbucket *head, *head2;

	struct inet_bind2_bucket *tb2, *new_tb2;

	int l3mdev = inet_sk_bound_l3mdev(sk);