Skip to contentSkip to conversation

tcp: avoid the lookup process failing to get sk in ehash table

PATCH Superseded Jason Xing 3 participants 6 messages Jan 16, 2023 – Jan 17, 2023

Subsystems (3)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Jason Xing

author
#0 lore raw

PATCH v5 1/1 tcp: avoid the lookup process failing to get sk in ehash table

From: Jason Xing <[email protected]>

While one cpu is working on looking up the right socket from ehash table, another cpu is done deleting the request socket and is about to add (or is adding) the big socket from the table. It means that we could miss both of them, even though it has little chance.

Let me draw a call trace map of the server side.
CPU 0 CPU 1
----- -----
tcp_v4_rcv() syn_recv_sock()

                            inet_ehash_insert()
                            -> sk_nulls_del_node_init_rcu(osk)
__inet_lookup_established()
                            -> __sk_nulls_add_node_rcu(sk, list)

Notice that the CPU 0 is receiving the data after the final ack during 3-way shakehands and CPU 1 is still handling the final ack.

Why could this be a real problem?
This case is happening only when the final ack and the first data receiving by different CPUs. Then the server receiving data with ACK flag tries to search one proper established socket from ehash table, but apparently it fails as my map shows above. After that, the server fetches a listener socket and then sends a RST because it finds a ACK flag in the skb (data), which obeys RST definition in RFC 793.

Besides, Eric pointed out there's one more race condition where it handles tw socket hashdance. Only by adding to the tail of the list before deleting the old one can we avoid the race if the reader has already begun the bucket traversal and it would possibly miss the head.

Many thanks to Eric for great help from beginning to end.

Fixes 5e0724d027f0 ("tcp/dccp: fix hashdance race for passive sessions")

---
v5:
1) adjust the style once more.

v4:
1) adjust the code style and make it easier to read.

v3:
1) get rid of else-if statement.

v2:
1) adding the sk node into the tail of list to prevent the race.
2) fix the race condition when handling time-wait socket hashdance.

---
 net/ipv4/inet_hashtables.c    | 17 +++++++++++++++--
 net/ipv4/inet_timewait_sock.c |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)
net/ipv4/inet_hashtables.c +15 -2
index 24a38b56fab9..f58d73888638 100644
@@ -650,8 +650,20 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 	spin_lock(lock);
 	if (osk) {
 		WARN_ON_ONCE(sk->sk_hash != osk->sk_hash);
-		ret = sk_nulls_del_node_init_rcu(osk);
-	} else if (found_dup_sk) {
+		ret = sk_hashed(osk);
+		if (ret) {
+			/* Before deleting the node, we insert a new one to make
+			 * sure that the look-up-sk process would not miss either
+			 * of them and that at least one node would exist in ehash
+			 * table all the time. Otherwise there's a tiny chance
+			 * that lookup process could find nothing in ehash table.
+			 */
+			__sk_nulls_add_node_tail_rcu(sk, list);
+			sk_nulls_del_node_init_rcu(osk);
+		}
+		goto unlock;
+	}
+	if (found_dup_sk) {
 		*found_dup_sk = inet_ehash_lookup_by_sk(sk, list);
 		if (*found_dup_sk)
 			ret = false;
@@ -660,6 +672,7 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 	if (ret)
 		__sk_nulls_add_node_rcu(sk, list);
 
+unlock:
 	spin_unlock(lock);
 
 	return ret;
net/ipv4/inet_timewait_sock.c +3 -3
index 1d77d992e6e7..6d681ef52bb2 100644
@@ -91,10 +91,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw)
 }
 EXPORT_SYMBOL_GPL(inet_twsk_put);
 
-static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
+static void inet_twsk_add_node_tail_rcu(struct inet_timewait_sock *tw,
 				   struct hlist_nulls_head *list)
 {
-	hlist_nulls_add_head_rcu(&tw->tw_node, list);
+	hlist_nulls_add_tail_rcu(&tw->tw_node, list);
 }
 
 static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -147,7 +147,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
 	spin_lock(lock);
 
-	inet_twsk_add_node_rcu(tw, &ehead->chain);
+	inet_twsk_add_node_tail_rcu(tw, &ehead->chain);
 
 	/* Step 3: Remove SK from hash chain */
 	if (__sk_nulls_del_node_init_rcu(sk))
Signature · 1 line
2.37.3
Reviewed-by on v5 1/1
#2 lore raw
In reply to Jason Xing
From:   Jason Xing <[email protected]>
Date:   Mon, 16 Jan 2023 18:33:41 +0800
Quoted 33 lines

From: Jason Xing <[email protected]>

While one cpu is working on looking up the right socket from ehash table, another cpu is done deleting the request socket and is about to add (or is adding) the big socket from the table. It means that we could miss both of them, even though it has little chance.

Let me draw a call trace map of the server side.
CPU 0 CPU 1
----- -----
tcp_v4_rcv() syn_recv_sock()

                            inet_ehash_insert()
                            -> sk_nulls_del_node_init_rcu(osk)
__inet_lookup_established()
                            -> __sk_nulls_add_node_rcu(sk, list)

Notice that the CPU 0 is receiving the data after the final ack during 3-way shakehands and CPU 1 is still handling the final ack.

Why could this be a real problem?
This case is happening only when the final ack and the first data receiving by different CPUs. Then the server receiving data with ACK flag tries to search one proper established socket from ehash table, but apparently it fails as my map shows above. After that, the server fetches a listener socket and then sends a RST because it finds a ACK flag in the skb (data), which obeys RST definition in RFC 793.

Besides, Eric pointed out there's one more race condition where it handles tw socket hashdance. Only by adding to the tail of the list before deleting the old one can we avoid the race if the reader has already begun the bucket traversal and it would possibly miss the head.

Quoted 6 lines

Many thanks to Eric for great help from beginning to end.

Fixes 5e0724d027f0 ("tcp/dccp: fix hashdance race for passive sessions")

I guess there could be regression if a workload has many long-lived connections, but the change itself looks good. I left a minor comment below.

Quoted 58 lines

---
v5:
1) adjust the style once more.

v4:
1) adjust the code style and make it easier to read.

v3:
1) get rid of else-if statement.

v2:
1) adding the sk node into the tail of list to prevent the race.
2) fix the race condition when handling time-wait socket hashdance.

---
 net/ipv4/inet_hashtables.c    | 17 +++++++++++++++--
 net/ipv4/inet_timewait_sock.c |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)
net/ipv4/inet_hashtables.c +15 -2
index 24a38b56fab9..f58d73888638 100644
@@ -650,8 +650,20 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 	spin_lock(lock);
 	if (osk) {
 		WARN_ON_ONCE(sk->sk_hash != osk->sk_hash);
-		ret = sk_nulls_del_node_init_rcu(osk);
-	} else if (found_dup_sk) {
+		ret = sk_hashed(osk);
+		if (ret) {
+			/* Before deleting the node, we insert a new one to make
+			 * sure that the look-up-sk process would not miss either
+			 * of them and that at least one node would exist in ehash
+			 * table all the time. Otherwise there's a tiny chance
+			 * that lookup process could find nothing in ehash table.
+			 */
+			__sk_nulls_add_node_tail_rcu(sk, list);
+			sk_nulls_del_node_init_rcu(osk);
+		}
+		goto unlock;
+	}
+	if (found_dup_sk) {
 		*found_dup_sk = inet_ehash_lookup_by_sk(sk, list);
 		if (*found_dup_sk)
 			ret = false;
@@ -660,6 +672,7 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 	if (ret)
 		__sk_nulls_add_node_rcu(sk, list);
 
+unlock:
 	spin_unlock(lock);
 
 	return ret;
net/ipv4/inet_timewait_sock.c +0 -0
index 1d77d992e6e7..6d681ef52bb2 100644

net/ipv4/inet_timewait_sock.c void inet_twsk_put(struct inet_timewait_sock *tw) · line 95

Quoted 6 lines
net/ipv4/inet_timewait_sock.c +1 -1
@@ -91,10 +91,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw)
 }
 EXPORT_SYMBOL_GPL(inet_twsk_put);
 
-static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
+static void inet_twsk_add_node_tail_rcu(struct inet_timewait_sock *tw,
 				   struct hlist_nulls_head *list)

nit: Please indent here.

Quoted 17 lines
net/ipv4/inet_timewait_sock.c +2 -2
 {
-	hlist_nulls_add_head_rcu(&tw->tw_node, list);
+	hlist_nulls_add_tail_rcu(&tw->tw_node, list);
 }
 
 static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -147,7 +147,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
 	spin_lock(lock);
 
-	inet_twsk_add_node_rcu(tw, &ehead->chain);
+	inet_twsk_add_node_tail_rcu(tw, &ehead->chain);
 
 	/* Step 3: Remove SK from hash chain */
 	if (__sk_nulls_del_node_init_rcu(sk))
Signature · 1 line
2.37.3
author
#3 lore raw
Quoted 36 lines · Kuniyuki Iwashima
From:   Jason Xing <[email protected]>
Date:   Mon, 16 Jan 2023 18:33:41 +0800
Quoted 33 lines

From: Jason Xing <[email protected]>

While one cpu is working on looking up the right socket from ehash table, another cpu is done deleting the request socket and is about to add (or is adding) the big socket from the table. It means that we could miss both of them, even though it has little chance.

Let me draw a call trace map of the server side.
CPU 0 CPU 1
----- -----
tcp_v4_rcv() syn_recv_sock()

                            inet_ehash_insert()
                            -> sk_nulls_del_node_init_rcu(osk)
__inet_lookup_established()
                            -> __sk_nulls_add_node_rcu(sk, list)

Notice that the CPU 0 is receiving the data after the final ack during 3-way shakehands and CPU 1 is still handling the final ack.

Why could this be a real problem?
This case is happening only when the final ack and the first data receiving by different CPUs. Then the server receiving data with ACK flag tries to search one proper established socket from ehash table, but apparently it fails as my map shows above. After that, the server fetches a listener socket and then sends a RST because it finds a ACK flag in the skb (data), which obeys RST definition in RFC 793.

Besides, Eric pointed out there's one more race condition where it handles tw socket hashdance. Only by adding to the tail of the list before deleting the old one can we avoid the race if the reader has already begun the bucket traversal and it would possibly miss the head.

Quoted 8 lines
Quoted 6 lines

Many thanks to Eric for great help from beginning to end.

Fixes 5e0724d027f0 ("tcp/dccp: fix hashdance race for passive sessions")

I guess there could be regression if a workload has many long-lived

Sorry, I don't understand. This patch does not add two kinds of sockets into the ehash table all the time, but reverses the order of deleting and adding sockets only. The final result is the same as the old time. I'm wondering why it could cause some regressions if there are loads of long-lived connections.

Quoted 5 lines

connections, but the change itself looks good. I left a minor comment below.

Thanks for reviewing :)

Quoted 62 lines
Quoted 62 lines

---
v5:
1) adjust the style once more.

v4:
1) adjust the code style and make it easier to read.

v3:
1) get rid of else-if statement.

v2:
1) adding the sk node into the tail of list to prevent the race.
2) fix the race condition when handling time-wait socket hashdance.

---
 net/ipv4/inet_hashtables.c    | 17 +++++++++++++++--
 net/ipv4/inet_timewait_sock.c |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)
net/ipv4/inet_hashtables.c +15 -2
index 24a38b56fab9..f58d73888638 100644
@@ -650,8 +650,20 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
      spin_lock(lock);
      if (osk) {
              WARN_ON_ONCE(sk->sk_hash != osk->sk_hash);
-             ret = sk_nulls_del_node_init_rcu(osk);
-     } else if (found_dup_sk) {
+             ret = sk_hashed(osk);
+             if (ret) {
+                     /* Before deleting the node, we insert a new one to make
+                      * sure that the look-up-sk process would not miss either
+                      * of them and that at least one node would exist in ehash
+                      * table all the time. Otherwise there's a tiny chance
+                      * that lookup process could find nothing in ehash table.
+                      */
+                     __sk_nulls_add_node_tail_rcu(sk, list);
+                     sk_nulls_del_node_init_rcu(osk);
+             }
+             goto unlock;
+     }
+     if (found_dup_sk) {
              *found_dup_sk = inet_ehash_lookup_by_sk(sk, list);
              if (*found_dup_sk)
                      ret = false;
@@ -660,6 +672,7 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
      if (ret)
              __sk_nulls_add_node_rcu(sk, list);
 
+unlock:
      spin_unlock(lock);
 
      return ret;
net/ipv4/inet_timewait_sock.c +0 -0
index 1d77d992e6e7..6d681ef52bb2 100644
@@ -91,10 +91,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw)
 }
 EXPORT_SYMBOL_GPL(inet_twsk_put);
 
Quoted 6 lines

net/ipv4/inet_timewait_sock.c void inet_twsk_put(struct inet_timewait_sock *tw) · line 95

Quoted 3 lines
net/ipv4/inet_timewait_sock.c +1 -1
-static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
+static void inet_twsk_add_node_tail_rcu(struct inet_timewait_sock *tw,
                                 struct hlist_nulls_head *list)

nit: Please indent here.

Before I submitted the patch, I did the check through ./script/checkpatch.py and it outputted some information (no warning, no error) as you said.
The reason I didn't change that is I would like to leave this part untouch as it used to be. I have no clue about whether I should send a v7 patch to adjust the format if necessary.

Thanks,
Jason

Quoted 18 lines
Quoted 18 lines
net/ipv4/inet_timewait_sock.c +2 -3
 {
-     hlist_nulls_add_head_rcu(&tw->tw_node, list);
+     hlist_nulls_add_tail_rcu(&tw->tw_node, list);
 }
 
 static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -147,7 +147,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
      spin_lock(lock);
 
-     inet_twsk_add_node_rcu(tw, &ehead->chain);
+     inet_twsk_add_node_tail_rcu(tw, &ehead->chain);
 
      /* Step 3: Remove SK from hash chain */
      if (__sk_nulls_del_node_init_rcu(sk))
--

2.37.3

#4 lore raw
From:   Jason Xing <[email protected]>
Date:   Tue, 17 Jan 2023 10:15:45 +0800
Quoted 44 lines · Kuniyuki Iwashima
Quoted 43 lines
From:   Jason Xing <[email protected]>
Date:   Mon, 16 Jan 2023 18:33:41 +0800
Quoted 39 lines

From: Jason Xing <[email protected]>

While one cpu is working on looking up the right socket from ehash table, another cpu is done deleting the request socket and is about to add (or is adding) the big socket from the table. It means that we could miss both of them, even though it has little chance.

Let me draw a call trace map of the server side.
CPU 0 CPU 1
----- -----
tcp_v4_rcv() syn_recv_sock()

                            inet_ehash_insert()
                            -> sk_nulls_del_node_init_rcu(osk)
__inet_lookup_established()
                            -> __sk_nulls_add_node_rcu(sk, list)

Notice that the CPU 0 is receiving the data after the final ack during 3-way shakehands and CPU 1 is still handling the final ack.

Why could this be a real problem?
This case is happening only when the final ack and the first data receiving by different CPUs. Then the server receiving data with ACK flag tries to search one proper established socket from ehash table, but apparently it fails as my map shows above. After that, the server fetches a listener socket and then sends a RST because it finds a ACK flag in the skb (data), which obeys RST definition in RFC 793.

Besides, Eric pointed out there's one more race condition where it handles tw socket hashdance. Only by adding to the tail of the list before deleting the old one can we avoid the race if the reader has already begun the bucket traversal and it would possibly miss the head.

Many thanks to Eric for great help from beginning to end.

Fixes 5e0724d027f0 ("tcp/dccp: fix hashdance race for passive sessions")
Quoted 5 lines
Quoted 1 line

I guess there could be regression if a workload has many long-lived

Sorry, I don't understand. This patch does not add two kinds of sockets into the ehash table all the time, but reverses the order of deleting and adding sockets only.

Not really. It also reverses the order of sockets in ehash. We were able to find newer sockets faster than older ones. If a workload has many long-lived sockets, they would add constant time on newer socket's lookup.

Quoted 81 lines

The final result is the same as the
old time. I'm wondering why it could cause some regressions if there are loads of long-lived connections.

Quoted 5 lines

connections, but the change itself looks good. I left a minor comment below.

Thanks for reviewing :)

Quoted 62 lines
Quoted 62 lines

---
v5:
1) adjust the style once more.

v4:
1) adjust the code style and make it easier to read.

v3:
1) get rid of else-if statement.

v2:
1) adding the sk node into the tail of list to prevent the race.
2) fix the race condition when handling time-wait socket hashdance.

---
 net/ipv4/inet_hashtables.c    | 17 +++++++++++++++--
 net/ipv4/inet_timewait_sock.c |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)
net/ipv4/inet_hashtables.c +15 -2
index 24a38b56fab9..f58d73888638 100644
@@ -650,8 +650,20 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
      spin_lock(lock);
      if (osk) {
              WARN_ON_ONCE(sk->sk_hash != osk->sk_hash);
-             ret = sk_nulls_del_node_init_rcu(osk);
-     } else if (found_dup_sk) {
+             ret = sk_hashed(osk);
+             if (ret) {
+                     /* Before deleting the node, we insert a new one to make
+                      * sure that the look-up-sk process would not miss either
+                      * of them and that at least one node would exist in ehash
+                      * table all the time. Otherwise there's a tiny chance
+                      * that lookup process could find nothing in ehash table.
+                      */
+                     __sk_nulls_add_node_tail_rcu(sk, list);
+                     sk_nulls_del_node_init_rcu(osk);
+             }
+             goto unlock;
+     }
+     if (found_dup_sk) {
              *found_dup_sk = inet_ehash_lookup_by_sk(sk, list);
              if (*found_dup_sk)
                      ret = false;
@@ -660,6 +672,7 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
      if (ret)
              __sk_nulls_add_node_rcu(sk, list);
 
+unlock:
      spin_unlock(lock);
 
      return ret;
net/ipv4/inet_timewait_sock.c +0 -0
index 1d77d992e6e7..6d681ef52bb2 100644
@@ -91,10 +91,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw)
 }
 EXPORT_SYMBOL_GPL(inet_twsk_put);
 
Quoted 6 lines

net/ipv4/inet_timewait_sock.c void inet_twsk_put(struct inet_timewait_sock *tw) · line 95

Quoted 3 lines
net/ipv4/inet_timewait_sock.c +1 -1
-static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
+static void inet_twsk_add_node_tail_rcu(struct inet_timewait_sock *tw,
                                 struct hlist_nulls_head *list)

nit: Please indent here.

Quoted 6 lines

Before I submitted the patch, I did the check through ./script/checkpatch.py and it outputted some information (no warning, no error) as you said.
The reason I didn't change that is I would like to leave this part untouch as it used to be. I have no clue about whether I should send a v7 patch to adjust the format if necessary.

checkpatch.pl does not check everything. You will find most functions under net/ipv4/*.c have same indentation in arguments. I would recommend enforcing such styles on editor like

  $ cat ~/.emacs.d/init.el
  (setq-default c-default-style "linux")

Thanks,
Kuniyuki

Quoted 22 lines

Thanks,
Jason

Quoted 18 lines
Quoted 18 lines
net/ipv4/inet_timewait_sock.c +2 -3
 {
-     hlist_nulls_add_head_rcu(&tw->tw_node, list);
+     hlist_nulls_add_tail_rcu(&tw->tw_node, list);
 }
 
 static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -147,7 +147,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
      spin_lock(lock);
 
-     inet_twsk_add_node_rcu(tw, &ehead->chain);
+     inet_twsk_add_node_tail_rcu(tw, &ehead->chain);
 
      /* Step 3: Remove SK from hash chain */
      if (__sk_nulls_del_node_init_rcu(sk))
--

2.37.3

author
#5 lore raw
Quoted 147 lines · Kuniyuki Iwashima
From:   Jason Xing <[email protected]>
Date:   Tue, 17 Jan 2023 10:15:45 +0800
Quoted 44 lines · Kuniyuki Iwashima
Quoted 43 lines
From:   Jason Xing <[email protected]>
Date:   Mon, 16 Jan 2023 18:33:41 +0800
Quoted 39 lines

From: Jason Xing <[email protected]>

While one cpu is working on looking up the right socket from ehash table, another cpu is done deleting the request socket and is about to add (or is adding) the big socket from the table. It means that we could miss both of them, even though it has little chance.

Let me draw a call trace map of the server side.
CPU 0 CPU 1
----- -----
tcp_v4_rcv() syn_recv_sock()

                            inet_ehash_insert()
                            -> sk_nulls_del_node_init_rcu(osk)
__inet_lookup_established()
                            -> __sk_nulls_add_node_rcu(sk, list)

Notice that the CPU 0 is receiving the data after the final ack during 3-way shakehands and CPU 1 is still handling the final ack.

Why could this be a real problem?
This case is happening only when the final ack and the first data receiving by different CPUs. Then the server receiving data with ACK flag tries to search one proper established socket from ehash table, but apparently it fails as my map shows above. After that, the server fetches a listener socket and then sends a RST because it finds a ACK flag in the skb (data), which obeys RST definition in RFC 793.

Besides, Eric pointed out there's one more race condition where it handles tw socket hashdance. Only by adding to the tail of the list before deleting the old one can we avoid the race if the reader has already begun the bucket traversal and it would possibly miss the head.

Many thanks to Eric for great help from beginning to end.

Fixes 5e0724d027f0 ("tcp/dccp: fix hashdance race for passive sessions")
Quoted 5 lines
Quoted 1 line

I guess there could be regression if a workload has many long-lived

Sorry, I don't understand. This patch does not add two kinds of sockets into the ehash table all the time, but reverses the order of deleting and adding sockets only.

Not really. It also reverses the order of sockets in ehash. We were able to find newer sockets faster than older ones. If a workload has many long-lived sockets, they would add constant time on newer socket's lookup.

Quoted 81 lines

The final result is the same as the
old time. I'm wondering why it could cause some regressions if there are loads of long-lived connections.

Quoted 5 lines

connections, but the change itself looks good. I left a minor comment below.

Thanks for reviewing :)

Quoted 62 lines
Quoted 62 lines

---
v5:
1) adjust the style once more.

v4:
1) adjust the code style and make it easier to read.

v3:
1) get rid of else-if statement.

v2:
1) adding the sk node into the tail of list to prevent the race.
2) fix the race condition when handling time-wait socket hashdance.

---
 net/ipv4/inet_hashtables.c    | 17 +++++++++++++++--
 net/ipv4/inet_timewait_sock.c |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)
net/ipv4/inet_hashtables.c +15 -2
index 24a38b56fab9..f58d73888638 100644
@@ -650,8 +650,20 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
      spin_lock(lock);
      if (osk) {
              WARN_ON_ONCE(sk->sk_hash != osk->sk_hash);
-             ret = sk_nulls_del_node_init_rcu(osk);
-     } else if (found_dup_sk) {
+             ret = sk_hashed(osk);
+             if (ret) {
+                     /* Before deleting the node, we insert a new one to make
+                      * sure that the look-up-sk process would not miss either
+                      * of them and that at least one node would exist in ehash
+                      * table all the time. Otherwise there's a tiny chance
+                      * that lookup process could find nothing in ehash table.
+                      */
+                     __sk_nulls_add_node_tail_rcu(sk, list);
+                     sk_nulls_del_node_init_rcu(osk);
+             }
+             goto unlock;
+     }
+     if (found_dup_sk) {
              *found_dup_sk = inet_ehash_lookup_by_sk(sk, list);
              if (*found_dup_sk)
                      ret = false;
@@ -660,6 +672,7 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
      if (ret)
              __sk_nulls_add_node_rcu(sk, list);
 
+unlock:
      spin_unlock(lock);
 
      return ret;
net/ipv4/inet_timewait_sock.c +0 -0
index 1d77d992e6e7..6d681ef52bb2 100644
@@ -91,10 +91,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw)
 }
 EXPORT_SYMBOL_GPL(inet_twsk_put);
 
Quoted 6 lines

net/ipv4/inet_timewait_sock.c void inet_twsk_put(struct inet_timewait_sock *tw) · line 95

Quoted 3 lines
net/ipv4/inet_timewait_sock.c +1 -1
-static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
+static void inet_twsk_add_node_tail_rcu(struct inet_timewait_sock *tw,
                                 struct hlist_nulls_head *list)

nit: Please indent here.

Quoted 6 lines

Before I submitted the patch, I did the check through ./script/checkpatch.py and it outputted some information (no warning, no error) as you said.
The reason I didn't change that is I would like to leave this part untouch as it used to be. I have no clue about whether I should send a v7 patch to adjust the format if necessary.

Quoted 4 lines

checkpatch.pl does not check everything. You will find most functions under net/ipv4/*.c have same indentation in arguments. I would recommend enforcing such styles on editor like

Well, there are two other lines which have the same indent problem. I'm going to clean them both up as below.
1) inet_twsk_add_bind_node()
2) inet_twsk_add_bind2_node()

Thanks,
Jason

Quoted 28 lines
  $ cat ~/.emacs.d/init.el
  (setq-default c-default-style "linux")

Thanks,
Kuniyuki

Quoted 22 lines

Thanks,
Jason

Quoted 18 lines
Quoted 18 lines
net/ipv4/inet_timewait_sock.c +2 -3
 {
-     hlist_nulls_add_head_rcu(&tw->tw_node, list);
+     hlist_nulls_add_tail_rcu(&tw->tw_node, list);
 }
 
 static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -147,7 +147,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
      spin_lock(lock);
 
-     inet_twsk_add_node_rcu(tw, &ehead->chain);
+     inet_twsk_add_node_tail_rcu(tw, &ehead->chain);
 
      /* Step 3: Remove SK from hash chain */
      if (__sk_nulls_del_node_init_rcu(sk))
--

2.37.3