write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/net/core/stream.c
..
..
@@ -73,8 +73,8 @@
73
73
 		add_wait_queue(sk_sleep(sk), &wait);
74
74
 		sk->sk_write_pending++;
75
75
 		done = sk_wait_event(sk, timeo_p,
76
-				     !sk->sk_err &&
77
-				     !((1 << sk->sk_state) &
76
+				     !READ_ONCE(sk->sk_err) &&
77
+				     !((1 << READ_ONCE(sk->sk_state)) &
78
78
 				       ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)), &wait);
79
79
 		remove_wait_queue(sk_sleep(sk), &wait);
80
80
 		sk->sk_write_pending--;
..
..
@@ -87,9 +87,9 @@
87
87
  * sk_stream_closing - Return 1 if we still have things to send in our buffers.
88
88
  * @sk: socket to verify
89
89
  */
90
-static inline int sk_stream_closing(struct sock *sk)
90
+static int sk_stream_closing(const struct sock *sk)
91
91
 {
92
-	return (1 << sk->sk_state) &
92
+	return (1 << READ_ONCE(sk->sk_state)) &
93
93
 	       (TCPF_FIN_WAIT1 | TCPF_CLOSING | TCPF_LAST_ACK);
94
94
 }
95
95
 
..
..
@@ -142,8 +142,8 @@
142
142
 
143
143
 		set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
144
144
 		sk->sk_write_pending++;
145
-		sk_wait_event(sk, &current_timeo, sk->sk_err ||
146
-						  (sk->sk_shutdown & SEND_SHUTDOWN) ||
145
+		sk_wait_event(sk, &current_timeo, READ_ONCE(sk->sk_err) ||
146
+						  (READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) ||
147
147
 						  (sk_stream_memory_free(sk) &&
148
148
 						  !vm_wait), &wait);
149
149
 		sk->sk_write_pending--;
..
..
@@ -196,6 +196,12 @@
196
196
 	/* First the read buffer. */
197
197
 	__skb_queue_purge(&sk->sk_receive_queue);
198
198
 
199
+	/* Next, the error queue.
200
+	 * We need to use queue lock, because other threads might
201
+	 * add packets to the queue without socket lock being held.
202
+	 */
203
+	skb_queue_purge(&sk->sk_error_queue);
204
+
199
205
 	/* Next, the write queue. */
200
206
 	WARN_ON(!skb_queue_empty(&sk->sk_write_queue));
201
207
 
..
..
@@ -203,7 +209,6 @@
203
209
 	sk_mem_reclaim(sk);
204
210
 
205
211
 	WARN_ON(sk->sk_wmem_queued);
206
-	WARN_ON(sk->sk_forward_alloc);
207
212
 
208
213
 	/* It is _impossible_ for the backlog to contain anything
209
214
 	 * when we get here.  All user references to this socket