From nobody Thu Sep 18 08:15:35 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209408uab; Wed, 15 Jun 2022 13:28:31 -0700 (PDT) X-Google-Smtp-Source: AGRyM1swwzvEx1xZV/JSdNdZvLnvv2iKrgwo0K63t8woGXnKhqtbRlNJJTxWZSNuH6DWGoabyy4h X-Received: by 2002:a05:6808:18a2:b0:32e:f46e:5183 with SMTP id bi34-20020a05680818a200b0032ef46e5183mr776454oib.71.1655324911803; Wed, 15 Jun 2022 13:28:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324911; cv=none; d=google.com; s=arc-20160816; b=Q1ehAc4Usmxj8pS39F2mq2U6lVtuNtJl77Ast3ezrdtpfN+TPnFbI/Dv40vNr+fG+7 Lk3w2rCIGP6Lm+lWd+VjMJpfGB3F6xj8I86jS5XHtrWnf3qFj6IrUYcLGJwY5+KgvhqR OnUH7eVZObxm2CsOIONYbcP28u6IYO7Lvc0d50W9ztPhzIZPKdgYwKhUqd5Gg/n/Lji9 vap1CUG5C0gmeUGKeUXeMKOv0yy71QXMQxhdnjyAGl8Tay9MvlHLW/lc3/6EOBr1QLcp +N2pvGbi/VSSXLeIgQ1FD7wK1LGYGGhE37vx0ezhArHrvuuV3mAhV5M11m+gz2odnvIQ g45w== 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=/gUpc9d77Yr9CavgneuMYlMESCy3ScnOki+efXZPISw=; b=W0V+RtsQxJeBrMxRNTKf30f0A/KVI9sQpq7ClNNo3DsxBHvQlk6Aiv2Fa5dSslxZmq wxCSj0jEJLs1igv2rEw5EByiomECkqQt+zrUYizqI51hYX7Ty6z+w+X8RA/8fbHfPBfK lR1Jw+0pNeJFk2gCrOfn1VAPT6CG5I7bGPbacpQXntUIl+7DiyAsi4liKbq0msyHVmzg 6noUG1KKKJb3vVx4gVgWi84g9d6AwqaQg6V7eGPH4nQF97wRgtEmk/r5Mxz/MYBala9y xkZITGVOt8uSRq3UHiKMPLE83hBrqdGQhDLNLoiZOPeHkMJHQtxVTBn4XItBjWRRCjZX Al1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="GH/o8a6b"; spf=pass (google.com: domain of mptcp+bounces-5663-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5663-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 w24-20020a4ae9f8000000b0041b87ed09bfsi187702ooc.22.2022.06.15.13.28.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:28:31 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5663-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="GH/o8a6b"; spf=pass (google.com: domain of mptcp+bounces-5663-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5663-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 7D25A2E0A1F for ; Wed, 15 Jun 2022 20:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E34C43D99; Wed, 15 Jun 2022 20:28:27 +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 890703D96 for ; Wed, 15 Jun 2022 20:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655324905; 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=/gUpc9d77Yr9CavgneuMYlMESCy3ScnOki+efXZPISw=; b=GH/o8a6b8qL8CLHssVCeiN1hW802ChPmeRWgforIYqf29ahKju5yUpMzvAYVL8IQ2A6arz pHGdTE86Wl11fyW2JoPlkNNx/lMybkQFgYbBEejNM0JQ9TL4rtNceOE0FVAGfOC+Vc6WOo RiAiV/ceBQmmUsvk5UHs+BYSv7mhGmc= 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-154-MSLl_aytM0ihrdNfms8u3A-1; Wed, 15 Jun 2022 16:28:24 -0400 X-MC-Unique: MSLl_aytM0ihrdNfms8u3A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 482AE83397F for ; Wed, 15 Jun 2022 20:28:24 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBB8040C1288 for ; Wed, 15 Jun 2022 20:28:23 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 4/6] mptcp: fix shutdown vs fallback race Date: Wed, 15 Jun 2022 22:28:11 +0200 Message-Id: <295d4399ffbe647652245925f73aafdb7b072c38.1655324843.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.84 on 10.11.54.2 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" If the MPTCP socket shutdown happens before a fallback to TCP, and all the pending data have been already spooled, we never close the TCP connection. Address the issue explicitly checking for critical condition at fallback time. Signed-off-by: Paolo Abeni --- net/mptcp/options.c | 2 +- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 19 ++++++++++++++++--- net/mptcp/subflow.c | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 0bfa6662447c..57eab237c837 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -966,7 +966,7 @@ static bool check_fully_established(struct mptcp_sock *= msk, struct sock *ssk, goto reset; subflow->mp_capable =3D 0; pr_fallback(msk); - __mptcp_do_fallback(msk); + mptcp_do_fallback(ssk); return false; } =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 50026b8da625..4f4d6c66e190 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1245,7 +1245,7 @@ static void mptcp_update_infinite_map(struct mptcp_so= ck *msk, MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPTX); mptcp_subflow_ctx(ssk)->send_infinite_map =3D 0; pr_fallback(msk); - __mptcp_do_fallback(msk); + mptcp_do_fallback(ssk); } =20 static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 077a717799a0..ad9b02b1b3e6 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -941,12 +941,25 @@ static inline void __mptcp_do_fallback(struct mptcp_s= ock *msk) set_bit(MPTCP_FALLBACK_DONE, &msk->flags); } =20 -static inline void mptcp_do_fallback(struct sock *sk) +static inline void mptcp_do_fallback(struct sock *ssk) { - struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); - struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct sock *sk =3D subflow->conn; + struct mptcp_sock *msk; =20 + msk =3D mptcp_sk(sk); __mptcp_do_fallback(msk); + if (READ_ONCE(msk->snd_data_fin_enable) && !(ssk->sk_shutdown & SEND_SHUT= DOWN)) { + gfp_t saved_allocation =3D ssk->sk_allocation; + + /* we are in a atomic (BH) scope, override ssk default for data + * fin allocation + */ + ssk->sk_allocation =3D GFP_ATOMIC; + ssk->sk_shutdown |=3D SEND_SHUTDOWN; + tcp_shutdown(ssk, SEND_SHUTDOWN); + ssk->sk_allocation =3D saved_allocation; + } } =20 #define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=3D%p)", __func__,= a) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 040901c1f40c..75fdc6474d0e 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1273,7 +1273,7 @@ static bool subflow_check_data_avail(struct sock *ssk) return false; } =20 - __mptcp_do_fallback(msk); + mptcp_do_fallback(ssk); } =20 skb =3D skb_peek(&ssk->sk_receive_queue); --=20 2.35.3