From nobody Sun Feb 8 19:01:29 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1343810uad; Sat, 30 Jul 2022 01:05:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9+hdDAmAMskfM/snS/4TNZjfcjsmwORp7NghdZKFh32fwW9oFtU02aDvQ4amMnaz2WswG X-Received: by 2002:a05:620a:4606:b0:6b6:1df6:8ea7 with SMTP id br6-20020a05620a460600b006b61df68ea7mr5352312qkb.276.1659168304999; Sat, 30 Jul 2022 01:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659168304; cv=none; d=google.com; s=arc-20160816; b=mku9E7m8vQDDXdbdIMq3gzjSmp+FLwCqjj+2RKn6TgT19kUroNB32IU/HvnNC+V0xL pJavtbFklozZGw0JTlUiNpOe8DN//ZnoZF8WEG8RlI/pD+QfZeT5839NgxTahWmqyrk9 KAxT/dhn4IfwOJh3y6hLaafH8Ab51ioglm0w43xuDilmyuRzDqRc1Wmgn/tcxpc4wW6n j0lkpQ5XluXVyjw9igZ0vkWsNm0+tNwIyXBYEDoZjbZUDvi/1lg6/3SUzA9xQDQfNHrS daYx5ZTCbWTLEWAUVqc5gHupUkS5x+3fsfFQNuHmJ4t87dZag/q/vBwXJyjmR+b5mAEw kAkQ== 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=KK0raSO6CEyRBdHugwVOA1UTjuR41WA+Z5qJ1H1K+Nfxoz/b7rZKiQlcDih5AIHmwZ 7b5tuktqwtTULE3AOEIXZDuCY5rO4ndKP345Y9Y+cGJqWdOCNSaXgt3fQi/I8MT6QoMO zEOUHbdujA1Z6LtiNLKf4hA1CTxSyGZW8Uk4XtpBE9jnIWuPJvrI2D7bwjYxsCa/aVQE /ULmKf/q/hVWfO4PJj/7UMBR0yd5Un2vDTSlmlxZd0WRYzLmtvvxkyp541Azisg1VzLp yh+SqdjSjoh8q0MrAzvUc0XL1I8r3rMna1HMVFw9x2wtBI47zuBx00bPSg22QrJMgB52 AQNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XTq5f0go; spf=pass (google.com: domain of mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6095-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 v20-20020a05620a0f1400b006a70a853931si3608075qkl.607.2022.07.30.01.05.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jul 2022 01:05:04 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6095-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=XTq5f0go; spf=pass (google.com: domain of mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6095-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 BB41E1C20966 for ; Sat, 30 Jul 2022 08:05:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9222F23CB; 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.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 7856123CC 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=1659168299; 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=XTq5f0golIxveG8z7ZgfCKC2rdHuob8uKJMtFNtdthxXWYFousnaJp9boM4dGoZCzZZJKt W8o4uBFMC+fD1NayO7YhiLwbUarge0XVzPhDFsdjO7nh3kR2CmXBDgz0CwDjqdjkaAcR59 j8r9zQ+NGDNxgWZTND8DpF4fFGcr0+g= 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-357-oxOT0wnMOaCQTRgXCczp8g-1; Sat, 30 Jul 2022 04:04:58 -0400 X-MC-Unique: oxOT0wnMOaCQTRgXCczp8g-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 B750E1C05148 for ; Sat, 30 Jul 2022 08:04:57 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47BA62026D64 for ; Sat, 30 Jul 2022 08:04:57 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 1/4] mptcp: move RCVPRUNE event later Date: Sat, 30 Jul 2022 10:04:39 +0200 Message-Id: <81be75dff29adfdc136035168f5bcd6d1378b0b4.1659165378.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.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" 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