From nobody Thu Apr 25 04:06:14 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150043.outbound.protection.outlook.com [40.107.15.43]) (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 61F007C for ; Wed, 16 Nov 2022 11:43:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nKxB3yWmbnMphnlsVSFQOiMwzKsyBgengo6/lVa+J/IZBUwftrOB5SH5OeGoEU9ONfJ8vGj8RDvGssN9qSk0ycjuLmb8hUP0/5ce9DQJbMDhy6DBBWqQNEgfFTmE9EyCsCPBkOBF9TS9VpS1Qo+ajknBf31Vp8UmP5aGTx0s3JCoah8GQb9GtHp5y6FNLorrEalFgJPAlH3VISOn/uWLH7WQEwan5Q/wBp7v+gs15quRSFpFIGhRYwkwBMj7FeTYNJA+kUQN4OfN90h6kiGz5u34OHhai+zjvEppEyzKsPHfpkvqnx7rAhFht1pARZNpqps91d47vKhk6L4oWAyupA== 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=xWVoBgbqICvnHyTOKHD9U8AxgUnegZuHdpJ4yDiYJyE=; b=H7Vcnz9v23pxbWmS4dnMGLfSGiCyZXHoz3Jv7NZZcxk62QZOtDjroDKfZ0ewMVHAaqAC90JHegISQ+yoe7wzL7LlHmMg24XiszXq3CVnuVOtrC4sAxG0+3xBlYgRwLmWOSqdq8791Mez55ahw/2QOmlI4OCvvu4Pnl09rqwY+hNQPmQcJKIJKAx+01tJU9Ju4pzDokJQ9wXr8pI2uWwHeIXUIF0GKeWyy2vgpjgPnqiVdSbWprAF+joL0YTCfg/XR/syY1MJ5td1O8T1JXYCn/+UqaoZ+0MKVSkS/a7tuCq6k+UXXiypN2Lvaa/z7Cm9J1x05/+2OeIW9Ez+JEGA1Q== 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=xWVoBgbqICvnHyTOKHD9U8AxgUnegZuHdpJ4yDiYJyE=; b=BrZ7xGWbJxfNQ5tOv/tEn0DHb1rHr12WO5eyIgX0talTFUpQCXTSwng2tn7JB6AoGW5WQLeqS+Ov03NQ6XCOKUwDKVl1DcEhrD/d9p77vGvLi1uoDVLHn1zwOpAcHZDxTfC/xOXYDLEuHHXmptBnAodIeALsvUQTE5skU6160pBsPVoZWSCeukSJEpvpGKCs7NrmlXi7Ldvr85oMn9Br3apf6uztewWsqshNrKfpe5wOt78VtwrT9J9tAVkOSNuB+hO5Utw3oYjXrEy0aOZ8TmIYXgXKXzYs3t+Z5QuGaDgi/txwq8Ccr6ibGqY6sFAiPOsPbifHoIfKm9ySw2jWkg== 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 AS4PR04MB9434.eurprd04.prod.outlook.com (2603:10a6:20b:4ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.16; Wed, 16 Nov 2022 11:43:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 1/7] mptcp: add scheduler wrappers Date: Wed, 16 Nov 2022 19:43:02 +0800 Message-Id: <7491f4f854be68092607ebaaf21c2bad3f4dd951.1668598782.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0181.apcprd06.prod.outlook.com (2603:1096:4:1::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_|AS4PR04MB9434:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f2a6822-e3c4-4b0d-13c7-08dac7c7b641 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ayz1eisL0gUGKu5zN++bYzkI6F3RpM6evQ8m+uZtO5SsUzgY213ppSrtS3xBuBLTvkSmmFTBAFGPi//h+FH3R8J6bqGClszzO+3GCS/+Z33zAoFDI6Ikpxu51eX00Uo4iOCriTh9d+ZvrJI3Ar9Q7adR7GH0PVQ90ooWn6BLQNlcDuRzmjmTDhG09Fi8rT7bbCpHKucoR0vN7NrI1urT7X9h1V24WPldlTVc+PwzmID2ZkMhQ6Eit8UxUH42xvOcqoL3J+jDWta7FhPo5kjOLeJ2uIjJTS2gAHH/stepxsupd5cypKi1CXp13J0t1stHuttIKB+JzfBkSw6I1GHT1MumSk8Ij7BeiNI94VPuehW6K7P8mUVzaeh3dTMFarDygOGzNGARPdU/Et00jeYwvyxKuDLAjNoX5iGePoOkdmyOGZFHK9WWsajrsUrNF69TWqxPGTRDXBDwt00BbXOj6227zA00kcfZLFNqchhO81oZHeOj+IQCROjEb/WaTMGDNFFELteNQp+jL2xYkpx9+xCFCFcmmw2SRAyoTWSSkO2aurcZFy4KLVUAyKifzpiHUGuoJKgrQfSuURMSvbyn8DC0uLe0DUWzkY5NOMGk3PPJJdezjrurUrSjTRGmPJwLEF81ZvmYvWDCAlHcxAr4VHMVKTXxcm5g73Q5xK3OmOaOHhUiGqA46VVMPJ2VcMTlj+ieQ4ckXfOu9u5k/I9vcw== 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:(13230022)(136003)(396003)(366004)(346002)(39860400002)(376002)(451199015)(186003)(6486002)(86362001)(478600001)(83380400001)(2906002)(8936002)(6512007)(5660300002)(107886003)(44832011)(26005)(6506007)(36756003)(2616005)(316002)(66476007)(6916009)(4326008)(66946007)(66556008)(8676002)(41300700001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gr0ar6MdsmERAXUasnhWcJvEFZoA8lPoXuCuQgUvV/bn3/AJTjlQ+AT1+08f?= =?us-ascii?Q?K/L3eNghpXmc1uMa3kYgtWEb+CLJTY97VO4YTRlqWCxesfGOeMb4ydf/0feu?= =?us-ascii?Q?QTqYl6yNfydrqj21Yf2JDyoNM8inCTmzNDUILSAfTJkjpMSsWLjFc2Xn6mjB?= =?us-ascii?Q?qYurW5xIqUl8f75pN39j7n2jB2KO89JXBrXeI6c0F66G4siZ3MrafDJNXNH1?= =?us-ascii?Q?oPwq9wsELTJ9s+gjf0y1k5+z/Ie5QiqevPuH71acLGHYjo82in5fFzymsRlx?= =?us-ascii?Q?HORCiiCGN60zWx6FbtYwb/p2m3RpqHp15G4+Kr7hatVDqH2Y231E30fwE3nk?= =?us-ascii?Q?HWMCy6WXXA7uLMpiJwDcAtAbi1pQlTFo289UodlZntL8drf0IX7CAWA3VkPT?= =?us-ascii?Q?/mUY+jEQKWGdILv/b08bmP2me60F+ylg9I2O7KrMMsFdNREkWvb1159lcBkv?= =?us-ascii?Q?LSU2VCGQCtRH/WQY1EnJQmsvcGj8qyOLMcBsEjSSz27bQqQJD8uSSK+IfooW?= =?us-ascii?Q?V649sG1ATbVHdV+IdIpPMWDlB7rKP2scpGp1Vtpf+YDqMrvpuHvbjY8tjKnm?= =?us-ascii?Q?5NBG+6WSvdNm8OPVx6Pu24dN3zepFPgG4OvbkNgu9zkpfokw7Vji6GNhJS19?= =?us-ascii?Q?v19W5WQ+hXLFU+pVj3TYr23MPVPbkU16bOL7jkGPqSC2v/8ZtstZ2daKIYtZ?= =?us-ascii?Q?6DT5KwMlFlHsWj3RbwaXUjro13E6FL3gCdmSuok/KSUwdDm/5KlxkBxPzlEf?= =?us-ascii?Q?FIOQsX8IseqVGnnZ9za8mu750uUUXF44NjEncUbLnp1aKHNeTmXL/hQaA8wW?= =?us-ascii?Q?1sRyortazoRESDXqNv7UXxSZmuvA9H5jgWh9nrkvIeMU71lzmDgVUgipOhMO?= =?us-ascii?Q?q5p6NcqhN0T/VvxjlDifsfqMeUC3DdngP7FI0ryXoRUDIjpe1ZEb8WDd7g8p?= =?us-ascii?Q?9cRy1AMGltqMb47FvHVidKpv0ddTurM2VOy1kKVWm2jG7EWm81tj4OyhprYT?= =?us-ascii?Q?QqpKd22b9oDg3avdREqjB5Gp0TMSU/HDpMLAUiouSYxTeLVqiOTE4PGDb+A1?= =?us-ascii?Q?qnBXEKfsJt9jLO38n+xGuVyPvZo2EXz7Oyg/uvrWBdKVYjjdD4yPCxSp/f5T?= =?us-ascii?Q?wiXbkbFiG4w47GP0/5OT0WiKVJAz1XUkpZDWUS+1aISZL+RrBqxX+tbIMKGG?= =?us-ascii?Q?vguTErH4I8a7VF0A4Kn9IY6Tg2XmaMJDRU9PztX9rMZMwBTbRK9oRWGWMASQ?= =?us-ascii?Q?jP88KYrr5QuobCmr3UXN4psA2ao0+alr9V41magS8lo8MTlB8iZi5TqODN4M?= =?us-ascii?Q?T1G4x8K8EQ/0uEw7rsGivC1jYatU0AZ1bbrqxkMvkcHCUDBUHzsG3bO53NZw?= =?us-ascii?Q?AUWUVKS34O+6Gd0466QOCb/qp+QzSJyR/0ZjLEB0Txf3uQP9qtIRJrGBJm8Z?= =?us-ascii?Q?FdhvH3c6S33sdfwtE0ucxJClpmy4+4VUcupBMgwTKx4Q86OoSbutFzOBmtsw?= =?us-ascii?Q?WYeBYdNCzn6kcDioDD35fYF6VIAaMQQFP0bLw1UV169Xp6lJGlaPbb56yQgj?= =?us-ascii?Q?5OwCvwz1mbtM0LeH9FUGh+uM4b9+oKn5XKS0MvgWejyBGYTYuSLBc8YI8EX3?= =?us-ascii?Q?kw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f2a6822-e3c4-4b0d-13c7-08dac7c7b641 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:42:59.9921 (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: efHvHRDfOekSZErr7QusSnzB83htZ73901QVKauqPBBN2u8IHN8pnvmZQaNz2qfsKqGwp8mbe1GmRWnps7h1Rg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9434 Content-Type: text/plain; charset="utf-8" This patch defines two packet scheduler wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke data_init() and get_subflow() of msk->sched in them. Set data->reinject to true in mptcp_sched_get_retrans(), set it false in mptcp_sched_get_send(). If msk->sched is NULL, use default functions mptcp_subflow_get_send() and mptcp_subflow_get_retrans() to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 4 ++++ net/mptcp/sched.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2e60165c0eb2..6531df5ef4dc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1397,7 +1397,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -2213,7 +2213,7 @@ static void mptcp_timeout_timer(struct timer_list *t) * * A backup subflow is returned only if that is the only kind available. */ -static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bae216bff6e4..8536035a71d0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -652,6 +652,10 @@ int mptcp_init_sched(struct mptcp_sock *msk, void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); +int mptcp_sched_get_send(struct mptcp_sock *msk); +int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 0d7c73e9562e..f51f9cf20b6e 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -112,3 +112,51 @@ void mptcp_sched_data_set_contexts(const struct mptcp_= sock *msk, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; } + +int mptcp_sched_get_send(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + if (!msk->sched) { + ssk =3D mptcp_subflow_get_send(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } + + data.reinject =3D false; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} + +int mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + if (!msk->sched) { + ssk =3D mptcp_subflow_get_retrans(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } + + data.reinject =3D true; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} --=20 2.35.3 From nobody Thu Apr 25 04:06:14 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150080.outbound.protection.outlook.com [40.107.15.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 DCF507C for ; Wed, 16 Nov 2022 11:43:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KXWCYJOOGZ+7ULDYkxlW54501B70ykoi7176+RUyL+4cYB/pYsellfRhv+VKvf0zzFkf3Gq7S0w+D/kREJsc2gT/nnOCOUxjt0YnfbIqB1go5PnRCvz7C5dKti+iIf6KPu1bM5PPPdI6UXm9f5R49Jdm2k6/SaMco6VADxjCoPcBtUNg9T5cDnCg8YSIzdfLq11fkwhph4gf3S0RoIfsMZXllKSdFmKiPZiYQA4JxDlFMLrd4PMbbIRn8h+35E56hemirL+lYiQ5FeKuX+8BEwLJ9frXUwaWt/ZpEwLDKDVpXqSAT1A/RU92DOQM/7NgXqg5C5nPvJskvd+QM+ko8g== 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=EBu1Y9mHKUmsHLjrGIO0VACl2swVy7OHQvA/aEpjtWk=; b=b8yOptPu+MK8aTOUkwsrmTgjrT+Rq3Tyk7vjpGfohQjUeddB4BARFN7BobjCxkPczg5Gu4iEpCKwLJTDB+0VUrJaxM2Q9yeYcCfuSOlNBhatkSTzIqQNK8OMEo5MEsd3gbDJoAZ8DUXF9IOcEBkWugRaDMPOv55gb0Y2oSle1SbbLZ0bEYT6ylOW9gFUiSd8I3wO+WC0Zawq7iQXOaOnRDwgQjBK3/qu365LHVT4N+IF9yiRZeUqNYnHACmhrHjIyKnmd9nY90VK9HLKSzuw30lIgWL72qafNNcJO7eROFQDiWzvuYlgZzd9oVWv5RSODAER62bigxIvRhHV5sBghw== 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=EBu1Y9mHKUmsHLjrGIO0VACl2swVy7OHQvA/aEpjtWk=; b=hF2irtJomI0C+xNnjmAk4WfusW/aoFoA+PXFiyse3aVuoKYbMO4/ebZMET9VzMVqhdBUdtEydPRuXWwgwm9d1/X18AVyMLoEJKs0ZBBF4dNfTGBNhrbFPMfIxbut0Y17vJFdIOQdUGWhhe2kC232gnz0r7kloPXIY579ZD3qg1Lx2byL8sIg/Agei+ILN+FTFkRnfGEhD0lee4CK+tqRt9TvjvPltH5lEFkHfJh7lC3aTwDT4tLwXPiakLgq/klyhgjuq2pvSdWxnB+RU61N2Ea0b84/59YMPeqoA1gSY4NaMrHdZL/AgwCGWD3T2gbJAdBTCDlYYfLwrhj6DhuhoQ== 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 AS4PR04MB9434.eurprd04.prod.outlook.com (2603:10a6:20b:4ea::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.16; Wed, 16 Nov 2022 11:43:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 2/7] mptcp: use get_send wrapper Date: Wed, 16 Nov 2022 19:43:03 +0800 Message-Id: <5ebe73a0638e916ffe03b9354bc0dfb1c6027224.1668598782.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0007.apcprd04.prod.outlook.com (2603:1096:4:197::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_|AS4PR04MB9434:EE_ X-MS-Office365-Filtering-Correlation-Id: 169d7c09-be63-4e45-fec2-08dac7c7baf4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6HH9WIm43IKBRQmEa96kkY/hngSgoEt6x8mfdYEHyPCX0z8kQfHJruWwAQH1Xf5of1nsWVQxxdgnjx5holnNIBoQPgAZInVNYjdx7kVZq1j+rBMGK09pHaH12YJwI4nCjfxlWwAP3iRkkjGYAkN/ttYiLiUwiMkuaXxuqj9Hsl3uHyrr2OPwzWRACiZ75iBHXTsQn3PoYKwkpa/FNn5OuhBlcktrLwBW6r/9muwpn0hVud6gFH1t6JU0b9mNrSJgMR6DWAKKVHCx5/hFoSqgGNh6jhK1/tGJeWuZ99hR+ELzrGKiVC2dZewWVxT47iJQs/XthS47Ctl60LVOXTCAJBDHdac08nzqTNq+64MTBt+xIRtu0qFDXKL+SkroE/3IHCh+b02Z72mo4Z0LZSOZ5gKFjGHlIKawiB5SwrymFAnX7QbO3G3nKePGVdJVXQc3P9oCFm5WzA19ZUHf9LL7jnjQ7SUCwPU5TQVY2wWttvZ6mSSQZ/tW+2BEsJoGSq9e9QWlL4q+dfC4TF5SfNXNDbcZw749R1oFfUm9bB5tOaIzsuch3PFc95sMpARBnkWJA+6Jtnr71/dT68NmA0TJ9ck1wxUZh6aTiDwflXO7yVmen1lgHeupRoGiTdPEP8lzF3wDQ3tUNM0VCUq/ivArcMgaZPeDHC/+k8YvbycUdbMwaKbHfOJT6QswfVnUuKU6S8btklvsf3n0MlOvT8222A== 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:(13230022)(136003)(396003)(366004)(346002)(39860400002)(376002)(451199015)(186003)(6486002)(86362001)(478600001)(83380400001)(2906002)(8936002)(6512007)(6666004)(5660300002)(107886003)(44832011)(26005)(6506007)(36756003)(2616005)(316002)(66476007)(6916009)(4326008)(66946007)(66556008)(8676002)(41300700001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pju//BCP/Di429qlOnAvi2VEG0j7HdoP6XHgteYaG/PUpt/zuhrChyLTnnCE?= =?us-ascii?Q?HdkJl3Xu/nzjP01HT+sVzNDX3k2pJCkbUna9erPBQM0+rnoCHTl66qAS66ps?= =?us-ascii?Q?i/tmPX+8rfiwXF2lLbtCeGLQvM+qo+C10+AfdOzM09DJ104a/tXL7HpYFWbf?= =?us-ascii?Q?XlvCwBVjBpZHJriOGJHk5PNIcwu/YuM9qV5JnHd8yRINjr2loTsOxSjK35iF?= =?us-ascii?Q?YrUmCk6tqP4kmnAlcjqNvzmPezfFsu2U9gM/J8+5qMn6tnf4DAS5jLLcR87a?= =?us-ascii?Q?2csO3x96kPjDlJiXZHkvvnFjiItv1RLgQFwwZr1V8aWdvSPiuqbH7CEw3ZiB?= =?us-ascii?Q?Kq7PEUZsnyBeDVwtiV8a8vwKnmGA3x/KhXnEj3aHcmu+xjc1WSkTzzeV/iyq?= =?us-ascii?Q?IpgKplsYkk34nxqKwHL7qEd3Ewn3m9NiYBRAlWhPsmFfnN3KHB0LXS6l1bO6?= =?us-ascii?Q?h8fAPCoVNxcA5T9BAxMVUn+lKM8t4D8IN6bkl4vJKIj14+emOIuUKt1yFFL0?= =?us-ascii?Q?CTaBCNGS5LEV0vicKdJCPfNrDDJckX0WLVgDwRK42Qz2ZiSadlV/wNlEO7G6?= =?us-ascii?Q?yGbI6IhXmsv/3MYYHyr7k09v++bhAasv9OJNa/1yx1lLqzzIYslBf2UxG42e?= =?us-ascii?Q?hw+ZxB7QXi2M74xPK73JKHwIDzIDlvFb2Uqb3sTJ44nPKOc1ecTlKE0rl2hE?= =?us-ascii?Q?LCHf/MV3DO3pR0DUaNGuu8XjLGE6v/azh117nal2Y13aSt6gBxN2MwPrl5qG?= =?us-ascii?Q?f2NPX/vJk9kvGXGC116dsjZBW0cm8dJaiYcPCFzYeNNM7d3p71OrPmJVGYTE?= =?us-ascii?Q?NWwQbWQySxT5yjG69MrBFE62x50CUr79HWY9iyn5MOUExTRaBJ2UyyVL/dsY?= =?us-ascii?Q?ghJoUtUAfCRlrn2LxoIuQeeRaArG+JtuJQIthC6vmrHELPmCdKrcwX2q0tw1?= =?us-ascii?Q?YaOdwZIrfHDjxLFwTK9oZUPrRz/whrdDABISuttdG0XBKlRpPcnH3oelUnuP?= =?us-ascii?Q?NexPl1VEUtzgwE05BtcPB9ZZPiufjZI9NdmjIK3m/TS/ge6fQAgFgLmNoc5f?= =?us-ascii?Q?R3hRgG4Qv/imZudVNdrIzSedRA5kinCpX8/ZwpIPbIPZlTLImgxh1Xbowbla?= =?us-ascii?Q?+vA+YAnW3T/VNRTIIgMj5PnsDq//q8JYhq+UN4wmVDxO/8DOVPB5pZ7rYrlY?= =?us-ascii?Q?98J4KV7EVJCbPO/kZido2yduUPxjCXAR584dJ9TKIpoGqwObPf0mRUML1pf0?= =?us-ascii?Q?UEKBfCf0a5PvzcTqpJSdgA/p/G8HnDqQfFSfMS8abYeDwQeV0G9qqnsoMHO2?= =?us-ascii?Q?L/1ZDdQlczPHjKp8DuHti7k1V5xMAwHhqYJNntFdMG9YRxTGkhxBdbbIafpK?= =?us-ascii?Q?KSQq/kAzS7VUFWk3c/yrs1y0V4YuMUVvn5lBGHRMV5+UDokX8lRbK2YbQ4KF?= =?us-ascii?Q?XAPyIBOME8FkSwsrTu5vENUsZnUbrKeyHj5J6c+12qsD6ezltbySv2gK94Fa?= =?us-ascii?Q?TUOgJN/B1KacoYRsG1ZKpmMyFgL8iVv+1Lph7SGIhmMS/NOpwUHsSzOhIvEM?= =?us-ascii?Q?YOjnF4FGSZV0lC0k4YA9BdUOQhvcbHRmCOeGQ55Gj+UJuuaPREGI69FN0Cao?= =?us-ascii?Q?BA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 169d7c09-be63-4e45-fec2-08dac7c7baf4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:43:07.7258 (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: hg83CuwbQibS21AGFN/feP+74VUoTH7oKSmhCKf0xCOs4sIRgrHaGBEI+VcsbHYqbYPK+iHluACH/EQlOB/Vkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9434 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_push_pending and __mptcp_subflow_push_pending. Use get_send() wrapper instead of mptcp_subflow_get_send() in them. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Move sock_owned_by_me() check and fallback check into get_send() wrapper from mptcp_subflow_get_send(). This commit allows the scheduler to set the subflow->scheduled bit in multiple subflows, but it does not allow for sending redundant data. Multiple scheduled subflows will send sequential data on each subflow. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 119 ++++++++++++++++++++++++++----------------- net/mptcp/sched.c | 13 +++++ 2 files changed, 84 insertions(+), 48 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6531df5ef4dc..f3720923b22d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1408,15 +1408,6 @@ struct sock *mptcp_subflow_get_send(struct mptcp_soc= k *msk) u64 linger_time; long tout =3D 0; =20 - sock_owned_by_me(sk); - - if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return __tcp_can_send(msk->first) && - sk_stream_memory_free(msk->first) ? msk->first : NULL; - } - /* pick the subflow with the lower wmem/wspace ratio */ for (i =3D 0; i < SSK_MODE_MAX; ++i) { send_info[i].ssk =3D NULL; @@ -1563,47 +1554,58 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) { struct sock *prev_ssk =3D NULL, *ssk =3D NULL; struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .flags =3D flags, }; bool do_check_data_fin =3D false; + int err =3D 0; =20 - while (mptcp_send_head(sk)) { + while (mptcp_send_head(sk) && !err) { int ret =3D 0; =20 - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); - - /* First check. If the ssk has changed since - * the last round, release prev_ssk - */ - if (ssk !=3D prev_ssk && prev_ssk) - mptcp_push_release(prev_ssk, &info); - if (!ssk) + if (mptcp_sched_get_send(msk)) goto out; =20 - /* Need to lock the new subflow only if different - * from the previous one, otherwise we are still - * helding the relevant lock - */ - if (ssk !=3D prev_ssk) - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); - goto out; + /* First check. If the ssk has changed since + * the last round, release prev_ssk + */ + if (ssk !=3D prev_ssk && prev_ssk) + mptcp_push_release(prev_ssk, &info); + + /* Need to lock the new subflow only if different + * from the previous one, otherwise we are still + * helding the relevant lock + */ + if (ssk !=3D prev_ssk) + lock_sock(ssk); + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + if (ret !=3D -EAGAIN || + inet_sk_state_load(ssk) =3D=3D TCP_FIN_WAIT1 || + inet_sk_state_load(ssk) =3D=3D TCP_FIN_WAIT2 || + inet_sk_state_load(ssk) =3D=3D TCP_CLOSE) + err =3D 1; + continue; + } + do_check_data_fin =3D true; + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } - do_check_data_fin =3D true; } =20 +out: /* at this point we held the socket lock for the last subflow we used */ if (ssk) mptcp_push_release(ssk, &info); =20 -out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); @@ -1614,33 +1616,54 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk= , bool first) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; - struct sock *xmit_ssk; - int copied =3D 0; + int copied =3D 0, err =3D 0; =20 info.flags =3D 0; - while (mptcp_send_head(sk)) { + while (mptcp_send_head(sk) && !err) { int ret =3D 0; =20 /* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); - if (!xmit_ssk) - goto out; - if (xmit_ssk !=3D ssk) { - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), - MPTCP_DELEGATE_SEND); - goto out; + if (first) { + ret =3D __subflow_push_pending(sk, ssk, &info); + first =3D false; + if (ret <=3D 0) + break; + copied +=3D ret; + msk->last_snd =3D ssk; + continue; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - first =3D false; - if (ret <=3D 0) - break; - copied +=3D ret; + if (mptcp_sched_get_send(msk)) + goto out; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + struct sock *xmit_ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (xmit_ssk !=3D ssk) { + mptcp_subflow_delegate(subflow, + MPTCP_DELEGATE_SEND); + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + goto out; + } + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + err =3D 1; + continue; + } + copied +=3D ret; + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } } =20 out: diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index f51f9cf20b6e..923c07296ff3 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -119,11 +119,24 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 + sock_owned_by_me((const struct sock *)msk); + mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) return 0; } =20 + /* the following check is moved out of mptcp_subflow_get_send */ + if (__mptcp_check_fallback(msk)) { + if (msk->first && + __tcp_can_send(msk->first) && + sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + return 0; + } + return -EINVAL; + } + if (!msk->sched) { ssk =3D mptcp_subflow_get_send(msk); if (!ssk) --=20 2.35.3 From nobody Thu Apr 25 04:06:14 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70078.outbound.protection.outlook.com [40.107.7.78]) (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 97F737C for ; Wed, 16 Nov 2022 11:43:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gq/xwlQYC5hbXGfbRIDny3/6IR7ssnKu2oHmc1UH0Fwf1a5Q/QP6okyxZPH6/rKXoYBBDGi7vs86M0uTnKU+WzInawSBxGIIE+GVq7OjueMjBtfMCkNyWam8MjnZ9cBHhL31K/d31APuFjs1YrVTmCk52kcWtxDUFE8dydk8ABFapN1V4oiQ3AGkYvG0MMFcwZyOspY85fepWdapJZe5Lm61nlrc6HFSIzTl85iJYj9nKvojCHqeQCS3yvj3ITryzGuuq2CvzCyURAWLrVqgGjZwrJzfaYDMeAlBvnTX4/9mGa5KQd4KAXSdYPoe08MBQBepTZbUmLA9v0fxFSxmSA== 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=e+0hIltg0i9MkaN62TQd1SyQnnkH5rZkO/9gOrGZDjs=; b=IyLJFIYlkBlNIcouMS/f/7RtvdzRn6qhKqWVO/YDZ4VqpMZ5JYBP5BlBGYdP8UR7egjasBfwdzTJnMe8W9ayELShButttzMKiKZNhjn1EymRTqeeDWcBIcABXQ1m63XUCgHL/VvRyQsXLeyu7ROPZ0iZPlvT7suvzqmTF0LiPKVb5YVP0hz1IF0Aq1bxd9pUUMpdVkrQ9iTrSl3ALeC/wyx1/2AiFdw+xTUjuV3OUg1XyhhBBkii8LZi33dKD8978mldPrLeJl0XAK8wJ+foyO/8CMupn9IrXrKmhnLuvtN0gWQF1hydiA3Qv5os20HCO93P+kTIp8dYoPQ6/6+YyQ== 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=e+0hIltg0i9MkaN62TQd1SyQnnkH5rZkO/9gOrGZDjs=; b=W/UrE8f494fY1YrYZ5pY6C6niVaGa7CtBMEJIRuncbHqbPSF0Zq9/f1s4e3cid5nXuybjddCLkf1w3gpktXeUN/FdVHVACR2ISRGDN+ZTIv+YyKgTULKQ/GGy8A+RUV3DVX1iN1IVV4TbZ8ouFiqwFBQMnAgRf7iO4u+dpD/g2sI7AtQyISlskmsyjIsRxOu7HCw108FX59SrMiLvXeJR+8qI1vJUo2ds+PjeV21yHPL+Vs0b7OQh8TaShmxD1O6s2UQoIRItBUlRodTw3aAauR2H+BDFu4fvOhajo79AkyFW8DHvxclrkfC4xxTRs1xW2JSANMSTOM/REUe1py7Gg== 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 AM0PR04MB7153.eurprd04.prod.outlook.com (2603:10a6:208:1a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:43:15 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 3/7] mptcp: use get_retrans wrapper Date: Wed, 16 Nov 2022 19:43:04 +0800 Message-Id: <50e0da978b8ee4d3a6880eaf843c6697192d43f6.1668598782.git.geliang.tang@suse.com> 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_|AM0PR04MB7153:EE_ X-MS-Office365-Filtering-Correlation-Id: dd0f9d0a-1c65-41e8-edee-08dac7c7bf6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 09ph6d1CMX8ax/jChddej60/NYT8LbJt2NPyU+PuBCCS6r93FyuIEljneIwdaizDN6Fin8Wmb+wx+y16cCJF07urnNZ4Mtkyqbm70KKLr+QsBOTO7rSIFD6exsvvrmLHMk8dDKdH0mxqb0qP04c8ZSbXMGcGGp+ZNd8DMsS72ZloVA97K015plfAHTDoDtDZbTT0N/ATbpcO8zM9tP/2NN/zKoiZ2EudtHgvI1wj8Xm3oF8pTl3+05+4lHhMJE5MxPbXPbKpXDminQi5Adgm4UZGWDYB1N5Xun0QDwAlCsEVv+O6aEms+7mUxoFsGkuewYIVXnvMwizFjPhmCmCWq40Mdo7WI/8OOQjMHf2GqX1fFvjkK3qUCDvJveB+No97p6tBQ3/OKgEOz8laJhCL/i8fgByN0wOLwhviLhhoJH8ghmqbn9T8wwSyAz2WnFPNBxS3xIDMagkKc4H8Mf4xV2LfFdefh1Xt+ixB1mAr6j7ecIEEph6GVb8fWmQrxoqy6QcboIlOY5kmHGp8q/sAjFV/EE4crN820DTwEodXO9hSRZ+/ISRycicFy5vs/J0cBNe7lz1AjNG+UEe7T0IQvI1T59h8A2SXF+MBMAddr6iq3NXgSZDpBu7GUBFQm/Hql2zYN56REyHYtlStbv5laoDR4QRnlKsSuhns9ql+8qgkF8t0Db5TDJGD3cpUGo+D9gfBit1TCDenaN8J/HbXgA== 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:(13230022)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(86362001)(83380400001)(38100700002)(478600001)(6486002)(6506007)(66556008)(107886003)(6666004)(8676002)(41300700001)(66946007)(4326008)(5660300002)(66476007)(316002)(6916009)(2616005)(186003)(6512007)(26005)(44832011)(8936002)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bL5VRWmlrXqTBuQqxFWEKmPfW88+CNdN5LJ3k5AfKSY1BaI8H0ZZnhGfTmuR?= =?us-ascii?Q?ifLOMjITcU7oydDzVXntmNYtcgJE/DPZbcNpT4IFMaSebOhYgxRUw7X/90W/?= =?us-ascii?Q?8mnRqE7m2l/xXothgqU9wDUniA6BBzxjmCUI3nCAmsmT2Dsz4eWxSPE1iahJ?= =?us-ascii?Q?wyNSKSFqIqxS/KdUYdzNiZ/S9pVx8MJjVVdDp+sB0VpsUsdc3qmzx3baJ6Xe?= =?us-ascii?Q?izHZ51VFuvGP9GVLZ2DbLhb0Dl2tDI2PjZgoEuvi1zfVXeJeEcOR1guY3JHZ?= =?us-ascii?Q?1cx2CrtmqS3yc1HrTFdNQgi8UL93KHBMkMhPsBz3EAIO8f+o0itFPuvISjPc?= =?us-ascii?Q?LzGnKVpdP4zm3t6/W8CWr1l0bDuDsGaSmErpGvQkvzNf7UfL3779deDuFQqS?= =?us-ascii?Q?hMq7IPw83UT1VYB5jQ18y3KDVhHCeyU4ng3PRRqj/zFnRIFIzvRUeisqSKxJ?= =?us-ascii?Q?JGF3ZEsZ8M1iuchJaqC/XijrvdnLR0WiqFGs4gYCijQDGI8avAgMTB9k2E34?= =?us-ascii?Q?krnfpKhzgTunBmqRsj1GJ70mYMlyQ8jWDZl39K7Ki2by95yBlstjw5fG+whU?= =?us-ascii?Q?xioqGRJqHQZNIR64BzZYXslwWBILfVWIN7raKD4atWImbO3mWtPl3LI1YUpe?= =?us-ascii?Q?K8GqGewowSUiLZ16N2y00jT0GpqWz6ieRo1cPGJoIQoywAcaRHpfIotMa3OE?= =?us-ascii?Q?WFNgDhYb2GD1xWqU1154445d4glITMcmNcuu26ndpmaEgznXN53XB+ez6cXV?= =?us-ascii?Q?W+/pP5wrnQ/f16b/o66D2+EgJ+c7Dd7WxZ4gMszMvygkwEwcb0rUm8h67HGm?= =?us-ascii?Q?GzxSq7RxOaqYQlApshtYCZx/YKJLm6DoQVtNgqM24WSA7RNMXmc5px6NMilg?= =?us-ascii?Q?V9umEkUBo7b7VkrqOACcUti9jemuZhjTM7VkGb1Q3/Nd+LAeNRYnEqijjrgc?= =?us-ascii?Q?WE3T6MxUOSJEmrYWGBIk7IYMszVEzGd52ODkGwne14iIsRTZHFNYnalEvvgU?= =?us-ascii?Q?WGn3EvlSNo+YF5ASdjbQ0tOno1W/YA78yr4PPZUfsrIe8qAqt6pvw4qGmhdC?= =?us-ascii?Q?gCwvBpUSfKET5LmdD2zG4TIKBHir3MXkQDAEVUg++JW8bWwuihzKLUcmQ+oV?= =?us-ascii?Q?RTXCwDNiuYeRuzC3Gd476BBNUylYKOxcxrQJ4g+2sV9k8iBDRiLdysqLzm05?= =?us-ascii?Q?viqYbhfdZH/NUk9uC82SqrIPtFV8/Or5/LRcfm9eh49WmeWBXS38lIYoUe4C?= =?us-ascii?Q?zUG8hwKqXKloaRYzVlS8hUcZRFcPVsvo7B8L+KF9uJ0ZGmxgFyBkrtAlUKDz?= =?us-ascii?Q?1RY3IfcHadMrI3Ou9WkA+7xKHlih2cXoRhyXnVAl0mY+/vhhSIoxKe0kMn5Z?= =?us-ascii?Q?HxN57jB+VZWGcJGKhNgkod5Hs4D4M0FAnWaQlUbZisWJiO4ksDnWtppxgFHD?= =?us-ascii?Q?gYQumc8ucMdk9uuNtahJcNieRii8yfwB+JZkpqYoREKO01leSSzjyzncTyzI?= =?us-ascii?Q?ElEeeWxv/GOHpOfhs307gIwkAmAZB45p9AFb70ibgshECMvKKS1ULH0zsUF4?= =?us-ascii?Q?SYvQvXsIvgEtegj7GhI7DOHTTDexAiKFDHWnLcX7WSt+wLYJD1JdJVCBFZ6f?= =?us-ascii?Q?hw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd0f9d0a-1c65-41e8-edee-08dac7c7bf6a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:43:15.3190 (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: h8LmtrAR/QQU7sRu4PvD/hep02pBsnIdd9p8+jzrvtU4zSOYrdMn1a1XjK4O1CU/nWiiUE3cPt/9FYL4QY1tuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7153 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_retrans(). Use get_retrans() wrapper instead of mptcp_subflow_get_retrans() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Move sock_owned_by_me() check and fallback check into get_retrans() wrapper from mptcp_subflow_get_retrans(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 67 ++++++++++++++++++++++++++------------------ net/mptcp/sched.c | 6 ++++ 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f3720923b22d..b8265badbe29 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2242,11 +2242,6 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_= sock *msk) struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 - sock_owned_by_me((const struct sock *)msk); - - if (__mptcp_check_fallback(msk)) - return NULL; - mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 @@ -2521,16 +2516,17 @@ static void mptcp_check_fastclose(struct mptcp_sock= *msk) static void __mptcp_retrans(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D {}; struct mptcp_data_frag *dfrag; - size_t copied =3D 0; struct sock *ssk; - int ret; + int ret, err; + u16 len =3D 0; =20 mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_subflow_get_retrans(msk); + err =3D mptcp_sched_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -2549,31 +2545,46 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + u16 copied =3D 0; =20 - /* limit retransmission to the bytes already sent on some subflows */ - info.sent =3D 0; - info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->al= ready_sent; - while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; =20 - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; - } - if (copied) { - dfrag->already_sent =3D max(dfrag->already_sent, info.sent); - tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, - info.size_goal); - WRITE_ONCE(msk->allow_infinite_fallback, false); - } + lock_sock(ssk); =20 - release_sock(ssk); + /* limit retransmission to the bytes already sent on some subflows */ + info.sent =3D 0; + info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : + dfrag->already_sent; + while (info.sent < info.limit) { + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); + copied +=3D ret; + info.sent +=3D ret; + } + if (copied) { + len =3D max(copied, len); + tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, + info.size_goal); + WRITE_ONCE(msk->allow_infinite_fallback, false); + } + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 923c07296ff3..edddd7cceada 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -156,11 +156,17 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 + sock_owned_by_me((const struct sock *)msk); + mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) return 0; } =20 + /* the following check is moved out of mptcp_subflow_get_retrans */ + if (__mptcp_check_fallback(msk)) + return -EINVAL; + if (!msk->sched) { ssk =3D mptcp_subflow_get_retrans(msk); if (!ssk) --=20 2.35.3 From nobody Thu Apr 25 04:06:14 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70079.outbound.protection.outlook.com [40.107.7.79]) (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 B5EEA7C for ; Wed, 16 Nov 2022 11:43:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EBaLjOVvThFjabFk2sdnd+ePVea14AIdGsUZCb8Cul7jk07wBAkTkWH3200JrfWImw+4XHdvfsXXOGEtOjnCBw7dKK1+J9oqkhwERnWibPXxFgFTpCr3onScyZFJNzlu9bW/zwga/pK3EvERpwJGdKZaxdMDMvA2IupuHohhJt0GVPEv8QY932cc2fqN1Gv2jJ64N3VAAu3WgJMixZftsg7Bb/uDDIbjyxcTF3qyilo0VdunBGFpkK2EpqthewoGOgvLmp6v1pZROuuCbN+6k1NdYy6neUPdv1HyH5629sXMbe+lRhNCqgRIWwB6HriIee6mG27jUZ0Zi0dQaBmLWQ== 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=oR3hVQ2Ir1jc7W4bhU48PfKmagBRrHPJgP8GTmNkZUY=; b=IbeqDLoHnW6K4hwr7SqNiOVtuNDUkqYy5OpaBJEdgVuRkSO4wNPWHgbfpIbjXJnSE4eXo5KKKVWf12vAUXgArPO9+fFGx+rf42M5fwI5Bz/6PZ7OX6x45VGdv6YN25sXqH7nWv2qEl/zKlcR13FzHlJPm4RGidnVqW7Clsuo1bGvO1Yy5VBRfl2hvqMZeZOhwPNNy2wzpIEyesWUo7fouP+98lRDovrCIaYn56DsOQcTR4oHgsBBc+2GNW3E/P6+ye8uSZTi2i95grS2FmpGPSsVW6m7RB7aXLniWw5AMY8vcVkjJHDyrwDzupmJ9GaoDenTaChlVnKCyXViylt+xg== 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=oR3hVQ2Ir1jc7W4bhU48PfKmagBRrHPJgP8GTmNkZUY=; b=axV2tfP5bwaWRlsR6u+zDEWD9iRlwrB+JaFUafILeqLAATc3WkRNdJmBxxQUrH5adEkW3Q/avBFVSEtm7o2PhacDCldATsynPG7app9DjciY0ZdGjUeqPjNqIpsl7oOiRtXGbKTGtorP+lCTKjsQBvA3EyaZXKSVd/VpZp69G6/97S0+5g9dAAVjVIystQVJA4UU9luBsvmTXUwCMedqsEvOzk2dTAhKaAfEPGvGS4fQ1Tjt+csXjY132eDVx/2A5sfhL3NzD05sB63tH/HEwni4dXdVi+T7QJEOAdfOhayFn9SmyeD9MoyxRm9OsL7bjGKgDR50es7K1EKqEtvLJQ== 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 AM0PR04MB7153.eurprd04.prod.outlook.com (2603:10a6:208:1a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:43:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 4/7] mptcp: delay updating first_pending Date: Wed, 16 Nov 2022 19:43:05 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0167.jpnprd01.prod.outlook.com (2603:1096:400:2b2::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_|AM0PR04MB7153:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f782f73-e2f1-4d54-f973-08dac7c7c5ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CXYIQGUugWXjdTV54h+nCOEzBiS/1xn+e66iKxF143zm83+jUO1K+PWg0Bw5Qxv0Cf0FHhPirnqlHAc2bm/698M77yDO3FeUCCmVkV+EoVBXL/uGeOClAzWVt6gjxl/IaW9B7GJJ5hVxsN4RBsJrL42/s1TiHhlkEvJ3xgaXpc4H7sV1Pq4elSiXB3KUtHui163X7TfFJswDHG0C0pt0KKXryapAAqWZ0vhRVIml1ueKPejiAzJVA6+r+hVmsxKkCLaYDKvFerqrKdt3neo8mJIjCrc7618jOa/LlkB0UT7dIgpI6aa8L7fsE4cWT8KXGyqjjQ6NPxi3h62O4xhVaNv8JQJhqlyOyZHd/eO6wxydZ84CiIFtQy81V2yLdwcAGdeblBdEKuccbxQuep0iUp+LZsE5jNNVkYe/0HwdaQ+obY9CLbQRWwplgLKcWj06EGUcBep2VFh1TwqRWY+3PsVvips87hDe9aKMhAzoC+WfzIlyzONiEgnizb++J0oiVqnoB4FXbg1eqfKq6DYufLMpwvmdlFM6/DqQZIwb2nqyVWn5XDSLryDznXsMetH+pBiwsNY8zvqIj4bjtg5mQ44rLUa0g8dcVVo7I+7a+KEOv37ncE27suSFejeYtzwTIgo877gzSsScuVoaTLP4NRI1ME+XQifNRD5ejjrOHcqoCQrg4ycu45GX0fmMROHVvggnLOpPc/hZE6auJIYIFw== 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:(13230022)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(86362001)(83380400001)(38100700002)(478600001)(6486002)(6506007)(66556008)(107886003)(6666004)(8676002)(41300700001)(66946007)(4326008)(5660300002)(66476007)(316002)(6916009)(2616005)(186003)(6512007)(26005)(44832011)(8936002)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1H0VFCEhuU8vTEIc6k+jgrJnoHhHKhkVFfEERpKICeogs78rhTj5v5yIuZ+l?= =?us-ascii?Q?ADuFgLm05TDBEFFMOAxuHaTsXZdjMpI2fW3KSDzWAFdotWriVRMWF/6r+5oC?= =?us-ascii?Q?aNl32jRpSZuE8GWfCtpyixhz5lbrKATXOoC+tvVOQB0KMnNE4tESWpZdeD6j?= =?us-ascii?Q?a5V37IHn/SnLnWo02E8u449JMWajfu34E+lc62ihUnEeMBA0QKK4ZeRMmnwL?= =?us-ascii?Q?6tsJPOrBy/s8NsLQM2e3JeF3zRT2MROwuJ+Oc2ZhKkSM7rntr+fybSWT8AwC?= =?us-ascii?Q?qiPUnt+8Wq6bGkxkv4AI3qOW0tfQhVBUxB9P3KUQeYzEpT81QdnPYuuMiFjS?= =?us-ascii?Q?WwWTYBbgDfkIXCi5zdULNvE3TD+5YWrgs6a00KEeqyzXaRvGo0VdSKJYWfaM?= =?us-ascii?Q?C5di3WgTSawkEGxF7NHoHD4RMZZd29G2so2lPLqTueUIRar2NI08CYvz7hnz?= =?us-ascii?Q?YCoQZhzPCZmOEvbarSMtq3MBOu1W1C8EvU+oi7nW/3B1KnTQZXtGgCnLrGQ0?= =?us-ascii?Q?W8CX3wfhP4I365SmfxwKRLCZriiDS/qrVx62yjAzKxzGBAQD9HW7LD/eKpRb?= =?us-ascii?Q?uiJJ9WUR5ouqzQQVQ6p2WaaiCXjjyxgYCv71lXdAYe4psFefuf5xego0iRog?= =?us-ascii?Q?v4T3ByOfiUrPyQVCYhKU+O1PHjqseKzhO4/2UN+Tw8F00hYQeL/npzY/9vf9?= =?us-ascii?Q?8lSRP3vVF0YU2s8Y06D8FtkLHmDW5ZuP1IvSZUEW+NMK/Ferq5NP5aIoUi/h?= =?us-ascii?Q?QiPFeccsTXqao2NencTkmKSLAgt4t9Yqn9r0JsXiawfTwLS+xGsLCRcm6rE/?= =?us-ascii?Q?4sKd4l/Gam4ad9+MwOgJSJxjtg+ncEj7Pcl59K4aqXhvauEQm4Z5YCJiRuSS?= =?us-ascii?Q?q6CrRQjWh5AZMyva5XHobi6GALngezCqFGhxKO/Piwbg5f/vCv5BjTo1rZV8?= =?us-ascii?Q?3+dWFG8XhOehqBsIUrILIDmDk5BC4mX9MgZ/4CasKU/XEORLhxAvIETY+k9C?= =?us-ascii?Q?YKjlXx47F65De+wJAU18DmnMCdm8Gjl5n+WNWiubOkjGdj7/czh5taECxH95?= =?us-ascii?Q?E6r/+vdmmW6oYVi7kdo251cNd4weELHyq3hfcIMpxXUCt5WRfe/zxhRuw7Um?= =?us-ascii?Q?jXCpBO1D8pMLis1fuX615+7snNfcp+avMpZx1bmWWZf/OWsKN8m8HH4bnnxs?= =?us-ascii?Q?9/mM2Ryez/Lt3hqAL9d5c/IDcsyR1cHHcozTpdSreLJcWEZuKSSJjiObFItF?= =?us-ascii?Q?qkdj5lZVXJHhtNGaDF4VE4klQ8MEHfsFiD/6MCSzapM/4zhm9hHbev0wxeIl?= =?us-ascii?Q?FDE+nYjmAH9nzCnOKLnYnvpZCOyi7dsLScdgbyJG9z5GU996vuk0lrhKjLIR?= =?us-ascii?Q?ySofymgkoq2Wh8Wmwupxopx7Ig0kIqUbMdN1cfc/1fk5x3UiWukCdkt7Sav7?= =?us-ascii?Q?EcI9oPnKoRZC2dCToXE3CJUVJDf9bXIPdbiFy8G15XNQmqK7G+91jbDm3r9l?= =?us-ascii?Q?7Euacj3UcaNqtNzGq/yEKE7A05LKgE7wF56VqJWr1g0lKt48SfixnOYycBVh?= =?us-ascii?Q?ZAMulKDM6pkYTuZU+o1VH7gjre8YKMwylrXqjF1PiDb4ceam+0kmzdVtFHAp?= =?us-ascii?Q?7g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f782f73-e2f1-4d54-f973-08dac7c7c5ac X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:43:25.8806 (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: UXnq7sBqmYQSHLECZlXLY51BhFlRzmS6gfu56uM2WpoXAYRrol+eM6JbzfV7JJgg+VZ0w4lO/uzudqH0E/Qy/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7153 Content-Type: text/plain; charset="utf-8" To support redundant package schedulers more easily, this patch refactors the data sending loop in __subflow_push_pending(), to delay updating first_pending until all data is sent. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 36 ++++++++++++++++++++++++++++++++---- net/mptcp/protocol.h | 13 ++++++++++--- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b8265badbe29..4c249d1b9ec6 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1112,6 +1112,7 @@ struct mptcp_sendmsg_info { u16 sent; unsigned int flags; bool data_lock_held; + struct mptcp_data_frag *last_frag; }; =20 static int mptcp_check_allowed_size(const struct mptcp_sock *msk, struct s= ock *ssk, @@ -1502,6 +1503,19 @@ static void mptcp_update_post_push(struct mptcp_sock= *msk, msk->snd_nxt =3D snd_nxt_new; } =20 +static void mptcp_update_first_pending(struct sock *sk, struct mptcp_sendm= sg_info *info) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + + if (info->last_frag) + WRITE_ONCE(msk->first_pending, mptcp_next_frag(sk, info->last_frag)); +} + +static void mptcp_update_dfrags(struct sock *sk, struct mptcp_sendmsg_info= *info) +{ + mptcp_update_first_pending(sk, info); +} + void mptcp_check_and_set_pending(struct sock *sk) { if (mptcp_send_head(sk)) @@ -1515,7 +1529,13 @@ static int __subflow_push_pending(struct sock *sk, s= truct sock *ssk, struct mptcp_data_frag *dfrag; int len, copied =3D 0, err =3D 0; =20 - while ((dfrag =3D mptcp_send_head(sk))) { + info->last_frag =3D NULL; + + dfrag =3D mptcp_send_head(sk); + if (!dfrag) + goto out; + + do { info->sent =3D dfrag->already_sent; info->limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; @@ -1534,7 +1554,8 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, =20 mptcp_update_post_push(msk, dfrag, ret); } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + info->last_frag =3D dfrag; + dfrag =3D mptcp_next_frag(sk, dfrag); =20 if (msk->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || @@ -1543,7 +1564,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, goto out; } mptcp_set_timeout(sk); - } + } while (dfrag); err =3D copied; =20 out: @@ -1587,6 +1608,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) =20 ret =3D __subflow_push_pending(sk, ssk, &info); if (ret <=3D 0) { + mptcp_update_first_pending(sk, &info); if (ret !=3D -EAGAIN || inet_sk_state_load(ssk) =3D=3D TCP_FIN_WAIT1 || inet_sk_state_load(ssk) =3D=3D TCP_FIN_WAIT2 || @@ -1599,6 +1621,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_dfrags(sk, &info); } =20 out: @@ -1632,10 +1655,13 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk, bool if (first) { ret =3D __subflow_push_pending(sk, ssk, &info); first =3D false; - if (ret <=3D 0) + if (ret <=3D 0) { + mptcp_update_first_pending(sk, &info); break; + } copied +=3D ret; msk->last_snd =3D ssk; + mptcp_update_dfrags(sk, &info); continue; } =20 @@ -1656,6 +1682,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool =20 ret =3D __subflow_push_pending(sk, ssk, &info); if (ret <=3D 0) { + mptcp_update_first_pending(sk, &info); err =3D 1; continue; } @@ -1664,6 +1691,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool mptcp_subflow_set_scheduled(subflow, false); } } + mptcp_update_dfrags(sk, &info); } =20 out: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8536035a71d0..cdce0c092c3c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -358,16 +358,23 @@ static inline struct mptcp_data_frag *mptcp_send_head= (const struct sock *sk) return READ_ONCE(msk->first_pending); } =20 -static inline struct mptcp_data_frag *mptcp_send_next(struct sock *sk) +static inline struct mptcp_data_frag *mptcp_next_frag(const struct sock *s= k, + struct mptcp_data_frag *cur) { struct mptcp_sock *msk =3D mptcp_sk(sk); - struct mptcp_data_frag *cur; =20 - cur =3D msk->first_pending; + if (!cur) + return NULL; + return list_is_last(&cur->list, &msk->rtx_queue) ? NULL : list_next_entry(cur, list); } =20 +static inline struct mptcp_data_frag *mptcp_send_next(const struct sock *s= k) +{ + return mptcp_next_frag(sk, mptcp_send_head(sk)); +} + static inline struct mptcp_data_frag *mptcp_pending_tail(const struct sock= *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); --=20 2.35.3 From nobody Thu Apr 25 04:06:14 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70041.outbound.protection.outlook.com [40.107.7.41]) (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 E335C7C for ; Wed, 16 Nov 2022 11:43:34 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GdF1tSBfhoi8FzuGgVU8cQdZPrAj5UatzDeeAAQXe0nLNY5Z71K99QS1UmJ+BxntOnkgGhyzff1WeW8KMTNUb1TDbLFhtG+/n+8gsnUYK58NZRRlVhEbtSWGflxK8nHH/V5IbEqkplPQiqnAG45zyDG2wEwIH2G2NiPqjSVG6OS9nRxQLGbTJ82OPLq/hrFr6etUkxVOCzeaBDCxH7Thu+NeNletJvnlN+XKOw6uVFQxsC3IxViceQsa+zjQvEJuR8PWP+1YclJPZiYPEz1q8I8FzfInk/OvPmH1VhxXsOMFNJtotUjVJAvijvR7GlTCKFH8xJq1H/QCV4NAfVoZaw== 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=nY35CjR36XFstY8WAoatp8oyi4y3eRT9l9RxjIh7eD4=; b=mAmDwrgWWBHuFV5gSMOmbrljEEVVuUY0S2eCVku9m+vaQ6RbWTeqSVrU4LvrzPVzcCb4bE7+EpYsnFRU75XhNyaQVycncS3zbH+7spl0E+IO7h+gLs5lMtPSN0SAwPGcSfpgMzpxqFMQQ5iEVfN3Gp7cL9GDXDWvOhBEyZ+xxSDV5kiex5q1b20kmFLeCxsgNqSqj2gpuru3QPJMTDIhgHp2AH7J5l2SsP/CXE68BJilXRWS+KyvyXa2P92gl2IJ1SvWznLHiEYAfY+IQNdFgVBVRXxQOB1ng4xE0iIFO/PlrQ7vz7E4ZkkZXy/HyxCykeBy3+hqQlY9gpoujxDT1Q== 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=nY35CjR36XFstY8WAoatp8oyi4y3eRT9l9RxjIh7eD4=; b=kzA7W1JuXu6iDF9nI023U+rxUSHss6zoiYWkAslGU9phSU3hEPvOz72Rrbbe0qwEJuFmS5m8BFTmZ98xZi6uhuSc+NXLvL/Ez87ARvcO8fScWAlPvC0nvhmP3p5568t7lwqCv4rNzRuTJcCIJfEsjYYOmnWvVoxuU794QZKIFTRQ+TDWEuUeoO/J+WgI+DSw40U/xOCn2GwLmsR26RGdPBvBg9JigEYTXrhn8n6YkyAEUUQK1mOSMTR5G3bmAgBcjSdY2TDxHczYz1LR1occzw0uaymOuUJ55w5jXHh1Wqi+HEXEMHlQWhvfZQPbwRYiTx/Mg39eevrSlQ1cGcZfLQ== 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 AM0PR04MB7153.eurprd04.prod.outlook.com (2603:10a6:208:1a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:43:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 5/7] mptcp: delay updating already_sent Date: Wed, 16 Nov 2022 19:43:06 +0800 Message-Id: <863432f61618b8625948918365524c9bfa9f9aed.1668598782.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0011.apcprd01.prod.exchangelabs.com (2603:1096:4:191::6) 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_|AM0PR04MB7153:EE_ X-MS-Office365-Filtering-Correlation-Id: 14791222-4aca-47ad-f0c8-08dac7c7c9a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UNd4FmAUd0NMCxCEze89mtk5P8T22LZRi/e1jfqlcIKpGLG3Dv2tRLUHXhuFRSlY+VaVZ/Fc3HTQHx9YrLQqG/yoSVtk4xyCM3cbYuHIGOXLAGKXqWVY0ewAOh7j1lU9cAFLbSCga3EChblCKgcKXUQ7sXmIafhiY0LGorBHZcoMuukvfqNUwx8lPkqsh61q+8B3BYLd2gGlmh+lyYxLHS2+OYVfO9x1QCIYhY+ruKZ2Cu0sK008zPmFGuJJqi0ENc/dfUxqT1m3QxZ0pFhvoD5Ycfu4oCmzFGpGhJAWrB6WE+pyDdbVAsnznQGQgfd1DZxtnryKi3rOsiAXDGPgcUg1RA7qO+7E+b42hmC1nDOssI/O5bOoFUb6cko1ZRrpSC8T/WcZ/ZTnBUER3CncFGuzPMEWefELw9EM09uK7aOF3J2bqyWIeKbDP5vwlcqVFaI9cnf79swHv9cd2FzjhkmTxPbylJe1QUoOTPK+JvYrYQc1zRyGVi5CN2Pse7HcW9/KmBioChf5ex/5BdKdG6+sHBXjAuiC5mDq8DrUOgIKU2LNi/L5enTyZSvR7Uo0OdTiPh7qbWSMCIMJI2I67qXX7QUt0B6XxwnUUO0N0pMzYgqfuRIAF6el26vkRDal9CTTor12LFWTlYYQ3+0ReNksn2/TZ8OEW8hkQM1/P5L8YWQj3nRoGF6C+Jws6TYOVPeZ/ld9ajJZjt8YwCWG8Q== 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:(13230022)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(86362001)(83380400001)(38100700002)(478600001)(6486002)(6506007)(66556008)(107886003)(6666004)(8676002)(41300700001)(66946007)(4326008)(5660300002)(66476007)(316002)(6916009)(2616005)(186003)(6512007)(26005)(44832011)(8936002)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LyYY+m5d/PMS0LRQt1pP/LabMgi3U9dlEY36Aw77cqRI/Ve7Qa9dMLyvjwB8?= =?us-ascii?Q?3pNx9hkT2++f/AhyaqrhVLfVX7ZvWppoE/pNIQ8YTWDblGGue+Oed18I8A9/?= =?us-ascii?Q?06X5Yf7OEKy5rOYthw8whQHvXLNxTwNgElluntmibJxTs9RwmuS/Hxg6kl6o?= =?us-ascii?Q?Q3z750hROmE2A9VBW2KqdhWpaY55QsgcvFSms3/mS3OPCrYs2NSnwYZaLxpr?= =?us-ascii?Q?2yyGMUR6a+B+G1/qQUmPItJN4GCT0hxQVq1eT+QYbo7Dem5aciqhdd1Pmmny?= =?us-ascii?Q?Es0cuw5VXW84eDozaUEc1+ZpLoziOyVMYymlM9H/Va0TRU3YY6qTQgl9GbEx?= =?us-ascii?Q?sKXb1Q08ocepl+WU+IIwBF8A9/4Nb6unOhWuttDaWlcFeyx+lxHFPL9s3hW1?= =?us-ascii?Q?qY6Z2PxXQnkoewtvpA9eqbX2U9sCaODhMKn0xt4RoNSToVXEZmmXzaSwE9LG?= =?us-ascii?Q?LH7jG3DeFMmkLA6Qz0iscwtmJhN1av+NP6bNvgZYJ6TRRFZN6BgWAiaELBfw?= =?us-ascii?Q?j2u0OP3Ov6qXdKAtlYMp1b0pgmmx2idzSwIq3quYloHW78YgxskvZE6DbiYw?= =?us-ascii?Q?oLCjPYepqc+XriPbAzNIEK580nQR4ejD8qiEUOTRwsH+FqUxHf+SGAvkIU6O?= =?us-ascii?Q?aCokQKDj7i8FAXNygGgyRtyxqwkCu+V+1mfi1gPERLA/vxvpL82PcF6HlYKa?= =?us-ascii?Q?ylaOJ3fK970aVotS5X3RwQTDOCnwTORepjHczAy+xXdWs8iiaO6VS4wQ6w/z?= =?us-ascii?Q?kqkHWjnKT2C6moF7pGZvT+aGhxsNA7yVwRQux8F2HaG05eqscbYKUB9oCKe5?= =?us-ascii?Q?KTDDiYf4pSUdfSq4O+mpGp2bX/nyo8ewLfBbQ8G3/SGJmwK4PAQYQ9WlZsql?= =?us-ascii?Q?ZvA6L8Sfv3/rtaPEKaI5RkiaKhAW+6K/Do2afGu+N0WuRqU8JJiBEmhVx6Zx?= =?us-ascii?Q?vrHYcAcgiUPS9cdkpEt5ozX6jzkve7kRnjEsghIHN3iILUKRCnvMf7fjC9/P?= =?us-ascii?Q?OTg5LdJuVBSfprwElfOAYYxV3Wxsa33VgfK7EPIyzucNz3HL8J9n2yjApBCq?= =?us-ascii?Q?SEFXUw+oHJ6j0yieVywp7XZlrmaPr7Rqj4b3rnyI1n8RwxQm2J80aMqA0nbW?= =?us-ascii?Q?N+8/3OkNcdDtAUPPax4kaY7+yHAVBi2aMYWP/4hzun3oxCRVKuUhoyYNzMm1?= =?us-ascii?Q?zy+VFHUOO/5UGutoGB4H8nOQL0NCziKtEJQ9UGRfLKZmJJIhDlBrs9qe/rTe?= =?us-ascii?Q?u8z/OYq9XuPMJKsVY6mFrHvwInmpn3CIHbEouJBvW+23Rlr0Tp1chjf9hMUl?= =?us-ascii?Q?ceWOoo/tYhVks/if9H4wMsa7IxzcUw9w47nvnz+76RZtZymCJCUEVdY7tbvt?= =?us-ascii?Q?mmJdvaueiyHmVjmOkw6++CWdcAEwA2Bh/e891Rn8ud4HXY1ZScgLkhYafKLy?= =?us-ascii?Q?ncavIU4qOJ30WnO+Mf41FbsIEN5KdehuSiZoJGZB3YKnMvYXIYMpPY54NxBp?= =?us-ascii?Q?rqW1DETvqK4EeXhtk3RdA25oGjW28JCM0GVVF0weQVjlrR3HtxHCXdSxvD1f?= =?us-ascii?Q?DlQHdyfOnbw/t03rUY70vI3b2d6jyn5XDowQXzHFpnMUDRrqX7ZkttCjDtnh?= =?us-ascii?Q?yw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14791222-4aca-47ad-f0c8-08dac7c7c9a6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:43:32.2864 (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: BHZVdz6tb1YBnQH4Nf8VMjWPIT2TnLm9azBTKj5ARdXJ0UepcZA2R9vythbANWmD96IFzNb5fHBRcs3gysjNsg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7153 Content-Type: text/plain; charset="utf-8" This patch adds a new member sent in struct mptcp_data_frag, save info->sent in it, to support delay updating already_sent of dfrags until all data is sent. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 18 ++++++++++++++++-- net/mptcp/protocol.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4c249d1b9ec6..a1007751bd4d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1099,6 +1099,7 @@ mptcp_carve_data_frag(const struct mptcp_sock *msk, s= truct page_frag *pfrag, dfrag->data_seq =3D msk->write_seq; dfrag->overhead =3D offset - orig_offset + sizeof(struct mptcp_data_frag); dfrag->offset =3D offset + sizeof(struct mptcp_data_frag); + dfrag->sent =3D 0; dfrag->already_sent =3D 0; dfrag->page =3D pfrag->page; =20 @@ -1484,11 +1485,11 @@ static void mptcp_update_post_push(struct mptcp_soc= k *msk, { u64 snd_nxt_new =3D dfrag->data_seq; =20 - dfrag->already_sent +=3D sent; + dfrag->sent +=3D sent; =20 msk->snd_burst -=3D sent; =20 - snd_nxt_new +=3D dfrag->already_sent; + snd_nxt_new +=3D dfrag->sent; =20 /* snd_nxt_new can be smaller than snd_nxt in case mptcp * is recovering after a failover. In that event, this re-sends @@ -1513,6 +1514,18 @@ static void mptcp_update_first_pending(struct sock *= sk, struct mptcp_sendmsg_inf =20 static void mptcp_update_dfrags(struct sock *sk, struct mptcp_sendmsg_info= *info) { + struct mptcp_data_frag *dfrag =3D mptcp_send_head(sk); + + if (!dfrag) + return; + + do { + if (dfrag->sent) { + dfrag->already_sent =3D max(dfrag->already_sent, dfrag->sent); + dfrag->sent =3D 0; + } + } while ((dfrag =3D mptcp_next_frag(sk, dfrag))); + mptcp_update_first_pending(sk, info); } =20 @@ -1539,6 +1552,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, info->sent =3D dfrag->already_sent; info->limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; + dfrag->sent =3D info->sent; while (len > 0) { int ret =3D 0; =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index cdce0c092c3c..cdadb39a03da 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -250,6 +250,7 @@ struct mptcp_data_frag { u16 data_len; u16 offset; u16 overhead; + u16 sent; u16 already_sent; struct page *page; }; --=20 2.35.3 From nobody Thu Apr 25 04:06:14 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140087.outbound.protection.outlook.com [40.107.14.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 7D41A7C for ; Wed, 16 Nov 2022 11:43:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RK56Jeo8HiidmS8Jn82zGTCz6f8MYluX4EtcWBFxA9Dk2vZqKRXj0R1H5ruEpI6d5WWFPgGZxSCXy//KWk7+dYwSg4dYnfH96MQzbKfQxtLl7OUb2Q8BX6bwtYtBhFK9QPXiS//76UBEweiuy5l7D+sNYnH1E5QNuhzvUIIydxR85lewuJuwAvpcBAIDRszEOHR4/VNA7h8rxO9zAGAei+Coswt8Fzw4TgxW5J0Tomvwpp9wx+QbISDG3rViQ/83IpI5PhsBkWQy46jXFr0D2zaBWf/GKnI+COpHaAENRqontvxwL36tHV5X1GZO11o7G1gjn/3S/w3V5a4joO3XlQ== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=Cps3jIz8Yk5KuisgjrC1hAx+xVdfqSSkypJG1iCo27GJh/wGF3OR4QGT/CQ2oJJWL/IVNosxGjDBbTLKfsdgC0Jbm3PylsngjESwOtxTP6nJT02q+LlvngKUQ0BMn9UR/w4g643FbeofpcGAX07Kc9Q5e2UGnMtJDrdqTQkeBuMic6eMHdxz4iKKKouOkSqvYUHx3qZ2VmokbbtvEQmv/cDtnc8xpbQYBmBTb13WIehisFh7hhkHZvbCkD078UTy/Pnv5ho2Bm6uRFNIsyfJ3loLV2ascBdt4CTH87amVdY3KFIRHd02cRHn620cGaiI7NTfumpIVFjNkx9xGuzPAw== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=egJqVAlgtuxRJaChj4kpvyw2mOdXIE9o4Y7oUVw/NuQWBykmsOrlbLyeMBX/PPBDZxNPVm9KH1OYbuWQcc+QZgdHl22BniYgqzycsH0tr/T53a3a0GX+NH3sbbqPQfr8W9QZmXDCt0L2GIvCPL/JXg9J6IUKTVTHQMSRSJuvVXEiUIUoH4Vm/XAhV/6G5/z6SBLYTT9mGC+PGJtuuhpZak45ljTo1M4EyN661CvrkSLQnN1rXe9ab49e64oZiU0uVFjXEDxjMqD98peG4zW6t03e+EPYZzXt3NfMTEpyb6As/cSiUHImOt0UaZZKMBcA3bO84pW/Eu1D3H0mbh1iig== 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 AM0PR04MB7153.eurprd04.prod.outlook.com (2603:10a6:208:1a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:43:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 6/7] selftests/bpf: Add bpf_red scheduler Date: Wed, 16 Nov 2022 19:43:07 +0800 Message-Id: <6fbb817dc84b88dc70ed797fe9356b1dfb69ad02.1668598782.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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_|AM0PR04MB7153:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b73a418-d5f1-4128-66ee-08dac7c7cf6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sWpNth1OwzD4dYR+Fa7O7H9+UiAiJKsMFswvroHaTl4iAnbAElBs9R3F4pjawiCunIDtM24bTtpbReZbHy4TNdfzxA5sL1rroVWhNT4Z1lFwUNNu036NtEsqK3X+VzeOD93amC2z5V2EsY6DltizzyOfATz6AqrFRPR8KA1osuMCZqT4Yp0giR7CuBmRAH8BfUu5okyTSejNOEA3UaN9Jhk8moAg9u0K967HQNXXEPM0Sa31H2O/dMd3C6GVSoXSVNqTBqFV5feXrBJ3vC13rRB5E4O+H6Ar73wEGeKYGwm0g+C3pyvbxGVAJ5AiDUWmeO9enSQqE8kcZm1/Gm0KPU1ki9z2/aiAL3gdotAVJFjV5LQ66I5RcYdVdFscD8/YaFCUMl+td1LNy0+D+rL4kGDfJApz11PcSUyuPMOH/rUJn2BjTYqE+Gz1PhzBo9xOR1ZXbK401fNfzjfVMV1IaH6fAePCmgd+gf5H8KRmYN/y8V+pMjg6VRsAiKVtliaxsvzHpnbHYDzN13HkZDbMWYvqJS965WYJufqNYohLJ3TKLyhIwNwQurwyzo/iIHNUEHU0LfbxsHPudQnNXfRDn9xwK+byeti7OuqZJq9MnmIXRixq8AKLDUoZ+hj1vqYbUtsxwE8MaQwRvj2cqI28LIWhLvgzI5ftG7ALN6NuS+6+Fp8uUiR7jLNuZjzi/lg/EuodODPsIZMkj2dSBVa+/g== 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:(13230022)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(86362001)(38100700002)(478600001)(6486002)(6506007)(66556008)(107886003)(6666004)(8676002)(41300700001)(66946007)(4326008)(5660300002)(66476007)(316002)(6916009)(2616005)(186003)(6512007)(26005)(44832011)(8936002)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jlEFLN+ZqC89iJurWREJD0oILUR9pLb/Ep1qkXGkNrNIcBsZkrE9d8KTarNw?= =?us-ascii?Q?XS6epBeZi3nz290mo/Eoqaia1oA7xiv0Jxj6ORMI/IVvxqn0x88bWET76koI?= =?us-ascii?Q?sp1wX7A+Ij4Ho+s9sMx72vsocjdnvEJLs9xBXBFlonbiiPvWrawvP06lQkwR?= =?us-ascii?Q?IZmyALeILyfwAWUFWxOdQaVH4vErCTYBepYMxb8aew+Vc5v6EnPv/HoPjbSF?= =?us-ascii?Q?iWBk32SIcswN24GuGHEGuFvp83zVhE7QvDuln13X782xr7KDBidqls0twKZA?= =?us-ascii?Q?MNPoxLxzFctTJNy7sNukzzK6zZN2G8MG+0T+k+Tg300DNQ0bM7uwMUpzxhQu?= =?us-ascii?Q?6jhRXzN0zikyq2Ohb+PYedpAbyBXMeZzL7Cir8X3mLKLXXIiGToo1+LoRgpG?= =?us-ascii?Q?RfZqOQ119ZixNuYW6citUoRRvB+HWy4bOA9aEWzI1KrbwNLYtbyQgb5ITHR1?= =?us-ascii?Q?1m8wbdb0KFNlpxzN/lFTk+SQhnckHq5PdCyi4G5SfaNDzp/zeXTBbmcVwNWE?= =?us-ascii?Q?BY29QiHmNao4RHoSGTT6B5bbSOcap1s2WcmiO0NPBP6YMxoxHknfl4pmFND+?= =?us-ascii?Q?w8KESZ6O9HEebEf4czFuZnk8M0Hgkik4L7iKeH+m+tVNVkSPVtNdq+vUhA6D?= =?us-ascii?Q?8gvL47ue1mNcgqnN2yDOP+LiJ2M9cCagMfZVILlpUfkEHyzdVUey9z7KRb2l?= =?us-ascii?Q?hTeBFPRfnCwsoXmS8Ix7jxRK1ajhO9q3WWu//8DW6CZnmTOxO2Zer5eRz+3S?= =?us-ascii?Q?ilgkfSPGSpNfsdY+159SNsuq7xZ8IEbLdji8agzwtyFfvkn7UXOlZKpoS4JL?= =?us-ascii?Q?p9vKyFAj3QlyqM1hn52c5/vRdq4IFuC3PqXxWBj39i6guBu/467q9QGyb4jb?= =?us-ascii?Q?7XvHOZ0vS3QIX0mq4F5OMdB9spVPdNAsO3wZivlgWPxDzOgtPKCMAcrEdHZW?= =?us-ascii?Q?MP0Ko0uQnBtTl/leS7fKOf3uxi6etWOp1FNw0zZojUIMOCoUeKYn2TWFElP0?= =?us-ascii?Q?fqT9FwV8/m52d+lmepAfKyuZBTAdFsfO7EetlnwpVMSDNg1daAIviBM/0kOt?= =?us-ascii?Q?fPHaqM1MrDNOP+QfyrtfX9I5iDCqydU0Aq3eRfJJGU6kmmgOdvYQNXnfFrcn?= =?us-ascii?Q?hIwGoVuFmmr3Cl1vYnawS2NgkVYSPIlBVeYfa2qvr+tPG8ioaHa3dk+A/kws?= =?us-ascii?Q?/UBfcRW3rnX7LXtULuXHH30UvGAexp8obdhddqLX8IMF8fqytqGveI+38txe?= =?us-ascii?Q?C0IPxo+YUnnv7FsQN2XRBLcw1mlXgLhAT1hHxrJZdJZpVVycUlV0V6tuYLRL?= =?us-ascii?Q?JRRqtkXvxPdhjgKwhawIjr3P8noFKsLi7aljNZfkUyqaqzioZqg1yqa2SHED?= =?us-ascii?Q?a7xLxej89ybqZEiFfspzlYw8Z5xMTS63vJpG9n/x1GjzqlbK4zWgGAIcXoif?= =?us-ascii?Q?R6nT73M9A0OKUKQW1ot6D99/MUc499By2D2x0L5PVgWlNf4hMPlsvL6ws/Ys?= =?us-ascii?Q?oTHAkBlpbeRKw96QgSxigLsUeEUI4Otna6LmrIfZEFUSxQGtrd7szhFpoRVN?= =?us-ascii?Q?135HFowqwuX2GPlnQOBe9TCdsxk2ZWRvxc9g5wQZ2GXxiUdCTkc7r+umeBRX?= =?us-ascii?Q?lA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b73a418-d5f1-4128-66ee-08dac7c7cf6f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:43:42.0044 (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: IH1LjmeXDuIVavkPpzj8DrW2WDb/5baazGNCPkv66GZchEOI5PvZbVBUjr535RggVIC8dZZEJg2l7unrCn488g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7153 Content-Type: text/plain; charset="utf-8" This patch implements the redundant BPF MPTCP scheduler, named bpf_red, which sends all packets redundantly on all available subflows. Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_bpf_red.c | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/test= ing/selftests/bpf/progs/mptcp_bpf_red.c new file mode 100644 index 000000000000..30dd6f521b7f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_red_init") +void BPF_PROG(mptcp_sched_red_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG(mptcp_sched_red_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_red_data_init, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_red_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + mptcp_subflow_set_scheduled(data->contexts[i], true); + } + + return 0; +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .data_init =3D (void *)bpf_red_data_init, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Thu Apr 25 04:06:14 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140082.outbound.protection.outlook.com [40.107.14.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 0F16B7C for ; Wed, 16 Nov 2022 11:43:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jQ9oi3ArAmfC30MRNOMrMdSY85UY3Qzm4UeKm/obPyyZCyHbxVqmpg2/kznup6BuWqwFhnmJxYtXADyM209d17nifY4SXdKYZ8XSttbJ78NaN1jvr9sb7tfpEGld0laOLwUJYWg+DKwyIs1DlzhhY1HszqHa7O6ZPj9y6DkUUJdPylaVq18PDPN4gl0ewEaumpBtE+7p5sviR8dEDmGIKDiCq+d0yUgANB2wF7m8RI0O9Svl9ld+3MCGNa/Qf0PaKRa+HRF6Lk8R2ndAXP3Zu+6mXp6/hLdimM+snpEPqrs1VNHW/MlEqNIQfc7VG0CXPZfmiccTH23jN5V1O7bdjA== 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=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=d/HZi3/E2sbI/8mBw45YTrJ0YxHllUqiMI+8pK7kqq/C3zL3C6S2TFDtkfATPdUj87jAsCbIKVqpUWrOU2Qz9KO0vQC/BNouH7FN3lm8kcfTv5NE6MA4OgZSmPuXa+K1mVNXs9YkICYPvYcmV4y9TpiL1aJMzcaBczeGFfvX/e8acfMZAsbjbQJynGHF2F8TbjyUd0DYKy6i6OBXBEjYfmDlIx527xP5rhJPweMDWg2MyfajZwestYJ21lnWzQRP9G3xRG08MCuzQYIOBNiegLLeJlyk9iE46N31N6VeuwhHqtr/UgPHRhdXux5uKJz31t8GWp8YYa16TQ4EY/8nVg== 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=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=hMcn+tkKHwG6rdNc6dZekYvxQPHC6KLjLYzvU8nO8xyipvOfGnunUupBrkCA4Kt2ry5eVEKDQ5lMVclYUlbsqf4KV3INX6XHRtDPOyVZ2gHjPBduGNa8NmVP50UbmF9HjtLsoBj2ScayTq7feyRqy2w4GbifsoeidDvaekO6VHGT4HUmQk/6WkVwXBufVIoFwMmH+1xXQhQr5153c0lAvj+7JZX5XgLP2QlXNbzNysRRrQaNS2UQRuJ8Omo+n7b9i+ZVjxLvbQ1Fy810cZmjK+MD1+8oL6irUb0+uEyRNKy4Vis3SwvV6Z/sErhcWiHkgIwskbzOs3R3h45FIOersg== 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 AM0PR04MB7153.eurprd04.prod.outlook.com (2603:10a6:208:1a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:43:48 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:43:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 7/7] selftests/bpf: Add bpf_red test Date: Wed, 16 Nov 2022 19:43:08 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) 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_|AM0PR04MB7153:EE_ X-MS-Office365-Filtering-Correlation-Id: 597cfa76-591a-45a8-c09f-08dac7c7d36b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hiFfVNjIe0Geu9zreTUSeGz7SCBCcq10HAY9fBdbGcgTEDcpPdeHLekDxPnuTBmfMMLTizMZR6kjUlm2LsAWFkdG/Ew84fQty6XBWhtRuwHzfo0hkpoWSGnhuwHR3kFKtgiK+6H5Aw3LvpQKYlTuRi+vtpQH5bAPoOAqxc7WW2ExWVvdbxUyBtQ0/TUGUJRTRbNqTfZxzaqxJ3dHl7PZU43JOyf8Jj1u/Ev4in12dfVqzsAyP01apbt1L8FyAyW5HCyH4QE5C/W841UyM9uqc5ztoMvwEVzrZ6GhKrwDGRDqAqDLmOrVE0neQXTmaOataMQapC0ywInt5vb6scoOEh1tp/9Ks8ZHqr5YH+4ulpH5sIg21fFUzQw8c0kkNwz/DBWVGiJ/+jWC0G5WRRKaafVB5koc/TZWgvXRA/dhzx5q60/9o6NumrSwLBRBYSQdhrLrcRzuZ7k9b+pO4FtP342KEgciWggXY3/yWqcGpgcc1AUV9yPtkQmRujfTW4ERC5vfwP3FIhQ+eM5nkAYOIdFLnvUUnzMQbaY3b8xqTW+bqxwpLo4GiHnvcCbJaFsTwvv2RUrOEjkkJGtZrb4MpJMzLuSEhrqCxTLaNE1QCZOgz3H7ViulL8vCU5t9IROPS6lLHV3zg+mTcnleJat8dg2zUImDi212awyXygQaX41d+WZvk5aZFDb5dtOq5g7c9M15XGdEbrbO9HDuBQc8aA== 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:(13230022)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(86362001)(83380400001)(38100700002)(478600001)(6486002)(6506007)(66556008)(107886003)(6666004)(8676002)(41300700001)(66946007)(4326008)(5660300002)(66476007)(316002)(6916009)(2616005)(186003)(6512007)(26005)(44832011)(8936002)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E3gawhFs64B6F9GhSTFOwKxZpIrk9GVL4jKrL6G4dr4cMWtgnL0YeryNraaW?= =?us-ascii?Q?5P6bxUL0T/Vg83y6bWc4dtrp67DEgL73iY0X+DEIofkOHg+dSnX6plvgkQpd?= =?us-ascii?Q?N/WrTijjcMvmhSs8eSCpi+0DhetYACWQ3EWHAzYSdXmw8IIPvobTaJ6oVoxX?= =?us-ascii?Q?MKMcIaC9uWB2qhijUOTpGhnY8ZFecUT1oblQhGgKM+sPU+USAflZ9WMFPiIJ?= =?us-ascii?Q?iwD8WPezp/f787YCnaETKpAtMoDlkXUQpLeGRtE0IdJZNa2c+a4D8jIr6gEt?= =?us-ascii?Q?zS8UF0uu0TOhDcwCvCV0MHkvgGBtXy0xC1YQ3A1ubYPBYI9iOOaXkxNg8u7u?= =?us-ascii?Q?xyvBk6LXBdi/wbD2xp0uhYYaxRluqE7Z8qmWwWkkVKJEQskWFrn6w2OinaRB?= =?us-ascii?Q?U4mlCQlBIWmC+hn1uolvVc24ICvxaOFVtV+wghngZhCJiUV5MT66LY0p8znA?= =?us-ascii?Q?5YLf1Vb//cvdp2vazC3bHAnXnFbBHKJwFjhqWsj+ADomN7YWruzzHhghj+Lm?= =?us-ascii?Q?2n3V0FWSNW9XjrZBmgT+7LHDy061yJWRAnQqMjA1Ox4/YEBnwOdzl27PwNME?= =?us-ascii?Q?m468Z1Ozl3PrtJ8ywM64SIbg/3JNv/Pwac+FB1y2vGmjtMv6K4EYWmffDgfC?= =?us-ascii?Q?Sn9eyfXhMhxBkhJMih1YH320v82cw+ld/DfE9KcVasHsJjqbBJ3Le/3x8+XK?= =?us-ascii?Q?1iSmCohe96E++dfIjSku0H9IfudHsTQ4esT9tfaHNGhnjn2jUmWGpdhOJY42?= =?us-ascii?Q?x1tpD0B7meoZXcxDa6VlMGzu0CHt2efXoFJiUVxZBybvk9PjNdWbCm+gngfk?= =?us-ascii?Q?1SX/jd14BcW9pujGM2FMeP6bF6Xyxh7/KVUgcfNKl4xzZfeohS/IunmdsRxl?= =?us-ascii?Q?8NiU/toHKjdv+/Us0JQJvbbSgeTlXWT+Mk9dJloSmMBQNTRpBoTkxWxGj1Yp?= =?us-ascii?Q?w9n8c0TXFo6X7QLFEeC5nLUQZYsXmFRqB18LSxqNfTRdcupX0SL4E6IPDiSL?= =?us-ascii?Q?fV5TezTi1BR3UJZaLLEv3rVIj0GYLbEr8qRwnmaLRLfU3iBNKFbmPShv+7kc?= =?us-ascii?Q?PEg7DOuFwZORemDSW1Z+RL0VvkmuSiOjNewg/d6wkzSiPquO9SUQod+wRbO4?= =?us-ascii?Q?12bHhCM6srV7w+RNtvFXor9NijFFATKzfBhSWXVbRY0gxPsCjr6HDltKUWmG?= =?us-ascii?Q?IPlwA3cOu4CnfR4GMipvea+KC86679s5wrTro1ZGLZYeZZDFjNY8DyMcDgKj?= =?us-ascii?Q?Xceco2JB347jnNp4fI4HSoivpkgivyvhzZX5kUr0N/JpO5mR2JfjEqrqKt1Q?= =?us-ascii?Q?gJjw8TeIPkMfIpdeHaB6QDUsdGv98nM6ZWSQK865tdFPHH3V8NAIPT9m91Hx?= =?us-ascii?Q?6dtzwRfsiH4hZUL/J3N1abO3oBVjdPH0zRnJ7loaYMa9mHvdQSr5+7cfhJMu?= =?us-ascii?Q?XSVA57TC1ZyUDt5lN+PSdQsghL3geG6C4JVd3xb67YUoRrhcHQrhT8oMedI4?= =?us-ascii?Q?qJwJFypzHVwhn2o2n81I7R/07utAPp8VMyuB2OIzo7WFWlGB3sZcn0DldNur?= =?us-ascii?Q?oPxBjpx/36cZqVBj/UYWrd3mrqZ0FNIRC4Ynrd8OLGnu69w9Crv6//15R749?= =?us-ascii?Q?lw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 597cfa76-591a-45a8-c09f-08dac7c7d36b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:43:48.7226 (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: pMVUgqdLrBYFrxaduDMrdLIvwr/4XOb9LKpN/DZfijYLH2MjpvS2mfOWHep0/dfSm5vA9EVdCcqqXkOoakT8FQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB7153 Content-Type: text/plain; charset="utf-8" This patch adds the redundant BPF MPTCP scheduler test: test_red(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been redundantly sent on both net devices. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 647d313475bc..8426a5aba721 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -9,6 +9,7 @@ #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" +#include "mptcp_bpf_red.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -381,6 +382,37 @@ static void test_rr(void) mptcp_bpf_rr__destroy(rr_skel); } =20 +static void test_red(void) +{ + struct mptcp_bpf_red *red_skel; + int server_fd, client_fd; + struct bpf_link *link; + + red_skel =3D mptcp_bpf_red__open_and_load(); + if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(red_skel->maps.red); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_red__destroy(red_skel); + return; + } + + sched_init("subflow", "bpf_red"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); + + close(client_fd); + close(server_fd); + sched_cleanup(); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -391,4 +423,6 @@ void test_mptcp(void) test_bkup(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.35.3