From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2074.outbound.protection.outlook.com [40.107.105.74]) (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 468A934CC3 for ; Tue, 19 Sep 2023 04:02:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nIajugzpOBxiV1wGmYhma0rrXsjBQ9a2ka1Hbc+OlM3/JAdfa30ne/+F7plQQIOALxZrLmuRoB82pnNjnEUdc1a1/HOvlN0OZ6R9QEeCJ6j0zyx3uf6E2o8ZtLcX3i7Q+kAu9Egq9Ozm+OuZCWtvYupQByWx4FMO6M8vhGSZfkDz4NhsQHht85edtSGquZzriZg1QuD0yUdLVDvkyDE1LORhG1hnIKEqd/4XH/F50WQzgOW6yFpQ70diK1dZKHQw34rICW/4rnpPTFTyzXN+2dtkd7FrvMYfFp8GSl11B7SW7vwCCpCC398MFTq+lj+nDAR1weIWKSyrHwBa5LfguA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ldM+zhg3ZRaNH60oexri0cN4gapaj9rWMRpDBoFltN0=; b=mbSZ5v7prgwfjHIoiu8HTmPURP4CrPWQX4ZLHAvhkNWLRjEhZ4QFfpWoy0UgFLvQcSbggBVwc8/K/TQWOEgKqRFbvXO8IS6QBx2Ni1u43CjUVO2HMkgjsB355wOSr9eDXOGlZrgrOlig3a/tADwRnrZCvCG0+n7W8gZlQ/DlemiqXqRtxqI1pU5cOAMwwhE1UigoWWVlq3zRjFl4e8wjvNdHWsZ2upSJKNj15npL9JxzvgpTx97Pq0/zw4k8lukaMjpLpu9iEaDlsFIG+fZc5rXXKXxjcW2jEPUQtLhx0IbY5EzEGV05CgQhTZVYSLpYqwO/15jYj9UsWUJ4Oj3z/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ldM+zhg3ZRaNH60oexri0cN4gapaj9rWMRpDBoFltN0=; b=rdcQSuAf82PRJaW9+gA4KjSg07ZKwAT12YbIXmAy3wir43J+skuWS3bfI91IXHWnUGHbyKHPMKC+G3EnxJz2zYCi5wxlHEZlsNYp9bId4G+eNGHRQAexh8BxddrIKAdeGbiU66N90CrnNBCKebFJcmasVkM7bZZM7LudF5zYtVfpDsFaKtsz/2iJXXdRoVnPjqUKdciW5Hd/4vjLQEJOU/CWiaqONHHBFT5ZCh+QqMDHKJNvDuNPCyclGNT3YX/Evafv/WV0xfLKFpvhw9MTmKD8Z0eu2O9sdqfNrO6zmW4Gx5sCgoFw7zDf9KzMikf+RalswQC8RT+Qwmogh950XA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:01:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:01:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 01/30] mptcp: drop useless ssk in pm_subflow_check_next Date: Tue, 19 Sep 2023 12:02:02 +0800 Message-Id: <4dfcd21a19adfb1d8e1b61ae2dab6cde4ed8034e.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0017.jpnprd01.prod.outlook.com (2603:1096:400:a9::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c4e001b-1098-44c2-0801-08dbb8c52bca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pAg6guZrpDbpyysymtBu+wPrMxTAhqNY/U6nGsbNgar6mqaBnysb4UhODUwVf/HZB96sylnK4ZFf7OMRCqhpBNGDr9YxuzsL/tLDxNZoiNm7gt4DiRqhxPP2KOWjGHXebd6Y5ox9SqwVdeB4aSL0joRiLfR357MxJNsVqAsCIse+d8FZtvJqsDEfyiSBT+PyL0kDEc05c03gT0uiXfEY+2Xq/ryR0S8X0BfHAg6sggwzryhEYkeqUSYmTNZnysJviJRpewaclmLUX8GTGQut5xdPIX2gSYxq8RWkjkfirAedQCT9k1WGt1v/4TNtZzp/EA2zMee8s8Aw64qoTzRpxF1p0kRNv7l/0ExEvPU0uxrzYEZZ9n904uvbfg6eTO8KtI+AyvPPR5pjK0DMcQLrOzWTwvfWS4TcC8Yelo9HloKXWbEhJ4muRsA3ZBrHIRb0lSXRMDI1+ZbfYk5bMXWWW6faYb8WFQhG5kZlcDfbuZnPt15uOOwtcgMxg6jOfnucskKZl4e8kbVJFzK8htPM1eAkhQWGNlOhdawTubTkPNJ+5r3htvLEfConRgq52D8ZXfMEDNKM1h6B6mUtKQQXFl+5knX1NQJS7LLpCfT678o= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZabLgUZ4Ow/eNDQPpfk1neoDrV8ZH6mJMsaPwpWjHHwPHh8aha78hqVj6Xgc?= =?us-ascii?Q?pv7FcF63LzuG6HrmaD8E/+cPLF9ll4lKwZkx59CW8zCvyyMRQn4OdRanQAIs?= =?us-ascii?Q?3T7+q8Ti5UeqHEhOF76IiS1mdLZHN8fsE3CGmj5q5z9cYrmQcCjXY2msBOoR?= =?us-ascii?Q?Q7OmvoAFeT1BnRdZg44LwpWBziyKWc8nuC3WRcHziFa4hAmYQXJSGR+LSZPa?= =?us-ascii?Q?+QwQCHWw3DgefWDH8TRCmwTojCK9KFHl9z60gJScxxuYrQ6wSRrqJQZj7cTt?= =?us-ascii?Q?+WXwEI0frzetx6Uodn8sn3CdeP26zAXDPtQkL8Yo27KZdbJUyyXOZsfkIxbw?= =?us-ascii?Q?YAC58Dk+XklByzPg/inmiC1v2/t00Ymda15u1NL+0sMvSBkmdMQD+EK29z+K?= =?us-ascii?Q?luSggwhbLHAfMMVbnA84v3lDN9XumUJHxktyle0uAZeHl3pnkEhyV63VCy5i?= =?us-ascii?Q?qkHmeo8LLsJzC6OcYU21R0f/pGmCsh8Fv/CjSmGu2C6wNmYVcU9J3RNc9Lk5?= =?us-ascii?Q?9rn2mDoyMJI1UPXSxDbVdgU7wsbm4ewKmsNUPW5QXufn7iEx+7fidyiWztdT?= =?us-ascii?Q?rK1or7p8/zFTDy7TibBJAsf+2U7iehB+Fdsfdiy9J5Zd38XwcZyI7d2tnH21?= =?us-ascii?Q?Ivt5Z/YLJ5Gfn70zppuO0xlgJHZwrQssGi2CqSBHzSkyLGosmjJtqKfGzplN?= =?us-ascii?Q?qZ4SlIeq7x0mBE6Ci0caaYa0uAUKAOpz3IEu1gjvUypkX/pefL2XJSCfG4qI?= =?us-ascii?Q?NqmALEHxVSJWJsg6OCDLut+qOoH6F6w5FCW/ABKsHjGJcTuH0rx8jMnV3vZx?= =?us-ascii?Q?XrBlv4JPWIJPIm8o5xgPRwt+p4TPnsNTXMzN2ojUVJORrKGplM7XctOb8O6+?= =?us-ascii?Q?2o4MxTYGVdou9Oo7AvPM24jemvfFZEYD9zAoQclXJwgKEMhtgPvVMWrO1+0f?= =?us-ascii?Q?KzmZhJIIEjWD1L9xLfc+hUme1SVjZZLoi7PYchxczRSeUWQgzQ9n2s+lhRU7?= =?us-ascii?Q?zbbVNP0PN619l54Z4hkMCf9IHjK6NzqY/bVWSIYj6gTV635dabWsPsKHtL3Y?= =?us-ascii?Q?YlSqkA9ChlNY21a12Fh3FsVmimFLh3mppwmt2BSuSGAsUFdTbP0q6p6W/5XO?= =?us-ascii?Q?Z28YR45bjIiSa7MDkhZ5bkZ857/2lZj3Eo/i7QatZu++cVUeM/SmaE4E9Iel?= =?us-ascii?Q?FX+umW1yGImTb6uIgpP2EEKD9CnlK5ChqsEw1bWQGY3AeyMDTqiJ2JQWZuy1?= =?us-ascii?Q?CP+yG4lWIrp4GEr+kxjMpFb7+Yz4fk284aYjvflDTsdJAfDVRehmk7VR7lbk?= =?us-ascii?Q?lS4TcjRd3pDVVn3ILgXZcO0AwPLVqTRL0gNj+RILcu3Uy1PBr1OFtZpwvxoi?= =?us-ascii?Q?SoQgd1ISRBlJjV3AZY4wEBgv0BE+izvW3VVrx7bHXAapc6BDI2mUYru4CDwv?= =?us-ascii?Q?PHnEEzs1CUEpf1hGLOEPaTfuyk+1sSjEYct0fDK9uu4xcxhOP5VvSn4kkg3W?= =?us-ascii?Q?vTyVntY/mxJ3aL1qy96rOIVhP3tCU3zxIZLWBNYi5sAtTEWkerxVLaMoFeiK?= =?us-ascii?Q?m3ngB4fzTWX7cH44LDv6JeXIxH9T5lm2kVFLjRm8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c4e001b-1098-44c2-0801-08dbb8c52bca X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:01:58.6831 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YaVo6pYU8Q7TQkc/ap0X5h6lZH9ePYSOJ2S8/jce4algMm1jH6aMbxQbHQLIbOt9jfUXngwRBNkNlPnJi/GPZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" The code using 'ssk' parameter of mptcp_pm_subflow_check_next() has been dropped in commit "95d686517884 (mptcp: fix subflow accounting on close)". So drop this useless parameter ssk. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 2 +- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index d8da5374d9e1..4ae19113b8eb 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -184,7 +184,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *ms= k) spin_unlock_bh(&pm->lock); } =20 -void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock= *ssk, +void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct mptcp_subflow_context *subflow) { struct mptcp_pm_data *pm =3D &msk->pm; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1a0b463f8c97..15cdcc0f03bd 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2467,7 +2467,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ss= k, /* subflow aborted before reaching the fully_established status * attempt the creation of the next subflow */ - mptcp_pm_subflow_check_next(mptcp_sk(sk), ssk, subflow); + mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow); =20 __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3c938e3560e4..f67cb5596e41 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -843,7 +843,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk); void mptcp_pm_connection_closed(struct mptcp_sock *msk); void mptcp_pm_subflow_established(struct mptcp_sock *msk); bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk); -void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock= *ssk, +void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct mptcp_subflow_context *subflow); void mptcp_pm_add_addr_received(const struct sock *ssk, const struct mptcp_addr_info *addr); --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2045.outbound.protection.outlook.com [40.107.105.45]) (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 D82A3EBE for ; Tue, 19 Sep 2023 04:02:12 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J18n0300oaB204cTe18Jll2prhYaGye/C6V29ZouyvOqjWyvEXoY1Cg9pD0D0NhezNGBxv2fcOJ2tn1FiKZRiXNCdsw6xnWPgYd4dhHRWVAEWCXlydOjAsnlSQLkJSDmd9Iyf9MB7JRv7OS2K1sV0uH7qbWfldp0+yuRnksKdjknyGgNor55m3t3Qal2D/1F0gusv7o6nhx7MjmfvKyxMcGGeWmLbCKciAkpmdQ4MdA93FcFmAzvtjZSenkqdIw52iBK3m7E7iJ0vwo6R1eIqiXTBatEQ2CQhBeXcmmKJSWRXXWLb+dm+clkCSFOjJErFDVSDBtYooiGOdhnpK8INw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bc/gPL1cFO2KN2cjntnDk1m/Vfm4dXxUgLhH44IWpic=; b=DHee5cxg/AJ9JNpuKiV5b3Bz9ZHZNyt+MWCPDpQLFjILiZlKcMpd8dUfqlDQCY0CHEyOdMMP1DzYTd+hsqiYJkiR8GvtY3dYZhPqsM7q8+L25t9yQYZFaeXjUYDIQG2O1OBhS6GzvaXhbd9b60U2twHR1u7nub7Fl9//uu2RmuAARps+X+Vu20kR57GpEm0Mw+yaGvKdSJdSJkpbKJwfOCwudpqvKXdL7a/KlVXWYIwWniACltX42t4Pzzvp4/ggP7ZKDJrIo6ihNBAMCPZupJ54igAubE+zmvvFYT6AeI9eB9eu2TuKTp4i75EBdwF3VsCeWwRQNrnj4uidZKGgVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bc/gPL1cFO2KN2cjntnDk1m/Vfm4dXxUgLhH44IWpic=; b=pgWshJlqBwrGVcfrPntIFXDJxE93J9cySKJoqKEKyCRNyNXFUDcDdxqZEz8CrYTQDQ508xl9r6qeWfmzhHm+19zY7D6B0rJK5g/ubo4tDgJ2UdgJPW8Rp+L37LQgWG0W7ktf76MG9oMuZEPo6uvqrbIwgOGXQkoYFtBzKrUhTk2C9YREgRINsXUlm52qAvcg55rkDyjSJlnS0O3fREWGa+YX7JtIJKpu0u6MDJX0TFFkx67Jp8LzfrSpiQ1Fla4UFqbKckNPUAaYORWKmRvr2FYmBBKypVDHbBOizWTZy095rfTVzsXhC6wAHxCT+Y1D/f4f6U5WYooNenL77YLJHg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:10 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 02/30] mptcp: use mptcp_check_fallback helper Date: Tue, 19 Sep 2023 12:02:03 +0800 Message-Id: <8db2c70c0f516ff32e5c1cb669b39e5a0b01ae01.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0010.jpnprd01.prod.outlook.com (2603:1096:400:a9::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: b431835d-358e-4a11-2eb8-08dbb8c532cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gdRvTgxyTxgAQ09hsH3epH5bYvMRVHmWBLCtCYGwPuJhkF/tUYJ6rgk+VpQmXLNAGE1sJD5IKbshwOl0+UPpEASsawITFGxkZaa2jasfyfMje4KsZSBegujTxsmAVw5QJuqhUmbX93M9ladwoX+lOaskzb6igRzU/xF8FUQgrf+U1APsdhfByghm+3MxwpjtNM4y/MW7dU8otUHVQOqA5gBQoz8lqDpI2d0GKufavWDw/TVwsCpIH0CDlmTC+JQWJgja4kj5s/w0sAzGgYx45lnpKtCuSc0eItaQMVJLzg+DpXTxxd+8Q3JltlQQVgHB4T0Ogm3BZmBkSzlUlmc39Rwfjnif+1oMFgbp3BxWn90qNwn5Iv5MqOmf6Z4+mAzGoBCq2qBKPfFCb3584domxjuJrENkjQCwdP+oUNuvDrRvE0/llXbDcjdpnHA4POEYnvmTVA3SdhtLM3VTXOq4uxJv4wvaj9h7Rmb4AGzrSO8ETyblWIqAggtWD0ntbqlVUc5tIStDaglVsoYyOBkPQQhxEXaJIbg4z3eEjsFy9USuwBgGi3CTBOENE/TyQguv1CiIw07mg995KIBH3uaLQzzuME4GGcX5W1cOdZ6H660= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o4ztJ853vGUTp+Js39Fv7od9GmGlpmBYxt3pdaq66aC3Q6BhIV51K22xzVaf?= =?us-ascii?Q?ZcO50dHbaRhclcp3uH/gKepEKQCbh7lSzfxltDkmBzptn3COIJ15r8t3GJ8l?= =?us-ascii?Q?k5Dd3ggqL4jfwYQBZ4YvqiZX5OTrOy476aWXF/wGphobwFc+TUTVnsu6KJSa?= =?us-ascii?Q?Wn7PevDuEwqivLRqfVAHGjqLX9w1WQu/ic4m8yoBUiFLFSWPllZpzRGXVsCc?= =?us-ascii?Q?dTaRnP2BEeP9hyejriggRzBr/8veXL29fXpp/HPgQSHIqHkqEM8Y8BCkXWjr?= =?us-ascii?Q?6/ptX2rr6KJ3lbnG6M4ei/PFkBOSpejnbRRtrogYVR/bxkRGtjZmH0NWuYKr?= =?us-ascii?Q?Mo/5i44GF0kXLdYrwOOcnwWWi21EuS2W7CRDZqizMYNATv5sHdn7omtXnyeh?= =?us-ascii?Q?xNKvF7TNgR89dGxAwjcx4yyMLmuHOjR9vdx5YSWRmldyUiuLrzmY5Gr9kGC8?= =?us-ascii?Q?F2JhU7g8NDU10pOgYofZjW5HWdeSe19BKN3oSZbGBxs+CFSvvSC2jVV+WWPb?= =?us-ascii?Q?RkRauYCPZG/wkaOynSl+EbPZUCUkkXTVexHMYYd0qy35Fxb45nc/8r6GrkTM?= =?us-ascii?Q?Gw/2E6a/zQKBwXUisSackObaz9vnQIUTA6mfb+t74S1lTbE2x7naPsUApq6X?= =?us-ascii?Q?gVuh5WwbNDXSA8QtK4zf53LrUcq/TbALrsb2x0wcNF3DShpJdm5Wx5YUhgdw?= =?us-ascii?Q?4K042nEYCZuEBGTbsuoO0ROULEG1giMaG/GuT0Fb9ZR39jLOOffBNEY36O/o?= =?us-ascii?Q?kJzGSZ4EjBBtulmI5YwdId52aU/h/Ia0lagMgpR7+RrkQGA5qTUcUMw1W1lo?= =?us-ascii?Q?nYTQLImMtojexHP/v57+++OU0IRWHtYoxwo2yNKEvyBQ6Ev44JsbVyDr+N3R?= =?us-ascii?Q?+GUzbPnf7zZIscf4sK0MHRiLHDm2em3b8EXYEjghkptMSKbuxuPfTz2MThtj?= =?us-ascii?Q?uMFLmQs6AazXMWenjsRPdUj7Ns7FsEiELfrbAhQKsxi6LawTSuGjigdCYk9T?= =?us-ascii?Q?pi7PQkDfbnF9x8YQ7eDwoZeDNWjC87uGQCZlFi1D4iKTYTVj8FosqjFT/7XK?= =?us-ascii?Q?w1fnnIbtPoIpOQfO1FLCEC1wr/f+laMtXNaR8x9tZNezRfkOh0UTtcg3wV5x?= =?us-ascii?Q?gyDfFy+ZmvCCF0jl2sT/xtrUOaMcDYld2uXzy7RG/eLA4obFtxn50aHaBnhW?= =?us-ascii?Q?aQHqJU7GZc530LCKfaVkGKdL43FXpDq0IYosOR/OsA/iguRzFLFckH3vE5Hh?= =?us-ascii?Q?etcSm8XZtVjGTP3fGKFTGP0r7+gUZdYu/+KxTyTTIrHwvRajjAosWpv1bofz?= =?us-ascii?Q?X+8sUbnt1/KUfZe3bSNsXbmk78w/bTdORBTTkPjs1cR7yeDRhUOCLvtBEt2p?= =?us-ascii?Q?HoLDpY2vgPvRFquteTG+KPJo7S8WdcXK32eTQ5DBUTcMLDfov578KZBjvVnF?= =?us-ascii?Q?APlX/CFZ4CRgMgpbyqCIjIIZR4a9V15s+UdpySJeoghT2EPCE4CV9HkCSw9M?= =?us-ascii?Q?9wGs6CMcTc31mTCAlVgsErHnSoAHWs2Sk5vkiPQeeBLj90AnRld2uVuhr9mQ?= =?us-ascii?Q?Y5Vq8IRtYpRUEGEZ4Gkyo8EbXcoQMydBUVLlA295?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b431835d-358e-4a11-2eb8-08dbb8c532cd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:10.4481 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4fZ3tZeJTWWnJW/5aAt0H978GPGRG2gAwp1LOErX0o8fqEFFtILZM4Ol61oFf4fxADJtqIGtBYbc9/vm0HQiBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" Use __mptcp_check_fallback() helper defined in net/mptcp/protocol.h, instead of open-coding it in both __mptcp_do_fallback() and mptcp_diag_fill_info(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 2 +- net/mptcp/sockopt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f67cb5596e41..fc041763dcb0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1024,7 +1024,7 @@ static inline bool mptcp_check_fallback(const struct = sock *sk) =20 static inline void __mptcp_do_fallback(struct mptcp_sock *msk) { - if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) { + if (__mptcp_check_fallback(msk)) { pr_debug("TCP fallback already done (msk=3D%p)", msk); return; } diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 8260202c0066..1ae9fb6fabf1 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -915,7 +915,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) mptcp_pm_get_local_addr_max(msk); } =20 - if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) + if (__mptcp_check_fallback(msk)) flags |=3D MPTCP_INFO_FLAG_FALLBACK; if (READ_ONCE(msk->can_ack)) flags |=3D MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED; --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2062.outbound.protection.outlook.com [40.107.105.62]) (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 307ACEBE for ; Tue, 19 Sep 2023 04:02:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dgl/7jaIEY1Rbrqm9a++6PkH4t6sSthskYxIVbgI3AeiQ//Juzrmzlm2rN26FueUzXARnaB6Ttq6YLJrmb/7abIQ2bJhIbyU01ccZfwCALB0stSy0Ccvgsq2yEZYo4AbH9DTiDFjYR4yHHuKHSzYHxGaiFW22DBcI64Zo8qB7g+ah5pa3TB3oqob2iOJw8sxzu9+/zBnst+az0xrWC87g5THqCgWh0Rw8Kaus7C1fAp8t3Af+rK6Bk+xDnoNfWIT9z10HKgTIjIxtFDLtJtHGazxwUVGw6gX1+Q5MvxfHAt7si4zvSO2fivSdsyAZWhpmT138xyjrHb4vzqsUAT26g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H+Y33su+C9J6Koo9Ht4ThakHCQPCRdOnwLNMviqBHVs=; b=UMhVMrsi9kO0WGoU3q5yp/7kYyMC33n8zwNConiHm9hvZUR1mOj/fy/kE2Q7a6Zjd/zUaCS2zcX0TH6odZ45ir7VjDnmyPCpOGXagrviKyTqnibqt4BqHxaw2u1B3mWc1i4I8auX1tXrZs3vRQ7Dm2WsN0Bbc9hb+3XptxOTKq6I6OzWGmmUA2TKxXwaIvmjSuu52D4TUQy76jUWbsCj2p1RRGyy2zjhht2vhieP/ucxgjluieOMyMze7atZuq/j3pkaoOn1G0XG8kcS3QBrDVrSOSgDZyDlyPhsRV98P28IJXJTbwJsbPTmsSjk3CM0al/76Xw8f8frYgSZ9mmqEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H+Y33su+C9J6Koo9Ht4ThakHCQPCRdOnwLNMviqBHVs=; b=RHAG84RfuSgMEEi0Ozu53sM+DIyUhaN4cEeJYqm81KUHDRTnWFYhUBsxdNmYNsvCWethVCZCzCiVQ4wR8OJti/eFeq4M2Wi4JcCXme8HoEk6eMdveKG3gQeOwLVkvN7+9SbbnHX5G3cdoOb/TYZbm2iBROlQHYRhs3jlsEkelBTfKf5n3Up8jXtgnsfnDU9vZhrq/AMvC4TprIHFoXDWkauDkCxlSkFzk2JUey4/YFDr1Ve+80OF7pstOPLjmxTaYxN2oWPgmzH3Cq+wD2oOYkQJCGDg/gYvZsGzdiDNnVkX3vA30DAUQ8Njxc2Jx9E5xEMQtsBj/4znsEKDwzcD2w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 03/30] mptcp: use mptcp_get_ext helper Date: Tue, 19 Sep 2023 12:02:04 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0181.apcprd04.prod.outlook.com (2603:1096:4:14::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: cf999998-51ed-40bb-d069-08dbb8c53734 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Apgpi2vMkLYElllJvHo2rwYCZ6fjk+G1pUL17TVKypk+Z5IqDxztS0gzX/oS2oX3/qIx/42FMJkWQG63yQz++NbVeDLUWo6rj7tH6L/B7N6UmbVHl7Op7sAafxB6wkBAxfx7usEHXo+DLHpw9+pOyrthu5cOtkytXmNcCbyo+9vyMzIdAasYyKY34yu+QUSjTErjguqHdvsSWdEbYOEMIq8eCTH/dFlIUj9uvgedbGuIqK/xz1jX3hZxKi2S1yjhovLMqD6XJuipBXOKG7jBTcvJE4k9fny0eIf0moH1L3AtXrBL5Uv1GfiFPNHLtnXzrBGC2J/zThLJSmf8kz46FF3BMQpP3iQxjDLuBoGGIzlHi5RlfenS/YNVEspTsFf24E9By7TgHOjjPIH5S3wjW3AyE3ZQP3aCs4HiNR8tA83+ge7mdFLhBnvtp/7M/UaWOmM+MCFplhn9LIGinxTov9ZHKMV9zbsPKJRCWtgDssa7AvD9gbje5Ef8ty6E7u41qPv9agX2hullo9cr/dxNVe3AOnCkeKC0OKO7M/1tuS85ZAkaeZ7WYoG06pU+kk9zLEU71RIQm+V7Aezc22lFP3+hZ+qNC7RfI+oI84mz/Mg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(4744005)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Se1r8XSe9NDVU4nu+vr5eI36nyRcE6LJgp7A5yGZT9BzjyXVte4WaOCHBuZP?= =?us-ascii?Q?Ee+HxwmJ+iA1Lw34EZS0zlF2Vhj2C12z5C1C3/SNuqz2McRAvSIkd0lHo41/?= =?us-ascii?Q?I/OhtNRqzv4cF/irDT1UvJNT9dVK4jL2qkHyZoiyqWCOJ9zJveZkpbLLM4Cn?= =?us-ascii?Q?WvvJGn2q0qf4qtWXtPUIURIvIoFl58PNT08zpVxuaxfmfF/kD1OXtJccmhvn?= =?us-ascii?Q?MBllHAaEPcZM1Hi91PtBQ+1Q6k4EmGV/aJ3dlocGnBvDc3HE5PzPjbixq9UU?= =?us-ascii?Q?iOVc5Nue9ocyP344vc+CWb9KQeg8BI3it2PG0kiOKoEctqMQ7CJ+078nRuso?= =?us-ascii?Q?mt7M4IWUk6AnRQjtkjrnZuPOFu0tWwGXmpRcVdfCNOJFQlFC0sSsYTlIurGo?= =?us-ascii?Q?Se/Sq7uox7X9/0nL3C5AZnQydtJtm9D0jbdImDCuNJVLdO6n9AtZkkd+ZjBX?= =?us-ascii?Q?yCrymEqEW3/vVcn9RA3NG3vuFdJMrSGJjJoWUdqK3TQevBOUDQSUhEplTbM5?= =?us-ascii?Q?R0X4OlJIfgHTzczVZGHggS0lzRPdYcOUD4NNr8tuu3np1ZCr8TIrXghAdTJu?= =?us-ascii?Q?jTXV9EZvTbWMzLHiNDHDgQjLttbrngX8ZW4DauyZSVSL7fBQ2jv9IYBQTweA?= =?us-ascii?Q?+g8LzAXSlW0DxQEfqjvYUE1++QriYl8Vd8gbk1FKEF6GpVRZjFvAg02s6Vz/?= =?us-ascii?Q?FzTcb4RQV7eSEtOZJLpIBazf04RQev1HDLUBpXssFqZQYSHhctWNjTYVUmuz?= =?us-ascii?Q?3Umve8dw1nceCKXNrX0kcVCvVetcoZIBtQYo4l7GWFfMu7gVZbRZCmkTSBFX?= =?us-ascii?Q?zfHemDtogJIoMvSqKCNTXUuQbT1rcQGFJYzjBuZIbAePZcJnTro+X3czW4Ny?= =?us-ascii?Q?ZKVqDkriLcfZ8569v4sB1aYDaj7UlMHgXSVAU4A4D0/uLVaBj7ka+N3G19BF?= =?us-ascii?Q?48pvthMoHinGxZoDbLflgSW6brwmVHIeWoU0m+DzRMmYn6Th6mqtC+HAqaB1?= =?us-ascii?Q?Ryyzq4FEuMKIiI0dRZb0NGIVoIxrvQ3N8M16lNvsqwEPhEO4tu98pYYQudv9?= =?us-ascii?Q?yz/sRe2FNhY4fgu60zlLSVJv8HILtK5SGQ+1TgdegI9MDjYOl9rgTGN4+DQC?= =?us-ascii?Q?Si+ykX5ppXXNkG90dVTPfHjQk1GCSkzpr8DBotFoX9wJOGJl540RTsElD/Wo?= =?us-ascii?Q?3KBvCB2+QMyECxeqSmmsJUT1yCxjkpEAkS7hN2eE2uH7piMh5sXJUWUqvowX?= =?us-ascii?Q?Td2qkgFoEbdUVj/AYFX6lmRVmpugdliZuBg8RT/AocWnWLvgM4OrvFH2DTC0?= =?us-ascii?Q?t3NXM45bS573U/3UGYRL+WQqo6Rt+KcZ9/pkKJedYgmlVoOJ3kzbIi8VIDvH?= =?us-ascii?Q?C9r+uYQf3k/YhDNrIjgmm+wVPvm50/4SroJkIwJiWlFeqK5IHoPlL6RZSUcu?= =?us-ascii?Q?2L6amXLyo1ttI+5q90kTuJdYgQETkAQ3dTefv4UNFQzZTYM7v7jqW72+BZt9?= =?us-ascii?Q?6BPhvJ93PEUmabEww5d6EFR6jmWfI45Yx0SMGRKuZp3d9E/co3oZ4LsDKaP3?= =?us-ascii?Q?ImIbwqwzFTMDJXh+2QhgN7YQ1c4a/UXczD3mdfNn?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf999998-51ed-40bb-d069-08dbb8c53734 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:17.8452 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: njXXIsVWJpdGI6SXiR8/7SCm9bWNyE4Gk8rUKIL+ScvBBeOpto01EXAvutGY5v2qY7jrbSYJvE5aRQkN3Es9qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" Use mptcp_get_ext() helper defined in protocol.h instead of open-coding it in mptcp_sendmsg_frag(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 15cdcc0f03bd..2c2b1ab7d1ae 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1268,7 +1268,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct= sock *ssk, * queue management operation, to avoid breaking the ext <-> * SSN association set here */ - mpext =3D skb_ext_find(skb, SKB_EXT_MPTCP); + mpext =3D mptcp_get_ext(skb); if (!mptcp_skb_can_collapse_to(data_seq, skb, mpext)) { TCP_SKB_CB(skb)->eor =3D 1; goto alloc_skb; @@ -1290,7 +1290,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct= sock *ssk, =20 i =3D skb_shinfo(skb)->nr_frags; reuse_skb =3D false; - mpext =3D skb_ext_find(skb, SKB_EXT_MPTCP); + mpext =3D mptcp_get_ext(skb); } =20 /* Zero window and all data acked? Probe. */ --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2080.outbound.protection.outlook.com [40.107.105.80]) (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 AAA6AEBE for ; Tue, 19 Sep 2023 04:02:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U3idN+BY0+yRQen8M54gTLLPzUdb2TNVw90ropr6ZhXFz8c1k8vN9spNbVFDhu5FhXextG/rqw7ZwXRaH+8sxjqC49vZELpMVNYERDOxhJan8AFZyCLxH/vuiTUpxqKfPifXnss7tUnKoxxueuRfNGJ09GprQXxZYpZDyZ9FQcYFkO31Y5eHsbBATPus9vFn/6ifS5Tghka0p5A9X9sSjY8L9uZikbeaGRZx7O4dfQVxX1Th/TqP/ezVfGIcJi/BABxGG17CE4xfvNoKrBT2LCV2HhJgWUZVIspQfBD+6KMVXlmuSb95hyh6F+f+5b+UYRxYyO1GVWJ3aNZQN8TpGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lxJoP65w/SR8UJ8c/cl5Nvzh7Nzpvhdk7YlZORSm580=; b=kny/9DQJKJEmFVT9ISyYayiRHHNzdUi+t1ftFJnr1sNvQ31ZxyqbkVNDaenKtxFFH9STIsF3k3cARPF587+XVDIm0vMhhTOk9zFvZyeC2AXyAIb6mrai3JKUN/Q+PZN9IpSPct7I6HKB+odsf5rgUKxyOFbpU+Vm2bCjvIkgli2B2/Iq5+5YPojaDBP1PEUnY5s8KQsNtzWwcLB9/asx6ldVBbpelvEEmkmAAxu5Fcg8DTaqlB+YkfPVzrq2a7qJEcvy+AZ8R0ET8NuqQOTz5j2/gPY5fcu+bpGPa39OltiOH2mWX926zuOYyOcQ5VrK1wS+AjAR19R1ZlmnR6q89g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lxJoP65w/SR8UJ8c/cl5Nvzh7Nzpvhdk7YlZORSm580=; b=NDM2QJrs5A5XqNsNfMBPxlSkBTwcwT/KYrGMffoGTlRlAMbPIzpAGSCuAanphtfyhCn8dQnFiaejrTjvVa+de23dg4loPtPJaC9OTAob70ThKQy6je/8RiE24J8wCR70zUoY3LgWe66OMeKZKhS0f2rDHHO9yPJhnnfw+foqnnSX1wJG18HIH833PiGvZwgq30NrM9jR+bviTyW3Z6Yx1NBoD2cs1ybeSchPposc1uM7YDaTFnuuELUd0k+0whhnoHCJAEqk7uGjsx8Zz8czPaf8AOtIpbarLwiaVNmhPIYWULC528cqFyqK63M977uzbVfTn0KEwAiocI1pRLstdg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 04/30] mptcp: use mptcp_wnd_end helper Date: Tue, 19 Sep 2023 12:02:05 +0800 Message-Id: <61179b15016da6055cc5a33dfdaacdaa30883cfb.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 76a9fcc5-7ef9-43aa-dc8e-08dbb8c53c4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8JIQEVuZa/tVxpElUjKm9/EhhDJuLJszHO46jT1JpO4Z34XKKJbpZrxvf6rMe1DYP1Jvw7sNDC567IGUYUjrzaZV7s+6y89uEgJpTAPKB6ac2+UPdyMJwX6G79wIsOWnIRsGrBU0JxfRdhO8cXHcHiAMidg2qwsRe823EF/tElo1xE43qnjz+vL4KBQ5/ypafIo/gWVVicF8RKbrLK/mt3A2QwqhqK3sQAyIvnyDPrh9SsDEuJu+uwmn+qkRjS7sKC1s6hGRX/jBu86embboBwV5t7268oXme96V9pI7kAdEsCbZXzGlkCpKP7M1UxZGvnhj92aeTNgJPDkSp2NbH8C/Pg1b9taZ827NLWWMNYf7zQCAZxLh7oC4jOntpz+SkFjfZ1poMMDh9SSUeyrIdndZrmcZ7iedeLE/425M1OxITZgrrMIF/DsWAPjEfRFcNFBZxT8mKiuZmiC+RhH0YdIq6r0mPtJK+6kiE9zKXd9q0u7KDmSBeFXi31tcZyUzrPV5jqJ32St1dxHsj5TRvywkuXb9j/qKISeJ0sY/XZqfe4/TOJlTkg/pfhCcbYRYdSBeLhQML7SFWnzgbeDZa5o8K5aXIo9eTqf4vwOQH94= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(4744005)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g8ykrMAfypdPuRTIpUeTfaoNzOfCGc+pf4PPOnxV9COC+hqZna9tjJ5o0CwF?= =?us-ascii?Q?J6cKo+DkmV4IkiAziRhZpANqVs8ie5Lu222opCguTE/OO6Vin0A5h97Klc5w?= =?us-ascii?Q?hT9Nn6ubzTtxHuyOl3O3Ml2yeJJSftecZplhN32MGdEQ6QqBAW08ZAKCYy93?= =?us-ascii?Q?m1NiNNXtW9/VDiC3++Ri/5mYmMYOVIU2PUwopXr0O6XyxL50Rvheyt4pmngX?= =?us-ascii?Q?UYMbdL3Hu0shE/ln7RNtZtEOp4h9iHG6OZe3aY1XFQ50orNV2zevKFFINp7f?= =?us-ascii?Q?fpVIDb28bXfweZW63A4/NtXBIGkwRtMm6d/zHu0vEV1BXHlv72wDQS0hWM/l?= =?us-ascii?Q?+6OP8Pa0qMvkm3MwEdW/tJay9YQ7W6zj0pAFK8HQ3L+uMCLj9KlSHd6P0jC9?= =?us-ascii?Q?pjaM/tReLByOnrlQ8DsiPNZdF7BEzA71zpiIniFwn+UOClAkj3ETMFovEe20?= =?us-ascii?Q?8kXM3/jeti3VII1YIhxmnuwOZrs0Dl2Z5IxjTRmp+/gDfQnEh0CViX0z3ZWv?= =?us-ascii?Q?T1sYHMuMGvsM5KOvJz50aklo1+bbvtLL0ou2tXPhpPZqF2/f2aLerjTdzcTS?= =?us-ascii?Q?cbYof0rvVJmtnMb9EQaC4oy2aQ8QKFgovZuKR4QkSNksn5KQRLKMtRTPDprp?= =?us-ascii?Q?Njw3ge2niG70ApZV/TNdTlJm6MMRA98ZAwUrexKaovd63QOepRqmTgogx6rC?= =?us-ascii?Q?5neNELT2iW5HEeNnrUGlyK2484GdWtr/XtPHh46TmsJcJ0W52hF4vJLxVhSb?= =?us-ascii?Q?6hJku0YBxznNuplOHief7MshExFy5bV82qAR+OrAEJ79NY9RL/WatiutOLxj?= =?us-ascii?Q?58B+m2j8CX0wOnIIOIrpWCw8orAwpDnpmv44hpOjUrvqEz/yyGkHU66KSIys?= =?us-ascii?Q?9iecS8Qx88sXlasaDIDz1jMbEW7S1bl//kvyP0a2sR+Pudt9jQ/QdQdj9ZmO?= =?us-ascii?Q?kf2XFOw7YwWnUHleQfy2mitbA9jbih3U+Bo+NT99vF0Q2XSeWeLcn5tqUuup?= =?us-ascii?Q?jit0BQ9NCiUmY8MY2IRX+XWYBf6CoVL6FwgiRp1IUpL9nqoowjL/IaaYm+G/?= =?us-ascii?Q?rCVcghUJDqGfRXb60UvfNOnzmIcoQNgADIF5m5IQlMN98mSB4P2U1naaxlo7?= =?us-ascii?Q?/k0/mdt+8pIQdcQ3kN+/mOMCCBuPPLZuN4FhdqO6zkQAGRUARHgHnFvt9bn1?= =?us-ascii?Q?q7btc8cbVQHKGoEzWW5icveRX8llKprgt25IXMQf5Tl/IxhOcuyWaalhcXS4?= =?us-ascii?Q?z87r3/ooVVwCcO4Ns0WoIcYIbtzO73dtI40PH7Zvpoeuj1LVVulkcSVUcN1w?= =?us-ascii?Q?mbLGYBGvn5uDlLEx2Rld+EjBguqi4qppmMNOZNip2EnC6oMXix6hRLkE1+wQ?= =?us-ascii?Q?HzpFKvWR9kZeRzN3zPAyL/XqgAkiez7G187cUNgtZg+vUYQLUo3GgZzSTb/S?= =?us-ascii?Q?EYZ/n7bBX1LUc6Ug4W+FXciaE8IigGLXVSse6uzdmZnzZxPw99YDCgwx2yKZ?= =?us-ascii?Q?jhkW+ZGhNzXtIqknjSBLX2SeLNLjEocK+CvBDGd+Ltntl1dA5vymz/D60WGJ?= =?us-ascii?Q?ddVwYKa4Bt1SeFuSbGHP3DrPjCLc4Ct/VDgs7Tvl?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76a9fcc5-7ef9-43aa-dc8e-08dbb8c53c4c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:26.3957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZmTiUx283TH+lvOMx1U43nFrQwtS4kyjLopUSbsjscLnAvKzlZ3UbfPd0alrrBrZTpeY0PYax6/Qh6vRQWFWMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" Use mptcp_wnd_end() helper defined in net/mptcp/protocol.c, instead of open-coding it in ack_update_msk(). Signed-off-by: Geliang Tang --- net/mptcp/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index cd15ec73073e..f40381557788 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1059,7 +1059,7 @@ static void ack_update_msk(struct mptcp_sock *msk, msk->wnd_end =3D new_wnd_end; =20 /* this assumes mptcp_incoming_options() is invoked after tcp_ack() */ - if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt))) + if (after64(mptcp_wnd_end(msk), READ_ONCE(msk->snd_nxt))) __mptcp_check_push(sk, ssk); =20 if (after64(new_snd_una, old_snd_una)) { --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2057.outbound.protection.outlook.com [40.107.105.57]) (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 C486634CC3 for ; Tue, 19 Sep 2023 04:02:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cjrc2w1KFcN7qDSgvszCwZnYXfhqA7L/XV9zAPXaseBObaVSezFnt+y57Af6xaIswMg9wNF17+W96/jBBT0wyOyTiqaJIxV0u59qPTVmbyZQzxGe+YvtogXwJgB8NjwqDgFuB41leYAnGRrZC1U8atSt6GekaflesJLBVIsZpqDCm7NlpghDP/FivybJEz+lBcM5Z55Kk8bA0MQA+kFtQPkBqtciC5dOBUPUHP5Bb5uWpo0BYxUWfb62oN/4w8mDUCHX0wHmLGTU5I8QMTeQr+d6or2R3wet+bJIqyLoRiEX/fx07f4iCceTdf0Zx1ognrfqhKXs3XrGZ/qHd2gubA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zdapZy3VHL8/rSV9ddO6iLmmZB/ipwSsYOncBeSeRu0=; b=YcEJXVxXkcjvfSmnrLi1/NXwBmROmGpYjHz0adlO5iFmhfrXCWPFE5mU/cdpr6Er12wnujie9rN4Go4sSPWn6Kdf7DXIBwLUa1fpxxfV/QRE9tbDlY3FMSvMva2olUG4OZOnG3pIbxgAD0VlfKZukqacyxOciP9t+HZMnu0GtoekW1ABow3ROnwBbj6YxE7WKcHdYiNR8FBVMmKfiUAWR8qAq1700rFv+0YCgA0Ksms+UanMcOERR4Q6hLUBLtem2+b8wNeR/9uHmyKOESCLZJFsWjdu5qL9czae5mirpBtsFOBui6P1g/aFSp9cKUQP3v7wbXVwaGhqhy5sBZviOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zdapZy3VHL8/rSV9ddO6iLmmZB/ipwSsYOncBeSeRu0=; b=vay5VGhC+CktXw9Q+ZHYLCnI/AWZR8W69CCOAR840A1hAJK7hnkb4vyXbsBFPd0EjwHa2aDsZsH79RBJ5AJnhqIBxySkULnwIuSG0pZHrdnyDad5WffRAGsIEzMRW3N/US4zbEp0GYMASIc/YupfjYnr257psyvac3u6Jj2CUq7M2kdQipAv7Wc8Q1V7J6K+cASLI5qxsovnOPTanCbmFd4fvsyW2+hi7jrRhIpOsUBRWTps1DXqIFADKCEjRIpd5+8W/7TuWaq8ExOWA9SHAZPyT3uV1uYr5PzaBk404S4ElOcjVDD0WJchDeERfZHgm4lif9uVG6xxiKEz8DUsbA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 05/30] mptcp: move sk assignment statement ahead Date: Tue, 19 Sep 2023 12:02:06 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0179.apcprd04.prod.outlook.com (2603:1096:4:14::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 3eb85f23-f385-4ea1-a10e-08dbb8c540f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lb1hdQtvzijWKj01vdHChUKW2IkdJ9nfF69hsj+f7eRvZNxFEhHnX3+IWARYwc5xWnbfkDOz3IwTxMbkLAOU5kfFcnlzWMf9+yTiy2cFw0uDVlwvQxLyZ0BuiSX8gww15R2Y0gCf3PEgzF5uRDFXaS93dIEg4VVn1fED17PhqfawNiX+w1M+H2w88VME4vtn0eEJ3LzXUAtrv79Ck7CoWTOUKPU+flzOwb063xUN6xyJGM4BM85T2TS+uJ6Be1Nu0j5UmnCjriFn4o1GAwXoXpZl3blW0zvXmOqvqXIsEVjJpUkkQHmSSc/U0KEr5pJjLkDBV9mzRWLdfk6tjziNqSNMWm0hyfHbdva64w7RoNG0matIEmSC2S7yh+L0auKBT76UQO44n21uwxtPmj2Xattraq4C3dFiB1Ut/irV7VNrCQo1JNCsMkAYlbn8WDVyx2g1u5KYo2flYMDOSWW1WuqCZ1Zs3tmgYVfSpiNSTm3FwXTD7SsLUaZ3XYETIbWt+sNba7ZnFbUMhTjbDQIFxn187rKQ8sILTPvSMW2Pg+OpnOJYXncBGlrk+Xwbr6coPtBiYaWDii5fZ32Bt+1R2nkobHxKAJBlZpOWxXna1Us= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bWBtD2h0xjgbnvLva4LRyRBJPGU7lU2XdoWGIn4MfUeKqBFy+zVhJ9xQrLCm?= =?us-ascii?Q?1GxRESkCWojurPWmSpnxIoKWyRQZPZcSZibPbu2y5SkoQssgLOLaJbd3+9X5?= =?us-ascii?Q?8l1x/a4D5X8r/3AZvxvlIXXA757SPw6yuyRPZQiT0Ie5i3Vav8/VDLlm5Ojk?= =?us-ascii?Q?uDvQ/gfJ8TvHKkcwJCA1LvWozf6QZQPA7HYoPC/JM+p2F1X+gKthhCz9F0y4?= =?us-ascii?Q?95amiZpsyUK3V9X4YSgWND3FwNuBrVMlHfH4XTa9whTcxJg86pfb8YFNQY0q?= =?us-ascii?Q?kAJk52fwfhCosBMgo4DPvxxy29NazPkbH1ujByr8vCpIazEEqp+giBwjBb1t?= =?us-ascii?Q?59gc4LW1YJgJY/ohB1+iz6fbkp8aGAPyPEjLCGQw7AWYlVKeadEOrfh8IWj2?= =?us-ascii?Q?8U2VmRulcRwiw/Pz2zinSA6ukyIBcQX19hhCKqfps8E3jP4OnBGagtssTMuz?= =?us-ascii?Q?8nH2d3tw8IGIDEnDsjk0M5Oqd3kjvdJI5qOoTO+BMnb43BPSake4NtumgH96?= =?us-ascii?Q?QcHgZkIXRaVJ9rziPEUra2oUkPvgPA93LMZTnDN395ubHQr4UDpN7xg/SjXk?= =?us-ascii?Q?zLRoHT1rAft9gT2QjSKVZqnGwJbcQHOqTOuRliJXR/Xtk6o6mKHoRwvpdED/?= =?us-ascii?Q?hkedtdZTt5GZJ8oVRCahTewegY0K59t6H1YLjyeKJC89rAS6RfKrN0Ine5VT?= =?us-ascii?Q?xz1d2FiaBByQIfT2Yma7/Kr0XRgNrFjLECygIyN76kjUAifIdjWGqFV/ej47?= =?us-ascii?Q?LybRsuenoZ0CK4/iJs6lwg2Duc/cgAJxlLEHtt9hwRxmg5JilQMOjpvLUh0i?= =?us-ascii?Q?6v+qNdrQivO/oVEnV2kI3N4u5S+MhQNFRnz2WyeJfnSAoVlg0gquNzHzbCkD?= =?us-ascii?Q?6pdraeSfOkHhYDXOOXEZSbFVNviDKJA/tN5JL3M4bfqHzRdb8n9QD5z6GvoH?= =?us-ascii?Q?Xj+6X3r5EtHC5VyuuGzEl7ZAMYegrxU2WLhHAvS6B4chNqn/jtrEuwJGZzrt?= =?us-ascii?Q?dwofKt0FJg7lhpl7dKdrNVbfSiTRUcaEtlmxwtILFo+QnsytfmAGwbbjBT7/?= =?us-ascii?Q?7CzrA4B1bJLRSnQgdfwhPShW0k2F4moL0mMNIudxx9ng+e5rQfJHNfwUxmMB?= =?us-ascii?Q?ca4JgYzibMKvSKUu05qBEEx6hlSCfv/zEA1RKhsR3byKy+IK/0OHXkXukECU?= =?us-ascii?Q?WzmsLGPW8YyX9F4BfQ8/eZUpeYerc058W1i0+ukJiCHghkK6corRySECNLaD?= =?us-ascii?Q?8klV89qZOEld1mNohwgYJE4Jp4UkmKnqqJrwUWQqUQYGhAg7AK3ERWg3OweJ?= =?us-ascii?Q?1v5UfaO+GCWz0DQAYiTH7KKulm/iT/fdXOZqLc8f2G2oRDuydaEWkngLTGfq?= =?us-ascii?Q?qXWK46j3f2KAXwO3M5HBeJSRIijFk1wvsi04TqqNl3oa0biRkwXFFe9KLCMw?= =?us-ascii?Q?pe1cxznIr6viVQTthYLjTlikgjSUJcqaqk6Ti2WoYQ6wosWAETGX59bmmH+p?= =?us-ascii?Q?BxGYZJORM/YmlcnnmDafrm2epz3Nxay755kK2FnrpC3SFiz5gK2unF7cDGTC?= =?us-ascii?Q?w98EjlN8uGgiGINfnS+T3E+O5A1y9wgOT5VhHxSm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3eb85f23-f385-4ea1-a10e-08dbb8c540f9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:34.2452 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w8wqHyhDyhpChVBgq8iuyCSK3I8CPXZVna4dOlCciLKCfIf9F2UMfJHxr05FQh9MJcLP52Qd9RtsNz+7h3GDyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" If we move the sk assignment statement ahead in mptcp_nl_cmd_sf_create() or mptcp_nl_cmd_sf_destroy(), right after the msk null-check statements, sk can be used after the create_err or destroy_err labels instead of open-coding it again. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b5a8aa4c1ebd..78b935ab7d3b 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -296,6 +296,8 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto create_err; @@ -319,8 +321,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) goto create_err; } =20 - sk =3D (struct sock *)msk; - if (!mptcp_pm_addr_families_match(sk, &addr_l, &addr_r)) { GENL_SET_ERR_MSG(info, "families mismatch"); err =3D -EINVAL; @@ -348,7 +348,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) spin_unlock_bh(&msk->pm.lock); =20 create_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 @@ -425,6 +425,8 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto destroy_err; @@ -454,7 +456,6 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) goto destroy_err; } =20 - sk =3D (struct sock *)msk; lock_sock(sk); ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { @@ -474,7 +475,7 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) release_sock(sk); =20 destroy_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2055.outbound.protection.outlook.com [40.107.105.55]) (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 E6621341B8 for ; Tue, 19 Sep 2023 04:02:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=naqg0Mx3VkH/Qf/9kPMwCp/SeRGDem5BtGxp9GXOHSp2DYYe7ofW67RlsSj8lz+xKArhTUU3mj/FOsCFoRaqG1DUgPxtAFCD+Bw1SyE6KsSKQXjEX5COe9tQOn86N1nei2ZBGA0BMmPNaat82YMvv2FgFZyzWjj2kcqgXbo2GDzthwgSpihRrlBVdVU6wNdc82y81YThviL1QvLqlzAZlwJzqO/yAkERwgtGBxO57W++olYle5q0/lQw2EERqQ8GuL4ITfElmdJ/OPPjf4CfuAP8mB+eg/IRn7GA9d+jDCpa/2+hv0zWnoS9fgCW296cIPiL1mTuifboBtJebFzltw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WZWnKfmbeJi30V+/EU50X13bO4wOjIfw0jiMcfX/c4U=; b=aAV08qW6ObTpdDXHlazmUQSFc90FZih3TqbEfpmd3CwuzBl+vSIKpGYsA28567XMwmh5sB2sdScGXzzvCr70wg8GqyfOYtlbLJIer/k4AEXvsr0ZMyfHFR6YFbeGUUMf4/oaO96C2h50a4Y+OMU872j0Jn/vXLs3XUV967BCMN59wiVfgt8qGVKU0j4l799NCEEDixXyapSy9nKtAjU7dbyFiWR3YMQdyXF/YUXdysk2Qe93xgutyUbbR9QrOTDbqHrGdNIBngkGJF0rrXdw+13yDVAR6npqefjR/4JTHhbl7nM5FAzGJ+fpRd6DkhBtKc/NRXdqyJlxcKJqGvZPjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WZWnKfmbeJi30V+/EU50X13bO4wOjIfw0jiMcfX/c4U=; b=U3+pt+WlKnN3yqqi1WvUa42SnowUcgeVjJeuW3o19cphqJVesCTKxx6p9cmn3oxGiq4dOLHGlhwIH/zG3Zkp5Ds5Ugyl/P220Sngp8BTi5Uye9Hf2nRJ6cx02KgpYeE43sheiYyUurt+/SyUJLrbyzVJaP2Ud+QUuFhEqxdF4/PonZ0sloZZZl33Dsktleo1lyWcXLJ7mmZMbvRqThudK2abK1W7jxrdsbzXQ1bxtb+VBHRNgap1rkzpGcjv8eqgUKAEEUPU4R2rAToWB1ornqxI+d/WHfKHRXuJ8EPTOqgr1HxMZ2FzVdajeU7lPNGDBbcVRkiU6Dg2ObLXXETSiw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 06/30] mptcp: define more local variables sk Date: Tue, 19 Sep 2023 12:02:07 +0800 Message-Id: <90e3adcc0291d04a31264a3359576190fafeb64f.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0187.apcprd04.prod.outlook.com (2603:1096:4:14::25) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a8058c6-0c9c-44a2-9acf-08dbb8c545fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZVMqRgh1qdvs0iQQ83KC2pwFRMzzrK5AHLgOpMvI5QaGHFTENghhiG3G568AR2N+Oo3MTDuHpatsQuGQaI34XPpqo9IvRnvOiUmyeuAA5hrBj/2W48xn4bFuu10/QgF6SoLsHOzlAkhAItB14xvC7LBfg43AZy5PhA4EPL9sJlb49UrMxvawIQSoLSSpLl67FdZE8EzsRVykNp3z0GmIyPizAHKtNYAnkAXly7/6inh3wBEdek84hyO0WUVyT/2cxrrA0BainJGSn2/bpoM6zQNQFpLSjiyhlkoAz2SOXqhdqgKrKfglec0SXYS5vo4mpo3w/cnQb45WSe3b+yNDDfNpMzdLXwu1dGNtWqJaBXeaTNz75HOnFWH0kABXcfD3JfKAC6QR7+T+qroilVNtO6Yv6rCexY3MdNzfJZgLjOQ8lj892VoditnUMdw6Ew3BA3xjH1U376OgeiZi6o47Rki9vcUaBgcT1HUlfxQFlbq3q/BRhZUjZHd6UUmFz0ZfkoDT/BvnSw59w/G0F/pVpfp1mMQxFkF3uzyuTT2wezZsBzxEUK23QAO6P0x9S0kLCGyGD1EEin3fvwqFuppBBEQlbsUOOpy6unoTpUkfQNY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MuR8SrB3OtTYNpBvLzfz7ldhtLowLtLN5PNBEpVUwC+SZ0hKUExhwauLIZ1u?= =?us-ascii?Q?rrW/YgCGsC3PVC42pP8ssA8/q1TQxTBPiLGTK+wczGHSPhhk86WqpwsYonL6?= =?us-ascii?Q?somDYxB0zCRAckvzBJXNboXjhGCRZtISnJPPvbkirNArKxcQGpGS01+nulDQ?= =?us-ascii?Q?39ToLNPKHd6kqs0KTB53h1WU1K8QMTwFdNNzIezRXfCxE0XkPKzRDNfAJt2p?= =?us-ascii?Q?8wixHYsK0nbZQxkG+DxKnLRACbi69c3ecl+ZA/3vL10hWw0Vy5VIQgl+ESnJ?= =?us-ascii?Q?vdqnsfGZFCOyl9aD30tPfQOg4GFN1vwauydhqr9QHiwmQYX0I06aJnTlJvw7?= =?us-ascii?Q?0e8gpydIUF/83BGjS+qCKEZAIUWjUlnsEdW6bL33Tw86EytEnQ+ajUIRBgMl?= =?us-ascii?Q?gdVYGyYCryLz9fx44fhAyejZs9Gzb7Yiv/fEC3fKxgIKHSLRirPJc6Fmk4oQ?= =?us-ascii?Q?6Ez60yhCvi4+9T7MZ8gsRXBOHAM3tB5B/j0tbRoDC6+SrvzUvLcEvzi/ztlJ?= =?us-ascii?Q?DC+sylPLXfXy3641A3nq9vXrEYTsSb3NW/lPa0rC4W7whn68wmlsZElDWl6N?= =?us-ascii?Q?43AWNg0Qca0Ayf4QIVT8YYTqtQRmXCx178wtwFfmqpS3LOgcJ4XBOS9q9RBm?= =?us-ascii?Q?5Y50Zu9jmiXkpZQ2av9fthzprUuVzHdhHg3A8KpY9cN+iuvQ3KtDc+DlmT6T?= =?us-ascii?Q?E5mdaEj21EL9W6JORXo54FhyO32Ll0ib1Ms3bwmxC2626hIORYQZYqIXSZeP?= =?us-ascii?Q?7/PDfRBunKc60+Ay+z6OMyVnIBPxbOLHwsLCmJrybdEi1IUHCBigKefvL8YT?= =?us-ascii?Q?fNlusbtasBkU0toKX5CRqVxhIIkkusLDdHd48jXHzP9a7ywi6CsACFS77dPb?= =?us-ascii?Q?5w6PDamonFShBqlekvNklTBpdLKHtBUao/11AgFDlSaqo14Bxs27pw2I4rAG?= =?us-ascii?Q?TxbJR4z+ZxZb6r4ZLdpy/ZtbKocF7fDK8Pvb5AZxDLRkgOV/lM99NsaeRa1G?= =?us-ascii?Q?Cp7wu4yOKFlrNn+XbupDF41MDOR94F3A7OHhr3f35Bv6aDkFsUpaKNbMA9Tm?= =?us-ascii?Q?wC1ZPEgiIJ0j9pR9q6WGZ/xoJM+YtNS0uzIy0qH1Vg0I7Lods5HDBcvLq+Eu?= =?us-ascii?Q?lmslFlatEkSKrjPkqPt8hCrHXnnsnWjFcSkIV7v+ElL0jkSNm2ucm+7yZQBT?= =?us-ascii?Q?w45OY8BhKKNVTemiryYGEGkmOQk74CYU5PkyjMeL7Xz3jHnZPcJymGkQjsJu?= =?us-ascii?Q?y+So88x6wzY0eVUXIk8XD2y07vNKG593m/UxKYTVLYTZ9Qsbk7ZnEwYz91pC?= =?us-ascii?Q?v+jcA+fdkXJ3h0YEjmVQERO/8nen63HF4qbFzSmHYhn7YzMmcCGmDimKqJAj?= =?us-ascii?Q?t8B6wLzMRxrW/WmTo0PaKJoxw/JUPmNhLV1pwdx7t4jcCngtvQfntWtQ82cm?= =?us-ascii?Q?+AogphTOqFQbtEWGySTLRGL26MhdWbU3PBsXqS5zO4PM3/wNkH3eX8ceE1Wz?= =?us-ascii?Q?6fTGYVGZ7aoedrz5sRGyfUUY+SBM6oB2FT2YWJQKQ8OoY/uN/yU/mQjAYWcn?= =?us-ascii?Q?AD1L317sDFmvQ86bqqAUyIVKUrOMUVQphc9PKt8E?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a8058c6-0c9c-44a2-9acf-08dbb8c545fe X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:42.8312 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wPbG5TXYsLt1Jh9DRQrEmfAn+kgUhILsxUCPmJtiNbpbkFBYTItlacFpX8p/8LHUHnDObhIQPXURFWqq5nRJgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" '(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(), mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c, it's worth adding a local variable sk to point it. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 78b935ab7d3b..9429cf91a9e9 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -152,6 +152,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) struct mptcp_pm_addr_entry addr_val; struct mptcp_sock *msk; int err =3D -EINVAL; + struct sock *sk; u32 token_val; =20 if (!addr || !token) { @@ -167,6 +168,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto announce_err; @@ -190,7 +193,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) goto announce_err; } =20 - lock_sock((struct sock *)msk); + lock_sock(sk); spin_lock_bh(&msk->pm.lock); =20 if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { @@ -200,11 +203,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct= genl_info *info) } =20 spin_unlock_bh(&msk->pm.lock); - release_sock((struct sock *)msk); + release_sock(sk); =20 err =3D 0; announce_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 @@ -217,6 +220,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) struct mptcp_sock *msk; LIST_HEAD(free_list); int err =3D -EINVAL; + struct sock *sk; u32 token_val; u8 id_val; =20 @@ -234,12 +238,14 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct g= enl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto remove_err; } =20 - lock_sock((struct sock *)msk); + lock_sock(sk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { if (entry->addr.id =3D=3D id_val) { @@ -250,7 +256,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) =20 if (!match) { GENL_SET_ERR_MSG(info, "address with specified id not found"); - release_sock((struct sock *)msk); + release_sock(sk); goto remove_err; } =20 @@ -258,15 +264,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct g= enl_info *info) =20 mptcp_pm_remove_addrs(msk, &free_list); =20 - release_sock((struct sock *)msk); + release_sock(sk); =20 list_for_each_entry_safe(match, entry, &free_list, list) { - sock_kfree_s((struct sock *)msk, match, sizeof(*match)); + sock_kfree_s(sk, match, sizeof(*match)); } =20 err =3D 0; remove_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 @@ -485,6 +491,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struc= t nlattr *token, { struct mptcp_sock *msk; int ret =3D -EINVAL; + struct sock *sk; u32 token_val; =20 token_val =3D nla_get_u32(token); @@ -493,6 +500,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struc= t nlattr *token, if (!msk) return ret; =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) goto set_flags_err; =20 @@ -500,11 +509,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, str= uct nlattr *token, rem->addr.family =3D=3D AF_UNSPEC) goto set_flags_err; =20 - lock_sock((struct sock *)msk); + lock_sock(sk); ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup); - release_sock((struct sock *)msk); + release_sock(sk); =20 set_flags_err: - sock_put((struct sock *)msk); + sock_put(sk); return ret; } --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2051.outbound.protection.outlook.com [40.107.105.51]) (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 0C0AC341B8 for ; Tue, 19 Sep 2023 04:02:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OHD5r+q20uRVPbB8feo4nnnSI3V41O2N54OwsFtnIUIKi1A5qPKz22TBf5QZuZ0cZicBgWpLYqyPBcU3uJcan6GYI6ZjFguGDlfjNxZt1hXFyf0bL2Ol95JqsVon8/1Whr9Cy9yU8Hvj9BzVBmdCtYouzlRk/LsGbeKNllN99W40aCFFkiLsBHtcsroEXiy4f+HVDQN4Nynb/YaPOljXHZN0tAKLiqMtSzfTacFGd+yttXkKP9ICkUwVtbq/JOJdespucQYAbY8QGp1F9WUoqK7IcIv2485F1gZOolvGCopZrsfrbt45tdPub11ldbLcLOjKqhzLNVer5jsTSklczg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dInZIUajdHuxJUDgJG14Kc+DE02JYSEOr7Mb77Eg9HQ=; b=ob2IpCRD+F3VStJKp+NqN2UD13jMU5hz/EewpvwaMlKroog/DP8Zj/cnj0URKbl17mIYU9Wm3R0KrSBCUTmMdHXZOKwIhvcqZ0qq9OJrqaKNqTyusU+Wxx4s5Q+ceWt/LOUUJ+Z8/6hqH63+zGur5wWSzi6SZOyUVSPG8pcD9glqqosaUWnCQptuGICUYWWJbZo9eWZjlX7Bm5ywqqtBaR344ARDoMRUREhITHmBXfQVBacFtZclNAwUy63a55fcDSJ388fQdN/XiALd6BteiNBvv44Trrw5GTfkLaSB2CwS53HcuQaJw1egHBduv9ctAgtzVRE8axIAd1IdpXteQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dInZIUajdHuxJUDgJG14Kc+DE02JYSEOr7Mb77Eg9HQ=; b=bO9mBnkoGjdTB7w/kF2D55Yzfeo6YufXHXmDvgDaFuUCv9jn4g02VuanIRef1UDfxopceX7MD0/6pZcx6UqFoI/u+rWgcEoFRCcgs5X29j3+dwR1s7/ILQ7VEvLbSdc7VzJFJB407jZAmkEpsQccmkluuMyq34pR+3g5cDU/4LW8bVF4uDLK5kKuNnHDbS3zR9BT/OwLfbtb7pSNYuR8xpfKUcg4rsABp9iZSVpVB6acn+/47ntwPbwCdP2mHeNSGVL3fBiSq0aOL2nEJ4FKQKTDTg3meyVVP2sdM1EoLW69yL0FiOUMDbQ8hc8icnvn21j+VHXzdfRxeHHMspXWsw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 07/30] selftests: mptcp: sockopt: drop mptcp_connect var Date: Tue, 19 Sep 2023 12:02:08 +0800 Message-Id: <78919edf30a15920a07adba329b5888049a832ba.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0182.apcprd04.prod.outlook.com (2603:1096:4:14::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: b94f0bdf-25e1-4797-9070-08dbb8c54b41 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0/A8yS/kNF97cm1hdShIi4jbI3iqo5jKDCFqlIk26riMGbLdnfJQ50wZY8+c66y4/V3dOU7MqqHm5AStsN+pinBXXpnz0Vo93GPf14ccl6et3CfPMh/sAnrZAKCo9Gmu6Ra05KJrYXh/Iqw/HY+BdnlkMADgrD1M0gwHC/5ZGCA1T4gaM1Tlq1gPR+zo+7bayQkG0SB+s1WCUuZtFWtTV9A74MmQoln8jfRifdIBL34wLQTyFBJ9wMPk5NllnkS8y2cdjZI6W/e49xr/8TTeJZ5qbXHs1h1qQLYxIHErYGDtuFW49jznZ57lGqC+EFoEphgrVdfR+ZDtcJ22K78ob/XG4szvLpCpv8z/Bg1u50WqK6Pr5CZcSJV9vr2SBKrN+AoNWAb95/LFVpdFopRI+cpsevKJpdS14WMj9YX+/UPjK8FotMfXTJTLDyWH4MqFF1YZlPjlyJ40dCCtY3sIvA/vclzuAAxqX75ODOcsdX406+HkWqVAPA/QjGrCQsX85zakjcRGSjrIEDcovf2wIpqTv2X/D1y09ZEzWAv9sHSItOb5CpaYazkd/MFjKPCbYMcT9A99aYqhdxEjzIzTeZuZ0tGA//V+Wz7NVzh2/dw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(4744005)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Tr9pd93NhCw6YmWj85IhNFPziZty5el6cJrvc6bTwlsDBKC67RGtuW79LaOy?= =?us-ascii?Q?D8aG+qWw4uZq7gFzAfGj9UpLRea6+qthEpg4vNNhGR4mwbwh6TYqUNdfz1EF?= =?us-ascii?Q?hUIWGOjGUg+yIwidOvmz8UPBYyblSRGTQ83wYBA6jeOkHdRcsW1uRHGb1JZF?= =?us-ascii?Q?DhHcTG1cnkc55yh70/yX6OGRhJE1bOH6YsPhNaCko6TbVdxyYXAEgIemJaXP?= =?us-ascii?Q?5X8Fw3ek5arSh7cjtmyWP0EtOz4lGTYCGh0bDo5lfbHJBwhbZ+w/pyL27o7h?= =?us-ascii?Q?9CgAja1JKTCwkH7pKfa4+2ON3deI4J/0wApxb4PNEAyq+RKD12pUudvlB9i9?= =?us-ascii?Q?UsHZC9bo2mvMLLEIBHZbyWVMH9Ds2T05W8B6MpcO//0k+ToX80jMm6FZWgc2?= =?us-ascii?Q?17pFE1zxTR5FdHyoy3rNIAaurO8JzG1yZl0nmeWfuDn/6WxMxvnv1rJdAUO7?= =?us-ascii?Q?PcPhHYQ0GkokZW0yE/y2CiCFTRdOFkNA+gP6fwFkqqjPi5aHZy5Hf+06u0Sz?= =?us-ascii?Q?Pcs3Ds3mzBabLgWggTfYCxnEdgpBXBj80poIPR8xILo/gC/Io+S2rtoNZGzs?= =?us-ascii?Q?dzdhlfblNeYrHkLzp4pGSR0oRdp17KxeZQfkc/Tmr3NeBwS8nsI4IBJvbheH?= =?us-ascii?Q?HOS1WcsH7A+2rfsjC65o4f0sTH/lUHtez5kQ7V74pc8WZoMS8aL4BycmRBNY?= =?us-ascii?Q?GDlvA1tQuqJWUzlrxkkpRsTmzJR+luvZAj39xKo6gb8sPy72+Fa9xJLrn2Wr?= =?us-ascii?Q?mbrrmuqn3PYOp9bLGGYVlpRSW8G8KcaUGZglmrBBtivoG12oDn7JakrkuHQT?= =?us-ascii?Q?1v5XoYtGWmkytkXg6rc0Ke7Xbe1UYlezgFN8GFB6JOSY3IQ6aamR/2Fa/oFC?= =?us-ascii?Q?o84x8MidvVJomWbmcphtYDT8VhLhDZsZZNauDmHqc8uc+H/Rmns48YdPWvap?= =?us-ascii?Q?FODCgEi4uq64R6VOoA8NonYPyz2BQrb/QV1GmzLtZHElDiOkzENiv4sQ4P5E?= =?us-ascii?Q?Ya27FBIdDeUWpe7GGNIStjubvYmvLxK3nphsP/uKo8najveH0+LKmhkZ+iIx?= =?us-ascii?Q?ZJH1JjwUgTug2in6Im9YEgUKqQ7QQDsLHk9sTQjWs6myzesf//Pl+zSOIaAo?= =?us-ascii?Q?RhLzpQUK3hIB1KU5Y6b5/pFUXjWgJk1b8RVj/flPfsuWqCrdFoOS8D/EyGxo?= =?us-ascii?Q?/AOM6Y7saQC3q/b90O+9sMR+Huacb3T166hBKqomn+Ad9PacZDByoEamj6xW?= =?us-ascii?Q?MLZ/w3hiI7HZtnq+vHnvZX1+pVefmzJXjfhQwgPR5LJ/X8pb+ZlgLdSezoZt?= =?us-ascii?Q?aQ+cvOzd5URchOhzadplx4xW3BbHiujMNPwXoKcDkpwUuvVZLNUDu+PA/gNa?= =?us-ascii?Q?ftSKZnhh7tew2/J/qofEFVD0WG8W0wmYuYtZ8sDvgO8WQVx9zWrSEZ7UaCCY?= =?us-ascii?Q?MWQLzIMmAdTOm19mRTK7MEuerM0jkDYNhQV95UcbSSIgMvUIzYJV91tlGUtM?= =?us-ascii?Q?KlfL/OppFzXy6BPQPXEqpcgkjTyaV9zQnj1KhWXka4h5yf279Idjhue5Kd1y?= =?us-ascii?Q?P0xwEZKV/Pd1w/uyPqev+2V8eHKZObQuJSef2iFd?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b94f0bdf-25e1-4797-9070-08dbb8c54b41 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:51.5060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: in+de6SutfNCGPaCf1R2KpiZauMv59uuJElsawmZzvO7ayVh1flSj+QRzsNeQR1AVlr5FZOt/EYr1z2BMdxWfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" Global var mptcp_connect defined at the front of mptcp_sockopt.sh is duplicate with local var mptcp_connect defined in do_transfer(), drop this useless global one. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 8c8694f21e7d..a817af6616ec 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -11,7 +11,6 @@ cout=3D"" ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -mptcp_connect=3D"" iptables=3D"iptables" ip6tables=3D"ip6tables" =20 --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2073.outbound.protection.outlook.com [40.107.105.73]) (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 CF0BB341B8 for ; Tue, 19 Sep 2023 04:03:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I6xU75icPMZOElLGoBolCQ2xmf0w3Bt2xvvP3eWXy7p30cAs2M02/KAC3p7u3Rq0olXY5jN0Z2O9p1oxP1aPT9jRXLUts4hvWW6qFDEZb1GdLnnUsP6GWzt/LgQ7YcQYDclqiyALNBxn8sOVPpBabX94mRgQ3PklI5YNcWnF/weg1SADTXeyWFQlFAFrR1+01vMF/G/J+gBL/Wo9XjRZLR8j+rTE9GBZ636V1oNoIu/xp2rAj7MPAWklKx9Zd9Zjk2SuSEkbMg94XmiOrmXtUVUx+i8tLH1iJ6yPrys9cuyPdGd0wx4inEZwDBqSigIMT72TqNm7HLkenRSADJpwvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sNw0zsb4wZAmD9AaThDWqiAvjV6ZxsfKpG3uZIV1Nrg=; b=VPzJvb0KEowQzTiT+2bRykTPzkk8VkkVl0ulj3cxVxWARcghTXWdtq0CUzXQ6l1yJ81N+enbTxaz4kyp0Lnw7zWq1UbPOtSHdsViRwwVR4KW+O4J3vFNe0rXkVCMTpdHPu2QvCKDN/YGZL9NodWCJBkDAuNVGDeTemBMOHm//KGqUt+Sfp5C9vIgqG/CeyHt/QTZTHpmSY18ViN2MZQ+M3OMfdOF0B6R5M4FH+zbtPseKi9h+P0BtIfxwURDgd63mR5nAx0DBul8N30iCyHIpt7DGoG0O0j0zAQ3+N4M8tvF1oDBq3KyKaQUcokfO7VYhXFbfhMSspQVOZXdmdsYgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sNw0zsb4wZAmD9AaThDWqiAvjV6ZxsfKpG3uZIV1Nrg=; b=UR/+n4j8kacAl7UB/HH9dQRTMGYAHPSx2ci0LXbPBvVOoBCXBFOvh5J0FI7SlrEZ58wamXmJqxo3H+4M9QUtwoISOE62ebp0vLp/DBj42bGg8QbeLajnWolQWEsY1L+jTtsowZTkQiOdRo5darEuF1E4Pk4XYaA0wRsXdowjN2AcMHBoy7vcSYdvxXAc5T9H8IELfVAU8qE0NCxsdEUwS4CQkc17Y8pT/4vH4YcQpfCzS5IsqeOCM6NSn7Q257w6WnWht9wutahU/AzYd17LtEsHyetq+kTzNrexWR1CKXdBA1ZANI7xCmCHWYbQGQREarQn+IAxYad+qC0F2OdqCQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:02:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:02:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 08/30] selftests: mptcp: display simult in extra_msg Date: Tue, 19 Sep 2023 12:02:09 +0800 Message-Id: <9271c666e8bbc80a5ee08e072a1db13c49859d11.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0195.apcprd04.prod.outlook.com (2603:1096:4:14::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c127735-1583-457e-b733-08dbb8c54ff0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G0Nl3aJVlHVfbFr2t3VI2n2EvzXElRV/0njDbPT0f/T5v5LluMnj/6baUPfCPNUKX/MxjXOw59Ry0ENT0k5RNiGRKVYs0Ht2D1lWdjrZVO6+7/OJtyVp11706/LhNrVUk0rDgYp2HH9e246oewMzF9ERojt2STsMjGUyO0k0OMpGGG6CzGj8kw6XKkC6Dvxt2Meb9yvtrPY0AnLpVr7ycqZhF9Lk96qEbyrR0OxAotjsuSS15gH873CX4mqHgLpcd6iT12kLuitTVpyHphoCisgVUu6AwL4jTipt3GcEcxqdjFbThqI27yYm5UE5zHKv6OqZ4R3jEnJjzFOtTMESwHo6F33VK0pEmgN1IZLC+x8I+lou/ZQiUl6VBhi/m70aW49isHX8iHuYpEaQlvFBo9/0A+VbT5yc873lUqx5H9esl9tBFkBp8DWucdi0a1uD3FzrfO1re8yL9SsAwWhehtP65Mtb+D/xsw7yOHeMUAX1L10fMS9r30k5sxT52j9CcySLqntpcNmj2S/kd1/G6/ZFTzXaZztExv8vDoX25WeCenbBWwxpMlYL87Oi1qgXVItzWT4TtF1/pU7Du9YlV7XJRkzH0/hhweA8LC4QZNQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?45+4mC81yNbbBHHq9UQfMbwYs43SkmetO80Wp4zNX9nD1jz3gjXZkEY8s/GQ?= =?us-ascii?Q?0ZNKxDRBmLxscCvM3l6qh1M/y+8NE6DsugVKfm1CZn9y91GyFZ49Q7JShWR9?= =?us-ascii?Q?yRJ1zzxi1rpoEn3tDdqvINFSPkGqYvqZcdqKuxI9YmCZHcYzWz7zGhHMP1iL?= =?us-ascii?Q?GkuAfRTirgVTXJCPSJi9SPoGAAKlOeyIDgWy3oLXiw5b7qnaa1zqTY7TBwcT?= =?us-ascii?Q?SPMoJcLrX9/3vJ/hc0IMwroEY7p/zZAvIT/0py6RcSCOMmOy+Fy5fAN5zy8o?= =?us-ascii?Q?Lr7thIZlAQ7d3WvymKhlmkyB+WImX9uvIY/fORhMYslID3NZ0zM6PAQKL/+I?= =?us-ascii?Q?H78BWfa/kXrbCL8jA6FSw0ERyZOOWWwqKMQoS7/81Cz8KTmG/OwxKUKcsePT?= =?us-ascii?Q?UfGCZRh7xkMLUIAETEtHiL4dsRq5Mxe/GSATXh3vnbfyta/kvKB40mnUeVDQ?= =?us-ascii?Q?SsYQQ85cir83kg1fCUKZQZR9P7oo5luUxOITs2IKU2XjpSAap11bKd9OgpLd?= =?us-ascii?Q?QqNxjoNvbmbff4hoARZ4WP8tt02x8vuTB8x1qa0IjgJjRPYLF9LseIxVwhWT?= =?us-ascii?Q?Rb+bmSDLi4Rg6H5YRIN+qdb6HKvGKRs9CyV5FXaF1OKd7vpG3B3xtXHyxmxy?= =?us-ascii?Q?kjNGugxR8OCizqjQMyF2Xj7EypzodQSRr1PepzD0FKG4Tg/JkXsdQ9eNHEfS?= =?us-ascii?Q?LTXgHhXHuRhBVm+d5LBXU0FhkUXdkdjxwfzDM7y97tT2Wu53iGl79sgizhrC?= =?us-ascii?Q?sxoY+ksbZm3DgXHoe9Xr93gj7eD7ys/algu1RBQvsHirCMA95YKSwqtSG2IV?= =?us-ascii?Q?XqKwk5RN2KWn0b2IsRveEoeys+aVhlRTaLJ4kyx4MqiBuf3PUPfo3R/gRJ/D?= =?us-ascii?Q?ENCD/t+gOD9ljapV81wh2vM0IA8EbHYD1OKHsIjvxa14ISlTn3/ilwYV+7ms?= =?us-ascii?Q?oZBr2QP+kchSJVjiWkFspwjIvbRqIVVQB8wNRsEBWaXV3FMFJPC8HAREz2i4?= =?us-ascii?Q?sjU9JoH7UpH3R8nSugjiJytFzHKBhdL9vNoDmWETS8hPNFnyaIdHXPuMgVhQ?= =?us-ascii?Q?oW0VF2sPHZWtxYLkodbgpwQYmWz+lipIbthF6qcZx/FooEH3Pj6MX4jaY2pz?= =?us-ascii?Q?miygIPAGl6Azofh2W/DJ4oJ/EmJ2Ahd0PQUcHcjgwbhS1p8Kekuv9xUv8jG2?= =?us-ascii?Q?Heru7EnTUx14xJcBEhkRx4O8zhUecIoZmVY8Os+9AgY9DG7WyDqDiR+v6F9K?= =?us-ascii?Q?j8Y1kjqV93oBN1cxtdIh7tlTW3L4fDTGmG+SCZ73IUKpJrOm4rkmvvOy3gb5?= =?us-ascii?Q?W/bzqncty5oK2O8MBGRhMHmkqv0iPZsWn5gWJiRM+eO5mFotl6fBGpcHAIS6?= =?us-ascii?Q?x9RKdTc9sAyTBIRvvrGrFSqc15NTLQRi0AfiF+Xp647KydYQMYPcBRSw3RBx?= =?us-ascii?Q?jdcomhMMYRTMfEB/ELlmGaTmsXHPtmIMjsOgm+e4PjdhfwybPmdWudF19j6P?= =?us-ascii?Q?Elqt8qdiyVDBNb86/nR+u6kl54tWhqzpFfy+fsMJTu0tSpzKKGIB/+gss3OH?= =?us-ascii?Q?eGR/7ab2gFhcUaW17qxsuRHY8BriZUTi5njIUIOz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c127735-1583-457e-b733-08dbb8c54ff0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:02:59.5089 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XiTnqGvKQGTEufI5cLT2xxyY0GT4elU82FFCqc/C1dDb+b5BZr2xai+GqKzL4ekN0J1+Xd/VIzzNoPDh2wCtdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" Just like displaying "invert" after "Info: ", "simult" should be displayed too when rm_subflow_nr dosen't match the expect value in chk_rm_nr(): syn [ ok ] synack [ ok ] ack [ ok ] add [ ok ] echo [ ok ] rm [ ok ] rmsf [ ok ] 3 in [2:4] Info: invert simult syn [ ok ] synack [ ok ] ack [ ok ] add [ ok ] echo [ ok ] rm [ ok ] rmsf [ ok ] Info: invert Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ee1f89a872b3..d02e53be8b31 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1766,7 +1766,9 @@ chk_rm_nr() # in case of simult flush, the subflow removal count on each side is # unreliable count=3D$((count + cnt)) - [ "$count" !=3D "$rm_subflow_nr" ] && suffix=3D"$count in [$rm_subflow_n= r:$((rm_subflow_nr*2))]" + [ "$count" !=3D "$rm_subflow_nr" ] && \ + suffix=3D"$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]" && \ + extra_msg=3D"$extra_msg simult" if [ $count -ge "$rm_subflow_nr" ] && \ [ "$count" -le "$((rm_subflow_nr *2 ))" ]; then print_ok "$suffix" --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2044.outbound.protection.outlook.com [40.107.105.44]) (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 969BE34CDC for ; Tue, 19 Sep 2023 04:03:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JFNgRQAB388iKY8GlQpX1ULCCiMDA2/7XFieFYJrsjOM89EBKNj7/v65qQhN9YMRMThpOH+MUEV1XugAbkEyv2XlvJOiv3kgQPeZYpUheuD7el2YJVWesf9MLGeQdGpLGVgxnL4hGF9GDpy9WTgzlslXhrLoX2vjuVXQiHYYF44Bqa1adty0qSTL6wjyCAnq7ATg6ec0EhgisO2sHgQDYw6J7KP0vICr+ztoFhfjSbxjxmDbL75no490NWa2XK1fiCt+61pN3mkIicnaQ/HplryAlGdtOrv8UQO2r2Gp0oOzIQtnArOccqBUJQ+GlzFnvZ1AIXx+IeialRq1Aa5pCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3GuXRKU0kGKFBbQTCAFpBu1DJOiuIku/r1Uosa55Oc4=; b=aRn9L//sNR0qUk+lDjiBQISOzwMDn7V7tBQmoIg5EHvz0rtGyQsrmxJrfWai4OoMLNDWqOV+RUNIlu1GeHcUNzwzi1u/VVVzNT0jOvtFXcxPPzfvNxrdAWIlkY30TBsGWAA2h/MzYAXqAj+WRSbIacFB7R4h/BM6BdvTkDyMIP1UiSwIq9YeVe9F0gK2NpeVcVJdXS/VU1/iup5FN3QAPfzvy//xcG0lZL9Dd0znS7BlZ+guBuCQAxniAlaYLvfZfoXguknQLjviqHLFzIgsXSA3VXbD8+VBajGNlct0FDCoMb3cpocyDI0siqvpkJXBCP14uov5GonDTPC+4mq9bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3GuXRKU0kGKFBbQTCAFpBu1DJOiuIku/r1Uosa55Oc4=; b=lD6X94ldEGJJBy6l0wWNLcY7R1K3OyEu5rM2OXNnCrAqhrbVMqM8db12WATP0OQ1X3zzwU72VL3xPjHtF7wYU9ATCTJyvWRs/+ZS8FKj7y76FoB4uAnLZbDQtRjRjGW+mr6KeikZFeoWtEGKl9KzAfNd3lHBiv0ECWCft63zK8FK+nJew0N+oLv0Rl2oGkhXV3bwCpRHNSVUDNq/Rm3/V2mZpM8oP1D8m01Tgb8a9T2j9OFmxt5KfSDucuvHev+2N0vWxlk8zTUfN2tR4YKpAeH9vn0s5tku7Oc6GiEb8lvMdHop2xSruTGAgFmixPl9xsosKP7gnjYg861dciOByQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 09/30] mptcp: add mptcpi_subflows_total counter Date: Tue, 19 Sep 2023 12:02:10 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0190.apcprd04.prod.outlook.com (2603:1096:4:14::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 55205c88-fef9-4203-3a46-08dbb8c553d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iClIp9G/x7X+zX4AaC89VNZoFpslGXbwWXeeH0ngti0T29EGUVD3+ik0kYTquSCXdzo4vbctqsq3QIwnnwSgVeoD1oz/ZgeX0A5bYRCD4GfUGFi1BSUxB0M+UxtSd18t1Cb06MDWZKqyPR43Pzqf6sj4r72rQgb+wqFYUB0BfMcGODot+zo2msdTNtd2hHxyY/KarJKeKe/JQA4cyGbOUHeEQk6crlwMNin0bIpEUJlHWG6oJxcuH/05Aj05e7ZC+Ov/U2Ir4SRTQPRFEF1rD0220KH2zD8PapVDcbyTtz359QnykHjVmpoFXQuOMLNiXb+H5CQhK21zGrMVupHYY2mh+OxdU5Ufw+hmpNRqG7rFp8w5N7uU9TXZAb+nr4YicPWsy4CDfPxX5iK4JuOL4yumHBrPjZcZSZvnpA57BWy7NZXrgUUbEvAu8YTp5yrdp9tAlguwWHhv82h5gFnMQwPehsN8xUjIcbr0Tw3Eb+nJl45ZDmNfGyjtdzpdE6oegRP8WzYJ0qgfUMar/6bd0IcD0QOpCiZ6tKFwIrEjTNhRjSCvWzGUds7Fs3WqQf9u1OYw9JRvq3vDpTucOFOjgED7gO6KwLF0zDZxojIji4A= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(966005)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rUro7I4rI6NeNWIYX2i8QzCFQuvru8nntCkJm9u/RzdRDJ+ZgeXU/8o4Jid7?= =?us-ascii?Q?S+AhtqnhWh3w6kwVPAam54FUyEiM6KJRl0J4o4a24lH8UYVxdHJ+ew6KsdRx?= =?us-ascii?Q?oZ2pW6pjuGCzB1zsxyM4XsVDBniSKwyeqPA1Q4ZP4ggJzyHvIBVzhlU3gJBT?= =?us-ascii?Q?S1w6nvhj3OfPbeSNXDNcZ25uIzxZ83K0ni81EYfNqPUcjz15koJRwj039eU+?= =?us-ascii?Q?FXFZu2465PAI+2kiB196qOgBlBblNo9hFkRAh+8r3Tp5bnd2Xb4Pp6hDzmZL?= =?us-ascii?Q?M2N5COq4yu28u2skI5iCYpZQ84iMD+S0tfQfpWz3MMQ7JFCcI/3SjY55+cM3?= =?us-ascii?Q?CYbcRltY5PstiyuBTsT6jtGsM+WXIBoG+zmXEoVKlmUMZrSMX3i0vBha2M4B?= =?us-ascii?Q?yk/3f+emYyguKn6hKnZfLM9lhrMHW0mmBIwpl5gZKwrfQRTNkV+1QPqerQFC?= =?us-ascii?Q?3+dpgZw9QtixJIDygHwO6jXQzY2SKHL6P8f7MLKPyhBpWnI0cpcVG6BPg8jT?= =?us-ascii?Q?W1hhQewxosecJ/hIlZ3TorZZ1Pp09txvhDqQo8Ad4dvsq/8BS7C6H8sCIZa8?= =?us-ascii?Q?1ogoKjdWVuvSJvkaac803GrJPrHdXXWaFq2J+ffS4MzKJVAOD7f0iUi7Msyb?= =?us-ascii?Q?bTHgsx4bfqR47WB5WOjQkaGF37kPrSWTDswYQd/b2o0r9wBQs884Pzz9PZv+?= =?us-ascii?Q?yeCS3+nP/Ng/klYbakj14xaNupRoTA5VFsaqteLx78H3nsB3o5pPDC/Yaalr?= =?us-ascii?Q?cTH+NvV3SjW5EqbhO7vRPjseDDzOcA96k+hrTu+1la3zrhax2rqE2u1u4Y6c?= =?us-ascii?Q?sFrhDZajnfZThb3QrojI/xdGjET7q93x95UwegNJpMNGLPkMf3km9kaRAdn4?= =?us-ascii?Q?Vkv42/1xzWiVCKB6umDxF7w3QDKAtsYobSBXTgLHK6VM+AQ/3r+reGVhRibu?= =?us-ascii?Q?XE4ttydiFfWHcru6n9egURkIuDuVqo3QYDgCmab474ibC/RDLcehbuZx7WP/?= =?us-ascii?Q?KYUew2dmvYFiTn/+BqfEumQBmME+h3/si54GuV7Sy5sBJKnxeTl3TPMgb6VB?= =?us-ascii?Q?bciKeJ/2aZSqZErXSKOp1YxpYjGCwjKhhaQ33JPviFspM4B1FqXOtRRvacbp?= =?us-ascii?Q?GgDyQshLXmABt5jQA8EXTuC4CwT4TSzLFHFQYtOxtVqCQsMvW0w4vqk/K8xe?= =?us-ascii?Q?pieMWzicHQsgWUHVYiyuVUG6c68h/ndlLhqyfVVgbkV1OM/6kzrEIRqHExYv?= =?us-ascii?Q?087fZoKOv9b0VBy/NMD6yBGEdK90IPA3kQdAbF3gBd4nUt7el6qlIKo+nfVP?= =?us-ascii?Q?tcVCvH876GkIOycCemlkCckp1XsWO/Q5LEYb5xpIj+/hnJ8auOkFGrq5lV/g?= =?us-ascii?Q?6i842EZOx6OVHU8TQvsVH7NFf6KoiA+PmKOLyiCWqy7Y3uqRqHBUo90xrv10?= =?us-ascii?Q?wrYWraDT1WndgFG3PWn1wsFRs55DfKT4I/FMq38quL4rflA74WPao0wRWSoJ?= =?us-ascii?Q?myquiE1cRJNM0FzXM46kf5BRA2pWvZio0Js86I7fKeUE2xf3Wf66wVYrbKO1?= =?us-ascii?Q?vQKTEtTwRfE9xlgjFfx5kMgIy1gXmq3QCNp/eUhA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55205c88-fef9-4203-3a46-08dbb8c553d5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:05.8754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ChleWEWWKkqJks8ereOSh/LClwEB31hkRGXQMkBMOT1GKRhgnk3BNY11WbzwKo8ds8ppw7olDTZGbndGuIDcsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" If the initial subflow has been removed, we cannot know without checking other counters, e.g. ss -ti | grep -c tcp-ulp-mptcp or getsockopt(SOL_MPTCP, MPTCP_FULL_INFO, ...) (or others except MPTCP_INFO of course) and then check mptcp_subflow_data->num_subflows to get the total amount of subflows. This patch adds a new counter mptcpi_subflows_total in mptcpi_flags to store the total amount of subflows, including the initial one. A new helper __mptcp_has_initial_subflow() is added to check whether the initial subflow has been removed or not. With this helper, we can then compute the total amount of subflows from mptcp_info by doing something like: mptcpi_subflows_total =3D mptcpi_subflows + __mptcp_has_initial_subflow(msk). Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/428 Signed-off-by: Geliang Tang --- include/uapi/linux/mptcp.h | 1 + net/mptcp/protocol.h | 7 +++++++ net/mptcp/sockopt.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index ee9c49f949a2..f89aaa67f10d 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -128,6 +128,7 @@ struct mptcp_info { __u64 mptcpi_bytes_sent; __u64 mptcpi_bytes_received; __u64 mptcpi_bytes_acked; + __u8 mptcpi_subflows_total; }; =20 /* diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index fc041763dcb0..6ec1d967f22c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1031,6 +1031,13 @@ static inline void __mptcp_do_fallback(struct mptcp_= sock *msk) set_bit(MPTCP_FALLBACK_DONE, &msk->flags); } =20 +static inline bool __mptcp_has_initial_subflow(const struct mptcp_sock *ms= k) +{ + struct sock *ssk =3D READ_ONCE(msk->first); + + return ssk && inet_sk_state_load(ssk) !=3D TCP_CLOSE; +} + static inline void mptcp_do_fallback(struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 1ae9fb6fabf1..d380575bbe69 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -934,6 +934,8 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) info->mptcpi_bytes_sent =3D msk->bytes_sent; info->mptcpi_bytes_received =3D msk->bytes_received; info->mptcpi_bytes_retrans =3D msk->bytes_retrans; + info->mptcpi_subflows_total =3D info->mptcpi_subflows + + __mptcp_has_initial_subflow(msk); unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(mptcp_diag_fill_info); --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2047.outbound.protection.outlook.com [40.107.105.47]) (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 C705A34CCA for ; Tue, 19 Sep 2023 04:03:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dKvCSJ2ErcmKCDf3verWUCpBtSVxNvLlECQGpQZD+/go72rsLlDlFSXO0kgDn905UKDrPg5KxNXE22ht34KamK7R1ndVI80U+ZUWAj+jXNGPnsdyBT17Ru0XTvXy6KoOJq9uOW6/oYzSDf4foREllDqkyEoUT/6jbyiEstsIc+ywUKTMGj2NW+ZZXcAxYSTVyIangrkCn38nx4kq9YjxDZxm2TBl+9PaWBaa+vxEr0kDXNT3pWpk7hLQ9NFNiAoxG8erew0oHDEiYUdV69Jf+zJ7yfQv4Gxi2wau7vjSwHuTB3/ZCGd3H3buVzOgOr2sVja/ViYCq0aCekPMS67Eug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wrYQKTkxiDbmrHrww7JkAgnC3WhfM02wTpBScaPxdT4=; b=gayDXYZ3B/jcAbSiBI8D/YHpD9fv0W8wyjmwEM6xFf7TqTNGXFyTsYowVVgFvNz1u34+muRHlzve/iFUQj01wTgB3v28gsmicQHV+y33UEEbT+RAv+JI9akiTwedMUje/YbXompVJ7ZY1Fd64CggHWN3o7Rdh/gxGjmqdYsi8apLKyU02jogUmOtQ/Oi8IE5hkXw7PoxWNoTnCyYKV2j1IxAUtb+oMzBjVr+ARa2oaemXyiaVKHygMgj8kt2d/qauIL8liOjxFbifgy5GL0To2iKN/8f9DcOUs6i8T18EBJfZoqKpBRf0HkygR+5eGOxEFeC73fUvNW3is+ZthmFgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wrYQKTkxiDbmrHrww7JkAgnC3WhfM02wTpBScaPxdT4=; b=fJYTpZa6tJQMknoJROIl5zvGOfBJKqQTG13JBxsvQQX8zDKEtOpfW0paNDmzWnI9D+BY4s073vzH8rdLyueRjJd+D4rEEWb7WiOsAwOJf8atOJGqlgFF/6tM89Lynan+1GUMPBk8S5HyXxU/2D8vG4r0yZUuK2hzHN2j4RxLaAOskOZm5+sC9C9CTeN3vCHeMUfx9YvA+LabQcgxs85AJFWw+Y+500j+GJ2ir8OQCVEg9CX3Ixf2oMcADQVdgWFvf+f3F7sihG3pqhOngok0j/i9GHYcuIcWPFhuecNvl0jyDvZ8v490blZW3cmrUYYCOiSQLppePGn6ID1BIv6lOQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 10/30] selftests: mptcp: add chk_subflows_total helper Date: Tue, 19 Sep 2023 12:02:11 +0800 Message-Id: <3a48bc6d1b3fab45017afa8cf7bef1d5d6bf6708.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0175.apcprd04.prod.outlook.com (2603:1096:4:14::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f237dec-c212-47b9-237c-08dbb8c558a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h9RUqtN4DG5ODYeaJ/X6KXpDit84uxDubdQfijxYQssXMHfqwQGcgMu61Yf8PlYDj6aDQkiTkDYbUgEK9PtVi/lMCqHlUYPCzwccSOdVXSUKvEXi4pvU10tPHYn5qWMdCm/EcoJVr0QGSrg+HUnOJYgKPh/8mE6p2w5GbneeAM2bOb3sii/zV4CIwDkOyIaoLcwrXR21zymZcpy1JxGIJPUUPF4ni+S/iKhcxsBvmVrTrEM00rA7zq486/IIQxVlXv65NpvaVUX9yeiL9o7u7k8l6uQEhTDGi9xI2XuFlqQ6JgTJlaz873dPJ/T3crmtek2dRoxx02eaPMuJ/3a527zVxQISXGOuZmckc0QPTycvVf8gT/AEs8e34G8hUEXBBcP9PfunRSxhBu7TQhZ8YTO3WQQOpqhqb1baqty94uswIp4/74QfIsmClwA+R3eAAr77M7Iy+ISEUABXikDalnCD/TSsN+3p0qqyvdZ+JLXn0mxN5I6LcdSHezkJ1iMCMt2Hg5NRGP6Nf8gnUGOpcWSoqnINfKoG++pTn5MZ5uFqykDiKtPBEfeCBQyLiROCUXPhiNH1GddixrH8Gf0HBKHCDw39laxQdnlwIRPbIFg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vnRd1g4qQUKaVUIMRJHVOxzH9hugN0GkrcGzuhGIGaSrymGd4DrLtKO+rU/W?= =?us-ascii?Q?fpz/mLSxU+BeE8ggFotcISI7F/SEsQNXdTlXuGoiW16x9z/HWVXT2ok1SwEW?= =?us-ascii?Q?dYLq95kB12OLoGq2NW8k9ZYVYAclENeA6ymNd3H4BcRvvlD1a0nXT8rQ+Wn6?= =?us-ascii?Q?M63NfJPXFiI4t6SgkWiEzlW+HdWrzr8NfhaPN1YwD3ZNhrrvRW4tmFWLXCbe?= =?us-ascii?Q?W45LozRdHBQF7n4ypfzwKmP13xDUw878mjvYFpocfhi7B/Vi2S5ZGPmPffet?= =?us-ascii?Q?M3vXZV1FMT5jUr1hh/DKPS9iGGMR2JrrI4ph5X3uiOrg+IaR5/m3HsjRgNF6?= =?us-ascii?Q?3jHf4Ir1XuB/qf0LBDUD+1qgbrImiJ7Jux0g9XfHDmqXAbbOEhIu0x5ODLMH?= =?us-ascii?Q?gSkQDJfk6acI9iw2F7VcJFyAazpFcbMZOfcq+yGS5MHciP9+rCmoa38/W/lB?= =?us-ascii?Q?8PeAmvor86w3c5bKqHnxBOUJO/1RqPs0/pBvCzlp/tPf0RrBKdw3ykDcxgP7?= =?us-ascii?Q?TlcAcBB49rbZzL0YiSziiR4VTEO2RKtGzZVD/4op0eRkuPGQlSXKDhW0mvvs?= =?us-ascii?Q?foBGULBk4r5eeI/37YOpr/NDTkPo1hSOeEcxFaoBLzvTytL4WT0oXI9xTb04?= =?us-ascii?Q?GdmcE3iPkvj5LcGM3Wan1/n2Tb+khheuM840nW/zr4bDQShssHuWcFQlKq6M?= =?us-ascii?Q?zg85o7SJLTClUjDP+Ykkl1y4hq8fb7dMFDd7N2ngU7Jt3OeTPl78ilZNxuCw?= =?us-ascii?Q?MlMfpt7JdDXLfIzY73f9AW3w5Q9Kl9AEcAwsav72x6LRdaEk1C0HtCLeeHvk?= =?us-ascii?Q?jZ+C8K2aQLGr/M++ZlTXz/eYKpo2uUW4mE8L+7AtbhgC4C+EVr2L1iNe/P8m?= =?us-ascii?Q?5Q67wr/w2DF5W3eD+g5X93qYUfEhA89QTm6KT4g0FqFulh4KvHAdHM+XdxPa?= =?us-ascii?Q?FRiBIL4slD2GcgEIFT83jVFSDTwydWhWu7jpNb/ayJp2ARdg1Wl1BtdU5sS8?= =?us-ascii?Q?woaJKFNinXl5uAidrLZdOt47BS57LNP6WLdr0Xf+P+doSE9rGsCOJs501WTM?= =?us-ascii?Q?xkzdgUU8Qq6c8kS0EqmZGTdKAL4YtLYLvEIybxNX/re2EAePIk1/+Vz/luio?= =?us-ascii?Q?vCSO9nP+fLRZigcRI7ikuNwz/GXuaFbcauwSUvVqOiPgmTfLSDX3/eiHA9zA?= =?us-ascii?Q?3et5bxNTVHIXpa3NdTn/CkwadQvbNpsSejcackqrPCM65EE67SY7oM0f8rx/?= =?us-ascii?Q?A6qPbuqcRFWrS/tHMIJos/t18t3YsVZyaLgMkSCBb7s1e0aAOxcb8LMFLYbo?= =?us-ascii?Q?Vk2vF80XWtk8f6MP2sMEXPQOVKWfVAcI+uiZWnHkq6Cge1+Q6TXOYkEJ+drp?= =?us-ascii?Q?Dmh/T47M/vQSFdY2Y3TDrKufa+YaqpjIhp5FvmIQVECRvkkMx8WowKLWp85q?= =?us-ascii?Q?WcTJnCI9t+KsEF5oQM0dD8GvGbMpqAZO3C4PioIUL5K51scrDUBqgHFf4oIT?= =?us-ascii?Q?PTWf+Y+Yde+a00Nga+YEVIxk2zUcBHjgMWtouOBfzQ1W5P2pgRciaDjomRso?= =?us-ascii?Q?xVVl4WkCPg47CRXfy4d0tTpKAkEFQXHnSqonybIe?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f237dec-c212-47b9-237c-08dbb8c558a8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:13.9439 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WmYMZivZNpO/p2OhA25X6XDXGov3C+LWUILaodZ+azOymfIAo5gaVmH8NFTvrU3jkuAmv0IZ98HBK+THWciwmA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a new helper chk_subflows_total(), in it use the newly added counter mptcpi_subflows_total to get the "correct" amount of subflows, including the initial one. To be compatible with old 'ss' version without this counter, get the total subflows using this 'ss' command: ss -ti | grep -c tcp-ulp-mptcp. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d02e53be8b31..784eb695f42d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1862,7 +1862,7 @@ chk_mptcp_info() local cnt2 local dump_stats =20 - print_check "mptcp_info ${info1:0:8}=3D$exp1:$exp2" + print_check "mptcp_info ${info1:0:15}=3D$exp1:$exp2" =20 cnt1=3D$(ss -N $ns1 -inmHM | grep "$info1:" | sed -n 's/.*\('"$info1"':\)\([[:digit:]]*\).*$/\2/p;q') @@ -1885,6 +1885,37 @@ chk_mptcp_info() fi } =20 +# $1: subflows in ns1 ; $2: subflows in ns2 +# number of all subflows, including the initial subflow. +chk_subflows_total() +{ + local cnt1 + local cnt2 + local info=3D"subflows_total" + + if [ $(ss -N $ns1 -inmHM | mptcp_lib_get_info_value $info $info) ]; then + chk_mptcp_info $info $1 $info $2 + return + fi + + print_check "$info $1:$2" + + cnt1=3D$(ss -N $ns1 -ti | grep -c tcp-ulp-mptcp) + cnt2=3D$(ss -N $ns2 -ti | grep -c tcp-ulp-mptcp) + + if [ "$1" !=3D "$cnt1" ] || [ "$2" !=3D "$cnt2" ]; then + fail_test "got subflows $cnt1:$cnt2 expected $1:$2" + dump_stats=3D1 + else + print_ok + fi + + if [ "$dump_stats" =3D 1 ]; then + ss -N $ns1 -ti + ss -N $ns2 -ti + fi +} + chk_link_usage() { local ns=3D$1 @@ -3410,10 +3441,12 @@ userspace_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_sf_addr_ns1 10.0.2.1 10 chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 kill_events_pids wait $tests_pid fi @@ -3430,9 +3463,11 @@ userspace_tests() userspace_pm_add_sf 10.0.3.2 20 chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 userspace_pm_rm_sf_addr_ns2 10.0.3.2 20 chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 kill_events_pids wait $tests_pid fi --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2044.outbound.protection.outlook.com [40.107.105.44]) (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 13FA934CCA for ; Tue, 19 Sep 2023 04:03:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PlEqC6xvxJ/fVxDRYIZIEiE8ColuV6K7LGAcVF8s7HDdunpK67JHRF/geZoZn8XVxZdwE0sXVm2EXzSv6aMhHNVr0YIywTNynqQY6QzDdGpt3kchpJKWU6vRKqnFMFRVwwqNwz7ve5Vld8E+eApCISUI05rAQ5S7vrdGxm6phm326ZEe3uuKBPbn2tHOejJ1aWCX5/vw7rDnSKggn1TdeWUIDhvhJ8KcSkmsA+Hxj9tQjbNkKhzqEtdume4woRXZ3Zj/5ulKoghtfcfZPuyxkiA3gDAAnpZUjF1Isqe1VQ3ErkunNnYQB0FqDYj2nZ2yPbdNeFwEuj1q6u6Khn2kCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ku0tte1dpmSJPclfwZOKkIP33liMO10cxkuBvsGrOHQ=; b=jP/scP2WtD28S+WglPfM++DDDfLcRVSuJeuoQSkcXz2tjUn4+jPGNuVdQfsFr3j/ESA2raImPipkwxFUCYfOwanBMOPQXKIAL+hjKNR7vpy5iFROcnMmouyPM8eR27dg7VYkeTOTVopjMgyawi0N4uwCfCIUT2SOql/+KI53e6f0BNFai3P9nNQodI8EucukEXQ+mZB7xLwYq5984pwGEXgpdRABRQ3MHwUM9nWwY3IzF5pBpPAgKxP3mrOsbO/pKIj48gKhfIlckpKaClxyKx3wcGP5qjIaTRH3IXGCBk8xSbQqZxjG6i1KPCiw+XfG4++yFlsyxyqk8Su5XVdRfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ku0tte1dpmSJPclfwZOKkIP33liMO10cxkuBvsGrOHQ=; b=vbO7bRsiDF2ix6yU8LODd//Y017beQ2bNW9K+Kd1M4x/jTaT5H005KEMMX8BL2waVSLnkLJMWtjx7RvpnFTrrFze/BaGEIkkXjWj/t6764ErSZHKfOV0BcgwvV9LAx3xHHTCm3z0Hd7SyFn4ZWYm1w1hSZYynVfV4LsbvRmvAPdJjDOaPH9wENIAB7YB/VDtq6N4TJkqAhDl3LFAlDipsPwc/8XMHJfpbEabZ4zab/G/DaEGZwYsDVfNlu+tkEnJRPRtKWBi5nqOS8u5dIdBoleEXGiQ5MT1mKteJCQBXmZ+IKZzfynhts5UhGJq4wy31INAdChrUQzL8ApMp6lhPQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:22 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 11/30] selftests: mptcp: add evts_get_info helper Date: Tue, 19 Sep 2023 12:02:12 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0178.apcprd04.prod.outlook.com (2603:1096:4:14::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 55eab7b6-3b9a-4b09-712b-08dbb8c55d5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Uvmmo3bqF7OXd51vwiUhdaVgDeeDgUw0VEqGkfH1f90u/emsOvW6B7K0oLvbLdLqX1geEFiAPhU14VSQVhgV0GdSaclqSmzJdjFQZMR7ltdTbeOwdiR7Eb0zXc1QA9LCfwj8TvanIdojINxnCoDvFZHa7lHWd3eNk/Qe2RxRU4Ub5/bHv1H001oIqnUfXFr0rE9iuiua0vrFH68gRt6fNKKOkMItilu2+3auQxkWLourABdwaRKFilc4b3bXJOmE1591B/f13kKrqR2d8v53AlPACDeZrGr3UUx4MbqUkoQt+JBYBXenUw4AC316282MlYKCd76G3iwEIQruafOqyyVa8dLRbHUn8lu5oOqDjldcmq1aZ4t1FSBSM4F4R2BHtvilmxVTm/mncrIyEfOX9EdxAg5ezClyaVNZFDzh4Z6Gvcqdyo7VTdiRfdbznNnXeir6SYofSbmgFFE+/npmu/v75HlmHkNasyCd1b4BzYb41iHqVKwjQhSim06JE4l3XlOu3iuUWP2jjsRtmw3hd19mt+kulJP5px7/2Pzj/cupWAclz6S0HiCuZS6hzV1+oMpmlUPmF4By9Fjmb1+FwIIQWHeKd9SfunFch1Gyn+o= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(30864003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0jNeZZrXWsSIdyyaj8X7dBWysOEAefbhoZGYXNcZdojAEy2XEOmj6oV1OP1L?= =?us-ascii?Q?Ma8hVGSw1L/3c8sEDbByqBfnatys25T3A3/ayMoLAvaJr0XOa1uGfLr2irYf?= =?us-ascii?Q?gww6O4RSmoDm9K1i2YBoiuTkQPR80qvWEibUUrMRhLZWgm0fYx6MLpwggOAx?= =?us-ascii?Q?MaVfez55q5dD/p4GbMvhHMFM48FfQ9vocfbIMzmZ9W2y5AXNfMiF1uERou3/?= =?us-ascii?Q?1Msn7jtO24w8SlLLtyehFX8edMwU7fA+jO2KBlRedx80ipQyWjCh2UxAFngq?= =?us-ascii?Q?DB+laXBGoIjrBJpFpP1w51PhCJRScea0MNYNQZ/DOn2bijGOLYwBjGP3OTGi?= =?us-ascii?Q?thA117lBvZoP5nrZI/AYMggnt+oVT27x6P4CtmSIkeaZbBQEvKZ1EA1xjQS+?= =?us-ascii?Q?00QOmizcYGRcwvRxX4V2uPDvU31rozIgTE5q1tyamgbclKidhHKz6EsaFoTo?= =?us-ascii?Q?JVvLvtWE2znzJXShB2Kwk3EjAujRcUqIRVgGipKV50IvcNgfMtMjFSjikk0F?= =?us-ascii?Q?FTTyv48w+/dXICmASg1X4uq7IoeF842ZgiBMhtT/ODVkjZRf2Q2psBJsJpxG?= =?us-ascii?Q?QRfVWmVEfoN3V7D9Wl88D1WQYael0VIX/NvxAnOKZiiXQeY4OekA3wVPmsbo?= =?us-ascii?Q?qtIy8rtI0ad4hhOYaNHmUfRW7jWNex3bYFgIIlXKlk8jcAih02xcgPj3Bsb6?= =?us-ascii?Q?sMX9yDe+k6UVH+ixu8KSQJOBaVS1eFDZcoIS7EmQ5NjZhS5hgxxwHZG2Vujp?= =?us-ascii?Q?qhIJhXpvaWJy6sTayQgFqtkPusHPL5A8il6deTMTQqgV1TDi/YjPjsUbiQci?= =?us-ascii?Q?0HPDx3fJShMCAAOmGgMU44Xaj4WCmWjUB2TUqR54pA6kJ5P4UL+Zn6/eG2bL?= =?us-ascii?Q?VUXlFw/BOtXsB0qHIsOW0MF8RplaDFpazxnXBXtTpWN6A2EGYFgvEjcbZ/zi?= =?us-ascii?Q?HvxXNMDOYT4XYlVixHmYv3dp2w9ZwJ01iDAaH5QF7CqcNYp+LFjXANXqjSWq?= =?us-ascii?Q?SecZNbSvEWPDEnpkE7/Bo/OGzuoZvNnD6hDuQT3czY8X8RbZ44Eq21GPVZ32?= =?us-ascii?Q?reeo+06zY/CZS9mPTM4AaAck1pAqulKsRasSwaiDxs9k6GEhXJKKTrgsxgG+?= =?us-ascii?Q?ray321JleMeONZvZu+KdkmOb5WHBtbKWYsiQEUpZzHGD5O2oWT1+shaxxpvu?= =?us-ascii?Q?qi2WsAXzbLqxuw8g8CRp6KKz/A/pz9MQWlY0mqex7PlSSggk6sPS8IIXEq/2?= =?us-ascii?Q?iuqXR84B545ZJV4s7pCGd0VgbShyrQ2BNwVzCyL2fJEdg3ln+GZeunhdGFlV?= =?us-ascii?Q?qpozE6G9TPZHJ/QpEGOMOOmFlk2LvZkVSaQsZbFIdiSQj4M++uMDgi2aRsGV?= =?us-ascii?Q?21ViQoRxu6j8l18P1jhv/ZKNaUx325Yr7vJHcZCZJCtJngjP03slrT6Ic+nf?= =?us-ascii?Q?XF1XKqPV4JPwd+9iNFWBAdC8t3J+iQu3GFgoZARAHojTG9bU598zCiQ2m2ca?= =?us-ascii?Q?nVsPcLRmzbk6CMO/GvrqDXVfEJvJkbGkzTKWHrWl3FgPt055bn2f5lhOKEPX?= =?us-ascii?Q?VHe0xbdwTY+uYD9ev8fXVMu4sJzXaEvTaP6oH0a7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55eab7b6-3b9a-4b09-712b-08dbb8c55d5e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:22.0909 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nFEL+G9t0BNlvDSgCarfWwQTmWVNH4h0SlamjfXfp8adw442pNJAKye74LBrHVr7F/2iu0g3O2sNwlQpOZszLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a new helper get_info_value(), using 'sed' command to parse the value of the given item name in the line with the given keyword, to make chk_mptcp_info() and pedit_action_pkts() more readable. Also add another helper evts_get_info() to use get_info_value() to parse the output of 'pm_nl_ctl events' command, to make all the userpsace pm selftests more readable, both in mptcp_join.sh and userspace_pm.sh. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 19 ++-- .../testing/selftests/net/mptcp/mptcp_lib.sh | 10 +++ .../selftests/net/mptcp/userspace_pm.sh | 86 +++++++++---------- 3 files changed, 57 insertions(+), 58 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 784eb695f42d..3e24ab7bc221 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1864,10 +1864,8 @@ chk_mptcp_info() =20 print_check "mptcp_info ${info1:0:15}=3D$exp1:$exp2" =20 - cnt1=3D$(ss -N $ns1 -inmHM | grep "$info1:" | - sed -n 's/.*\('"$info1"':\)\([[:digit:]]*\).*$/\2/p;q') - cnt2=3D$(ss -N $ns2 -inmHM | grep "$info2:" | - sed -n 's/.*\('"$info2"':\)\([[:digit:]]*\).*$/\2/p;q') + cnt1=3D$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1") + cnt2=3D$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2") # 'ss' only display active connections and counters that are not 0. [ -z "$cnt1" ] && cnt1=3D0 [ -z "$cnt2" ] && cnt2=3D0 @@ -2861,13 +2859,13 @@ verify_listener_events() return fi =20 - type=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(type:\)\([[:digit:]]*\= ).*$/\2/p;q') - family=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(family:\)\([[:digit:= ]]*\).*$/\2/p;q') - sport=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(sport:\)\([[:digit:]]= *\).*$/\2/p;q') + type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") + family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") + sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(saddr6:\)\([0-9a-f:.= ]*\).*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") else - saddr=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(saddr4:\)\([0-9.]*\)= .*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") fi =20 if [ $type ] && [ $type =3D $e_type ] && @@ -3262,8 +3260,7 @@ fastclose_tests() pedit_action_pkts() { tc -n $ns2 -j -s action show action pedit index 100 | \ - grep "packets" | \ - sed 's/.*"packets":\([0-9]\+\),.*/\1/' + mptcp_lib_get_info_value \"packets\" packets } =20 fail_tests() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 92a5befe8039..def35395a254 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -207,3 +207,13 @@ mptcp_lib_result_print_all_tap() { printf "%s\n" "${subtest}" done } + +# get the value of keyword $1 in the line marked by keyword $2 +mptcp_lib_get_info_value() { + grep "${2}" | sed -n 's/.*\('${1}':\)\([0-9a-f:.]*\).*$/\2/p;q' +} + +# $1: info name ; $2: evts_ns ; $3: event type +mptcp_lib_evts_get_info() { + cat "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1}," +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index b25a3e33eb25..2413059a42e5 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -247,14 +247,11 @@ make_connection() local server_token local server_serverside =20 - client_token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\= 2/p;q' "$client_evts") - client_port=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2= /p;q' "$client_evts") - client_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ - "$client_evts") - server_token=3D$(grep "type:1," "$server_evts" | - sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - server_serverside=3D$(grep "type:1," "$server_evts" | - sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q= ') + client_token=3D$(mptcp_lib_evts_get_info token "$client_evts") + client_port=3D$(mptcp_lib_evts_get_info sport "$client_evts") + client_serverside=3D$(mptcp_lib_evts_get_info server_side "$client_evts") + server_token=3D$(mptcp_lib_evts_get_info token "$server_evts") + server_serverside=3D$(mptcp_lib_evts_get_info server_side "$server_evts") =20 print_test "Established IP${is_v6} MPTCP Connection ns2 =3D> ns1" if [ "$client_token" !=3D "" ] && [ "$server_token" !=3D "" ] && [ "$clie= nt_serverside" =3D 0 ] && @@ -340,16 +337,16 @@ verify_announce_event() local dport local id =20 - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") - token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") + type=3D$(mptcp_lib_evts_get_info type "$evt" $e_type) + token=3D$(mptcp_lib_evts_get_info token "$evt" $e_type) if [ "$e_af" =3D "v6" ] then - addr=3D$(sed --unbuffered -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' = "$evt") + addr=3D$(mptcp_lib_evts_get_info daddr6 "$evt" $e_type) else - addr=3D$(sed --unbuffered -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$ev= t") + addr=3D$(mptcp_lib_evts_get_info daddr4 "$evt" $e_type) fi - dport=3D$(sed --unbuffered -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - id=3D$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") + dport=3D$(mptcp_lib_evts_get_info dport "$evt" $e_type) + id=3D$(mptcp_lib_evts_get_info rem_id "$evt" $e_type) =20 check_expected "type" "token" "addr" "dport" "id" } @@ -367,7 +364,7 @@ test_announce() $client_addr_id dev ns2eth1 > /dev/null 2>&1 =20 local type - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= server_evts") + type=3D$(mptcp_lib_evts_get_info type "$server_evts") print_test "ADD_ADDR 10.0.2.2 (ns2) =3D> ns1, invalid token" if [ "$type" =3D "" ] then @@ -446,9 +443,9 @@ verify_remove_event() local token local id =20 - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") - token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - id=3D$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") + type=3D$(mptcp_lib_evts_get_info type "$evt" $e_type) + token=3D$(mptcp_lib_evts_get_info token "$evt" $e_type) + id=3D$(mptcp_lib_evts_get_info rem_id "$evt" $e_type) =20 check_expected "type" "token" "id" } @@ -466,7 +463,7 @@ test_remove() $client_addr_id > /dev/null 2>&1 print_test "RM_ADDR id:${client_addr_id} ns2 =3D> ns1, invalid token" local type - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= server_evts") + type=3D$(mptcp_lib_evts_get_info type "$server_evts") if [ "$type" =3D "" ] then test_pass @@ -479,7 +476,7 @@ test_remove() ip netns exec "$ns2" ./pm_nl_ctl rem token "$client4_token" id\ $invalid_id > /dev/null 2>&1 print_test "RM_ADDR id:${invalid_id} ns2 =3D> ns1, invalid id" - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= server_evts") + type=3D$(mptcp_lib_evts_get_info type "$server_evts") if [ "$type" =3D "" ] then test_pass @@ -583,19 +580,19 @@ verify_subflow_events() fi fi =20 - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") - token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - family=3D$(sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q= ' "$evt") - dport=3D$(sed --unbuffered -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - locid=3D$(sed --unbuffered -n 's/.*\(loc_id:\)\([[:digit:]]*\).*$/\2/p;q'= "$evt") - remid=3D$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q'= "$evt") + type=3D$(mptcp_lib_evts_get_info type "$evt" $e_type) + token=3D$(mptcp_lib_evts_get_info token "$evt" $e_type) + family=3D$(mptcp_lib_evts_get_info family "$evt" $e_type) + dport=3D$(mptcp_lib_evts_get_info dport "$evt" $e_type) + locid=3D$(mptcp_lib_evts_get_info loc_id "$evt" $e_type) + remid=3D$(mptcp_lib_evts_get_info rem_id "$evt" $e_type) if [ "$family" =3D "$AF_INET6" ] then - saddr=3D$(sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q'= "$evt") - daddr=3D$(sed --unbuffered -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q'= "$evt") + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" $e_type) + daddr=3D$(mptcp_lib_evts_get_info daddr6 "$evt" $e_type) else - saddr=3D$(sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q' "$e= vt") - daddr=3D$(sed --unbuffered -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$e= vt") + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" $e_type) + daddr=3D$(mptcp_lib_evts_get_info daddr4 "$evt" $e_type) fi =20 check_expected "type" "token" "daddr" "dport" "family" "saddr" "locid" "r= emid" @@ -630,7 +627,7 @@ test_subflows() kill_wait $listener_pid =20 local sport - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$server_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -668,7 +665,7 @@ test_subflows() # Delete the listener from the client ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$server_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW6 from server to client machine :>"$server_evts" @@ -707,7 +704,7 @@ test_subflows() # Delete the listener from the client ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$server_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -745,7 +742,7 @@ test_subflows() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -784,7 +781,7 @@ test_subflows() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW6 from client to server machine :>"$client_evts" @@ -821,7 +818,7 @@ test_subflows() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -867,7 +864,7 @@ test_subflows_v4_v6_mix() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -933,18 +930,13 @@ verify_listener_events() print_test "CLOSE_LISTENER $e_saddr:$e_sport" fi =20 - type=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q') - family=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q') - sport=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + type=3D$(mptcp_lib_evts_get_info type $evt $e_type) + family=3D$(mptcp_lib_evts_get_info family $evt $e_type) + sport=3D$(mptcp_lib_evts_get_info sport $evt $e_type) if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr6 $evt $e_type) else - saddr=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr4 $evt $e_type) fi =20 check_expected "type" "family" "saddr" "sport" --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2044.outbound.protection.outlook.com [40.107.105.44]) (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 90C8234CCA for ; Tue, 19 Sep 2023 04:03:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MuOf957bipNGOmbcH6R7E62D1OfhxPo+qYcMln6vfqPz7GN3rLZKj2gh3Zwc8ZqDa9YqK1N7534dStd7nYDrTjkfZPj+ermpZyCWyj7367+HtkWX8JrlVG/eWaIkKLZCLCOfM20hcI1mtGg5K0lK6MWMQ5y5kwsnGHuO0+abcvhWpdiUbbf/X1YBK4CkQ8aWcsHkynrBrEvwBa1Q7/Avhdj/pEAHWJ3q/CKxQ+52DBT87jFqBxfEpLtiVQvmg1xYtd6BNidGIRjNpJoZ9JQrUILBA4rCA7uaf+KNltCfvJKSJ/GfH7+rsjSn7OM0ZEo74wBnk8RMXdIhbhPB8ZtZSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2dldh0QL60dVm0Zv3FutnsN/7YDz8pwJ6WGJ4JYinY0=; b=jlTcyXMtPgpzkfeLPdpORfHY6IdkWgmfDclH9djFEu97OgqcQp6kL2neaLYSN19+Mx/OQ5YOpDVXvZcRghiq3oKlhGSLSgx0CaIgi0L4UuCfflUY4YxXMlUMxe0V5yNNZljp2dJXaKIaN1r6x6eqkeN9cQHXNyFeqCGSJXheXZBOzbU54UTzbMB9K8PXbXw1GBasqpTVNd0eVBa5Few97NnH8h+SshlrrfGJIVX4Y5MgMAiKHBKhG5QGpHfxKg/JEaZOELBWixkbt3uOxkaYTApKstWoHT+rHZL0abXfmii0f/ZzajhUIZKpKAHpbcR94xzPrFhmz9ZU0IFRFTNoZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2dldh0QL60dVm0Zv3FutnsN/7YDz8pwJ6WGJ4JYinY0=; b=1TQ9bIIKb5WbxQeQDxfM63zEYZWCf36Wz9u0TbeuHz/hBaI+cCHl9FDkV41lA7a2y1mTbg+U+dymjWLAToFmPRoxbaBOLfOET0rvyFFJthFeFv+/jFqcvxTpwKJxC74T1q7DC/aKQubB5x+trfW034yWsZyQ6XLHqfZwgSvkD3e7tH968Qp5ryn2QbN+bL3ioFXOsAqiII//9LSknkobATJjt52dPTE/AwLtiqDlgmS4bb/flkH7RWSUYx+sc474W16xu0I0I16f2gNEbdIWhsYm/d0UpuM36dNtpZCGBsMh4mW5T6F62KIhXk7yajBSMRhhODHRcQRMtkyU5O/Xuw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 12/30] selftests: mptcp: update userspace pm test helpers Date: Tue, 19 Sep 2023 12:02:13 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0019.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::10) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: c566adaf-0217-44b7-bee5-08dbb8c560ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E55ddeWjsNgho2qgDtHwtXp4lCZDQ9ZX0W4DqhnyHdmHhlBuJ5oUSStmFE7K3QsR+KrV5BpQsJ5CeE3N130D+VxFfJ/GvXzIcl88qoyV/weGVnS/QPiw4AD7LNmPSuPX0TY1jTx3/qTgZYF2y2X04Tp4839j8adCe2lNj3rgtcOnxXfGr7ZvwzY80sbyRYnLs+i+QzGiCAnMH0GCAosIYpc6Mjluq3hUA9h2Zdh/x1k3OYaj5RYjQj5QYg345uLP2RC78+Ky9PR9OcFZvDGsJ6hyIHQ9sddUWCD+jCjTY6/tVKMWJrF6VZB6dPUKAB0/t8S0N8dNkf9Dwzjza2Jk8LWcGW7t1QNjpFnEPbcG2Ii0cqz7kwyhH94Uwk8FG0IBFWfM2SJ2tvEqn38IAbL2jcdyT5waAZItNXozkm03GIwiTZ05qNt4oX72QWH/wxUwc5wp73LM7rxvbXanOjxQNuzi3+U/QrVqCo0TJx/i3TGEND/vEXSYcmA2ey5xEKYDSbnUYjwCQhsTlEICh9R0Mt5LNDyGDNm5lhuoXhu99B8Va+uIyd95+xWmnAeL/pK2sMX0zvnVRE0864jl2mx+rsndQPy6Os1yxEdVWbiALFE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4lJKvSIx7fwNORKLeb70A1p5deTX9kiH3/7OY9QqoSa26xS66SKIk5dmOqXM?= =?us-ascii?Q?jCUvXxZWsEcg7cY6RhiD8NW7C3eXuJl4V50g+ol8yp9MoX372fM8NUI7s6s1?= =?us-ascii?Q?IWRc/F9muCW9GqLQDpUndpbeHidD6o9dJ3dTHXAbxEMCdqZ6Vva9QaP8Poug?= =?us-ascii?Q?q/LYvuAq53ls2Pp4wNCLpq5ptAdWSd1nIAk2zX6m6fRwPbpuilvsA8x5vkfC?= =?us-ascii?Q?S96x3h3Sk0nj041NEJSLV5H5YiF8pPhQ4l1jpKHV6UVu+yvbNJU5Y5W40jVE?= =?us-ascii?Q?UNaPpJsPeNhaxyVpUy1ZOCCkCX6aF8QByYKfzeRlXbS36QJH0ATHGZjr26C6?= =?us-ascii?Q?r/nP3C09Ar+XlOblj+MnbEuDGxne9jJBtQQGeTw4j5wqfjmVJ4fneS7l11GK?= =?us-ascii?Q?bmHG85NyYwFKGPbAoCebDPkXFcTzt97QIe4fdT7R3RncR1ywDy4+9Oxi1K9h?= =?us-ascii?Q?cQ8VPibUw3Ic7QYtH+1tGpDIl0wOyWAsCy+G0Vbyp9gJ8aC0kTkY3fpfCzwd?= =?us-ascii?Q?EBpa4gWa8qWN6yZwpfYjY+yLElEjpVOvmSLEAKhhluP3+iRafJX/KD6LwNlc?= =?us-ascii?Q?3CJHyB8Flz0boCg5drmvqt24tKWrfeCpEEHn1kOo0bE9aexq6wiZYsUQVlyZ?= =?us-ascii?Q?oAb1iwIWbHaaDZcO3f2IaNOjk5ItF7wM5pbr8f5MgrKt7bxB9NMpMO7zzwmi?= =?us-ascii?Q?T2QyC2UVTJa7KTEk9Mc47POSQkjOI/2cyYbhrBnO/90ni7Gb2LzLlBDsgxI6?= =?us-ascii?Q?zsccSX2fMacyiK+p1IvqWgvMTBZ+kbSugB0h+wvKPNIKEN4DdKIrYGKdzsYq?= =?us-ascii?Q?lMK2IPJwMxr9b5VKNYfUIOVQ+8oH8Hwt46t0YMWU+I36/WPqWAkyzKVugPIY?= =?us-ascii?Q?41hjvct/kdHE0A5J2CFbSOxzRgN8HCz7MbdSc3XyM96n5y4/o2ojEvYygPj7?= =?us-ascii?Q?w8o1R0Xy8rFLl+VebY/akyZmLA9hxK5YjoT6UvJGeu3hYjDiOdJq90+E3Tsf?= =?us-ascii?Q?OeXgLjhBkDRHP+T1SOwFsyF2JHE/HXSjPjHQds82LNUm53Vdv8fL1/Nfkoo4?= =?us-ascii?Q?dJsgcpbn8zeakuXNi8WlBEh9oLmV5XBb9zhYKoS+yl5cfULHlP/8mfZNiayI?= =?us-ascii?Q?EW1nPB/6leWy2GDdedpQjjmlbdVNeeD1cuH0bXD2ONSSWAS1UD9cktYBLAeG?= =?us-ascii?Q?GyDX3aIV5v+kmXBiWZbFcrl/ZUjETFBeSrr0AwKcJ/mJwAt5QPoNRQ39Be77?= =?us-ascii?Q?uc865Pvkbl/YL3BkkDVMB6X1RSjVIN0jUvkqa+k+YpRv4afTMApHKyDREfUd?= =?us-ascii?Q?yf1+cc2HYr/rsZK/2+9765nAz7aGcCeskBGnpyesVLHb7FM4ETGvpRgYBNBd?= =?us-ascii?Q?Jy05sfNWqvuh+ANK3yJjLqsvog3KbXyk/OLFTFOWMC9u+hhRD9LAyGHthgzx?= =?us-ascii?Q?Y7bfvjftJ4mVaC/WFeGUNUcPL9n1kjbgGLLdrs1BOOPW/s8mqCA6TduvqUm9?= =?us-ascii?Q?PaoBFCw+1EAIAZZbI5zEGOOl5STkFadGw679XJc7hRs3SCVDuzNNSew25kO/?= =?us-ascii?Q?A/CTH74ycO1exBndcGMxdQ1A1yUqdx1uItLBdReA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c566adaf-0217-44b7-bee5-08dbb8c560ea X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:27.9817 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RLKmqm+Lh1oUZwR/KIa8Zw22pDaGBDV3M8NxLMtTlSK5kSGa6UTvJh/1wu25Kir1kpzHY7Q8sg+ZmZJL+723Fw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a new argument namespace to userspace_pm_add_addr() and userspace_pm_add_sf() to make these two helper more versatile. Add two more versatile helpers for userspace pm remove subflow or address: userspace_pm_rm_addr() and userspace_pm_rm_sf(). The original test helpers userspace_pm_rm_sf_addr_ns1() and userspace_pm_rm_sf_addr_ns2() can be replaced by these new helpers. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 89 +++++++++---------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 2 + .../selftests/net/mptcp/userspace_pm.sh | 1 - 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 3e24ab7bc221..25c2948391f5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3285,69 +3285,66 @@ fail_tests() fi } =20 +# $1: ns ; $2: addr ; $3: id userspace_pm_add_addr() { - local addr=3D$1 - local id=3D$2 + local evts=3D$evts_ns1 local tk =20 - tk=3D$(grep "type:1," "$evts_ns1" | - sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec $ns1 ./pm_nl_ctl ann $addr token $tk id $id + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + tk=3D$(mptcp_lib_evts_get_info token "$evts") + + ip netns exec $1 ./pm_nl_ctl ann $2 token $tk id $3 sleep 1 } =20 -userspace_pm_rm_sf_addr_ns1() +# $1: ns ; $2: id +userspace_pm_rm_addr() { - local addr=3D$1 - local id=3D$2 - local tk sp da dp - - tk=3D$(grep "type:1," "$evts_ns1" | - sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - sp=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') - da=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') - dp=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec $ns1 ./pm_nl_ctl rem token $tk id $id - ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \ - lport $sp rip $da rport $dp token $tk - wait_rm_addr $ns1 1 - wait_rm_sf $ns1 1 + local evts=3D$evts_ns1 + local tk + + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + tk=3D$(mptcp_lib_evts_get_info token "$evts") + + ip netns exec $1 ./pm_nl_ctl rem token $tk id $2 + wait_rm_addr $1 1 } =20 +# $1: ns ; $2: addr ; $3: id userspace_pm_add_sf() { - local addr=3D$1 - local id=3D$2 + local evts=3D$evts_ns1 local tk da dp =20 - tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") - dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - ip netns exec $ns2 ./pm_nl_ctl csf lip $addr lid $id \ + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + tk=3D$(mptcp_lib_evts_get_info token "$evts") + da=3D$(mptcp_lib_evts_get_info daddr4 "$evts") + dp=3D$(mptcp_lib_evts_get_info dport "$evts") + + ip netns exec $1 ./pm_nl_ctl csf lip $2 lid $3 \ rip $da rport $dp token $tk sleep 1 } =20 -userspace_pm_rm_sf_addr_ns2() +# $1: ns ; $2: addr $3: event type +userspace_pm_rm_sf() { - local addr=3D$1 - local id=3D$2 + local evts=3D$evts_ns1 + local t=3D${3:-1} + local ip=3D4 local tk da dp sp =20 - tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") - dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - sp=3D$(grep "type:10" "$evts_ns2" | - sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id - ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \ + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + if is_v6 $2; then ip=3D6; fi + tk=3D$(mptcp_lib_evts_get_info token "$evts") + da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) + dp=3D$(mptcp_lib_evts_get_info dport "$evts" $t) + sp=3D$(mptcp_lib_evts_get_info sport "$evts" $t) + + ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \ rip $da rport $dp token $tk - wait_rm_addr $ns2 1 - wait_rm_sf $ns2 1 + wait_rm_sf $1 1 } =20 userspace_tests() @@ -3434,13 +3431,14 @@ userspace_tests() run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns1 - userspace_pm_add_addr 10.0.2.1 10 + userspace_pm_add_addr $ns1 10.0.2.1 10 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 - userspace_pm_rm_sf_addr_ns1 10.0.2.1 10 + userspace_pm_rm_addr $ns1 10 + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 @@ -3457,11 +3455,12 @@ userspace_tests() run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns2 - userspace_pm_add_sf 10.0.3.2 20 + userspace_pm_add_sf $ns2 10.0.3.2 20 chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 - userspace_pm_rm_sf_addr_ns2 10.0.3.2 20 + userspace_pm_rm_addr $ns2 20 + userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index def35395a254..bb95dd967eb3 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -8,6 +8,8 @@ readonly KSFT_SKIP=3D4 # shellcheck disable=3DSC2155 # declare and assign separately readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') =20 +SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED + MPTCP_LIB_SUBTESTS=3D() =20 # only if supported (or forced) and not disabled, see no-color.org diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 2413059a42e5..283c62deb628 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -25,7 +25,6 @@ fi =20 ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED REMOVED=3D7 # MPTCP_EVENT_REMOVED -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2044.outbound.protection.outlook.com [40.107.105.44]) (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 CB81334CCA for ; Tue, 19 Sep 2023 04:03:34 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TSrQVGT7NUNyVBr7HREwqAhMM/4PrweZYu9LyM5UGltG6O3/HAvZoQJk77XSLBQjVr3cFHoKsMXC5wMAewHj3c37pSUypRqqlQtqrDZsVOC1oZ6WsR3qxjn0yZ1bqwiEH39Q6qMgHsDga8ZNw+PqFB5BuZ1xtISWpIGoKFAMruoGjRCsM9g709YHvOcdwmGbwMrjxX3ijEopXvMH+Td9+k4aTfDGbq846t1jXbokXenyRUE9kuqjDd8E1S0KACqDC+inrVCAHwsi+rCQWdLpsq064V7oYHjVPjCCopxLyS1RDGHByu5bStnxLZYV6lVImYfyMUDVUBhABGCfoFlrvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6DVloCXJ3mYJju+edLyiaPtl++IR1GJZL3EH6ObiDIE=; b=efwhMKkRbsb0dmA6Mwd4OrYaKzUVmzfOkJNNntubulG2yPMnkmHyBmdQmnkyD5l2+Er0f/Hib93s40sWDdrs6cwDo8q3jEkfoONl4VN5OU40fmWAINAoRAd4Sisx/MzFsuZ6Ugq6EB9N0qp2zzZchqJrUsJyGE45Uv3i+KPTyfB/ii/StZo5VlOw+GeaIlTxQB3xAh68GbEjAcEeQq9DwLt4TxtcEtK0+oW7+agAWN8MI6nsn9TLSFDm65Eq1UA6UEn3VMzl6WNyuOlMEn3XuyeLvwwtK2Mv6Xqiu6ZOiyNOWByZlghK6fWY1NVYgh8PiKM9nHDp88zbHZKpbBJiLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6DVloCXJ3mYJju+edLyiaPtl++IR1GJZL3EH6ObiDIE=; b=efWeto7dYNT3Xh+BShZryHLgCppUxht8ydz4UQM/Bi97H3tiYGWeATcggAnnRDVzesYajEB1U+TaPOUpeQn3NYgJ25pYmjWNjGJOvzsU2JCkd9iSAqGd/kDfWiHOOUk3wGeJOTx/yHN0/ZKTxUqpO3/NnDltMoECrA3WGRNpKCHQo8nxVeOBV0lRdfKwgwmbpXnMFlmbjECvX8WornFdv2QxcjfpUN9G9jvRQCUCD0oKAAVrfmuSrwVJlIbudaACF52NJ9v9d/uf6SY9+tqbpyadQzatSkPKdkRJhlGewg6FEUX0FMlGAzNtvVyHuoLJz4kimg7PTnu0yIT6J5TVNg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 13/30] selftests: mptcp: userspace pm remove id 0 subflow Date: Tue, 19 Sep 2023 12:02:14 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0028.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::9) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: ec707d3e-a12a-4d06-835c-08dbb8c5646d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2SJiSQzwuxsH45hWQPp4tQRjhR1rf81t3gvPuBTeW9aUtub0dZXLywIIUMFOP8X67YkeiIQNIpoc1FXGWVys6vHQGEExtvfCMJQ1OM3vWJSZ5Q2yfK+YEi0HvRVrSRYtxe5aVHsryF0USQJXyNBlLISON+CvZ4G7Kwm0MBcvZ7glTa8Xv72JUvFI/yCe8/CllBfLrsjJbnJ5WtSpgrsxCRKyQbopRX7o92Ke6WiSPB/+ZxPrFxhANLYLDqN+Ilqc19MvLZY6lvYGdKQKpjEyns0Hv5dv/sF5W4b2DUFCbp6djWXdJlfZTyT0ttH6F5Hr0vkaQUjrpdR8uz8sdVtIltyTant4WoGqIDHOkmG/p/GSX8G5EsPpK6A9TcmDTJU27MP1VLARYKdLl2lg3HM+d/7rXX2udS7e5INt4m5V7KwdNufeY4aJ+3EacHFAJ/rbCbCp8JaMqvaaUV0nRq19Xv2BpHipSZRCHIoGetsc2dlgPh2da+DRMnbcK46e2RWAmeVOmY15iq6VpGqg88RiRcq+iS+WzOI0jo57yxpODWbQdtHUK9XOY2oSluNgNaxjIMMto97sm7NCdxNU+ysKGGpTL3sWqoy2ugsW1Z5WAs8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vxEQm2Drh542C2N2lbd02xUMkkubbsk+TaSE+elD2ZJKdduAexAONzsgLZsu?= =?us-ascii?Q?9msiiUolE0V2An0Du2+PXBM1MYIjD0W47sCH2tLuqBeKvKIzrtxEZbFSKCzq?= =?us-ascii?Q?xTkYfXoUCvXHB1x8VzTx7PxJv+59V/CMqdFvRnQYzCM15rDkBMeN+7PLV9lv?= =?us-ascii?Q?LUgo2kZMdlblC0jms1pTC8MQVuCQJYpMfWDYkHUSmmjFOAYymFO/PrpySefK?= =?us-ascii?Q?RNLye8Z5hP/vfjwk5lm38/4bWr3aZYRUYTQCmSDiAD7sXFQCDO8IU2QyuWSN?= =?us-ascii?Q?FnnIqsvyOAoaHdJP4ui2UCPMZ/WoWBpnJd8x0NihKJKJxJGCTDHr1mPVHREQ?= =?us-ascii?Q?9+YoC38Ecg5505nyqeKPOJi+LwNPVYAzgN4vtOkVL5clf7qGw0K+lyx9IV6w?= =?us-ascii?Q?dhV8jJDGF8ZhhHGluDAYH1qXndhIRsnyIx8Nj+jFLNbGKeFJmXJsAxbBWNqr?= =?us-ascii?Q?45RidkIf7uT1b6tm7F31JCqcKoYiHYxIPT8VJ+e7XrommB/FnJJD55EysQeG?= =?us-ascii?Q?S4DigR46bRpyPIB5gzstwOz9DDTDsfZvMDqKfGIFYvGxnRkccxGWRdxYzzC8?= =?us-ascii?Q?GhDuzI+c9/aQ1JhfxMxWIr+XDKO0+5wL7JNpuDE/786D9jFXKSTgmK+Lw1FZ?= =?us-ascii?Q?vXrCYZZy6+qXv7IJYxH15Fcz0KMhUt3+rdrnMuW02bQydgPJ8HRGMn4gTXvo?= =?us-ascii?Q?TFFhD1mhoxFXoC+bOU4tDxdTPJhi3Z+HOoELr4c+x0da2BzNo9Y4rKjj8Yc9?= =?us-ascii?Q?Zsmqcs1Lwcn4Z9KjmYR/CiqcJi37NyNv9KEJzn0Ph8TPH0YosbTyc41qXGkt?= =?us-ascii?Q?Zf1e6Eh0tWN7vzIc2BI9Dlb66n131gIFlQkPD7pMI8Id/9K8gT2M7wMIkHKp?= =?us-ascii?Q?p9Zhp0CZHEgwyLq+TSa/YY/CLp6YC/1hLzkOSbpd5GqrTfBVpyuYwBVsM48c?= =?us-ascii?Q?KtKYHlhqRCiab3YB47EBIWZOV2dJ+L/3lBrZA4kMcTs69dUkC3YU4e2xVWWo?= =?us-ascii?Q?5F+Y+fnWEwZeasALOi7I6VVgBDMUCnEBIdQA/nHCSTUp2/+hO5DJbXBwtgp5?= =?us-ascii?Q?50YqU3uZ4vJHHbQwLoAmHHaN6EX4DbzpEJoqXtoN4+m23FqFcig7ppJNpMRp?= =?us-ascii?Q?M2SowZAiSX1sqoFLypv09wQWGvETPxRy4jpZKkav+jadMbnDSyM78N2ubG8F?= =?us-ascii?Q?TgLvbGOgZWXeCDDKCAVClr7kVGkhNKupjwJtDAIq0N4D906rihM4sUC+BusF?= =?us-ascii?Q?xckqHsTIApEuO4MpnThvtgqhs/r5i8przdg3Y9KqncqiNB9OSwqzxPiDSACK?= =?us-ascii?Q?brNkjx07zrMHtvGEEKRZj6Er3Ob6PY/nCf8vzdbkf1qYNrSXGigx/R/KmzJl?= =?us-ascii?Q?PfT8S5C3lDycpaYMIW8hC0JJsejN+zijN8E4vMsFXaOeB1enFThxPAfooFDz?= =?us-ascii?Q?4DjPDwo4g8Ntaj9PzRkp6i4FQZWOG/YLr2ZH1+VYk9hrb8yjX/FQlCFBL/IF?= =?us-ascii?Q?xQRHqUR0A8/SCiK3UscoQjP2NHUvy46QqxPRT0J8Flgc2GuUMzXZhM7kE6+x?= =?us-ascii?Q?s69g+vltUN7D0B1hx6Dki7a/HAZBkf3+dZ/IhodJ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec707d3e-a12a-4d06-835c-08dbb8c5646d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:33.7333 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OxgDLHaci9rqIyPk7mKz1VuvRM8uRSohCXTA3sX+T4G7kFtDDO2ged9cPAwIco/BZajSQ9RsyK3SubRmzJw8DA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 subflow. Use userspace_pm_add_sf() to add a subflow, and pass initial ip address to userspace_pm_rm_sf() to remove id 0 subflow. When closing the initial subflow in __mptcp_close_ssk(), dispose_it is false, then tcp_disconnect is invoked. This will send a MP_RST to close a subflow on the peer too. So chk_rst_nr() is added in this test, and chk_all_subflows after closing the initial subflow is '1 1', not '2 1'. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 25c2948391f5..ca75d2c6d415 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3467,6 +3467,28 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 subflow + if reset_with_events "userspace pm remove id 0 subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf $ns2 10.0.3.2 20 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + userspace_pm_rm_sf $ns2 10.0.1.2 + chk_rm_nr 0 1 + chk_rst_nr 1 1 invert + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 1 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2080.outbound.protection.outlook.com [40.107.105.80]) (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 0BC6034CD8 for ; Tue, 19 Sep 2023 04:03:46 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NhasprsoKpw+fZmGqHs68CxxO1v8gtgyljgIB8Obw0PFohGErpRec8oINfbDRPJugFEIktDH4DcaB99WhQ2geDnVCjXm4L2g9GYIY2jg0P39+cvurlQ6Djm1to6Ru3nm8eJfR4j32jwDBGhGZuXM3eKRO/WFZItP38dKDaPlvDLCeGOXjQ7s9YtDk5WwrbwsF09t89udfaPdH+FAXDZbyW4XoK4o700NKclCtC5y4QNXiafAo+tMIkpru2ikZWArTL8a0AAAhOf66qxjDFZc25F5KeEEpc5ZpaAqgI66T8hP6ppVes/zyRxNi9L8CteEJ3fY3W18BrZSDsvolW+GZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2Zjp9bt/yuNdQy6C1YPaMp+mCE4nkYPA2S0UrQedhZg=; b=igMXbUFCap3j7GZbeEWQz8BXMAGiCiygAKgvjPQWx8XIsFaJNpZuwzahqGJxQ6/mZu7375Sa6ywoPCOfUfXqWGXwmfHFmS6bVrua8Yyo0b4ewhkVbYx65T6aFxsgiN3bhGPZhYLceaaK97ffMDeRbrSJH/djetSyf1a6u1zutddQ2e13n9S6JfKJB/5NrbVzQlokmQQzbPbkjWki9td8iiKNUEW2ybhSDaVB3IRhdgbidtEu/7a6k2rqcmuqiTNx/tp2VqAFW5VLqsrEwPIecHWgWt0NueAvjvtv1i86F5gHs2pA67x6LcBofVZ4RCR5iAg3L5/l+zO/z4tF0jUksA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Zjp9bt/yuNdQy6C1YPaMp+mCE4nkYPA2S0UrQedhZg=; b=l/+q2rc10fFRHTFPuRzwwU7zc9VsA4djtdBFrotRaE1F4CQCEXLrudE9x5qvUC8U8TlpXG4MiXR3zuui2AYBqt3+Mh4eGiZIuR6o3JMFFlw4nDJ1L+Kj9wnWj+Lvv+I5A51c1C0isQt15EAjpniEnWJgj3Yff7ZqHLtb+I/OgEyrtzmbXrPdWFiLiEr9XBVe60fN+IoR340byrolRFyctRfnMYWoR6isYnJGvwOqr2P+79E1IHDiEW2JEFWw+es7bvLrKVr8IOR79wwsBOXcokccEFIoZzcenjyNup8Mw8nGJPXbbVrZa1Uim3/38KxT8r4PN9big9BUR2Akwddtsg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:44 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v2 14/30] mptcp: userspace pm allow creating id 0 subflow Date: Tue, 19 Sep 2023 12:02:15 +0800 Message-Id: <4bdc9790ea25455308e5c71d26b1cb88c1779956.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0273.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::12) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 56e40441-7c24-40ee-0217-08dbb8c56ae4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rqoKN1SJDkyl7ZZmgnHUHA7IPfEzsK5dpEqpN2Ybdoo9ngXlT6e3EaZdfodM+ON2bYtkHZYimKvR5HoHj3wLXeHTYhA8Euk71SJs224zbjPb6ehUIqsL0AYbpERgIHFYRUIJIdufRC3QvV2Aj78o53+bVLdcFJw3llyCEe1sXc3clGrZygU/SsQlyjFSJ1DOIX9dZ/vS8MI/+c5n+Za81LdUsWWgE2QvuwH9p9JiABhY6EPAB8Fd6pFdzf478UgN/pRQ+V+wCmSknXCpI6IQeho8cQMZM0ypNOLCHEkuu1ouPF/2lOzi9eRhRN//dHpGGd14N0dCwB4l2Ozhu3kr35iUDB798gmPjlPoBfVNm3MEn1OcS3nEyD+cGWRz5bbWPVZN16cnj1p512Xf491t6CRXb6FtD9+QutNUhPJ8qLZDoYZjdc1LLuB2E/gMXEF8fjxLIzbNl5mcudVnV2NxrQ3iGO1WztgTYECLMS3gdUbtlHwuHD7m9YE2SyXEuTc5Q10LSduvoXm0iMJ3wBdpAcqYmRiDG1LfNnm52XvafHR7M1Clzsurs+1+hMnYSR/sPxS0AxaOn/lvc9YMvUdO27okLwtHo7e5MoMn86SFkFI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(54906003)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(966005)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0uwBDz1W0s1otCKQXttCwBdHQo+PfHGN1vK6kmN6v7h26jQp/AEn+4wQC7wH?= =?us-ascii?Q?nN8Ek23mbHGB3SC0Glu26vPj8NTFWoAFrOgCsdH1u+4zJryUJRdmu+RE0DYg?= =?us-ascii?Q?Ft+A4cPEZAAdv5S85Fri8pZOMCNHFAUnoNgbfhu4XzCYM8CtEwq1iqwrZeEC?= =?us-ascii?Q?NvgAe96GQb5h0Ui/gtrpJopdYWxdZ9JgXJDtWEeQFmUqBiOMgQYJcoXYCbpS?= =?us-ascii?Q?Ry6DSUZPGqpD7JRL1UzhOMVrF7TP+zr3gYYQxDYpHIlTHrzUGQiyEIR3zQqJ?= =?us-ascii?Q?f8mDY57Y4C3O1FHlnpPXbDUF7IWmT7aTEAYFgkuiXApMqqScLm2IIrYqtEx8?= =?us-ascii?Q?+XYs81wfM5CLUtHZRkXQnQQzf4CnebJRz2Iv8n5FAQAJU0U0qNDYTBwJd+8v?= =?us-ascii?Q?rt6YoPvRf7qhlEj++wm+CAPgv50/HLiBtFqz7FjUddNctRuZd1rg53SeV5bd?= =?us-ascii?Q?y7sxQl0QqnVuPpnqzxDyKSlKwQ7sS7yO3NyejtyT7C/5aGzgQlL4ngVbVKki?= =?us-ascii?Q?D4DdqK/9v9MgZQkz0UFSWEcOc9Vvlg+ZahQBVRSf8lWmvVm0ub75F+bUpuB5?= =?us-ascii?Q?kIRymj+tIluQaj8Hlqvq2t17aj0MxNPgIj8Jqm0L1/EqP/jpH0CIkdEareNH?= =?us-ascii?Q?mdtEWBANHZVyEtfFkZ1bi0iSNMgQcG8bmcFj8RP4xd4vESSVh+Xj0VfBWwpe?= =?us-ascii?Q?kIRTC7FQT7s4qst1pPn+erngjEedZVf4oiEk9StjJ6URoqCtZLgIckOf/7DQ?= =?us-ascii?Q?U9RRSCtqDkw13S33MDn4ZN0DZyG02PFEapfYod0k5OuD5Z7txVsCQ9CXCkZC?= =?us-ascii?Q?npJzviGlUA2+R9HButuNjmadvEezFAtwP6JgddSJ6l9zCcAFFNsbCcg9SlB3?= =?us-ascii?Q?X7NtzEWctDyoK9uO/PA+sbcIF9P9atI0dvFwDcYaNxSEjwhFY4dkwXSPcTnU?= =?us-ascii?Q?UxQAg2mAG45oS9JD90EQKq18H8k3UUTzQtKlPL3KyXoru0T6EWO+TfiqY/BH?= =?us-ascii?Q?GoTzzk84FtoyDXXf0yyuaB3nGdnvRDyK4cUM5OT0cO4a5K/hsy9dSJYD4LB2?= =?us-ascii?Q?jHJiw1BFzv9aLmKRxE7btEtt4pulTvP1DQuv+cVC6CJa2K0vp4mSExB5p96B?= =?us-ascii?Q?AdeSI8DQt8O9u19lcJ+RMA/bj8BH8SzzRdnUuGGgb4Tksaz4bAsaM2usDy52?= =?us-ascii?Q?pkQ0cgMjqxw5zND80VOQ8a9uUym2LSuxKQWL3FMeO0HHiKpl/MDnKQbRLaqR?= =?us-ascii?Q?YzWmHf1HHXWOp27qRdKQiqwWWvF1gndXOU+I7LUYkScATsW4Th+WDzO0KaQo?= =?us-ascii?Q?413Im8nwJBXSmOL9qbHqU3pBWUf7aLitNLBEB6z0DCjC6UKvu8qs51JxEGyo?= =?us-ascii?Q?LPaNm3FfTdtW5TBDa3orw6SgCgJI9dBSyZIC+br83aj6QFksjHvV0ib4+SkM?= =?us-ascii?Q?youfUyov0YZsj67q9z+l43iahPBpJNk595ZAwdncz09uvYw9sLenUlVx7pBp?= =?us-ascii?Q?8m50E2I/+lsJrrLdbUiDFstql/QvDQuGQSsDrw5D3SFO/mVl7N31QPy1jse1?= =?us-ascii?Q?kbY1z9ctPjbnHyZrJ4e8pIQkZAq93JkaOgHYba2D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56e40441-7c24-40ee-0217-08dbb8c56ae4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:44.5879 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2qt7T5mmQQmPd2SOkq25HC8Y4PJePPrDwSXHy7eOx88fFttfhqdZwAYZ1Ms/DJVIj34R2NmgTV6i7He1BIe/2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch drops id 0 limitation in mptcp_nl_cmd_sf_create() to allow creating additional subflows with the local addr ID 0. There is no reason not to allow additional subflows from this local address: we should be able to create new subflows from the initial endpoint. This limitation was breaking fullmesh support from userspace. Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establ= ishment") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/391 Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 9429cf91a9e9..d8dac3eda7dc 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -315,12 +315,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 - if (addr_l.id =3D=3D 0) { - NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id"); - err =3D -EINVAL; - goto create_err; - } - err =3D mptcp_pm_parse_addr(raddr, info, &addr_r); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr"); --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2051.outbound.protection.outlook.com [40.107.105.51]) (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 5360634CD8 for ; Tue, 19 Sep 2023 04:03:58 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YndIDLAwW6LYAN7rW2oPr2ThD1FgASP6/Z/Gg+qt/wGsF2PlSKrAjvKdx2v6IdXxtmCMzooohBYXFoQ0hJ0xubGmdDBiriKXF+1MOX7PenlFMMLQMvwBCwzWzXCdhMX7RJqZk7b3XdEDIsBJxegRX9OikbViAYSwYMW3bApE8NdoouujLOgOk3hFgwrz7RUXHYsKm5cpDJTsJVHCbLib551rm+22DzOol9FIzAPadl0bj1x00qaIsk29AoMcinphLG3xGhuc6Ke9Z0WWi1bVIC5M8UkIwYuvGALP3ShDApUeslY82YzWy0ss3kVoDBzUNt228yFZocAnpoJpVdTN6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fh0AThWy/1iY4ohouWlu1EMSH+myMG0i4Rl4xquRNfo=; b=SSRrRSUE0kzS7h/xbsyPPFvLRVzIIMEra7EG8O462UFOzeVI5XYz5FvmhaqpAvZJ+/08ABya3wwqn4cT7zva4h3QGi+RcCtcImY1ORhjJ4rw1sZk0B1oiaW8zOSj3leTyZJCEFwe3bbd+inWQJwWfyIYOVYa+f37ggmNYGDTD3yXJ5LnViQQqpgHKCye7so9wiy6RklCSszc8dm9Ucza6OdZs04GMM8CDRZiVvs11HI7g/uL0WL4CyUxFDCYALAd4T0lV1878QVlX4mYA4LcmwNVTBhsm/H6Fi/u41xYIlDRoR6qxqijIkwI+xnnUNOnJS/IT266VVTTC16sZYRgfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fh0AThWy/1iY4ohouWlu1EMSH+myMG0i4Rl4xquRNfo=; b=Lgg8qY1gmWibC9CONQVf6yfDqpurrigWqc1DhwaobrvygOhaRKFZORq2XUBWtb/mX9w8qjhTuoSqk6XwMQnqtzrhBVGzz+JneHk1GBltrrJlDgfQFJvTIN45i8X7X/JWWUwYxuZfNytfStVSW811uMgugnIBK0dZ9U44fv1m+4KOwS++1W6kZArYEfO21nXplXOw+woXD/77lDz51jS8OGtnkvrnX8xw0ODpr0O8aZVNpuMGr4yQlS6SjyoA6/xV7Jnx2wnPpj+LRVVXpVNedKsTAw2xw6hg11aZ7hzRjerd8jy7IINWtrzoqep2/Op2+ai/C04XBvmDSXPdgzmuDw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:03:56 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:03:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 15/30] selftests: mptcp: userspace pm create id 0 subflow Date: Tue, 19 Sep 2023 12:02:16 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0272.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 049e5f12-3032-47b0-3d38-08dbb8c571db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P1bTRDk9AzTs9AijnLPBZg+rarNnhpQQFmaXdyarEsdXDjNItgoU+wOfuPskVU9vP7yFERxs0f8KkcOw3ItynnpdwcC5ugIRbtp86nMuaN0NkMmzJBXVSATBHMKBsvTATggVOVWM+w4E7lBcyEQXyk6ngO2YBObNiB3ogg5aRSjyJg9IsEDIQwimSMZWciLqsuhzukAo7p8oK0nZfwHQzA+/vpxh/usp+yVwvtLAS3DqaYzVkEoS6o3BrOJnUYPc24C/PNuTgneRV4IJqqUpTwgWCqJQS1CL/XJDAX48UVmmZmGR3ZazT2YOrRfkS1yWyZxQ3/pH4oiz9kGH6F9S6Q2N9uopmhb/FuHuINocy5yDvnSIf8F2gKJfdTg9AVCObzJcVi+5txB/DoELWGgUWWTQKC/0F2XpN51drQ2AIWUu4N50JgvTaZVeG9Qz/ePLU3hQcoz3bim8dQTyVlgi/kHhwlY8YHtkmSR6CNwAJ3dCHofTmkn8Uc7NkcyzCwWcFoiyaaA50aifpLUG7kHtNRY/FU6O3QMkpurSetmTD4k/7WwS76A7LeOcFrpeXbV1FBx31xqfVhp6TwCVxO/8Azpkf/0Yrkm0Dou6ybptd4A= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?A5oxQ8EU7hiI7AHmB9j2ZYezTZrjVwCVuYoAvQpgTmB9J8OOnLetcIUbdZk3?= =?us-ascii?Q?SmoXtTM9PUjBzj9bQkPfrQKBt1EPTxpJb+ikEWwzUnZRMrjqndtUgBT97iZo?= =?us-ascii?Q?G73DK1jaXg5x1BoANRI/I+IocEZDa1iEucNlYQt/Z/Fsj5al5txCzy4KS3jv?= =?us-ascii?Q?a30Zh/pmMcsHjOxbGac3wraIoWl8IWglXkt/87yIQVk/oQvtiGuEJ6a0iXLM?= =?us-ascii?Q?xVuofa8A+wvfRrg5a29lzF9fdwA5r2MOvvq6S8WzdQ2eKr54zShNL0Bu03D0?= =?us-ascii?Q?vWzVQsfZSNB9ppA4Tbym+UczY3IyRhf5Zv2w49A6C+DUEthtVCJ0b5XRUr5o?= =?us-ascii?Q?WT9HZYje1KvaBDQqFalDh6zs21TitylGrSSPzz1gWsVt/SDOVFtXfjJAMu6J?= =?us-ascii?Q?q5XXtHOxLF30TSSc/TfouPV2OYKMCOxUjE4dhgeGncXl0QMrL/38mMlC0MU/?= =?us-ascii?Q?A2XVEXb4Z800C2FLlLhByeZV8BcdiJpzGLqni9Sm4G6jIcEoDYSny4WlGkW1?= =?us-ascii?Q?yOdD4L2u7DYrzIVw+2qbETVXB9WhI5Gte2L46B+3ILY7HrQ6Vlq04RXxqgsh?= =?us-ascii?Q?kAcjPKOr0Y7nKzOSInH8P6XwwBBArGRJn6WXpOJcfOVU1Gb+9pug23VmbZxW?= =?us-ascii?Q?WwNV3Y1+JiaEJ9S7YXNyJIJSHEGiZfdnJmY5w99u2E569cbLRCa0diBsADHP?= =?us-ascii?Q?MZfzoOKsAonwN10MJ3+PLErxHdTXapO7B1cg7mGa0/azhibuGEpCZNV7sJVf?= =?us-ascii?Q?/tVbdUXI0CnlF5ijFeOst7TnySmNVoeyHBBD0v04C0udLdMoIXlktkZdiaWi?= =?us-ascii?Q?w+lTcq6X3s4WOU1Lww1Qzek5DT2K4iWcFCN2UaPVvJ/qg9ryGT+nXiFOSsyH?= =?us-ascii?Q?79YUVfu1oBlhrQAgllnQE00/GXWviFsAk2Mmk1yUlBVMz/S9MhtL+wnFnRZw?= =?us-ascii?Q?IKim+ouhMxh2lmJftPgBBeVlqvsRC2NxbJ0+s4l7oMYv+ouzsQrtS39L1598?= =?us-ascii?Q?JdPAAYvKx8VPm8KBZUUbSYBgI6+csGTDMBw7jBWaRRgPqX5nFynHd8VJemZz?= =?us-ascii?Q?gLfLvUEgapXIYOrU1v3QEvz7BluNrIQY3qaXg/9bnQtjz7XLZ0sg+xV12Vq9?= =?us-ascii?Q?2/NzgE6cHMSYpW8NzjykEG+Y2pCJfvk6MXJBKmbLFQLIxg0O9f2DpwM5UkD4?= =?us-ascii?Q?2+dxYDwL5NkZi9ZDBdLKBaoy/vt3BqupWEVJHdVxHeKzcihaugnOvBUiUtIx?= =?us-ascii?Q?VNerMUMxTt9bmCVX4zQfuMhITPHnfvKf8RhkcESVMJdhIGOtVsdkq/bzF1en?= =?us-ascii?Q?NIqSNX3VjX9VsAPMASGc0CcDcyaJDgIhW2dFpw4QvHDx1wNsFwJV1uY3jtO/?= =?us-ascii?Q?2yH5d0nf9zBs0HtaMpQ0IDB2qrUNU1UPPrmyTq0hIvqvhqQOqk7q5R5gdhjI?= =?us-ascii?Q?mHk1r2FbUfNNXuJhVhWbs5rwNTJI9LIpJc3bXHj2qad5GwbghNEtHL8CxiIe?= =?us-ascii?Q?tdt28Z4y2SVP7y+T5JooMY5TwUKCQI2TX90gZCj91d6mvdEp/c7gVk45ftzW?= =?us-ascii?Q?C9V5rZjU6gQJhGabaxDVJUTbSmD506nDrisGZxoX?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 049e5f12-3032-47b0-3d38-08dbb8c571db X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:03:56.2246 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oiZpQVMdW+MT9inlWBJg3N8WGZRwWI5qaotrD50GTE06+/+HRbLKr/DmlhFcfMYwAmGgE4PcTsOQp7AlJbnofw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a selftest to create id 0 subflow. Pass id 0 to the helper userspace_pm_add_sf() to create id 0 subflow. chk_mptcp_info shows one subflow but chk_subflows_total shows two subflows in each namespace. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ca75d2c6d415..22aa69db87ab 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3468,6 +3468,25 @@ userspace_tests() wait $tests_pid fi =20 + # userspace pm create id 0 subflow + if reset_with_events "userspace pm create id 0 subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 + userspace_pm_add_sf $ns2 10.0.3.2 0 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + kill_events_pids + wait $tests_pid + fi + # userspace pm remove id 0 subflow if reset_with_events "userspace pm remove id 0 subflow" && continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2056.outbound.protection.outlook.com [40.107.105.56]) (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 A6BE134CD8 for ; Tue, 19 Sep 2023 04:04:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I/80jOaSP17vmnRAOCC8ABY9sNUx2VTfi3utWKWE+bmXQtHsGTzHfnOZc14DrXxfAa9SADSEcjY3Gr612oASpMfCW31rQulI4/ghvWmqZhQqDiRYjQfbRLylQcG6lmbJC7OCv4Lebk5go5Dg4SUrmEBt8CQ82yA8ONS24C5WAP2uh6UhRQDyiIv1XLw8uekyXMvcN0ZBjnCuhmC5hlae2MrsFGydeRMQ8rqjmmaXjEwZBgs6qOIhFRvFfUZZt7MvD1C3Zc3KOvn/YxebdUkvWmyp9e6f0R1ZGpVg9oSbfXoJym76v2bgtkDFtQDAgbT8j2Ghy/yqNnwszE4Cy2f/VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NpKTSE9FxJceNojrpbeUuR3KarLL0hCiQCrYnuj6QgA=; b=M/+8KIPiFLVo36C3P6atat4MXX9AF54LNDAmsHTjkkCm/U8J72bBZBhFc2EWUjsazfp5fRGjBe+wNftIgSyOfBrwBSInEhgMVLlBiDxMPIy5A4NaBJ8qcddtyGmbkCmERYII06L/opM2CBtQOb4JleJrpJtiKxOClG/XxcaVQjh2M4wmuC2RKeYdmgTM3kLXdxZPkCTzl26jzkNofNW0S9zakKbLc0Y2XBn/OvM1uJDKMO/5s4t+kR2K9ClYOgFQKQjyy9iPDrwhKQdOr3x7fyrwOAs3TqYv0zK+zMXOYqBBYJFT84UM1s3YD6xiRp3lxuLYofsvjZv4zvi3bSAkYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NpKTSE9FxJceNojrpbeUuR3KarLL0hCiQCrYnuj6QgA=; b=e9M2xZbk3hDOXAa8Wy3S6wWn4u5Q38wmxzlpiKKgV1tG16m1VBXJU3rximEzmwOW6uUs850bhUMjQhTwghVZOtQj4gPzbfN4ylix6pF0drTtlhRW7Tqinpd1yt/ZQj3ocKJsmxWx83Q1wRlihen0CvLeTvw+XvwQY+qRDGZUedztqShMbQRj7SZHdGuiHghQwQbAXTnVo/0BrXiP9Sssto1JR05/nWSsuEuTt9bx/45eMcHWcxWWxejiDZqEwji85BBDa41BddO3wDFiP7bd3MbxHxW75KacCNksEkAtkTqw0N8pDGagDc6Qk05uRWX7StTjAX+fU4og/xx1qiLZDw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:04:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:04:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 16/30] mptcp: userspace pm remove id 0 address Date: Tue, 19 Sep 2023 12:02:17 +0800 Message-Id: <47bca92c35edfdcc16669ebf81c2743ba1cd43f9.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0281.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 10a923e6-ddbc-4ff5-6e29-08dbb8c57843 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WrswLOAbBxYFQvvjnSvn480zNhZalHRStfy3GnVF2xmAABp8JZcQTA/qCafZljw4ilctIeyLxQF3YhyLxJgBO6xZFproYeMM722pt95tq07dtOg5+WneOZNmYlQ+zdJyaTDoLQ2qo2HIvxnI90C2/Lm2OYRazStIDYu5sT6+teDFoDiQ+LjZmnT67C6h57zXwyp07W+V0LURgwUBaksw8ZfJYeEwY66Ae7Ue/MT8wSvG+pzlW4brzEJYVMEtZbrf36q6LuCz5UCHMry6+9+M8BnQyRteyFz8875RgXh5bL0TUPU145gd6G+11BK+kqbTnej/dQ73hX0APyO0rxUFaZRvmfhQ6M32UU9JA3H8PznHCEjSm/8cl+IP1GnDvBiqd1gyGV0iNA29+8TsJZrdG273MNqQAh7SF+0LVB68PZ1jBLfY5RpAGNSQ7tXjj9tskrO95hmKjpKfZ/7zi9lIYyBEbQpim163geN9O9BPMjmmHqUzJKAJTE5+UIr5D088IjMgyBLwrt/4ngnv75jbyLpJ/7tkNQWFb51BtcF6WYcVd7WMrBw/1G67s/XKkdrHMLubmla7uU7SX0JzLM7Uf64ek7+kGW42lladwnNYly0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(966005)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xUs7xDUlRmEaXo4/YXitCbgADyp2n1GfwTob5WNjAJ6A4af6S4PdjPkqzhUo?= =?us-ascii?Q?WTolEhOXBwHzVB8wFbHHqb6Pq+glBpPNFD3rXX4KMYetWmt46fadtXYiZJSN?= =?us-ascii?Q?GFsUm3GH7QBx6MJkMXekRGp96xSzUIq2Mn1u9UJQg851fIEUOHl8QhaA0pY9?= =?us-ascii?Q?4njiOfqsARAII8bS9tS7GslO4PisyDwJU0eudHH477EoGiwDDAwZ9St4LAbx?= =?us-ascii?Q?o+9HXvx6RhlZm4Pk3zDGvFAccuBrZGbYPPuX2pzvVKZwnSaL5mYsmPqItM5z?= =?us-ascii?Q?oc8NW04XQet8jmUOVlIXG4YjiBOB50PmfgDVkuRC5PD3Q8PKB81CSaZ9+cKf?= =?us-ascii?Q?euugDCwSZZbFX60BZO9GyvaE+wkx68Bcv6My3ciDKIzSK+auYY2gXJ9rqo72?= =?us-ascii?Q?fzZx7MzetVpvju7Cbpea4e84vGKrxJ1uppFpuVSBxA0pDrslPJAT1Cxr+H1f?= =?us-ascii?Q?FPvraCFQT04rWk/SOfJujCVqbB8SwIDyHiLTEJM54HDXPidUjMEp2p/bCxDX?= =?us-ascii?Q?LS8xlVEckdgLiyNaGCxS+QI1vBRH9pPJ26eh7SGuiMPo5rbFtdplDLMgqwi+?= =?us-ascii?Q?5t4D3FYzH1arbMQZWBnuDsfj/ZTkUBoVna3Tp0Ao/bHEXH06raLCITcQTU7X?= =?us-ascii?Q?ICrF7bjhiJgwuImNdEMaXr3l527L6+p9kKohyp/qRAvbur4SG0pMoPLWycsC?= =?us-ascii?Q?1Rs6s0SZulDqhiqpiEfTYB8zwfIjsW3LVVY/872PDzPAEn9QAs3GcI3G81Fp?= =?us-ascii?Q?l56NDjgAanYj5Ma8FfGbX6QL3X59fq7vz9QVqTzBdnZD4eyRNW4SOC8xw9+e?= =?us-ascii?Q?JhvlfvJFqv6QQbpjgQ0CVC5zQJiSLTp0br+8MdZWZZqNs3cEc+4DZZ1TC1z9?= =?us-ascii?Q?EpITTIY8KE4rwLk2ln9rLhJUI5hWRTZN80KQ1/u8MWcG+FTXEa9oXXOR34Et?= =?us-ascii?Q?nN5oZbJgDEWs901PWB6XQpwgKzMDL6y35gCo5Mjq10a+MY7UpDtY5mFSbNnX?= =?us-ascii?Q?1Iy5bhGNDOCVQcyBrHaa5P0BoEx/4ybLd0n5LecIlDSNBQ9d9RQHrRuiYsqN?= =?us-ascii?Q?BSFNHKGMtYCU2TOt8GkwYe7xJQcsPyQTET0+dV2zW6jxYIMCReA2ZtooemGK?= =?us-ascii?Q?DePK1liJLPSHYvuUgrLKUAVIt8mG4WnOavkzsCVkJIgBHVzuVdxlsrNjuWOR?= =?us-ascii?Q?aBn/vwOSc5+uFziT/vSdYLbypV2GeZu1zrB5Z57iow8iQ7SLaBcfQnVZlsrG?= =?us-ascii?Q?JcYLTBkPQMr7oKjG8CvA9lAukRPZuPcmu2kR645+1q67A8x5JzGB05qXOJq/?= =?us-ascii?Q?wG67tnJ4pauq3Mn31qtDghJlog0W2zPjEQ2NNV4mX46KvB5IQ7GbJBiWHjRT?= =?us-ascii?Q?nZfjAQbEPdO5CxQDDTIwRW8J4e62fHrSzc4dl1+CPeJYZXBAFeCNaS/1vw4S?= =?us-ascii?Q?6IXhYTaUK6YkpzKQ2eWIue+igjQy1aBxblexqxzTUOEpLDXp9StZAMIzLGrk?= =?us-ascii?Q?rjngJlwPePoD8UWzFP6SJ0KK85cTld+AjlBzGpXug9stfiexBPchZG7elBJD?= =?us-ascii?Q?5zckWrUv076gA2HDAf7nnDMyvhiD/JVUJIDFwdd8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10a923e6-ddbc-4ff5-6e29-08dbb8c57843 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:04:06.9683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cncPofNyQAHW7NzBIjX525WhGzYv/QwbxGH9LpBwFZGRHJhxpR50S1WLZxpNoCMrjPi+TQ9zI5wJpiqv/hu23g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds the ability to send RM_ADDR for local ID 0. Check whether id 0 address is removed, if not, put id 0 into a removing list, pass it to mptcp_pm_remove_addr() to remove id 0 address. There is no reason not to allow the userspace to remove the initial address (ID 0). This special case was not taken into account not letting the userspace to delete all addresses as announced. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index d8dac3eda7dc..c1dac6d0a28e 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -211,6 +211,38 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct = genl_info *info) return err; } =20 +static int mptcp_userspace_remove_id_zero_address(struct mptcp_sock *msk, + struct genl_info *info) +{ + struct mptcp_rm_list list =3D { .nr =3D 0 }; + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + bool has_id_0 =3D false; + int err =3D -EINVAL; + + lock_sock(sk); + spin_lock_bh(&msk->pm.lock); + mptcp_for_each_subflow(msk, subflow) { + if (subflow->remote_id =3D=3D 0) { + has_id_0 =3D true; + break; + } + } + if (!has_id_0) { + GENL_SET_ERR_MSG(info, "address with id 0 not found"); + goto out; + } + + list.ids[list.nr++] =3D 0; + mptcp_pm_remove_addr(msk, &list); + err =3D 0; +out: + spin_unlock_bh(&msk->pm.lock); + release_sock(sk); + sock_put(sk); + return err; +} + int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; @@ -245,6 +277,9 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) goto remove_err; } =20 + if (id_val =3D=3D 0) + return mptcp_userspace_remove_id_zero_address(msk, info); + lock_sock(sk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2058.outbound.protection.outlook.com [40.107.105.58]) (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 DDEC831A74 for ; Tue, 19 Sep 2023 04:04:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LzrM/xBFe8cRExuvyHhCrxOyv1AT3HgZobZSxv2Nklx2EhrvJ0910BONzAuqVTOxBzLoCfcXgMmr8RAlGlKBOextaA1bppQ4hsXcoqsedHFOMXe7ZU8UqeHwveOlvI+EOidKoL45stHJhvk3CGBNYTZaJ95O2iN2LZg550f5gulnCuj7WPtth5Y1eZRTmY3Mr2WrtMDKYzwHe4cIqbF6xJECBr8NztON1gUkhAgKz4qZp7zegSB9hqWJstfGLHU3JTJMNB4rkQSKh8MUrM/3VS9x2UgUslAIGwCfQto5Ad1iDv3jRbnWqz/SmZo4NK6O6XMFG5acGyjU4DU022vRcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v3/Thb9MfRuKOX6+LCvr/Dd4cn72+PR9JNmDkwAOZbE=; b=JdSX0sbX9U2dGl1SwTzJNZkoSfdg/hmyaQMq4GvPXLQS7cg00GU2OQ1V0HTFvzdXFC8S92pf15yDWw8oajUq0dZhLZHvlxv71yX9N8QJZCPeL/Ke+Tm9byptaz90/Tud4G2DreAqc+1+4gl7iG+KiN/fqxRoQCJ0hZVIKUYKYC+lGS0FsOZvqix6WLOvd1nHT7RqeD/R47kITZvUUsdjlJWWyRvh3lSr/w9fuHo85S7qcSsHumsIv3V+2BW4xhI7zgurkzsUNrxjyKbeTm5HtnZ9irIbVuMwkj22Bev6MFbaKTn6GyATL42+p2mmrYDH1wUibvV952N4BuV5dzPzkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v3/Thb9MfRuKOX6+LCvr/Dd4cn72+PR9JNmDkwAOZbE=; b=gX0XJoYJlJrWxJvqsUN5w9N7zGr7WwNPqjZxhN0pgSEgk0jS/Q/8TKb16wnH44iGXvxx8dEBGMfaMDN71AeVcdSpHPbELh1jsdylkKNP1V5ewI8eC/BR5eqQ/iw/XEMuQHYzasIolnv0/hjyslh+s2fJzE7dPPVxrTRJOyjo+oV2TIdiSUEDv2AV2R3jvpto7t6PJ4RbPxPmSze+q1EKHZKUNUh2xK2WhYK1fFzm9H59mUPwei/s8SSMHafwib+eQN86vY96F5t5iLnKEErb4C94f9C2W5u+N+39TrPKGOpL2o9Cq3xqjyPV4tzDQG9L2vmf6F6QmBGO/kKHOtx0yg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:04:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:04:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 17/30] selftests: mptcp: userspace pm remove id 0 address Date: Tue, 19 Sep 2023 12:02:18 +0800 Message-Id: <93a7a0abbe9eff32cadd01f32333b6316d545b86.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0275.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: b2ed64e8-d32e-48b7-96ef-08dbb8c57f27 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SbhUWRobphx2ZhsH96iaGIRGOH3+ANMB8AWc3G1XqQ5uiIgmhDnQzXQFo74Nm9ue5J4iiPR4bVOgGWpjiVfpzOjWTK3JYvkwzRSsYhsyQVEBEG0UzIgew99mf4eWPI9RjnjiFbTPOWnnBe9OuOkvqX1MHbYn1oZ2I4jtS1b0/ahawtXiM9fNCi7SOhiglEHZBaZQrR0Vt+nSSA/PPELmKzuevuC05tTrVndKUN6rGKk1PB6VpU+BcO6sYxn4Zt1ybGNdblKCWOINoL7DvE+lpnc0xSTbsOXyrhfaUZI8yRvTMASoH5XnUtWCuoIH35Enn86HFi0LN6jvibAPvKGHssORgRCDXIBG1gPNIDni45k2ajnrvCvIGN4hi5O8b3GUs4ifppcIvK/Y+Kt6zGUtTfWetrJQmfSmPE9AkNaCdFgbUmd25XoA2jF8UQ7mmjZxd7vv/5AT8LAu959qv5MpTLR3w1t76hD0g+Y8xBRnjthqYhf6i81uoXnet8OsBb+tnthjyE37BlhCrWvEBdpe3tiOrk45biCzmVKVH34ixugaq63Akfc3jG4HnI5lqGr5X4SgXSKYuxlMF3m/BB+fTJ9Ziw0ddoyi57T0uSaVwvA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mdpiBJm4uoUhvvlIKdYhwx+KpWYY0OmSkp76D/J8F3OudcIQPvi9GhOpDWUz?= =?us-ascii?Q?oNVmHXQ5oe3d44jVjvLQLcIoYYifS3aoQnAGBWVSqzvfk0TGXU5nRkDGI/7W?= =?us-ascii?Q?SqfsMMIE94zepw3TNufRowSDVvCEcvxaLdAzNUz/EsIq37NEW+oQIZxH/i9u?= =?us-ascii?Q?o0Fy7n5lXtUSgXo/oc4olQqYEPQByUvKPt625HE+APyqYXPUGN07V2nlF3ue?= =?us-ascii?Q?g93FQF3UFwRf3M+Okz+Fav7HOEdvBFXp4w0JGhGln/yfSmsoe5SYToVyRsBJ?= =?us-ascii?Q?Mp1sgdPEZYtMM5WEjm6W+FMorTigERFyo3tj6vv7l8qtygqcLg5ZeXtIhG2H?= =?us-ascii?Q?y7ie/alPWsdPDMgtu/Uxhr2fOKoJ9djZ1ea/Ef1RRoqNb5I8KlSSx8FBIYpp?= =?us-ascii?Q?UuAb56z4LH0O7lYTVpiHsWUKcKWFe7guh8zjY6Agy6TADO0hQ6DZknXmFYme?= =?us-ascii?Q?NAhjTHWpqkL3FYSTMp2u9y5M3jS2fF9x3hGg/fHdBm9psHNUFoOuqneSlH6r?= =?us-ascii?Q?hi8aXla4B+XRnRpuWoe3EY07OZTA60tKNzCb4Fib03gEf2iXePuqRncYxmvE?= =?us-ascii?Q?IObg1H2QSicbJlFlMahUhQokozpKcMv5w7MSlP5NlFar8pQ/c3lfsZPevF+q?= =?us-ascii?Q?coTNopgp1z7YDQghSxCSd7qYzUs5e4awBmEcNMqwzjY/5RIwUNsoprWG6zdL?= =?us-ascii?Q?oCBIC7RlewbaPNa7ciUdrD8aziSoScdMhPQU3jf7yKzxSVLtePgeZI3jxkdG?= =?us-ascii?Q?L+r3m14PYJkiIF2CJshgrLprR0RzKpJcaps+2iu2+U8WKhVIXJCDa6z8LUyd?= =?us-ascii?Q?VajPk0LrXRRjK0ExcF3xeg+F3ZHr7hVtboSqFXDnD5xyNrLAfdi+/Q+JMlss?= =?us-ascii?Q?G5QtWRlRc54daEMGPdx8OS2x+IqWjYjAVQQIlw64Frbz31Xh1xbz+9Gm4YUK?= =?us-ascii?Q?FLOYLpklnT1aFrlBZ2bGUHs66xcV9wrwOpaw6W5zIfJBs59WKSBKmdaE2XyK?= =?us-ascii?Q?aV3P3ntUgYsbN5PjDrFm4nEm0fOBffYC0++JYwpgjT6wjnUgOW0AqqheaDcO?= =?us-ascii?Q?f7x5PTL0uxwkMwUP73ZiAwcTmLyvoJH5eHLJsiAZ1bJ1nQW7gTss/OWq31yo?= =?us-ascii?Q?etnLGt9kpTTOfEYAZWEb9xe8xZLJWChFCtVENFGA1U95ntqOYjNrIO+TKJwW?= =?us-ascii?Q?+gztopiT4iqaIWfr/OeK5I3b/c11ziGCeIAn09znmdQkZIJNWCYE22sQzgPa?= =?us-ascii?Q?22Xnoy3eyeCv1lPn22dxHnCiAEDotUaaO6WLdX7O+seDvTvguQKnI2x7bKZX?= =?us-ascii?Q?qUoFGUqoQjOqUO/slFpb0m/kKFa6u8CdjHuA1vvNUDpwGmfVposbccWajfsy?= =?us-ascii?Q?f3sABZApf4g/WZtlY7/6wAlU0F5hcIU5Nf1UoaBu5PKRc5QkDDuxbrLKC6sr?= =?us-ascii?Q?ktp2QGpD1a7OQcu4F19uUhP0J4j6AbXSIQiN607Xjl3L13FJ5V/QbSI6ZpqP?= =?us-ascii?Q?zfrb8B/Iim0Ynjsm54IPWY96ciZLpfN5lHMz1klRT9aAx1GWf44S+O+xLdyo?= =?us-ascii?Q?/K6jK6aLwZ0a6KumeIBUcqGcQFfn68D4CwFNCcHw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2ed64e8-d32e-48b7-96ef-08dbb8c57f27 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:04:18.5542 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QFSbe9Zxj/ebiiWxETbW2T5cxmid5cfYOVU2MGbAAKjZjKlHlUJkIjYrfdwADripw1D0r3+zQKW/8Fs1r1VXkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 address. Use userspace_pm_add_addr() helper to add a id 10 address, then use userspace_pm_rm_addr() helper to remove id 0 address. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 22aa69db87ab..aac50ef86785 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3508,6 +3508,30 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 address + if reset_with_events "userspace pm remove id 0 address" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_addr $ns1 10.0.2.1 10 + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 + userspace_pm_rm_addr $ns1 0 + chk_rm_nr 1 0 invert + chk_rst_nr 1 1 invert + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 1 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2087.outbound.protection.outlook.com [40.107.105.87]) (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 947CC31A74 for ; Tue, 19 Sep 2023 04:04:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSOBYChnBFAYvvNtYUD3OSirhkNb1zDRoRpAOJ9aT9N1GoIzF8RbvTC3X8Nqj1lA1WE8AtFQ2SeE93U1PCi2kupKrkVCkyzZmJ0+JbOS0OAdLEqXatkjcng5ToW41bzHiFUWvBZBBzgRThjLyQ73aCG18iuT0p9PwDUDV9KL/mXSYiYCozQ5CnOPj80QJm8OSWXjHGy6i5jLp0S9ITLoJsY75HIhBJK2bKYy9zxrI5gMp1BvaP2VZo4Mlm0qhbICF1293MpK/YmsdDQr11ZyrOVMcRXq2etZMRmOOnBpXyjHvnjRTsjdL0cXAqdgEduvdeTQis2thS/SbG+UaJM+NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PpT8z1BWMsArBuSFlqbf5Uc+F+tKd/u4sAAz5PWo8fs=; b=dTE75ApeoCyjQHCbfX4mjK5duTdGbBkN5IWlTzTtRAe00TcyOyb51W1vSTajsSc/SlRyv+AkrBD5TD9Gp3HSbcTVhb4j8BiCio+bt9ONLAE4WXNTrxx6U7fYaOH87dAuy4hMMd1sdIOilYnrzvjR7BMa0kaCeOa55sFTuZMHRtmU8NIHg8YIM/718KTb+Bz0lW7UTBkpSutrASPWkqDJEU4xhdmOljQbOhU2XXQref7IIz4AUPjjZJyAMPcvCuKC+9sXkhcaWBnLVE0j8vLDY6OALTs2YBD1PumOAkcgBXLAl0JbkFZQ2wU3g1pPUsmTRKSZydxll85RziCrSzGeOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PpT8z1BWMsArBuSFlqbf5Uc+F+tKd/u4sAAz5PWo8fs=; b=xaaBVhpOQ6mt8hykAH2W55THCVjK0EiQ2vKZ9tfA8rFFGc/E8EyjM9AXR221gavza1cD4+kg30j7P6ERysyppQCJJ+nHr+wErk/wtlpexEPz5dwcHpFWng+K0H6NnsYHdQ0N1OjXYZnZgPC0vNfuG8UZ6f4+wkWkEu6VfUaqS364VQKjOmNNxH8bBcGjsdQIccZyqljtmL0gjZONLyG3OLuJt4QHnZ9845ULX15IlXQ8PGMJ2/qZe6HAQ9jreNIcVxlYXExxAb4lW1RYby8dryPoFHxikH7qQmXYiIIYRxIUyg0IOpartmYIV43zmBZtArxzLEVs1duu4kPwgPAzhQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:04:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:04:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 18/30] mptcp: add userspace_pm_get_entry helper Date: Tue, 19 Sep 2023 12:02:19 +0800 Message-Id: <27e62f435ddc40524e7e1b6d7aebca4e10376cae.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0272.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 6006e56b-a3b4-463f-3046-08dbb8c5840b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IGirubExA14mYK66wrD0kZjuiDfhcHe+4uzZPpv3adv6eybu4k40JFCDA7Y1Lm90V5pY12klhQfrpwvYpjQM3SVYLhKqjMw21wx3ZXyIIb6JZWEC4FPUvKiqH1jP7//mLpwENESdODlNupUnKA4+0vOadI2tB1I3ODj6fWpeRGnOQ7OQbkpW6ky1beFrG0fNuYB5vcxSpiLHgQ29LYqEytdQ7gtkCc5g2CWxZOoGPukk28RXsrC/zJtS550sqHt8jU0qaxtGbaa6eNuy3b2EJ+JxT4a21XUMTwMUMZ4T9+w2OyANhNj2EUQ1TMiu0+0Rz30PdIlpO0AOHnkxOIn66hevGE/4gi2r9en3yDhbgQWpqe6qYywRlymjqXcwaB8trmhiu5PV8B5xLLhtWU4trQb6yibKqy39P0err48ZfyN35eI7IJJHP6qsMS/CsuNtE2q0f4AVkqIgswaqEFSeJ2hclNE+NTZT3YaorBuzlAxRwyi97MUKtXXMYZQDhx/vcs8n5AmBASbuYi+RwL2T8SJwD33cH3Yqt7oy0yIswXQ7wlnHGbeQkc+t3XCdozrWH0vT61+7nVB8gI5Pxh2dAUWmcQt1LXjPnHYVD9XG/Lt3wRrqWp5oHWxhiemXw4NfqdBQGsE7o/AXoph1HeDNJQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009)(334744004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0hGUqbSjajtIwuVG0nVuIN+jo15Y+nPjD+i3HjYyT9Mq8VkAD+JKQaTniy9A?= =?us-ascii?Q?Ol/tGO8Md9mbKV69j6NF3TlXc95je53C2gjOD6+tgrpGGBE/aWOmI/ukRdMr?= =?us-ascii?Q?VM6150NuX02v6V+/FW0kIxymiQuGxBPyvYT1FuctvSHJ4cdS0QmnSdb6UGfY?= =?us-ascii?Q?7LxnyqOfQxKMpXjYZYX4HNKHeNwx7cgf+HWwmQTFQgR4iczofV12EvoqfDSm?= =?us-ascii?Q?xDuLhy176+yuLiVtBawZ7Ui08oIv3FbWiSlEpwWh1Dmtwwhds/PJ9d0UKfYZ?= =?us-ascii?Q?3yGQrkSJ5UDh+ktLsKW+B5azwjfUR/cKqr0RO1kPEMkNOPlQ2HW49F2AWSix?= =?us-ascii?Q?0xRq9BCDQYe3SYsQ9vGOOSEyxGeNK/x4yN73vVwYO26z4mIbU3b7wk4YSb4O?= =?us-ascii?Q?MpMlqdvhIslLuiMnlGHlArUyNpIhSxHjyDqmhohZgZ5YL7wjyyqKWSlsgRAj?= =?us-ascii?Q?VATBhH6WcRqjz8hLnuLIVw0lGk/m2H9UdA5dKjQaeLR6bgzqEx7AEpBP8qm9?= =?us-ascii?Q?hG680i3ePzSG+diO1C7UUhq69kh/pNed1NKWktnLanEghVAKff+zZ8yX912O?= =?us-ascii?Q?1jCsLkLZNS50DfsShQV58QwWS7bGjlMijJhIdM733L8YEaTxkY+b+si+L8RP?= =?us-ascii?Q?cfDjlqW+PwYOTtwugtu9JpqXdxbVylHgAwJqA35NZVCdIWp3Lg1b+35YZ7OU?= =?us-ascii?Q?IQ2zs8ewrnJOACuZXK/kM1HTaynW9V9RL80gwYQ+OxyS1UuBCF8aIP/25r4L?= =?us-ascii?Q?yqwYEeLphSOI48rXT16fn7Ef5GcXzd5VPGFDI6URTqqANHNFOwqjxBBesEkT?= =?us-ascii?Q?B73Lk+vqfJE3WoR1o8xBuaWMGvIj6EoEnewwyChf9r7DJE3yUKA72oEqQDJz?= =?us-ascii?Q?FQ5S/mKin7KjXWA+0N8/nLBkBciSAOQjED/st0yuFjq4bXWIjT7qvxbHi8ol?= =?us-ascii?Q?jT3pMiaYl42+FLIruOXOdfIJJsZl92opka/Ro1y/yDferO5eE3p9F8TxyICx?= =?us-ascii?Q?3QoqpquZ/sORttPK4pRwdQn/3f1zR7gwe7rGh3qdgOzWFRCjZWkmv19sC4YP?= =?us-ascii?Q?w7VnjVEw5iZmkKF6ui73I0gzzxHs1AcX3PdG4GNfyrpse+FHs+fj5IsqJ4i5?= =?us-ascii?Q?rtDVpq3Y1RBK29aX1p1lXQXZUqynuHVyEQJuzJkl2T2OdWkiaRavGOwdpauO?= =?us-ascii?Q?qeB7uBKVMZhahcf+87oJjLDppRdEEC0gJz/KRyoFQvf0LsST8j4kjMS5qXlt?= =?us-ascii?Q?syHN+QM+fN/1AKny5Ba8p2+rlT5YGm3U5LnXdHBuV/7M+5tIt6UlzEVba0Ev?= =?us-ascii?Q?OVSRwziKbZbx6r9mpXiAxVbNZeSSaMwsl/owGP6hYmz5f+MVK84Rfqab7EGL?= =?us-ascii?Q?TzQZ4gO9xjicFLxoQpazDgwf0WnGArRmXlXkXOH6kEby+N9VHJHB2U+TZ91f?= =?us-ascii?Q?UE1CGQB+Szlzjwtj8cFuoxXJ8wczanoOR8Zg3AHr6Li+kTafxAnlfGjOT1AZ?= =?us-ascii?Q?npxLsOBi2OS3N6bYagpBSDtNxRLKaglPyUkzCpJNjO1nVCIL2t/q6HsafrPF?= =?us-ascii?Q?IW9PpOgrChsbVo3nwI7CkLnaBm+n0C6BE0vgHlbt?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6006e56b-a3b4-463f-3046-08dbb8c5840b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:04:26.9652 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Adkr/64WslU/ezeFEfbn6kuVzlP3R7PfPnlzJIdbBWM7qC7NYBGOhQvIJBpQqs2/S6ucPa6kioU7/JER4FSLJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds a new helper mptcp_userspace_pm_get_entry() to find out the address entry on the userspace_pm_local_addr_list through the given address. Use this helper in mptcp_userspace_pm_delete_local_addr() and mptcp_nl_cmd_sf_destroy(). Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 43 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index c1dac6d0a28e..75c08375f6f4 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -80,6 +80,19 @@ static int mptcp_userspace_pm_append_new_local_addr(stru= ct mptcp_sock *msk, return ret; } =20 +static struct mptcp_pm_addr_entry *mptcp_userspace_pm_get_entry(struct mpt= cp_sock *msk, + struct mptcp_addr_info *addr) +{ + struct mptcp_pm_addr_entry *entry, *tmp; + + list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_lis= t, list) { + if (mptcp_addresses_equal(&entry->addr, addr, false)) + return entry; + } + + return NULL; +} + /* If the subflow is closed from the other peer (not via a * subflow destroy command then), we want to keep the entry * not to assign the same ID to another address and to be @@ -88,21 +101,19 @@ static int mptcp_userspace_pm_append_new_local_addr(st= ruct mptcp_sock *msk, static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *addr) { - struct mptcp_pm_addr_entry *entry, *tmp; + struct mptcp_pm_addr_entry *entry; =20 - list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_lis= t, list) { - if (mptcp_addresses_equal(&entry->addr, &addr->addr, false)) { - /* TODO: a refcount is needed because the entry can - * be used multiple times (e.g. fullmesh mode). - */ - list_del_rcu(&entry->list); - kfree(entry); - msk->pm.local_addr_used--; - return 0; - } - } + entry =3D mptcp_userspace_pm_get_entry(msk, &addr->addr); + if (!entry) + return -EINVAL; =20 - return -EINVAL; + /* TODO: a refcount is needed because the entry can + * be used multiple times (e.g. fullmesh mode). + */ + list_del_rcu(&entry->list); + kfree(entry); + msk->pm.local_addr_used--; + return 0; } =20 int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, @@ -495,10 +506,12 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, stru= ct genl_info *info) ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); - struct mptcp_pm_addr_entry entry =3D { .addr =3D addr_l }; + struct mptcp_pm_addr_entry *entry; =20 spin_lock_bh(&msk->pm.lock); - mptcp_userspace_pm_delete_local_addr(msk, &entry); + entry =3D mptcp_userspace_pm_get_entry(msk, &addr_l); + if (entry) + mptcp_userspace_pm_delete_local_addr(msk, entry); spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN); mptcp_close_ssk(sk, ssk, subflow); --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2048.outbound.protection.outlook.com [40.107.105.48]) (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 4C19231A74 for ; Tue, 19 Sep 2023 04:04:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z+dmMljwOsWTs/8MgiPyEp02hrtWdXDApsD+YL+o1moOwsaGMeyWEdbweIvtvDfjOuIGP6bsV14yvQcpbooY9IATGQpyVolyca+/4PgYAHduVMwB07wawc5qDmyRUk5dHad9p27n8RunlrhaRAX12S1C/NLxYQMMdDDFbie6eseJK+ZgHvDFYu7Su9lIQIwvARnkEJYABLD39ZjVNGaUcyopk9Cx8YpMhR1uv1/5x02T9KWyBeXowBBu8c7kPpdQ0WXfse56S9q97/MloGxT4xU1xs+jCosZ0AGW0wC/pHAQF2UvWijS7an9x4nOfG3nAQUOSSGggCIcqZujsKorpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wJX3nlevw6ZwDmBvHc7qhWe1X38wjYVlM6XsBOW4TyQ=; b=Jj4uztFbgbZSMCkp0EOn5LKiI2I5DXx8gGQ8D1TXLFxYxAgsUzrtC6WWf+UNB3+cndJd2D9obYMlfcx4tYe8qYKsFppuUsjVcq5+7ykrXlIo7Twz0e2N4IImSZ2EtR5HMdu6IYD0zqPV+sXErPl5k66N1ntiKhh7flNKufnm0xhMx56V+O7kebCwEaLCeCga6Mjpp2Hxq4aUG6zGPP+S9RiEZ88SS1iaAX0pv+GK9eGLrJj094XioslNim2ZiCYMLhMeFNjrUt7tR5B+/QEuflKA5CrJZN6afcK6S3qm5jkz9q4ELFEftQxP3Wvm6t78xg6K0KSA5AHr6bVSxLpzKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wJX3nlevw6ZwDmBvHc7qhWe1X38wjYVlM6XsBOW4TyQ=; b=AtsJod9r1BmK9bGRe27gFGqlyiJUQsnKjllelNrBY8orDbN60hzRNpiZ/qXG/vLIPVikRhAnenHNGYy937MzxrRREZ+MDqcFovrJdwDHNu6pIWjJArG2OsFOZLS3fn4KysPxtGeYhNY3jlkYrwzAqHKiet/Sm2Xlf1uPw4E9PPrzXuX9Ph/0Gs7vaZRKpE++v/uxXHRDxZ8EUOzMDInL4XQUCS/VU2V2OVkfRLycwF/bJ2i0KzbDq4UYt105A42uGxH0F2y8BCvF7loSRigClR5D68hYdIVd8KDhPAB9sddNVc2bDhV5J90WqTRLddSOuTyaEpoogxoAn+Ipf6ukSg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM8PR04MB7297.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:04:38 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:04:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 19/30] mptcp: add userspace pm addr entry refcount Date: Tue, 19 Sep 2023 12:02:20 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0278.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7297:EE_ X-MS-Office365-Filtering-Correlation-Id: 822cf576-f960-4782-1151-08dbb8c58a84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dy5OYNsLtIkTZXG8fujdfXXiMTPVAtqr6Axtty9LjxJlybZ+cvfJ+55LVyU7YK9SOg2t0FJbTy5poAPwBnDqvnbG2tR+pqJeIovaAmAZquL8jfZgZ+Sty9FS+aEvCQFRF4M6OPnRmUehguDXGGuGQh5wiPusRkAv4Cvy4rnCxcaGCIBnmTEL4Opfiniz06lI2mjq9jHelY7l0RSUNALShOETDTrzOSYhe/eTjHIQoNeBi0ZzylgW2J2hpwdWBg0Zdk9omnZBAX5KpoT4g7diEmH6fYV2uLf8F04WXxVHRbOxfD3zyS0crZOlv0JPuCDlj/VOnjDGe+aKlOUyV4uVb+PmSlBGKryiLZvjIclbSw/sA4T9l3Io6AbGaBNZsc3LGbu8DmBbKOuAe8kZgLKVwXo8BMRUB1KjTku3aB2ZjAGtp3NZ2x0gnWEHVz3mcTh3qSXaWHk2+zDcqV3p5Gc/ffuiPf30WbgIjmBOMQjkKLeEDgHqdgju0Mwq3clNtDW1zvamHcqAoT4zyyblxMdyUK6ombcwYpX3GjAI4qZiS+p17KDZIfWM5+j8OmsrBzDYgXP+QITOnWhKMFayvQeyV7EbRvypyk9xCx8JQvfB/mI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(1800799009)(186009)(451199024)(83380400001)(36756003)(2906002)(38100700002)(6506007)(41300700001)(6486002)(2616005)(66476007)(66556008)(6916009)(316002)(66946007)(6512007)(86362001)(26005)(478600001)(44832011)(6666004)(5660300002)(107886003)(8676002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dMaFN5XqH0EhMf8hBGVovPbStfoNimqUv2eObmE6wZf+h74tWThfT6kC0i90?= =?us-ascii?Q?g1X9g8VYajlmVXGrXzLFRjHTrMwmyyU+NRbvBFMD0ou36fViDg0wM8CHO4Oc?= =?us-ascii?Q?AuB5y0howsF348o/WmWS2Z66vOXqRDYUHW2T4ajp0gkAdFC9hEklYn+ykGzl?= =?us-ascii?Q?NfBjtx8DwJ16BKSPwRF1Puk2kz2BSfAmjeUX8xVrO/i7xZfvix5Puepb9R+n?= =?us-ascii?Q?m6+MqatojCiqSbiZHuGH2J/kChimQHR8lCvGT4ocASzM2JEPrpKY1OcoolbC?= =?us-ascii?Q?u+KHViQnCOHSm2rYcM5++LkWcQg+ShJeauxBQaadcZ142TNYjnk854RhRKmc?= =?us-ascii?Q?rWIsQTn/SXDWwbgZpMREZLtRPk/v4DLYzkXCEDfvfR3iBuN8W+EpRM7NQbpV?= =?us-ascii?Q?Sl5DUeSfLJO9Io8nCmuMPTWsJFjYYi6UiuiG+T9kHmgjss3VG4Oh8s3hh+hL?= =?us-ascii?Q?6ejc0t1KoAQcItL/5G4hbkAexPj2zgj1LvO0GoU7EnMl4MQqDVFOYXig7RLO?= =?us-ascii?Q?JEjqrTuNfYDfC7/O91kkyY2JTzoY1V/ZHBZ63xktIDVZebkJEdIeOaNknE4K?= =?us-ascii?Q?K8nBdaHKq4/W7fZ2Cwb3XJForNhQgG159M9hQeHCWkmpQsBJ1cvp+RoetiTJ?= =?us-ascii?Q?zce/vP+XK1tIAvR8tLHx5+Z/cXe8UhRI/EpeBfTXLn66nLHzeLCAA0oO53b2?= =?us-ascii?Q?JfTFlP5O4nB8XUahR5CZOzk9U5A3hjbiK2xN6rzlPXBKOpZsVo36xju52Q5X?= =?us-ascii?Q?GfbVxGWBsIkbCjuBMeNrKQVaOXAFiDtu4jAyGvKPHMMhKweFuKsDzJylPW+0?= =?us-ascii?Q?GpkzEXjdvQbuPg2GH+IAaBSLZ1+8LRMg/WDjxMMt4f6PcBsRXpNDZ9S3mDw2?= =?us-ascii?Q?3+HbPvL8Pmo0AOkKpqKTs9fH/r6wOR5XhTEyUdhSSoVPqR2mPfW7Ivlif6Kn?= =?us-ascii?Q?+pYa+1xmtlw95vSL9qvKZcy7NuNd2lZ3dbwYCHmXYwqJLgEUQtwEKjLC++4t?= =?us-ascii?Q?LbLAFzhst/JWeJiZzKOCKiKXJrHYrxPGuIW59kE5XwJK9O3IoiMJe1ib89VT?= =?us-ascii?Q?RqJMDKWoRx4fluUkprTV/vs7/BWzGqJ+JSdIR/pJmYX2YwX6xsChk7RpiWmc?= =?us-ascii?Q?+biuH+BG6WkXbrRUsliPhytzUilF9qziqwib+x8A0C8ia+tYLj3oTje3VEL6?= =?us-ascii?Q?puiZe26UcaMPWcCwUXXZ7zPKEwXwe1ymfyanf/JBb3kEOcP2mVGOK3+Kd8p7?= =?us-ascii?Q?La8HSQYhUoVIyYT5S9kqhmV7s2S0arWjVejCq0lo0osmABEbeL6bgPHeaPum?= =?us-ascii?Q?JQT5UDnKzfcX8ukyk99Hg7dc2CA9d7yBmKowc2446LTLohrU/mdmRBW+uR6c?= =?us-ascii?Q?iUvOH+iE9vJz9U2QLFuSnlT65LYfdGFRFh61XJd2eTyeDB6SDQfelLBtRrov?= =?us-ascii?Q?8NfjAnGrLaTSM8PGx1caYfY124ADSqOU6Q+yldMi9VyYB9+Km9YGQCbvUtpx?= =?us-ascii?Q?lCrMFylfKicQqC6ezP34ItVsxtywoG4uHUj3cUs+NyBHYzu9tQnM5wMUzXuD?= =?us-ascii?Q?l02uQWguf3JbA1mfUjWhXWZSMh5YDqC0mtYdserf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 822cf576-f960-4782-1151-08dbb8c58a84 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:04:37.8683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iIHQmTIvyvhIFSfOutkxFNznRnJzySW/vGnmwIALAca7/PwyJ0FryTctW3s0IdzQu9zSro77tqNEWuuTjFxklw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7297 Content-Type: text/plain; charset="utf-8" This patch adds userspace PM address entry refcount. Add a new filed 'refcont' in struct mptcp_pm_addr_entry, inited to 1. Increase this counter in mptcp_nl_cmd_sf_create(), and decrease it in mptcp_userspace_pm_delete_local_addr() according the subflows value. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 21 +++++++++++++++------ net/mptcp/protocol.h | 2 ++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 75c08375f6f4..d3846f2e8339 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -70,6 +70,7 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, 1); list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list); msk->pm.local_addr_used++; + refcount_set(&e->refcnt, 1); ret =3D e->addr.id; } else if (match) { ret =3D entry->addr.id; @@ -107,9 +108,12 @@ static int mptcp_userspace_pm_delete_local_addr(struct= mptcp_sock *msk, if (!entry) return -EINVAL; =20 - /* TODO: a refcount is needed because the entry can - * be used multiple times (e.g. fullmesh mode). - */ + if (!refcount_dec_not_one(&entry->refcnt)) { + pr_debug("userspace refcount error: refcnt=3D%d", + refcount_read(&entry->refcnt)); + return -EINVAL; + } + list_del_rcu(&entry->list); kfree(entry); msk->pm.local_addr_used--; @@ -387,10 +391,15 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struc= t genl_info *info) release_sock(sk); =20 spin_lock_bh(&msk->pm.lock); - if (err) + if (err) { mptcp_userspace_pm_delete_local_addr(msk, &local); - else - msk->pm.subflows++; + } else { + struct mptcp_pm_addr_entry *entry; + + entry =3D mptcp_userspace_pm_get_entry(msk, &addr_l); + if (entry && refcount_inc_not_zero(&entry->refcnt)) + msk->pm.subflows++; + } spin_unlock_bh(&msk->pm.lock); =20 create_err: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6ec1d967f22c..7adad41b5c1d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -8,6 +8,7 @@ #define __MPTCP_PROTOCOL_H =20 #include +#include #include #include #include @@ -241,6 +242,7 @@ struct mptcp_pm_addr_entry { u8 flags; int ifindex; struct socket *lsk; + refcount_t refcnt; }; =20 struct mptcp_data_frag { --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2074.outbound.protection.outlook.com [40.107.7.74]) (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 92C3A31A74 for ; Tue, 19 Sep 2023 04:04:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CKxr46i59fTPpgKkjZ6ljClM0f3qBl4wwC2bt5f2nBVq8B3bOD/V919T+lByQ+jbRZSpvuNeV7TGgXRmaxYv8ot3mi9zewD1jCabKpFiY+1iJrsJpiAaDsAvghTWTCWlDkS7iuoYgdeSC6sk1Yk4icSHVR2bWyYcZJch+uIAsi/ev5O9GT2GB74ZeVzf66aC4ls2jNhzggpybUUflP/D4gg6Qki4rti+SZBlAF90Ho9OLAO+PV93106N0j3bxBzVbJdG0H1lD+A2yJmvUnRT22Nin9LJpXy3WzEDxxB2XZc33HNBcPD+hoqpgMwYC7W7yHH8ace6FGA28sLYh5e7AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UWt1G8qJtcNlvR1ojF2/stIP4boXpCPl+SplV82Ys2U=; b=dzPIbumP02tZax6WVMChZ3+BeoRD4ho5EyIL+FiET9C/qdKwPJqmbLTuHOg46geluAz6gLJy+xmdpXCB8oE/D7B65r/n7F92Yy9v8QcOVGnFrCzXLlLh8UUkw+3IoVzLdSFNLg0Qk/gtnqKqnBdwhdZCu8m7oaTi9RPCfKbyvxtLbfxZMMsa9GjZnIVAgKuQSyD0rzjafF4Y5PxiNxQvq26V/kafTJZ+RJvUVGz6uxcfnRN0WhF5yzV9IgRarEx8MQ13qiWd2rc3UIxUVVKeCno9czXDSBYxMtgMtmEMogqvsZva3VTmS07I6bNY7sZuklGyvrlxlCb105QGMuAHTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UWt1G8qJtcNlvR1ojF2/stIP4boXpCPl+SplV82Ys2U=; b=n0J7jsnfTkqiV4ROqkFEVPUU8I5CoqirSNQOeSQqxL7nhC5rA38+dEOIxsscuIprDL86uc3F1VTBR80M8YCbTBiDqPuEvD+H1Atm/vYuJ2W4IXrJQ9miZ7v/cOeI9/OSgV2uqfruLmQ4Gb8ws685IqCsFVDVKa0Evs6TSR6w7IIamoqCo0/cdFAybWvEbXxbYUtN/OExZ7/M9joY38QQcHzfwsrIK8AOY7MsA+Jwn0FRjpA6YXNg8Ralmc2SrdTJjsY89D3ubncH+FTmkIcZeqtfGGvjeVizl++cQQl4A2tusVtqUdpRIc7+Mi2NCKzY3tVoM4/EKPxYjswzsTqPjg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:04:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:04:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 20/30] mptcp: add netlink pm addr entry refcount Date: Tue, 19 Sep 2023 12:02:21 +0800 Message-Id: <9f63b3165770e871595d1bf3f9d78d72a6e2e3ee.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0281.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 63007960-1927-457b-3c1b-08dbb8c5901f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JLfvyX06NgravRQQN/iftg06n41AwXNQmbOj7zbKFWczsFvXbSRFDHv422ilUomoJIwFuoivXFSrOn45zc6TGQEf2Arw/w0o5vwNrFkMeHC4skeOwBQ7Ow7TJkLQinTPQow2w4SBFHjZZsj5ddHIKXvqhLyJ9B2EqokjMpKywUJEe7OULnIerzq30qKn+UhDUXCwulIvAIbBdqKKa5ljgkLJ3wRwu0M05gEQyPXfxz1Wd9tJYu3DCHGUIIOexlxI8YVmLdtVCgFc1GW+kfYorDCc65A/dDlbRfvFtqKKVKDp8ruqavKAxuXg1LB9eZMXfE7a1E4z9A3/8eQkhjc0cnJgwmCfc60LRFcEx+iMvC2C4DPRh8j3K2OJJGjabO6xQRxuNoYFsWlNCyvUjm8CQv2CNQOkNuwClwr5IpZaJhrmSTDkdVhFgMZov/60296qQ5eUD5ijIoMKgXMCyAHWKaZhc4+pFTEiTV/POKd0Kq2v/n5M8pwEElFLKA7J52D2vDUegY91CZjH9h7j/aj2UJTO1RNmWA3OeOLf/wsRVbne7il5IdCSJ+8uOyaijmz4yoMokzkkTWbOecHs72E6qQftC7cn1LGVEfAKp9Qtm6I= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hY7mdHuSQmvFliksYS24Gxebgn7D3GquHB8Poh+09sApRWeNxY8Q3oGsq3h/?= =?us-ascii?Q?dvMrds65KHZPWL4ZmYLPYgTxaHsNt1aFmA1BQ9VMEYveaDsWXbMw/YbNz2q3?= =?us-ascii?Q?fGsYrrzoTMRQvIcfCHarvYChzFv8GTY6cMyhbIKFYVSY7zsNqcklIThJd0UO?= =?us-ascii?Q?OhQbC7YWNi2NNYKWdMj5knVIbocYCK9GqkciaiTOlWPnul3mwbX6Dhi7xCsC?= =?us-ascii?Q?Xq5FIUsABi8D1Zcc0TqK9MfE5z1Y/PAqMpNP/JGx7d7J9xPvGOnAuFgEpDgt?= =?us-ascii?Q?OTkjUCuPWBG6mMJMFxyt3byLHA8rkR+rDg8E+F331eu27feQHwZGHBVfYxfA?= =?us-ascii?Q?zvp4wXB1wGUbSrP3TE6DIZIwc21VPK71J7CiSFcjl/vP2iHMwKcEUPg499Zr?= =?us-ascii?Q?NFH3c0obzUUeVPOKLIfRMb0tbh1IkvBiRUwalgm4Z7U7YubUzC8oTcTOsa0A?= =?us-ascii?Q?WwbTtlh1jYWgFzF60g1VArg6GVjviiFYtR9yE6KJGKRckgCqG5UkKsgCXkFh?= =?us-ascii?Q?qnYp/qYt85n0Leu/kZMIB+M1vRiuI+/E39u/c+7UhRgmuxbTJhPjZbyoJbEv?= =?us-ascii?Q?OQq5UgA2cCB0hUPIx42BImKwlzge4u76W3flTQgazcAdZqY08AgoYGXeHJRY?= =?us-ascii?Q?tKX5PX6B0wwZPr5c5rHhG5mlRnDE85DHJO+RlQD9cGQcB98dSLjU0mmrkdlm?= =?us-ascii?Q?FL+yAKbOXNbUvW9EMK8+pa2mvwXylGlSdKqXkcqiwYYlCYVOCdjdn9AWCd3l?= =?us-ascii?Q?GLcoOYP4BzSttHUvV9A4o5R6saiLYjwcIwpQy/75TNejTRUwofnof6J2m4n5?= =?us-ascii?Q?//SQTQM9783uftMlNjukrEK+GRdFaJQLTwLHZtMe70/n4XiEnu34Ra9Jd/3t?= =?us-ascii?Q?9yXsQHehfHE5TiPkbCz1ClVpGO8c/fSt5G8hBfB+h8r40wPKshS8JtTC8qCx?= =?us-ascii?Q?qE+mX2wciXu8q6xtlXM8rB+V0GStma/upoV+9OSdKjYU2kclOaEZbQCYrC3/?= =?us-ascii?Q?owtttTA0PXhfIjSOql0jpBmqyNktntW8UXYOIKRg7UJuJ0D0zBgF6tVQg/7z?= =?us-ascii?Q?8QkJhU7V7pXeyKg/dLHhNacC8WHs4raycx/z2C44CcRB6bedOGNcKW60ZVVK?= =?us-ascii?Q?hQJYllkbk1qkzXGWOrB9NDSmN396/AFUWM0/F7QPO4m+LoQxe0ic0mp9nf0x?= =?us-ascii?Q?+GPJ7A52OsC9+hSHmXJ4biRDDJz1UoDBsCVxrXWkl1CpBizyr5MQ7Uo2hIGB?= =?us-ascii?Q?AqSE/KE1itw+Jo1UFOFY7h1Ao1loDdjrTPELmBhYdXnou1Nq6cQ7QifwrbZK?= =?us-ascii?Q?R9q9EUEy1vrF/6nIfthns+dpJZ+78cTQLwUaab5iU/GuURCQhP1islkICtPr?= =?us-ascii?Q?uZGde8ZwsKNSlPotXGAUUnBySBx4OKedDtk4xUzRZwACXtSbjAnmUqCgon5Z?= =?us-ascii?Q?WV5M+1ZDGLMlhnZABRMt9VmtxccOjDiBBTuGlnmPP0n+LXiG0ljHp3YoSlh2?= =?us-ascii?Q?/rx6iFnzS3LGE2MpNQ41BNDRAhnOSLUhnEbs68/6eU1ElP9JlFLg4NR1i4Tv?= =?us-ascii?Q?LTTUpbYsbS6TtSE+pPbJoJOKr9IHtTWRHnB7BvHK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63007960-1927-457b-3c1b-08dbb8c5901f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:04:47.2553 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JA/bbBcB+GIWzrg6+V19r5ud6bI70woUhRIWEz4J9uhag6xtAylF5XtjfiAumaQ72us5b+X9zCmymeX18ZNZkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" This patch adds netlink PM address entry refcount. Init 'refcont' of every address entry to 1. And add a new filed 'subflows' in struct mptcp_pm_addr_entry, inited to 0, to store how many subflows have been established on this address entry. Increase both values in mptcp_pm_create_subflow_or_signal_addr() and fill_local_addresses_vec(), and decrease the counter 'refcont' in __mptcp_pm_release_addr_entry() according its 'subflows' value. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 25 ++++++++++++++++++++++--- net/mptcp/protocol.h | 1 + 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 9661f3812682..09e632f72366 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -603,8 +603,12 @@ static void mptcp_pm_create_subflow_or_signal_addr(str= uct mptcp_sock *msk) continue; =20 spin_unlock_bh(&msk->pm.lock); - for (i =3D 0; i < nr; i++) - __mptcp_subflow_connect(sk, &local->addr, &addrs[i]); + for (i =3D 0; i < nr; i++) { + if (refcount_inc_not_zero(&local->refcnt)) { + __mptcp_subflow_connect(sk, &local->addr, &addrs[i]); + local->subflows++; + } + } spin_lock_bh(&msk->pm.lock); } mptcp_pm_nl_check_work_pending(msk); @@ -644,9 +648,11 @@ static unsigned int fill_local_addresses_vec(struct mp= tcp_sock *msk, if (!mptcp_pm_addr_families_match(sk, &entry->addr, remote)) continue; =20 - if (msk->pm.subflows < subflows_max) { + if (msk->pm.subflows < subflows_max && + refcount_inc_not_zero(&entry->refcnt)) { msk->pm.subflows++; addrs[i++] =3D entry->addr; + entry->subflows++; } } rcu_read_unlock(); @@ -895,6 +901,16 @@ static bool address_use_port(struct mptcp_pm_addr_entr= y *entry) /* caller must ensure the RCU grace period is already elapsed */ static void __mptcp_pm_release_addr_entry(struct mptcp_pm_addr_entry *entr= y) { + int i; + + for (i =3D 0; i < entry->subflows; i++) { + if (!refcount_dec_not_one(&entry->refcnt)) { + pr_debug("netlink refcount error: refcnt=3D%d, subflows=3D%d", + refcount_read(&entry->refcnt), entry->subflows); + return; + } + } + if (entry->lsk) sock_release(entry->lsk); kfree(entry); @@ -1087,6 +1103,8 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct mptcp_addr_info *skc entry->ifindex =3D 0; entry->flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; entry->lsk =3D NULL; + entry->subflows =3D 0; + refcount_set(&entry->refcnt, 1); ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); if (ret < 0) kfree(entry); @@ -1337,6 +1355,7 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb,= struct genl_info *info) } =20 *entry =3D addr; + refcount_set(&entry->refcnt, 1); if (entry->addr.port) { ret =3D mptcp_pm_nl_create_listen_socket(skb->sk, entry); if (ret) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7adad41b5c1d..1c31d16a640b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -242,6 +242,7 @@ struct mptcp_pm_addr_entry { u8 flags; int ifindex; struct socket *lsk; + u8 subflows; refcount_t refcnt; }; =20 --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2045.outbound.protection.outlook.com [40.107.7.45]) (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 E322C31A74 for ; Tue, 19 Sep 2023 04:05:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gnk8BAHACqSXxF+FV0Cw6HppbJ2+atAv6vPS+ZusNyVMoMh+V+DNShbGJPheZgQmh2rw5RCI/WnIgPPFVT6tMO1/uXbP0Ri94MIihJf7SNYk/DhVpnqrWCdbyPyVdS43AbEKPnu96dMU3Zk/H/jFjbIfDnNNQ/yu6g5gsDphHrbBZwvhFqcB1dX0ri4RavSJJE5c7eUVmIf0hCW5WPMLsbLkWN1TRqkzZe/Se6T9WBjVxMZm8cau1ogccYEWzNxRuJ0+FdDd3x3c98L1PNnjP+3V3XomYAbq2w2yOm69ZEoxseJYhRcvI8KIWZAd/KCgtR1XOUz9/MKDG4iumtFblg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NapUf4qgKI0NRdY//931ACRYU56EbV92THDEYGdGTH8=; b=b1/j1FpfchVs4hQNt4mMx2t/GRXoecR05iXRruPjoaML7vzJ53/Qw2Ua9g9zY2Po6ymDZcNbo5IlL7pdYCOpAbkc17F5WpAJpPW277qlOVEpvlW+XirjIh6uqu4I8XhX6ZG4u6qOJgfF55Khv8UKSxmJUkbh98WJJjRo7Uu7WjHfgDgnBVRrllXDQTt5SKe07fHC+kDcICSE0OkvvQXgxtlEGptR5+wRgBPivMuA6bjQJsqjMwXh6YJp02HEUesSUinl3Byjaw0OYJwSHChSY7ke5gHksc4Lb0pBVSTTIKMnxB8fz/NnIiLsT0wCBVJCGm5SrH4DLO4vufb8EFhs2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NapUf4qgKI0NRdY//931ACRYU56EbV92THDEYGdGTH8=; b=YpA0KZ+kdYLkbs42No+Hkmye3M/Vwu8IWNY4COU5GIKkLiv0h6jUtGH7hhyqW+B69X/zM7+x1dypOiKdGHg6FSIcjgcYPvzPsBtIqhf1G+Nvh5pMs6ShivchZ69azFElmPeZDlErwVSrvSf/oQlvlql2GxOCuq2h0lIgbWbEnTTE8LNooRURGZ2zGXZVC67d8cSzDZLX958LtObkByZAlwK9k33Cr1CzBmyLxWO+Te5gl/jlYaPYXYa9OBOk4GwHB19HpFrB4qrqp3ZrAqXSxbeKfONy83qi8H5O35tH28f8GSHqMGkqeDNS/iuLOWe5+8AxWhuvOPBkm+PxN83OuQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:04:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:04:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 21/30] selftests: mptcp: add userspace pm fullmesh tests Date: Tue, 19 Sep 2023 12:02:22 +0800 Message-Id: <8629c1ee889d633407e81ae826794c21d76fcac4.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0098.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 1215f7d9-9275-4d01-296f-08dbb8c59708 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 05i9E647cuO/4R4txvDCe+ieHw5ioysm2kp6mfmzL46A8gn7+SE8ieMjj2gp2z3josw16josRopy2+zezYZX2m2uLXOPEaMHJlB5rhbEdhJARxjF/f8ox2R9htlPTsC9Gi1/tWlfLtj8pJK/ZLh6cLxQw7WcDwoVzoXq1w5R7khCdgL2SYulvbyYoM0ybkZfz7FHjgx0ezbrvgEpneXczYvMs1Dhh1QeRktM1QuKxSJTLCmYrO1XOrJJ4VuFeZexlIxUyNbDKxL7Hdv9h+z05ItboANi5qa3OKpLycdrEahXfPjBExYC8AkN5HHAuBncUhdFO9jk90YzLAdZyk6k98BbTe+yyN0Aj4oYngbezZw5P8xd+kE78P4jVF0bV7M8qqU13ytU04IQTTa49cWy1desSyV0kttJEW3V9H1Kg9fXBq5tUNbNDWj0pzh6EjZ2rwRy6TRN9GT65TDErMt3/2H/MH2BM8vSuH6VuwAHDE7z0uLYpVzlG3M01oaho4M8IecHvv+veG5mUpRaTDz9Hcu/Jk9YYiF+CzGFbm/at9gPTbMLWpeAQOIaZt5QSI21oW/I/ejDcphBRdeATXlLCQb4gLePICYGRBgFMLl3Y6s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?t98qaLlNUuQHKRyNsdHOs+1BnLDi+znOPO6Td53TNBAV/rzXifgx1xp9SVH2?= =?us-ascii?Q?bnMdgdIame5lX+DjrkuFRrTerj+asd5uGue28QlfiBkmnKVrxD3lbi5Qr4+1?= =?us-ascii?Q?JEchtJFR+OWAb22Ke2wXLSg/U0wjly19n9mxLVZOelYX0oe/btoAKVEcAtX+?= =?us-ascii?Q?YwfDq0IHIDz4RNXgePhQhmZv2ioIaoT7zJCBb3WaOR/kA7ZvXQraADFN8zf0?= =?us-ascii?Q?vLaf5ocfq6Hpn8GHV5k7irN09AseGZ3df1acW7iDh20k05/9Aunm+X03MzLV?= =?us-ascii?Q?6rlOeQ+FGFiM65Unj+9KizfnQNMGtu4RioZ9e75urkthl7d69JMAGddo5fMY?= =?us-ascii?Q?qQ9G1w8sksRdd6cETc6c4g6KfDoysSNNUiZ53zfWyaqQADW/UPNKsVlOjpDa?= =?us-ascii?Q?jGlXGGALlh0HkGQcMJ/tFs8r9rFZiwLyaEo8SE9q2ZxE81TcRXw0ufZt1Xuy?= =?us-ascii?Q?Wu9NFu7bqd0soeVhw+DNHBcI+Kce75wlL5UV29E/jSpikV/VJ5kwxHypcryx?= =?us-ascii?Q?91iXklECmDTBiP8Tl2sRnGNR25k5qQk22XOsWggjNOqENsHydwWz6d9U4+Cs?= =?us-ascii?Q?8dlblHk2cWlpBoPMA5jjMhG1bq4Ts9y7O7MvyCyg7eYkusyCDt02IQMgNeES?= =?us-ascii?Q?ERnQt2H2hfdwXggkZfCSNVQHKlRj1rlgVYONa7eAxGk54YZ1whEpnvHJ9UbC?= =?us-ascii?Q?9WvODB5WltFiHxt4sBAETJYbdB3ii2xUwnOMFF/6ngK2vQlQYhXG17JNdlNV?= =?us-ascii?Q?Yiv1UMVrm7/9IHZGPDahHtwQAtgHIEbg7rdcECJOIad9CGCymYwh3vDCEfuF?= =?us-ascii?Q?yLqZaIIfJK1M2F5OxFUvzj/hCbS4xdaGW8H/6ncEDxrGuBvX9bFBx8AokrEa?= =?us-ascii?Q?6k64LmP89qaSPn9f8jW2lhrCFRnh5yjk5OXJGb3Wy5sF4LkXsEszhPrrsTtG?= =?us-ascii?Q?RSksM8X//lnxfZmHpZDkfKem/dXCaWaKh87lT9WVkiIHCEWOT9pnDxtGorQM?= =?us-ascii?Q?HRbxpFBfQ5UYc7obUkUfh9+BkgoBksvCaKUnPlASG2YjZr3/Gdky5+JUuBlU?= =?us-ascii?Q?Yjs1w+gOlxXuICO9i2SY24p34PIpU/n4RuHCgqmsOHthFCbq8DDCuRkEb39x?= =?us-ascii?Q?eVMxTA6oB5NlOWypDeNWk21Kh3Jk9iqijaYChECu6iD2PZZJwY/96WrlPqS6?= =?us-ascii?Q?hUgN7KzANzMh03ukwnT59DMsNVlc5XCOzFJuvcKoH3zFjkOaq6VoXNtYeV54?= =?us-ascii?Q?J3T2ULDhp33OjPH+gjCAS4OyqUsbN6Tv5iu+uYEN3f1AuZEaCMzHYCvWyakL?= =?us-ascii?Q?HKb08YX9APXw/7y+IhgpzktJyMGffHz8dAw9dLTfQSlA6pwHLmATTqsO0vIk?= =?us-ascii?Q?UtVp9Qw+9j4H956EXuhR6okpB+lFfJoAWCWVL2+ejnVil7Y4uL/LeMRUurdC?= =?us-ascii?Q?uAevYn59+zUGKij5GU5V7ixPcFDqiu26i+pTeMlDgHVTismcJqgF9oYbaaHG?= =?us-ascii?Q?esoD5mLcnR/qZ+SSIaVkdwVHZ30pzNP0NXoSsbc1EXuHPFxsxKbRG/KCazZz?= =?us-ascii?Q?BD4NCftsN6gDWWbbI5cPoQ9spo9eBjwCZuYENkGc?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1215f7d9-9275-4d01-296f-08dbb8c59708 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:04:58.8474 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C+ccABg0qIhxNe3hadxJGF7aZEfHwTQy1d6lo/Ad4+W+JmEHvh7ZGgVQtoQDmCax+g8Na5LxlCEZEgspSGr8cA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" This patch adds fullmesh selftests for userspace pm both on server side and on client side. For the server side test, add two endpoints with fullmesh flag on ns2, then signal an address on ns1 by userspace PM to trigger the fullmesh connections. For the client side test, just use userspace PM to create multiple subflows to do the fullmesh connections. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index aac50ef86785..d883c6c2426b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3532,6 +3532,46 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm server fullmesh + if reset_with_events "userspace pm server fullmesh" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 5 5 + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_addr $ns1 10.0.2.1 10 + chk_join_nr 4 4 4 + chk_add_nr 1 1 + chk_mptcp_info subflows 4 subflows 4 + chk_subflows_total 5 5 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 + mptcp_lib_evts_kill + wait $tests_pid + fi + + # userspace pm client fullmesh + if reset_with_events "userspace pm client fullmesh" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + pm_nl_set_limits $ns1 5 5 + set_userspace_pm $ns2 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_sf $ns2 10.0.2.2 20 + userspace_pm_add_sf $ns2 10.0.3.2 30 + userspace_pm_add_sf $ns2 10.0.4.2 40 + chk_join_nr 3 3 3 + chk_mptcp_info subflows 3 subflows 3 + chk_subflows_total 4 4 + mptcp_lib_evts_kill + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2052.outbound.protection.outlook.com [40.107.7.52]) (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 7D55E31A74 for ; Tue, 19 Sep 2023 04:05:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bm9pUCa5tLGWO7QYfT9QWQdNbEscbTWeQ2EitH76svSfoWqHgumjqme0pmYCNZPkn41iz+zLkBPFDH9ZMYYRb7aQ2GlBRZV76qrTZ5xXSn0y1cP34joPsdsR5eG6RUYwjMw2G/I2nfz44pv5ExOTSz0+ShAb9JBFEQCH1bq8m+V6cbfuIcMns9ZEDQc7brave+Zna2b9Gva6AjgVTFpiHNBYY15Of1CKEv4ZO+CKDsuQNpvTPFifx/VimBcxLntV+CZ4OQlqwdfcWz8LePIyQkYfSm8hjdK1MAecuhaWst9RpXHXWHQSnnTKRi+Pj+zP6s+6MD7Yf+B5K/cZUg1nfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6wYLGyGAoYo7LK1fEPe6VfElrhuOCAPZq92AjlOF54M=; b=GEUnYQdYgWw/dp0S39v3CXZnLQJhry2+M6C5kl5bEIhkD2n6m1G+19iJDFsthtfe8cZuOkjN3l+S3K8JN+4XAevuYY9xLf2x67Ydlw7CG41h5Pepjd5fhjD9buBdjS3SPR3bKWNl4vjKMeQ2068F5VKgizysju3ViW8CcR3maxNOait28eytr+9lpsCLJ7/fJndA1oiodWFne9TaNPMLeg3LR2neLlmCpaqxGclk3WDDJnuViyKPYXHultSVSehlxUeygB5bMyIpsj4KK8ZUfE2xfStVbCQUOOEU3PpHdeSkCkGKn3Wp0jG9EnsxPM8qo8iZREa8pCBEn0qhZckfPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6wYLGyGAoYo7LK1fEPe6VfElrhuOCAPZq92AjlOF54M=; b=4EGzj4HLEWH9THZK6chqqogmL/DAhPyQ531mSCJMHvQGKXtrkFoLG7H8emrzI7Qe3nF8K12Nzm7ZT8zuj2juAcT6U1cf+seRdAySwaxZOWos4OPSE4L5cBem2AC/ACeTBYcUW96F0Pf+8kVw3H+kYEgRR/NPkztnizDHwBvofu+FpaNmtl5LFg1dEg9P0WERdiCNabZGdbnDLv40FmT0iVwwtANxmXY6Mr/VLn1BHzfVkK0AsdQ3ybYBTlMGWfUdKn/PsmEU6t0nfndi0mtWiJGnAIhVDU6W+U5xcWJrYWOHuarqovcuQbNx02XW3ULV9udSJBUwviIF3+0D/aOIvA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:05:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:05:11 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 22/30] selftests: mptcp: add mptcp_lib_kill_wait Date: Tue, 19 Sep 2023 12:02:23 +0800 Message-Id: <29407317f5a4783723e49d06131471a94d23e720.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0096.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::12) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 9be3daa4-c689-439d-a5fd-08dbb8c59ec7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BpjwkOqNUUciYFAFZZsO7fOfUH8HliuYNC+3Jypikjx2kQxb+L38LHH1r0x2b4j7kb1hP90UMs0aRk9v+xSqvptWATtzNzllmmgsCDWD8VqKPMycAInUbI6WlILXTWbc5RhavrR0a6WmCxRov20TcQs9Eo4j2tgUkzWzyx/SwyROmMksH9jIprprWnr1yPLxdW9p2kgfBs33OM0y1ldCaJqL80EXeOSRswXHct7wgOwK3h1u/QVAcUKnA+J7WrhjHM3Fb7eDdyDLb/IwS3npDWnmFbdEpCIzN3eJRf98Qd1Dz0P7Vc3Pa7MSKBm5fKYgvwqLGay4DTtvil26X0qks8UMhkUVE0/rO6nfnImmxKI59eJ5QOBeqG3k5m7mcJ9LVELA7trc4UvqziOFSVPv5X654fe3E/vGW4irtwKzr98GZ/DRVQwayJdYPRj2M9Ide0Eet89r01YOWYSoibm2syQZNWWxnJ/aPrXvy1CTOOjI+vkm0r21Xy90pG17j+gni5a+Jy6r8ir5Fcy11AsL/tPNCbsvW4CiN62AQ5MI8X6ZmSRUhMA0TyBN16mTm0O9uKZuYRs6d+HGWtH9QASLYfDW3lqYs9+qsZhNAdONsRc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zZ4GdhnkXgDFCpzZjkNLc+2+RHn0BIrNH4MttJCtRyU3Cr53hMmAMCFZNf4L?= =?us-ascii?Q?Xe73hskpzS7n55hnACMD9GUgO9A5fsmoj6M06TskNTz1ObONhDsl/iYfjdIO?= =?us-ascii?Q?JgJnuybF2tMNQnN3tjikXEiVJ9qbsGiRF8KLVFNmBTporFuvzNMctc2+QYdS?= =?us-ascii?Q?9lNtMrsKF28NOzfcaeYpdhKh8jGLH8dydxvrlAXsLTqjc2Jt9MPxFjXFD25e?= =?us-ascii?Q?gXFd44JuzOkBr5bwyNDbjaca81PeeQXuIIvcC2+aspBV7MikPnab8HTBB35e?= =?us-ascii?Q?5cGE1CNXMmhOltnONPnW1vpvAF8A7rgivqGh75yHqVaLiZ/FAojIer+zUcNs?= =?us-ascii?Q?GShijyeU3EzDAiF5knSm0VW2+u8XFBaiDTICJ/GygPfWGZBEqLQyGbKifNCk?= =?us-ascii?Q?v8+DH1J0OwCNpOuVsa7tGHRgF9kaDKiHk8k0x8Mdtx7RAVG+AExQAnr0Vea2?= =?us-ascii?Q?RCIAz/v7nK/tQCY5d4xTURZKDzC9QS0KKR9mxem3rE2O02gGPOGqtdKXZvFg?= =?us-ascii?Q?oU+V5ZvGVbSuHpRTKM69h7mYOlV+XPh/sgZB5UpABrMm1ElzPVYuC7QyyLf6?= =?us-ascii?Q?0CV/RFNY0SAhUPBdT+AemlScR3S3wdOaxWKSqm/lp5UKhy34sTTaCTems2g2?= =?us-ascii?Q?y06kzUtoVOH/BMali63AeGKT84euLJz2V8ogqgH0fhgzhDW7m6W2HoUeWhqI?= =?us-ascii?Q?S/VEGtiunbMoWKi1PvGAuger9IwA2n1RbN/eS2CWLAyoIqJs6x33cdDTktvM?= =?us-ascii?Q?w/TLYbTWVSoNN3MURxadTff8KSynGuTUHFBGQUbrI7i6ws7rK0W92OR2yPbU?= =?us-ascii?Q?byROhNvcQ2ro2shwYSOVxE3At+yL0C2iEyJi3unhgiNRT3Ck+pxTIeA9Nu51?= =?us-ascii?Q?HXfmt9f06q+t5h4wmafCqPNQhUuj+bOUcAVDG3mzYbIcK0xIVnFyqS0+z+hl?= =?us-ascii?Q?nYVIc5gUOeABcDosxgeu/1aRhHlHA0prB8CREdfdjRB4Wh4nIwbxSPNBbOEm?= =?us-ascii?Q?1ef3SH8fX6ifeOWZa9hsz4y2TAh1Qp2zr1wKNjdJsk/z+HIJBCCnd7eadonR?= =?us-ascii?Q?eLEpzVBBgaRDyU9NwJplsO7H4CAkc/JRfRxDdYhKO8eLBEKvfshWfyc68wux?= =?us-ascii?Q?+p+nwChXV4xjXwboaveHKzEXAVLRCUlExzNOsL+Z5p29wN9NTBCSkFX/SzjU?= =?us-ascii?Q?L+bOPcYsJuf2bF1JPvWHjw3tyFcJSm+NXgAh1CvGXpJadTRj4tTxuxKRBcx3?= =?us-ascii?Q?73WHs1IBQPagSmHV0JE3rudvTnD4jDT8AQzSpm7YExZAX6PIeXHVQLojSiW3?= =?us-ascii?Q?iXt+yLfoQgqcJ+uraDNNHclv9K5PXsnVFVsh0gSMUsvlAOBeV+RpBrNnDsG6?= =?us-ascii?Q?6LhSA95pw32vHiVxtogDskALgh6dJrvseZKdTCp/rPFM6kyVJHQNX02dGPmB?= =?us-ascii?Q?YlRL2MHNk6H4LkCCr4Qddky/KrK79Yth26Wnkq6PYFqwojYV9cIqo192KiT/?= =?us-ascii?Q?Er1PfjjSdt8EqVrM73GLbMjEYjX/HYJBUY2dBMkQxm4ogZtu4GcQIP843+Md?= =?us-ascii?Q?uYIR7L5tmeMNZwblPl6DYiV9tJ6Ua4S4dopYgJ/T?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be3daa4-c689-439d-a5fd-08dbb8c59ec7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:05:11.8323 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xjMiEi42bN/4Fp74U2szAgHQntdhzthFWi2VDxccYb0YwhaGPr7v+mpcJHCsovK/R4gVMfTQmkZ2G0qrzCIjkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" Export kill_wait() helper in userspace_pm.sh into mptcp_lib.sh and rename it as mptcp_lib_kill_wait(). It can be used to instead of kill_wait() in mptcp_join.sh. Use the new helper in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 10 ++---- .../testing/selftests/net/mptcp/mptcp_lib.sh | 8 +++++ .../selftests/net/mptcp/userspace_pm.sh | 31 +++++++------------ 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d883c6c2426b..f335a782c793 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -682,16 +682,10 @@ wait_mpj() done } =20 -kill_wait() -{ - kill $1 > /dev/null 2>&1 - wait $1 2>/dev/null -} - kill_events_pids() { - kill_wait $evts_ns1_pid - kill_wait $evts_ns2_pid + mptcp_lib_kill_wait $evts_ns1_pid + mptcp_lib_kill_wait $evts_ns2_pid } =20 kill_tests_wait() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index bb95dd967eb3..8051ac5507dc 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -219,3 +219,11 @@ mptcp_lib_get_info_value() { mptcp_lib_evts_get_info() { cat "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1}," } + +mptcp_lib_kill_wait() { + [ $1 -eq 0 ] && return 0 + + kill -SIGUSR1 $1 > /dev/null 2>&1 + kill $1 > /dev/null 2>&1 + wait $1 2>/dev/null +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 283c62deb628..7cddf793950a 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -107,15 +107,6 @@ test_fail() mptcp_lib_result_fail "${test_name}" } =20 -kill_wait() -{ - [ $1 -eq 0 ] && return 0 - - kill -SIGUSR1 $1 > /dev/null 2>&1 - kill $1 > /dev/null 2>&1 - wait $1 2>/dev/null -} - # This function is used in the cleanup trap #shellcheck disable=3DSC2317 cleanup() @@ -127,7 +118,7 @@ cleanup() for pid in $client4_pid $server4_pid $client6_pid $server6_pid\ $server_evts_pid $client_evts_pid do - kill_wait $pid + mptcp_lib_kill_wait $pid done =20 local netns @@ -209,7 +200,7 @@ make_connection() fi :>"$client_evts" if [ $client_evts_pid -ne 0 ]; then - kill_wait $client_evts_pid + mptcp_lib_kill_wait $client_evts_pid fi ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & client_evts_pid=3D$! @@ -218,7 +209,7 @@ make_connection() fi :>"$server_evts" if [ $server_evts_pid -ne 0 ]; then - kill_wait $server_evts_pid + mptcp_lib_kill_wait $server_evts_pid fi ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & server_evts_pid=3D$! @@ -623,7 +614,7 @@ test_subflows() "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 local sport sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) @@ -662,7 +653,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 @@ -701,7 +692,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 @@ -739,7 +730,7 @@ test_subflows() "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 @@ -778,7 +769,7 @@ test_subflows() "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 @@ -815,7 +806,7 @@ test_subflows() "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "= ns1" =20 # Delete the listener from the server ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 @@ -861,7 +852,7 @@ test_subflows_v4_v6_mix() "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 @@ -973,7 +964,7 @@ test_listener() sleep 0.5 =20 # Delete the listener from the client ns, if one was created - kill_wait $listener_pid + mptcp_lib_kill_wait $listener_pid =20 sleep 0.5 verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $c= lient4_port --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2040.outbound.protection.outlook.com [40.107.105.40]) (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 0997331A74 for ; Tue, 19 Sep 2023 04:05:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BtlkPz+cxKkODdTWvrM0nMPl7YpXmgvHEQpfJU/NpPZ9gvbYMRzU1dK6VGd/ymYHT/jwmu9m+NWDEAPCXXR3KbfE57JBYdf9b/qxqRW+pkjeTY3CzAeFnOkyzIRY0x/yy+zKkVnUxEGfAFHS9mN7517nZ5TtDTjyi+GIt+K0XybjwhKEkFdZIESrrRBEti1UbcykZcOiIIMdPibPnpji7fXG4IJBS0OmI4o7XLTnigdfDsZPthEv/5+SmOlmtY+FuzodQd9kAEvhEgeImPFA51zIMvc+ThN9hSba6SheTa7i5xKRg43spoMhQeQq19VjewGMTWQuIZZ8u+X07a2Cyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZiF11NXyb+/eq2Fr+9urODFByr5oasUBA34WB/Dj9Pc=; b=WM/sjGijpXMNXUb8EL6S4tDxxA9JkD6OSe0zfHYkcn5CrWojAGEUHzmcb8nnhseylLgFKCO+Dcbri3SaJ17oPmeUbhtYt/UP5trpFUpbOyeJegXztQ7BFyCPByuGqT0FKyEekXKNNOpNYoFkGKXkmenyAYlfdG8qV7CBnJl41B1ku2qC3B1qill+K0gOS7sVQMjjZA4kZYppH0bU04MTqLM4xCPVx6Z58ndRmKuMu+IwDUIQNv7IS3bpDQ24AIr6WGGPcscQJnJVpjEIIwd1erXpb39us1x9fKmrB5Eqa0fPVyKxqniQjg7v+8BZL6LYxLaajD0Zk8Ee01pv2XRz9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZiF11NXyb+/eq2Fr+9urODFByr5oasUBA34WB/Dj9Pc=; b=ylNLXUb8CIKTubiI0QtRLKFl9zjrPefpQD2XtKSkZX3oGHNJ/kJPA1Bga6tuXUkixoYynoE6NaCNho3LvC0RBkppgkHSdLc2LItOA3tii95+WbBU4ITSMfpHJZYRCxM8SRENCirWxTRd7z6CWcghcBWVI3dyyliUK91LcrzMUSXps9IVyUVoh0J307SOgL+bmvUaP3qbZjq9CuMNYcU7yjqxR924h6KAgyAqUJ2gvUD9PVYL5iPdRQrNXptF38tda4IPHBItEuReAHJR6zq+/eoBCS9ZWAzNlY645Gn7a1NK9nR+mgiQDIetUBOypU+SlkUYPYNjdDG9zK7aCjtL9w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:05:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:05:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 23/30] selftests: mptcp: add mptcp_lib_evts_* Date: Tue, 19 Sep 2023 12:02:24 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0199.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:385::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b52d233-9925-46e9-80d5-08dbb8c5a59d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GLQffilxdMQtQCMjvxafjuXsiBzQEHCFW7dw7APU6y7yd+mckc/KQzKklp4WqwXscQguqsruZDxWA4RxGUSJNwufJkk8u1mtPVKIWSFGSG+vZ67aqFRi23dj+2crKf0M6q6/nF6tnEluEuocZbT6CQ0am0Mmo2BEw0xCTYxZRDjupcQjdh63LZ9GXUnshs9F73LDnF2lp3+AsuuTLCG6xyKhSew1r31hlx+blL+8ijjDkhZQvs2CQboMyD7W0Ijj8uT0aOUxOtHRREdpzxbSNQ4jGA/XGKm/uX+f7tPNl/8UrU0a5Uz9FkCpM1klEDVyusdhacpWLymMM/fj5cF5+tCLGqcoHts+5I8ZfHiNTSeCmxTG8cbnm0pcLmtghIo9/6WtSyyFyGqzuCq6Y1HKR94wUSCrE9vde7W/AsSeCJogNRXFMDSs1WobYPoAhjRaF1uPftQsmGw8mtm0qRqy9jL1foVqKj3V/FC5tyPY4ec9WFg/51++L3y2HTDnl41tQ7LMDf/q+u61BTXaloYpmqg05XmAB/7ZcNogpNAEGoYZPMMuPDRgwGsxHmWu/TTb1VMvVQ1FK7uGuxBDYRN4gsEgmmPRzljka870QAg5hVg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Um41BDhpFkUQubjSPSpldWFF1brDiON2IKq2RgiWz36YTE5h4vhkDRPk4JCC?= =?us-ascii?Q?j9V+V3+WhQ6WpQTyMG+tZbBqgx5xuijoPfDXC1c1qyLj1s8jNDqk2uP2hJyr?= =?us-ascii?Q?ekL15ZQ4phgYPMQ8TYR9UQN5t9XM8xMcMZWAeXkMxnGjUVMogy/iPGlbDNLt?= =?us-ascii?Q?dapcdycmlm3y3lWjm7dnFQi4sw+7lEO5ZB9VzkNkENLOTyNJXjj2rR4Dqd43?= =?us-ascii?Q?Lc2vZmqgPo4D3ycfymZszX4yeCgPCN+cbZfGkg+OhIRrrv589foKWBqBBZVt?= =?us-ascii?Q?baIYtJwMurrvsVDqaY9ubKajZ3Db21Kj27Gl8IwaSQaFBXKpZEqLRX/ThV5x?= =?us-ascii?Q?yOWwoi3Zn7Kp/JfIPkFG5XuRrzr2vMvSaBumj9y+t/CJqH5o9vnCShDMcdwf?= =?us-ascii?Q?HcA4Als/7NxLgvtDE/RajE9h8kb8UmStqrk9wMmEo3yTaoccYJuS3ThBnKz/?= =?us-ascii?Q?CHNUVhkptPQcTw27Ba+zOZrDgFOsbodEl3h5/10vj9RQLrWeiwqpjv6/iROM?= =?us-ascii?Q?p1mj22PQ/so1DU3uKK86z3Nh1///mdmxGWxWsWX5qIQ/8JbYQthtEXQaphHv?= =?us-ascii?Q?geI2TSkoqZ+N2kyuEB/gwG8B8vyIMa1+KCKwLyVawhOCNIHTtj0ncZFb6OC+?= =?us-ascii?Q?NyiDiBKhz2Mw4aBwI4CiYIsz4CbjwDTu6RGHCKWaZszkN6OwXAvcjqFowwul?= =?us-ascii?Q?Ut9WfhJScr30WHK4+vBw0PLByYRS96hK/alo0C/tMRs+/iVTgkWiF54ifN8h?= =?us-ascii?Q?EJuq/5uo7VRltmYenWpFPqczG+DmS+mrjEC3a2HGeeRRCwOHaTkSjNUHf0Jt?= =?us-ascii?Q?/04LHv6QLYprYRgU86zZ8BbB2ERof6CymDBX+3KIQW8qw0wMQRsm2DZANu7a?= =?us-ascii?Q?nWnOmIF3WtrtnBCLGTR24HVRO9It4d1freX7lYooutO85m5UWqrGEwNA1vj/?= =?us-ascii?Q?W4HAiFZuuQ+x/tkr/fy+QgcErFWYa4u5r7FAUmZnrLj5a8Wmwky/JibjZP3x?= =?us-ascii?Q?RnyP2xZJWN3e98AJAAjq0R/YoHRusZyUP5arIo0jm+PMnL2JZXWkYZgFV1VM?= =?us-ascii?Q?2VEa3gjABg9GQsYhZw3ZhcjX3cxS6bQJNWZ4X2YtPctj/9x3yleNSTK1+BY1?= =?us-ascii?Q?lzGyci8bWkeam2mEPpReNOeXqu8+zQj1zSkf5qEG83V8aV5Nvu34F836pU7w?= =?us-ascii?Q?0IspK9Ewu5zHV2BEtKZMJ4yikaW+6Lh/Ka40gLgY7aZzUTPBfJ0amh76hOOE?= =?us-ascii?Q?BqxgqrPGGMJa6TAHC5rF9A5ZplovH2LNyv9jJEMou+NzT8HB8aOLL49gDxtZ?= =?us-ascii?Q?ccIXmgI+J531AZzvhiXlFQWWhp7Nvk+kNjraPoCwzAcIxkzBVItNq6OqmhxM?= =?us-ascii?Q?ISTP9uD1V7+4luqErHr3gJ+ukunxfCeLfV5GrGGXT/TynlxG6SXP+bH4X0sk?= =?us-ascii?Q?NqCtHLedBhQEc3PH9GpFUJhBQ5AY+CAJFmIw3l7S4ILDqpIdos+0umGoZZTL?= =?us-ascii?Q?rZzXxT/jAyBmuhEcJqbwaFFC8htbsj3mgmPtZcVeQA/iSMaoicuGTHFgnAFa?= =?us-ascii?Q?2nRe2OKPDbrf1hw3ccq9AqpesI8nJQRxKzJRnwAZ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b52d233-9925-46e9-80d5-08dbb8c5a59d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:05:23.2937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iL7TdkaTdqz61mPU3LZNuZyZr1oB+7IAoi4S+f4UhmmksvZ1FSPuK23zxIzwlIW8d7EFfc4/PwTkHR0ffXMqKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" This patch unifies "pm_nl_ctl events" related code in userspace_pm.sh and mptcp_join.sh into four functions: _init, _start, _kill and _remove. Define them in mptcp_lib.sh and use these new helper in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 54 +++++++------------ .../testing/selftests/net/mptcp/mptcp_lib.sh | 40 ++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 31 +++-------- 3 files changed, 65 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f335a782c793..8c708b92a942 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -35,10 +35,6 @@ ip_mptcp=3D0 check_invert=3D0 validate_checksum=3D0 init=3D0 -evts_ns1=3D"" -evts_ns2=3D"" -evts_ns1_pid=3D0 -evts_ns2_pid=3D0 last_test_failed=3D0 last_test_skipped=3D0 last_test_ignored=3D1 @@ -182,8 +178,7 @@ init() { cin=3D$(mktemp) cinsent=3D$(mktemp) cout=3D$(mktemp) - evts_ns1=3D$(mktemp) - evts_ns2=3D$(mktemp) + mptcp_lib_evts_init =20 trap cleanup EXIT =20 @@ -196,7 +191,7 @@ cleanup() rm -f "$cin" "$cout" "$sinfail" rm -f "$sin" "$sout" "$cinsent" "$cinfail" rm -f "$tmpfile" - rm -rf $evts_ns1 $evts_ns2 + mptcp_lib_evts_remove cleanup_partial } =20 @@ -460,12 +455,7 @@ reset_with_events() { reset "${1}" || return 1 =20 - :> "$evts_ns1" - :> "$evts_ns2" - ip netns exec $ns1 ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & - evts_ns1_pid=3D$! - ip netns exec $ns2 ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & - evts_ns2_pid=3D$! + mptcp_lib_evts_start } =20 reset_with_tcp_filter() @@ -682,12 +672,6 @@ wait_mpj() done } =20 -kill_events_pids() -{ - mptcp_lib_kill_wait $evts_ns1_pid - mptcp_lib_kill_wait $evts_ns2_pid -} - kill_tests_wait() { #shellcheck disable=3DSC2046 @@ -2907,9 +2891,9 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 101= 00 - verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100 - kill_events_pids + verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 = 10100 + verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 1= 0100 + mptcp_lib_evts_kill fi =20 # subflow and signal with port, remove @@ -3282,10 +3266,10 @@ fail_tests() # $1: ns ; $2: addr ; $3: id userspace_pm_add_addr() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 ip netns exec $1 ./pm_nl_ctl ann $2 token $tk id $3 @@ -3295,10 +3279,10 @@ userspace_pm_add_addr() # $1: ns ; $2: id userspace_pm_rm_addr() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 ip netns exec $1 ./pm_nl_ctl rem token $tk id $2 @@ -3308,10 +3292,10 @@ userspace_pm_rm_addr() # $1: ns ; $2: addr ; $3: id userspace_pm_add_sf() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk da dp =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info daddr4 "$evts") dp=3D$(mptcp_lib_evts_get_info dport "$evts") @@ -3324,12 +3308,12 @@ userspace_pm_add_sf() # $1: ns ; $2: addr $3: event type userspace_pm_rm_sf() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local t=3D${3:-1} local ip=3D4 local tk da dp sp =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts if is_v6 $2; then ip=3D6; fi tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) @@ -3436,7 +3420,7 @@ userspace_tests() chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3458,7 +3442,7 @@ userspace_tests() chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3477,7 +3461,7 @@ userspace_tests() chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3499,7 +3483,7 @@ userspace_tests() chk_rst_nr 1 1 invert chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3523,7 +3507,7 @@ userspace_tests() chk_rst_nr 1 1 invert chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 8051ac5507dc..899c21ced5a3 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -220,6 +220,11 @@ mptcp_lib_evts_get_info() { cat "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1}," } =20 +server_evts=3D"" +client_evts=3D"" +server_evts_pid=3D0 +client_evts_pid=3D0 + mptcp_lib_kill_wait() { [ $1 -eq 0 ] && return 0 =20 @@ -227,3 +232,38 @@ mptcp_lib_kill_wait() { kill $1 > /dev/null 2>&1 wait $1 2>/dev/null } + +mptcp_lib_evts_init() { + if [ -z "$server_evts" ]; then + server_evts=3D$(mktemp) + fi + if [ -z "$client_evts" ]; then + client_evts=3D$(mktemp) + fi +} + +mptcp_lib_evts_start() { + :>"$server_evts" + :>"$client_evts" + + if [ $server_evts_pid -ne 0 ]; then + mptcp_lib_kill_wait $server_evts_pid + fi + ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & + server_evts_pid=3D$! + + if [ $client_evts_pid -ne 0 ]; then + mptcp_lib_kill_wait $client_evts_pid + fi + ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & + client_evts_pid=3D$! +} + +mptcp_lib_evts_kill() { + mptcp_lib_kill_wait $server_evts_pid + mptcp_lib_kill_wait $client_evts_pid +} + +mptcp_lib_evts_remove() { + rm -rf $server_evts $client_evts +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 7cddf793950a..640273d4d7a1 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -33,10 +33,6 @@ AF_INET=3D2 AF_INET6=3D10 =20 file=3D"" -server_evts=3D"" -client_evts=3D"" -server_evts_pid=3D0 -client_evts_pid=3D0 client4_pid=3D0 server4_pid=3D0 client6_pid=3D0 @@ -115,18 +111,19 @@ cleanup() =20 # Terminate the MPTCP connection and related processes local pid - for pid in $client4_pid $server4_pid $client6_pid $server6_pid\ - $server_evts_pid $client_evts_pid + for pid in $client4_pid $server4_pid $client6_pid $server6_pid do mptcp_lib_kill_wait $pid done + mptcp_lib_evts_kill =20 local netns for netns in "$ns1" "$ns2" ;do ip netns del "$netns" done =20 - rm -rf $file $client_evts $server_evts + rm -rf $file + mptcp_lib_evts_remove =20 _printf "Done\n" } @@ -195,24 +192,8 @@ make_connection() =20 # Capture netlink events over the two network namespaces running # the MPTCP client and server - if [ -z "$client_evts" ]; then - client_evts=3D$(mktemp) - fi - :>"$client_evts" - if [ $client_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $client_evts_pid - fi - ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & - client_evts_pid=3D$! - if [ -z "$server_evts" ]; then - server_evts=3D$(mktemp) - fi - :>"$server_evts" - if [ $server_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $server_evts_pid - fi - ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & - server_evts_pid=3D$! + mptcp_lib_evts_init + mptcp_lib_evts_start sleep 0.5 =20 # Run the server --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) (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 467E931A74 for ; Tue, 19 Sep 2023 04:05:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dzD0VdW3iYAXbooktOg5BEK0ADaVFyBTwa202b5hkgQM4G10/4QnRt6diEJcg8kERJambZsyf4wjcmfkoOOx2edn3Fo4EjgCrDtj/ywnMy0NFxz9I4BaMBuPyOeQZqk8CT9PfQXTIkE3HbfJ0vmDFfokgk4lV/otXmUb3tyeSXmWN3VeaPJ4rba3MJExsmZfIQsVi2KKVRzSdAjRLU5AWhrj6I78rtgNI0kGk79a23PY7TxvGWzyLh+bBXK+o1xY18n9yWxjvNRjS7ogX3Vbc9M1fIyVXRjhmck6TVmHorE4y5ARNR608nJG/DxsevFRYLU3Q+FbiODBgBDwOWDrpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DJMYVcUnJHOmrvVRb6sHxKxtGacHjISedN79M97i4GQ=; b=CWFHd5yXj2lNqOUgCgExhcHVpiC4a/RBzCy+C+lhyoDrch2xo39F5Gg5KvnjYt6/0Y0mPlLL/23zyAXwALGXxx0+pGrlSp4SafieS58RPGSlWIW5hj91rN7oFj7buVkLcNiXeu6oA4Koc20tIbskVWxIulg9ZRYMBpWUxFFMcV31g90Zd+uVdRRw+XX+Xix3EuIaFbtPNXffZittwFrTRiPP8gFDFgNGAsqTpYKoZpU5796YHK4ykQBPGg0fHOOZlgubG5hc68xyj8XXEbreZHgLA3ikhrWokZmINfrpfh2SUNvCHRtXgNKoB3XrxwkMQItqjmxR4Nzm9cy7NEcMVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DJMYVcUnJHOmrvVRb6sHxKxtGacHjISedN79M97i4GQ=; b=MGVu+MrHXKNrp90NsLQ577LimXK/8XDvgoyYd5l8gGPfaJD07GLuBK0RCpJC94Vw9uPbvDXxAQyXT0C5hX8Xbb0ktvXlZroQmJ44ohI5JPE0UnyqLtg4lsRqA/tc0P7sBSlxMKgN1faiYTOwKpfJElq14HZJ43WNpgm2PJ0A5jAWWzdgtKFZ3W8ubsmG8aJW5joE2mvPZKrkKWP1yvklnbaUNBBP7I3ff7rUKC6mAMGf9QVXZawud5hd4nEpFNOz5heXoI4ymFfmRwAP/GuSZ3dX8d/A5aKDK295AsxNTaxfJEw0HgjBLToAimVs5ewUM8X8ch0NTT8gGeqe1mikAQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:05:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:05:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 24/30] selftests: mptcp: userspace: print colored results Date: Tue, 19 Sep 2023 12:02:25 +0800 Message-Id: <66e8a3500531957615465f72908545dbf98ccf82.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0009.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::7) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 94680c5d-f95f-4663-a35d-08dbb8c5acde X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ia6blU0IFB1w1OGuikPWn/NUZQR574naY3/htgtykvC/syI3Jw537p5OerHNHmYl4LIP3Gti8Av/1pp1muXKLBgualZQ3pHx5WB+pfmHAN0pYn7Qu+i1CiPNc7b47o21U9ZYJao1pnZ8QagD50rnhk8OAbo/VJnL7wSfYzfCZ9nFnBlwlbJQ4Io9XsZYJIT7GDwKlDrKXsAjfkVbf1aqcmzqsD+bkupJkkOj1RV9arV9TMeJUhKmBJePHbqK89yLVqwmaj+QpoH3CtQ+YmwY/hLXVGwebHrxhzmc8UnfWBlYRvGHpTtZ+PJxlUPxUizKskHZffsbZyY6eiwRvlfQg4rlENtnzHW0SWKS9sGpcBqMOw3BOiKueU+1auaW5zd6YI5b3xS/cIw+XyZwWc8ydOzd7wegaHgm9hhwGB8UAitTwR97BYHVV8NFWHT6ZWrA+Obho6zcOsqYbtO+t8WaUB9jbUB2X89ZbGQlU6szOobzxbTJRRxIZXkCvWgLrF+rxZ/vAJafbOmV5UkV2Rkrbnl1o7Vfh6b23SknN1ShyaEKChFmh8YMe1Kh7OS7wrIXPbOygbIu8f+3jE3JKghcjW2xuoMq537H4LS6bX9cZSc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RGmUU8qjxrI3sqx6FZoBtmm/HMYw4706u6h1O4hj53yv/DjUluWDjeaF6sfJ?= =?us-ascii?Q?5FqSjMgX0XQ1Xd+6htzWvWslX8EUnkIrpB1sdOJU8g/wXIUfeWDeqjTX5hTR?= =?us-ascii?Q?55a6LPqLotRKZZUgLsxoO6KAPpvm5tcvrc4ceEgxFTLciZH5mXFNBWK04J8p?= =?us-ascii?Q?NW5NG/ATja0t+bIg38eSbasuqPy/VARvlTrNLFrUrvNfIIeBP/gG15sMfJG9?= =?us-ascii?Q?AWS9gUUFMmLq04RlaTRXtS4Eh5C0rpmrJtXm12H1SRd12nWfAOzaxNsnrtl3?= =?us-ascii?Q?IGvkh2Gksp8F3565c79L4+GYdUJiryCcNbqIYVGGnYdIbdWji/WJhZGV5ZAY?= =?us-ascii?Q?Xz6rK8+A9r5lFmtJgjFjzCke87m2pDxrvqm+FPm7vvmL91mGAMuge+i1ttqn?= =?us-ascii?Q?rd1QdUd1+zyaZXAG+mo5rYpNVru8HSIh5juAFfKJMIiKRv6nxUcfWlV8dpid?= =?us-ascii?Q?lZKrFDHc5pLkYhv8p0NVhNKFYqzydDNu7fSMYs00/y05HpHp/X5XZ5gSx+dI?= =?us-ascii?Q?JI0nFyVM9pwprCBxHYu4BKV+dZflBTP1KZo4BJ1GcNOrAxdOe7gtJAqlKgDT?= =?us-ascii?Q?7vGDHjBogGebriHKxrKybLl66eujNh8OWUOKEW4fZQhZzLSB3VOtHAudekVA?= =?us-ascii?Q?cXlu/33lIdTFkV57pAWMnmNQIRmnz242I8xTpDnB7MdePi5czkcMI3yt9eYf?= =?us-ascii?Q?mt0j/kZrJbOsxhX4MRVwlFI3Xri2RwNLtXTwqNgBag2ykwtt1+p3Lx3ZyxOj?= =?us-ascii?Q?TIsm9LGMtI8TbILwer1l35lNLXKqxpkzBhsM5IoVEDzPMB3yfxRvh8Jj0+w5?= =?us-ascii?Q?wAizxLXTQGBBKeakb5jvrUBGhsvPefxjQAqfKi1jfMYCPR9zeTEGOz+CN+PW?= =?us-ascii?Q?Yid6+gxYmMeIvzjmIVAPQqWXKBpKSKxd+fQhGBHAcHcNzsE7feojsfoj7dvn?= =?us-ascii?Q?YKsCM64xYvhrxm6GHJzA01kPiXJI1EX9W3tKMUmOlKamnVXOOM6WBgptyuov?= =?us-ascii?Q?/rkPacNwdzMuGneAFt90B8koKenmfMwDwSpvTNOsVavtHRgTa7XqncodTncj?= =?us-ascii?Q?Foi/aeY3HsKFNyUK4gTrc+qGbJzbvuhzIblAjRzrbw+4azp+1K9KN/UlNRaO?= =?us-ascii?Q?ecvBYPQE8Ee+mekQTabQHc9p9laNp3Qc0Xq4YNq55e9BdBrlvKu/w0I7rFgl?= =?us-ascii?Q?ZhGvmclmkHkilb2rvUPAPFs0C9L1TsQg/iNcM8CXQxzE4/eRIbmLBk7NZdR1?= =?us-ascii?Q?vwa0DNx+ZbUgyfo2fGw85rSYkeSjBSKDdJB6jVdsOJ1B44GO/x3bwNBY5tJV?= =?us-ascii?Q?s1j++8/tXk5/x/H0YM4+QiyOCfA++xk+9OxrJHvUvtrduOngl5ec7dZhVv5T?= =?us-ascii?Q?YiH+KZeByS8AyQyH1MtHR+2lQPFS9ZnY2pe1oXzmwJ3wWGmLfyjXDmdFa8Tq?= =?us-ascii?Q?6SETujWoPz/eJq2az8bLA7rKvcB7280sXIiYpnoR0oDXkxW/rs9eTsZo8Iwe?= =?us-ascii?Q?8BKZcDg8q6FYIOhwKpjPA/NnS58cBFQA2hVeF6fyc7fo/c5KiJiZBEdMLv9s?= =?us-ascii?Q?dK53uArn7TvhGXbdTcaxOleCQQAT40kMjVz1GmgN?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94680c5d-f95f-4663-a35d-08dbb8c5acde X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:05:35.5385 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: g985m8aNMW2g/1nLPiNgSdIDu05zPo8EQL81KCfCQ6OtuCbQlQOHo0qpdy0yy6o6QpBS3d6ZN2gTmRa1jm4hzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" Use mptcp_lib_print_ok(), _warn() and _err() to instead print_results() in test_pass(), _skip() and _fail() in userspace_pm.sh to print test results with colors. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 640273d4d7a1..84a77ee3b633 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -73,27 +73,22 @@ print_test() _printf "%-63s" "${test_name}" } =20 -print_results() -{ - _printf "[%s]\n" "${1}" -} - test_pass() { - print_results " OK " + mptcp_lib_print_ok "[ ok ]${1:+ ${*}}" mptcp_lib_result_pass "${test_name}" } =20 test_skip() { - print_results "SKIP" + mptcp_lib_print_warn "[skip]${1:+ ${*}}" mptcp_lib_result_skip "${test_name}" } =20 # $1: msg test_fail() { - print_results "FAIL" + mptcp_lib_print_err "[fail]${1:+ ${*}}" ret=3D1 =20 if [ -n "${1}" ]; then --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2052.outbound.protection.outlook.com [40.107.7.52]) (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 6221F31A74 for ; Tue, 19 Sep 2023 04:05:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AZ+960D5F7AV/QRIfzgZBYZn40deQCp6VeO2UqxkdfSFLEr/tdig6J6QqPwRrnR/Nha3z4khI0QQlfODHHcVRXRck4a/RW6ikgGqkK9Ji11+KLBL6WXle9aykIUH1dSOWXjTfd1I9BOHJ8Icbe1S5KYsmKPwOfdA+ZBc6rXglxegY85ZymF8joG6TC6rlrCl1OHKzfogek3t7SD0FROr7QbhJLKp73Sdapn2qKRDMMNT1GfMaJAJLF+5V6NrtlVmfAWeGBS0x4LrXUh1B2ZpWWI64IK/9aCp9W86qwCWfCdFmG9AVoSyPpmIMLmkAMDXcgc7IU6nWZJCCnJSiDYDTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=D5OE8Y9OwqddXSFHppsqjt6p7uQNiMSdupJ01441QY8=; b=np38V1DPaYoMgCH2yPBaQeYtIl9SvGeTYNpuxQlpd8Ngje+5Pq6dZK9pr2W1LL7iUN4ZzYWlATGZRaZli3sPwyV01jwSnG+E9BPLWpJDvq8r3uldJ2r8xue8jQgDGSzSc6/5nD8Kn8Z9s31E+s5/ZlHqIrjYaCZto6qwDGY4wd6LvhI788+LrhNG9QCqSZvspg0HV77D0tFQIloMS6o1xTDcBvyuPki9lFr940FYfI2uCUykfMvTL8UkHYk5vRH9uR0xsnEJ3GyZKFbuWqFf4ZFaugBEpg+8f9lMJPNZfUuSu9vyDEWHFb9AXxPf2oGenRapxb8KFKpT2amVpuKRUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D5OE8Y9OwqddXSFHppsqjt6p7uQNiMSdupJ01441QY8=; b=q8okqRf5hb7xjRhl3C9mkHyiZFV8TcaQ5g+6HIDyIOzh7DEZ01O8NdFxzkFOrv+YNMlEPSRv4Z9IjwDsCC+AHe1DWwxuP0hyopde6IobDOwOiWPsEDG7i8XcNK/bApmW9xW7QebVLWIW0NQORMCjKYAr8+iJPAw9gG4TWDcrkqMnOuTwcRKL1MP2sUL7TkxNbJi4asPsrFTqSqwluw+KFRIgOv0iGfDYH81RX5QhC+sPyj5cT0zOcm2Qmwk/MFRFtvjkgSqe/HomWNzaTP7EbWFEaxsf3F7143WbRAp1vtY0dWOvyIh7ifOWIyMFtuUpKGZ4bOxbREBsZBVHFUffAw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:05:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:05:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 25/30] selftests: mptcp: add mptcp_lib_verify_listener_events Date: Tue, 19 Sep 2023 12:02:26 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0018.apcprd04.prod.outlook.com (2603:1096:4:197::9) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: ac9c0070-6450-432c-098d-08dbb8c5b14b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WKS1c/2iLJi4jdouRYrchUu1oAjh11DutaWccYZjStxZd09yXvDVSU4IFN7GzPm6QA4C+gof9ddVtOCe/4qppNNNCDWcCCLz0sogEj0OHoVVDyPY4no5080ZvLBiALLa53zyxYRuvDHI15qQUOuTp2P/hdCNjOpVW7wPioQyB0iUt9ZLHEX+2T1sNi410r8FSFLJTCUd7D0LHwyfpFKonQuZWpVT0n5DSu31MSzNuW5am+t7XkzEsGt0u3FxeuaqeTh7ishxlqm7xmpWa2ZcgxzpmU0G5RWwoLvJWmBGB1bdUooufHg0BifXQaRxTzI/z6XD72ZHOHfYpM5ud35eb2WNgcgeA0dJ+8iO008bluTwDNdPybMr33ZsdbulOjDGHiTziBw+PGDOkGVWWG2xGGw11EawThUFWUyhTDwOeFhpsNcC2nTp08DBxy6sfxYy3xU9JP+hk2AZE/JTN9brdSOJAoRRVcre5OY4rn1qFlY8DQ3zISStJsXMjGJRULweKrCFNaZN1C5r9e0/OfSFG5Kx2iVND+/1YQEqz6vLoOj8Dk0tWQ90qtKmn0gBYkoza037yQJY5bfJybUrqTFMdWQICJ4gpKutzJFrz3CnWxU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6D2w2kZQoyCE9HajAsuypIBvBpbo9pRhmOyR+H6XyCAXgclAtcSJF9GykuPn?= =?us-ascii?Q?SPr8aT6Kqv/5Nw7Vrp4jrJckLNEss/ZM82acKx5l2XcZ9TadD4J5q03psnJa?= =?us-ascii?Q?Rp3Vz+r4bjyLtZ/91aVToHuoNe5K4hewPZKPcB3iAj3zRQE7R1prK8q4Wo54?= =?us-ascii?Q?LOF/LsHFkDbPNVdj9h/2FyLATwzuLrK4RLRjX8rOz6IcGuNLQ1aLxsQNsxFj?= =?us-ascii?Q?XvQxHgE6aGZ29qWkBUGfK6kngTUNHbMTQtcgU3FhpxApb7zfKaa8CixWtHWl?= =?us-ascii?Q?VJc3RHalw4tB1/eZ4HSwnrnTXTU9cW7Kvl3qSl7HSg0g5OupXnejrm+5hn0M?= =?us-ascii?Q?shO+BIiTfFzUZDRVy7vhkZpRP+MFAxQRfqohMupMHRCf2BQacpAVoYJdGCAR?= =?us-ascii?Q?tWVHTmje0BL++Uvug3J9zC73XQ5RE1gW0ClgdHcRS/f83ge8a+mPjguza+TD?= =?us-ascii?Q?mJsEwrrkhwNGQwZF/2U/jLkLsaKDbih8OYADoAo+6UYK+WXtc4VShjKt6yYy?= =?us-ascii?Q?hbBB49cSgAzlkX6vyVvVkNwTOP+/PgBNIKVY8f31CegdOW1Bpu4OjGROTtUG?= =?us-ascii?Q?YqNMzRr/rbK1GxSd+sfTiTbPlo2k4v8+Tboq1Cxi4fuV2Z7U6ZqsHst/nPWY?= =?us-ascii?Q?1KxfTRA4Pl+ue0jMjnnMfd8OkOJe66o0Lppk2TZiTrVfJTAcQKqSbyoi2/xW?= =?us-ascii?Q?6xJhmp6itX7GwhuQiAtZ4Kjan0vWiJMi9OqhnK5bkypCZBS3EqAUlbLtlVsa?= =?us-ascii?Q?0lYOPoUQNgli9QQ32C57Gro9M6drzpQMYNHqLuY6lH2FMuReEvz/mXS5nwhv?= =?us-ascii?Q?qmgmFqSyp0342quA3DXJwtOibNDHISy+70eVyMvucPW3SxvytrfVjKVW8YYl?= =?us-ascii?Q?iKrVCpmZMlb1rwVkrbqT3uqT5FgJxD52cleFtdWQ/fSL0NpIVHboFBAT5TmP?= =?us-ascii?Q?UGVnD6Tj5HXxjDq15II0Nk0h+AOJp55TCBaQ09meUx67eYBJSVt09ZrYdvu7?= =?us-ascii?Q?lO8R2IVGECEc3q95fXwRL58nmZBvC2Jgxg7YzQB59uk0sl9iRsep2X7E3X3S?= =?us-ascii?Q?ob+edACp2dP2gYwSxvWoh7wRSb75JXlLfgpPm8ZkGH78vFC5fal+6px6oCNa?= =?us-ascii?Q?D1bctz8S2nXsIta93Lp0zzLaog6l3LTbgiY5kK6C0b7k9G1gVx4Lsqr0YfOh?= =?us-ascii?Q?XcX+4dzkF7K7KxjIe8cQKHda00P/vpHiHuQVanhq0hMQ2HhJFP/Y64Z418q7?= =?us-ascii?Q?+C9FbPpCf4uliIK0XFk9dei1eS49fpdzVYgrTGyfiwnSHPE3T0tOWQhN4J2a?= =?us-ascii?Q?7LZpZA9V+qbDDgu9PucNz5rwWm+ZXmmqsj7TLDzFypEYtBXaxQgpee5Y/807?= =?us-ascii?Q?oj4fokLw4yfG6LaxN7B060Mu4SDxsYNL8TxQRIE6n8kf+js6hWgCT8c1jvGU?= =?us-ascii?Q?6fNCwJW8diCr3JY7jGBkh8C8nXvjCx/OSf5zDp+hqAO/DQCkULj5ytGKs/V0?= =?us-ascii?Q?zLvJ7h3LRYW2JI5x7itiSDG0VGwBBse9AAy6qqv+qADC1KSJ2JNIeutTCADm?= =?us-ascii?Q?Xfupg6WxjDmXo7iZD5yC3Yqwe0ZeLBzyHEKH56VO?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac9c0070-6450-432c-098d-08dbb8c5b14b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:05:42.8455 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o/mZDtb8zDUhF2kkHfN5Dorq7iFGiwdnfR+7WnJwayO/X5tv4SIkfmo1lfvjUciCloRd/kHqRvda0ygw8zS5PQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" verify_listener_events() helper is defined both in mptcp_join.sh and userspace_pm.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_ prefix. Use this new helper in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 59 ++----------------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 56 ++++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 41 ++----------- 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8c708b92a942..e59867eed5c2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2803,59 +2803,6 @@ backup_tests() fi } =20 -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 - -verify_listener_events() -{ - local evt=3D$1 - local e_type=3D$2 - local e_family=3D$3 - local e_saddr=3D$4 - local e_sport=3D$5 - local type - local family - local saddr - local sport - local name - - if [ $e_type =3D $LISTENER_CREATED ]; then - name=3D"LISTENER_CREATED" - elif [ $e_type =3D $LISTENER_CLOSED ]; then - name=3D"LISTENER_CLOSED " - else - name=3D"$e_type" - fi - - print_check "$name $e_saddr:$e_sport" - - if ! mptcp_lib_kallsyms_has "mptcp_event_pm_listener$"; then - print_skip "event not supported" - return - fi - - type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") - family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") - sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") - else - saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") - fi - - if [ $type ] && [ $type =3D $e_type ] && - [ $family ] && [ $family =3D $e_family ] && - [ $saddr ] && [ $saddr =3D $e_saddr ] && - [ $sport ] && [ $sport =3D $e_sport ]; then - print_ok - return 0 - fi - fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$spor= t" -} - add_addr_ports_tests() { # signal address with port @@ -2891,8 +2838,10 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 = 10100 - verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 1= 0100 + mptcp_lib_verify_listener_events $server_evts $LISTENER_CREATED \ + $AF_INET 10.0.2.1 10100 + mptcp_lib_verify_listener_events $server_evts $LISTENER_CLOSED \ + $AF_INET 10.0.2.1 10100 mptcp_lib_evts_kill fi =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 899c21ced5a3..1301af71ad2c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -9,6 +9,11 @@ readonly KSFT_SKIP=3D4 readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') =20 SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED +LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED + +AF_INET=3D2 +AF_INET6=3D10 =20 MPTCP_LIB_SUBTESTS=3D() =20 @@ -267,3 +272,54 @@ mptcp_lib_evts_kill() { mptcp_lib_evts_remove() { rm -rf $server_evts $client_evts } + +mptcp_lib_verify_listener_events() { + local evt=3D$1 + local e_type=3D$2 + local e_family=3D$3 + local e_saddr=3D$4 + local e_sport=3D$5 + local type + local family + local saddr + local sport + local name + + if [ $e_type =3D $LISTENER_CREATED ]; then + name=3D"LISTENER_CREATED" + elif [ $e_type =3D $LISTENER_CLOSED ]; then + name=3D"LISTENER_CLOSED " + else + name=3D"$e_type" + fi + + if [ "$(basename "$0")" =3D=3D "mptcp_join.sh" ]; then + printf "%-6s%-36s" " " "$name $e_saddr:$e_sport" + elif [ "$(basename "$0")" =3D=3D "userspace_pm.sh" ]; then + printf "%-63s" "$name $e_saddr:$e_sport" + fi + + if ! mptcp_lib_kallsyms_has "mptcp_event_pm_listener$"; then + mptcp_lib_print_warn "[skip] event not supported" + return + fi + + type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") + family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") + sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") + if [ $family ] && [ $family =3D $AF_INET6 ]; then + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") + else + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") + fi + + if [ $type ] && [ $type =3D $e_type ] && + [ $family ] && [ $family =3D $e_family ] && + [ $saddr ] && [ $saddr =3D $e_saddr ] && + [ $sport ] && [ $sport =3D $e_sport ]; then + mptcp_lib_print_ok "[ ok ]" + return 0 + fi + mptcp_lib_print_err "[fail] $e_type:$type $e_family:$family \ + $e_saddr:$saddr $e_sport:$sport" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 84a77ee3b633..98189b3f73dc 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -26,11 +26,6 @@ fi ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED REMOVED=3D7 # MPTCP_EVENT_REMOVED SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 =20 file=3D"" client4_pid=3D0 @@ -878,36 +873,6 @@ test_prio() fi } =20 -verify_listener_events() -{ - local evt=3D$1 - local e_type=3D$2 - local e_family=3D$3 - local e_saddr=3D$4 - local e_sport=3D$5 - local type - local family - local saddr - local sport - - if [ $e_type =3D $LISTENER_CREATED ]; then - print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $LISTENER_CLOSED ]; then - print_test "CLOSE_LISTENER $e_saddr:$e_sport" - fi - - type=3D$(mptcp_lib_evts_get_info type $evt $e_type) - family=3D$(mptcp_lib_evts_get_info family $evt $e_type) - sport=3D$(mptcp_lib_evts_get_info sport $evt $e_type) - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 $evt $e_type) - else - saddr=3D$(mptcp_lib_evts_get_info saddr4 $evt $e_type) - fi - - check_expected "type" "family" "saddr" "sport" -} - test_listener() { print_title "Listener tests" @@ -927,7 +892,8 @@ test_listener() local listener_pid=3D$! =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CREATED $AF_INET 10.0.2.2 $= client4_port + mptcp_lib_verify_listener_events $client_evts $LISTENER_CREATED \ + $AF_INET 10.0.2.2 $client4_port =20 # ADD_ADDR from client to server machine reusing the subflow port ip netns exec $ns2 ./pm_nl_ctl ann 10.0.2.2 token $client4_token id\ @@ -943,7 +909,8 @@ test_listener() mptcp_lib_kill_wait $listener_pid =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $c= lient4_port + mptcp_lib_verify_listener_events $client_evts $LISTENER_CLOSED \ + $AF_INET 10.0.2.2 $client4_port } =20 print_title "Make connections" --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2052.outbound.protection.outlook.com [40.107.7.52]) (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 A564331A74 for ; Tue, 19 Sep 2023 04:05:53 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hSlftuMl7SiN15erE+yAzBbTUrmReq2KyuJ7z1c7BnCZPLydoC6+B3A8sdFjTEHZocarZpIGj8pkOUc683nTWx+3OUinbl1eDxICrhj5t6P19t81iZM7KsFQvJ3irzK1yqcmbVAFUoyzhywBQXt3u+Ad7ub6LfwwU+LnaloF9YLhxZM2WJF5w3iwWwFOplKVD/uFxRBsNui4BUaTYNrEMKKGXjl9mm2iUvpXhW9qXLTVtRXhxAVfzV9N50ZY0Ke13VWe9pEy8ODndbt+Ivv1ltipkO3jeoFtm+MwV4rzWOvV08PTppS59sTgUUfvzFtPWdNlpw7iXGTZACtzC7p4Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RR0jOb0tBkJ/YkD0fh3SD5h400nX2dUp+Egk8E1WuwU=; b=BBOxH37VE70z7HfJftDnVNh/9ILkLQt6tfOzuTiI04GK91+S2sbt2QxjkoLsr9HDlr9SMJaXZmXkRkc5kVVZsjaK5t4QeErODy7NcvNP1ulk8mfGWwTmC52+E6MpQALXaZoVTfAhHY9+AetSDL7UXBodHf2dtQzFX6b5knMiR0VcKlOEbr2Pq5UfrFpSxkrrBmrwnQj9e95FaeXELH/UmyENwcjB6Wx5Mqw0azvD63bfnd/EHRbhdtgEeeYkFO5GWPYwYk5IlrCW3zPduEL5hZ3KXaC5fqnDympvNSdHKwA1cHAeZF/iw03Ljb/YQlgmY6X6QGr3KqLxPZb/++luZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RR0jOb0tBkJ/YkD0fh3SD5h400nX2dUp+Egk8E1WuwU=; b=TNnmLbqEfVY0y5Q2KvwiCmRL0q3DjYj373owz2O7HopnwEFL4kYoGHbu6sSkjN2RDJKfMw4613/MSRfPR09L4vR3qhKOux4kisSCPPBE3Fhknrg/7XhvcwGHiDxqz7o5mVBM0SZxi/fAvhwl5ww8tT/sBUd6wrZrHOSBeBlavZaqHOLIKG8KKKza6ZtncA1qtLM1TrAM3PMh6DGPKN/owgYuyz8BsZfa/5b1ZPxScVCjcG8gXqP4kI9RlqtRtPG9pKwYIW1UgzaAThNSHqclWzMfrdhQJ+s/8q3Sfb1au/SCYjrNdpeEvuPkwwym5dpDN4dTl7L8mSgJgzIqCoaicw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:05:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:05:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 26/30] selftests: mptcp: add mptcp_lib_is_v6 Date: Tue, 19 Sep 2023 12:02:27 +0800 Message-Id: <59d96934e3303beb08d7392da8c27419b5e2a2ce.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0014.apcprd04.prod.outlook.com (2603:1096:4:197::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 91139076-6673-4c8a-f6e8-08dbb8c5b5df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DFuLFEwpodY52iuuMhv3jPGDHsR85xzIGPnNOdlpCrFvzS0y2ymFwTXt+6eQzMQ2y4kIWPCmuBFjFb6wIJiiCk+aSRMkDFvNjTbpuXimRpA8NGH1wSkbIIXHLH/zogiEQ0Naqn7UcCPcmEBw2v06W4eVeYCl8s0yvMqetfTYEC/gl/j/kIL3e2vQLy7H/jANUI/ztSQQqDk5uePcnZ8UCTRW/LbH4P59J8SZB8vA4ENLmpe/Ny/TtfRJcjrK+wwRLumgZXXm6ChiDfL26/1dNcEEmwul7W7Yxg1tPhp7opvqklhurccNNO0T2ECQu7vqZ18VzYUFCoUIV0f1hnzZU5nr1ZMCeORQV8w6iuJxa+Ze1tex7AMPCxuQAkQir0XxYtUeTmRd3UwlYxAf89LfJWjc5cN+bwS92iuD1/YL6rr7LPKfloz/u3ZYWqSjlAvfUK3tOrGFu0b71PhLi7pc9IrlLxAAnuw5wz+LvuosyXMidhTzKTIY6lm8z52x4fuF/zT89JMdCO8ohr4Q6HqgCxLa7I9GTXaEge0TaD+CJFveO3I6TlmspW7vIFntZ0kuB4CRCVwatDioFz3SByaNXMJ7GXZxGmFtSYVIls4e+iQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?t3sXTcoigXaeEWJRC2CyhL2xW34dj5R5h4iOj/XQJ41HC4EL8iPZJeVTppmw?= =?us-ascii?Q?eZCWs9dCGlvDqrkgKeQ/nhcgPCVj4H+Aj08CLcCVDwWgV35EiH/FPH3VEzBQ?= =?us-ascii?Q?yb0vyVyQ9FFzF2BuWp4387C4sY0xkj45Ga+Qa4nySCviHmi69zPv0bNftKnZ?= =?us-ascii?Q?nKVZx0C2AtA2rnFc4KVHNdSUlvUe4joWeHgaqENFqh823UgKaveThwumqRud?= =?us-ascii?Q?HgLPAx6l1Rk6cERvPjZ66EemmJfRB6lhiS+vjUV1tdVBugYTGeaXsCR3wpcm?= =?us-ascii?Q?SHejfu/DUcEN7FNs9RyrjfK+UUvj6oob+3rqgjj56FxLdN3YvG7tgxwFm3qd?= =?us-ascii?Q?iwPhUNMPV7IfBdtS3p6Te5YyH08R2vqhhOo2Bb/avECPqCA4crY+HyzdBx1d?= =?us-ascii?Q?4BI3/IncWbGV9TlulCL602+rbGdNbUmseHJfxxVf0HIbWf1NScjZo19JAZ8s?= =?us-ascii?Q?0WJ4xjbhcUMmiurjjg1pX5LinvHTdOF4/dZeBkut3a6veLZT2UKndfE1FL1V?= =?us-ascii?Q?0J7RrtS8iLWXURX+gi1V+BxBPcDPW2LiWeGpOOQhImidpF+UDnOLKZ6g55LR?= =?us-ascii?Q?KotR+rXEmLxnbvYMGFbD2HlX+P6lPnpOSgQK58BogqOltQmeweyp23vvsq6A?= =?us-ascii?Q?yfDz1VfD7XMj+G4mQs67ToVbRGcPKgjwO53Bfh59qWRUtwVSyktgwH2hmGbT?= =?us-ascii?Q?uJTJW4UkdiieB/D5k3Dy2t422EQEUnqrJtF7GzdcKJJSJBd4M7UyZn7/qugl?= =?us-ascii?Q?zW1wFLkcemsbfrJ8w6wA2qq7+m+/Lb/9lSm68QUFDZBmiDMmMgjn7Z37B+38?= =?us-ascii?Q?LDEoCaj8eJabmMJ8r4qlympyiaFTq92vXY0fG+FsOgX3p1DK1f/vQrWbenqe?= =?us-ascii?Q?MHfFu51EPPX+xjP0DOOS3z5noH4E4W2gxpT6Vy1t8wEFifzpnnUHFUVPDHRI?= =?us-ascii?Q?E365LcbclPCG1Qs39yjgT/OrZcLu0obELLVmKD9m+zH/bxtiMtJxwR6JHPRt?= =?us-ascii?Q?hZnbXfUuk5klfBMNJNEMwLuX+AcuXCL/SmT6wvIGzSEfEEsOkRhXW1Ef1Gsn?= =?us-ascii?Q?/Og7xOCp1jHRI+QBHevEzJ6AJWgR6qH+n1SLRvsDKtUh79NMHe+DIvX84u3m?= =?us-ascii?Q?Kl6AovBzv5bmjyYn2D9vJKDZQDdO5ZIY44IRRrbdfyjec/icXwBvbtxEQpHh?= =?us-ascii?Q?MnmUGoeD7bK3OL2Ob5KZssz0ijJoKLmLOw7r+v9eUXEKqXHZxDqKtREhyTwS?= =?us-ascii?Q?+Ofd0IGuJ02tM+MPKCX4aSiiZ+NyCbUEAJBnCbTiM83W1BIpvMJFLUrYUZ7F?= =?us-ascii?Q?SXW9F9sxkYrGhRgCm+3vI26NSzhQF1l+VbikScUp98yReS5ZxtkMLOX11AV5?= =?us-ascii?Q?CZpZy0ghW9TqK7ga+TVhoaj/rA3eQZgnr8sUKKTv0l4TOWFVLnsOM/49jCmg?= =?us-ascii?Q?ZNna2NFXkzadclmAl5vvsJjppx31TpybiSx36NV3A31RZMlrQ4J1bsS1TTTT?= =?us-ascii?Q?bqhnEZ9xH0myQiP6NdRUjk6ohmpWKNqYVXVPPWVt4LvEhykj90kihIKs36sC?= =?us-ascii?Q?12poSqByKItZKJlT3mzOpViua+BtIcO7P6JvnoUQ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91139076-6673-4c8a-f6e8-08dbb8c5b5df X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:05:50.5326 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Kz8XVh1WGpLdTlB9ZWDRjO4TQ1U6rXX57yNDBvJL2t3yBTcKWbdyrWkYFd8+N9FXd5U8RikyUvrrvAN+fgdY6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" is_v6() helper is defined in mptcp_connect.sh, mptcp_join.sh and mptcp_sockopt.sh, so export it into mptcp_lib.sh and rename it as mptcp_lib_is_v6(). Use this new helper in all scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_connect.sh | 16 +++++----------- tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++---------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 5 +++++ .../testing/selftests/net/mptcp/mptcp_sockopt.sh | 8 +------- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index b1fc8afd072d..4cf62b2b0480 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -310,12 +310,6 @@ check_mptcp_disabled() return 0 } =20 -# $1: IP address -is_v6() -{ - [ -z "${1##*:*}" ] -} - do_ping() { local listener_ns=3D"$1" @@ -324,7 +318,7 @@ do_ping() local ping_args=3D"-q -c 1" local rc=3D0 =20 - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then $ipv6 || return 0 ping_args=3D"${ping_args} -6" fi @@ -635,12 +629,12 @@ run_tests_lo() fi =20 # skip if we don't want v6 - if ! $ipv6 && is_v6 "${connect_addr}"; then + if ! $ipv6 && mptcp_lib_is_v6 "${connect_addr}"; then return 0 fi =20 local local_addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then local_addr=3D"::" else local_addr=3D"0.0.0.0" @@ -708,7 +702,7 @@ run_test_transparent() TEST_GROUP=3D"${msg}" =20 # skip if we don't want v6 - if ! $ipv6 && is_v6 "${connect_addr}"; then + if ! $ipv6 && mptcp_lib_is_v6 "${connect_addr}"; then return 0 fi =20 @@ -741,7 +735,7 @@ EOF fi =20 local local_addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then local_addr=3D"::" r6flag=3D"-6" else diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e59867eed5c2..8ef91a939c1b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -577,12 +577,6 @@ link_failure() done } =20 -# $1: IP address -is_v6() -{ - [ -z "${1##*:*}" ] -} - # $1: ns, $2: port wait_local_port_listen() { @@ -879,7 +873,7 @@ pm_nl_set_endpoint() local id=3D10 while [ $add_nr_ns1 -gt 0 ]; do local addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then addr=3D"dead:beef:$counter::1" else addr=3D"10.0.$counter.1" @@ -931,7 +925,7 @@ pm_nl_set_endpoint() local id=3D20 while [ $add_nr_ns2 -gt 0 ]; do local addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then addr=3D"dead:beef:$counter::2" else addr=3D"10.0.$counter.2" @@ -973,7 +967,7 @@ pm_nl_set_endpoint() pm_nl_flush_endpoint ${connector_ns} elif [ $rm_nr_ns2 -eq 9 ]; then local addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then addr=3D"dead:beef:1::2" else addr=3D"10.0.1.2" @@ -3263,7 +3257,7 @@ userspace_pm_rm_sf() local tk da dp sp =20 [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts - if is_v6 $2; then ip=3D6; fi + if mptcp_lib_is_v6 $2; then ip=3D6; fi tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) dp=3D$(mptcp_lib_evts_get_info dport "$evts" $t) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 1301af71ad2c..91a17ae81cb8 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -323,3 +323,8 @@ mptcp_lib_verify_listener_events() { mptcp_lib_print_err "[fail] $e_type:$type $e_family:$family \ $e_saddr:$saddr $e_sport:$sport" } + +# $1: IP address +mptcp_lib_is_v6() { + [ -z "${1##*:*}" ] +} diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index a817af6616ec..bfa744e350ef 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -161,12 +161,6 @@ check_transfer() return 0 } =20 -# $1: IP address -is_v6() -{ - [ -z "${1##*:*}" ] -} - do_transfer() { local listener_ns=3D"$1" @@ -183,7 +177,7 @@ do_transfer() local mptcp_connect=3D"./mptcp_connect -r 20" =20 local local_addr ip - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then local_addr=3D"::" ip=3Dipv6 else --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) (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 A388C31A74 for ; Tue, 19 Sep 2023 04:06:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PVZDP6ujvC5tHymly0P3fJhO4HDzCpPd6CnFvHTnhhHmBFBueoujh4LsxikdYF6yvxao8BiTi6lfaRvlqIhVWGuKQxZ+jJ3+F6IiGOdO52dpWuOKrmi6YMg20PeGvqeYHQxV0AadtHMCCI+y+EUKAmP5ZnMUIMF2psCHE97GHhKwVpkZFHWQnaDqlQMNMUjqaaP7TYpNuH49q5PmzixBUm9bGjMkxb+Nb1QJ9byeRnqmXHPnIbBgMerSYLcppEEM8GCvKf1hAuO/digM6UaAbtOcMb1GwhYbz+DmCLyVAsKl0wAEWzTMn4oTVLLVwZut8R+9SplDsy58aEbnUvWi2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZGhZiuYYIVVlw+Aybh0lCrW7ROExttZPli2QbbzK4hI=; b=kOVNHOTNgk9lkSHf0kjYUoj9ldlPodWto02R6UfQE26YSALHXKSumZx0Stl5uQ0OB8h/8xRpfzaBgtKHPxm0D6zEPBq2lmhtI0p/tCecodVCN1A4nixbvhTqASzPPmcHdLnY81qKcTe9uYJpVXQkfYlJzvgclxmiyt/pzVu8cWb9eIWrHvkXG7zmKXzj+YCw5zqejIyhrfsQs/ssAtanGKku45VDX78mtC7uwxHpCBMoSxd92oVB/nSS7ABgIDm0yPvqEiI1qXa4a1GZwnq2Pn9y9NcDlZAp73T8dIZeCZzWDwu4ip0nMpY/fNtCLYejrTHNs65aUMR1AzC+2L+h7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZGhZiuYYIVVlw+Aybh0lCrW7ROExttZPli2QbbzK4hI=; b=iIbUI+IObMn7i89e4ITLOZYb0+STFTs7PAA/6y59OysIqgQulvEZZknNXXavo6IsXQdU53DQcMa4e1XfuLAymOck5/1nI1yGXOF94KiFDUjDGN/McWw4C8KH8xCjKta6gIiuS2/qY1tx5XKWzzyt+qYcXllGxePlaw9sC1JiALkv/aWDb2FRNB6eUOzu2oL6QnZrFJIyBBlSZV73Q4ndfoFtgsh/dnsEgyaK5XJ9yFe5mmp/M0MhW2WL1X41BHyWdoTRAWl4ZreHrQ8TFHIo4QllPToV7vRUw9ohdGCUltVv8//ezqjUp9muOQ9llZvsB9/ZE6eHFdDeetAX1UNyMw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:05:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:05:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 27/30] selftests: mptcp: add mptcp_lib_get_counter Date: Tue, 19 Sep 2023 12:02:28 +0800 Message-Id: <34b089b78d9f4ed9a9a3b5ebbc7d9d49599b22ec.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a98c843-c7df-4f0a-27e7-08dbb8c5b9f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J0MMzj/tBPcNc6GvAy/X/eLJ8AV129ezX06QYKl0+zQhGsFq/cBCulWQLFAgMIL8Ia0yc20FgCDo6ImbpshBDCfqxrWELTw4fsydokvV3VBEegu468htQXKBvEqiOh5+01Qh8ICcAiK0ByzLh2pVpJdfzV8Tsokt5fyg/CNRRUpXPu+MiERIpoixMIQegtGi2lSrwIxDPDWuViLxUhI6YGq/fqUTyzvnq6kignJ5rvq0ODpsjVG0GQNVCVHHisP643qo3W9Q1gQiRq9TPxOc0rCxAHRjUwi4OGGNF95UMM8T22jkyf57vRgxXOIy2yoeVQQE1FQTSXwrZGf8ihtnc6hqblDwOoM3EKR1281ghhm+QNNXiAFDwlRVB4t6ZIWsfNuoR3sbF5LAPbF+zKIP13lpNC39OkwdWc5IeiShYuaD05ZTZsSkhUYjyWghd/h1slF9fEGrwcR9dviixmmO9fGzEIUaDMlQrlSqSY3r9DEiPiOJLskc1arlsn4pDeqfyOLC5MvbT8sp5b/c6wr02+vWjSvzeJf1evYTPePpdSzGMdEejKKlTLs0Y+qNmwJh1h3db5hJLA4F+yKkHLpCFVawwiMMTdsdugJ7C805lZs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(30864003)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UKQPGqIF+Xw0JO8AJpnbs2w8O1qbsWklL73haI15goLRou4ZIcRuiv+KTn3r?= =?us-ascii?Q?/pZQ2LysrtDIH5XeussUFgfLjTEya/rmlQwJFQZvk7mjaeSIcAr97AKCl6OH?= =?us-ascii?Q?vmlysh5A8JLUpplky4UMb1QLiZgc4HeIDYPpSxlnka8sIDBgMHzEGDlWpA7Y?= =?us-ascii?Q?jTYsvdIBnF9GMZx69TpkE5vKZcuN4Slc/T+KfZEfUZA1w7f8HuX1muAZL04i?= =?us-ascii?Q?hZD/49feAJalGx9GYzYO0YHbzdRGWEg9N+x3M7t4T8o2Ah8J9kqHx+PPuHtu?= =?us-ascii?Q?9Le9waSMNUq2vMcAFpjZA6c5bR/Ii00iArG3q0MeamvXISL9eIWSxN3Yrhh0?= =?us-ascii?Q?R3wrQ7LSsGY+ZVOcBpnO2DJ6owvhvh2v7oufPJZ0jM0nuKdia00uBEZ63ihT?= =?us-ascii?Q?mr4RkHBzqk38l5uU2PjREyg4MSbcnLfvS+bKi7kLy5Fre9E+2efj0chidd9+?= =?us-ascii?Q?ghKkNq88QfcjamjQWXBzOJkKcNLLtSZy2XZtrhLwLcXdR9bDxZQeC08rh8rO?= =?us-ascii?Q?A4lpjVeWxnE3ifWs9PJO6ZUVLc77BXIlNfco12pRG2I9XQjvNy4Mx42Szu4d?= =?us-ascii?Q?4ZXQHc3TF6DGojOqhkNHMHMWIOKFxcErr/WF7vjlg/XtwJ8Y3QRiYlcc3kgV?= =?us-ascii?Q?p/fgAQXaxUbN9kftfzNpv7FJaJkHMrAOxrR5CuNPr1qVNrJatj2AMdJzRtMu?= =?us-ascii?Q?Ex3ZQ+fLLtwxgUpHuVfpGpONSQH+ll9oVaawwhdui6/oNWAWdepw2YjhJArF?= =?us-ascii?Q?XiAYoXyiSbBkU/q/i0QqXZ/j8lnaPER+D6J6y8dva8hOtbmT80pUf4zfcWqa?= =?us-ascii?Q?a9qpVBPN19STCqTKoIBnHOeH5GqPH8bdYOjzOEkvcSzYYyBqNRAMVqiwsD5V?= =?us-ascii?Q?Gqf9LAfkxb2yTor4KXl9rmfXB7rFwpNrvPe5qekaGjFlonD8QMietMQcgZEy?= =?us-ascii?Q?eB7AKxKyWCuJXgajeo5UY47asa5ledU8sd+dfbqeepchc1Qrd4TQeP7UDzze?= =?us-ascii?Q?U8R89mMDraTqnI17zZnsIWP3mG/ierxXkuc0n5HIN7qg+ZUUcSr/c2VT9BCU?= =?us-ascii?Q?T6p50PN6U1M0kF1HXzMN/xgmI4QwNCyAMbga0BvtsARVdwreXIklnROxOJGJ?= =?us-ascii?Q?BGUYoR0gzFl/DJZfVs6kOwsW+P+2DxV8+ZKCZs3O/nbkcJLiv/42gUTjUv9r?= =?us-ascii?Q?E0qm2ierjLeU/2co8wiBl7hSlcIIBTi1aijQxHNdwWT//VhPgYWH+XXFSYqK?= =?us-ascii?Q?0804YZQObN2x0ionUHlAUp8hFq9p04rj01Yz45opf8iMQxqiPVgABPYFSQfS?= =?us-ascii?Q?9n/z9Nb6F3T/bkg8iXBCnqI0gRuPTiTdoP4m1xSndyiyBMAEidWIINLY8t98?= =?us-ascii?Q?C1KbP78sNmPZv0z481w3jY5CbEUGko9qJ5caMqlKg3AhSPwtllAq/6P3vtA0?= =?us-ascii?Q?6C17md6y/TTlIXgc5tWW5gFVdr+QSiwTopOF2lZhzWefcb/aWevGaef8LU0B?= =?us-ascii?Q?PcxuCghcGPNfE38xfCYG4rs8EqwHGspmhrrQUWXW/rkt2IOnY2lhqX/hMW6L?= =?us-ascii?Q?G0EWm8No/OJBiRg4GekKxJNTo+fVZytY0y+CHpeu?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a98c843-c7df-4f0a-27e7-08dbb8c5b9f4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:05:57.2658 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B2TOM+8ACyNPUiH+jzAV5oWOgXHNbqHVUzV0GlmvNMLpSitKPon5sVC74+C6KdVykLSsHs2brI/LAqXyWy1toA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" The helper get_counter() in mptcp_join.sh and get_mib_counter() in mptcp_connect.sh have the same functionality, export get_counter() into mptcp_lib.sh and rename it as mptcp_lib_get_counter(). Use this new helper instead of get_counter() and get_mib_counter(). Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 41 +++------ .../testing/selftests/net/mptcp/mptcp_join.sh | 88 ++++++++----------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 16 ++++ 3 files changed, 65 insertions(+), 80 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 4cf62b2b0480..3b971d1617d8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -335,21 +335,6 @@ do_ping() return 0 } =20 -# $1: ns, $2: MIB counter -get_mib_counter() -{ - local listener_ns=3D"${1}" - local mib=3D"${2}" - - # strip the header - ip netns exec "${listener_ns}" \ - nstat -z -a "${mib}" | \ - tail -n+2 | \ - while read a count c rest; do - echo $count - done -} - # $1: ns, $2: port wait_local_port_listen() { @@ -435,12 +420,12 @@ do_transfer() nstat -n fi =20 - local stat_synrx_last_l=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPC= apableSYNRX") - local stat_ackrx_last_l=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPC= apableACKRX") - local stat_cookietx_last=3D$(get_mib_counter "${listener_ns}" "TcpExtSync= ookiesSent") - local stat_cookierx_last=3D$(get_mib_counter "${listener_ns}" "TcpExtSync= ookiesRecv") - local stat_csum_err_s=3D$(get_mib_counter "${listener_ns}" "MPTcpExtDataC= sumErr") - local stat_csum_err_c=3D$(get_mib_counter "${connector_ns}" "MPTcpExtData= CsumErr") + local stat_synrx_last_l=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcp= ExtMPCapableSYNRX") + local stat_ackrx_last_l=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcp= ExtMPCapableACKRX") + local stat_cookietx_last=3D$(mptcp_lib_get_counter "${listener_ns}" "TcpE= xtSyncookiesSent") + local stat_cookierx_last=3D$(mptcp_lib_get_counter "${listener_ns}" "TcpE= xtSyncookiesRecv") + local stat_csum_err_s=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcpEx= tDataCsumErr") + local stat_csum_err_c=3D$(mptcp_lib_get_counter "${connector_ns}" "MPTcpE= xtDataCsumErr") =20 timeout ${timeout_test} \ ip netns exec ${listener_ns} \ @@ -503,11 +488,11 @@ do_transfer() check_transfer $cin $sout "file received by server" rets=3D$? =20 - local stat_synrx_now_l=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPCa= pableSYNRX") - local stat_ackrx_now_l=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPCa= pableACKRX") - local stat_cookietx_now=3D$(get_mib_counter "${listener_ns}" "TcpExtSynco= okiesSent") - local stat_cookierx_now=3D$(get_mib_counter "${listener_ns}" "TcpExtSynco= okiesRecv") - local stat_ooo_now=3D$(get_mib_counter "${listener_ns}" "TcpExtTCPOFOQueu= e") + local stat_synrx_now_l=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcpE= xtMPCapableSYNRX") + local stat_ackrx_now_l=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcpE= xtMPCapableACKRX") + local stat_cookietx_now=3D$(mptcp_lib_get_counter "${listener_ns}" "TcpEx= tSyncookiesSent") + local stat_cookierx_now=3D$(mptcp_lib_get_counter "${listener_ns}" "TcpEx= tSyncookiesRecv") + local stat_ooo_now=3D$(mptcp_lib_get_counter "${listener_ns}" "TcpExtTCPO= FOQueue") =20 expect_synrx=3D$((stat_synrx_last_l)) expect_ackrx=3D$((stat_ackrx_last_l)) @@ -536,8 +521,8 @@ do_transfer() fi =20 if $checksum; then - local csum_err_s=3D$(get_mib_counter "${listener_ns}" "MPTcpExtDataCsumE= rr") - local csum_err_c=3D$(get_mib_counter "${connector_ns}" "MPTcpExtDataCsum= Err") + local csum_err_s=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcpExtDat= aCsumErr") + local csum_err_c=3D$(mptcp_lib_get_counter "${connector_ns}" "MPTcpExtDa= taCsumErr") =20 local csum_err_s_nr=3D$((csum_err_s - stat_csum_err_s)) if [ $csum_err_s_nr -gt 0 ]; then diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8ef91a939c1b..26ea0919810f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -595,25 +595,9 @@ wait_local_port_listen() done } =20 -# $1: ns ; $2: counter -get_counter() -{ - local ns=3D"${1}" - local counter=3D"${2}" - local count - - count=3D$(ip netns exec ${ns} nstat -asz "${counter}" | awk 'NR=3D=3D1 {n= ext} {print $2}') - if [ -z "${count}" ]; then - mptcp_lib_fail_if_expected_feature "${counter} counter" - return 1 - fi - - echo "${count}" -} - rm_addr_count() { - get_counter "${1}" "MPTcpExtRmAddr" + mptcp_lib_get_counter "${1}" "MPTcpExtRmAddr" } =20 # $1: ns, $2: old rm_addr counter in $ns @@ -633,7 +617,7 @@ wait_rm_addr() =20 rm_sf_count() { - get_counter "${1}" "MPTcpExtRmSubflow" + mptcp_lib_get_counter "${1}" "MPTcpExtRmSubflow" } =20 # $1: ns, $2: old rm_sf counter in $ns @@ -656,11 +640,11 @@ wait_mpj() local ns=3D"${1}" local cnt old_cnt =20 - old_cnt=3D$(get_counter ${ns} "MPTcpExtMPJoinAckRx") + old_cnt=3D$(mptcp_lib_get_counter ${ns} "MPTcpExtMPJoinAckRx") =20 local i for i in $(seq 10); do - cnt=3D$(get_counter ${ns} "MPTcpExtMPJoinAckRx") + cnt=3D$(mptcp_lib_get_counter ${ns} "MPTcpExtMPJoinAckRx") [ "$cnt" =3D "${old_cnt}" ] || break sleep 0.1 done @@ -1256,7 +1240,7 @@ chk_csum_nr() fi =20 print_check "sum" - count=3D$(get_counter ${ns1} "MPTcpExtDataCsumErr") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr") if [ "$count" !=3D "$csum_ns1" ]; then extra_msg=3D"$extra_msg ns1=3D$count" fi @@ -1269,7 +1253,7 @@ chk_csum_nr() print_ok fi print_check "csum" - count=3D$(get_counter ${ns2} "MPTcpExtDataCsumErr") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr") if [ "$count" !=3D "$csum_ns2" ]; then extra_msg=3D"$extra_msg ns2=3D$count" fi @@ -1313,7 +1297,7 @@ chk_fail_nr() fi =20 print_check "ftx" - count=3D$(get_counter ${ns_tx} "MPTcpExtMPFailTx") + count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx") if [ "$count" !=3D "$fail_tx" ]; then extra_msg=3D"$extra_msg,tx=3D$count" fi @@ -1327,7 +1311,7 @@ chk_fail_nr() fi =20 print_check "failrx" - count=3D$(get_counter ${ns_rx} "MPTcpExtMPFailRx") + count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx") if [ "$count" !=3D "$fail_rx" ]; then extra_msg=3D"$extra_msg,rx=3D$count" fi @@ -1360,7 +1344,7 @@ chk_fclose_nr() fi =20 print_check "ctx" - count=3D$(get_counter ${ns_tx} "MPTcpExtMPFastcloseTx") + count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFastcloseTx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$fclose_tx" ]; then @@ -1371,7 +1355,7 @@ chk_fclose_nr() fi =20 print_check "fclzrx" - count=3D$(get_counter ${ns_rx} "MPTcpExtMPFastcloseRx") + count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFastcloseRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$fclose_rx" ]; then @@ -1401,7 +1385,7 @@ chk_rst_nr() fi =20 print_check "rtx" - count=3D$(get_counter ${ns_tx} "MPTcpExtMPRstTx") + count=3D$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPRstTx") if [ -z "$count" ]; then print_skip elif [ $count -lt $rst_tx ]; then @@ -1411,7 +1395,7 @@ chk_rst_nr() fi =20 print_check "rstrx" - count=3D$(get_counter ${ns_rx} "MPTcpExtMPRstRx") + count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPRstRx") if [ -z "$count" ]; then print_skip elif [ "$count" -lt "$rst_rx" ]; then @@ -1430,7 +1414,7 @@ chk_infi_nr() local count =20 print_check "itx" - count=3D$(get_counter ${ns2} "MPTcpExtInfiniteMapTx") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtInfiniteMapTx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$infi_tx" ]; then @@ -1440,7 +1424,7 @@ chk_infi_nr() fi =20 print_check "infirx" - count=3D$(get_counter ${ns1} "MPTcpExtInfiniteMapRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtInfiniteMapRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$infi_rx" ]; then @@ -1469,7 +1453,7 @@ chk_join_nr() fi =20 print_check "syn" - count=3D$(get_counter ${ns1} "MPTcpExtMPJoinSynRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinSynRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$syn_nr" ]; then @@ -1480,7 +1464,7 @@ chk_join_nr() =20 print_check "synack" with_cookie=3D$(ip netns exec $ns2 sysctl -n net.ipv4.tcp_syncookies) - count=3D$(get_counter ${ns2} "MPTcpExtMPJoinSynAckRx") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynAckRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$syn_ack_nr" ]; then @@ -1497,7 +1481,7 @@ chk_join_nr() fi =20 print_check "ack" - count=3D$(get_counter ${ns1} "MPTcpExtMPJoinAckRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinAckRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$ack_nr" ]; then @@ -1530,8 +1514,8 @@ chk_stale_nr() =20 print_check "stale" =20 - stale_nr=3D$(get_counter ${ns} "MPTcpExtSubflowStale") - recover_nr=3D$(get_counter ${ns} "MPTcpExtSubflowRecover") + stale_nr=3D$(mptcp_lib_get_counter ${ns} "MPTcpExtSubflowStale") + recover_nr=3D$(mptcp_lib_get_counter ${ns} "MPTcpExtSubflowRecover") if [ -z "$stale_nr" ] || [ -z "$recover_nr" ]; then print_skip elif [ $stale_nr -lt $stale_min ] || @@ -1568,7 +1552,7 @@ chk_add_nr() timeout=3D$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout) =20 print_check "add" - count=3D$(get_counter ${ns2} "MPTcpExtAddAddr") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtAddAddr") if [ -z "$count" ]; then print_skip # if the test configured a short timeout tolerate greater then expected @@ -1580,7 +1564,7 @@ chk_add_nr() fi =20 print_check "echo" - count=3D$(get_counter ${ns1} "MPTcpExtEchoAdd") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtEchoAdd") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$echo_nr" ]; then @@ -1591,7 +1575,7 @@ chk_add_nr() =20 if [ $port_nr -gt 0 ]; then print_check "pt" - count=3D$(get_counter ${ns2} "MPTcpExtPortAdd") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtPortAdd") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$port_nr" ]; then @@ -1601,7 +1585,7 @@ chk_add_nr() fi =20 print_check "syn" - count=3D$(get_counter ${ns1} "MPTcpExtMPJoinPortSynRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinPortSynRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$syn_nr" ]; then @@ -1612,7 +1596,7 @@ chk_add_nr() fi =20 print_check "synack" - count=3D$(get_counter ${ns2} "MPTcpExtMPJoinPortSynAckRx") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinPortSynAckRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$syn_ack_nr" ]; then @@ -1623,7 +1607,7 @@ chk_add_nr() fi =20 print_check "ack" - count=3D$(get_counter ${ns1} "MPTcpExtMPJoinPortAckRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinPortAckRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$ack_nr" ]; then @@ -1634,7 +1618,7 @@ chk_add_nr() fi =20 print_check "syn" - count=3D$(get_counter ${ns1} "MPTcpExtMismatchPortSynRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMismatchPortSynRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$mis_syn_nr" ]; then @@ -1645,7 +1629,7 @@ chk_add_nr() fi =20 print_check "ack" - count=3D$(get_counter ${ns1} "MPTcpExtMismatchPortAckRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMismatchPortAckRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$mis_ack_nr" ]; then @@ -1667,7 +1651,7 @@ chk_add_tx_nr() timeout=3D$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout) =20 print_check "add TX" - count=3D$(get_counter ${ns1} "MPTcpExtAddAddrTx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtAddAddrTx") if [ -z "$count" ]; then print_skip # if the test configured a short timeout tolerate greater then expected @@ -1679,7 +1663,7 @@ chk_add_tx_nr() fi =20 print_check "echo TX" - count=3D$(get_counter ${ns2} "MPTcpExtEchoAddTx") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtEchoAddTx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$echo_tx_nr" ]; then @@ -1717,7 +1701,7 @@ chk_rm_nr() fi =20 print_check "rm" - count=3D$(get_counter ${addr_ns} "MPTcpExtRmAddr") + count=3D$(mptcp_lib_get_counter ${addr_ns} "MPTcpExtRmAddr") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$rm_addr_nr" ]; then @@ -1727,13 +1711,13 @@ chk_rm_nr() fi =20 print_check "rmsf" - count=3D$(get_counter ${subflow_ns} "MPTcpExtRmSubflow") + count=3D$(mptcp_lib_get_counter ${subflow_ns} "MPTcpExtRmSubflow") if [ -z "$count" ]; then print_skip elif [ -n "$simult" ]; then local cnt suffix =20 - cnt=3D$(get_counter ${addr_ns} "MPTcpExtRmSubflow") + cnt=3D$(mptcp_lib_get_counter ${addr_ns} "MPTcpExtRmSubflow") =20 # in case of simult flush, the subflow removal count on each side is # unreliable @@ -1761,7 +1745,7 @@ chk_rm_tx_nr() local rm_addr_tx_nr=3D$1 =20 print_check "rm TX" - count=3D$(get_counter ${ns2} "MPTcpExtRmAddrTx") + count=3D$(mptcp_lib_get_counter ${ns2} "MPTcpExtRmAddrTx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$rm_addr_tx_nr" ]; then @@ -1778,7 +1762,7 @@ chk_prio_nr() local count =20 print_check "ptx" - count=3D$(get_counter ${ns1} "MPTcpExtMPPrioTx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioTx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$mp_prio_nr_tx" ]; then @@ -1788,7 +1772,7 @@ chk_prio_nr() fi =20 print_check "prx" - count=3D$(get_counter ${ns1} "MPTcpExtMPPrioRx") + count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioRx") if [ -z "$count" ]; then print_skip elif [ "$count" !=3D "$mp_prio_nr_rx" ]; then @@ -1917,7 +1901,7 @@ wait_attempt_fail() while [ $time -lt $timeout_ms ]; do local cnt =20 - cnt=3D$(get_counter ${ns} "TcpAttemptFails") + cnt=3D$(mptcp_lib_get_counter ${ns} "TcpAttemptFails") =20 [ "$cnt" =3D 1 ] && return 1 time=3D$((time + 100)) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 91a17ae81cb8..0f5e34c76bb4 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -328,3 +328,19 @@ mptcp_lib_verify_listener_events() { mptcp_lib_is_v6() { [ -z "${1##*:*}" ] } + +# $1: ns, $2: MIB counter +mptcp_lib_get_counter() { + local ns=3D"${1}" + local counter=3D"${2}" + local count + + count=3D$(ip netns exec ${ns} nstat -asz "${counter}" | + awk 'NR=3D=3D1 {next} {print $2}') + if [ -z "${count}" ]; then + mptcp_lib_fail_if_expected_feature "${counter} counter" + return 1 + fi + + echo "${count}" +} --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) (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 9172131A74 for ; Tue, 19 Sep 2023 04:06:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezhO08B0crhN8yklL7cuguwCuwgDoWHFtk0YY1XOsrG9FyENYgVXECliIdOoRbPg6I+YakleffxUmQkwsxurDHml3nx/olqL3aBqNCL/YTHn49vMT1aLlhwJ8tZvP44lIBMf9MyclOMn8q8RiH0DOQEaQ9S1s8xdvuLRkXvX9OzhyYGY/ENHiFb/L2UI/WupNqr8RxPGV7AhXSwnNF827efEwczwFUFMjYyQ5oyaLmNoXn7OT0KNEnOytBT6WKaTtYFw+rG6+S0EfsQNi5QGAWu94CzPA36U5/aBCfxss4fOsjFBxappIwoq5bNfGMr/0X2wA4Cl/IhGzeFmpyQO7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DfiUlnaOL6tni4TgrPOu8dYkMi9w0/0Qpz4rQ/NlGbY=; b=njPmlLo7+kbL0GR8C1/8MJro+zoDyziEBDytqDYtnhQrTd+H+9JURqznlxISpM+9CcNQb5pS/2M2KZCGPL6GcUuY2ukjld/W7bhPWnO8H0RnhuxYTLEQWc16m9b28lNdus/jrvsDSbFxCYGVpck1zO5azZm7b0pgoqDTJSOujOFQdEO2NniLHVDXqI5wKocVpmSxrJ0VnvvW0SrqycreOhghDcOXxnD8s7ELtuABerqDOmJ/+XL44tLeWOwVAEsM5BZw/pWRAUhKeE6ZxnFMRLS4kdWi1BEneoc1QlOzNgHD13ahcUvGmAQ9VX7UKZ6XQ2dmiX034guF8dAttq4Zug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DfiUlnaOL6tni4TgrPOu8dYkMi9w0/0Qpz4rQ/NlGbY=; b=AFtEIUgVXo/OGrBefvd/lH9LaJMYnmH9Yug5Fed690Zhkw7ScvxI7DEcj19mRYuIW005AL/WsAoTd659+v10vvWD4YpvXpfr/M3aIVCzAJvWLADJhzh4sI9t5HmM4bmU+0S40njvJjqIru4N+b5U4qfrEBiimTH0tWWYeeHr7nqW6z+zgZQsjv627MDn6iwWQP4xmtYPp9HxHdjOSSaJfhumIsy2cwhqcnBcEQCgCRmSKMg59iau/k4eUbq85hSTnxZKAfn5V5PfA2aCKqb8EpathFSv6BVWOS4P+pfs1LhTk1l0sxcLnzXrYbB6iEjGhwa1KZZtw0NPSvrOVzHrlA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:06:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:06:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 28/30] selftests: mptcp: add mptcp_lib_make_file Date: Tue, 19 Sep 2023 12:02:29 +0800 Message-Id: <8699cc3a83222a30a1c1173ca555ca58b277ad12.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0012.apcprd02.prod.outlook.com (2603:1096:4:194::7) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: e97fc610-629b-4033-0add-08dbb8c5c04e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jj80dok5qFZnBPRK4xKdeB4JqSMP4ZYa+XAfm5IQsWYx9Ec29XN5GUmoYllhk522+SQUBAuQH4LfaH0LoT2snFkYBCFIdJok066fzdaXpTX1fMt+ffaMyeAe1kcd+gWseaEOsa0vgSlUmA3IKWTkUhbymM73QhtB2ay3wfpsSsAVWTL+o2qrKLBII7UsHbr1T4SWkM8r/S0YHtUFV5VZJ/LSN480Ft8Hq3kNYGlBZZFo4fSsEdBjqcWrtA2LlLGu3gB0TOWoupF+HCWKiZ4D3UKxSqeCs9+CFmLQC5Klz7TySNGhtaK63Yk5uzqJRLOdtdthH/90OAZ8+UHI2eZ2e6xzI56WqQwt/Di/+byGk2ymp8J9ggmqe/YyPKLdkuaT21tCE63Gdan+ARd+84wptU0qwJYxAZhEzJzvc47YM9y8ruOpxnszoyHK8bTaPtxW6XDnOL16TJ8YsKcGeOrPsHfRW1kiSvNsVlpHATnwkvMDWOVOevZY+qFk82gYBCf/rj0o71q//dC/PuFJBputla2jj4KCxgLXjiQb+wLWhlao9JYIuApP0BUM6HHz+pYMTgZWWPVhwj0P1tRdZjM/gDD+lofFoPGWkIIuEKzC+Jw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Nca8WhzXEFHscBXzRFwptacAepQ2d4TIolFk3JqIibc1ktnp6WMvdlJtyDmY?= =?us-ascii?Q?KhBn6yB+y+J1y/Lczl8pr5pWf0tcmBiYnw+6ks7NQ7GkRI7A8KGND0rP9qMM?= =?us-ascii?Q?WMoxPVEFjnHIWr8h4uV3YUQSqNeFvsrXv7E8FexvILAse/s8qaBhyPGUOuTY?= =?us-ascii?Q?on/EkhlCluCQf5aZBHgz6vDPCF+dYEVoVTkHyUTcneFL+KR5OLtCsqcoNbWW?= =?us-ascii?Q?0SFKsm1kNdq0YA8ccTE6AUQzPqvwx+oi0tXVeg8T1ACyYCZUZfCqfDr2RRwk?= =?us-ascii?Q?ENG+7b+e3KK1uR5Y8LfLAgwmPalubeNmDXgb0BdDu796wTkYOARBnfkll9os?= =?us-ascii?Q?s1Lf8vdpTrQTxtTTq1d88Sf7leNOhxqHltyGEbX5OaMBsGbtuTTEpD5r0iEz?= =?us-ascii?Q?ybyRGOHck8Jwt+UKrkPlpL01gADC1x1EvPbNWtr9Ac9GmOYDy6gqyWQrHDgo?= =?us-ascii?Q?PBo0JWvvn9+5FeaQSlL7tQSivpntNghljhVN5f+ockaTBT/N6dxNR52F5z8V?= =?us-ascii?Q?4h3AMitq68losjWKpd81Fg51B52+vUZTt81Odz0rakSfZ5akHLM0MxObcPPB?= =?us-ascii?Q?HCU8rGoRgtSTSak1UVC1Zy7BIXDSS5SuuCE2lnwqhDmFivcVcG/CwxweN0aK?= =?us-ascii?Q?n0GuYDk1iuZuGSDByTFf4SQMaIJqJ+Y53n1sgLGhZW3Li/a5ggcAIddVSJvu?= =?us-ascii?Q?xCWq/XNb6LPXUNxEvHKZRcZd5Q8DsAWXsyrfQnGJPCPgUjWCp0wK1vAmBZDo?= =?us-ascii?Q?ULhXLd2SFofx9UcHdBzkz497Ldwu52AyIu6rLMu/MezgVF590vzQVT6tp4VB?= =?us-ascii?Q?hqhu6tvXbgfX6Pl93qypJAGagk9wFwfKbovE2Hx5CQNFUZ8ogzQVSh1zAHgi?= =?us-ascii?Q?+WgiDtcRWQbGcq3LFfD1fxgoXAmnmH9e+tfulTtXNtlK9yBD8VNiQ03b774C?= =?us-ascii?Q?/GWxKtzq6xFr/LdclOlBc0Bf5sZ93C9QCaXFzXRIsQ9/ocFSEJoL+PkdrsIP?= =?us-ascii?Q?QW+Z4nwUqxAorif9UZ2IQUy2A+GTR7FYoH8fZxlEd+gNjc4KxJXuQfOeJ0Gr?= =?us-ascii?Q?1j/sXLMzEw/zaqIzcqXei4Ye+tF2W2oeXuFsd7VkzaLmhQBXqCM2pqA+Q5hE?= =?us-ascii?Q?UB9Of9Wrp9tAHRSIRA8sZ84yukcB2tV3YrSDZjfP+KZmbrvaA8Sz3b/UUiRy?= =?us-ascii?Q?7BG2cxzLRIHg4DGtt5pK3/xwA2qbZZGN5LXc6BnJfWLwreni8A+0iMNeifVp?= =?us-ascii?Q?bEYYctlu6f4m6SdEbr1NYFLwvYTkb5XUjdZtzKE2Ef/hqBm0Wa6MbjtPs28X?= =?us-ascii?Q?MwotROkN/3SRItpKUteT9lFxVjS8gCcRRpnqBYN0uE8i9KlYUdEyqbY+PMTt?= =?us-ascii?Q?eLXfbfcVXn/j8oT2hju+Sq+Q6X/0PmpTZMj0W54lgCwpGeE5u0MdLSXAtIdc?= =?us-ascii?Q?wmBzjhQkgvHav9CH7RaSycJK1jifBTCUeA/+SMcpSByST+8is9Y2/Jkjefer?= =?us-ascii?Q?3BX3RgBRbRvpedPHoMz7qaXHaI3M+O3Bu0t39NnzbZC2oa1p4XFWPQozw5Ft?= =?us-ascii?Q?TD4lGSwGVrReN/tBllQxiIpUen1A8fb9rBrmYsKV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e97fc610-629b-4033-0add-08dbb8c5c04e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:06:08.0588 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gNMzPuNpGliDKueNAThn+SQ9EbNqHwpototgBUNHxzBkItn3HX5n3GqGHRAJm014SLjUTjdNiD65B7iPsbQs2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" make_file() helper in mptcp_sockopt.sh and userspace_pm.sh are the same. Export it into mptcp_lib.sh and rename it as mptcp_lib_kill_wait(). Use it in both mptcp_connect.sh and mptcp_join.sh. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 3 +-- .../testing/selftests/net/mptcp/mptcp_join.sh | 3 +-- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 9 +++++++++ .../selftests/net/mptcp/mptcp_sockopt.sh | 18 ++++-------------- .../selftests/net/mptcp/userspace_pm.sh | 12 +----------- 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 3b971d1617d8..dc4a1dd3566d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -592,9 +592,8 @@ make_file() ksize=3D$((SIZE / 1024)) rem=3D$((SIZE - (ksize * 1024))) =20 - dd if=3D/dev/urandom of=3D"$name" bs=3D1024 count=3D$ksize 2> /dev/null + mptcp_lib_make_file $name 1024 $ksize dd if=3D/dev/urandom conv=3Dnotrunc of=3D"$name" bs=3D1 count=3D$rem 2> /= dev/null - echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" =20 echo "Created $name (size $(du -b "$name")) containing data sent by $who" } diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 26ea0919810f..f88168d66fdc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1155,8 +1155,7 @@ make_file() local who=3D$2 local size=3D$3 =20 - dd if=3D/dev/urandom of=3D"$name" bs=3D1024 count=3D$size 2> /dev/null - echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" + mptcp_lib_make_file $name 1024 $size =20 print_info "Test file (size $size KB) for $who" } diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 0f5e34c76bb4..7b0d03c40f89 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -344,3 +344,12 @@ mptcp_lib_get_counter() { =20 echo "${count}" } + +mptcp_lib_make_file() { + local name=3D$1 + local bs=3D$2 + local size=3D$3 + + dd if=3D/dev/urandom of=3D"$name" bs=3D$bs count=3D$size 2> /dev/null + echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" +} diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index bfa744e350ef..39128fca99dd 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -245,18 +245,6 @@ do_transfer() return 1 } =20 -make_file() -{ - local name=3D$1 - local who=3D$2 - local size=3D$3 - - dd if=3D/dev/urandom of=3D"$name" bs=3D1024 count=3D$size 2> /dev/null - echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" - - echo "Created $name (size $size KB) containing data sent by $who" -} - do_mptcp_sockopt_tests() { local lret=3D0 @@ -357,8 +345,10 @@ sout=3D$(mktemp) cin=3D$(mktemp) cout=3D$(mktemp) init -make_file "$cin" "client" 1 -make_file "$sin" "server" 1 +mptcp_lib_make_file "$cin" 1024 1 +echo "Created $cin (size 1 KB) containing data sent by client" +mptcp_lib_make_file "$sin" 1024 1 +echo "Created $sin (size 1 KB) containing data sent by server" trap cleanup EXIT =20 run_tests $ns1 $ns2 10.0.1.1 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 98189b3f73dc..d5197d745171 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -150,22 +150,12 @@ print_title "Init" print_test "Created network namespaces ns1, ns2" test_pass =20 -make_file() -{ - # Store a chunk of data in a file to transmit over an MPTCP connection - local name=3D$1 - local ksize=3D1 - - dd if=3D/dev/urandom of=3D"$name" bs=3D2 count=3D$ksize 2> /dev/null - echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" -} - make_connection() { if [ -z "$file" ]; then file=3D$(mktemp) fi - make_file "$file" "client" + mptcp_lib_make_file "$file" 2 1 =20 local is_v6=3D$1 local app_port=3D$app4_port --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) (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 2611E31A74 for ; Tue, 19 Sep 2023 04:06:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GfZDekim6ffv0edbZJGKcjwDV2GNhYvF7a66v4JlwP7StlR4u40QJBAbHzFEUqCe4PSCrZJMIvO6NRGvnz/4R5YHiKDcksjb7OiHuHSgKqvpmwLAylewZlm/8bZI6OompkRwJEln0VkU55s65CEB5Mefevkkt2446bDCn/i5pEEgcWdj6omWDiBu9o2wf1DHImEpS8ST7DHaOWrad9GIiBPr+Yxq1VfTTt2LZ4wgUImM8V5dXWwKVFNgbblBjx5E8Uwzod8Z6AY5uXRFY57WVADL4OfmEu5keSCYiEmj+MRPMczN2/VRiu7AECDsQHaZId4j4hGce/wOK5PU4thxkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YIrW7/25Xrfd24slnKQx4+bibQeZAmVdI/AdCNiFfq8=; b=OzC8Q7d/cvd1+pnGw2DQ9PPUIoLR0Q5m72zph4rWq5sHaIlKwKo9EHnxaoBgqospwRCBA6TyG+M73C6KdOHt17fxTXhoN0Tg+4hV1pawarXb6oMet6KU20KLzOMd20MYDUd+NO9vLpO/584Rsp0IVJV6glGJz6dDi+fs5kqjwWOo3yypMEi4scMMeztrHU+EnPp7kB89I5Qv5+c8s5Reo+3lvOdR0L5KfMa7MqweymeHcMfTqACag1QXJJ4/JG3WH2mWjYNb0XJmH+sD/YcUY7G7yY0ucLwa6PwkFN8WxFrcNaUjNCo8pQwYp2RbLy4dslJXlZg2TfXvECl8/5GiWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YIrW7/25Xrfd24slnKQx4+bibQeZAmVdI/AdCNiFfq8=; b=vGMT8PH52gYlVbVXXjKpFN3tTLfuwzv2IwPRwm4ZFftuC0uxlPmz5n686FMtxMBJ+deMwYtLgXLYc4RTW3fXIChUVz6ppogBXGt9ciOaoTwOYHmcdA+UslnqbnWNd5gOWxMtoj9Uxn19AL2Yujt4hkSPXFiw5Ioej7rUJw2VnjBCCXqT8TmfJf/d3FfsnCB98vLTDwSFJ/GHHAHY2gSS6KJfjJj/YYjEc2oDTlKX9Y/1hE8iTbNs8o+OYXXWypuI4gWGX+vM5VDPEGczoErJw1XGD8lBRA0Hv4HNPndt7L2l/knJrwB4RgFFIRVcfSnuSruXnU2N5EV95v3/NShJvw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:06:16 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:06:16 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 29/30] selftests: mptcp: add mptcp_lib_check_transfer Date: Tue, 19 Sep 2023 12:02:30 +0800 Message-Id: <20c74b7d5dbac1c4a47d167ec64ae3b993f24dd5.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0008.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: bc5c1637-8112-4cad-0894-08dbb8c5c515 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lIk/B5fbXnM9u0vfw+6SSgPF3tCK2XcF4fDHoXRDs6L3VDvChn6ZrB5CE1hKgfV/xRMx+jUZnY9nki+phegDS73l7v482J+l2iLfHXO31zmdoYNezSRHfMdaesZ5JoFhXzFfHGDzk3IsDX1SMIY7RW7i9bIAZamqKKSS7Dv4602eq+75UHLNhHh/3qfeTbJavLABj3Mi+ikU5SPtjkBaAFzxRvNJg2DZmBrJGD3oLlHVmRugHChnia7j2KwCUvK1WpXV3v7q/vRdiRIM9XPNJmk+6Lt+ekWPzhIpHRyQn2Rl+aKcmnfXW7X4oL1ZQ5nZtnE2aN/2/0HKSdkvdetDQ7BSrDMqGHw4jIJRZz4mxIVE7Obx6+2uzelK7zr5qamnFnjgJoU/K8mBDSh9u7R2zD1SE5kfZCzd1yaVD5qXWkYbEM5jzEA3+nR5Xe97opB4nxwX0nBlxFv9smiCov11x8NjNcSlF6pJqbUEoryKv5fG9tvvs6SPfYF4xM84GjIV9h7pLIuTabpYk8QfE3GZpdqZvUrkwy4DTaqQcR7whFEallH/qh8KU2UAAB2XKylXvsJ6iRIJ/Zl1oF1eOVzX6MtKCebeoEr2gRx7C2HHIOo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o7pm0KKjgHiLNuFEYmA8T+3ltqUssNSTu1C1Mg0UYrmVaAVPydGAsUaeEiSH?= =?us-ascii?Q?NAoOdxl7JbMPoT2x0oMNZTHi0Inzm9cWbjhOgdOJbdLEtWBdi3L2cF7xtoeR?= =?us-ascii?Q?GbojUv6x6YPXr7AQVe1YPgYsxs9pIx+Q5dfA+8tnvvdGf0s7DvxfdcjK2SeB?= =?us-ascii?Q?7qO3clyXodFYnyuCODphb+fmL3b99ACl4TdhuOpBOhTdKFTPtAkSjzFhHNg7?= =?us-ascii?Q?REJU4vwLaLKEPFxfwEqPbZ0jIRrmyDB0JU0QPmlQQG09ADFdO8ZA5189E1y9?= =?us-ascii?Q?Q4Tm864+deeADyss7xtfVjvyxlWQRaoOIVPaYwD8LlClHcPlkeUliE1+RJjj?= =?us-ascii?Q?3+mp5pSFxxcpS9GmZFU2nVG3swxjyBfXdF+G9ZQyfbAx620FmNEnCkAOULGA?= =?us-ascii?Q?jGn8GP39CBbWU56CZCzaLoBAUtqKhf3ZZl8HGBPBHjhXyfQHZ+71yngkidsi?= =?us-ascii?Q?biDp04+GAhabl4xGiSD+fngEPjZegXaly/xutycYr1oVBmUP1/pIrnP+0jTX?= =?us-ascii?Q?WVWmhJtNWQ9qYdnXvPeVRtF4Djc6JjPWlU/3U2DbdChrn8KtrMfdsopkORGu?= =?us-ascii?Q?QlZfplN7iwlyYlV/HTGH3UBS8Eulna/w5u3fLLhT2FEW14OTRh/QVI1X2r8/?= =?us-ascii?Q?4AaPRCz4UbtQpSTCvLbIXKJ9SlI30PRPmDBt8eCAqt9op0o0PsG4YjFYtDNq?= =?us-ascii?Q?UN4gVrdX0rZU8n8gF2L6QnLWEAGG78Uk8Z9kEJNWOSJlRNAoE6Xc3wu3/MUS?= =?us-ascii?Q?WkW1nIJvSKFLZl86meq6DDI/VFH8SWkdsWEF0XcmHrp86234E+uWrE4rxywh?= =?us-ascii?Q?+ool8ciNeUupwINTMojFc9v2LxYS0cFGPV7BuyPnw4FCbnMyq7vsvYZVnrCH?= =?us-ascii?Q?427DzsCnIY1PW9WXbgWx4FbGO7rFOPv2G16Cnk5JZtAzeK4CSRNyTfrXa7v/?= =?us-ascii?Q?RXQd6TIiCda/OUPeEMPHrkdxHFzMDMbSTFfVatPsoUWJbkBI4LCyVlNmm6Mx?= =?us-ascii?Q?h1xX8+0KkvLyCWDfkaflyJOPpxz5Ih1Cua0ybmfjjvKVeldDvseit5/gM0d2?= =?us-ascii?Q?qbng7aHkWDr5YJ9F7jUSyAiwW3D+B9aGj9jHu/EbW+WeXKgKT5AmlGqV96GU?= =?us-ascii?Q?qyZhSI84srPh/0l5tVonUTHUmRm28rYiTYzLrylHGqmpXFYZbvuNGBBbkrve?= =?us-ascii?Q?sLaXUjiQZ76mq6L8r5cGRK9sPlnwoqQ8kq63bb28IWHC9XlAuj9ygo5N8JQ1?= =?us-ascii?Q?vNadZpB0yigF/xpss6uITiu0OtXJRGbH/YJxhjcXC1GXPvoeUQcORuONWdwY?= =?us-ascii?Q?wtMGWtoEIw5gNG0q9MNtE1NE5hqT9gidoVnfeB6LtrXuDUF0UObZplZ8MPWb?= =?us-ascii?Q?lxsrL1LyYEpTNtkRqafX1+cVQIZASPI73+Wd8aA+ynHiwHdQ6qVqneh1L62k?= =?us-ascii?Q?dGjc/KEmkUUraQ+2m9RqxTVSWl+rsHt4Zv7iCAA/CN6t3CbdfdEWFgYYhfR+?= =?us-ascii?Q?ipXA71evxVTTQZ6/yM+xaURfN6V43mv/nq6kwMCaIYNtz+G6AqNKabBJ3E8E?= =?us-ascii?Q?wVIxPUaAOHdPvNZfSHJsiyrBeMQQlGK1XGqdDUQr?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc5c1637-8112-4cad-0894-08dbb8c5c515 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:06:16.0643 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FURCNjjkYUOldjYx8B6O9IoDo54CTcVvBXxPTwwMzJE2ph+1MAzuDdhH+nTXhvVJSHVZ0JYhNNIOAIy857Cbzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" check_transfer() helper is defined both in mptcp_connect.sh and mptcp_sockopt.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_ prefix. Use this new helper in both scripts. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 29 ++----------------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 24 +++++++++++++++ .../selftests/net/mptcp/mptcp_sockopt.sh | 28 +----------------- 3 files changed, 27 insertions(+), 54 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index dc4a1dd3566d..0bd2392ae442 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -254,31 +254,6 @@ else set_ethtool_flags "$ns4" ns4eth3 "$ethtool_args" fi =20 -print_file_err() -{ - ls -l "$1" 1>&2 - echo "Trailing bytes are: " - tail -c 27 "$1" -} - -check_transfer() -{ - local in=3D$1 - local out=3D$2 - local what=3D$3 - - cmp "$in" "$out" > /dev/null 2>&1 - if [ $? -ne 0 ] ;then - echo "[ FAIL ] $what does not match (in, out):" - print_file_err "$in" - print_file_err "$out" - - return 1 - fi - - return 0 -} - check_mptcp_disabled() { local disabled_ns=3D"ns_disabled-$rndh" @@ -483,9 +458,9 @@ do_transfer() return 1 fi =20 - check_transfer $sin $cout "file received by client" + mptcp_lib_check_transfer $sin $cout "file received by client" retc=3D$? - check_transfer $cin $sout "file received by server" + mptcp_lib_check_transfer $cin $sout "file received by server" rets=3D$? =20 local stat_synrx_now_l=3D$(mptcp_lib_get_counter "${listener_ns}" "MPTcpE= xtMPCapableSYNRX") diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 7b0d03c40f89..fba62cdef2cd 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -353,3 +353,27 @@ mptcp_lib_make_file() { dd if=3D/dev/urandom of=3D"$name" bs=3D$bs count=3D$size 2> /dev/null echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" } + +print_file_err() +{ + ls -l "$1" 1>&2 + echo "Trailing bytes are: " + tail -c 27 "$1" +} + +mptcp_lib_check_transfer() { + local in=3D$1 + local out=3D$2 + local what=3D$3 + + cmp "$in" "$out" > /dev/null 2>&1 + if [ $? -ne 0 ] ;then + echo "[ FAIL ] $what does not match (in, out):" + print_file_err "$in" + print_file_err "$out" + + return 1 + fi + + return 0 +} diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 39128fca99dd..aa4b9a4e6a56 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -135,32 +135,6 @@ check_mark() return 0 } =20 -print_file_err() -{ - ls -l "$1" 1>&2 - echo "Trailing bytes are: " - tail -c 27 "$1" -} - -check_transfer() -{ - local in=3D$1 - local out=3D$2 - local what=3D$3 - - cmp "$in" "$out" > /dev/null 2>&1 - if [ $? -ne 0 ] ;then - echo "[ FAIL ] $what does not match (in, out):" - print_file_err "$in" - print_file_err "$out" - ret=3D1 - - return 1 - fi - - return 0 -} - do_transfer() { local listener_ns=3D"$1" @@ -232,7 +206,7 @@ do_transfer() check_mark $connector_ns 4 || retc=3D1 fi =20 - check_transfer $cin $sout "file received by server" + mptcp_lib_check_transfer $cin $sout "file received by server" rets=3D$? =20 mptcp_lib_result_code "${retc}" "mark ${ip}" --=20 2.35.3 From nobody Fri May 17 02:41:31 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2044.outbound.protection.outlook.com [40.107.7.44]) (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 20D8731A74 for ; Tue, 19 Sep 2023 04:06:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mVC3VydQqWnmlytW7iraj7lkACogRnS5EO0bR2osBXkK3CoxfSaMKnazHQQgYg0doCf4RFZLu10ewOoZMp55xHLSLJmM/gNXblhOy0Se5dzxgjkjhJ67qM+TWNkrN8jnfmoytsujHlKnd1j95ECeeqXLcJIK47vkBxZjJdlrA4Eth5myDbPfXO/DmznZQMlx3pnhEb5UiaKb9xw8gLMr8EFnv4IzJwXrlAGsiFriWssnJBMIHv2C1VX7yetH+09FjuzMMEDwkTzgYEst7Vq10LOkQkhW1ajWnT0T0fNQYH1R4axd9W+6h2Ph/6P/VtzNgtzhLEQt9UWyg83wBkzMEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kBnPHfYwLlS/wdkpFJPRYKmaNw+TgwYNUTCFG0e/PlI=; b=CPfSPS0WyNLvQ7riJKusMGgdgplT8PCwmEx/NN0DkZ2TOT3aoH/uryagez3PEIQ+CKcsvjMoQqSbF6vzawcU7SkccRU4pRxsYfW2xncPtcX9S4gyxIADzF/N4P7iKPV3MqtxRANulxMkT2VJrD7bAM4g/MjumfjWFmO1ZDcHIZhArmTCyUgLk+iICmKIRMLAXQ8Lus8lANoTpai9KG5/gEAP44hVk7Pe+Ntxkt93DSZaA0KWwJHvY/lukbZ+56qk9R61gbsxvccwY3nSU82GYt4ujG78j9p0zigfAZ2p6MtP3X/rR6gAMlDl8j+lHZ+z7++waLhflQ93nXGNGmCIww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kBnPHfYwLlS/wdkpFJPRYKmaNw+TgwYNUTCFG0e/PlI=; b=AP5b62/nkOeJRMCxLw1bAcECxsvXtNWJ7zYLMr4CN8tKXIZa+BPEPmN7FUcXopIDji9b8gkGnrrl6lIfKFYL3Qyg4SollSCuEUA1rt+MlsY1AupNSdI6sUnYXlvSNBm+dfcUJv2/bOGpI8IGNDvf380LBA6MyLZ00GdHVPyyUF+LiJqYH3rTkVoIraAbbL6HAnQifnczVzpHL27o/itpIVdITLAQ/7Pj9bEjdRCUtcwKkTRbmCvlQTi91jIR5Xo88NXoKSyQYtpOJ3Iu/p3y/y5aujUTEb6fKI+iHsQjB28B6o5gBy8I7LkTy47/ijpQcpFgG2jfbgg6sPv6qslmJQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8136.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 04:06:22 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 04:06:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 30/30] selftests: mptcp: add mptcp_lib_wait_local_port_listen Date: Tue, 19 Sep 2023 12:02:31 +0800 Message-Id: <32a7f528dfd2ccb083f99dcec9ad8b3ba9717686.1695095289.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0001.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::7) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8136:EE_ X-MS-Office365-Filtering-Correlation-Id: b05c6029-dffa-4247-2f58-08dbb8c5c89a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cZaGIF0ZmsbJ6vEDvqnP13s/LwJ8XazfGKoaMc4FhZgs1ol6oT9Ec0DrKOkmEW6ltwKnktSGS2y2dwuOUbr+SyMVfkXh6Mclk7tT8TwwYtmXYdvG3S7Js5KP41MzV6zoQ8maJbfxP0ulbpnxUUlxxYTX9RRLbQPo5SVhmlzaJ1dk1uZGiTHB9au0Jz+YivJK5PYx9B+iNNSilslmk0aBtf33Pnyy8XWXkZx1NlCGGjQxL981As67zj9NKdFMGPJsSTCAZJDLaKpHosjjcN201zmOhBZPdi7T0/hzyjRf2y9kJ3j+FGgc9TxlNY2ZQFTsErUm2z6SBZgK2hyfurlq8f0659j2OtbDD2v9eThsyNABF/EByrSCHvysbbXW6jHkvb71i/MWTyBwHZ8WmO+DNNJMY7cWwaxVrzGeg8TfB5V9zWltiwinQL47oBbyWvmeUPnYyr8sl4wQgsKJqrrq8M1ipi2kdlNh5UtWuX5Ctoki/1YMQTOP/6pAMbgIk9Cb0J9zTaEqaxvA4haDdBkwFRRMPOQ4sI09poX8RGwjnMpzxYI4eMbYReA5jo1EwI0VJLHzewHswPnFpu2nUwYXootHxaCVCRsHJT4uq1UpVuc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(346002)(396003)(366004)(136003)(376002)(186009)(451199024)(1800799009)(6512007)(6506007)(6666004)(26005)(83380400001)(478600001)(6486002)(107886003)(2616005)(2906002)(4326008)(66476007)(66946007)(8676002)(66556008)(5660300002)(44832011)(8936002)(6916009)(41300700001)(316002)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d/+cQfHkyFpjE9ftKYANDTdizcB1X7/qUNY3LiTGw5rfKPjB7/ejpK07f1gg?= =?us-ascii?Q?obLWxiSIM32p3J8He3XSjh95BHWvaZ0phCPLf52EcXTYZAY3PCZyooSU2zx8?= =?us-ascii?Q?bkSvM/akvWQD/HHdRQUK6JPhMEHlgxoi1DpIYy94og+J0W/PdPHUDhR59+jd?= =?us-ascii?Q?RfvSBC/GBrMnJzvIO8v1mLwnHDnpMqerEAaRe0qB+JjMibh3mIqJmz2aAPFT?= =?us-ascii?Q?UYDF8yrCUQ1n4H6zx2LlBkE9Au2b/9Y9w53ALVol19pZRNz4Wj/Z/RpfxAd0?= =?us-ascii?Q?MQ8CIj2kZ6zTUCVCRJOIWZz0AwYZXP0tvwgCLB3r3CvVwG+9WHqbn6yPjHRh?= =?us-ascii?Q?DpokCRvjQYtskAUjeP6UdHqqlUcaX4kgb8SlkFgMMO7qg8bkeNpnl6xr+rAM?= =?us-ascii?Q?Ru5y3hr5LSD6ltIRigb6f0q3UQKu6seLaKqazej/Z51nE00+8W1P0OBwiXOK?= =?us-ascii?Q?v7IEEibFCT/9wcIXX2xR38vw2lTcjDrlbkF0sFFqQaz6/DXvAp9x8PVfu38h?= =?us-ascii?Q?+losVEUaG5Z0TH6unHFwF+mmofB9pbt5bgKw62UUUQ0G52zMj5Ev3xzDV1Wd?= =?us-ascii?Q?QmLjyRpYPKKpTzbCFQmVD6wgTtORdLPMFwI9GjoB+OlgwrZuL8QLRrL8u6Us?= =?us-ascii?Q?dPre/2jCQITdbxaFQH1UMKBZDj7UIt9EtmiyOf2m6kX8yvy3TlBv7Uh9qKfZ?= =?us-ascii?Q?nKPCH70SAwFG9vibj+KoVJmrD7+R8eQsRtJknztne6EJ4M5PN1IIN4ScNG/7?= =?us-ascii?Q?77MYL1LiWRs+TIrEQaDNlwyKQhIxD8U6bmq4+dqvZKupabCUKheqW64Py077?= =?us-ascii?Q?HjqRF1cbejP/cGomTmZ0ypbIjqwp3nJdP7e2gkpESoSnocmHx4+CEQr8Ktao?= =?us-ascii?Q?ytLx1u6dHwRs2D9Y+sWYVIp98AvjEqG98sFARxs3xC0cOKv+JFRz3yE7JsEq?= =?us-ascii?Q?k6lEWVFBE/DE2c62QmKAQnqGQLDAQRUmbCkoq7qwPW51F2nyywadCZEnfg38?= =?us-ascii?Q?3ldOqHpQNT4pjAXG1tEGfUctmCAJTvX8xj5cOqAO7YrPJrTYstTGSL61MssS?= =?us-ascii?Q?gjbYVpC9MDTVwV9Ykdr7pWzCbxi6HnWCYPP3gPtjNRPR0Ql2ZdC7FJjqUjSq?= =?us-ascii?Q?bRYRgqClpjxHGzaAc8b06DnSnLS7WUOj4zTkKvNZd1KVreZQMJ+gIWg+FrXk?= =?us-ascii?Q?oDQjfZ3Vodpl6lQggmI3bpQot3KEP8n0TyCAw2MCfPAt00Mda5laihKERlso?= =?us-ascii?Q?At0tKmSBLJ+Uz4qgL8ZcYpcHgoeijnUkr9IcqTOQY5KMOcmIOZQd99wUm8sy?= =?us-ascii?Q?cZsrO4UNcXWri9+vBXsZVY4W6OQsiSSNn/PgCfuJgPb3ZCl8WhE6WPRPHS6U?= =?us-ascii?Q?Hm6OgXObSqHyciTJhYWURIIO1S2RmOu/IUXryMytkv42ltAhY0tR/g+oyYSq?= =?us-ascii?Q?lF8bgVvigJ0YacBupq9tSexAV5fkicNiXNsyI6PsImSLGgymGtSgRUwQD73z?= =?us-ascii?Q?6VNqZmZL0DUQEfk5QfHP/X86k73rXj8rIFzYQYL28u/ir58agyXgcK0tHKn1?= =?us-ascii?Q?CL54xBMnQZxBEalBfxYq0I8hz2FUu0yKbQQVBhUr?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b05c6029-dffa-4247-2f58-08dbb8c5c89a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 04:06:21.9516 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KlaNGtlG4MteaARRttqOzuGwN9VTNuz/WaWAMsEKwjyWmulb1sU43NecUgKwV2VRarRf4HitmVjD3qzpbNjs1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8136 Content-Type: text/plain; charset="utf-8" wait_local_port_listen() helper is defined in diag.sh, mptcp_connect.sh, mptcp_join.sh and simult_flows.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_ prefix. Use this new helper in all these scripts. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 23 +++---------------- .../selftests/net/mptcp/mptcp_connect.sh | 19 +-------------- .../testing/selftests/net/mptcp/mptcp_join.sh | 20 +--------------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 18 +++++++++++++++ .../selftests/net/mptcp/simult_flows.sh | 19 +-------------- 5 files changed, 24 insertions(+), 75 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 85a8ee9395b3..95b498efacd1 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -182,23 +182,6 @@ chk_msk_inuse() __chk_nr get_msk_inuse $expected "$msg" 0 } =20 -# $1: ns, $2: port -wait_local_port_listen() -{ - local listener_ns=3D"${1}" - local port=3D"${2}" - - local port_hex i - - port_hex=3D"$(printf "%04X" "${port}")" - for i in $(seq 10); do - ip netns exec "${listener_ns}" cat /proc/net/tcp | \ - awk "BEGIN {rc=3D1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) {rc=3D0;= exit}} END {exit rc}" && - break - sleep 0.1 - done -} - wait_connected() { local listener_ns=3D"${1}" @@ -222,7 +205,7 @@ echo "a" | \ ip netns exec $ns \ ./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \ 0.0.0.0 >/dev/null & -wait_local_port_listen $ns 10000 +mptcp_lib_wait_local_port_listen $ns 10000 chk_msk_nr 0 "no msk on netns creation" chk_msk_listen 10000 =20 @@ -245,7 +228,7 @@ echo "a" | \ ip netns exec $ns \ ./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \ 0.0.0.0 >/dev/null & -wait_local_port_listen $ns 10001 +mptcp_lib_wait_local_port_listen $ns 10001 echo "b" | \ timeout ${timeout_test} \ ip netns exec $ns \ @@ -266,7 +249,7 @@ for I in `seq 1 $NR_CLIENTS`; do ./mptcp_connect -p $((I+10001)) -l -w 20 \ -t ${timeout_poll} 0.0.0.0 >/dev/null & done -wait_local_port_listen $ns $((NR_CLIENTS + 10001)) +mptcp_lib_wait_local_port_listen $ns $((NR_CLIENTS + 10001)) =20 for I in `seq 1 $NR_CLIENTS`; do echo "b" | \ diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 0bd2392ae442..d6e3ef786694 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -310,23 +310,6 @@ do_ping() return 0 } =20 -# $1: ns, $2: port -wait_local_port_listen() -{ - local listener_ns=3D"${1}" - local port=3D"${2}" - - local port_hex i - - port_hex=3D"$(printf "%04X" "${port}")" - for i in $(seq 10); do - ip netns exec "${listener_ns}" cat /proc/net/tcp* | \ - awk "BEGIN {rc=3D1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) {rc=3D0;= exit}} END {exit rc}" && - break - sleep 0.1 - done -} - do_transfer() { local listener_ns=3D"$1" @@ -408,7 +391,7 @@ do_transfer() $extra_args $local_addr < "$sin" > "$sout" & local spid=3D$! =20 - wait_local_port_listen "${listener_ns}" "${port}" + mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}" =20 local start start=3D$(date +%s%3N) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f88168d66fdc..d11a2289f8f5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -577,24 +577,6 @@ link_failure() done } =20 -# $1: ns, $2: port -wait_local_port_listen() -{ - local listener_ns=3D"${1}" - local port=3D"${2}" - - local port_hex - port_hex=3D"$(printf "%04X" "${port}")" - - local i - for i in $(seq 10); do - ip netns exec "${listener_ns}" cat /proc/net/tcp* | \ - awk "BEGIN {rc=3D1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) {rc=3D0;= exit}} END {exit rc}" && - break - sleep 0.1 - done -} - rm_addr_count() { mptcp_lib_get_counter "${1}" "MPTcpExtRmAddr" @@ -1073,7 +1055,7 @@ do_transfer() fi local spid=3D$! =20 - wait_local_port_listen "${listener_ns}" "${port}" + mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}" =20 extra_cl_args=3D"$extra_args $extra_cl_args" if [ "$test_linkfail" -eq 0 ];then diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index fba62cdef2cd..1fb0950ce44d 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -377,3 +377,21 @@ mptcp_lib_check_transfer() { =20 return 0 } + +# $1: ns, $2: port +mptcp_lib_wait_local_port_listen() { + local listener_ns=3D"${1}" + local port=3D"${2}" + + local port_hex + port_hex=3D"$(printf "%04X" "${port}")" + + local i + for i in $(seq 10); do + ip netns exec "${listener_ns}" cat /proc/net/tcp* | \ + awk "BEGIN {rc=3D1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) \ + {rc=3D0; exit}} END {exit rc}" && + break + sleep 0.1 + done +} diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ce9203b817f8..ae8ad5d6fb9d 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -123,23 +123,6 @@ setup() grep -q ' kmemleak_init$\| lockdep_init$\| kasan_init$\| prove_locking$' = /proc/kallsyms && slack=3D$((slack+550)) } =20 -# $1: ns, $2: port -wait_local_port_listen() -{ - local listener_ns=3D"${1}" - local port=3D"${2}" - - local port_hex i - - port_hex=3D"$(printf "%04X" "${port}")" - for i in $(seq 10); do - ip netns exec "${listener_ns}" cat /proc/net/tcp* | \ - awk "BEGIN {rc=3D1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) {rc=3D0;= exit}} END {exit rc}" && - break - sleep 0.1 - done -} - do_transfer() { local cin=3D$1 @@ -179,7 +162,7 @@ do_transfer() 0.0.0.0 < "$sin" > "$sout" & local spid=3D$! =20 - wait_local_port_listen "${ns3}" "${port}" + mptcp_lib_wait_local_port_listen "${ns3}" "${port}" =20 timeout ${timeout_test} \ ip netns exec ${ns1} \ --=20 2.35.3