From nobody Sun May 5 19:43:55 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp1705724pid; Tue, 19 Apr 2022 10:19:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzcAgINb5E0am+vfxVNEbB4u8n5BY2fwkEVUYtlYIpKsbaMsvQk1Kif3Zq3nJLWNIXDvxZ X-Received: by 2002:a17:90a:488c:b0:1c7:b62e:8e8c with SMTP id b12-20020a17090a488c00b001c7b62e8e8cmr25223162pjh.157.1650388750629; Tue, 19 Apr 2022 10:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650388750; cv=none; d=google.com; s=arc-20160816; b=oCch8LVSkEoptdmMcq7IgS2s7aGcjD7F8Hhfu9A56F1oAyMMmKF8XIxOzxgzq7ZTPP zn6oa1OBW24gopwjTDBV4XSWfxSJGrQaJ7wkU1ITOo7SBICR4ctHuQLdfLfUm3QII11L SQNWN0GyRG8d0GZt20M9wGwJKet/vhkGQUBgYNyp4F8Cfofhob0xRZSu1ZiVNqQXP7m3 qInBir/62QT7i4oumnVOzf6uq1pm5Zsnej526aLMYLMNfFdtzCVYCVsjz6fp4r160A2N ICZcumf8Zb2VCxxCjDE5/YvFoc1OfuFVgGpou8W/kNfpnyf4LwyQdul1sh32vcxccdl4 /Ftw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=CGTewbNlZUGfFdE30/MN+3b/au+fh0iegi/684GrH9E=; b=DgUxgniXqS6vh0lcbG1gcfV0huArKqa2N+s9+bQI4MHhGTHiD671tm4SNNcNA0o6ko HPasR3zvJiEQiKYpKCala2rm8z77T3g8Wtugm476EzGpuHBOPGGkaXRxqxdlR1iZfAk2 b855KlwPQxv4V3HajKs39bzGGsVNra/tujG+Qurx0m2gYRqP7mB2p6LIjLXbRhR7YHog 3Ay4tjQB3PEdqq8nTWovSfuAQ7pf3OzTJpT3drPz4xW+YZWAc+vIa4dThzGij8ZCpVBV 2eEIP3IH6t36+3lFkmTIsyyTBsOvcVm4jsTPtt16Yn0urErbFeW6g1J4c58iZEXKuCH6 ZtDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TtWtjMlZ; spf=pass (google.com: domain of mptcp+bounces-4771-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4771-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t69-20020a638148000000b003aa3698e98csi344016pgd.15.2022.04.19.10.19.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2022 10:19:10 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4771-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TtWtjMlZ; spf=pass (google.com: domain of mptcp+bounces-4771-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4771-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C21FE2808DF for ; Tue, 19 Apr 2022 17:19:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DE8521379; Tue, 19 Apr 2022 17:19:08 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 7436D1374 for ; Tue, 19 Apr 2022 17:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650388746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CGTewbNlZUGfFdE30/MN+3b/au+fh0iegi/684GrH9E=; b=TtWtjMlZrZnKnVdMdLXX7C6UqljSxwhSsrMTMkuE0jfIU7V/uLkqLPJGqNH6Ndb9pnrxtJ mk8S9/OWWR+nG3wNkHB8yCPGLgHIikBYCW6WWxQINsxPSpkYVIhFTeeEOWt1U22ZoGNZtJ xHJOI8Jom9vCHzNAJ2Ny6G3PLM2Ol04= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-527-AdcT_uPVMpSvmAXXxaYmHg-1; Tue, 19 Apr 2022 13:19:02 -0400 X-MC-Unique: AdcT_uPVMpSvmAXXxaYmHg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1B4128EC109; Tue, 19 Apr 2022 17:18:46 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id D314E403372; Tue, 19 Apr 2022 17:18:45 +0000 (UTC) From: Paolo Abeni To: netdev@vger.kernel.org Cc: Eric Dumazet , mptcp@lists.linux.dev Subject: [RFC PATCH 1/2] tcp: allow MPTCP to update the announced window. Date: Tue, 19 Apr 2022 19:18:23 +0200 Message-Id: <7a91a8d9980c668c4de07b3f0304a7808d0a1113.1650386197.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Content-Type: text/plain; charset="utf-8" The MPTCP RFC requires that the MPTCP-level receive window's right edge never moves backward. Currently the MPTCP code enforces such constraint while tracking the right edge, but it does not reflects the constraint back on the wire, as lacks a suitable hook to update accordingly the TCP header. This change modifies the existing mptcp_write_options() hook, providing the current packet's TCP header up to the MPTCP protocol level, so that the next patch could implement the above mentioned constraint. No functional changes intended. Signed-off-by: Paolo Abeni --- include/net/mptcp.h | 2 +- net/ipv4/tcp_output.c | 14 ++++++++------ net/mptcp/options.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 0a3b0fb04a3b..ded4359b15be 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -124,7 +124,7 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, struct mptcp_out_options *opts); bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb); =20 -void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, +void mptcp_write_options(struct tcphdr *th, __be32 *ptr, struct tcp_sock *= tp, struct mptcp_out_options *opts); =20 void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index c221f3bce975..7d64c3fc5d40 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -444,12 +444,13 @@ struct tcp_out_options { struct mptcp_out_options mptcp; }; =20 -static void mptcp_options_write(__be32 *ptr, const struct tcp_sock *tp, +static void mptcp_options_write(struct tcphdr *th, __be32 *ptr, + struct tcp_sock *tp, struct tcp_out_options *opts) { #if IS_ENABLED(CONFIG_MPTCP) if (unlikely(OPTION_MPTCP & opts->options)) - mptcp_write_options(ptr, tp, &opts->mptcp); + mptcp_write_options(th, ptr, tp, &opts->mptcp); #endif } =20 @@ -605,9 +606,10 @@ static void bpf_skops_write_hdr_opt(struct sock *sk, s= truct sk_buff *skb, * At least SACK_PERM as the first option is known to lead to a disaster * (but it may well be that other scenarios fail similarly). */ -static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp, +static void tcp_options_write(struct tcphdr *th, struct tcp_sock *tp, struct tcp_out_options *opts) { + __be32 *ptr =3D (__be32 *)(th + 1); u16 options =3D opts->options; /* mungable copy */ =20 if (unlikely(OPTION_MD5 & options)) { @@ -701,7 +703,7 @@ static void tcp_options_write(__be32 *ptr, struct tcp_s= ock *tp, =20 smc_options_write(ptr, &options); =20 - mptcp_options_write(ptr, tp, opts); + mptcp_options_write(th, ptr, tp, opts); } =20 static void smc_set_option(const struct tcp_sock *tp, @@ -1354,7 +1356,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct= sk_buff *skb, th->window =3D htons(min(tp->rcv_wnd, 65535U)); } =20 - tcp_options_write((__be32 *)(th + 1), tp, &opts); + tcp_options_write(th, tp, &opts); =20 #ifdef CONFIG_TCP_MD5SIG /* Calculate the MD5 hash, as we have all we need now */ @@ -3590,7 +3592,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk= , struct dst_entry *dst, =20 /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */ th->window =3D htons(min(req->rsk_rcv_wnd, 65535U)); - tcp_options_write((__be32 *)(th + 1), NULL, &opts); + tcp_options_write(th, NULL, &opts); th->doff =3D (tcp_header_size >> 2); __TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); =20 diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 325383646f5c..9d6f14b496df 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1265,7 +1265,7 @@ static u16 mptcp_make_csum(const struct mptcp_ext *mp= ext) ~csum_unfold(mpext->csum)); } =20 -void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, +void mptcp_write_options(struct tcphdr *th, __be32 *ptr, struct tcp_sock *= tp, struct mptcp_out_options *opts) { const struct sock *ssk =3D (const struct sock *)tp; --=20 2.35.1 From nobody Sun May 5 19:43:55 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp1705718pid; Tue, 19 Apr 2022 10:19:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/5h4QCj1Pymc1yIEDa+TxPda4eaL3BCCfUUono/qq5pGVZVfUFIvs125spJPJILGnxCiL X-Received: by 2002:a05:651c:1a11:b0:24b:54dd:720f with SMTP id by17-20020a05651c1a1100b0024b54dd720fmr10267223ljb.433.1650388749484; Tue, 19 Apr 2022 10:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650388749; cv=none; d=google.com; s=arc-20160816; b=e6/baEWwjShpALXvHn6IRNC518ayMeqOkJrSWZup98VkwgX/hYxjHw2GK9V6cY+rIA 3nDn7E/4G6a4mnjxoj2AAlj+DY4XBsnImhEig5cOKReftZQAa7+e9t9wNjbMA2mFm1xy T4MNAwTp7eaY4eAeC7bOZaUsmIEzv5WVYaG2fSZIoqcxdMJL9mZKJSIgLqRwtLdY77V5 RDq9rI9cbeniEQuRVl68/wRmyVqmekAfvZKkSeXvd7NuKXclJsnHPSRQA24MKI/deMnQ d7ROrbgc4DmMSuX43t6upp9S9JShHpYiaRUiGIOHAmyGq+KIZ6Pe0XCOoKBNiNU05RiR DTbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=+OY+yFzsQIMqQoPMP1panGUfFqcHdiP2vcaSQtdolkA=; b=rG7nYtkFJqZCBqDOr7jAp5murxJIZ1wVcKIoZupsDJyD4WqDCBRNtotSWXYe3A9zIA aRX9IXKmsQFl7DzqGKrpgX1e/TJpL0742cAMvkqpepsfA7VgxuA0DC6yC1BJ09SKTUgO NaHy0CczmSJaR/Nw8X1LcdyF3hwIMh4pXBoSMSoRVcA64jaVO6MKp04Vm0kqo8KXFvju S647nq5wkpnBFXVjF5Er4IAHsytaBEpwM2KBq7UZccp7nxwosIR9W7C9GQlDV122emJt PsiSPdmt2DOBcf05E/Viuyux7zIcbm2pszusiES6PwlqRfsWpAPJerVAjdSdFlEOTLT+ ofQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WV4+kT1o; spf=pass (google.com: domain of mptcp+bounces-4769-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-4769-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id d1-20020a2e96c1000000b0024b000ccbd8si10949926ljj.427.2022.04.19.10.19.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2022 10:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4769-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WV4+kT1o; spf=pass (google.com: domain of mptcp+bounces-4769-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-4769-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 42FA22E0C8D for ; Tue, 19 Apr 2022 17:19:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C76F41379; Tue, 19 Apr 2022 17:19:04 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 4FF2D1374 for ; Tue, 19 Apr 2022 17:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650388741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+OY+yFzsQIMqQoPMP1panGUfFqcHdiP2vcaSQtdolkA=; b=WV4+kT1oMuaLMN1ysLTELzFeXwqTD0mqI7gljvbK4RKDDy+MUHmNR0J6gUsnJfjzUrplxG 9/9Vy+CdaUOP6eokG0J5e0NK3zHSC/8tN+zk2DvUJeU/A98ILv6fZH7I/Iu29zyz0z4Bp0 AywgUYmZr979/gmeqbf0GJBhfdq4u04= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-496-03ZBCMCGNd2K67i1YWzM7Q-1; Tue, 19 Apr 2022 13:18:59 -0400 X-MC-Unique: 03ZBCMCGNd2K67i1YWzM7Q-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D3DBF8517FB; Tue, 19 Apr 2022 17:18:47 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2199F40146E; Tue, 19 Apr 2022 17:18:46 +0000 (UTC) From: Paolo Abeni To: netdev@vger.kernel.org Cc: Eric Dumazet , mptcp@lists.linux.dev Subject: [RFC PATCH 2/2] mptcp: never shrink offered window Date: Tue, 19 Apr 2022 19:18:24 +0200 Message-Id: <4742d835a4550db1a6f6f8ac6eea3433f819c36a.1650386197.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Content-Type: text/plain; charset="utf-8" As per RFC, the offered MPTCP-level window should never shrink. While we currently track the right edge, we don't enforce the above constraint on the wire. Additionally, concurrent xmit on different subflows can end-up in erroneous right edge update. Address the above explicitly updating the announced window and protecting the update with an additional atomic operation (sic) Signed-off-by: Paolo Abeni --- net/mptcp/options.c | 52 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 9d6f14b496df..86d67ad41266 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1224,20 +1224,58 @@ bool mptcp_incoming_options(struct sock *sk, struct= sk_buff *skb) return true; } =20 -static void mptcp_set_rwin(const struct tcp_sock *tp) +static void mptcp_set_rwin(struct tcp_sock *tp, struct tcphdr *th) { const struct sock *ssk =3D (const struct sock *)tp; - const struct mptcp_subflow_context *subflow; + struct mptcp_subflow_context *subflow; + u64 ack_seq, rcv_wnd_old, rcv_wnd_new; struct mptcp_sock *msk; - u64 ack_seq; + u32 new_win; + u64 win; =20 subflow =3D mptcp_subflow_ctx(ssk); msk =3D mptcp_sk(subflow->conn); =20 - ack_seq =3D READ_ONCE(msk->ack_seq) + tp->rcv_wnd; + ack_seq =3D READ_ONCE(msk->ack_seq); + rcv_wnd_new =3D ack_seq + tp->rcv_wnd; + + rcv_wnd_old =3D READ_ONCE(msk->rcv_wnd_sent); + if (after64(rcv_wnd_new, rcv_wnd_old)) { + u64 rcv_wnd; + + for (;;) { + rcv_wnd =3D cmpxchg64(&msk->rcv_wnd_sent, rcv_wnd_old, rcv_wnd_new); + + if (rcv_wnd =3D=3D rcv_wnd_old) + break; + if (before64(rcv_wnd_new, rcv_wnd)) + goto raise_win; + rcv_wnd_old =3D rcv_wnd; + }; + return; + } + + if (rcv_wnd_new !=3D rcv_wnd_old) { +raise_win: + win =3D rcv_wnd_old - ack_seq; + tp->rcv_wnd =3D min_t(u64, win, U32_MAX); + new_win =3D tp->rcv_wnd; =20 - if (after64(ack_seq, READ_ONCE(msk->rcv_wnd_sent))) - WRITE_ONCE(msk->rcv_wnd_sent, ack_seq); + /* Make sure we do not exceed the maximum possible + * scaled window. + */ + if (unlikely(th->syn)) + new_win =3D min(new_win, 65535U) << tp->rx_opt.rcv_wscale; + if (!tp->rx_opt.rcv_wscale && + sock_net(ssk)->ipv4.sysctl_tcp_workaround_signed_windows) + new_win =3D min(new_win, MAX_TCP_WINDOW); + else + new_win =3D min(new_win, (65535U << tp->rx_opt.rcv_wscale)); + + /* RFC1323 scaling applied */ + new_win >>=3D tp->rx_opt.rcv_wscale; + th->window =3D htons(new_win); + } } =20 u16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, __wsum = sum) @@ -1550,7 +1588,7 @@ void mptcp_write_options(struct tcphdr *th, __be32 *p= tr, struct tcp_sock *tp, } =20 if (tp) - mptcp_set_rwin(tp); + mptcp_set_rwin(tp, th); } =20 __be32 mptcp_get_reset_option(const struct sk_buff *skb) --=20 2.35.1