From nobody Sun Feb 8 19:56:12 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1071730uad; Fri, 29 Jul 2022 11:14:55 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tHkTG/pf95IfkJvH4tZEe8obkGuHnbp/FqxK7yCe9UEapSLICmwz2Mr6eb+ACSzNEY1a4X X-Received: by 2002:a05:622a:40f:b0:31f:83c:e17d with SMTP id n15-20020a05622a040f00b0031f083ce17dmr4504471qtx.165.1659118495658; Fri, 29 Jul 2022 11:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659118495; cv=none; d=google.com; s=arc-20160816; b=MQApI1iFqZJWWunDS7/TC4Pi2Kx12l5AAcrdW1QRTxpQFlwv9iTb6cLCQBYHezg9CW Br47h1qg1S1A4zF18NhPt72hxoE2bI/ZxOulTx27bmxSYUp9V7s5w9FPSrjD2UqHrMUZ uBmVE3N4RBXlvfx+ZFjvtD/q2robKW4tV4FWfmqGgVFLJiYek04xBP8/JHNvoK2wSK4j t/z7GH/4u8e9MnLHBiRWFC+oCfccI7DoxtCMYEilFpOZTIMd+SFXRnMvcPEmzyE7hqVs tmuf9FonXujUctsQjVHgSojaJEnsT511djnW6qammEj89pEIDxbk5jE1DGklEl8shsqM IGIQ== 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=Qnm8YZso62fww3P3/CW+QUpzWDwUsCaBZjYMD8aYeaunkIvDCIgxWKuwsNRURm/nqy KqN3SoL/P2re46oOJdcmFfvMkrcQtoI7iKG1Zns/b9qQ5LHo46DXtXIo258FerZqvDLT jMLPYWcQfTpX1tB1rowPsXpyJO3pa0QAVfEG+sGWBCpR1SOwXu5U0QV5ixE28eCcZxdi 2GhFDpX983IyMlReMH6T9tuQVvrRyJ3e7FtVYurSbsBMBEsKldnXHlfs1kPFu/JQq7EG pMQELTXquH5qDbGBWJIVmLLWFTPGUkRAR9disK8XT6KbL418Mw7RQiKLhH2OriIOVDxw H5Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ce6+Gj9s; spf=pass (google.com: domain of mptcp+bounces-6077-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6077-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id e14-20020a0562141d0e00b0047305aae947si1425564qvd.345.2022.07.29.11.14.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jul 2022 11:14:55 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6077-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ce6+Gj9s; spf=pass (google.com: domain of mptcp+bounces-6077-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6077-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 76FBB1C2090F for ; Fri, 29 Jul 2022 18:14:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25BD04C8B; Fri, 29 Jul 2022 18:14:54 +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 99C604C77 for ; Fri, 29 Jul 2022 18:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659118490; 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=ce6+Gj9sAri6MYA9D15MbdjXb/VE59Jql54+pvitwH1K//GMl2Ml3CzXoqA0eoZgq2o/uP bzre56njwbsahYiV06Xo1457xNKUCbK7wYTG+CWbzEc30goXxs8C0nrvZ2s3D5kOZBz0WW ObpLHWpgawntMewM7iIZ7Oim5VxMatQ= 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-275-UADs1iQBMZeQpZG6MmSVpQ-1; Fri, 29 Jul 2022 14:14:49 -0400 X-MC-Unique: UADs1iQBMZeQpZG6MmSVpQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0CE7C1C05139 for ; Fri, 29 Jul 2022 18:14:49 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91EBC1121314 for ; Fri, 29 Jul 2022 18:14:48 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 1/4] mptcp: move RCVPRUNE event later Date: Fri, 29 Jul 2022 20:14:38 +0200 Message-Id: <81be75dff29adfdc136035168f5bcd6d1378b0b4.1659117128.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.78 on 10.11.54.3 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