From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 83A348017D for ; Mon, 16 Nov 2026 20:47:43 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKkYXm031672; Mon, 16 Nov 2026 23:46:34 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkYXm031672 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="nLb7zpmv" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKkFuG031610 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:15 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkFuG031610 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4a3052225cbso396551f8f.1 for ; Mon, 16 Nov 2026 12:46:15 -0800 (PST) X-Gm-Message-State: APuU4Z/3VGOh1KmTMJg0I+i41Ko7Pftj7dHnBqEbN7NIDqnUb1hkJ0IO vRev8YQS4vyG0Frlo8oRR3UK+uuE/dPET97xLqMVSbSLeKFAYrgB3CrLiIP31C0Y83QzyLBWnyK 8Os3K4vvX+LypJnjQrCItwEX+o0hOt1ZL4eTdTQzQN57GO15JLv9UMQ== X-Gm-Gg: AZFdTZeQHtf85s58vo6gsHnYLG9ab89HR3Z3OyQT3fy4RPEz80/Mv6FQu1ytpZSoIOu o3NoqzxmU2xhPAl+3eYLyDEf3d9a98aMABGThpJjmyrj5UYRcSLmEWj7a475/iFqI3wFbZAZIbp RwXEiKPJ2BA86z0KuxyeobHQLqltpnVu0Trlzq8Th2ejH+vXifPGp4FzfFqD2kgkA0eZt96eaTv kMnjUxYTysZtmW8j5o6IRT8NoJDcEuAwECoFJgFxvD2bKEe9vYh/DkW3Dy7ZwQkFCuSkJFvb7Ia q7aULP5oqvXbVKK/qrovg6wtz+vdvil433Cx5zYI+MP3SFp1A+SA20dSKPs+QsIsnr03KHLwo+m qV1C08zohpv3KcyEwqi9Em0dq X-Received: by 2002:a5d:5f47:0:b0:491:d224:aa78 with SMTP id ffacd0b85a97d-49c713ae2aemr25907855f8f.26.1794861975128; Mon, 16 Nov 2026 12:46:15 -0800 (PST) X-Received: by 2002:a5d:5f47:0:b0:491:d224:aa78 with SMTP id ffacd0b85a97d-49c713ae2aemr25907825f8f.26.1794861974632; Mon, 16 Nov 2026 12:46:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861974; cv=none; d=google.com; s=arc-20260327; b=phEaB3CeumNdiikXwvApMv8sTk1lX7sncysgQcFsihEpOgvW3Maw7vV6qDhEdS+oUx Cf0Qf2/O8KqMEBlUDGVs5KGFyIVDhYOPTRiB+mNd29X/Rid/tq+1vnW+gPOMDSvv2iMO WVAqhFcoFX4GYZ92lsc6hbMfrd8dbspAlicdZHSqKvWgAVGDrgJab4dq84aFxUjbPF5J 8kZz/MQZnBXF+W5mfxw0SiGZcMU3AgnzQhKofCG2NHyqUSDBvOM0Y/vFR0r3iQZ9UB3f B1iITz+4GvhMwQI545kjwU3mLKn6k8f0KFNBtuTiGOpUq52cwqozDQInCnodACfnXU9S FaeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ed7JwwVN+JIVq9WKLzYH72Z2DUeSVYUJ/9qMkVXb6o8=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=XjJ/qwWnHOX7jXEQ6DB9Lm5vzqmgpO2EC0M6or3wQu3NeiUcsYi0bTYxcuXYTDu88R zs/IMwHgg+HLRn2ION3GTcxYE5eUDkRvwGEHH8OdCN/freEnZvmZTkVpRn/8vYra2IOt ethKzt1zYUjY3Qlhgm605OeypSdq6x6LuAiuUqDOeSVkyigg6JW0hGNQg1B14Dr+KFno kRIb1nTkbHaZnOK9eDNCVSCb8fefrrckL8o+1rt3wmgRKjwno7s/yS+Q2Lkl7TAlxZCa 6s1Mabn2pgHS/bEQ56km3X3Gt5ZP5CCSjcr4lNltD75P/pnxJYCfN9LW6WIR+MmNbX4G kPMg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=nLb7zpmv; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c63e989f8si24800236f8f.268.2026.11.16.12.46.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:14 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=nLb7zpmv; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=ed7JwwVN+JIVq9WKLzYH72Z2DUeSVYUJ/9qMkVXb6o8=; b=nLb7zpmvHUUO fvsyPxamsDDn7KaBdra9QeBnVJqNodgC+6VL0GTTzmDiAwv02ANFycWqcEhwQJ4YYBRhnWgqn9Gs3 2g2JkUlzxRQq3RP9CZ9Of68fcqSYuq4DT2BVLIUS1h2ALlcpb9qPh5TfGAEz9nx8D6imHd05F8N2b boJXlmfyUy5DcU5sO3qdftZLwUcMtsfG3yLpRafuZxiETEsRLyMlH4f2fGIiIzMpg6sNR0e0+aehq BnRnpgISaCY9mTozlkUExxRZEWVTlgyZqirLDd+Il3+pDFb0DXcQe/P7rIGMPQwWnsM3c+wF3uGY7 GGkzg0dvIlRrEnJ/iZVl2A==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xT3WQ-00BfjZ-1J; Mon, 16 Nov 2026 21:46:05 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:06:01 +0200 Message-ID: <20261116204557.718500-10-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> References: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 09/11] ms/mptcp: implemented OoO queue pruning X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Paolo Abeni When moving incoming skbs in the msk receive queue and the latter is above limits, prune it as needed quite alike what TCP is doing at the subflow level. The main difference relies in the stop condition: since MPTCP does not perform collapsing, it's better off dropping the bare minimum to fit the (newer) incoming packet. Signed-off-by: Paolo Abeni Tested-by: Gang Yan Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260807-net-next-mptcp-oooq-pruning-v3-7-dbc1eb853cc3@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit e468d371180d3c5b3333660bd742103b88703adf) Rebase note: in the older receive path of this tree the check goes into __mptcp_move_skb() and mptcp_data_queue_ofo(), after the map_seq of the skb is set, and replaces the drop of the previous patch, as in mainline. The two commits of the series between them are not needed: b1224c4b40f6 ("mptcp: enforce hard limit on backlog flushing") is about the backlog this tree lacks, and 996643574cc8 ("mptcp: avoid code duplication in __mptcp_move_skb()") is a cleanup. OFOPruned is added after the last counter of this tree. https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/protocol.c | 79 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 19eb9292bd60..fbe27ddea8e1 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -79,6 +79,7 @@ static const struct snmp_mib mptcp_snmp_list[] = { SNMP_MIB_ITEM("RcvWndConflict", MPTCP_MIB_RCVWNDCONFLICT), SNMP_MIB_ITEM("MPCurrEstab", MPTCP_MIB_CURRESTAB), SNMP_MIB_ITEM("Blackhole", MPTCP_MIB_BLACKHOLE), + SNMP_MIB_ITEM("OFOPruned", MPTCP_MIB_OFOPRUNED), SNMP_MIB_SENTINEL }; diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 128282982843..f2b9934a6ecb 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -80,6 +80,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_RCVWNDCONFLICT, /* Conflict with while updating msk rcv wnd */ MPTCP_MIB_CURRESTAB, /* Current established MPTCP connections */ MPTCP_MIB_BLACKHOLE, /* A blackhole has been detected */ + MPTCP_MIB_OFOPRUNED, /* MPTCP-level OoO queue pruned */ __MPTCP_MIB_MAX }; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4cf70cca0158..4fe666ed9d27 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -157,6 +157,65 @@ static bool mptcp_ooo_try_coalesce(struct mptcp_sock *msk, struct sk_buff *to, return mptcp_try_coalesce((struct sock *)msk, to, from); } +/* "Inspired" from the TCP version; main difference: stop as soon as the MPTCP + * socket is under memory limit. + */ +static void mptcp_prune_ofo_queue(struct sock *sk, + const struct sk_buff *in_skb) +{ + struct mptcp_sock *msk = mptcp_sk(sk); + struct rb_node *node, *prev; + bool pruned = false; + u64 mem; + + if (RB_EMPTY_ROOT(&msk->out_of_order_queue)) + return; + + node = &msk->ooo_last_skb->rbnode; + + do { + struct sk_buff *skb = rb_to_skb(node); + + /* Stop pruning if the incoming skb would land in OoO tail. */ + if (after64(MPTCP_SKB_CB(in_skb)->map_seq, + MPTCP_SKB_CB(skb)->map_seq)) + break; + + pruned = true; + prev = rb_prev(node); + rb_erase(node, &msk->out_of_order_queue); + mptcp_drop(sk, skb); + msk->ooo_last_skb = rb_to_skb(prev); + + mem = (unsigned int)sk_rmem_alloc_get(sk); + if (mem <= sk->sk_rcvbuf) + break; + + node = prev; + } while (node); + + if (pruned) + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOPRUNED); +} + +/* The stack can't drop packets for fallback socket at the msk level, or the + * stream will break. + */ +static bool mptcp_can_ingest(const struct sock *sk) +{ + return unlikely(sk_rmem_alloc_get(sk) <= READ_ONCE(sk->sk_rcvbuf)) || + __mptcp_check_fallback(mptcp_sk(sk)); +} + +static bool mptcp_try_rmem_schedule(struct sock *sk, const struct sk_buff *skb) +{ + if (!mptcp_can_ingest(sk)) { + mptcp_prune_ofo_queue(sk, skb); + return mptcp_can_ingest(sk); + } + return true; +} + /* "inspired" by tcp_data_queue_ofo(), main differences: * - use mptcp seqs * - don't cope with sacks @@ -168,6 +227,12 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb) u64 seq, end_seq, max_seq; struct sk_buff *skb1; + if (!mptcp_try_rmem_schedule(sk, skb)) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); + mptcp_drop(sk, skb); + return; + } + seq = MPTCP_SKB_CB(skb)->map_seq; end_seq = MPTCP_SKB_CB(skb)->end_seq; max_seq = atomic64_read(&msk->rcv_wnd_sent); @@ -286,15 +351,6 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, skb_ext_reset(skb); skb_orphan(skb); - /* Can't drop packets for fallback socket this late, or the stream - * will break. - */ - if (unlikely(sk_rmem_alloc_get(sk) > READ_ONCE(sk->sk_rcvbuf)) && - !__mptcp_check_fallback(msk)) { - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); - goto drop; - } - /* try to fetch required memory from subflow */ if (!sk_rmem_schedule(sk, skb, skb->truesize)) { MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); @@ -315,6 +371,11 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, if (MPTCP_SKB_CB(skb)->map_seq == msk->ack_seq) { /* in sequence */ + if (!mptcp_try_rmem_schedule(sk, skb)) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); + goto drop; + } + msk->bytes_received += copy_len; WRITE_ONCE(msk->ack_seq, msk->ack_seq + copy_len); tail = skb_peek_tail(&sk->sk_receive_queue); -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel