From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A13C3BBA1E for ; Tue, 26 May 2026 20:34:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779827652; cv=none; b=e/j9rGcD+lHbaYPnsmN7uPBGdqBCHflxA2FsfMKevEUhIRYtxcdZhTam84mVaGemeHs8wCPOoUl582RF0MTHaf2IT0I8zCAK4iS65oSM7JYaGMKfm9DDQbiGdYUtw47DH/reM3d2u9fqbQjdG2qiQWls7BA1l3AAtfTgIph68L4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779827652; c=relaxed/simple; bh=PJqS2JKsermQxxDC+omrvKcwUGwmzFRSz+UB/dEatPo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M4yfaDi9cuSzJeQ4tKqrAdSnkObuAQ0Kozmc4v759XDxupNUmhk5e0BmQuxA4u3zBNi0n7JS3shfKebysYE3+lZms8qfGkhl2dTtUXOaR9hejsSIzjaQU7l6Yd8BGB2mNtj2N2h4pqrXK4OCkK3rsEuC8RPo6gQoa9FOL86IELo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b=ARXLoW+5; arc=none smtp.client-ip=67.231.153.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b="ARXLoW+5" Received: from pps.filterd (m0528004.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64QJESBY2980952 for ; Tue, 26 May 2026 13:34:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=s2048-2025-q2; bh=uJKOp/e wQBRmcuqAmolU8Rm+GfSEgwbNorpxjJUr1jg=; b=ARXLoW+5SahmrEHQKU0eJvs 5OD0Q+ojQy3g76RZ/+qMmWzQCDz91COkvk1JFAxDfNYI4m60ajY/xjWtrYRsaHE8 eKOwvllnGAaN7Iua83VHOk+rRVdKqGFoHXa3JEp8J8JblP9dMzn4S1dxiUEKIqpq lrvLrPsic6NlW0xvORxt1CnwKGqTxLDPU0srRZ089PAAj1LBw2cf77uioSz+nP7z pxWGmJTeiC/UQpWguKq7PD79D1elIis3f8CFqZo8nhFr9AxUakcUn73k2kmrZW+n Y/KpSlNHUlEndzrbvOzEAL+gLXdJ+Qx3fZyMwlAN+Chkq9YnBefc+8/e4KIGbxA= = Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4ebwve590d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 26 May 2026 13:34:07 -0700 (PDT) Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-4856ecace68so2927369b6e.1 for ; Tue, 26 May 2026 13:34:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827647; x=1780432447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uJKOp/ewQBRmcuqAmolU8Rm+GfSEgwbNorpxjJUr1jg=; b=hFFFYSXoRJW+NYwNP9FUU1ps822+b8uHFYgn56uhGOltxQHlpajDLvCYcb+NU2AFoZ RoCiXV0lg1epBhu1lVBCxsqa5fZCavzMit4fUO/ik3c8BrcQoLNcR91juy+zxxTApERi SAEwxdOfUZguAZ1ZfM4fTu5dR3LCarTzp0/UA44/+yw87NfnLZ8sXeWhfAtquZFA0qTH 4NEqqjJdaC/bZ2s36OftcwgmTSUQLa9CFWkD5l6WiH15uQ8g3z3oyM9g76ASVboUg8Ho VD+L02SL7V1EK7+Pyq9jbokAVxlK7aMrM4EmdkX/41HmlEmKqdVR6DvkFb1d2KcKFVfn iCrg== X-Gm-Message-State: AOJu0YxNHWkZwX3KUMJX4WDqkLVgSi4ZtWQfiYOEFUrXMP8v+qLPQvek I03GYZ5OyFpSGkNpNGIAH2T3WyioLWe0Id3Uxak9M1Z7EWntR/NIWzmO2+T1bWakcn1s6kfqCOd HXxXg5dSUDa6ZJMD3NEwvAkPi/aTDlwtv/x2s857gaW22ZnbJ228lUjhDxsOB03s0/0330anlz2 FtuR4RL6o+/X+hzdusGxPV1Afpd7uKrDr1SXfv X-Gm-Gg: Acq92OF5byN+IPwDquQnf+MusIk8ElxFbjQj+U8APVS6FoTg9NAwG+y1IDkECjL58OQ rt27Ty42mv17tGf3VOB0VVIDNDEncWbkqCsf1eO5ISBAsBAYHop+dXUurfKPd7xJEJKd0vgAP8D QeGkpdsHZP36kdVXhkJExM8bSFu81hzI/JWVfPkbmZ+mYJuFC31aFn9dhK4QgGCHEpAgtx/WDgT CUB9EKDUPP1S8cwmlxq69r8Y3Aa9OodkHEgmQEOagDULG7P/9H2PJ+8ml6pyes7yK2ilouXBe7J 63gtrizenF0LAm2Qv0NGtF2XgR4yTXFtjhNgYiEYOvnUPRZgua/kYJgq/U9UMHAHiBlMjkK4pbM fRusx6gBjmg== X-Received: by 2002:a05:6808:191a:b0:485:3dd3:7721 with SMTP id 5614622812f47-4854a3d40d0mr11266821b6e.35.1779827647194; Tue, 26 May 2026 13:34:07 -0700 (PDT) X-Received: by 2002:a05:6808:191a:b0:485:3dd3:7721 with SMTP id 5614622812f47-4854a3d40d0mr11266789b6e.35.1779827646639; Tue, 26 May 2026 13:34:06 -0700 (PDT) Received: from localhost ([2a03:2880:12ff:2::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-43b63a7cfe6sm13381504fac.17.2026.05.26.13.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 13:34:06 -0700 (PDT) From: Neil Spring To: netdev@vger.kernel.org Cc: edumazet@google.com, ncardwell@google.com, kuniyu@google.com, davem@davemloft.net, kuba@kernel.org, dsahern@kernel.org, pabeni@redhat.com, horms@kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, ntspring@meta.com, bpf@vger.kernel.org, martin.lau@linux.dev, daniel@iogearbox.net Subject: [PATCH net-next v9 1/2] tcp: rehash onto different local ECMP path on retransmit timeout Date: Tue, 26 May 2026 13:34:02 -0700 Message-ID: <20260526203403.3517607-2-ntspring@meta.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260526203403.3517607-1-ntspring@meta.com> References: <20260526203403.3517607-1-ntspring@meta.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI2MDE4MiBTYWx0ZWRfX4X7HE/z2ZYM5 VasV+sKAd/fuM2uHFa/vuEMbFSEWkKhNLzjg9zoeh8sBam7m5eEovn7asEudv7XglbR5txPBwSU KG8YIkQDaC2GBRkLNrFazFlHKggGVmYbQDoqkXmmyKX7X5TPhDbC7RoaxTAspU1OuKpOsikWNiN zpUeniFVcWy+dbIu3Rcj833bDlHFPhdH3d6dTBtojrpqGudqhVevpGszTNBsCwCyeuBG2RCOeBe pJWk+ccK/FLxzMgXgk0jK5bqNqkgbMoKUrkwevqG9qsecqioLLwf4VsHcUS+xo16OVzVzdXfLtJ tqiXxQuK9sC3zShVNh5nfVCY5Eg0VTkL5wwoo3lOmzFgNTnwIkLiksSt4UFi2CQ2IgFZw7fJZ6M B2E63hQ4Y2n+OsiGNK9CVr9LGELeAqfUK2Pm6S68Bjtk/fGXWSh8RboP8K/X/oRYObEpphXuJuO cEbdFy5Sk/ify2NN8rw== X-Proofpoint-ORIG-GUID: NGvpAtV8eKVUVzfxUL_kQwpwZlD_Gnju X-Proofpoint-GUID: NGvpAtV8eKVUVzfxUL_kQwpwZlD_Gnju X-Authority-Analysis: v=2.4 cv=JeOMa0KV c=1 sm=1 tr=0 ts=6a1603c0 cx=c_pps a=yymyAM/LQ7lj/HqAiIiKTw==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=f7IdgyKtn90A:10 a=VkNPw1HP01LnGYTKEx00:22 a=7x6HtfJdh03M6CCDgxCd:22 a=GbPsI2Ihf5RTnMjR_gZv:22 a=VabnemYjAAAA:8 a=TRHSsKDO3c-AA1P1OBkA:9 a=efpaJB4zofY2dbm2aIRb:22 a=gKebqoRLp9LExxC7YDUY:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-26_04,2026-05-26_03,2025-10-01_01 Currently sk_rethink_txhash() re-rolls the socket's txhash on RTO, PLB, and spurious-retransmission events, but the cached route is reused and the new hash is not propagated into the ECMP path selection logic. Two changes are needed to make rehash select a different local ECMP path: 1. Add __sk_dst_reset() alongside sk_rethink_txhash() in tcp_write_timeout(), tcp_rcv_spurious_retrans(), and tcp_plb_check_rehash() so the cached dst is invalidated and the next transmit triggers a fresh route lookup. 2. Set fl6->mp_hash from sk_txhash (or tcp_rsk(req)->txhash for SYN/ACK retransmits and syncookies) in tcp_v6_connect(), inet6_sk_rebuild_header(), inet6_csk_route_req(), inet6_csk_route_socket(), and cookie_v6_check() so fib6_select_path() picks a path based on the new hash. The mp_hash assignment in inet6_csk_route_socket() is guarded by sk_protocol == IPPROTO_TCP so that non-TCP callers (e.g., L2TP via inet6_csk_xmit) fall through to rt6_multipath_hash() and retain their existing flow-key-based ECMP behavior. It is conditioned on fib_multipath_hash_policy == 0 (L3) because policies 1-3 compute a deterministic hash from the flow keys which must not be overridden. The expression uses (txhash >> 1) ?: 1 so that the rare txhash == 1 still produces a valid non-zero mp_hash. Setting mp_hash explicitly is necessary because the default ECMP hash derives from fl6->flowlabel via np->flow_label, which is not updated from sk_txhash (REPFLOW is off by default). ip6_make_flowlabel() cannot help either, as it runs after the route lookup. sk_set_txhash() is moved before ip6_dst_lookup_flow() in tcp_v6_connect() so the initial ECMP path is selected by the same txhash that subsequent route rebuilds will use. This avoids unintended path changes when the cached dst is naturally invalidated (e.g., by PMTU discovery or route changes). The dst reset in tcp_write_timeout() and tcp_plb_check_rehash() is guarded by sk->sk_family == AF_INET6 since IPv4 ECMP does not currently use sk_txhash for path selection. For IPv4-mapped IPv6 sockets this produces a redundant dst reset on a cold path (RTO/PLB); the subsequent IPv4 route lookup returns the same result. For syncookies, txhash is set to the cookie (ISN) before route_req() in tcp_conn_request() so the SYN-ACK uses the same ECMP path that cookie_v6_check() will select when the ACK arrives and the full socket is created. cookie_tcp_reqsk_init() likewise derives txhash from the cookie rather than calling net_tx_rndhash(), since the original request socket (and its txhash) was freed after the SYN-ACK. The cookie is SipHash output, so for IPv4 (where cookie_tcp_reqsk_init is also used) the derived txhash has equivalent distribution to a random one and queue selection is unaffected. route_req() receives 0 as tw_isn for the syncookie path so that tcp_v6_init_req() still saves ireq->pktopts for REPFLOW flowlabel reflection and IPv6 cmsg options. The ecn_ok clear for syncookies without timestamps stays after tcp_ecn_create_request() so it takes precedence. bpf_sk_assign_tcp_reqsk() is updated to initialize txhash via net_tx_rndhash() to avoid reading uninitialized slab memory. Signed-off-by: Neil Spring --- net/core/filter.c | 1 + net/ipv4/syncookies.c | 8 +++++++- net/ipv4/tcp_input.c | 20 ++++++++++++-------- net/ipv4/tcp_plb.c | 5 ++++- net/ipv4/tcp_timer.c | 2 ++ net/ipv6/af_inet6.c | 3 +++ net/ipv6/inet6_connection_sock.c | 8 ++++++++ net/ipv6/syncookies.c | 4 ++++ net/ipv6/tcp_ipv6.c | 13 +++++++++++-- 9 files changed, 52 insertions(+), 12 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 80a3b702a2d4..7fea9ad881e7 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -12301,6 +12301,7 @@ __bpf_kfunc int bpf_sk_assign_tcp_reqsk(struct __sk_buff *s, struct sock *sk, treq->req_usec_ts = !!attrs->usec_ts_ok; treq->ts_off = tsoff; + treq->txhash = net_tx_rndhash(); skb_orphan(skb); skb->sk = req_to_sk(req); diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index df479277fb80..8591f2606ca6 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c @@ -280,9 +280,15 @@ static int cookie_tcp_reqsk_init(struct sock *sk, struct sk_buff *skb, treq->snt_synack = 0; treq->snt_tsval_first = 0; treq->tfo_listener = false; - treq->txhash = net_tx_rndhash(); treq->rcv_isn = ntohl(th->seq) - 1; treq->snt_isn = ntohl(th->ack_seq) - 1; + /* Use the cookie as txhash so the ECMP path matches the + * SYN-ACK, where txhash was also set to the cookie. A + * random txhash would be inconsistent because the original + * request socket (and its txhash) was freed after sending + * the SYN-ACK. + */ + treq->txhash = treq->snt_isn; treq->syn_tos = TCP_SKB_CB(skb)->ip_dsfield; #if IS_ENABLED(CONFIG_MPTCP) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7995a89bafc9..1ced8a575300 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5020,8 +5020,10 @@ static void tcp_rcv_spurious_retrans(struct sock *sk, skb->protocol == htons(ETH_P_IPV6) && (tcp_sk(sk)->inet_conn.icsk_ack.lrcv_flowlabel != ntohl(ip6_flowlabel(ipv6_hdr(skb)))) && - sk_rethink_txhash(sk)) + sk_rethink_txhash(sk)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPDUPLICATEDATAREHASH); + __sk_dst_reset(sk); + } /* Save last flowlabel after a spurious retrans. */ tcp_save_lrcv_flowlabel(sk, skb); @@ -7636,6 +7638,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, tcp_rsk(req)->af_specific = af_ops; tcp_rsk(req)->ts_off = 0; tcp_rsk(req)->req_usec_ts = false; + tcp_rsk(req)->txhash = net_tx_rndhash(); #if IS_ENABLED(CONFIG_MPTCP) tcp_rsk(req)->is_mptcp = 0; #endif @@ -7659,7 +7662,12 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, /* Note: tcp_v6_init_req() might override ir_iif for link locals */ inet_rsk(req)->ir_iif = inet_request_bound_dev_if(sk, skb); - dst = af_ops->route_req(sk, skb, &fl, req, isn); + if (want_cookie) { + isn = cookie_init_sequence(af_ops, sk, skb, &req->mss); + tcp_rsk(req)->txhash = isn; + } + + dst = af_ops->route_req(sk, skb, &fl, req, want_cookie ? 0 : isn); if (!dst) goto drop_and_free; @@ -7698,11 +7706,8 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, tcp_ecn_create_request(req, skb, sk, dst); - if (want_cookie) { - isn = cookie_init_sequence(af_ops, sk, skb, &req->mss); - if (!tmp_opt.tstamp_ok) - inet_rsk(req)->ecn_ok = 0; - } + if (want_cookie && !tmp_opt.tstamp_ok) + inet_rsk(req)->ecn_ok = 0; #ifdef CONFIG_TCP_AO if (tcp_parse_auth_options(tcp_hdr(skb), NULL, &aoh)) @@ -7717,7 +7722,6 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, } #endif tcp_rsk(req)->snt_isn = isn; - tcp_rsk(req)->txhash = net_tx_rndhash(); tcp_rsk(req)->syn_tos = TCP_SKB_CB(skb)->ip_dsfield; tcp_openreq_init_rwin(req, sk, dst); sk_rx_queue_set(req_to_sk(req), skb); diff --git a/net/ipv4/tcp_plb.c b/net/ipv4/tcp_plb.c index c11a0cd3f8fe..849ac4aad480 100644 --- a/net/ipv4/tcp_plb.c +++ b/net/ipv4/tcp_plb.c @@ -78,7 +78,10 @@ void tcp_plb_check_rehash(struct sock *sk, struct tcp_plb_state *plb) if (plb->pause_until) return; - sk_rethink_txhash(sk); + if (sk_rethink_txhash(sk)) { + if (sk->sk_family == AF_INET6) + __sk_dst_reset(sk); + } plb->consec_cong_rounds = 0; WRITE_ONCE(tcp_sk(sk)->plb_rehash, tcp_sk(sk)->plb_rehash + 1); NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPPLBREHASH); diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 322db13333c7..7c05f1072a06 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -300,6 +300,8 @@ static int tcp_write_timeout(struct sock *sk) if (sk_rethink_txhash(sk)) { WRITE_ONCE(tp->timeout_rehash, tp->timeout_rehash + 1); __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPTIMEOUTREHASH); + if (sk->sk_family == AF_INET6) + __sk_dst_reset(sk); } return 0; diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 0a88b376141d..7a2b1de7487c 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -823,6 +823,9 @@ int inet6_sk_rebuild_header(struct sock *sk) fl6->flowi6_uid = sk_uid(sk); security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6)); + if (ip6_multipath_hash_policy(sock_net(sk)) == 0 && sk->sk_txhash) + fl6->mp_hash = (sk->sk_txhash >> 1) ?: 1; + rcu_read_lock(); final_p = fl6_update_dst(fl6, rcu_dereference(np->opt), &np->final); rcu_read_unlock(); diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 37534e116899..7ca24eef614c 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c @@ -48,6 +48,10 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk, fl6->flowi6_uid = sk_uid(sk); security_req_classify_flow(req, flowi6_to_flowi_common(fl6)); + if (ip6_multipath_hash_policy(sock_net(sk)) == 0 && + tcp_rsk(req)->txhash) + fl6->mp_hash = (tcp_rsk(req)->txhash >> 1) ?: 1; + if (!dst) { dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p); if (IS_ERR(dst)) @@ -70,6 +74,10 @@ struct dst_entry *inet6_csk_route_socket(struct sock *sk, fl6->saddr = np->saddr; fl6->flowlabel = np->flow_label; IP6_ECN_flow_xmit(sk, fl6->flowlabel); + + if (sk->sk_protocol == IPPROTO_TCP && + ip6_multipath_hash_policy(sock_net(sk)) == 0 && sk->sk_txhash) + fl6->mp_hash = (sk->sk_txhash >> 1) ?: 1; fl6->flowi6_oif = sk->sk_bound_dev_if; fl6->flowi6_mark = sk->sk_mark; fl6->fl6_sport = inet->inet_sport; diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 4f6f0d751d6c..70759cd64b34 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c @@ -245,6 +245,10 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) fl6.flowi6_uid = sk_uid(sk); security_req_classify_flow(req, flowi6_to_flowi_common(&fl6)); + if (ip6_multipath_hash_policy(net) == 0 && + tcp_rsk(req)->txhash) + fl6.mp_hash = (tcp_rsk(req)->txhash >> 1) ?: 1; + dst = ip6_dst_lookup_flow(net, sk, &fl6, final_p); if (IS_ERR(dst)) { SKB_DR_SET(reason, IP_OUTNOROUTES); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 2c3f7a739709..ecdc8f84d203 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -258,6 +258,8 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr_unsized *uaddr, if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) saddr = &sk->sk_v6_rcv_saddr; + sk_set_txhash(sk); + fl6->flowi6_proto = IPPROTO_TCP; fl6->daddr = sk->sk_v6_daddr; fl6->saddr = saddr ? *saddr : np->saddr; @@ -275,6 +277,15 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr_unsized *uaddr, security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6)); + /* Non-zero mp_hash bypasses rt6_multipath_hash() in + * fib6_select_path(), letting txhash control ECMP path + * selection so that sk_rethink_txhash() rehashes onto a + * different path. Policies 1-3 derive a deterministic + * hash from the flow keys and must not be overridden. + */ + if (ip6_multipath_hash_policy(net) == 0 && sk->sk_txhash) + fl6->mp_hash = (sk->sk_txhash >> 1) ?: 1; + dst = ip6_dst_lookup_flow(net, sk, fl6, final_p); if (IS_ERR(dst)) { err = PTR_ERR(dst); @@ -313,8 +324,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr_unsized *uaddr, if (err) goto late_failure; - sk_set_txhash(sk); - if (likely(!tp->repair)) { union tcp_seq_and_ts_off st; -- 2.53.0-Meta