write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/net/ipv4/tcp_output.c
..
..
@@ -177,8 +177,7 @@
177
177
 }
178
178
 
179
179
 /* Account for an ACK we sent. */
180
-static inline void tcp_event_ack_sent(struct sock *sk, unsigned int pkts,
181
-				      u32 rcv_nxt)
180
+static inline void tcp_event_ack_sent(struct sock *sk, u32 rcv_nxt)
182
181
 {
183
182
 	struct tcp_sock *tp = tcp_sk(sk);
184
183
 
..
..
@@ -192,7 +191,7 @@
192
191
 
193
192
 	if (unlikely(rcv_nxt != tp->rcv_nxt))
194
193
 		return;  /* Special ACK sent by DCTCP to reflect ECN */
195
-	tcp_dec_quickack_mode(sk, pkts);
194
+	tcp_dec_quickack_mode(sk);
196
195
 	inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
197
196
 }
198
197
 
..
..
@@ -874,7 +873,7 @@
874
873
 	if (likely(ireq->tstamp_ok)) {
875
874
 		opts->options |= OPTION_TS;
876
875
 		opts->tsval = tcp_skb_timestamp(skb) + tcp_rsk(req)->ts_off;
877
-		opts->tsecr = req->ts_recent;
876
+		opts->tsecr = READ_ONCE(req->ts_recent);
878
877
 		remaining -= TCPOLEN_TSTAMP_ALIGNED;
879
878
 	}
880
879
 	if (likely(ireq->sack_ok)) {
..
..
@@ -1374,7 +1373,7 @@
1374
1373
 			   sk, skb);
1375
1374
 
1376
1375
 	if (likely(tcb->tcp_flags & TCPHDR_ACK))
1377
-		tcp_event_ack_sent(sk, tcp_skb_pcount(skb), rcv_nxt);
1376
+		tcp_event_ack_sent(sk, rcv_nxt);
1378
1377
 
1379
1378
 	if (skb->len != tcp_header_size) {
1380
1379
 		tcp_event_data_sent(tp, sk);
..
..
@@ -3609,7 +3608,7 @@
3609
3608
 	th->window = htons(min(req->rsk_rcv_wnd, 65535U));
3610
3609
 	tcp_options_write((__be32 *)(th + 1), NULL, &opts);
3611
3610
 	th->doff = (tcp_header_size >> 2);
3612
-	__TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);
3611
+	TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);
3613
3612
 
3614
3613
 #ifdef CONFIG_TCP_MD5SIG
3615
3614
 	/* Okay, we have all we need - do the md5 hash if needed */