From nobody Thu Sep 18 06:43:01 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209395uab; Wed, 15 Jun 2022 13:28:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u/S+hM23pALvtIkjdsBuftUBZhomzdbzb/RwyrfFQfUxOHlPD5iAYY1cf7Cw7XjALd3fv1 X-Received: by 2002:aa7:8008:0:b0:51a:cae3:7563 with SMTP id j8-20020aa78008000000b0051acae37563mr1373586pfi.16.1655324908950; Wed, 15 Jun 2022 13:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324908; cv=none; d=google.com; s=arc-20160816; b=HsxGZiqZRjTMhkL+/vpIBhaP6vtXHtCloLSQiaLN5fZFMh6rHvRQC3wZ5THBKaYYSz sMBjuVrUyDOQT1XjaSP/tGa1EfmhY//GKqNaGr2n+Mzs4xq0UIf5wVgpcDpMSGAuzni7 moLWsSzkY2aQCnwQCcln1YpU4N9h15UXsf9oHIQ7dJSn6aMVndLoeH2vtA2ZaqOYmTSz oATZ78ZQK+UNxM7NNDT5YmgMDu/7hTnIEDNf/w81MaS2PDgEdCs+zfNO35SubSDJXr7c IoigdC3pqVdrbyItjlNH/+nUUmmVTz+cxFvZcYWDBjKzyViz8/qznTCjlRrfRBfnCQIL kWcQ== 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=Jrao7/mTegW3CbS5Bh+3fFRaCjafcr/7yCiEW0m8aDaJ56794bS3C54JCGsmkOCLho z4nM9WL48vo73bQBP7taKcIewQN9jPFkSbSrRfOsQgqQFd2NcjWvps1qLqwdQCHeIAub zqQ9GsMPxwwioSE6CDmcLEW/DnKeGCPrHI0CA73u5Q8MpnyZrsC3KFSJmAcqla1QVk/6 GcomHw2VdPH19QjIoWuxOGIQQiA/LkeJTJER6iwwx5Jo9FTONzcSlTdOxfWHs8Qux5Qy u5bLWUcRJsj+uGPo/unBJwOBJ2VlvwZptbpWxWeC6BfGbZ32rrjkUDoMok+4VWhyrWoY 0xXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=W+t2isyF; spf=pass (google.com: domain of mptcp+bounces-5661-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5661-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 u10-20020a170902e80a00b001678a660d35si219290plg.95.2022.06.15.13.28.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5661-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=W+t2isyF; spf=pass (google.com: domain of mptcp+bounces-5661-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5661-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 AA3D7280A86 for ; Wed, 15 Jun 2022 20:28:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 755707A; Wed, 15 Jun 2022 20:28:26 +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 226883D96 for ; Wed, 15 Jun 2022 20:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655324904; 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=W+t2isyF7vKb6DTlloimXaP8BfduuoAVZud/nCM8detDaj6HNh2CNLOffEyAbYAgWG1G0U knHy5CrG0B0AvCKIE2dQpgIvR3pDPWv0fZHi7aD4wCDKrjJAT8uK3UtuxWFU/0olcFclmX miiRbe1jnBh8kFu3XyPf1Yw7GUG0gCI= 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-141-y45MkE29MtGz5A0g3HIqZw-1; Wed, 15 Jun 2022 16:28:22 -0400 X-MC-Unique: y45MkE29MtGz5A0g3HIqZw-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 0CF0B85A584 for ; Wed, 15 Jun 2022 20:28:22 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9177040C1288 for ; Wed, 15 Jun 2022 20:28:21 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 1/6] mptcp: fix error mibs accounting Date: Wed, 15 Jun 2022 22:28:08 +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.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" 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 --- 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 Thu Sep 18 06:43:01 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209392uab; Wed, 15 Jun 2022 13:28:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uYSs/ZtAqmhh/bc/LrB8sKZFMZ+Yoi7AgUYgHMY7qdSNUEQ7fB6zrT/hJ69PPnIW5Q0Gn5 X-Received: by 2002:a17:90b:33c5:b0:1e3:e57a:8998 with SMTP id lk5-20020a17090b33c500b001e3e57a8998mr1281878pjb.54.1655324908269; Wed, 15 Jun 2022 13:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324908; cv=none; d=google.com; s=arc-20160816; b=JdSbcLiTeRvcMTMho9RWJEJuXu9kBpGg+XJ9U6fMFfQVQ1QcMafxlDZHfTS7MEAvuM yh5EG6OS9zxf7OIA6j1wqVttS+Ww/YHzfdQG8JUZjL2O8RuIWRyHdTJ3IBhTV7NOF9Mu M07Du4kn9ODmMhR3A/VENvH2fi2Qe1m6Fc07dSqfqLeNf+WpnbyOQy4BjrNZUVy6c4f8 A3GQfiZ8C4NiJGmQ3DE1Eid8hc/yxWcuYLmtPoZkkenybsS+Mov9BKGfD8jphTheJge+ 62zS0w5kZcE7Lv2OxZyqfweCzFliF6Oh/iODHx+/kry08x3qwDbkNUTNS/Ak2ruK7+J6 XO4Q== 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=ZYOpa6wS6wRbMuRZZ9zV8IjEs1MqjbfhSyLvUf/BDH2rie9wKO93sjeWmAIT4XG84n slml/HvkmZifP/VamZIRyMmcUdsVswi8E0rpsthJSidTj2iumXpuHMFCLIffp6pHOE0q hyyoTDmLVeMVw4uPSY6ZVwNyVtu4lm3PEiczOnnqxya+mkkR8zBZ0icD5LB8tJEWRL6d FUAwYCjatfEFPJde4aDJmLwVagq/krT5mJRFC0CGeOhW6oHvq8eu0nChNO3RQXrAh2VH jlAccjhalfvCRJnmhC1M9ZGe2OJ3+gYW3tptMQoRwB6rT9bZ1fqqfPP6u6KlzV8e64tt jwAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WdIfNpFa; spf=pass (google.com: domain of mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5660-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 h14-20020a170902f54e00b0016784cc2e16si131670plf.393.2022.06.15.13.28.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:28:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5660-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=WdIfNpFa; spf=pass (google.com: domain of mptcp+bounces-5660-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5660-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 62F19280A83 for ; Wed, 15 Jun 2022 20:28:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 696B23D9A; Wed, 15 Jun 2022 20:28:26 +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 1F6B97A for ; Wed, 15 Jun 2022 20:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655324904; 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=WdIfNpFaGu8y85j5K7i2xxKkQFWKLHlYRTNWfmFk3r/5HNlEa800OayVO28l0BOVB9Scf9 7ZsfB1BW/pm7m441TfZNjfoe+XLmUzbMz9IZ3nA9NRWtXdtT8usxFgB21wt/Cn27NfoTf/ NRaXCPL35U3lJH8/3/0U7wDey3kf5oM= 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-183-n6HjqHW8PEKvQPzI8tUMLA-1; Wed, 15 Jun 2022 16:28:23 -0400 X-MC-Unique: n6HjqHW8PEKvQPzI8tUMLA-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 C36303C0D850 for ; Wed, 15 Jun 2022 20:28:22 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53C8340C1289 for ; Wed, 15 Jun 2022 20:28:22 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 2/6] mptcp: introduce MAPPING_BAD_CSUM Date: Wed, 15 Jun 2022 22:28:09 +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.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" 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 --- 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 Thu Sep 18 06:43:01 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209508uab; Wed, 15 Jun 2022 13:29:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sYYbVn7b0XFKymteGNALNH+LgKUKWr1H2I87tehAcUrb/4P5k0xODSff5XPyWn11gs6h7X X-Received: by 2002:a05:6830:22d5:b0:60c:11d4:eb38 with SMTP id q21-20020a05683022d500b0060c11d4eb38mr706455otc.257.1655324940461; Wed, 15 Jun 2022 13:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324940; cv=none; d=google.com; s=arc-20160816; b=C6k1jIL5G9imvxm6jJTyWAMmD82cOURYGA9ocgG/yofdu8D9asPUgkb1TV9A2MvZeO HQXXBSwMsAA1rbozUWYT7XajHmZZSFVWY/UntAz96xMJtLjHVJ6s1kf0CMgLfGoN8yeK kXQho077TJQwQ0+ik74s1NHWelTshrrqfrwPm19v6jdDUbGx8/ALrHI+A/RfyZgVWP63 0bJwz9K355s7YV/rPDPqxWsLWCYfHOt9rxDrdKF8Tc2hDvYgz55lZT9iTQJkKhSJpSwU 8jBZ5rN3krhQREMKVurCPmoMEgc2D90iZgx5oeg8awMyDkF9AegnXdHBKyZ6JChxiAZg 2+qA== 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=+adNQwyIY6UWuo7I4clhR5DAcIejKwNIKEOGOIt5dV0=; b=dZCbKoBdb6DZGfl96PeDql4ihQuPlXNIiouZOIFSoHMRdsJqn+83+YCL+pXbGvCDOM knnWHKowvhKzUmwQ8tx0q60hHwpEyMuzFGXKRr6yGBv56wmfVTpvGDU4BwANpIA1ZjCK OQyxLuXRIZT3c43mAU+cPVm0ttJRRkLSmOFVTKI+a2bPUBVdKxqEkBqNVkKW9PXqmwDB 2a9L+NFuCzSrFROZliveKyobkqHsyPUmIglpTgryaT8V1rlYLz7/pO1EBYXU4RCrQguT YGzaKm/l4u4V22ODkykcPf3USUWZfBBtgMQldu9qyhcOt2G7nITdWhAbSxb/SvzI7Odg WP2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BLVMg28+; spf=pass (google.com: domain of mptcp+bounces-5662-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5662-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 bd1-20020a056808220100b0032670efa1d3si426783oib.48.2022.06.15.13.29.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5662-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=BLVMg28+; spf=pass (google.com: domain of mptcp+bounces-5662-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5662-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 25E3D2E0A15 for ; Wed, 15 Jun 2022 20:28:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D53223D84; 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.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 0E8483D99 for ; Wed, 15 Jun 2022 20:28:25 +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=+adNQwyIY6UWuo7I4clhR5DAcIejKwNIKEOGOIt5dV0=; b=BLVMg28+CRmD+KVGGJ0Q9ucseWAcmUtPS1DWhEvFV64LNYM+nI1sSWtQ0EL70yRe3eiCTI DbjHvaurSYdd7e4cZAn+Rs+MCIzTFT+HBuVLl7Te2MU4MMPPzuJsDwyUR947CEwZHgiK3Q EkGa0gni2HRD+3LDUDaYX1WyhxX04jw= 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-263-IfBoc1Z5OL6eEM07drNfOA-1; Wed, 15 Jun 2022 16:28:23 -0400 X-MC-Unique: IfBoc1Z5OL6eEM07drNfOA-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 85606101E989 for ; Wed, 15 Jun 2022 20:28:23 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15E1A40C1288 for ; Wed, 15 Jun 2022 20:28:22 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 3/6] Squash-to: "mptcp: invoke MP_FAIL response when needed" Date: Wed, 15 Jun 2022 22:28:10 +0200 Message-Id: <1deca06703f8666dc199b76f39cd881733741666.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" 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 --- net/mptcp/pm.c | 4 +++- net/mptcp/protocol.c | 54 ++++++++++++++++++++++++++++++++++++-------- net/mptcp/protocol.h | 4 ++-- net/mptcp/subflow.c | 24 ++++++++++++++++++-- 4 files changed, 72 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..50026b8da625 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,56 @@ static void __mptcp_retrans(struct sock *sk) mptcp_reset_timer(sk); } =20 +/* schedule the timeout timer for the nearest relevant event: either + * close timeout or mp_fail timeout. Both of them could be not + * scheduled yet + */ +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 following is basically time_min(close_timeout, fail_tout) */ + if (!fail_tout) + timeout =3D close_timeout; + else if (!sock_flag(sk, SOCK_DEAD)) + timeout =3D fail_tout; + else if (time_after(close_timeout, fail_tout)) + timeout =3D fail_tout; + else + timeout =3D close_timeout; + + 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 +2576,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 +2605,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,7 +2835,9 @@ 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; + unsigned long fail_tout =3D 0; =20 lock_sock(sk); sk->sk_shutdown =3D SHUTDOWN_MASK; @@ -2822,10 +2855,13 @@ 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 + if (ssk =3D=3D msk->first) + fail_tout =3D subflow->fail_tout; + sock_orphan(ssk); unlock_sock_fast(ssk, slow); } @@ -2834,13 +2870,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, fail_tout); } 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..040901c1f40c 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1158,6 +1158,27 @@ 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; + + /* grecefull failure can happen only on the MPC subflow */ + if (WARN_ON_ONCE(ssk !=3D READ_ONCE(msk->first))) + 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 +1254,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 Thu Sep 18 06:43:01 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 From nobody Thu Sep 18 06:43:01 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209412uab; Wed, 15 Jun 2022 13:28:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v0mkGCEAHZRiIfzwDJAfAgAHfAHuzL0DamIdIBVNGWN9wkkRdsPAIKrkkZzFBE6eWmSaAI X-Received: by 2002:a05:6830:1e91:b0:60c:29fa:9fa0 with SMTP id n17-20020a0568301e9100b0060c29fa9fa0mr731173otr.23.1655324912925; Wed, 15 Jun 2022 13:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324912; cv=none; d=google.com; s=arc-20160816; b=nPGjfGwk+qtX23K5FZFBGArKSu7ljVKxfObg74kbNI7yqRXJ/X+mjVHPhu0ySi7/D/ L/WAi5cT75Y+nnp/mnseLKbvQeELgsR6gr8n+ZAsRuF4ZAQFB3vWnuHVSS/IBRQM3UdT nJ/fWdpnGgKzz0/mLbx7+zI13m5wWP6OpC31zCl8PrWvz5BQHC089EockD1ybSjiF0mp t7BW4vxyTU8gr/LnOLn73A3647MMk9jpnraCIGQtTmyNW9vqVbVtsieJiLw1I72w3AyF 4RUYG7so8f8tw1kp4b05Npv7A7kW3zyqAx+Ilt4f37o1vkTrKjkA6Qr8Y3RnpjP/0Xwy EUFA== 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=tJS/33G/jdeIT0WGkXjxwdl7IgG+gCx7SWlT7UoUkzE=; b=0bqLlMAuYnwSZGn4DnKnFiVNVG+qJIcN9ZDH330QpomBZUkXxNuMwnkj+11+R1GIoS 3ZdGQGQ9eaB7Xr/MEhvFEDfEe3zUN1o7XJRk8AxD7GowsV94xXTPqcEdjaWLv3TymfYw LP2pg8uLOfFBtYcewoVjYzLGS8n2rf5OZKIZjrwxvTg5ahoP11ipdAQCEPSqFWeuK/BD Tplssu6xrKu1j3GsG3fGkdJxF5fltz8J0z4hISkbtNURAdRmP37Duml6HTCfHQa4ZCDB icLUWXLNS6lKSWAT4cHHHLoh4gMBB6ECWOuFwjOz9rxeuK4sfguohynhBRFs5qHIfKz3 BUcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Rqq3NXCg; spf=pass (google.com: domain of mptcp+bounces-5664-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5664-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.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:28:32 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5664-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=Rqq3NXCg; spf=pass (google.com: domain of mptcp+bounces-5664-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5664-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 C00CE2E0A24 for ; Wed, 15 Jun 2022 20:28:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BB4F93D9A; Wed, 15 Jun 2022 20:28:28 +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 6B7F03D9D for ; Wed, 15 Jun 2022 20:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655324906; 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=tJS/33G/jdeIT0WGkXjxwdl7IgG+gCx7SWlT7UoUkzE=; b=Rqq3NXCgzBezbgndYu4VJCw17xctZeEF9W16elCfth/2I8wgs/FEtegbB1NpP4UdRCbjUt s+FeM+uToPRoWV+Xfx0rjqspHT6+Bxt6tZvjp9m+naeNDks1uPmgymDqzhuNktu3uQL1NF Vh2VUD3vRJodqU1ipsNYDbHmXzJMENI= 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-488-py7qMqxaOzKMwtLc8cfr6g-1; Wed, 15 Jun 2022 16:28:25 -0400 X-MC-Unique: py7qMqxaOzKMwtLc8cfr6g-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 0B10F299E77E for ; Wed, 15 Jun 2022 20:28:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DFA040C1288 for ; Wed, 15 Jun 2022 20:28:24 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 5/6] mptcp: consistent map handling on failure Date: Wed, 15 Jun 2022 22:28:12 +0200 Message-Id: <7aa8059e8fbbeab845269969ad02784a8c53fb1b.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" 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 --- 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 75fdc6474d0e..bec36e2bcc32 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1246,17 +1246,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 @@ -1264,10 +1259,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 Thu Sep 18 06:43:01 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp209416uab; Wed, 15 Jun 2022 13:28:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tXBkCB2YSQj0KN4pfy2XiIliQ3k/lkf69TaM3yxC0je4tmLvc7dqL3iDHN6vg+KfyD8okV X-Received: by 2002:a05:6808:1b10:b0:32f:1f81:32f with SMTP id bx16-20020a0568081b1000b0032f1f81032fmr784355oib.84.1655324914089; Wed, 15 Jun 2022 13:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655324914; cv=none; d=google.com; s=arc-20160816; b=GIgYvXJApOk+h289oh2js1NwzX0yu/dq5qEzAopQh3UMZNV6S3pLLFp2RecwjZTh4W c4sVdBpos4WRW3P8CYJEShwEf+awyM4JhxjxIYa1tcbfuXDV4UrdhxAClUlLlL6MFkBp 20DWKdxi5rUY/sy1mXoyyRtghGAr82Pf2YXtHJGz22qwsUmvDGK3HR59DmHgT45Nkhpv uW9hdWsALmrphYPIexbrjlm/En3vszCqM+g9RU+fnOpx5PUAnIhQFf5pltePAmlBkFlV 0SE2fQUJLhcEZf8vmc5jz/0W2TCCgCWhpoj+Qf57LKvGjLKghpFHa0WZaQLCVnf3+Cbo aBGQ== 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=PKbQkM9NksZKJWJ79oRNw0LFN3Wzl0ZPlA4jqwkj9vg=; b=N6gKgv2gMCtGkzPeAuM/wVk1T9MhbBVPai1yRf3eTbSIsqzuXHgKBJ448yDMwk3tR1 md9H5W9XesKTJ9PKfhVn3xLpDxFJqY1Ak9KL/dgh6LeZQYOptAMsKVDVEdNqQvKcv69q dS0ewQN1/YlZ1YfJrgEO4ANtd/OixFmqNLLeTQ0jxzpAqA7O1BFhyJdu1YqlrMCkh+pU uknjBpLOK/HtQ2wEZENht53l2Byzwendscre4vSruIwgbX7zU+JBzOmEv4Gj361fk/QL mhGAUqnh7fOFIOkrLzxGEE9zjZJFJovtn0O5EU7tQBQ8kSH8G+6z9lFV0CJiyLLmGH+I rQqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JJC3LArt; spf=pass (google.com: domain of mptcp+bounces-5665-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5665-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 q7-20020a0568080ec700b0032ee624b966si17031417oiv.2.2022.06.15.13.28.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2022 13:28:34 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5665-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=JJC3LArt; spf=pass (google.com: domain of mptcp+bounces-5665-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5665-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 E67352E09E6 for ; Wed, 15 Jun 2022 20:28:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 568037A; Wed, 15 Jun 2022 20:28:30 +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 8E6763D96 for ; Wed, 15 Jun 2022 20:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655324907; 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=PKbQkM9NksZKJWJ79oRNw0LFN3Wzl0ZPlA4jqwkj9vg=; b=JJC3LArtC4MOG9n8Qxlgbio3JnccrZGM31MUEHJkarcx7GeQr7wtbEiFWQSObHOqP+CQyU oNc1q85Z1TUydQ9VEh/EYM3oHkMFUSxL5x0uCzHHzfVHH9O3wBn6PdR6d75JgDNIn77N+M zjPtjYHFYHRYtLTnZquhawbLZYprDiE= 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-673-5980L5PfOIWo_K4k24FRNw-1; Wed, 15 Jun 2022 16:28:26 -0400 X-MC-Unique: 5980L5PfOIWo_K4k24FRNw-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 C0B06811E80 for ; Wed, 15 Jun 2022 20:28:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 502BD400F3FF for ; Wed, 15 Jun 2022 20:28:25 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 6/6] mptcp: fix race on unaccepted mptcp sockets Date: Wed, 15 Jun 2022 22:28:13 +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.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" 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 --- net/mptcp/protocol.c | 5 +++++ net/mptcp/protocol.h | 2 ++ net/mptcp/subflow.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4f4d6c66e190..35e3060233c9 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 bec36e2bcc32..02a12f271a60 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1717,6 +1717,56 @@ 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); + } + lock_sock(listener_ssk); +} + static int subflow_ulp_init(struct sock *sk) { struct inet_connection_sock *icsk =3D inet_csk(sk); --=20 2.35.3