From nobody Fri Apr 19 00:39:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:44a7:0:0:0:0:0 with SMTP id n36csp474929uan; Fri, 26 Aug 2022 10:03:54 -0700 (PDT) X-Google-Smtp-Source: AA6agR54wxs65L1HtrYVgSS0Ei6WFyt761ihB8vV2xqBdLy3B/UbK+pO+jUM9FeNv4XvU0Jmn8OE X-Received: by 2002:ac8:5c12:0:b0:343:6c0e:df90 with SMTP id i18-20020ac85c12000000b003436c0edf90mr633612qti.4.1661533434828; Fri, 26 Aug 2022 10:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661533434; cv=none; d=google.com; s=arc-20160816; b=B90tgwB35nBnSssI0bsIoFkH+Br71JC6wG5Dx5hRdQSkOrceiiP2yqE1FcXrOqA2gj uP1FGEA53LfNPzJJZxegXO5MMQbmrAIs1olPcfQL4wBB8AgA3/8xCN7RK6uCEuMzBCfS TGRgB5DAk8I6pKxqWlmQNFnqiQpD7HQ7TuX0jHaXa2IH3SSAlz8cSaYW8W2/kb++cbc4 69ZZFFdgvQhZilEGFCqyDjka7tDrQVrG1MVwmaSAf/Un9GFM4TLi3McyJ/47xR9qwwad KINSPvJiYWxT4CFJME6oBO8Z3FXlLZJD7A77msXmAznhtGEkA6g2B7+PzgIEHPW5KOcP NVRg== 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:message-id:date:subject:to:from :dkim-signature; bh=HIuxaaAX5MY7xt7Xqr5a1gV9v0vpq5vV1eMu2h79iGc=; b=eFZJ6XjxJCA4isQqdyj7MTgY7C8WRHk/ddLxXg69Qg8ZkhUOtLu0TeYAVDJFDBd9aW YIcShDiF+MOLSvQkHqAKmALjvKt9o778bTD6G5fB4NnQiGwQcDz0Q7abwYmnAK+ebBLa zKGntFBvQ5ynBNwpEYMrpY2J/kC2fxfteQlU1fmn1AGXRM4jgF7R1S7tJU84sdXyHHas p6JJqkyCQbP+a9wo+u3FBor29a8WVAllMh/Y7JxfaMNBBZAOX+vE/PCvcAIgEnhrtS5b f0qCIqZuBP3R9sM+aUFL7aivIoNPsVeaGNMFXcAlncQFCS0kZjMlNg0Eta8oGqIJ93Sl GZHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BhfpuDbk; spf=pass (google.com: domain of mptcp+bounces-6169-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6169-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 a11-20020a0562140c2b00b004973213e5ecsi77688qvd.327.2022.08.26.10.03.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Aug 2022 10:03:54 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6169-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=BhfpuDbk; spf=pass (google.com: domain of mptcp+bounces-6169-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6169-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 105721C2094B for ; Fri, 26 Aug 2022 17:03:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D69974409; Fri, 26 Aug 2022 17:03:52 +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 43C2C4401 for ; Fri, 26 Aug 2022 17:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661533429; 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; bh=HIuxaaAX5MY7xt7Xqr5a1gV9v0vpq5vV1eMu2h79iGc=; b=BhfpuDbkrG2Sd2IpSkBY94Pm85R1QuBk4SEFdPj4bVrWSqxwcBHPaRcUa6xsGl5j+EXETt Ab181bjyLx4XsHzSWsqO+1Xevhum5w5/A0P065H9lGPRRCXh6uE0n0hR5uLCcRrWXQ4QFy 43d2MH6BwpxebQjnyDCmURRWOxwtHO4= 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-436-_P5KgbtsO5K2fvOTgpRBYw-1; Fri, 26 Aug 2022 13:03:48 -0400 X-MC-Unique: _P5KgbtsO5K2fvOTgpRBYw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6820E1C06ED6 for ; Fri, 26 Aug 2022 17:03:48 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEAC8C15BB3 for ; Fri, 26 Aug 2022 17:03:47 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next] mptcp: use fastclose on more edge scenarios. Date: Fri, 26 Aug 2022 19:03:34 +0200 Message-Id: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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" Daire reported a user-space application hang-up when the peer is forcibly closed before the data transfer completion. The relevant application expects the peer to either do an application-level clean shutdown or a transport-level connection reset. We can accommodate a such user by extending the fastclose usage: at fd close time, if the msk socket has some unread data, and at FIN_WAIT timeout. Signed-off-by: Paolo Abeni --- no fixes nor reported tag, as this is IMHO not for -net and is more a new feature than a bug-fix, but we can adjust --- net/mptcp/protocol.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f4891db86217..417ee8860366 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2515,6 +2515,16 @@ static void mptcp_mp_fail_no_response(struct mptcp_s= ock *msk) mptcp_reset_timeout(msk, 0); } =20 +static void mptcp_do_fastclose(struct sock *sk) +{ + struct mptcp_subflow_context *subflow, *tmp; + struct mptcp_sock *msk =3D mptcp_sk(sk); + + mptcp_for_each_subflow_safe(msk, subflow, tmp) + __mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), + subflow, MPTCP_CF_FASTCLOSE); +} + static void mptcp_worker(struct work_struct *work) { struct mptcp_sock *msk =3D container_of(work, struct mptcp_sock, work); @@ -2546,6 +2556,7 @@ static void mptcp_worker(struct work_struct *work) if (sock_flag(sk, SOCK_DEAD) && (mptcp_check_close_timeout(sk) || sk->sk_state =3D=3D TCP_CLOSE)) { inet_sk_state_store(sk, TCP_CLOSE); + mptcp_do_fastclose(sk); __mptcp_destroy_sock(sk); goto unlock; } @@ -2798,6 +2809,18 @@ static void __mptcp_destroy_sock(struct sock *sk) sock_put(sk); } =20 +static __poll_t mptcp_check_readable(struct mptcp_sock *msk) +{ + /* Concurrent splices from sk_receive_queue into receive_queue will + * always show at least one non-empty queue when checked in this order. + */ + if (skb_queue_empty_lockless(&((struct sock *)msk)->sk_receive_queue) && + skb_queue_empty_lockless(&msk->receive_queue)) + return 0; + + return EPOLLIN | EPOLLRDNORM; +} + static void mptcp_close(struct sock *sk, long timeout) { struct mptcp_subflow_context *subflow; @@ -2812,8 +2835,13 @@ static void mptcp_close(struct sock *sk, long timeou= t) goto cleanup; } =20 - if (mptcp_close_state(sk)) + if (mptcp_check_readable(msk)) { + /* the msk has read data, do the MPTCP equivalent of TCP reset */ + inet_sk_state_store(sk, TCP_CLOSE); + mptcp_do_fastclose(sk); + } else if (mptcp_close_state(sk)) { __mptcp_wr_shutdown(sk); + } =20 sk_stream_wait_close(sk, timeout); =20 @@ -3621,18 +3649,6 @@ static int mptcp_stream_accept(struct socket *sock, = struct socket *newsock, return err; } =20 -static __poll_t mptcp_check_readable(struct mptcp_sock *msk) -{ - /* Concurrent splices from sk_receive_queue into receive_queue will - * always show at least one non-empty queue when checked in this order. - */ - if (skb_queue_empty_lockless(&((struct sock *)msk)->sk_receive_queue) && - skb_queue_empty_lockless(&msk->receive_queue)) - return 0; - - return EPOLLIN | EPOLLRDNORM; -} - static __poll_t mptcp_check_writeable(struct mptcp_sock *msk) { struct sock *sk =3D (struct sock *)msk; --=20 2.37.1