From nobody Thu Sep 18 12:49:16 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:1d48:0:0:0:0:0 with SMTP id 69csp225594jaj; Thu, 9 Sep 2021 04:51:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhNSs7xXcFV8CjNrVIGFhoPZRcmtrDJzZUj9bMYvfYFwUeNd1F3IfRLY29gLG8aL89Eds+ X-Received: by 2002:a63:dc42:: with SMTP id f2mr2348729pgj.152.1631188286292; Thu, 09 Sep 2021 04:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188286; cv=none; d=google.com; s=arc-20160816; b=rDtU7kdMPnxNXvivJdjwKzCY2uWz2RxXEPO9WM2G/gmZXca+i+wHdFlxbO/8raLQUg DvVBRZ/mBubhBN6hzUxuH1khbGNAjyFaBfTwd4rjtvAEvOvd91jVy7BMtMJ9wY7jJeAW zPBo+6LAHeHAJtnhZJ62XDlvvsiVzcBMMCRTPhz/ollNTPc6E2VB0gkr9gZj5aJPemMi iJgywFzDoodOCWPIZrq3M2GI4GWW86q+HYZ2mifiqRPEAfQF3ib8NMaTXMyu7bjIE22n P1Eg0ZhzNHinfwZNqKZufsRooc9+3P8leBHy0AeJgNY7sLZjpiY8/861H+sD2pnYrbbN dcpA== 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:cc:to:from:dkim-signature; bh=0IwQx+UGeHAuHdCt1Z8OYgPtaYSyiG9TEUMf//P9Z0A=; b=Z+SzXy5EFqYCuiYCd01CSm6jUhEhlYG0kItAr3UBL7pDdDlON2iB+qME0NDBCzKFO8 FdLP4sAvSaGgl+aNopu+hJ5Vt+tAiWXI5Abpo5Bghyxe8dsVKQv4ItQU0m+6MdkTEM6u LXZzHF4I4jaWpFbgLBAXQHBz1yeRTvlyGq0DI7vEHVNLyjXbYdq3Q1bLAVp6Ys+9M39q q/phRIV8YgytdNO39uLmsrvOnt0T0Cl2v6aGEWfxwsjkWa7C1gGNfkGZXlp7CasQOZyN 4igQOOSgt7GENEzDjn7mpD8TBGnSgNC05Mf2BMQNZKdB9J8OCZSV4qg+tbZ62SUDSHKY B2pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iBf9bvqk; spf=pass (google.com: domain of mptcp+bounces-1893-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1893-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id v10si1731591pgr.413.2021.09.09.04.51.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Sep 2021 04:51:26 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1893-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iBf9bvqk; spf=pass (google.com: domain of mptcp+bounces-1893-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1893-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 ewr.edge.kernel.org (Postfix) with ESMTPS id B4ADD1C0F20 for ; Thu, 9 Sep 2021 11:51:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E540E3FE2; Thu, 9 Sep 2021 11:51:21 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3D173FE1 for ; Thu, 9 Sep 2021 11:51:20 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id f129so1531317pgc.1 for ; Thu, 09 Sep 2021 04:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0IwQx+UGeHAuHdCt1Z8OYgPtaYSyiG9TEUMf//P9Z0A=; b=iBf9bvqkZU04lknYC0GDiQ5rslirbulZyy50UVh55aomVZGaVr3ZiERD2oiS94O8tt WTRICRmwHfRPz/wwI095CkdtsCHkwhri7xrKoQo3mRNyKoX/8PlYpM7HIBv+eHiHf8NE as02RGL85YHL258sWJqJg+G1IAau8KMW6Wgt535G0/twLS9qOj+sgY434SMG/CVYc6bM DKJGUuH7jTX5bXg2wsUFSSMnzbmAokMGNWPwt1tx6n3DiTLuJnHZdr16hBcwWdigCWh4 PetThZaCk9GcwaAzG/TM5tSchfnvYMaCx6Sgov5MBf5Eee6Qf/jd5h0XAPrNgSH+cHSV a8Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0IwQx+UGeHAuHdCt1Z8OYgPtaYSyiG9TEUMf//P9Z0A=; b=GjN1JM/OgrcBzDApTPU0gcU2dXEz/23xb5cbm5YeZZCgzy4/8cSwv2mn2IyXl3++6c OMGMWF9K0yI9NgHNMdyKe80G1ga2HvATY+BUQFs2v/PA3h1Gp5PjpgXD1Cqt36HRN5qv vDZEz/FBiG0CCH4Rq1FzsUE8jW2gnt6HzVcOjQCHo6qcHh82GUS7phAYJvLAQ7AUumU/ FYeEv5121nv6r2VaWJvGTKivqg0Jq3JO2eB3NhCf9Pah5jNLf9u7TkCj3Ai9SW8A5Ues uMej2JfxQOiQAM+E+JJ6G3TkCc+tHmGLdtr75NCZlHR1PMKdSl1li2LIOwUIWVZZSZs3 0EcQ== X-Gm-Message-State: AOAM533KSPvesUhjoC+qCq8FXqSQRxmxgVSLZpVt7/gBfobtvHJaDZSb njkmQEptQyERdgBnRh8DNsliCDeJaTw= X-Received: by 2002:a05:6a00:1255:b0:3f5:26ee:ca2c with SMTP id u21-20020a056a00125500b003f526eeca2cmr2806617pfi.62.1631188280336; Thu, 09 Sep 2021 04:51:20 -0700 (PDT) Received: from MiBook.. ([43.224.245.180]) by smtp.gmail.com with ESMTPSA id n14sm2458225pjm.5.2021.09.09.04.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 04:51:20 -0700 (PDT) From: Geliang Tang To: mptcp@lists.linux.dev, geliangtang@gmail.com Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/9] mptcp: add noncontiguous flag Date: Thu, 9 Sep 2021 19:51:03 +0800 Message-Id: <138e3913108d313b11a261e6c9e3db2cc788183f.1631188109.git.geliangtang@xiaomi.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch added a "noncontiguous" flag in the msk to track whether the data is contiguous on a subflow. When retransmission happens, we could set this flag, and once all retransmissions are DATA_ACK'd that flag could be cleared. When a bad checksum is detected and a single contiguous subflow is in use, don't send RST + MP_FAIL, send data_ack + MP_FAIL instead. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 7 +++++++ net/mptcp/protocol.h | 2 ++ net/mptcp/subflow.c | 12 ++++++------ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index bb8a2a231479..81ea03b9fff6 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1095,6 +1095,9 @@ static void __mptcp_clean_una(struct sock *sk) =20 dfrag_uncharge(sk, delta); cleaned =3D true; + + if (dfrag->resend_count =3D=3D 0) + WRITE_ONCE(msk->noncontiguous, false); } =20 /* all retransmitted data acked, recovery completed */ @@ -1171,6 +1174,7 @@ mptcp_carve_data_frag(const struct mptcp_sock *msk, s= truct page_frag *pfrag, dfrag->overhead =3D offset - orig_offset + sizeof(struct mptcp_data_frag); dfrag->offset =3D offset + sizeof(struct mptcp_data_frag); dfrag->already_sent =3D 0; + dfrag->resend_count =3D 0; dfrag->page =3D pfrag->page; =20 return dfrag; @@ -2454,6 +2458,8 @@ static void __mptcp_retrans(struct sock *sk) dfrag->already_sent =3D max(dfrag->already_sent, info.sent); tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, info.size_goal); + dfrag->resend_count++; + WRITE_ONCE(msk->noncontiguous, true); } =20 release_sock(ssk); @@ -2872,6 +2878,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk, WRITE_ONCE(msk->fully_established, false); if (mp_opt->suboptions & OPTION_MPTCP_CSUMREQD) WRITE_ONCE(msk->csum_enabled, true); + WRITE_ONCE(msk->noncontiguous, false); =20 msk->write_seq =3D subflow_req->idsn + 1; msk->snd_nxt =3D msk->write_seq; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d3e6fd1615f1..011f84ae1593 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -213,6 +213,7 @@ struct mptcp_data_frag { u16 offset; u16 overhead; u16 already_sent; + u16 resend_count; struct page *page; }; =20 @@ -249,6 +250,7 @@ struct mptcp_sock { bool rcv_fastclose; bool use_64bit_ack; /* Set when we received a 64-bit DSN */ bool csum_enabled; + bool noncontiguous; spinlock_t join_list_lock; struct work_struct work; struct sk_buff *ooo_last_skb; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 1de7ce883c37..951aafb6021e 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1166,15 +1166,15 @@ static bool subflow_check_data_avail(struct sock *s= sk) fallback: /* RFC 8684 section 3.7. */ if (subflow->send_mp_fail) { - if (mptcp_has_another_subflow(ssk)) { + if (mptcp_has_another_subflow(ssk) || READ_ONCE(msk->noncontiguous)) { + 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); } - 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); WRITE_ONCE(subflow->data_avail, 0); return true; } --=20 2.31.1