From nobody Sat Aug 15 20:32:03 2026 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 D456C419FCB for ; Fri, 31 Jul 2026 10:18:59 +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=1785493145; cv=none; b=KtzD9pqF+1rUhGCfmuAvjVuGzd+AJwzNOdQtMC0lxERq03yqzm1HF30euyinQDfn2wAboJ1KogdEefNPTlNIQBSY9yEWup2WeE7QjaEzWJylqiDhNzjv4+Yir9XIfSOMXK0hGRxPD6mXs4x4Ruvq35IVlLDtK+XVg1dufrFAyhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785493145; c=relaxed/simple; bh=0HQczlsRk6ulA4HUX8jH281qPMQIphdNwhcxuUcMCTA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K6yTt6POfMBtSJRCNp0jcoxJZDbrCuT77G6TBOodxin9ktI4cpF0FuFpT0LWozP+oZlLwS/uQx1VUcgH5LXxhgWpZZBVE+NF+yR5yYRg0h+oGBQ88mdXFi8De/sldFj8ST16iGI+I7NhzCdLgxQl2GvWF/TPVZ/WkJyGFA9VoSA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E6eNcEBk; 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="E6eNcEBk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E45CC1F00AC4; Fri, 31 Jul 2026 10:18:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785493131; bh=Lv4+0o2m5LkSth64dac8eYjlXTC7rag4sWRl9eif6CM=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=E6eNcEBkPCzRkYKeZi3h29oX3Rxcv5AmZLfEs19POtyGzxOm1VoO75U/Pv4Wh3FH3 pJm8ihRFh1OjxX7JnklzIltrluc2GcIFfw6HNNfxrXHnPQYlVCfhPNrp6q55LkK68K lWhgtJnXj35lXBsxdSSV9p5QSLdoiqljPnPHUZkHQzdSM6g2rWzE+t60GnbJbB5PA6 pN4kGxmjrLgjGASg0fOV2UsO8iKRwH3Mg4EMFszpra1oEH0v8oMA2E+QaGcOeXAU/f hTXFi246ftx7GUioTGiU6Ia+MEqVV7kS/8L7CvyVQazPUiR5hO/au4AcIsMHuo2P1Y S4n8mvAxFbXEg== From: "Matthieu Baerts (NGI0)" Date: Fri, 31 Jul 2026 12:18:43 +0200 Subject: [PATCH mptcp-next v2 1/2] Squash to "mptcp: explicitly drop over memory limits" Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-mptcp-squash-ooo-pruning-v2-1-499a523bbce3@kernel.org> References: <20260731-mptcp-squash-ooo-pruning-v2-0-499a523bbce3@kernel.org> In-Reply-To: <20260731-mptcp-squash-ooo-pruning-v2-0-499a523bbce3@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2278; i=matttbe@kernel.org; h=from:subject:message-id; bh=0HQczlsRk6ulA4HUX8jH281qPMQIphdNwhcxuUcMCTA=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJyyjrOnJbIk/lksaH21/vABMlL2jrr92yaPfO6jc3KJ d9sc96Id5SyMIhxMciKKbJIt0Xmz3xexVvi5WcBM4eVCWQIAxenAExkLh8jw2apvIPGjzep37z0 4pa/1CLHBefuhL5+kbZhqbeZge7WeycYGb7Vnin2aW9fE3pXSt1/ucHskwuPaPbpz88o4J9336l NkQ8A X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Address comments from Clashiko [1]: - mib: typo: "constrains" -> "constraints". - mptcp_over_limit: precise it is not only 0-win, but retrans, dup or old acks. - mptcp_over_limit: bump LINUX_MIB_TCPRCVQDROP, as previously discussed in [2]. Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260724-net-next= -mptcp-oooq-pruning-v1-0-5dd4dec63a54%40kernel.org?part=3D3 [1] Link: https://lore.kernel.org/b5244dd4-205d-4abd-8ea5-fd879a97038f@redhat.c= om Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/mib.h | 2 +- net/mptcp/options.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 18f35f7e0a2d..25f360724c57 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -89,7 +89,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_FALLBACKFAILED, /* Can't fallback due to msk status */ MPTCP_MIB_WINPROBE, /* MPTCP-level zero window probe */ MPTCP_MIB_BACKLOGDROP, /* Backlog over memory limit */ - MPTCP_MIB_RCVPRUNED, /* Dropped due to memory constrains */ + MPTCP_MIB_RCVPRUNED, /* Dropped due to memory constraints */ MPTCP_MIB_OFO_PRUNED, /* MPTCP-level OoO queue pruned */ __MPTCP_MIB_MAX }; diff --git a/net/mptcp/options.c b/net/mptcp/options.c index d6b009319839..7c0bce3780c5 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1193,7 +1193,7 @@ static bool mptcp_over_limit(struct sock *sk, struct = sock *ssk, if (likely(mem <=3D READ_ONCE(sk->sk_rcvbuf))) return false; =20 - /* Avoid silently dropping pure acks, fin or zero win probes. */ + /* Avoid silently dropping pure acks, fin or already-acked segments. */ if (TCP_SKB_CB(skb)->seq =3D=3D TCP_SKB_CB(skb)->end_seq || TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN || !after(TCP_SKB_CB(skb)->end_seq, tcp_sk(ssk)->rcv_nxt)) @@ -1202,6 +1202,10 @@ static bool mptcp_over_limit(struct sock *sk, struct= sock *ssk, /* Dropped due to memory constraints, schedule an ack. */ inet_csk(ssk)->icsk_ack.pending |=3D ICSK_ACK_NOMEM | ICSK_ACK_NOW; inet_csk_schedule_ack(ssk); + + /* In fallback mode: skb is dropped before the TCP recv queue. */ + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP); + return true; } =20 --=20 2.53.0 From nobody Sat Aug 15 20:32:03 2026 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 B21FD416857 for ; Fri, 31 Jul 2026 10:18:59 +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=1785493147; cv=none; b=rJxyplVZ/7hQbI3RdnAotMxMORcCfsap3TuAd3akt75RNc0BLFVPHEkz+RBjDh6RpmnwTp4RoAl3hF8lTRLlNfyxjxrYVWUslM35a0pQT0D4cFzusE6jEll/d7etb9uOQWGZuaiyPdqLuitdHTrhCZJzkc0FD0z6kBNM6qwy4C8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785493147; c=relaxed/simple; bh=vHuEkp3XcwG+TU5aIx0BZsYFQTQd2Ht4e2kyU9nA8S4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RKpjdOp7JXv6SLio6SbKFi/drr7NPynMsm7d6eLM7+R56WCgRkN1f37dxZfdgaPAaYhxvG0CDIF2XgrO4rolar3CcyWTMVxesKWoZYxQbMnph3hKNKupHK9S/qXrVvaMNLKXif5YXSHwi1unnlS8epAALE+w6O1khpaTZ0XIcyE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T6p5vYBW; 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="T6p5vYBW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B78EA1F00A3F; Fri, 31 Jul 2026 10:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785493132; bh=KSmVIbxsK9lg1LcvqJUDLSyantQ1A/HDYQ3wAY4kvdc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=T6p5vYBWFuqU6aS/WPCla0CYjU6WIZ7ReiUsTrrrd9Dxm6gLiRp+0bI919Tcju4ce 67NvNwjI1yXdgIBWtOqCblsYmLUGhxLuM0D+C3o9bn9pg5bCYS4qv+pi/ctDxJv1u6 A7plEAA8TdydwQyXUsvFOtzNz+t2met41bG7pdkPIyeLd7k5x77sPdyYkC1rbSN0tf /BeKY8IffloFhGXbMu7GZEKsbVEHbPSv6h/5k3S9HOmCIeodmM1mN+Ik2o/sAU5awx Y8NvieW8ENjd9UppM3HeAjKRZRv6St3JzTdneSO1XWPTjdj7jhY9db2dMOPcL/0auk jwgL0IkD2WZwA== From: "Matthieu Baerts (NGI0)" Date: Fri, 31 Jul 2026 12:18:44 +0200 Subject: [PATCH mptcp-next v2 2/2] Squash to "mptcp: implemented OoO queue pruning" Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-mptcp-squash-ooo-pruning-v2-2-499a523bbce3@kernel.org> References: <20260731-mptcp-squash-ooo-pruning-v2-0-499a523bbce3@kernel.org> In-Reply-To: <20260731-mptcp-squash-ooo-pruning-v2-0-499a523bbce3@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1894; i=matttbe@kernel.org; h=from:subject:message-id; bh=vHuEkp3XcwG+TU5aIx0BZsYFQTQd2Ht4e2kyU9nA8S4=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJyyjoDT3P8UCrnu2JwNX1Nx9buukO9OQmFASx/i4sru X+mfU3rKGVhEONikBVTZJFui8yf+byKt8TLzwJmDisTyBAGLk4BmMivGkaGLaeyD2aqfM4yW7qB aVnF1NPWt2RveJc/kfscdOH/vvb71Qz/k61v30xTMb3mX3N191VbkyC7s8p1F9+Ud5ytfRf5XFq ZHQA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Uniform the new counter with the other OFO ones. Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260724-net-next= -mptcp-oooq-pruning-v1-0-5dd4dec63a54%40kernel.org?part=3D5 Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/mib.c | 2 +- net/mptcp/mib.h | 2 +- net/mptcp/protocol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index d9bd4f4afcc0..2569385bab7c 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -87,7 +87,7 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("WinProbe", MPTCP_MIB_WINPROBE), SNMP_MIB_ITEM("BacklogDrop", MPTCP_MIB_BACKLOGDROP), SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED), - SNMP_MIB_ITEM("OfoPruned", MPTCP_MIB_OFO_PRUNED), + SNMP_MIB_ITEM("OFOPruned", MPTCP_MIB_OFOPRUNED), }; =20 /* mptcp_mib_alloc - allocate percpu mib counters diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 25f360724c57..3a3425e258a7 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -90,7 +90,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_WINPROBE, /* MPTCP-level zero window probe */ MPTCP_MIB_BACKLOGDROP, /* Backlog over memory limit */ MPTCP_MIB_RCVPRUNED, /* Dropped due to memory constraints */ - MPTCP_MIB_OFO_PRUNED, /* MPTCP-level OoO queue pruned */ + MPTCP_MIB_OFOPRUNED, /* MPTCP-level OoO queue pruned */ __MPTCP_MIB_MAX }; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 90dc894cb976..f387f24904da 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -416,7 +416,7 @@ static bool mptcp_prune_ofo_queue(struct sock *sk, u64 = seq) } while (node); =20 if (pruned) - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFO_PRUNED); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOPRUNED); =20 out: mem =3D (unsigned int)sk_rmem_alloc_get(sk); --=20 2.53.0