From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 0CDE18015C for ; Wed, 16 Sep 2026 12:19:04 +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 68GCHjhw014891; Wed, 16 Sep 2026 15:17:46 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68GCHjhw014891 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="WnTJppN5" 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 68GCHh04014875 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Wed, 16 Sep 2026 15:17:43 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68GCHh04014875 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-486f3c0d896so2805483f8f.3 for ; Wed, 16 Sep 2026 05:17:43 -0700 (PDT) X-Gm-Message-State: AFuF++lGbTRal6ZNAG5FSR/mSA8aSABJHuaUSbqDmYqkGWgVmaHsTrBJ 1TdKdrrl5eLrjYW16uPRv/+PCOa8vvb5APpFATkTb06HSA716XtPt54VI1TIK4M37TpU0LccpTX 0um2o1x3IiD8u6DSL8ZiWMYJYallS1ahNPpk2z/l+zmTDfAgi+szfiQ== X-Gm-Gg: AYBFou0XjYL6QKN678t35ZTRNngK1GATH9GgXO4CWOquqCo1WIVgP7Wno1zZlGJcqaE DirWQuNbinRQVPdHLv2Y5ty9DcfnrHgcfXXweTqTbb1MsxyA8+DOUbyNlLRMlHsp75qhEA6TYcy yErxsj3TAQV9bOX0d1NlQXKOjNGypGfhh7SD9eBErUqCNlNQAzi0fZ2wwKmKHRirm/BpqVceoky ln5lQRR5qz0foqCaTFGB6QjvQTpiwx++Jc/i/9qN/HKZtmqX5RtEuWJvbic6m/G4WXazH+3ZVDI KAfSjIYW/nwhyGh4wFSOwi47Fd0JAKFpnXnffBMmCOUX4n2zFaZnwKQo6vESjnAE+MH+hfMI+xz r2K8W7zxcqY39PmGH7hWYlst1 X-Received: by 2002:a05:6000:27d4:b0:485:8c17:9764 with SMTP id ffacd0b85a97d-4870d16b722mr2019319f8f.38.1789561063000; Wed, 16 Sep 2026 05:17:43 -0700 (PDT) X-Received: by 2002:a05:6000:27d4:b0:485:8c17:9764 with SMTP id ffacd0b85a97d-4870d16b722mr2019286f8f.38.1789561062393; Wed, 16 Sep 2026 05:17:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1789561062; cv=none; d=google.com; s=arc-20260327; b=im3LVc6DqBgcicUgiwlaZh3xrsi2GMPWlli6mED5VCc9e+w60Zx1/k6N0H6Xpk4Ggb ywdvR0LbvU30ZzqGoIxA+hIMjGknFM8sB/mTQOGeu2fUkKyJeSXHqXXBM38coxE1zdLL org23CkeUZVTF722vIfK9rF2MeaOMQH15DajfcsEl0OtzJY6VrYl6yNCc0BIksbLWW8R f/BAa6wgTOC69zj2wwfgQk0g4J9oUclLIh9vkz/ImHKrF2hs2+S0zpGX90Wh8rofzYEC nHM3MQK5iETBm1W2DkxfGcWUplZWlZ6pEKEmCYiwaVkeTER+TGSK6YBufv5nJZ+6P6oN j/+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=JPYCAlOjUqGssi+2K7BUNKBmJPuiX4cZ3T43iLnrPe4=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=WRJydmN4ZERKXzsIFXbKagmZ59JIsVcRCzMD4YcTAY0R/ZFvc27lzOPR/nPWowRVCN Z8Al+N6eJjVvuOb/hPs7KlLCDDyMuUvemOdO8GbgZFV9ZNoYVXeKks01lyDeZxj//VeM w+l6TJd41bb6FCdhCFrvo89Y/+6ZJuV85nG9ApkS0GCIaF9ecDtwwZNVWza99Fwv9agS IZ8jH4ZwhJiZw2moMrDIQeBnOBeDzExTtnBMDcMt8PhN7uCkWR5n6djZs2/o+oaOjG25 AC4rmjtScj7B7b6yDkDuUUTiAnIOSxdn6EgjTqhZtsBKkglhHOxOcq/CvGTf+WAr2Rzp cmNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=WnTJppN5; 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-4870bf2c2d6si4876309f8f.113.2026.09.16.05.17.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 05:17:42 -0700 (PDT) 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=WnTJppN5; 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=JPYCAlOjUqGssi+2K7BUNKBmJPuiX4cZ3T43iLnrPe4=; b=WnTJppN5mono 6Q/G1r9eOQaL3RAYUNWgtKAY0CTn1zTo/HrDZWIPsBd9vLyGvvIaYrLyHtXPO5SM5+Sdmpfy/1tRZ art+v/lwG4HBXD9D4oCaVuOqnJFLtCN2kn7Ewx/M8QCEz+BstbfPp+nI4r3e07oiYslewpmdm1cy5 wNTjaeAGcIP7jb/zUsblCeCh61E0TIe89V3OTO3VPemTlaB50DpuRdxuGrPmYu7G9UBJ7ZwQGSG57 ixw7nJ9eiTfegU33xs7ISKUplgF1MUmsKts+1bkHvbqART4ZB0C3cMN/os+jqtI1dUPRyx1tUs2Ag iuYGBas+eVWKiGGDkgfVkQ==; 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 1x6oXL-002xNc-1i; Wed, 16 Sep 2026 14:17:41 +0200 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Wed, 16 Sep 2026 15:17:34 +0300 Message-ID: <20260916121740.796320-1-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH vz10 1/4] ms/selftests: mptcp: join: rm: set backup flag 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: "Matthieu Baerts (NGI0)" Some of these 'remove' tests rarely fail because a subflow has been reset instead of cleanly removed. This can happen when one extra subflow which has never carried data is being closed (FIN) on one side, while the other is sending data for the first time. To avoid such subflows to be used right at the end, the backup flag has been added. With that, data will be only carried on the initial subflow. Fixes: d2c4333a801c ("selftests: mptcp: add testcases for removing addrs") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-2-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit aea73bae662a0e184393d6d7d0feb18d2577b9b9) https://virtuozzo.atlassian.net/browse/VSTOR-139651 Feature: fix selftests Signed-off-by: Eva Kurchatova --- .../testing/selftests/net/mptcp/mptcp_join.sh | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 2b08beb67f12..48af0da2bb6c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2337,7 +2337,7 @@ remove_tests() if reset "remove single subflow"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup addr_nr_ns2=-1 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 @@ -2350,8 +2350,8 @@ remove_tests() if reset "remove multiple subflows"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup addr_nr_ns2=-2 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 @@ -2362,7 +2362,7 @@ remove_tests() # single address, remove if reset "remove single address"; then pm_nl_set_limits $ns1 0 1 - pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup pm_nl_set_limits $ns2 1 1 addr_nr_ns1=-1 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 @@ -2375,9 +2375,9 @@ remove_tests() # subflow and signal, remove if reset "remove subflow and signal"; then pm_nl_set_limits $ns1 0 2 - pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup pm_nl_set_limits $ns2 1 2 - pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 @@ -2389,10 +2389,10 @@ remove_tests() # subflows and signal, remove if reset "remove subflows and signal"; then pm_nl_set_limits $ns1 0 3 - pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup pm_nl_set_limits $ns2 1 3 - pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup addr_nr_ns1=-1 addr_nr_ns2=-2 speed=10 \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 @@ -2404,9 +2404,9 @@ remove_tests() # addresses remove if reset "remove addresses"; then pm_nl_set_limits $ns1 3 3 - pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250 - pm_nl_add_endpoint $ns1 10.0.3.1 flags signal - pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup pm_nl_set_limits $ns2 3 3 addr_nr_ns1=-3 speed=10 \ run_tests $ns1 $ns2 10.0.1.1 @@ -2419,10 +2419,10 @@ remove_tests() # invalid addresses remove if reset "remove invalid addresses"; then pm_nl_set_limits $ns1 3 3 - pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup # broadcast IP: no packet for this address will be received on ns1 - pm_nl_add_endpoint $ns1 224.0.0.1 flags signal - pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 224.0.0.1 flags signal,backup + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup pm_nl_set_limits $ns2 2 2 addr_nr_ns1=-3 speed=10 \ run_tests $ns1 $ns2 10.0.1.1 @@ -2436,10 +2436,10 @@ remove_tests() # subflows and signal, flush if reset "flush subflows and signal"; then pm_nl_set_limits $ns1 0 3 - pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup pm_nl_set_limits $ns2 1 3 - pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 @@ -2452,9 +2452,9 @@ remove_tests() if reset "flush subflows"; then pm_nl_set_limits $ns1 3 3 pm_nl_set_limits $ns2 3 3 - pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150 - pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup id 150 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 @@ -2471,9 +2471,9 @@ remove_tests() # addresses flush if reset "flush addresses"; then pm_nl_set_limits $ns1 3 3 - pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250 - pm_nl_add_endpoint $ns1 10.0.3.1 flags signal - pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup pm_nl_set_limits $ns2 3 3 addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 @@ -2486,9 +2486,9 @@ remove_tests() # invalid addresses flush if reset "flush invalid addresses"; then pm_nl_set_limits $ns1 3 3 - pm_nl_add_endpoint $ns1 10.0.12.1 flags signal - pm_nl_add_endpoint $ns1 10.0.3.1 flags signal - pm_nl_add_endpoint $ns1 10.0.14.1 flags signal + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup + pm_nl_add_endpoint $ns1 10.0.14.1 flags signal,backup pm_nl_set_limits $ns2 3 3 addr_nr_ns1=-8 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 -- 2.55.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel