From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 AAD3E3AE188 for ; Sat, 30 May 2026 11:48:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780141695; cv=none; b=R0lWMY47EefVl8cG1z+lQTCJ8kUcPreS6+mPUHNMJS1rj7Lh2w0pwssGOPLP7EyeP6Sapsb8bEWOJBsKhGgbvvT01vCGQx0JltI5rtXAVIbPj0MIQeZJB1SNSu9tdVcTOPPuWVTbEyO4cCFWnO5EhVM/140Mn2PcD24kh48XEeM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780141695; c=relaxed/simple; bh=EVTBDqtW62WmfX+Bik+T+6PpXijWqN8VVK+oq5Pv3ik=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AFSA+V3VfWNatp6Rm3ndr4Jf6rJaGAhKLU10fCaG+VcX44MNnt1x/w6Dd3yzbTrFMHoCRkkTNDXmpx3pVGedXSFtLv45c0li546XU+1PWNdCOMrbI3z61w4BUosi5t5DGVvZDSmC5l8ShMqqIS6wbQxk34RE1dDV44pBQQOpL0Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iBWIIQqh; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iBWIIQqh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B91FF1F00898; Sat, 30 May 2026 11:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780141694; bh=ZFTnDv+8/1BAEfjvoBWg8nXu+RAO5NRIOzNX4mfKFDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iBWIIQqhafjsxAaPfiidKIrp5vPSd8qNYlwWsd+wBhSIhQSLApRcl8epnzOvBy1C0 WfEhzdZeMv5/DaE30SgF9yaNFU20fjWhCJyQmNCSUhySaK3K3EmJZOSNEgk/4LzCdN kS1Ic6hArummiciduP4NaVCqNFTkNBuyYXdzdB+H49QwEKUK/M0mFnH3vkYVmtrcex pavJVjWRofLsqDSZjPHItHiT637nrIpY5fuxmy9tvTlMiC7If4tYmM4u5s9TibAk2b 2weG6mpdXreR3pAR60/SrpRTubfkyVCjahLlnmo88hG8lzAA3lJIXFfo7Cp1wpCtKc liX9w3heRBp2Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Shardul Bankar , Paolo Abeni , "Matthieu Baerts (NGI0)" , Sasha Levin Subject: [PATCH 6.18.y 3/3] mptcp: do not drop partial packets Date: Sat, 30 May 2026 07:48:10 -0400 Message-ID: <20260530114810.1965750-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530114810.1965750-1-sashal@kernel.org> References: <2026052835-evident-dutiful-f601@gregkh> <20260530114810.1965750-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Shardul Bankar [ Upstream commit 50c2d91c5dfa0e465826ec1f8dbad9cdc254bd85 ] When a packet arrives with map_seq < ack_seq < end_seq, the beginning of the packet has already been acknowledged but the end contains new data. Currently the entire packet is dropped as "old data," forcing the sender to retransmit. Instead, skip the already-acked bytes by adjusting the skb offset and enqueue only the new portion. Update bytes_received and ack_seq to reflect the new data consumed. A previous attempt at this fix has been sent by Paolo Abeni [1], but had issues [2]: it also added a zero-window check and changed rcv_wnd_sent initialization, which caused test regressions. This version addresses only the partial packet handling without modifying receive window accounting. Fixes: ab174ad8ef76 ("mptcp: move ooo skbs into msk out of order queue.") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/c9b426a4e163aa3c4fe8b80c79f1a610f47ae7d8.1763075056.git.pabeni@redhat.com [1] Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/600 [2] Signed-off-by: Shardul Bankar [pabeni@redhat.com: update map] Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260515-net-mptcp-misc-fixes-7-1-rc4-v2-1-701e96419f2f@kernel.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/mptcp/protocol.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 13a787605630e..a47eb9b9feef1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -395,12 +395,26 @@ static bool __mptcp_move_skb(struct sock *sk, struct sk_buff *skb) return false; } - /* old data, keep it simple and drop the whole pkt, sender - * will retransmit as needed, if needed. + /* Completely old data? */ + if (!after64(MPTCP_SKB_CB(skb)->end_seq, msk->ack_seq)) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA); + mptcp_drop(sk, skb); + return false; + } + + /* Partial packet: map_seq < ack_seq < end_seq. + * Skip the already-acked bytes and enqueue the new data. */ - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA); - mptcp_drop(sk, skb); - return false; + copy_len = MPTCP_SKB_CB(skb)->end_seq - msk->ack_seq; + MPTCP_SKB_CB(skb)->offset += msk->ack_seq - MPTCP_SKB_CB(skb)->map_seq; + MPTCP_SKB_CB(skb)->map_seq += msk->ack_seq - + MPTCP_SKB_CB(skb)->map_seq; + msk->bytes_received += copy_len; + WRITE_ONCE(msk->ack_seq, msk->ack_seq + copy_len); + + skb_set_owner_r(skb, sk); + __skb_queue_tail(&sk->sk_receive_queue, skb); + return true; } static void mptcp_stop_rtx_timer(struct sock *sk) -- 2.53.0