From nobody Sun Feb 8 19:25:39 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp995379uad; Fri, 29 Jul 2022 08:34:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR72Qsg6iLqSNsIWLqM7WJZe+xyO4CIZH7b1tHqeVFcMlXLMiCh0afcQjGGP5lacHZpmJ7AN X-Received: by 2002:a17:903:1111:b0:16a:acf4:e951 with SMTP id n17-20020a170903111100b0016aacf4e951mr4355205plh.72.1659108840725; Fri, 29 Jul 2022 08:34:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659108840; cv=none; d=google.com; s=arc-20160816; b=RVUSEbPDUC87bHfjpIZnqFSFbqLJoW/xkDZPZTFjLueUYXfKHScNX58UunzX6WLidm vZkopnFt0/IIBSuo2qtQMTJjahE6knapbmE3sxshuJOaf0S7mPbFvydb1whhwWeOr6TT 896UK4N6Y7QCOaj2fEm9eFfrTbHqyEI/nlhYvO4n6KRQ3DgyaKG0aMsHrnwtvski5ua1 sDlSrvvr3Ud09rLSAhZr4mxjHvbSTZNyAz4YtpZso8C2FMvcIQCDGEhky9jrUr8ETYLL pVz45DgwL7nIRFPFv3xyoREph0gIMhNBd1/Cr1LQXUIeC9+Y4ggopCnRgg8XwnVwDMF/ RncQ== 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=bOxjCT/a5P87RNatFo2lM2GkXg3NSBmm+aMpbukibtQ=; b=OUoMVGsPz07xD/rE6/ugoCzlHlwheV6pQfpAqgXS4HenAR/TfewzUjBK5Q7Q93xjae DddUuCGI0GbEDscPL4CrOaielQfhRi1DC0bGUowqEFSPNaQlAfz9Rgb3SimrE6svgxUc ifb4ewfu2ZZm8XBe3S5Yv4TF0AJGBbCv6MKfxH7LWUOw6D5LPTpEGxj3lfBR6fYAwzvM aSRmxzqxrtbIUbYWA8kszhL7bVT6X+VLPFeX9YbThX36pk3qrk6fBqmPQzwCht1Jf3bU rxJqMxkgFvRbpMCjaCOuCtqohY7u3V+xoI+yn3E4veL1BrTxGJXz7gCFTU/uG1gzzsHm +8Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fnCt1ad3; spf=pass (google.com: domain of mptcp+bounces-6067-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6067-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. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k13-20020a636f0d000000b0041a4f693412si4667313pgc.134.2022.07.29.08.34.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jul 2022 08:34:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6067-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fnCt1ad3; spf=pass (google.com: domain of mptcp+bounces-6067-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6067-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 398B5280E31 for ; Fri, 29 Jul 2022 15:34:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1F8324C6C; Fri, 29 Jul 2022 15:33:59 +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 146C34A23 for ; Fri, 29 Jul 2022 15:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659108835; 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=bOxjCT/a5P87RNatFo2lM2GkXg3NSBmm+aMpbukibtQ=; b=fnCt1ad34yhqTsL//opqkz/EJK0s1WbprzW6AMC+f1xjj3qK3YOqEve3krd8aT3qzINkuC F0UCAlKZLI/e5hLBweFKmygIhxjTQBsDGC4InGqHgu3CGzhuqoDAvOa5Cfc02ui7Nod7n6 i0tlnzY94cjbMsrwzclIoQnpRxznJLM= 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-635-K-Gdf8SPPlqbakLZ3R-crw-1; Fri, 29 Jul 2022 11:33:53 -0400 X-MC-Unique: K-Gdf8SPPlqbakLZ3R-crw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38F9185A581 for ; Fri, 29 Jul 2022 15:33:53 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD80418ECB for ; Fri, 29 Jul 2022 15:33:52 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 1/4] mptcp: move RCVPRUNE event later Date: Fri, 29 Jul 2022 17:33:01 +0200 Message-Id: <81be75dff29adfdc136035168f5bcd6d1378b0b4.1659107989.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 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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" This clean the code a bit, and avoid skipping msk receive buffer update on some weird corner case. Signed-off-by: Paolo Abeni --- net/mptcp/protocol.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 970da88cd04f..5af3d591a20b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -642,6 +642,10 @@ static bool __mptcp_move_skbs_from_subflow(struct mptc= p_sock *msk, } } =20 + /* over limit? can't append more skbs to msk */ + if (__mptcp_rmem(sk) > sk_rbuf) + return true; + pr_debug("msk=3D%p ssk=3D%p", msk, ssk); tp =3D tcp_sk(ssk); do { @@ -786,8 +790,6 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, st= ruct sock *ssk) void mptcp_data_ready(struct sock *sk, struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); - struct mptcp_sock *msk =3D mptcp_sk(sk); - int sk_rbuf, ssk_rbuf; =20 /* The peer can send data while we are shutting down this * subflow at msk destruction time, but we must avoid enqueuing @@ -796,20 +798,9 @@ void mptcp_data_ready(struct sock *sk, struct sock *ss= k) if (unlikely(subflow->disposable)) return; =20 - ssk_rbuf =3D READ_ONCE(ssk->sk_rcvbuf); - sk_rbuf =3D READ_ONCE(sk->sk_rcvbuf); - if (unlikely(ssk_rbuf > sk_rbuf)) - sk_rbuf =3D ssk_rbuf; - - /* over limit? can't append more skbs to msk, Also, no need to wake-up*/ - if (__mptcp_rmem(sk) > sk_rbuf) { - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); - return; - } - /* Wake-up the reader only for in-sequence data */ mptcp_data_lock(sk); - if (move_skbs_to_msk(msk, ssk)) + if (move_skbs_to_msk(mptcp_sk(sk), ssk)) sk->sk_data_ready(sk); =20 mptcp_data_unlock(sk); --=20 2.35.3