From nobody Sun May 5 23:53:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2036969uau; Tue, 21 Jun 2022 10:23:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u9jJUxAD7nkFhRWxCw8BfFmJVrrmQYSIFJ48OstN1fVYmcF5PlPIES6/FwJukf93LlOr9E X-Received: by 2002:a9d:730e:0:b0:60c:7897:a156 with SMTP id e14-20020a9d730e000000b0060c7897a156mr12013079otk.189.1655832220259; Tue, 21 Jun 2022 10:23:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655832220; cv=none; d=google.com; s=arc-20160816; b=y6yEExj561SEJS2D4olV6KdWXhK9cN1cBuKbVmGfLzoZNs0021SDZ3DxY+LJWsUqrm +9kXNXH+uPOb/JuQ+8EeJnr6DFbyjMMExDR5ksR4zBFaK2Prd2af2tlnNACiAQbCypSQ 13ccvQyyeRqXFNU87C3iPFeX4DrJLL3ByN17/+SjEBB86h3G1v+HKCD8m4YZ8js2vtyU i+52IHnUt4qyVf43zHvomhSLYylwdgCBJnUh38SXz5H5lind9Xyh2EXI84KPYcQKkG2G l9CighSOtW3rLFKEQbJvE7D3aV/nTYjjuJUB9mnsOMs85it8+YgmJKfyWR0mvhLjWdZa Iutw== 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=zduH8uaZcAHo2NbiT8xUZB5EHlogKwIN6MiufFddsms=; b=npWteaLVpYjCPVHOwni1zKqEbqb9eew9DNHCy62vMKlNkwKOkM2b0zdQC6vvfvuCnA rFFk34fYt6r2HvZ3LbVMcQb6uJiycDd4zYfkSle4H7kloc+NBOKYC+kBPWqD+2+e/BOI b1YLmjqCF8Hkw0jGq1qAAXaMBpVU2Uh+ulOCQ0J1Z/H1vt2MwZraDG2Z6KnLcAseL6nH B7nIzYDq6u+FUJOemdLL6Tvsja5RTJdIMqVk3a6uUnH8fa1MrffI/XwWg1QLjYcxWW2W UBuCZVW1ZHXNlOM6bOX32JJFiBpJi0I0u5Ulbpw/YPha0r41kHFUtbHECUMXINssRi3F nPYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ar45sErC; spf=pass (google.com: domain of mptcp+bounces-5741-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5741-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 n4-20020a4abd04000000b0040e2ccc3109si13726991oop.55.2022.06.21.10.23.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 10:23:40 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5741-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=Ar45sErC; spf=pass (google.com: domain of mptcp+bounces-5741-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5741-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 F2BA12E0A15 for ; Tue, 21 Jun 2022 17:23:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4264B747D; Tue, 21 Jun 2022 17:23:38 +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 D978E747B for ; Tue, 21 Jun 2022 17:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655832215; 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=zduH8uaZcAHo2NbiT8xUZB5EHlogKwIN6MiufFddsms=; b=Ar45sErCm0mn+Ku+Dcr85t3aQwHDuZIfldfrR7iPbJ8jelMz6IatIO0YzDIS/opnbIRC/u D+o2BWAQjtHTdxVr36wTrKi80n+ketpEVBPcmhgkqKVkLtelvBwHrw0B2nciuCh4Ev6rsD 5054BAXC8ePef7Eo+d5ezByuq5JPM3E= 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-265-boRM78jENm-WFKEw_OFo_Q-1; Tue, 21 Jun 2022 13:23:34 -0400 X-MC-Unique: boRM78jENm-WFKEw_OFo_Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4723680029D for ; Tue, 21 Jun 2022 17:23:34 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E6B140CFD0A for ; Tue, 21 Jun 2022 17:23:33 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-net 1/6] mptcp: fix error mibs accounting Date: Tue, 21 Jun 2022 19:23:12 +0200 Message-Id: <3a7b0695362fe7228484d2a2bc97fc26ca68f919.1655829222.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.1 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" The current accounting for MP_FAIL and FASTCLOSE is not very accurate: both can be increased even when the related option is not really sent. Move the accounting into the correct place. Fixes: eb7f33654dc1 ("mptcp: add the mibs for MP_FAIL") Fixes: 1e75629cb964 ("mptcp: add the mibs for MP_FASTCLOSE") Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/options.c | 6 +++--- net/mptcp/pm.c | 1 - net/mptcp/subflow.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index be3b918a6d15..0bfa6662447c 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -765,6 +765,7 @@ static noinline bool mptcp_established_options_rst(stru= ct sock *sk, struct sk_bu opts->suboptions |=3D OPTION_MPTCP_RST; opts->reset_transient =3D subflow->reset_transient; opts->reset_reason =3D subflow->reset_reason; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX); =20 return true; } @@ -788,6 +789,7 @@ static bool mptcp_established_options_fastclose(struct = sock *sk, opts->rcvr_key =3D msk->remote_key; =20 pr_debug("FASTCLOSE key=3D%llu", opts->rcvr_key); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); return true; } =20 @@ -807,7 +809,7 @@ static bool mptcp_established_options_mp_fail(struct so= ck *sk, *size =3D TCPOLEN_MPTCP_FAIL; opts->suboptions |=3D OPTION_MPTCP_FAIL; opts->fail_seq =3D subflow->map_seq; - + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); pr_debug("MP_FAIL fail_seq=3D%llu", opts->fail_seq); =20 return true; @@ -833,13 +835,11 @@ bool mptcp_established_options(struct sock *sk, struc= t sk_buff *skb, mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); } /* MP_RST can be used with MP_FASTCLOSE and MP_FAIL if there is room */ if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX); } return true; } diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 2a57d95d5492..3c7f07bb124e 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -309,7 +309,6 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fai= l_seq) pr_debug("send MP_FAIL response and infinite map"); =20 subflow->send_mp_fail =3D 1; - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); subflow->send_infinite_map =3D 1; } else { pr_debug("MP_FAIL response received"); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 5351d54e514a..57d2d8d933d0 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -958,10 +958,8 @@ static enum mapping_status validate_data_csum(struct s= ock *ssk, struct sk_buff * subflow->map_data_csum); if (unlikely(csum)) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); - if (subflow->mp_join || subflow->valid_csum_seen) { + if (subflow->mp_join || subflow->valid_csum_seen) subflow->send_mp_fail =3D 1; - MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_MPFAILTX); - } return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; } =20 --=20 2.35.3 From nobody Sun May 5 23:53:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2036979uau; Tue, 21 Jun 2022 10:23:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uxGF3nD2Q8TpKZxzdimKKbPcJrBHdPOxGd33zPm4TJ29xFzaDd1EMstP3Wdxfl8U0B5SeM X-Received: by 2002:a17:90b:4f43:b0:1ea:4356:51bc with SMTP id pj3-20020a17090b4f4300b001ea435651bcmr33936290pjb.144.1655832221084; Tue, 21 Jun 2022 10:23:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655832221; cv=none; d=google.com; s=arc-20160816; b=Jh8wYzSULk/hZ8keQI5vOH77roIxmzZqR658nQRliuKKyL+AaHdsZ4HNEvLraI+g4H RV3UyNvniHT6JOMaQdYvSezJhO4QIP+UEjUbQ9ihQ80u6YeRc/wAL5emQWpWSIJI8ngh pWVMdITus6SMWuD3Dggnlb7lvrel9RdvsWCz4VMcP+Vwk0oY7CY1qs/LobhfgqH13tK8 s63MjeKnv5/2uIkkHJQMDeY9+E+t1LBHPX5V6GfRXZZwgmPkouX67ysInxjMSie5rxzB 0AJGWBqKS6d4NnG8O5RxGSgdtci8WJ+Dedn6WtvaVACAJYQ2Y2WTbLhanpT0AanX8n2z kKfA== 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=QyEw0Hxej3KhuemgaxQYg9IJahwM7VHtKclJqGNymzw=; b=R0p8qZZ+DEnvz+uXCuhv61z6N48GydkR8lxeeuA4xpD1m0knAUhhpZF6/oMTjRAeNw 2mPjw1th7ca0LZH3/T0O/N+UmZiO6CAU3W2KKkI0WeLVC0MKT4HIU0p8JVHZF+ifLr1z 10ueyleGdoSd8hJKxVY6SfzLGTc4bagy5Sz58YkgtBeAJUfBiF4NRcRddAma+Calvu0y TgPVsYlpaa5F5KF8S00s/3QunnM/tPjpRcfb75C1tcPL9Rj6a5O6Ipt5JqTjLKnbMV5B y7kvSWZgGuiQ65nKF7auDa2cMWpBt/3nhn3qwiVZcsHNMozY59CoNu/PT0JqJiwE4XMf bvhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cYJjZXfU; spf=pass (google.com: domain of mptcp+bounces-5742-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5742-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 t12-20020a056a0021cc00b0051bbdb40149si21940233pfj.122.2022.06.21.10.23.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 10:23:41 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5742-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=cYJjZXfU; spf=pass (google.com: domain of mptcp+bounces-5742-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5742-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 B268D2809AA for ; Tue, 21 Jun 2022 17:23:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 424FC747E; Tue, 21 Jun 2022 17:23:39 +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 C218B4C94 for ; Tue, 21 Jun 2022 17:23:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655832216; 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=QyEw0Hxej3KhuemgaxQYg9IJahwM7VHtKclJqGNymzw=; b=cYJjZXfU6HQtMFGphXGjOUL0trkhSIu3GMzqjr5goi/pGlMPVRrGWYgstbSymWgNdeLKKC /YxESsQwTYYxQbeP6j5TlRZU1UDYqU60Ze1Eo53IE6OA9CUiAXBi4fp06aZU88v74+NGxq syiHhAYO7DdzeDYvI7WseAeIFKnW8vY= 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-510-YkQ1kXjPOmihwZAKxdjWag-1; Tue, 21 Jun 2022 13:23:35 -0400 X-MC-Unique: YkQ1kXjPOmihwZAKxdjWag-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55F553804510 for ; Tue, 21 Jun 2022 17:23:35 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F90940CFD0A for ; Tue, 21 Jun 2022 17:23:34 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-net 2/6] mptcp: introduce MAPPING_BAD_CSUM Date: Tue, 21 Jun 2022 19:23:13 +0200 Message-Id: <79cfd1117a2697a6376f98913224fd9601e23780.1655829222.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.1 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 allow moving a couple of conditional out of the fast path, making the code more easy to follow and will simplify the next patch. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/subflow.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 57d2d8d933d0..98b12a9c4eb5 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -843,7 +843,8 @@ enum mapping_status { MAPPING_INVALID, MAPPING_EMPTY, MAPPING_DATA_FIN, - MAPPING_DUMMY + MAPPING_DUMMY, + MAPPING_BAD_CSUM }; =20 static void dbg_bad_map(struct mptcp_subflow_context *subflow, u32 ssn) @@ -958,9 +959,7 @@ static enum mapping_status validate_data_csum(struct so= ck *ssk, struct sk_buff * subflow->map_data_csum); if (unlikely(csum)) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); - if (subflow->mp_join || subflow->valid_csum_seen) - subflow->send_mp_fail =3D 1; - return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; + return MAPPING_BAD_CSUM; } =20 subflow->valid_csum_seen =3D 1; @@ -1178,10 +1177,8 @@ static bool subflow_check_data_avail(struct sock *ss= k) =20 status =3D get_mapping_status(ssk, msk); trace_subflow_check_data_avail(status, skb_peek(&ssk->sk_receive_queue)); - if (unlikely(status =3D=3D MAPPING_INVALID)) - goto fallback; - - if (unlikely(status =3D=3D MAPPING_DUMMY)) + if (unlikely(status =3D=3D MAPPING_INVALID || status =3D=3D MAPPING_DUMM= Y || + status =3D=3D MAPPING_BAD_CSUM)) goto fallback; =20 if (status !=3D MAPPING_OK) @@ -1223,7 +1220,10 @@ static bool subflow_check_data_avail(struct sock *ss= k) fallback: if (!__mptcp_check_fallback(msk)) { /* RFC 8684 section 3.7. */ - if (subflow->send_mp_fail) { + if (status =3D=3D MAPPING_BAD_CSUM && + ((subflow->mp_join || subflow->valid_csum_seen))) { + subflow->send_mp_fail =3D 1; + if (!READ_ONCE(msk->allow_infinite_fallback)) { ssk->sk_err =3D EBADMSG; tcp_set_state(ssk, TCP_CLOSE); --=20 2.35.3 From nobody Sun May 5 23:53:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2036992uau; Tue, 21 Jun 2022 10:23:42 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tODqbVQ/ldgui6jfqgPKckSTj2tadNdrDdrEeTh5WwPhSp4CbSfxh8vU3gxErUsNfNYsXE X-Received: by 2002:a63:7946:0:b0:408:c6ac:939b with SMTP id u67-20020a637946000000b00408c6ac939bmr27282576pgc.349.1655832222236; Tue, 21 Jun 2022 10:23:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655832222; cv=none; d=google.com; s=arc-20160816; b=rJaA32iX3zcyzWdzd2oLDckxt86ce4tenubhh713mNh2Ala3DRQhIJhy9KoHHpM2U7 bJWxdfMAkYaQ3bb3scRYm1W7hpxogRj6aBJn7bHA2fwS5NwCVozVR4LSo/W1rts2hHjo 9lcvCKwP5SiZmE/CW3QXlgneM43j+8EOuLkWiXb8b/T07hAG4x060VJyvFbUL4bKDnVp 7vR+L7h+4bVm40fdHIiqrN0uYOKOSGSIfUTM6KWhPLWehE5Dv5oHpdztFyY2i+d7dVSn igg+TDZ4Ddt90VwjcqCDTqA6d5Rpj2sfhxVBDUIifnYIfb3dsE+hKmQsNLzycCOiyGOg b8GA== 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=Q/f3mi8a44SumZTuibnx56J5FEpM7idTkqtgPJnmMuc=; b=nwGJkOrlGsL6OIwrxXOYDYQg3/fEur44jiVHxROKV6B8IwsDhLW7TEfGIbQ8ycc90h Y5vR4h9V3p1Xsk+PUqs/h9FGlHQPYWxEEE2UBV+TlgjfVxfxM2FtV7Ahu57bX2ct7lrA kMkeFH+XjtAtpK+JMniG52JMv9cq/fD9IfiTxo4jzt/4dcuqwvOAR14uSQFp98OMnZ95 +Aikn+Q+Lmt0k1Hu5GWUK9HqJ5RhbAIBqM0eNhE6tVrgg/DucvHEta5AD8cp18X9M0/j isD4x9uhfOKIsDmafSXBe3uXZthATvLGC6C7Pt++Hkj8c+pRBEwmvzmjW5ZxDxTHyr47 t6Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EDGGwUkF; spf=pass (google.com: domain of mptcp+bounces-5743-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5743-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 14-20020a63000e000000b0040cb9dc7736si8605103pga.422.2022.06.21.10.23.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 10:23:42 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5743-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=EDGGwUkF; spf=pass (google.com: domain of mptcp+bounces-5743-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5743-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 055AE280AB1 for ; Tue, 21 Jun 2022 17:23:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A2C87747C; Tue, 21 Jun 2022 17:23:40 +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 142BB747B for ; Tue, 21 Jun 2022 17:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655832218; 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=Q/f3mi8a44SumZTuibnx56J5FEpM7idTkqtgPJnmMuc=; b=EDGGwUkF1GAdhtaMf1EwDU6xx/WCc8hntjN6Zlya/FT/kQWAMW76NZPYn9xFN7rTNJB3Ur N/42ikp/QB/qkLhjsap0mboENsHrLEvhpaIv5TFzN04s0GXg9XeB0+UxJgAB+tgr88NTa6 BVfF2Ba2/mflKwwdcSBNGKtLFJHn9aU= 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-228-JxmU9DBOOm6SIA-tlDFirw-1; Tue, 21 Jun 2022 13:23:36 -0400 X-MC-Unique: JxmU9DBOOm6SIA-tlDFirw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8E8EF85A584 for ; Tue, 21 Jun 2022 17:23:36 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA4F240CFD0A for ; Tue, 21 Jun 2022 17:23:35 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-net 3/6] Squash-to: "mptcp: invoke MP_FAIL response when needed" Date: Tue, 21 Jun 2022 19:23:14 +0200 Message-Id: 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.1 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 tries to address a few issues outstanding in the mentioned patch: - we explicitly need to reset the timeout timer for mp_fail's sake - we need to explicitly generate a tcp ack for mp_fail, otherwise there are no guarantees for suck option being sent out - the timeout timer needs handling need some caring, as it's still shared between mp_fail and msk socket timeout. - we can re-use msk->first for msk->fail_ssk, as only the first/mpc subflow can fail without reset. That additionally avoid the need to clear fail_ssk on the relevant subflow close. - fail_tout would need some additional annotation. Just to be on the safe side move its manipulaiton under the ssk socket lock. Last 2 paragraph of the squash to commit should be replaced with: """ It leverages the fact that only the MPC/first subflow can gracefully fail to avoid unneeded subflows traversal: the failing subflow can be only msk->first. A new 'fail_tout' field is added to the subflow context to record the MP_FAIL response timeout and use such field to reliably share the timeout timer between the MP_FAIL event and the MPTCP socket close timeout. Finally, a new ack is generated to send out MP_FAIL notification as soon as we hit the relevant condition, instead of waiting a possibly unbound time for the next data packet. """ Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- v3 -> v4: - fixed a couple of typo in commit message --- net/mptcp/pm.c | 4 +++- net/mptcp/protocol.c | 50 ++++++++++++++++++++++++++++++++++++-------- net/mptcp/protocol.h | 4 ++-- net/mptcp/subflow.c | 30 ++++++++++++++++++++++++-- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 3c7f07bb124e..45e2a48397b9 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -305,13 +305,15 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 f= ail_seq) if (!READ_ONCE(msk->allow_infinite_fallback)) return; =20 - if (!msk->fail_ssk) { + if (!subflow->fail_tout) { pr_debug("send MP_FAIL response and infinite map"); =20 subflow->send_mp_fail =3D 1; subflow->send_infinite_map =3D 1; + tcp_send_ack(sk); } else { pr_debug("MP_FAIL response received"); + WRITE_ONCE(subflow->fail_tout, 0); } } =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index a0f9f3831509..725fd417ebb1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -500,7 +500,7 @@ static void mptcp_set_timeout(struct sock *sk) __mptcp_set_timeout(sk, tout); } =20 -static bool tcp_can_send_ack(const struct sock *ssk) +static inline bool tcp_can_send_ack(const struct sock *ssk) { return !((1 << inet_sk_state_load(ssk)) & (TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCP= F_LISTEN)); @@ -2490,24 +2490,50 @@ static void __mptcp_retrans(struct sock *sk) mptcp_reset_timer(sk); } =20 +/* schedule the timeout timer for the relevant event: either close timeout + * or mp_fail timeout. The close timeout takes precedence on the mp_fail o= ne + */ +void mptcp_reset_timeout(struct mptcp_sock *msk, unsigned long fail_tout) +{ + struct sock *sk =3D (struct sock *)msk; + unsigned long timeout, close_timeout; + + if (!fail_tout && !sock_flag(sk, SOCK_DEAD)) + return; + + close_timeout =3D inet_csk(sk)->icsk_mtup.probe_timestamp - tcp_jiffies32= + jiffies + TCP_TIMEWAIT_LEN; + + /* the close timeout takes precedence on the fail one, and here at least = one of + * them is active + */ + timeout =3D sock_flag(sk, SOCK_DEAD) ? close_timeout : fail_tout; + + sk_reset_timer(sk, &sk->sk_timer, timeout); +} + static void mptcp_mp_fail_no_response(struct mptcp_sock *msk) { - struct sock *ssk =3D msk->fail_ssk; + struct sock *ssk =3D msk->first; bool slow; =20 + if (!ssk) + return; + pr_debug("MP_FAIL doesn't respond, reset the subflow"); =20 slow =3D lock_sock_fast(ssk); mptcp_subflow_reset(ssk); + WRITE_ONCE(mptcp_subflow_ctx(ssk)->fail_tout, 0); unlock_sock_fast(ssk, slow); =20 - msk->fail_ssk =3D NULL; + mptcp_reset_timeout(msk, 0); } =20 static void mptcp_worker(struct work_struct *work) { struct mptcp_sock *msk =3D container_of(work, struct mptcp_sock, work); struct sock *sk =3D &msk->sk.icsk_inet.sk; + unsigned long fail_tout; int state; =20 lock_sock(sk); @@ -2544,7 +2570,8 @@ static void mptcp_worker(struct work_struct *work) if (test_and_clear_bit(MPTCP_WORK_RTX, &msk->flags)) __mptcp_retrans(sk); =20 - if (msk->fail_ssk && time_after(jiffies, msk->fail_tout)) + fail_tout =3D msk->first ? READ_ONCE(mptcp_subflow_ctx(msk->first)->fail_= tout) : 0; + if (fail_tout && time_after(jiffies, fail_tout)) mptcp_mp_fail_no_response(msk); =20 unlock: @@ -2572,8 +2599,6 @@ static int __mptcp_init_sock(struct sock *sk) WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk))); WRITE_ONCE(msk->allow_infinite_fallback, true); msk->recovery =3D false; - msk->fail_ssk =3D NULL; - msk->fail_tout =3D 0; =20 mptcp_pm_data_init(msk); =20 @@ -2804,6 +2829,7 @@ static void __mptcp_destroy_sock(struct sock *sk) static void mptcp_close(struct sock *sk, long timeout) { struct mptcp_subflow_context *subflow; + struct mptcp_sock *msk =3D mptcp_sk(sk); bool do_cancel_work =3D false; =20 lock_sock(sk); @@ -2822,10 +2848,16 @@ static void mptcp_close(struct sock *sk, long timeo= ut) cleanup: /* orphan all the subflows */ inet_csk(sk)->icsk_mtup.probe_timestamp =3D tcp_jiffies32; - mptcp_for_each_subflow(mptcp_sk(sk), subflow) { + mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); bool slow =3D lock_sock_fast_nested(ssk); =20 + /* since the close timeout takes precedence on the fail one, + * cancel the latter + */ + if (ssk =3D=3D msk->first) + subflow->fail_tout =3D 0; + sock_orphan(ssk); unlock_sock_fast(ssk, slow); } @@ -2834,13 +2866,13 @@ static void mptcp_close(struct sock *sk, long timeo= ut) sock_hold(sk); pr_debug("msk=3D%p state=3D%d", sk, sk->sk_state); if (mptcp_sk(sk)->token) - mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL); + mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL); =20 if (sk->sk_state =3D=3D TCP_CLOSE) { __mptcp_destroy_sock(sk); do_cancel_work =3D true; } else { - sk_reset_timer(sk, &sk->sk_timer, jiffies + TCP_TIMEWAIT_LEN); + mptcp_reset_timeout(msk, 0); } release_sock(sk); if (do_cancel_work) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bef7dea9f358..077a717799a0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -306,8 +306,6 @@ struct mptcp_sock { =20 u32 setsockopt_seq; char ca_name[TCP_CA_NAME_MAX]; - struct sock *fail_ssk; - unsigned long fail_tout; }; =20 #define mptcp_data_lock(sk) spin_lock_bh(&(sk)->sk_lock.slock) @@ -484,6 +482,7 @@ struct mptcp_subflow_context { u8 stale_count; =20 long delegated_status; + unsigned long fail_tout; =20 ); =20 @@ -677,6 +676,7 @@ void mptcp_get_options(const struct sk_buff *skb, =20 void mptcp_finish_connect(struct sock *sk); void __mptcp_set_connected(struct sock *sk); +void mptcp_reset_timeout(struct mptcp_sock *msk, unsigned long fail_tout); static inline bool mptcp_is_fully_established(struct sock *sk) { return inet_sk_state_load(sk) =3D=3D TCP_ESTABLISHED && diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 98b12a9c4eb5..238330da3f1f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1158,6 +1158,33 @@ static bool subflow_can_fallback(struct mptcp_subflo= w_context *subflow) return !subflow->fully_established; } =20 +static void mptcp_subflow_fail(struct mptcp_sock *msk, struct sock *ssk) +{ + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + unsigned long fail_tout; + + /* greceful failure can happen only on the MPC subflow */ + if (WARN_ON_ONCE(ssk !=3D READ_ONCE(msk->first))) + return; + + /* since the close timeout take precedence on the fail one, + * no need to start the latter when the first is already set + */ + if (sock_flag((struct sock *)msk, SOCK_DEAD)) + return; + + /* we don't need extreme accuracy here, use a zero fail_tout as special + * value meaning no fail timeout at all; + */ + fail_tout =3D jiffies + TCP_RTO_MAX; + if (!fail_tout) + fail_tout =3D 1; + WRITE_ONCE(subflow->fail_tout, fail_tout); + tcp_send_ack(ssk); + + mptcp_reset_timeout(msk, subflow->fail_tout); +} + static bool subflow_check_data_avail(struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); @@ -1233,8 +1260,7 @@ static bool subflow_check_data_avail(struct sock *ssk) while ((skb =3D skb_peek(&ssk->sk_receive_queue))) sk_eat_skb(ssk, skb); } else { - msk->fail_ssk =3D ssk; - msk->fail_tout =3D jiffies + TCP_RTO_MAX; + mptcp_subflow_fail(msk, ssk); } WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; --=20 2.35.3 From nobody Sun May 5 23:53:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2037000uau; Tue, 21 Jun 2022 10:23:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vZT3Zo0NK6gHHybTv/IIx1qGkfmtP+lqZ1TzURthBvZs2NM2TzYstBf9MIVgMn65b6DfQb X-Received: by 2002:a17:90b:4a92:b0:1e8:2c09:d008 with SMTP id lp18-20020a17090b4a9200b001e82c09d008mr34264694pjb.169.1655832223430; Tue, 21 Jun 2022 10:23:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655832223; cv=none; d=google.com; s=arc-20160816; b=bFb/Cu4NlRh1zI8rSo2pnXwKqAc1i4P0F3eolBt48bBypa+0zUrVfrpwQIcgTEW6sF JNCLyXFvisCmaJLfCSlZ0Ejz4Z//hI+sr8rPP7SaRu3iC0FYrSkoaJni0yDZsNmCZMQ6 c6SnO78utinh4n+D7+HlGgNoVI7l9bw1Nh1pmaXZ9uJr+57oi+oQiSHh4Q3dbe9Sz2Ds Qv2mDTslj8r6bJcn5RHLKhOLKcvrxJyyYTUyaSPHqY0kSibD0Czr8/y149tBeXQVZy0u LXU4OPmZMYxgXgCtF9AFPYQ4of3DvWioQe90TwllWs6e4HF0KpQ/dDgpGxQYH7u3BGP7 RQKA== 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=jGdXZqZN+scR9b+LnwI6TAhpQjvehqmnk3OUbGvrK50=; b=eW7mmLbcF+e31PoEPctoXF2L8vnxKOv3G0uql+/ocLEl0wgDajYLpfBur0nYc2dRgr UYgwcTCHcFtseBkKbfLojWfdtRGbSuOgur6OI6k23mFt3HlksGtm3LLL+HMEdFRqeGSq sytNLrSDZnP032RYDN05+OJ0fJNR6K3GgdzjibIljIimYaXk/C3OK1bPOQ/BSvpfpHr3 slOa5iXWe7RvbBMSPSamJpiOQ+JO90wbHZGe2THJrGuEidREi1aVprDhsM0KZSVu6R9S mY1SV7V1wgSNlDEpeDJ2jlfRMKr2zVXEqXRNYcGsDA2Y2DdrvLvJ5QHKW3EpcK+FLoC6 VYCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z9MjQ0c8; spf=pass (google.com: domain of mptcp+bounces-5744-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5744-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. [139.178.88.99]) by mx.google.com with ESMTPS id ob16-20020a17090b391000b001e6820f720esi26726988pjb.125.2022.06.21.10.23.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 10:23:43 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5744-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Z9MjQ0c8; spf=pass (google.com: domain of mptcp+bounces-5744-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5744-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 3861B280AB7 for ; Tue, 21 Jun 2022 17:23:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C70F3747D; Tue, 21 Jun 2022 17:23:41 +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 559184C94 for ; Tue, 21 Jun 2022 17:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655832219; 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=jGdXZqZN+scR9b+LnwI6TAhpQjvehqmnk3OUbGvrK50=; b=Z9MjQ0c8ATbIMqXLPsfrTqLkjreDRBVLyKiLVF9YgLh+c2yxFdpGl7+Vw9Smm5eXwnZDty lA1+u2eDjPNr7zhntGTjCBXbUzr2Ufk8JwdZ4+59nJw3GE1wP+ZqexZBPJ+cMtSJ3eBnKm n7mCJ0DSldkGsZj15MbwDqbZLIRd0Cs= 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-630-qwFlGVmPPR23vykhMkLA6A-1; Tue, 21 Jun 2022 13:23:38 -0400 X-MC-Unique: qwFlGVmPPR23vykhMkLA6A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 05778811E80 for ; Tue, 21 Jun 2022 17:23:38 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D92140CFD0A for ; Tue, 21 Jun 2022 17:23:37 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-net 4/6] mptcp: fix shutdown vs fallback race Date: Tue, 21 Jun 2022 19:23:15 +0200 Message-Id: <49c9e2fbafa8345df900ed1cf32c2349f0ca5fb7.1655829222.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.1 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 Reviewed-by: Mat Martineau --- 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 725fd417ebb1..00ba9c44933a 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 238330da3f1f..77fccc49d05c 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1279,7 +1279,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 From nobody Sun May 5 23:53:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2037015uau; Tue, 21 Jun 2022 10:23:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sSSqhdlWdRXxiGCHgVRSjVmetu0+4w/wHT28DS9FqSBmSV5Z7gkefwPPHxriU8EHlVQr0L X-Received: by 2002:a63:4c1d:0:b0:3fd:9833:cdd9 with SMTP id z29-20020a634c1d000000b003fd9833cdd9mr27638014pga.103.1655832224670; Tue, 21 Jun 2022 10:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655832224; cv=none; d=google.com; s=arc-20160816; b=JK7p/zFsewGKReipMKhVqWIAodknkDWxEL6XtdkF/N2Dymn2WreOcsiDWjiTlMFKH3 aH6LcIW+IytLJRH6YlnkdT+RxVO+wrjbNBe01NVDrlNZLSMdV7JdgoFBTa49tudw61po pzp4SjHvyhWh00RUoD92ZusedOXQ4PADpqx1ri3mz5nRYGom0hxQu1sjS+cWxjF9hool paRamMWP8nTSLZjBxLqng04XkxrK4H+/JCeEGEJzbVP9d6kZATvSgBKekPJPjdV29xgG gIO7X/xqDBqijfGEtWpNb7fzAt8/TKZ6NS3g2+BCzd//0B2JwXej6n2pIxiAdmRXgfOw uQKA== 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=Av8TpUGC4VOlwFitGVrmLJhb2bsuI5u1JkTtFTjnxjA=; b=Jlv6VxF2I+Cgnh+o/o5MiT2WPEXqXllggOw4nKVeXSZdciCn4WtINCkyF4yc/W+hyC TjIyWvZzZG6MD2vG97dU91x8i6pQMK7BrvM9S+n6lrBE1AnNhS/JaDUp6iD6YNnrSKVB TWeEPwj00cXAphQSxVVipWsZGaMKM/CXt/CHX0uwOzwqJ6yr7zjNkvFMWosUC98zm91A vDYfYs9UOwBV+FI2dxcmHNtTseFaMkwxEmyNZ6uFz6Whb2F0QWIiqLswMpKBCt5SJl/f quD9QVVu28dJbpNBKoBxea5XH9hBnS9a7mjQEU2Jpg6jSAkgwcUk+xJLRlP/spbzSpUB MKkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ilajmhys; spf=pass (google.com: domain of mptcp+bounces-5745-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5745-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. [139.178.88.99]) by mx.google.com with ESMTPS id np16-20020a17090b4c5000b001eccb086c83si3280294pjb.99.2022.06.21.10.23.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 10:23:44 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5745-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ilajmhys; spf=pass (google.com: domain of mptcp+bounces-5745-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5745-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 538CC280BD1 for ; Tue, 21 Jun 2022 17:23:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DEAC24C94; Tue, 21 Jun 2022 17:23:42 +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 73CEE747B for ; Tue, 21 Jun 2022 17:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655832220; 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=Av8TpUGC4VOlwFitGVrmLJhb2bsuI5u1JkTtFTjnxjA=; b=IlajmhysZYJMxcXaYYDNx/6g1cmw5LoLfjCkHgjl7BEY3Y4HaaVb4ErIbzHzqM2oKSR+XW j9QNEXDyNUlFP6MrkZyj9GjEruDYpK+QenNqNW3HJum4eqpqnN17Qvuj54KNLKZ49/BaF4 iuBn63rK3HMFcuY/czlWvVekWmAWV4U= 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-338-qz_yJ3xlM1eJ5gyQnMoc9A-1; Tue, 21 Jun 2022 13:23:39 -0400 X-MC-Unique: qz_yJ3xlM1eJ5gyQnMoc9A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB045811E7A for ; Tue, 21 Jun 2022 17:23:38 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F14240CFD0A for ; Tue, 21 Jun 2022 17:23:38 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-net 5/6] mptcp: consistent map handling on failure Date: Tue, 21 Jun 2022 19:23:16 +0200 Message-Id: <1d9852cc1346d6cec5f18153d821aae69cb1840b.1655829222.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.1 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" When the MPTCP receive path reach a non fatal fall-back condition, e.g. when the MPC sockets must fall-back to TCP, the existing code is a little self-inconsistent: it reports that new data is available - return true - but sets the MPC flag to the opposite value. As the consequence read operations in some exceptional scenario may block unexpectedly. Address the issue setting the correct MPC read status. Additionally avoid some code duplication in the fatal fall-back scenario. Fixes: 9c81be0dbc89 ("mptcp: add MP_FAIL response support") Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/subflow.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 77fccc49d05c..5c87a269af80 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1252,17 +1252,12 @@ static bool subflow_check_data_avail(struct sock *s= sk) subflow->send_mp_fail =3D 1; =20 if (!READ_ONCE(msk->allow_infinite_fallback)) { - ssk->sk_err =3D EBADMSG; - tcp_set_state(ssk, TCP_CLOSE); subflow->reset_transient =3D 0; subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; - tcp_send_active_reset(ssk, GFP_ATOMIC); - while ((skb =3D skb_peek(&ssk->sk_receive_queue))) - sk_eat_skb(ssk, skb); - } else { - mptcp_subflow_fail(msk, ssk); + goto reset; } - WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); + mptcp_subflow_fail(msk, ssk); + WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL); return true; } =20 @@ -1270,10 +1265,14 @@ static bool subflow_check_data_avail(struct sock *s= sk) /* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers */ - ssk->sk_err =3D EBADMSG; - tcp_set_state(ssk, TCP_CLOSE); subflow->reset_transient =3D 0; subflow->reset_reason =3D MPTCP_RST_EMPTCP; + +reset: + ssk->sk_err =3D EBADMSG; + tcp_set_state(ssk, TCP_CLOSE); + while ((skb =3D skb_peek(&ssk->sk_receive_queue))) + sk_eat_skb(ssk, skb); tcp_send_active_reset(ssk, GFP_ATOMIC); WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return false; --=20 2.35.3 From nobody Sun May 5 23:53:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2037058uau; Tue, 21 Jun 2022 10:23:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1twXwS1tq+dYA+4/WQph77DWf3FyQzfJ9Box00DQkeTZt4dT2fu8koy4S1l6V+U7hT4WuHF X-Received: by 2002:a17:903:2494:b0:168:fee7:6daa with SMTP id p20-20020a170903249400b00168fee76daamr29491139plw.39.1655832229926; Tue, 21 Jun 2022 10:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655832229; cv=none; d=google.com; s=arc-20160816; b=A+2wsSM1TjAJSzOmk7FENvq7HnE33hva97HW9hBIDxNhgknN7mU6b08+Qjte9BtD3c SqBPDZIZEYe5YCcYzi6PmZv9Aw3sih09ps4q7rtWNJgzj2DPK8yLUA/YnDxePbdSqvpg VJ5+febnHirwjeBIBp2vCfV8wY8v2ylL4fH11DB5FM7UqgOAhASfopd0abqlEaJKE6kt 9gvzgjQGkssf1slz5xoR9laHwEVfX+n/zW6PXQX8xEyOYv4QTwwh7u+hWmhriWc1AGWp Uu31iKuVD7S8Gh8d228HEnVqYaZxS9h40uM9uEwP4qfenfyOTcUyY3GKS6S8YZGcgVEb ffIw== 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=GPoTGIZrq9Vy19X8ghbSXhITg9eMi505n+T6Q/39T1I=; b=m6jd+XlkcmjQycUhUFoBGIdzabSDU5bwupbIL84jYOTG/tKEcVWb+smu8t1W+JdW4T 4XdpNWkglA2we2ZlJuIf2R03yEpSGIjWTc5Gay7s5jAj0FuTZQweANOTDF87hwKRhXTg +syL31VuEiMMPK/jV2f15avQpxJVxpjIeysuvJBjzixaFHJT373K/s+nEHPeCh68pxqr rZXEu4QUt+Oonxor8BpoyAmb5Ki0tbA5MuHK4VePxLR7UYJ0jyevC6IT2cyVByZH0h80 Es84isuITyzC6eQwEGLt1q/29NTG1drI7nL5jZTz3OgmcaQ27xasUX5HFVLR0U0WMers kqWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PIz5HY4g; spf=pass (google.com: domain of mptcp+bounces-5746-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5746-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 k15-20020a635a4f000000b003fe1eedd7e9si19805767pgm.360.2022.06.21.10.23.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 10:23:49 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5746-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=PIz5HY4g; spf=pass (google.com: domain of mptcp+bounces-5746-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5746-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 90B9E280ABA for ; Tue, 21 Jun 2022 17:23:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AE2EF747B; Tue, 21 Jun 2022 17:23:48 +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 4B8EB4C94 for ; Tue, 21 Jun 2022 17:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655832226; 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=GPoTGIZrq9Vy19X8ghbSXhITg9eMi505n+T6Q/39T1I=; b=PIz5HY4go1DJZCOLa72ne2ETJU9ck2XP5dcVnTDWsuxa5R4ECyfw1QQNaoGp9zFP32fNeU IMhRUgLEFfOM66vaHTsz/HxtEk/6lSZYE0CaxvFnHzq5gNKXBKMko2MuGdu7iLmy25xJLN WEQxI7s6FjD4OinccM2LDbgEMvED260= 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-195-saQgQk9MPfW9GXpjtKfGZA-1; Tue, 21 Jun 2022 13:23:40 -0400 X-MC-Unique: saQgQk9MPfW9GXpjtKfGZA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8BE9811E75 for ; Tue, 21 Jun 2022 17:23:39 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44DB440CFD0A for ; Tue, 21 Jun 2022 17:23:39 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-net 6/6] mptcp: fix race on unaccepted mptcp sockets Date: Tue, 21 Jun 2022 19:23:17 +0200 Message-Id: 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.1 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" When the listener socket owning the relevant request is closed, it frees the unaccepted subflows and that causes later deletion of the paired MPTCP sockets. The mptcp socket's worker can run in the time interval between such delete operations. When that happens, any access to msk->first will cause an UaF access, as the subflow cleanup did not cleared such field in the mptcp socket. Address the issue explictly traversing the listener socket accept queue at close time and performing the needed cleanup on the pending msk. Note that the locking is a bit tricky, as we need to acquire the msk socket lock, while still owning the subflow socket one. Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available f= or each msk") Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- v3 -> v4: - use correct lockdep annotation when re-acquiring the listener sock lock --- net/mptcp/protocol.c | 5 +++++ net/mptcp/protocol.h | 2 ++ net/mptcp/subflow.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 00ba9c44933a..6d2aa41390e7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2318,6 +2318,11 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, kfree_rcu(subflow, rcu); } else { /* otherwise tcp will dispose of the ssk and subflow ctx */ + if (ssk->sk_state =3D=3D TCP_LISTEN) { + tcp_set_state(ssk, TCP_CLOSE); + mptcp_subflow_queue_clean(ssk); + inet_csk_listen_stop(ssk); + } __tcp_close(ssk, 0); =20 /* close acquired an extra ref */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ad9b02b1b3e6..95c9ace1437b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -306,6 +306,7 @@ struct mptcp_sock { =20 u32 setsockopt_seq; char ca_name[TCP_CA_NAME_MAX]; + struct mptcp_sock *dl_next; }; =20 #define mptcp_data_lock(sk) spin_lock_bh(&(sk)->sk_lock.slock) @@ -610,6 +611,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk, struct mptcp_subflow_context *subflow); void mptcp_subflow_send_ack(struct sock *ssk); void mptcp_subflow_reset(struct sock *ssk); +void mptcp_subflow_queue_clean(struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); =20 diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 5c87a269af80..ec54ec72f113 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1723,6 +1723,58 @@ static void subflow_state_change(struct sock *sk) } } =20 +void mptcp_subflow_queue_clean(struct sock *listener_ssk) +{ + struct request_sock_queue *queue =3D &inet_csk(listener_ssk)->icsk_accept= _queue; + struct mptcp_sock *msk, *next, *head =3D NULL; + struct request_sock *req; + + /* build a list of all unaccepted mptcp sockets */ + spin_lock_bh(&queue->rskq_lock); + for (req =3D queue->rskq_accept_head; req; req =3D req->dl_next) { + struct mptcp_subflow_context *subflow; + struct sock *ssk =3D req->sk; + struct mptcp_sock *msk; + + if (!sk_is_mptcp(ssk)) + continue; + + subflow =3D mptcp_subflow_ctx(ssk); + if (!subflow || !subflow->conn) + continue; + + /* skip if already in list */ + msk =3D mptcp_sk(subflow->conn); + if (msk->dl_next || msk =3D=3D head) + continue; + + msk->dl_next =3D head; + head =3D msk; + } + spin_unlock_bh(&queue->rskq_lock); + if (!head) + return; + + /* can't acquire the msk socket lock under the subflow one, + * or will cause ABBA deadlock + */ + release_sock(listener_ssk); + + for (msk =3D head; msk; msk =3D next) { + struct sock *sk =3D (struct sock *)msk; + bool slow; + + slow =3D lock_sock_fast_nested(sk); + next =3D msk->dl_next; + msk->first =3D NULL; + msk->dl_next =3D NULL; + unlock_sock_fast(sk, slow); + } + + /* we are still under the listener msk socket lock */ + lock_sock_nested(listener_ssk, SINGLE_DEPTH_NESTING); +} + static int subflow_ulp_init(struct sock *sk) { struct inet_connection_sock *icsk =3D inet_csk(sk); --=20 2.35.3