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 3FC93803BB for ; Mon, 16 Nov 2026 03:53:46 +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 6AG3qXYS019299; Mon, 16 Nov 2026 06:52:34 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qXYS019299 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="cM5xmYfw" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qCQP019235 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qCQP019235 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4915ba023d4so1258543f8f.0 for ; Sun, 15 Nov 2026 19:52:12 -0800 (PST) X-Gm-Message-State: APuU4Z/Mg3WGP5c8FV4nJsXfy2/Nn5wvccRInnyOkIq9QsUvxnBu2S8o ig1aFsKi3t6BgmP0npPxWX+tjLKMQJq1z7Jg7Ca1f+zDYd9hji3TGsf4ybej9dILqQQHKUgFkMS NFPbPJSVfbOwNV2IZsl2lS/aKWVJ0XVEHPCgyKMJrfv07sFk25kVc1A== X-Gm-Gg: AYBFou0Wdf2GOdDNDFm5wREazMgdsjAQ2tTvbx4s9I8LThqN3IlWAJT7cKI96S1i+KV EFbIG4U4+lWXBLbNwBRNd+OijexizFJ2XS/HjsFMlHcKHiGdQ3Zkr3VlapgsqwmRO7ZPG9GC/UT iFnHAlQuu8ftwJzINGIOix8tNaSKW1iTCgUB3iUN459dEJyGcQKxHSOe0HKTZK4xqde7M7BVi46 NHyLm5Rltla3uO+pSknx6q0UTSXZKuQL0ZEQQkBQgoVeM88jx9hhA9XUlLKBeRPeBcZjAcne10m teY+I+ppIw93RnxBUxTkaT1YHHV1YpSuoblHTyuEqJgEWAVzCloCuvEtz9XQi5qjSGm2qJlDBL3 Yfqq0qSawhOS8nzPGf8bPQcykkA== X-Received: by 2002:a05:6000:4a1e:b0:48e:20ed:d5e7 with SMTP id ffacd0b85a97d-49c720282d1mr19941203f8f.34.1794801132217; Sun, 15 Nov 2026 19:52:12 -0800 (PST) X-Received: by 2002:a05:6000:4a1e:b0:48e:20ed:d5e7 with SMTP id ffacd0b85a97d-49c720282d1mr19941192f8f.34.1794801131787; Sun, 15 Nov 2026 19:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801131; cv=none; d=google.com; s=arc-20260327; b=JVM22ycsNeagHx2Vwl3HUtvBLb2rkOoJJe2Aocdw4oHEFw9R9HEcedCa2oL+Zc4+yW vutEVHq2f8+qVVYYyYe4V3INwB1wQpkA597JYXN993sxHZa9AiAqkUefDIt9p7Q7ob1A 3bGMgAbgnNQPnN8rXVPi1YekQo4N1sQdmStTwtGT+EwoB4faHCQ6P+2fDh4PT9B5vA++ l6Y3r5LrL/t2u5WdydeJlbV3bykStr09BNnej2M3/aBKpz0eixEeUNG3s9DCFAWIP2B1 bJ6yYkvUC69BP39GQ0l4Wwy1ueD8yPS+Z1ebkIGunFVXztrCYfsS9NEDdTFBCMy1+hgh r5HQ== 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=vJtRLfFaAmwOB2p/7nl9Wr6cO8Q6CjC6klOD4CN3zzE=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=nPnjftrNHzxd0l4Y0ST16/4NcVPt0D0lPHt6x0R664TJz5hzoH52XODVQ2ntHLKeJY WgNtUL9SHJyc5cOeVPmPMtryYSVGn7761fipIolMllTi6z3vqDW9kAyAaOi/SbHYfT2b UIOTWfSIN/rfiiPMZrOkH37oLLB/o8V/4/gwngt306Q5OaDCq9yfrirDdGrrLsDirksX Q/ftRohTBg8XfppTZCGJRd2rX2t1Iu0byuCBiHZvvynIwkt3biADC92MbRpoHWtEaH+y 2nTMFXvZULT9j83hdSBniniaAB2X0nYPR/47BJuobHX+uDLz7rMYH+nafiG/Jmn+3CMs 3wow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=cM5xmYfw; 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-49c650cbfd6si19314949f8f.486.2026.11.15.19.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52:11 -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=cM5xmYfw; 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=vJtRLfFaAmwOB2p/7nl9Wr6cO8Q6CjC6klOD4CN3zzE=; b=cM5xmYfwZFFd xVELOYY2rH5Vo2etC3SAKYanx/Sr32z8Noq3megsx+SIJ+3Jjl1jtcAW33ChgxLwICnJtbdL4DrRY qBmgxi8n6cfh60Y1yr0zLo3J2PAu7tAZhbmwmvER7t3R+ZBOo3QRAXXviHYuGA2VVgYPMbYuvV9Vm 4HowXrMMpgPgR0ISI+L+TUbl54pPuxV7fBoQf9IGTvCsvGkPqz9A9KxWS3+U9nkcmbUFFK/URvLLn HWe+PBGDUkJhejyQbSr/F8zwPX+5l/CgJUsuN7J0GoZZphEqSIV39UN2jqnay/Ri3y3CRbRLtSeIS LW9E4R49eODGxqDZShV8sA==; 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 1xSnh7-00A3ol-0I; Mon, 16 Nov 2026 04:52:03 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:15 +0200 Message-ID: <20261116035204.564416-9-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> References: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 08/10] 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 6e8779646d17..3b02a63ad1a9 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.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel