From nobody Fri Dec 19 06:34:10 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1343819uad; Sat, 30 Jul 2022 01:05:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR7F3HxNpQ8YSjSJ55kiFUq9TKMzE4BKvS1s0QUYUHH7n0trWUq674fZBTQgL0JrdyOhZ8UY X-Received: by 2002:a05:6214:4243:b0:474:9c2a:b66a with SMTP id ne3-20020a056214424300b004749c2ab66amr2781691qvb.37.1659168306047; Sat, 30 Jul 2022 01:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659168306; cv=none; d=google.com; s=arc-20160816; b=jI3BMtUa+O6zCMR9R6V8HZOTJNx3vceDAHs/ixg9jLhlgtkasTRC/iHmwUa03xxTPG 4ztNYmZncGtK0ZXaI/ggdsj9OrJK3FlBkFWjgwZ5ixUJfxVQj294uVmNavm6GSjGpWuG th1WXRWoGAy1ndloyNQlZsfYY71H/TqRUXk8JWPRMpjYV8uD76KiNkBxU2vmxNvmvtdA hDdVXdQv/jjsJ114GzmTApxk1hK/2So2fyAdIE69y6vH8ypbFP/4dOfDQWvKsRgOA9Ge hHcMuHY23jR3zNaTuXQkfRE6zVKzrrF8USQSTuSjVYK/qu00MbC9BLt5XYAe2WwNlpBi GyTg== 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:to:from:dkim-signature; bh=gjfYXwHTjVj4dpG6Lrt9wHMWmkdR4GiZUOwTPo+fbmU=; b=EQyRhAPqFDojvpvT5wbVN/ySD+IvdSghFrUMCLKKl5mik0CpvbZvsylfIaclUUg8YL FH0tobJeblktNjaQ593qsXyjM7LdCYqPTy13lhsMxIkskQaKijHT7WFcECu/jxCUpbym wvYhV5WYEs3FyksclYgfvcBQhxekX3vaqdO2q+U1cW8D2aPsynhg9jYbvqOE4NDYL4xh Hpxlc+tC2d4/86CXPlhXm1tnVVS/cVJ9Mx4CRysAidiZaUd2BixZ9VomWgPUT0sWkckO lJ4fhwS/kZMHDKiJxtSGy54ghLiuCwMG6O1jpMQRCi2VLIaENSuH+8AKwSaiuNOxS065 34zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Qc++/pN3"; spf=pass (google.com: domain of mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id h16-20020a05620a401000b006b5df8f35a5si3831911qko.608.2022.07.30.01.05.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jul 2022 01:05:06 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Qc++/pN3"; spf=pass (google.com: domain of mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6096-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id D2F671C2097D for ; Sat, 30 Jul 2022 08:05:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EF80823CF; Sat, 30 Jul 2022 08:05:03 +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 2863323CD for ; Sat, 30 Jul 2022 08:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659168300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gjfYXwHTjVj4dpG6Lrt9wHMWmkdR4GiZUOwTPo+fbmU=; b=Qc++/pN3uFLtD0OUtxAxFhuH5YI0WNI0qz/KQagua3WZ14guFEfWLjavNTbNPT0zUpdJ5G DfeSvaT57NpGCtm7qZW0+RcHkcKR/dUR3mk+hWDLDWgFgPArZkfaEcGW8joXAJMSZDfqoL YcvJWZEHSV47pb4LJuyT1q0+1z4Fj+E= 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-38-MWnU0YGPMUGJtpiBTy6p0A-1; Sat, 30 Jul 2022 04:04:58 -0400 X-MC-Unique: MWnU0YGPMUGJtpiBTy6p0A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79CEE803301 for ; Sat, 30 Jul 2022 08:04:58 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 072F12026D64 for ; Sat, 30 Jul 2022 08:04:57 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 2/4] mptcp: more accurate receive buffer updates Date: Sat, 30 Jul 2022 10:04:40 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Currently mptcp_cleanup_rbuf() makes a significant effort to avoid acquiring the subflow socket lock, estimating if the tcp level cleanup could actually send an ack. Such estimate is a bit rough when accounting for receive window change, as it consider the msk available buffer space instead of the announced mptcp-level window. Let's consider the announced window instead, mirroring closely the plain TCP implementation. Signed-off-by: Paolo Abeni --- include/net/mptcp.h | 2 ++ net/ipv4/tcp.c | 3 +++ net/mptcp/options.c | 1 - net/mptcp/protocol.c | 14 +++++++++++--- net/mptcp/protocol.h | 6 +++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 7af7fd48acc7..4b6c66b73bf4 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -136,6 +136,7 @@ static inline bool rsk_drop_req(const struct request_so= ck *req) return tcp_rsk(req)->is_mptcp && tcp_rsk(req)->drop_req; } =20 +void mptcp_receive_window(const struct sock *ssk, int *rwnd); void mptcp_space(const struct sock *ssk, int *space, int *full_space); bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb, unsigned int *size, struct mptcp_out_options *opts); @@ -284,6 +285,7 @@ static inline bool mptcp_skb_can_collapse(const struct = sk_buff *to, return true; } =20 +static inline void mptcp_receive_window(const struct sock *ssk, int *rwnd)= { } static inline void mptcp_space(const struct sock *ssk, int *s, int *fs) { } static inline void mptcp_seq_show(struct seq_file *seq) { } =20 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 970e9a2cca4a..d0c0100f74f3 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1606,6 +1606,9 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied) if (copied > 0 && !time_to_ack && !(sk->sk_shutdown & RCV_SHUTDOWN)) { __u32 rcv_window_now =3D tcp_receive_window(tp); =20 + if (sk_is_mptcp(sk)) + mptcp_receive_window(sk, &rcv_window_now); + /* Optimize, __tcp_select_window() is not cheap. */ if (2*rcv_window_now <=3D tp->window_clamp) { __u32 new_window =3D __tcp_select_window(sk); diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 30d289044e71..563ef8fe5a85 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -604,7 +604,6 @@ static bool mptcp_established_options_dss(struct sock *= sk, struct sk_buff *skb, } opts->ext_copy.use_ack =3D 1; opts->suboptions =3D OPTION_MPTCP_DSS; - WRITE_ONCE(msk->old_wspace, __mptcp_space((struct sock *)msk)); =20 /* Add kind/length/subtype/flag overhead if mapping is not populated */ if (dss_size =3D=3D 0) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5af3d591a20b..17e2dbe43639 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -535,6 +535,14 @@ static void mptcp_subflow_cleanup_rbuf(struct sock *ss= k) unlock_sock_fast(ssk, slow); } =20 +void mptcp_receive_window(const struct sock *ssk, int *rwnd) +{ + const struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + const struct sock *sk =3D subflow->conn; + + *rwnd =3D __mptcp_receive_window(mptcp_sk(sk)); +} + static bool mptcp_subflow_could_cleanup(const struct sock *ssk, bool rx_em= pty) { const struct inet_connection_sock *icsk =3D inet_csk(ssk); @@ -550,13 +558,13 @@ static bool mptcp_subflow_could_cleanup(const struct = sock *ssk, bool rx_empty) =20 static void mptcp_cleanup_rbuf(struct mptcp_sock *msk) { - int old_space =3D READ_ONCE(msk->old_wspace); + int cur_window =3D __mptcp_receive_window(msk); struct mptcp_subflow_context *subflow; struct sock *sk =3D (struct sock *)msk; - int space =3D __mptcp_space(sk); + int new_window =3D __mptcp_space(sk); bool cleanup, rx_empty; =20 - cleanup =3D (space > 0) && (space >=3D (old_space << 1)); + cleanup =3D new_window > 0 && new_window >=3D (cur_window << 1); rx_empty =3D !__mptcp_rmem(sk); =20 mptcp_for_each_subflow(msk, subflow) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1bc9f6e77ddd..1e603f28f1db 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -260,7 +260,6 @@ struct mptcp_sock { int rmem_fwd_alloc; struct sock *last_snd; int snd_burst; - int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; * recovery related fields are under data_lock * protection @@ -336,6 +335,11 @@ static inline int __mptcp_rmem(const struct sock *sk) return atomic_read(&sk->sk_rmem_alloc) - READ_ONCE(mptcp_sk(sk)->rmem_rel= eased); } =20 +static inline int __mptcp_receive_window(const struct mptcp_sock *msk) +{ + return atomic64_read(&msk->rcv_wnd_sent) - READ_ONCE(msk->ack_seq); +} + static inline int __mptcp_space(const struct sock *sk) { return tcp_win_from_space(sk, READ_ONCE(sk->sk_rcvbuf) - __mptcp_rmem(sk)= ); --=20 2.35.3