From patchwork Fri Feb 28 13:22:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13996415 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66EC226BDBA for ; Fri, 28 Feb 2025 13:22:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748976; cv=none; b=P4mHhJ2aD82ite6ktfcC5BQjHb0N5YgfVEQBH/AgDahuABXn+eSrNKuP6L7g+kW0yuBgWbZ9/cLDAG76CQl3z6h0PvsWz3WxGvLVtMoirWh9s1rwfCGwZoWvyhlaigg6zIwmWtkMR9XASSbwZWQr1qKfDW15Nbvf6XL6qgEVOnE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748976; c=relaxed/simple; bh=aB13b280MIcVuRc0VxldBo9bZY8SatpOVnXV+GjnvM0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GmZ3NfeKXadTAPgDacTw9kb58qKvQr2NmMMEuGVbNaRFcuj35bq7pF+7tO5htV+rImwO8gK/e49mAj/ymJMHDXdoqB3VhgRvkL8lcoK6swrPf5RzECZbaOKgVjVjHBihgHHeHLLS0WTeEqsXuLV12OYey/g0CgiSyi2FQWvFSxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=pmxXAJE4; arc=none smtp.client-ip=209.85.160.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pmxXAJE4" Received: by mail-qt1-f201.google.com with SMTP id d75a77b69052e-4720468e863so57181221cf.2 for ; Fri, 28 Feb 2025 05:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740748972; x=1741353772; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=J+sHfABVNcOpkFnI0atmQ4P/qaUHSlV5OBnOnZJOtrk=; b=pmxXAJE4WzPQmATN2nl+lNMC/WMDF3Aki4sdCg+iYlKTR72CUn9GnGaQ5ZsydIZ4gv BmAsq1/zlww5YScXrCKfHQ2CmpkfswemJhikh+UGx0UJovv0eI12em3szG4o3XUmUeRT a3s88GbWBK8FwTzimZmZTYYGRlTdBCgk+1w1yB3Epu27AHK6rssDhIiEjSbmOsCA2UTr hocaSJ+wwV4B1PfTkNjrKdDYCOdVJWsc84lf6pqCx3J66kUcbpIcaME2lxcDDDKu7Mwn qYBkVYUNYCTR+xS/fNK/LY5anG4UzwS8dyaocojlAdIonkpgoLsSiWl8FHVEe6ELqFZb i8Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748972; x=1741353772; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J+sHfABVNcOpkFnI0atmQ4P/qaUHSlV5OBnOnZJOtrk=; b=uT8d6dL9xC736dBCacOWrdR/+FnL24bFunozGwMIgkTzzj7gr9/5jy9HBOvYOhC+vM L/4gvQtOUcRV45h4hD8x8KqJ1GTIRrViu9/w3vlcctALzxiec3iNvzbs2wU26DP6Wggm KRb9aam6+7BM2rqGNs89D7UYLJGQ9Ub9RAEhrc620XBC6RSvfMW+nqnc3gluDITlAqM+ 6XjYYTiRTfO6Hm5dRC6093dbxVkMlIXhr8Fv9gEN9qnU0rn//31iKATjjdjgganTGqjz FkYxs4g468UeTvLtQ29DMDBy3SBJXCYXroxFhKknhq1Y/myk9w/3EfGsWs5qESqZ+2Xb DPvg== X-Forwarded-Encrypted: i=1; AJvYcCWRtKlI3Rwjo6pJdMn+XUgNOZN2UkFoSgWDl+AbLDgg2wWw5r8iE3Bmnlo6q67L+UNutpgEQzU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6psM/ZBtSoBkS2YBJn9OrUJfOPssQ95YmZUDAkd7jDe+JTdA1 l5zMhF25A6yrzRgibONpHdE9R3uvjN7DvKfUFj/mBH0mBLE9+zVfx28e/pGyycoI47tMRcyFYek vxg95KJX+6w== X-Google-Smtp-Source: AGHT+IGNhwpDZYXFW186mtVW1hIPqcfXtXXr9aykIaxQ74X6iZdloZfpfOmXWo/Ug/+sR5/G03ei1SDfBBmbYQ== X-Received: from qtei7.prod.google.com ([2002:a05:622a:8c7:b0:471:7d6a:d806]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:ac8:7fc3:0:b0:472:1289:f88c with SMTP id d75a77b69052e-474bc08ee32mr50845021cf.28.1740748972245; Fri, 28 Feb 2025 05:22:52 -0800 (PST) Date: Fri, 28 Feb 2025 13:22:43 +0000 In-Reply-To: <20250228132248.25899-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228132248.25899-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228132248.25899-2-edumazet@google.com> Subject: [PATCH net-next 1/6] tcp: add a drop_reason pointer to tcp_check_req() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Neal Cardwell Cc: Kuniyuki Iwashima , Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org We want to add new drop reasons for packets dropped in 3WHS in the following patches. tcp_rcv_state_process() has to set reason to TCP_FASTOPEN, because tcp_check_req() will conditionally overwrite the drop_reason. Signed-off-by: Eric Dumazet --- include/net/tcp.h | 2 +- net/ipv4/tcp_input.c | 5 ++--- net/ipv4/tcp_ipv4.c | 3 ++- net/ipv4/tcp_minisocks.c | 3 ++- net/ipv6/tcp_ipv6.c | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index f9b9377a289740b907594a0993fc5d70ed36aaac..a9bc959fb102fc6697b4a664b3773b47b3309f13 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -392,7 +392,7 @@ enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *tw, u32 *tw_isn); struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, struct request_sock *req, bool fastopen, - bool *lost_race); + bool *lost_race, enum skb_drop_reason *drop_reason); enum skb_drop_reason tcp_child_process(struct sock *parent, struct sock *child, struct sk_buff *skb); void tcp_enter_loss(struct sock *sk); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d22ad553b45b17218d5362ea58a4f82559afb851..4e221234808898131a462bc93ee4c9c0ae04309e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -6812,10 +6812,9 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) WARN_ON_ONCE(sk->sk_state != TCP_SYN_RECV && sk->sk_state != TCP_FIN_WAIT1); - if (!tcp_check_req(sk, skb, req, true, &req_stolen)) { - SKB_DR_SET(reason, TCP_FASTOPEN); + SKB_DR_SET(reason, TCP_FASTOPEN); + if (!tcp_check_req(sk, skb, req, true, &req_stolen, &reason)) goto discard; - } } if (!th->ack && !th->rst && !th->syn) { diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 7900855237d929d8260e65fe95e367345bb3ecd2..218f01a8cc5f6c410043f07293e9e51840c1f1cb 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2265,7 +2265,8 @@ int tcp_v4_rcv(struct sk_buff *skb) th = (const struct tcphdr *)skb->data; iph = ip_hdr(skb); tcp_v4_fill_cb(skb, iph, th); - nsk = tcp_check_req(sk, skb, req, false, &req_stolen); + nsk = tcp_check_req(sk, skb, req, false, &req_stolen, + &drop_reason); } else { drop_reason = SKB_DROP_REASON_SOCKET_FILTER; } diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 29b54ade757231dc264fd8a2c357eff1b2ccbb6b..46c86c4f80e9f450834c72f28e3d16b0cffbbd1d 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -657,7 +657,8 @@ EXPORT_SYMBOL(tcp_create_openreq_child); struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, struct request_sock *req, - bool fastopen, bool *req_stolen) + bool fastopen, bool *req_stolen, + enum skb_drop_reason *drop_reason) { struct tcp_options_received tmp_opt; struct sock *child; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index a806082602985fd351c5184f52dc3011c71540a9..d01088ab80d24eb0f829166faae791221d95bf9e 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1828,7 +1828,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) th = (const struct tcphdr *)skb->data; hdr = ipv6_hdr(skb); tcp_v6_fill_cb(skb, hdr, th); - nsk = tcp_check_req(sk, skb, req, false, &req_stolen); + nsk = tcp_check_req(sk, skb, req, false, &req_stolen, + &drop_reason); } else { drop_reason = SKB_DROP_REASON_SOCKET_FILTER; } From patchwork Fri Feb 28 13:22:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13996416 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB43B2580D7 for ; Fri, 28 Feb 2025 13:22:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748976; cv=none; b=IRanstECHKKXLIy927YY0gtB+T1Rlf6PJeOI08enRiwxudif1IcfqygJkc4yeHXCqdqN8vERz7h5CuvMFt+rJSaMBQhX96w73e1hrIosGC25qOOeMV12iHn+jf1qXmyT6pr5JEEJidPzhY4FxTOzXtslh2dX2FNMzyDvdNotp5U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748976; c=relaxed/simple; bh=ixzTek62XgE2gpVkuTJc+AloXLa/ol4WoFaREpLK5qE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Jw9IWw757mNsHZBX6I3qVYSxYyJZ6SSIynY/Tvjyydq+zERdLWGib8m4miYNniMbCH2qTrjLfH4tHNIPIeEg0s30QqTKHtPZrhUv6j844QHnM1Gkxyqt+fmsKFHJG6Pp7gQz/5mWhRYyoSWwkP/yIDIuWPFPALENIiQ+WhSUtrE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3xrpw/F7; arc=none smtp.client-ip=209.85.160.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3xrpw/F7" Received: by mail-qt1-f201.google.com with SMTP id d75a77b69052e-47217c14be9so70867771cf.1 for ; Fri, 28 Feb 2025 05:22:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740748974; x=1741353774; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=pNe/TItsMxBxnsI97c/FspSojTXGXLiTZRjtKnaJRMc=; b=3xrpw/F7CpXZFokEmOIwrYgFt0MGD7GcHjWJ/oIYBAtht2J6KziVdGOUmgBZ+PdCIh U9REiB6zWb1xmHk7Agpl+p4AwSwIQkhBdGuh2g+9Xihkjv/V9z9EN3pp0Cmapf5i6Zcn 9J5wwZNJPmQYlLn3OIMuTwd/J2Xz28no1hNyLmhyvoHigbgmTWHVImbxv+kb4zgAu0ny UKRt1mRObiqDD2Gw6RRlQt3Kwecv542N0mpxxGIvtVwq5KlO60cpz5TRIkoTvNL1fvWM CnBd8WUrhYETxoJSQVrMXGl1mPX9onwQrko8lMAJxfu0eewa5wInaRDREZk8F/RDDuAt jEWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748974; x=1741353774; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pNe/TItsMxBxnsI97c/FspSojTXGXLiTZRjtKnaJRMc=; b=FC84hc3VzYOhkI132sjo3WxuH0n7CeNC5udqE0T42jQYT7SfntwgPIgQ9aLpiizZKx qNNPsgsJcRGdM7kHX6K5TvV0Ry9y+1XhEqIB2a2RlzFcqdHmJ8o0gQgRhH3HpBSiPptk osDAT9n1R6w1n5YW2sqK5nRbHaROR0uYFeNCjvq/NfD2hhXZs0vzCIhLR2ZLZ1yNvNW+ skpl/CrbOi+HYmKLS8Bj0W6Y7Q8sWyiGPLHS7rvxeWJj3CpInNfHKsV//FgsoVnwSydI Z5mZKJfABjVa/FkWM4uEXvIetKE6Oy1/dGm+srrXi7HPZVKLzvJN2ufPrF8wJN7HX11p wlvw== X-Forwarded-Encrypted: i=1; AJvYcCXxBOlfh00cE38daGxeR09osQfdTYab56vh3xRF2ciaMVD03Ev6/j5H3Op3k4uLgBJ4Ul0yA/Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxKi07cbzfS2Wo6sDKe7W7qkaLwkt4y8j/bZV58REk3lJbN5oo7 aTfYakZn5ImU7big8+pcgE+r1ImstGgjAp0n/8eMGSD0Z7Vi7f6c1CwJta3mBCw+lnHlkN6Q6CJ zR01/rnjKKw== X-Google-Smtp-Source: AGHT+IHJY+Eekn5wtEKkbfekufxn5+yrisrXo0mMwSddL/+mn086YiHT6uH5DRKBc4KbBsa9j4nspUhTku1OuQ== X-Received: from qtbfv8.prod.google.com ([2002:a05:622a:4a08:b0:46f:d531:ee9d]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:ac8:764a:0:b0:474:bd24:dcf5 with SMTP id d75a77b69052e-474bd24de0fmr31816871cf.18.1740748973929; Fri, 28 Feb 2025 05:22:53 -0800 (PST) Date: Fri, 28 Feb 2025 13:22:44 +0000 In-Reply-To: <20250228132248.25899-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228132248.25899-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228132248.25899-3-edumazet@google.com> Subject: [PATCH net-next 2/6] tcp: add four drop reasons to tcp_check_req() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Neal Cardwell Cc: Kuniyuki Iwashima , Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org Use two existing drop reasons in tcp_check_req(): - TCP_RFC7323_PAWS - TCP_OVERWINDOW Add two new ones: - TCP_RFC7323_TSECR (corresponds to LINUX_MIB_TSECRREJECTED) - TCP_LISTEN_OVERFLOW (when a listener accept queue is full) Signed-off-by: Eric Dumazet --- include/net/dropreason-core.h | 9 +++++++++ net/ipv4/tcp_minisocks.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/net/dropreason-core.h b/include/net/dropreason-core.h index 32a34dfe8cc58fb1afda8922a52249080f1183b5..da806c2c620f774155fb1d6d2d5fbfcf483c4c0e 100644 --- a/include/net/dropreason-core.h +++ b/include/net/dropreason-core.h @@ -40,6 +40,8 @@ FN(TCP_OFOMERGE) \ FN(TCP_RFC7323_PAWS) \ FN(TCP_RFC7323_PAWS_ACK) \ + FN(TCP_RFC7323_TSECR) \ + FN(TCP_LISTEN_OVERFLOW) \ FN(TCP_OLD_SEQUENCE) \ FN(TCP_INVALID_SEQUENCE) \ FN(TCP_INVALID_ACK_SEQUENCE) \ @@ -281,6 +283,13 @@ enum skb_drop_reason { * Corresponds to LINUX_MIB_PAWS_OLD_ACK. */ SKB_DROP_REASON_TCP_RFC7323_PAWS_ACK, + /** + * @SKB_DROP_REASON_TCP_RFC7323_TSECR: PAWS check, invalid TSEcr. + * Corresponds to LINUX_MIB_TSECRREJECTED. + */ + SKB_DROP_REASON_TCP_RFC7323_TSECR, + /** @SKB_DROP_TCP_REASON_LISTEN_OVERFLOW: listener queue full. */ + SKB_DROP_REASON_TCP_LISTEN_OVERFLOW, /** @SKB_DROP_REASON_TCP_OLD_SEQUENCE: Old SEQ field (duplicate packet) */ SKB_DROP_REASON_TCP_OLD_SEQUENCE, /** @SKB_DROP_REASON_TCP_INVALID_SEQUENCE: Not acceptable SEQ field */ diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 46c86c4f80e9f450834c72f28e3d16b0cffbbd1d..ba4a5d7f251d8ed093b38155d9b1a9f50bfcfe32 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -809,10 +809,15 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, LINUX_MIB_TCPACKSKIPPEDSYNRECV, &tcp_rsk(req)->last_oow_ack_time)) req->rsk_ops->send_ack(sk, skb, req); - if (paws_reject) + if (paws_reject) { + SKB_DR_SET(*drop_reason, TCP_RFC7323_PAWS); NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED); - else if (tsecr_reject) + } else if (tsecr_reject) { + SKB_DR_SET(*drop_reason, TCP_RFC7323_TSECR); NET_INC_STATS(sock_net(sk), LINUX_MIB_TSECRREJECTED); + } else { + SKB_DR_SET(*drop_reason, TCP_OVERWINDOW); + } return NULL; } @@ -882,6 +887,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, return inet_csk_complete_hashdance(sk, child, req, own_req); listen_overflow: + SKB_DR_SET(*drop_reason, TCP_LISTEN_OVERFLOW); if (sk != req->rsk_listener) __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMIGRATEREQFAILURE); From patchwork Fri Feb 28 13:22:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13996417 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42F9E26D5B0 for ; Fri, 28 Feb 2025 13:22:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748978; cv=none; b=bc+CURtpwn1WF247jmeazhXW2HTLCiDQYpLXh2kh66e7z6NBhzsm4P9nbDMo/haxGwio4TSwLVB/OX9QpWOqZMRjb3DB11zX9LjTnePk5kM74JSEfBBS98FLkB/IIUARStlPcTyQRgWZqQcv6VPExBQNT934DMBugGzWcMTt+CU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748978; c=relaxed/simple; bh=jJEg6DPCUrCdloRmhIEpIIn3TlheT8iOCqKCFwjnDNY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Qb/70ovtiIvtMb8x9nI6Jjv66asIQu7yMPv3MhYlbm0BHIQZ2ZFj4shl5fb8/m1+kzN/F4/7wr3426zXVrN1JYnIA3GBS4jnqkYXQvvvnxSnJNSL/G0t6I2Ehztka0qzn7t27SVAAqKH2I8nIqspUmRTwCbgatp0C0MUd8K7RAI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=y+rSzFiR; arc=none smtp.client-ip=209.85.160.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="y+rSzFiR" Received: by mail-qt1-f202.google.com with SMTP id d75a77b69052e-472180fec04so23367951cf.1 for ; Fri, 28 Feb 2025 05:22:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740748975; x=1741353775; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=m3Gyz5Irr4onbWnuRNrk3cSUnmfOdTGAT+oq3uDi84M=; b=y+rSzFiRbu6pNWHzUR5Ic0FMzjkMWOW9DXDP6FT8xZ8L4OzL1aeiILYpiHurPpjbwd hYmZKDlkYp7EEqaK5bpqMRE6vMJBp8ovwYbTZzlrXYAsGU4p9/xrSuXJbAcXwCeGBExS q6aAxEVq3Gj3h6Qno+5Bj/ZTXhv5l8oy/akK7dp+69UZ/+5xsCCEWRD9NmkPeRUjUNXo cQIxyZdiRZ0AZ2x8oDSrZNCBkIviYuXtkEGU+UUlfEgT3/qh3DVsnYe4+aRYpVmuMgit 4PmlnCzb0tKcPnjc5SPvrHooWxwsKb/+blBUS7KUqRAHO8CatTJhCxmsE+zdI56EeFOv VTSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748975; x=1741353775; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=m3Gyz5Irr4onbWnuRNrk3cSUnmfOdTGAT+oq3uDi84M=; b=AaWfR2GXiStmsZJk7rwtmpsXwMyvqNNkzjSPH8QIo3x01GgOjwxXfiUITfDvtjqu47 tpJn1tHl/szy4ih1XivM6xWynrtj6MwO7fzHE1ep7dJb6HlgMz1pxiVbaYooxWCM2V3r iSexksiP5mB8k8a2/Pcr5SM7O0qBbWeQ61rNhXwYnIeaLBJBSEAdS5mexUdBKj4kn9/t IBLcpOYsJYX3KPKUJlt076eGSQbenfM9Ukcvcw63OdpRNM8L4uyQ9QXR5QqjSrnxXSFs 8/J8f1YJmRk1MPne/dDrWP4/hXhiWMZQa41Sd9/HVi4mo+OUIknLh32Fyv6A5UcVpQii 33Fg== X-Forwarded-Encrypted: i=1; AJvYcCVzbLgLRMj3UqeSGacDbvVaXtH8NhTmm6zPTyoopTZb4oWfSEJOF7Vig4KrnTG0HhEyG2Zgix8=@vger.kernel.org X-Gm-Message-State: AOJu0YyDoaN9gMloYOLVKCdU/2tB5GkJj9ePWa7hq7wsb94C9srZ2Emv xZpP9B5LgCVvyyZWdaGwvo+j5HjyWBUF2FOf0/uxGZVGlT/ADwbOQ6z9zNBvj/MX7rj0j80w30u N/aKocDz97Q== X-Google-Smtp-Source: AGHT+IEm6dl/0rxo+U+fczNZ0jzzUGXKpkHgixrstJuVNg94QiF8C8OQOgSY3Xrjawd/1cGgSdvBdOuUJrmyLg== X-Received: from qtbhg22.prod.google.com ([2002:a05:622a:6116:b0:471:f7c8:bc02]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:622a:241:b0:471:edf0:8366 with SMTP id d75a77b69052e-474bc0f42ebmr42127661cf.42.1740748975185; Fri, 28 Feb 2025 05:22:55 -0800 (PST) Date: Fri, 28 Feb 2025 13:22:45 +0000 In-Reply-To: <20250228132248.25899-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228132248.25899-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228132248.25899-4-edumazet@google.com> Subject: [PATCH net-next 3/6] tcp: convert to dev_net_rcu() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Neal Cardwell Cc: Kuniyuki Iwashima , Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org TCP uses of dev_net() are under RCU protection, change them to dev_net_rcu() to get LOCKDEP support. Signed-off-by: Eric Dumazet Reviewed-by: Kuniyuki Iwashima --- include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- net/ipv4/tcp_ipv4.c | 12 ++++++------ net/ipv4/tcp_metrics.c | 6 +++--- net/ipv6/tcp_ipv6.c | 22 +++++++++++----------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index 74dd90ff5f129fe4c8adad67a642ae5070410518..c32878c69179dac5a7fcfa098a297420d9adfab2 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h @@ -150,7 +150,7 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo, int iif, int sdif, bool *refcounted) { - struct net *net = dev_net(skb_dst(skb)->dev); + struct net *net = dev_net_rcu(skb_dst(skb)->dev); const struct ipv6hdr *ip6h = ipv6_hdr(skb); struct sock *sk; diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 5eea47f135a421ce8275d4cd83c5771b3f448e5c..da818fb0205fed6b4120946bc032e67e046b716f 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h @@ -492,7 +492,7 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo, const int sdif, bool *refcounted) { - struct net *net = dev_net(skb_dst(skb)->dev); + struct net *net = dev_net_rcu(skb_dst(skb)->dev); const struct iphdr *iph = ip_hdr(skb); struct sock *sk; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 218f01a8cc5f6c410043f07293e9e51840c1f1cb..ae07613e4f335063723f49d7fd70a240412922ef 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -494,14 +494,14 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) { const struct iphdr *iph = (const struct iphdr *)skb->data; struct tcphdr *th = (struct tcphdr *)(skb->data + (iph->ihl << 2)); - struct tcp_sock *tp; + struct net *net = dev_net_rcu(skb->dev); const int type = icmp_hdr(skb)->type; const int code = icmp_hdr(skb)->code; - struct sock *sk; struct request_sock *fastopen; + struct tcp_sock *tp; u32 seq, snd_una; + struct sock *sk; int err; - struct net *net = dev_net(skb->dev); sk = __inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, iph->daddr, th->dest, iph->saddr, @@ -786,7 +786,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb, arg.iov[0].iov_base = (unsigned char *)&rep; arg.iov[0].iov_len = sizeof(rep.th); - net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev); + net = sk ? sock_net(sk) : dev_net_rcu(skb_dst(skb)->dev); /* Invalid TCP option size or twice included auth */ if (tcp_parse_auth_options(tcp_hdr(skb), &md5_hash_location, &aoh)) @@ -1961,7 +1961,7 @@ EXPORT_SYMBOL(tcp_v4_do_rcv); int tcp_v4_early_demux(struct sk_buff *skb) { - struct net *net = dev_net(skb->dev); + struct net *net = dev_net_rcu(skb->dev); const struct iphdr *iph; const struct tcphdr *th; struct sock *sk; @@ -2172,7 +2172,7 @@ static void tcp_v4_fill_cb(struct sk_buff *skb, const struct iphdr *iph, int tcp_v4_rcv(struct sk_buff *skb) { - struct net *net = dev_net(skb->dev); + struct net *net = dev_net_rcu(skb->dev); enum skb_drop_reason drop_reason; int sdif = inet_sdif(skb); int dif = inet_iif(skb); diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 95669935494ef8003a1877e2b86c76bd27307afd..4251670e328c83b55eff7bbda3cc3d97d78563a8 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -170,7 +170,7 @@ static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst, bool reclaim = false; spin_lock_bh(&tcp_metrics_lock); - net = dev_net(dst->dev); + net = dev_net_rcu(dst->dev); /* While waiting for the spin-lock the cache might have been populated * with this entry and so we have to check again. @@ -273,7 +273,7 @@ static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req, return NULL; } - net = dev_net(dst->dev); + net = dev_net_rcu(dst->dev); hash ^= net_hash_mix(net); hash = hash_32(hash, tcp_metrics_hash_log); @@ -318,7 +318,7 @@ static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk, else return NULL; - net = dev_net(dst->dev); + net = dev_net_rcu(dst->dev); hash ^= net_hash_mix(net); hash = hash_32(hash, tcp_metrics_hash_log); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index d01088ab80d24eb0f829166faae791221d95bf9e..fe75ad8e606cbca77d69326dc00273e7b214edee 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -376,7 +376,7 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, { const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data; const struct tcphdr *th = (struct tcphdr *)(skb->data+offset); - struct net *net = dev_net(skb->dev); + struct net *net = dev_net_rcu(skb->dev); struct request_sock *fastopen; struct ipv6_pinfo *np; struct tcp_sock *tp; @@ -866,16 +866,16 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 int oif, int rst, u8 tclass, __be32 label, u32 priority, u32 txhash, struct tcp_key *key) { - const struct tcphdr *th = tcp_hdr(skb); - struct tcphdr *t1; - struct sk_buff *buff; - struct flowi6 fl6; - struct net *net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev); - struct sock *ctl_sk = net->ipv6.tcp_sk; + struct net *net = sk ? sock_net(sk) : dev_net_rcu(skb_dst(skb)->dev); unsigned int tot_len = sizeof(struct tcphdr); + struct sock *ctl_sk = net->ipv6.tcp_sk; + const struct tcphdr *th = tcp_hdr(skb); __be32 mrst = 0, *topt; struct dst_entry *dst; - __u32 mark = 0; + struct sk_buff *buff; + struct tcphdr *t1; + struct flowi6 fl6; + u32 mark = 0; if (tsecr) tot_len += TCPOLEN_TSTAMP_ALIGNED; @@ -1041,7 +1041,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb, if (!sk && !ipv6_unicast_destination(skb)) return; - net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev); + net = sk ? sock_net(sk) : dev_net_rcu(skb_dst(skb)->dev); /* Invalid TCP option size or twice included auth */ if (tcp_parse_auth_options(th, &md5_hash_location, &aoh)) return; @@ -1740,6 +1740,7 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr, INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) { + struct net *net = dev_net_rcu(skb->dev); enum skb_drop_reason drop_reason; int sdif = inet6_sdif(skb); int dif = inet6_iif(skb); @@ -1749,7 +1750,6 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) bool refcounted; int ret; u32 isn; - struct net *net = dev_net(skb->dev); drop_reason = SKB_DROP_REASON_NOT_SPECIFIED; if (skb->pkt_type != PACKET_HOST) @@ -2001,7 +2001,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) void tcp_v6_early_demux(struct sk_buff *skb) { - struct net *net = dev_net(skb->dev); + struct net *net = dev_net_rcu(skb->dev); const struct ipv6hdr *hdr; const struct tcphdr *th; struct sock *sk; From patchwork Fri Feb 28 13:22:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13996418 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE0F526E14E for ; Fri, 28 Feb 2025 13:22:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748979; cv=none; b=HeK8atN8RuAINSaAwsKdjDWqdiGxizt+JjXAATLIVknPBl3oyqEQyALiewBLATesRA1Dnmcu2phpsOfubGBv8PPaPbCT6LmHc5i/X9wXsQ1SQFTmItq/0o2FUcJ7OevCqOWifmweGFWcVAZL561GM2UHY8luLesX0ESVXeMZRtU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748979; c=relaxed/simple; bh=7q3zlLijO/oYQjzipNBwgPkgkkAsvOaHy4vrp8lRFVM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hULSWeUicw5jOBRU91dUhr1rRiwD3NAyZ9goO1N9HbIJnzGQzaTGoI8PebSpwtV/6HWnkA6MxHHPfI1r7fvd0WMNyXM0m6WWFlTJTS8e4v0ZTpyUQ6D1WElVWLks6G2W+PrhrOQPX1lA9CSSMYgUZ+JMeAqoFIwvrNz361D3ylk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HK1YlyC1; arc=none smtp.client-ip=209.85.222.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HK1YlyC1" Received: by mail-qk1-f201.google.com with SMTP id af79cd13be357-7c0b0cf53f3so370118885a.2 for ; Fri, 28 Feb 2025 05:22:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740748977; x=1741353777; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=cxw3yXkSMa6HHBMwRbpsaHbRthPBk1jXAbHh2yiBjUQ=; b=HK1YlyC1ZBA/9wRZ1GTzadMWb161XP3qljQ+d82fkPgVd4roJmMLfP4Yzm+FOm61Wu RSYVLBCPp+Wr63MQAm60NO9Ihmn85w6xvhuu7aM3NiRp1rbLHZhojOTFHQeOg2bZXPE0 tWUEicxVwQCqsq7zkHCs1gt6JIdA5SaUgk7jR66bYi36uyYD537yeFa41wulj6kix9xJ 98+Kz/Y5ksCMRJQDCmzhBxB+BpxD7nRzXIgRueAEZp8jU3mu3vQ/EMjpwhyvcekCVPLQ sZe0c4CgChxLrFgH50abIzhQBVQQIXoZkGTzIXfe2xQrVvQhNCLgeAC9r23ynJFTGICH gH2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748977; x=1741353777; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cxw3yXkSMa6HHBMwRbpsaHbRthPBk1jXAbHh2yiBjUQ=; b=fpf46ZPUhfUO1GhnAXhOUGSIV4O71hYMRdPDPUJYsZD+2Zs2VrULPDZb+2lo4CyF13 O24qvdpK4G+VzEbAHNNXiToux6e9mzeLyk3O4iWVoYGysuOV5/qpRFc9ajV/Z/YHmOYL zjLW9vGWhSAydhJSQB3VoWtvKt++jaEwX3m2mYgPVk3YE1j1ewPA5H6Jwskf2SBT6HYv pL2Y8dF/iZm35zmQK4bb/jBjldhKVnjAkhsmVEr9sBxss3eCzCvEHaB5DJ9qF1+W9iJq Mb7HfKRfPNH5sgk10xmWgD4JCHeMxuXi1KcBYA6MKIjQ3rKkQIQT/UDajr6nD0c2pIN4 Cz0A== X-Forwarded-Encrypted: i=1; AJvYcCWvW1NO/ElXzMgjXo57dTWEjtdi+ck2ckLi0xsGYn4n8zZpz6fOWlgJvhqs8Ao3AA/Wfw9XiYg=@vger.kernel.org X-Gm-Message-State: AOJu0YyO33xFIGyOUjquPzWIy4S9NJb2UA16r2KiFhuwJnDiVvNCBtYF SxDaSI22tLvpV97SyScQ9BHDUFtyh3AYWohkRZG4boZWNZA1Z5wBFSZEUw55RTK/4aMzJgbxBKi 0fbphLjxgDA== X-Google-Smtp-Source: AGHT+IHb4JKHdIXuOqDfhYLjZfbHlHZPUm5aqJxGmaWqHOiTeH06Mo0uLJGFW4PpzqgBPUK0VcqffWwtu6iK1Q== X-Received: from qkbdl5.prod.google.com ([2002:a05:620a:1d05:b0:7c0:b148:994f]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:4492:b0:7c0:9ac5:7f9a with SMTP id af79cd13be357-7c39c4a2453mr459814785a.7.1740748976715; Fri, 28 Feb 2025 05:22:56 -0800 (PST) Date: Fri, 28 Feb 2025 13:22:46 +0000 In-Reply-To: <20250228132248.25899-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228132248.25899-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228132248.25899-5-edumazet@google.com> Subject: [PATCH net-next 4/6] net: gro: convert four dev_net() calls From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Neal Cardwell Cc: Kuniyuki Iwashima , Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org tcp4_check_fraglist_gro(), tcp6_check_fraglist_gro(), udp4_gro_lookup_skb() and udp6_gro_lookup_skb() assume RCU is held so that the net structure does not disappear. Use dev_net_rcu() instead of dev_net() to get LOCKDEP support. Signed-off-by: Eric Dumazet Reviewed-by: Kuniyuki Iwashima --- net/ipv4/tcp_offload.c | 2 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/tcpv6_offload.c | 2 +- net/ipv6/udp_offload.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index 2308665b51c5388814e5b61a262a1636d897c4a9..ecef16c58c07146cbeebade0620a5ec7251ddbc5 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -425,7 +425,7 @@ static void tcp4_check_fraglist_gro(struct list_head *head, struct sk_buff *skb, inet_get_iif_sdif(skb, &iif, &sdif); iph = skb_gro_network_header(skb); - net = dev_net(skb->dev); + net = dev_net_rcu(skb->dev); sk = __inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, iph->saddr, th->source, iph->daddr, ntohs(th->dest), diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index a5be6e4ed326fbdc6a9b3889db4da903f7f25d37..c1a85b300ee87758ee683a834248a600a3e7f18d 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -630,7 +630,7 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, __be16 dport) { const struct iphdr *iph = skb_gro_network_header(skb); - struct net *net = dev_net(skb->dev); + struct net *net = dev_net_rcu(skb->dev); int iif, sdif; inet_get_iif_sdif(skb, &iif, &sdif); diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c index a45bf17cb2a172d4612cb42f51481b97bbf364cd..91b88daa5b555cb1af591db7680b7d829ce7b1b7 100644 --- a/net/ipv6/tcpv6_offload.c +++ b/net/ipv6/tcpv6_offload.c @@ -35,7 +35,7 @@ static void tcp6_check_fraglist_gro(struct list_head *head, struct sk_buff *skb, inet6_get_iif_sdif(skb, &iif, &sdif); hdr = skb_gro_network_header(skb); - net = dev_net(skb->dev); + net = dev_net_rcu(skb->dev); sk = __inet6_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, &hdr->saddr, th->source, &hdr->daddr, ntohs(th->dest), diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index b41152dd424697a9fc3cef13fbb430de49dcb913..404212dfc99abba4d48fc27a574b48ab53731d39 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -117,7 +117,7 @@ static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport, __be16 dport) { const struct ipv6hdr *iph = skb_gro_network_header(skb); - struct net *net = dev_net(skb->dev); + struct net *net = dev_net_rcu(skb->dev); int iif, sdif; inet6_get_iif_sdif(skb, &iif, &sdif); From patchwork Fri Feb 28 13:22:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13996419 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25F6826E15A for ; Fri, 28 Feb 2025 13:22:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748980; cv=none; b=PhWJRwqsJh7U1rxRh7N238wH6PqcPCmxYn7jH6GoI/ZLQFDQJDu3ulO9PzO5cu/R7gU7CK0fC8LLIy1/1GiOIKQ6aVgDFGc6r+gB4iG//Q9yrygar0lovYhl0W+Bl7WJZJIDcD2XM1Y5j9mq3uv7tfWIA/ZqYcFChEPYpxDLBdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748980; c=relaxed/simple; bh=7cS9lozPjGK6CJDB0rbF/JsDu7ljNWKuNdAb8/+05tc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PzdZf4bBypX/A6Dg+agXC085UTiLEqtuU7o2BOQNrfSy4OOUWN88KreJvIjynV4OW9AwOojFJuTW41oDTT71TS3m2q9Dxm082hVnlePXf4xePC6cLaiCyTIGPhVOVD3llXcXuV7+u2JAYGnN4hzVCEh6xvD/Wr7U6buGvG/7ve0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LIpPpT4V; arc=none smtp.client-ip=209.85.160.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LIpPpT4V" Received: by mail-qt1-f201.google.com with SMTP id d75a77b69052e-4720468e863so57182421cf.2 for ; Fri, 28 Feb 2025 05:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740748978; x=1741353778; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=OOQFszIdy08TjK2quwg21U1oq4H1pENWDe9muSGOA0Q=; b=LIpPpT4VE/j40vChgGbkeJIcxvIbXjBaK9X6wD5L2hJnVG2XPOSz35CX5Wmo7kDZlW GMQDtYu9kWba7UtmMst6jmiMCk579OUu34VFwsS300qR6ngVksRtvGa0LMEwcmkC72kN IYPLkmN8JXI6WdbUvSZPoQPKk2/tPti6fWsbf+uOeRR8z5hnN+2McynZdZoAiLHW3xV3 HaraAkRFwPmkAkDl1DucHinP4m7BiwU4QY88rXPLHV9PgxFZOL/xMqvqboO0SyKUAFzH 5TwXJFEO7Z9xmi/otNsAtCqnigwZm1/M4+Yxlmikfua3rA64l46gshi2mXXTZcO4ki/E bAFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748978; x=1741353778; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OOQFszIdy08TjK2quwg21U1oq4H1pENWDe9muSGOA0Q=; b=jVhm4LDhmREv+1u49j4Gp/dWISFKCi28doRKQgAX6HXMmwsU357utjLv7m8YG89HKp jMQOiAUpv6+Wz+LmFNzRm8pY41zOmese45BCHtxHhVbkPKSKZm4tOUhU7IzwPpJBNXlo vPayRAKNC0JLhegZJrAE588U48F0rfkQ54dll/JeI5/pJuCkXnafpf2qAbZu3bRIfB+o Kv4xBFShaNmcRlVhipZY1/E/qJZWb4BykhBrn+OSZAcjjHTK063W8cR7tdaUgYlsAagu ZesqzmNrt7kdCJEpZrY5SMBSoEl57B/Hc6oylIJnWo+sIrD3qxAKcXMAnfR2OY6m3VGY AKHA== X-Forwarded-Encrypted: i=1; AJvYcCXVZ9iuKhzbdIgQxaSG3es934GOnUDm5+4SF5ixIDSnEm7JScBwSOICzCpCiTlr9g8xw8DjHBk=@vger.kernel.org X-Gm-Message-State: AOJu0YxmG4N6wj+Zw0haX2kN1AQ/xUe+mn7DBr7rWSJ1Y4HiPXRrLjsq ltXKFetQ9vD/KDfmJu9IdhwI1PcD45Tq95mDejeV9+yK8bhwt/eDombAZTn00EY5Zp2SOsE8ho3 iqcnHFEptAQ== X-Google-Smtp-Source: AGHT+IGeU3/C54Ivok3ZVkCLjuYXF1hcfsKxRR6gvyEvDs1jN7PO3Zy42pixlFRDcjWq/CnppDm+8tt0fYwgHA== X-Received: from qtbbl3.prod.google.com ([2002:a05:622a:2443:b0:471:ffa7:6963]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:ac8:7f04:0:b0:473:8c05:2b5b with SMTP id d75a77b69052e-474bc0f2da1mr44242381cf.47.1740748978093; Fri, 28 Feb 2025 05:22:58 -0800 (PST) Date: Fri, 28 Feb 2025 13:22:47 +0000 In-Reply-To: <20250228132248.25899-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228132248.25899-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228132248.25899-6-edumazet@google.com> Subject: [PATCH net-next 5/6] tcp: remove READ_ONCE(req->ts_recent) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Neal Cardwell Cc: Kuniyuki Iwashima , Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet , Wang Hai X-Patchwork-Delegate: kuba@kernel.org After commit 8d52da23b6c6 ("tcp: Defer ts_recent changes until req is owned"), req->ts_recent is not changed anymore. It is set once in tcp_openreq_init(), bpf_sk_assign_tcp_reqsk() or cookie_tcp_reqsk_alloc() before the req can be seen by other cpus/threads. This completes the revert of eba20811f326 ("tcp: annotate data-races around tcp_rsk(req)->ts_recent"). Signed-off-by: Eric Dumazet Cc: Wang Hai --- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_minisocks.c | 4 ++-- net/ipv4/tcp_output.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index ae07613e4f335063723f49d7fd70a240412922ef..d9405b012dff079f7cafd9d422ff4445a27eb064 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1155,7 +1155,7 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, tcp_rsk(req)->rcv_nxt, tcp_synack_window(req) >> inet_rsk(req)->rcv_wscale, tcp_rsk_tsval(tcp_rsk(req)), - READ_ONCE(req->ts_recent), + req->ts_recent, 0, &key, inet_rsk(req)->no_srccheck ? IP_REPLY_ARG_NOSRCCHECK : 0, ip_hdr(skb)->tos, diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index ba4a5d7f251d8ed093b38155d9b1a9f50bfcfe32..3cb8f281186b205e2b03d1b78e1750a024b94f6a 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -585,7 +585,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, if (newtp->rx_opt.tstamp_ok) { newtp->tcp_usec_ts = treq->req_usec_ts; - newtp->rx_opt.ts_recent = READ_ONCE(req->ts_recent); + newtp->rx_opt.ts_recent = req->ts_recent; newtp->rx_opt.ts_recent_stamp = ktime_get_seconds(); newtp->tcp_header_len = sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED; } else { @@ -673,7 +673,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, tcp_parse_options(sock_net(sk), skb, &tmp_opt, 0, NULL); if (tmp_opt.saw_tstamp) { - tmp_opt.ts_recent = READ_ONCE(req->ts_recent); + tmp_opt.ts_recent = req->ts_recent; if (tmp_opt.rcv_tsecr) { if (inet_rsk(req)->tstamp_ok && !fastopen) tsecr_reject = !between(tmp_opt.rcv_tsecr, diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 0a660075add5bea05a61b4fe2d9d334a89d956a7..24e56bf96747253c1a508ddfe27ebd38da7c219e 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -949,7 +949,7 @@ static unsigned int tcp_synack_options(const struct sock *sk, tcp_rsk(req)->snt_tsval_first = opts->tsval; } WRITE_ONCE(tcp_rsk(req)->snt_tsval_last, opts->tsval); - opts->tsecr = READ_ONCE(req->ts_recent); + opts->tsecr = req->ts_recent; remaining -= TCPOLEN_TSTAMP_ALIGNED; } if (likely(ireq->sack_ok)) { diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index fe75ad8e606cbca77d69326dc00273e7b214edee..85c4820bfe1588e4553784129d13408dea70763a 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1279,7 +1279,7 @@ static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, tcp_rsk(req)->rcv_nxt, tcp_synack_window(req) >> inet_rsk(req)->rcv_wscale, tcp_rsk_tsval(tcp_rsk(req)), - READ_ONCE(req->ts_recent), sk->sk_bound_dev_if, + req->ts_recent, sk->sk_bound_dev_if, &key, ipv6_get_dsfield(ipv6_hdr(skb)), 0, READ_ONCE(sk->sk_priority), READ_ONCE(tcp_rsk(req)->txhash)); From patchwork Fri Feb 28 13:22:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13996420 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C61B26E166 for ; Fri, 28 Feb 2025 13:23:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748982; cv=none; b=m08JMBdMZ2nMGrDIOo++iGz7HdQhj7N4p8sW9in5Q4F9tGKhh3vt3OXer2nT8rHbc7h4aGt8391PNizSpi+o4bimXvBXK9ZYPQLZbByDrnYB8eNBdW6jsiQX1OWRZn2ahJ2J9sVfExJ/OdvnLgjrfYu3sgWiubG/JaHG9/yourA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748982; c=relaxed/simple; bh=FTYAPGA3SjXYPOXqynWOP8ZK5fmOsZH0A+0ezoAF2ic=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QddTaWmsTcnWKKIiMUytYS3sORq3tP5L/g1/+sy0WtwLOl70CrkfN5K2SpyuwUxAxAzdfpQhf3CZMzTl9uz5fwJzyxFx3UZ/bo/M3Nmv4uD9XDL7zUD2BcuzRx0uRMVWi8MAgH+XALsPT05mM3aWEvvfqslb6m/LUeCym8A/FGo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=G0W7Wfp9; arc=none smtp.client-ip=209.85.219.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="G0W7Wfp9" Received: by mail-qv1-f73.google.com with SMTP id 6a1803df08f44-6e890855f09so51814236d6.2 for ; Fri, 28 Feb 2025 05:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740748979; x=1741353779; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4n0xFPxK7p0S/n7CVqaTwUqyGjTiJKBUlxqkm44laGU=; b=G0W7Wfp9pHYDcmXuxnXyX4g94ogjJQrOXzHZQcYx7ii9p/AyXQC7mGO7DnoYKEWUIC QladEXtEr+fjjnF66r7cv5rz6iczSh5nFaxXZqzcLQSXLwUOWMQDHZ6jtuVaiR3BZKVq YDnh007lLUb5IksVpeN6p6qZSYzyTOiFa0/nZcPbNoUIJhV46VVZftEw2EY68TbOfulQ XcUPRacjw7oEedo2ubKAMhCMvF1ayoFxrTrRT1ee1GrtAnA9iMXbRpgd4Cm1IssdWXXh rS/rzPEnbWHPDkgE0IUFmXRqkHUg6wKPDYt4IHM3xk/pDSCn62D2xYpuERA+zbJKMXmV Dxag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748979; x=1741353779; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4n0xFPxK7p0S/n7CVqaTwUqyGjTiJKBUlxqkm44laGU=; b=PMIAP/EA30iucEbMMKnKjBSMNTY2iYuAbalb1LECTSWFd+57NNxtP29U0p/FEtcqMr yCZt9xa95JD1qx84aUQsrjk5UI+Bc9EwbX9NfnLR1a42B5FRE9BsC+2JR+BhvK2BLuGD ce+OP3fVn+5z5LGJ2AdIvXnT5XNdEw33O2lR9RqOT7KErE/VDVFaSvYRXkCHBO9z5Van khC35lKfBaEHnEVpUn9cy5ST+VG5QTwd+skfDNNa4IZP32g8420KHr/5HyX7SDFjjN+D fuST1Y00xuNycVhSHJNjsywYZYjj+SkCXh5e/awG7C0fD+1wN3wm022COwoMfGbQO+Qa 3Dhw== X-Forwarded-Encrypted: i=1; AJvYcCUCxeSyeAxut7d4lK2tA4d8NunRcQWOoAv4sznZ+AHd4IGXtjq8EMezSygJizMw4Jql4nuT2bY=@vger.kernel.org X-Gm-Message-State: AOJu0YwhxX6pVlb4QxmVmx41e+9AmUbQZG3qr/gQnXXdsaNKw8HSFN6T b19fBcCXNRIRebcXX/q77lOMCwQQUrkGNSrGgG4P8nPz31Jp2AAZEQfsLNkvXbaqBFGOCksBlU0 wKAYekEydkg== X-Google-Smtp-Source: AGHT+IE2U2ElO05g8LFt8D2CDYzHIZnnUVe2mfEJZoO8G5T6fL+YMGKpeYj1DaLjAmZApk+AG5WT1GO0mtjmHw== X-Received: from qvbel19.prod.google.com ([2002:ad4:59d3:0:b0:6e6:4c2d:279d]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:e8d:b0:6e8:7bc8:a850 with SMTP id 6a1803df08f44-6e8a0ad9445mr56886256d6.0.1740748979497; Fri, 28 Feb 2025 05:22:59 -0800 (PST) Date: Fri, 28 Feb 2025 13:22:48 +0000 In-Reply-To: <20250228132248.25899-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228132248.25899-1-edumazet@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228132248.25899-7-edumazet@google.com> Subject: [PATCH net-next 6/6] tcp: tcp_set_window_clamp() cleanup From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Neal Cardwell Cc: Kuniyuki Iwashima , Simon Horman , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet X-Patchwork-Delegate: kuba@kernel.org Remove one indentation level. Use max_t() and clamp() macros. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1184866922130aff0f4a4e6d5c0d95fd42713b7d..eb5a60c7a9ccdd23fb78a74d614c18c4f7e281c9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3693,33 +3693,33 @@ EXPORT_SYMBOL(tcp_sock_set_keepcnt); int tcp_set_window_clamp(struct sock *sk, int val) { + u32 old_window_clamp, new_window_clamp; struct tcp_sock *tp = tcp_sk(sk); if (!val) { if (sk->sk_state != TCP_CLOSE) return -EINVAL; WRITE_ONCE(tp->window_clamp, 0); - } else { - u32 new_rcv_ssthresh, old_window_clamp = tp->window_clamp; - u32 new_window_clamp = val < SOCK_MIN_RCVBUF / 2 ? - SOCK_MIN_RCVBUF / 2 : val; + return 0; + } - if (new_window_clamp == old_window_clamp) - return 0; + old_window_clamp = tp->window_clamp; + new_window_clamp = max_t(int, SOCK_MIN_RCVBUF / 2, val); - WRITE_ONCE(tp->window_clamp, new_window_clamp); - if (new_window_clamp < old_window_clamp) { - /* need to apply the reserved mem provisioning only - * when shrinking the window clamp - */ - __tcp_adjust_rcv_ssthresh(sk, tp->window_clamp); + if (new_window_clamp == old_window_clamp) + return 0; - } else { - new_rcv_ssthresh = min(tp->rcv_wnd, tp->window_clamp); - tp->rcv_ssthresh = max(new_rcv_ssthresh, - tp->rcv_ssthresh); - } - } + WRITE_ONCE(tp->window_clamp, new_window_clamp); + + /* Need to apply the reserved mem provisioning only + * when shrinking the window clamp. + */ + if (new_window_clamp < old_window_clamp) + __tcp_adjust_rcv_ssthresh(sk, new_window_clamp); + else + tp->rcv_ssthresh = clamp(new_window_clamp, + tp->rcv_ssthresh, + tp->rcv_wnd); return 0; }