From nobody Wed May 8 21:38:17 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3241577pis; Mon, 9 May 2022 08:01:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNSoOiDsEQQLNQOCwXVuKMlWKqOgy6/HNPyNGVvBIFqFE8P/CKlQuVszns2cD00ZF4WQna X-Received: by 2002:a17:902:7009:b0:158:3bcf:b774 with SMTP id y9-20020a170902700900b001583bcfb774mr16382658plk.103.1652108487167; Mon, 09 May 2022 08:01:27 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id y15-20020a170902b48f00b0015ea859b125si10644663plr.206.2022.05.09.08.01.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 08:01:27 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5186-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=JvBBUmBe; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5186-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5186-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id BAFBC2809B0 for ; Mon, 9 May 2022 15:01:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A88D21FB4; Mon, 9 May 2022 15:01:25 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 C01181FA0 for ; Mon, 9 May 2022 15:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652108482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BDBpLju37SaI1e/83IXiHupAq93aJYyLWveE++J5TlI=; b=JvBBUmBeNdq+clKt8KbuTG9bbhBnflh2oi0p+OPujE0HrNAbIxAazIWx44i9N+GpDyss3L vCDXFK/flqLxQUqREIhSRiiFX2IwyjAS9RryM6lnnJ9y/K1d3WjngV2d6+a3wMvvEYnwwn ura/JZotyphl1dprR5Zx5OXFXOAdAOI= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2055.outbound.protection.outlook.com [104.47.2.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-m31mYTKDNsW587fD47KQbw-1; Mon, 09 May 2022 17:01:20 +0200 X-MC-Unique: m31mYTKDNsW587fD47KQbw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h3WPXeQ3/WdrvxdEBKyj3YMRjl2yQ7FqAo5YLCmle0isQdVD3p1VBoHcJLm/Bbi082z3e7bRI1d2RvOh1QE2/fL5D8OOnxy/e8vd/B6dndrV5crMHp3yS7aqACr51HssfDZx7NNwrWm0VF6mexmWo3eMnNcsknuOCUebeOlhx0IVxLY5KugOudFL9/jYbCWE+hihpPgh+Xh56RvQuR0voJg2WsWCl4Kc9yK5x1RMiYPmf1Qe1VtyXfos3xirlHWahR8zdGMT4Y0B/ouAZWuvpywjoaobHuCnnqUyzY0kMD9MXkxC46enoQUKkZI1rZT50+Wr2E2JwVaY2vBcWsV6/A== 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=hfFFjewsdlSF3h+0lg0M0fKUQn5+YSHSCOL/Re0wawY=; b=HxOJrXJ2kZR1Om90gTePInLYjgU4+EvWEUEcUX6Vvhump3UhZQev5cl9E6NY9EEEwh4y4yRfq89nwbAhX1mCpwNwX4wE9zj/cw90RNiTH7fPtiZm2N2ZQzY/3XOEJI9yaFWjI2pgHv1brVbiFN+pvyKpxPBt8DbYEQdg2nLpJpnCn3wk8b2BRt38wrUvPt1iWy1cHtt6Hi29MJMIOXwKwC9xwUiwXbfh73NBQbjkM+49rxanVXVmR2/kP6ZfwKo1nlwKu0RlTxKFKpactcvjbyl+Fj2axwKDuAaUKU5BYbrF/0lYeWpY8S2hz8u2uGv17Du2dij9xlIiIJ2769h+4g== 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 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 DB9PR04MB8107.eurprd04.prod.outlook.com (2603:10a6:10:243::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Mon, 9 May 2022 15:01:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5227.022; Mon, 9 May 2022 15:01:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/4] Squash to "mptcp: add get_subflow wrappers" Date: Mon, 9 May 2022 23:01:07 +0800 Message-ID: <769fd51201f15cdc6c582e9b14661445143fdf25.1652108279.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0016.apcprd04.prod.outlook.com (2603:1096:203:d0::26) 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-Office365-Filtering-Correlation-Id: d260e032-4dca-4ad4-b2ae-08da31ccc634 X-MS-TrafficTypeDiagnostic: DB9PR04MB8107:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dJp4DSfP79p//NCKiJ/i3SVPYhw1+p4DtYmC18qDJLZnTC/wMZ4KPs8qluzd3GbMtHxOqjls1QnPUQdCBg8rFDP9nlGejIrA1soFGMqN6z8q9kd+ehsFbaK/KstEooxunyHSf2NlXTHIHQ6RTOl5eM80nWVbHVqieSgCz8j5pdEfQm1x42FPxjAcKgWO3EX8GD+WsxcaKK3ngUDzXPLEBZ3kvCXBpdNjl93pK9xEkTb/r+qTv1a7EjOsY3WoFtItRmUJgSnV5T9ZvALDB5FcBHKvBuB8NrFa+IkyfY2+6CA8ahLx8+ZgbSfHc7VT0g+1CulplVWT3ekaWvTn1WzmgZT5jK+qBFGRRzICMd90CQpRzJMs359k2VgCjqMty9xOq9avCcHW19atwQYipZac6WbiJRycXXn84Vc97/DrzBnbmxqayGzz88eyL14DnAoaR3RjaUhRDSaYPyE/+R+FjiKKkTMP9JkzAEDBDJr9J9//jztKGqtZuSI1ysRW6ISRBlFHvzKrIy2DF+5I29b6nuTWBwLXrYjoNN7DHpM3/+A3FSE7TiXqHzLdMD1oybn0legXi0k8Tq2GynIrfSOkL0/xewWELBknSx/ANlfm62LNS8tz9GmMRyI4rLJeq4tJGr7Uscbzf/0Oa4w0MNU6ZBykL59Ew6Z0XfQJzB3TgHgr0fCbfRQEl+Ppc4bEwtLZnNDoXqd7wCDIuyKgJ+0RDw== 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:(13230001)(366004)(316002)(6486002)(38100700002)(508600001)(8936002)(66476007)(6916009)(66946007)(86362001)(8676002)(4326008)(2906002)(26005)(44832011)(6666004)(6512007)(83380400001)(6506007)(186003)(2616005)(107886003)(36756003)(5660300002)(66556008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qQdGDtei0QLBtAGLpxItQ9+tuaKFWESJkJwEyrrmi0sH3+By0cni+AFmqqyf?= =?us-ascii?Q?t83NUGue7k7L23l3oEQ+jaqYy80LAts2aP2PpxtiSVEj2skVs6jlEeTqvP7v?= =?us-ascii?Q?/nyZj1gT8jPzgvxbxbQlnQUZFwfxRe/+4RD6EoF/V9V4hfpINY/xfwd4D56F?= =?us-ascii?Q?Kx1egHWyAibfzHnWa4hyMveyf9wivCgvFaYEzk7yHDLk82KltckzZSzutQcA?= =?us-ascii?Q?6Q/mLAW6DTeduEUIRQmQWZNxbF0eMickX10dozmP1Llyqy6bWXRoBVPN6yiu?= =?us-ascii?Q?7eiRkBaria3DrR0cpoJlkXO+5exDn3NH2BabEgxAi8nfuP1nW+Q6x9dI23hE?= =?us-ascii?Q?AfQTvIujrlwFRLTiMUs4JCZxcM07njNM+UbI1VJz383vfcGNlrypKynrZ3NL?= =?us-ascii?Q?CJZQu8FdDyCaclESlnRR0rPGCoDl/Ms8UkR14+KZ8whSQdIUJHB+mVBrvtNu?= =?us-ascii?Q?HacVnA1Os1hNpD9kFDKoxv8teQQssUmpBbKQnHEfX+CRyhiQkfmpq1APc2Qt?= =?us-ascii?Q?QTDcCRboe4pM0q+Y8JL87wVjpyyRPCXUpwFUT9SegHIUDzEfHRo2tBGma4n0?= =?us-ascii?Q?lAkySPKBivEKd8IMvNAS/mgElroJynYrGfqYKt11rOIWSfcuyyl9gfcPn/z2?= =?us-ascii?Q?xKvrDjiqTnV0ILbWo5yJhxjRktLQUZGY9rIb6N6z6HLZvrd+JQ7h0TR5ggZr?= =?us-ascii?Q?HqTFRFEcYsL5q2m2D6NX53wQuNfSdY5Win1dXwuksegmtIGFS7kyb6bko+eT?= =?us-ascii?Q?528wuTIuJLhrM1Q3YQHKmA0hiZh7Tz+K/UB1CfrqYLNNaCqvmTY4rnVzhgJ0?= =?us-ascii?Q?aOsYEWQDtawciX5OH6arCj+epiu/H/JOjFAW0h4m/UPeedOnrVOb3wX+gquB?= =?us-ascii?Q?VIDA/lzJ1ZyrPRh+J6BC58HYPtNd24+y7Ee9YSW27ldlMfI6A8j9u/s6C40E?= =?us-ascii?Q?yaQPjXwsdKnLciscmRmcxxX4Z/lOpVU3gdW3Rb3MwLarUdAkWq1wifhCUIuU?= =?us-ascii?Q?L7qJoKdMQILEtqvXxMupUhSqLKPoTG51tS5ldTa1LLrGqYzdQ8K79G9H4kM7?= =?us-ascii?Q?JkeFuUiJBOywFmUSwouZccL39ehzT8kOepUgy+7YKrvM7BUfg3zOecRynVB6?= =?us-ascii?Q?O79flm3txPhAbJEgryno5kvyHNNkWBZ9tvkL9xlmbLSkIG3pD8hCyj8Q6djo?= =?us-ascii?Q?BOLevjjDg1+DlZtRVT1KIk50OWCissAWX/Kz5dnbTQd50qhdXw77Drmp6xY4?= =?us-ascii?Q?K0yLcS7aWVuCxV7Fo7usc2Z15zXsC2by1Qq7zHrIlKDZpapa7V+d0zj6gead?= =?us-ascii?Q?cJo0G/4zBDkwMsDoiY+g+wuLFXTu81ZjaX59GDMUT6dU3NEmmQE61qTujuXe?= =?us-ascii?Q?H9bHelHh44EZ3IpCvx9HB13zf5MPPAvgfkfNeypAbaPS/4gALfwvE/AntqVp?= =?us-ascii?Q?ewTIq5uYK2gXd/QUT5Ng2Evhtcg3lDn1U02JqcHMjyl9BW/350+xA8c2lvwo?= =?us-ascii?Q?SS3tf5CzUu0S+zlheZlOtuwTQi9MUWeiRx820lgur395PluddPxOzVjfsKOP?= =?us-ascii?Q?0n2RrSA6tJHAXo9XKTKupS4IC8XnK46yV58wYcbdB4c5HGa2eefLq9l1PKYh?= =?us-ascii?Q?LBjyMileqvZcwPMfD90oYBYe5ASBgw+Bcj+ii8wWnYRBtir6+zhgHPUKbskF?= =?us-ascii?Q?Vnoi/xCy5+SQSJUs9oAV+Gpkbe9neWDY6b8ESXzHVg4lta16c354RX5ovUVJ?= =?us-ascii?Q?DxjRq5YU1FmnvdCwNIlqnzwrcPEyw90=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d260e032-4dca-4ad4-b2ae-08da31ccc634 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 15:01:19.7278 (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: mJpUaRcrjAxlm0Aquk9/fDuC2x4wASw9PEy1BzehuKiSgn63/GbcVmo4hWZFu4EYCMHW0XVIN0iE1FjqHASBsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8107 Content-Type: text/plain; charset="utf-8" Add call_again parameter for mptcp_sched_get_send() and mptcp_sched_get_retrans(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 13 +++++++++---- net/mptcp/protocol.h | 4 ++-- net/mptcp/sched.c | 10 ++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3c55e7f45aef..4a55a6e89ed5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1558,6 +1558,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) }; struct mptcp_data_frag *dfrag; int len, copied =3D 0; + bool call_again; =20 while ((dfrag =3D mptcp_send_head(sk))) { info.sent =3D dfrag->already_sent; @@ -1567,7 +1568,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) int ret =3D 0; =20 prev_ssk =3D ssk; - ssk =3D mptcp_sched_get_send(msk); + ssk =3D mptcp_sched_get_send(msk, &call_again); =20 /* First check. If the ssk has changed since * the last round, release prev_ssk @@ -1621,6 +1622,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) struct sock *xmit_ssk; int len, copied =3D 0; bool first =3D true; + bool call_again; =20 info.flags =3D 0; while ((dfrag =3D mptcp_send_head(sk))) { @@ -1634,7 +1636,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) * check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk), &call_aga= in); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -2461,12 +2463,13 @@ static void __mptcp_retrans(struct sock *sk) struct mptcp_data_frag *dfrag; size_t copied =3D 0; struct sock *ssk; + bool call_again; int ret; =20 mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_sched_get_retrans(msk); + ssk =3D mptcp_sched_get_retrans(msk, &call_again); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -3117,11 +3120,13 @@ void __mptcp_data_acked(struct sock *sk) =20 void __mptcp_check_push(struct sock *sk, struct sock *ssk) { + bool call_again; + if (!mptcp_send_head(sk)) return; =20 if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk)); + struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk), &call_again= ); =20 if (xmit_ssk =3D=3D ssk) __mptcp_subflow_push_pending(sk, ssk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 59a23838782f..2fe0021a678e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -631,8 +631,8 @@ int mptcp_init_sched(struct mptcp_sock *msk, void mptcp_release_sched(struct mptcp_sock *msk); struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk); +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, bool *call_again= ); +struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk, bool *call_ag= ain); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 9ee2d30a6f19..83377cd1a4de 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -111,12 +111,14 @@ static int mptcp_sched_data_init(struct mptcp_sock *m= sk, return 0; } =20 -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, bool *call_again) { struct mptcp_sched_data data; =20 sock_owned_by_me((struct sock *)msk); =20 + *call_again =3D 0; + /* the following check is moved out of mptcp_subflow_get_send */ if (__mptcp_check_fallback(msk)) { if (!msk->first) @@ -131,15 +133,18 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *= msk) msk->sched->get_subflow(msk, false, &data); =20 msk->last_snd =3D data.sock; + *call_again =3D data.call_again; return data.sock; } =20 -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk, bool *call_ag= ain) { struct mptcp_sched_data data; =20 sock_owned_by_me((const struct sock *)msk); =20 + *call_again =3D 0; + /* the following check is moved out of mptcp_subflow_get_retrans */ if (__mptcp_check_fallback(msk)) return NULL; @@ -151,5 +156,6 @@ struct sock *mptcp_sched_get_retrans(struct mptcp_sock = *msk) msk->sched->get_subflow(msk, true, &data); =20 msk->last_snd =3D data.sock; + *call_again =3D data.call_again; return data.sock; } --=20 2.34.1 From nobody Wed May 8 21:38:17 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3241706pis; Mon, 9 May 2022 08:01:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjc8PFQlEOj1Wp4jeffPTX/qANZtnD26ZHfxZdSGUj97ueoPCbQuNc6hs/UZzU0MOvdHnK X-Received: by 2002:a17:906:7313:b0:6f4:d9c1:5a3b with SMTP id di19-20020a170906731300b006f4d9c15a3bmr15196441ejc.382.1652108498062; Mon, 09 May 2022 08:01:38 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id q21-20020a17090676d500b006f3d331b455si12576743ejn.231.2022.05.09.08.01.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 08:01:38 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5187-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="N/E1zDD3"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5187-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5187-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 9668E2E09CE for ; Mon, 9 May 2022 15:01:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 265C01FB4; Mon, 9 May 2022 15:01:34 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 983661FA0 for ; Mon, 9 May 2022 15:01:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652108490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7/Wtg27IArqnG7ZvLzl7iOMdqSNO3s3ea/08k0HbLaE=; b=N/E1zDD3ZmG0XgpKoA4wZ/e4HCa74VDNOKX4PRJFvkaJvOTSYyh771RXgxVd3/u7sybxzE S0xkmDCUvAwkru+lF9KDsz7dAD0BymDcvI7BmKTY76ulIIwQrMYg+SXmfOSDMdVIezaqxB TlrhGqMMMuJDylBOhve6rLABT4O+WyU= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2057.outbound.protection.outlook.com [104.47.14.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-GZLeN9SZN3iw-w_LSkIwyA-1; Mon, 09 May 2022 17:01:28 +0200 X-MC-Unique: GZLeN9SZN3iw-w_LSkIwyA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TYhuIqd7qMmWi3e26RLkXiDnIlSam0E/vilvymfm4u09pgnxABVFJhyxNAmSClJ/TKcgU0Aoei1wOc5eKIdLxQH4iuRz6k6D5yvoRLkycvEA/2XAAVPxHW4r2AXRJ3Pd2tZcKJqCfhm3h0JrB/fol/4JBr7NqGz96fA108DeeRtqwsD8gA/VwAwtoX5La07+0dJGJZ5Kiw4+xPw9vr3iS5nWGt6TQDaWc9iwnyR5EAcHPhlCSn1PO+nOpfo9HVl+Abl6nsM/oYmHiRjdQPGI4d2XA1fVvSC/IyOVi+yb7EuKVtKYCuk7Fizdv+hqiRhSwJ8BYYKLLbDKzM01GYVLtA== 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=MqaLfTEwjRJOvnGoZchTs5ZXVzg5LIPMOusZdbb23n4=; b=lOTOcW4PeoHV2QgQ9UmTRLNXfY9qDfsODvOeMiksy0ujiBTOgePvdJ++EKwCfxXfOdOc4BY82kpyedXpCVU4ouQTZ5xyy5EAAFKz4tcINEDBA2x8tLXqfuAKnfyAR+xGUmnep2S4YPfCVb5NfsgxbnllTiuXhBsipCtyE+l/raTddULRknKQR2cggmbMRxxnJk7u68Y+O3zm2FKUiW9p5ni0ypkh1KUUZMlQQvwD5zPntRhc2O+LcWldDrhp4HqK9qeHYX89nE7Ew6Vb8Owoe9+pHuvr4M0eWralzDxtQlBtClA62HNeUffyh2PGl8+Pzjk6kSaDrgP3H3+dM3R5vw== 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 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 AM0PR0402MB3924.eurprd04.prod.outlook.com (2603:10a6:208:7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.28; Mon, 9 May 2022 15:01:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5227.022; Mon, 9 May 2022 15:01:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/4] mptcp: add redundant subflows support Date: Mon, 9 May 2022 23:01:08 +0800 Message-ID: <7455f0b7b02d6f2edac5fca53c8667e1e0e84533.1652108279.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0010.apcprd04.prod.outlook.com (2603:1096:203:d0::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-Office365-Filtering-Correlation-Id: ff84da2a-a549-48ce-8d30-08da31cccab6 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3924:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IA/AwN/ZCt4TbEMSjvNh4ZRuJAcAUPGL/uyUxDG/ezzNFsDm99bSmnqfQdyKs6Dz57iVva9aamQLrFnvHBcKc9nxYa3NQEnKjh64Vwplh9J5KejRn/VJgXYluvdyINhgwPRafx/xPKY2UloM2DX4nT3u0bn27e7SIxibRClNZ/xvNrOpNvH1POIeiIqjqBjyrO29d/hzYjSCrAxQ3MiHuARU6f0gR21Xsc26wOqXbRnZZOF+fYNFi6DgblZCH0pCgC/ybR/oyAmo9EY9ADOv2B1xzytjPf4xaamN84p9p+87tAIgQQMSROYP5DOeYuuiZW5L9JDKw/TFtiOdVHnSNwVLcv3YmT52Ec+NwdF5RYSrzBsT8KNHtXJkNAgMlT/xzXCZBtVrZFHa2y96KZHI4sJE1XRXZPeMqZfFE4PISG3SDtmmvodV/DWnHs678+uAjGYPuWd5atdDxJiLMzpIMa9gTPITdiMzD0YQfNFLG+1bn9fXKwq3vlhGnFtp7LGma2zrGVSQECa1G+iimvNjDJp0iy0YgVN+oVlLJwD65wUmjBEiWB3c+fQrypsvyZmd9VNSczKibNSwFURype/YpZkm8IKvYDrR2HJCIffFtHHKixenhccl9m9tPeE1w33bRO+OHhiO+p2yUz8ozt5wZJ1ao8uSaMKjxHrd/YVY/FBgxI5Hm5FbIDxNogjZLSX+m5SyTkKpRtYpNF55vwyFJQ== 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:(13230001)(366004)(66556008)(6916009)(2616005)(86362001)(107886003)(316002)(66946007)(8676002)(4326008)(186003)(83380400001)(44832011)(36756003)(66476007)(8936002)(38100700002)(6666004)(5660300002)(6486002)(508600001)(26005)(6512007)(6506007)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OPMfjuvQPUNgsw6c0IzgHn0vfRwn0ClD+Soj1Bd+r0Hy4l6adiTiEyq1gvbk?= =?us-ascii?Q?3WcQNNKbEr9YND7NxC/9QWsE2yca7Lh+buzV43zP7kDvYpgB9/mDanYfqRWj?= =?us-ascii?Q?jGInXHGeTlT1H99oiI18dH6PS7PNaHo4tXxP9Hd5vmLl/hZCBaQzPiX5WbSJ?= =?us-ascii?Q?hGLb4ygKT94Lwpi32htkWP4jEexVI6M8BiPU9ES8/n+cJ16d7nv/mzoUhxPL?= =?us-ascii?Q?dCeHs/j7KXg0xp24Spwrx/nZdIoIutohMbxGmPQorLM+J11Hp5B7CPxoWnFA?= =?us-ascii?Q?xf2EIFSIYsU5aGgj/xn8aMRRjPokXMjWx8SNPgqIssONFGiyE6W2LylPcBQ+?= =?us-ascii?Q?s2DbdEhIJKFHAoIoe5dstIVaogfP1H1OYRH0VB7+sH8uKfItxrSfmoQBxVUz?= =?us-ascii?Q?bPTK9Lfa+l+9cyAqenDtiOcAdK0OiUik7yfv2PiSws1UAcu4roMWkZrBTPiz?= =?us-ascii?Q?tVaBtFvufYgr/XULbJ5MAcxq4NtW0Dvs4/9QkUJnZ6eryj5/UPbO1KVWEDJc?= =?us-ascii?Q?MvN1WEHQdpxW9woHkxN2W5Q0kqELueS+oF9VC8Nsv09avIj7vdxlmHYfLp4R?= =?us-ascii?Q?2d4LxxRwTBicPcka2msZtaRsC3/R/wn+S4xE+q6EOtB07iHPTdX6hLp7vEJG?= =?us-ascii?Q?4ZvBU6LcbR9AFYY2Evcj21lS8IwyrNg2xanP2Dy2kHfuqFXrumSazYiCdWWs?= =?us-ascii?Q?I8FyDOrV/lZyYHDWIaR32m1qbzoCwFxyRdF9gP4hqwbyE+ddUVdoL0OAetYg?= =?us-ascii?Q?RD0mdYYbRYHxJhJIjYpzYa+9OI69YlEUAsbFPy0B9ypFEo1hWMWzXB7n19XR?= =?us-ascii?Q?sc+NAdsVOsMXX2U2UVIVMv/4pPvaoMK8w4bLw4a2rTvnNmZKGdiCzeFOorlw?= =?us-ascii?Q?bsKG1HmwprxANWaMPKiICQYWPCKnY8U31WqJwwPBuH7C6d00AVngMYrsXjQ9?= =?us-ascii?Q?sqSMLaB4tV1EfgJt5sxEP4N3ykhmqNcK47Iqdo5Arhwajg/00U8rGxttqRyu?= =?us-ascii?Q?B5KkQzpg6FOQ2Hf8fk/lVoVGTw+C+y2KrUzOBSn7/aHJKaueGhFHjIKbsw54?= =?us-ascii?Q?zQP2gjf8ME7HIhehJW6rygdqEXNUlTlg2Mv9teHkSt9blSFU6VKg/vAc2gct?= =?us-ascii?Q?yABlWNdx9hWXsaq0ZYgRJ5EPU/ksyu5Jh/CUnkpKDO8I3WQaD0bPgAUFjjEr?= =?us-ascii?Q?/LukJVnVnTlOWT9GlYEWVvBM03IOD65ZJ48YfuXt6mTXbJ5qvGngJSpv9oqN?= =?us-ascii?Q?dD0LQKJS5t8HEJEigO6KICXo5CAQuL8l2K6j5cOfoCNvpbiA67GJmpGaXiLu?= =?us-ascii?Q?T1QQ/KNuBH6V51+LyUt1tOnxA88zNZhjBJfwILZDnkn49Kfbg/B0wv+HwGwm?= =?us-ascii?Q?eHu4GqQXFix8jQOdeKZRJLCAgduKwtCsAzHTs5a2a/wt21ET62A3FHfUnNBD?= =?us-ascii?Q?Vxe8ie/RTMq2fGF7URJEwjQnSaWChfPzEcOrfzRDPnvumIZgRkmGF1iSVF3o?= =?us-ascii?Q?/HoQckAcJ2BiG99xSr78ITVXH3pF1gKEASemFvuCEWZ0buVQISYGEcEUr/HZ?= =?us-ascii?Q?IecNuyDrA3HS8iUaPh/D7Hnayk8+UGVMMMbQyrkjdhsbJRafXMy3s5sZOD22?= =?us-ascii?Q?OC/J6ksXnsPTqtCQ8bPj8RlyaVOoBxy3eubkLE5JraNAkvQLB/zywvcO0a/j?= =?us-ascii?Q?itQA8GFNP28cb0UYXwzfVscjUjzWpkRDiPwqzLqpK0R3TCZVtwVZlkDvK4hO?= =?us-ascii?Q?6N6MbvPtXqEigGWSb+FPWUHfHPwa1Es=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff84da2a-a549-48ce-8d30-08da31cccab6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 15:01:27.3834 (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: E7AO9qe6QFi740oQtm0vxAlbfSwROIBtCwxJGxRoFuCSuXI/zb87AmZ6eFG7Py0TfX/LJpagg6IJSRrAx8uvcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3924 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support, sending all packets redundantly on all available subflows. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 1 + net/mptcp/protocol.c | 13 ++++++++----- net/mptcp/sched.c | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 345f27a68eaa..d48c66de8466 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -101,6 +101,7 @@ struct mptcp_out_options { struct mptcp_sched_data { struct sock *sock; bool call_again; + u8 subflows; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4a55a6e89ed5..e3e1026aad97 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1591,13 +1591,16 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) goto out; } =20 - info.sent +=3D ret; - copied +=3D ret; - len -=3D ret; + if (!call_again) { + info.sent +=3D ret; + copied +=3D ret; + len -=3D ret; =20 - mptcp_update_post_push(msk, dfrag, ret); + mptcp_update_post_push(msk, dfrag, ret); + } } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + if (!call_again) + WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); } =20 /* at this point we held the socket lock for the last subflow we used */ diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 83377cd1a4de..0d5fc96a2ce0 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -104,6 +104,7 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk, } data->contexts[i++] =3D subflow; } + data->subflows =3D i; =20 for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i++] =3D NULL; --=20 2.34.1 From nobody Wed May 8 21:38:17 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3241799pis; Mon, 9 May 2022 08:01:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjV9kL7dttnJxCybLHXFY7zvuu+rPrUCpErUfK7HT+2dPh5LWA+MuerGsEyQxr497zW0pd X-Received: by 2002:aa7:88d2:0:b0:50a:cf7d:6ff1 with SMTP id k18-20020aa788d2000000b0050acf7d6ff1mr16363107pff.67.1652108505972; Mon, 09 May 2022 08:01:45 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id 8-20020a630008000000b00398009192c9si14993086pga.869.2022.05.09.08.01.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 08:01:45 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5188-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=T46H+jYZ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5188-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5188-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 92C18280A70 for ; Mon, 9 May 2022 15:01:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9DD101FB4; Mon, 9 May 2022 15:01:44 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 D30131FA0 for ; Mon, 9 May 2022 15:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652108501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PNmkGlg+6hr+3FqLH3HzZX0Cg1KYLfhuHq8SnIIrAcM=; b=T46H+jYZ72UFcqd9CLzPxMk/7taRGVHZCTDRUf697xagsbPEp3gMBMPtlXOjWIFccKP2NI cnSGqp9uoy+99ohmBpIXRKibJpj9OY00ALm2JRsJem03IMxYscqwUE3Kefrry7u+5voTtB tYN8MtQBat1U7G7oOdVI6aB+OG3pDlI= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2057.outbound.protection.outlook.com [104.47.14.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-zYJMrnZYMFWxcDC_FGyv7Q-1; Mon, 09 May 2022 17:01:37 +0200 X-MC-Unique: zYJMrnZYMFWxcDC_FGyv7Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X5y0z4Fi8A+0/D26dKlAzuVDY4C2GsPXClZIGAG/AFoNdEM2XF/7M9lH7Ssoy+nXt6dwYe3Tm1iHGWcsHcRFWhgTMVJU0QNOoBEFh1DYjrbSjGdkMYHoyT2Nl+3ogKZ68BWHkHwcj09+8AVz2yA3Xegm1Yta4jdycvozDFDWY++j38j0h7qhQdMM6aFse0Rm46n2KdW0iBqa7XJx+aWKlJwLDaKqoLub4bfTQc2sE76bTTLQlRdU4CyYk4UcH0xoXo/zK/zdxitqswoppBMfexCk5HYwWqd8BHoVTxeFCftr/2mt/ZuNbSDVzdW8JDcKzcfGqdOjLaeVKDe7KJRGXA== 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=Vvpofmtt3DZd3EotYYyUSg4dPxSMWEYswF+MK0Gh5PI=; b=J2PHDfxe22OrHoy2jY4kpJS9pMNYw3JqZWDkezIqE0gYCknBH5jDTVP0aWzuwZtxamQdEHQ8OwRu15JXou17kPG9Hi0h2D0wRDovcXInxYOmGg7juVpsRC1Dx++7KA2s+Z66ebbE++v5hPkr5xN86f7PmlWc7Owasyl2/YJWUJ2dWE4ZFOH9z+C2dYSER457BWW+xLymh7HVt4bTzQOkCYKIlOmtRBv47Cw638XtkX/LY9IvgfeHsW6w9Uo41cnyhlQFgeHgeO6vwLjYp3rNkmSLxUDZ1O3fVDJcM1wM007x8U8LKtuhvBnABnbauG1CjIM606zxIefT9++3kVCN8w== 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 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 AM0PR0402MB3924.eurprd04.prod.outlook.com (2603:10a6:208:7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.28; Mon, 9 May 2022 15:01:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5227.022; Mon, 9 May 2022 15:01:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/4] selftests/bpf: add bpf_red scheduler Date: Mon, 9 May 2022 23:01:09 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0047.apcprd03.prod.outlook.com (2603:1096:202:17::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-Office365-Filtering-Correlation-Id: c14ffcb3-2514-4615-3256-08da31ccd00a X-MS-TrafficTypeDiagnostic: AM0PR0402MB3924:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q68qMfTyETkRfxIgooEmt/taDJlWRWj1TwRsafrifzIcvrZBaP/7sbzqawCmMG25P06VLY4iss2PJXInFpLaSaOJPxArIPs7NbNw+RNSpBBRrkfczQLYP6Nqbnm2bFUg62ObWCDOP/jzozMaRTNJYEUyjQPopWlLigy2jkk/RpkBpxB091yYFzqzuaivTusw4dySxU7e4lgb/ue8XhaLK6/mp+q136zeWuLZRi+pYsckB3XghnrKIaVeHdC37wh4jd7SrNMkl1ahEU+qSKujx2T1qcozjeGFC/szaPzu0TCo25+zl0ZeFLY+KeqDBxrliaxvKMVxHPq2W6PrDmU9Eld2ISSm/VMwF2H7qvX22QL/b+QJI7HCNabhvkCkg6wok4O5WBEvsDz0mgHEqQoyTmAxOg7e2mCtjdabIkQya3BvNQzvO5NHu4qZ+ELpiUnoFSmSb8wzNi0poxioZJXooqv9/9Rb/pB7dWBD9Fuw4FnMmP5M+WAvxkw6pygtcUBwXmeNvXorxDM1x28AqpcSxH53n/nAjMyuPXBDoTIPXYpcY7NtghDVtOus/CaeC+a/XY42GITFCW1fl4ySO9yo194snVNXmNpl6yJr5Gg1ewhGZj4KpTXHiJIOfh3mvr6K5AIkBE41ztA4kMVvbnOLAdlLV8LzNoiy7/R5p5IaK2Ticpd4RgCLG/+4da5Ernqc9lq1J91gaGUKIk1ux4ERFA== 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:(13230001)(366004)(66556008)(6916009)(2616005)(86362001)(107886003)(316002)(66946007)(8676002)(4326008)(186003)(44832011)(36756003)(66476007)(8936002)(38100700002)(6666004)(5660300002)(6486002)(508600001)(26005)(6512007)(6506007)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jn32/HBwEotsXwN2wobRYdBQ5XGK0zRWlgdcQar2C6RS2r7rhsp+G279QZBD?= =?us-ascii?Q?9Yqb+1HMaAwrYAa9Ghg8+9wV1TonXdERokmVLYfn+BDn14qw2gRgbUUt2lfh?= =?us-ascii?Q?9zCYTJgYNjGO4EDXrr62nkMLX2MuLxxLITmENzLN/E1pSXVetIskCL5BwOWD?= =?us-ascii?Q?4ITcSeLI5pS6asrCCSePPuzmi0xgmJVOZ693B6wj3hl2QXNOTpVfn7jgZWSH?= =?us-ascii?Q?AAO8ayhdRQkuiKMDpyv1VcQU21mVIaWfN54PyCUsfa7yHGmQ/LUZ+sYcOGMi?= =?us-ascii?Q?EcCtauuNtOjTqqKr+qAnYvWtopBQps5t+t3FdSpk8Zs5n6DMMW0YAgvUUjEs?= =?us-ascii?Q?aMEyiFnNa3Es95+b7xLDNxqh/vcz3h9F4gHMtIZuWodLfYeMHA6JxNxuA01A?= =?us-ascii?Q?ovxYZGAV5MSAAunGL/iphvmmdRUADCTokjou5OoQcmhc6anXPkLzZowYRMFx?= =?us-ascii?Q?AMuoYjA+BFhTVV7Fm6+C5EuuzRwN+Q7BSQMSN8oKanxcXDgEHOL79QqPDAQe?= =?us-ascii?Q?Tta4NPBKWvyw/NAFQm83iXbwH/8Ci850te5Gr4uWZAJKmNimk3tjRF9v+g1m?= =?us-ascii?Q?RYX4Fojdoec+j73O4PcW4UgRUyPAryM29xMG73TKgcM70X54dze4Id/6xpHt?= =?us-ascii?Q?o45MJybud1ToYWPmBkQGlUDuvcJKyRPHFPVPA3nL1NIsgQy+GnXqPfPz8XnZ?= =?us-ascii?Q?QktkpBSfrIq7TYx24Q6Eg6qDRGqx64BG6FaMNGhaWASzfEztYeHPaK1h5z7r?= =?us-ascii?Q?H39TRPpoadbtoAmItCSSFX0uahUJDjsbPC4QRyCXSqv9GrYFc7R0fpfxqj5H?= =?us-ascii?Q?GIbSJ6YLiH5IreW54JFiPCKVoYxA4PTu/elAyQvcBOifFUaUhjhhuxW1g5ix?= =?us-ascii?Q?anvL5feB2P+53wiXyD43/MSYmEHXt1fe4I67/OZvr49sx32nI08ZkCeHRObG?= =?us-ascii?Q?eczR1dA30O5lhX9QRwy1z9QpijCFCNk/90ptp1d4BBih2AM7P8YaWYxzCowa?= =?us-ascii?Q?0e7YuScp64Li1/6LQNpvRJjvrtl9jvGVSous0zrUBAwzep5AGV6AKHpIn0eW?= =?us-ascii?Q?pWuc2E8i/NuU/1U8EsIChOWk0whLfrX00aiRXv3MLzlwo7ig5BgrNjiIIuYi?= =?us-ascii?Q?IcwHFN0QhRmjr1D68xgRX1iC5AHNTqCDseA0WyyGckJS5MzXhCXsiflA0s2J?= =?us-ascii?Q?RgUVZl76GHzAKcDdeYtcksdTV44r9bJJmJtV57GGxvy2Gqh914CV97NyvJ8b?= =?us-ascii?Q?yymwdYiSul7cSr0uwwmspI5rZPKBnQNBjlOis5i7JSqo18P4qgboquZgyv3p?= =?us-ascii?Q?7eDYIYXbrXl/kVn1klvJ5QtJQe4DqihlgBITtkMipHXLBci3tiTEmvINIs7G?= =?us-ascii?Q?Gfpl28JwH49RlHyqJGwtl+L6hta8Fh4bQq8a+zV7DFn/R4Q6cmw3990TfzHV?= =?us-ascii?Q?FZ+V9jbeQ/6ncvtxbCfzJwHUhLWk4xBNVkZN88oAbiCNKq6GUKC1x8+5mG9a?= =?us-ascii?Q?VfCf1O1+4MKOH53dwHuL+ecUiZ+MZ80rTv6XjKAeTAncBJzC7mt60O1G2gsN?= =?us-ascii?Q?XzoWsFHs/2/q68uEgTZgMI6JX7ztxvM4DDqESjkw9tIJbiX6JGTmeccrJzjd?= =?us-ascii?Q?DtsKSRmeFGHcB71+PoAgMUnHc9U3HghHUqeb+3kIP89if9emkyucPhhoP5Vc?= =?us-ascii?Q?ETNnz83jWBGl+hxkX87shdEQaz2TppJi5xmMvBv/a6VqOOlWL4qLTqcIFPLB?= =?us-ascii?Q?Xir0keKlUH/VSWcqtU19HzBgPaN0Upw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c14ffcb3-2514-4615-3256-08da31ccd00a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 15:01:36.2889 (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: 2vNf0pDjm9Py0Jb+f8xHAhyrpczARb78qq0NAAWmKoY4bqLF32/cy/UYIZ6QnlQ2AxpXRG42DY/0k9SBRySl8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3924 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 --- .../testing/selftests/bpf/bpf_mptcp_helpers.h | 1 + .../selftests/bpf/progs/mptcp_bpf_red.c | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 2d5109f459b4..9004947ee4e4 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -12,6 +12,7 @@ struct mptcp_sched_data { struct sock *sock; bool call_again; + __u8 subflows; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 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..74c928e8154f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_mptcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; +char fmt[] =3D "ssk=3D%p call_again=3D%u"; + +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_get_subflow, const struct mptcp_sock *msk, + bool reinject, struct mptcp_sched_data *data) +{ + struct sock *ssk =3D data->contexts[0]->tcp_sock; + int i; + + for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!msk->last_snd || !data->contexts[i]) + break; + + if (data->contexts[i]->tcp_sock =3D=3D msk->last_snd) { + if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) + break; + + ssk =3D data->contexts[i + 1]->tcp_sock; + break; + } + } + + data->sock =3D ssk; + if (i < data->subflows - 1) + data->call_again =3D 1; + else + data->call_again =3D 0; +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.34.1 From nobody Wed May 8 21:38:17 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp3241858pis; Mon, 9 May 2022 08:01:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxINBAhlZO6IqspdTkiO07kU8XJWSl3IZwgu+pk8XcSXUfzRXqeIIsvUe+0/2YksmMcDG/W X-Received: by 2002:a17:903:40c6:b0:15e:a8b5:5650 with SMTP id t6-20020a17090340c600b0015ea8b55650mr16383627pld.79.1652108511387; Mon, 09 May 2022 08:01:51 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k188-20020a636fc5000000b003c1dc83e6b6si14967595pgc.317.2022.05.09.08.01.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 08:01:51 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5189-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=KwhI7nMe; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5189-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5189-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 16F5F280A72 for ; Mon, 9 May 2022 15:01:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 06B711FB4; Mon, 9 May 2022 15:01:50 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 909B01FA0 for ; Mon, 9 May 2022 15:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1652108506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FyT4vd8d4FgbG8UHBfY1tYno8mNZh93Jdxr/CCjhsaQ=; b=KwhI7nMeBak/fbiCyaCiA+nS6PZ/FamD3hh+EnfKgj8CT4DDFkq5bj1ufKus13yEAoZ5d9 omVQ95e7bfY8J7Hfz2CfOE6Rg0hogNo+EWu4h6OKakqfPkQVfyseEczijuyhe67eIKBzMF m/KntDbd2utTMfzEVJqLh+mOnrsDplo= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2059.outbound.protection.outlook.com [104.47.5.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-CkUCgqIqNKOmioQRPPfzEA-1; Mon, 09 May 2022 17:01:45 +0200 X-MC-Unique: CkUCgqIqNKOmioQRPPfzEA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EIGbilEoZ9WZSKiDZnop5BBqAvsWCRoL7X2QPgBGv/gNhsD4TXx/Lao4hW9n0dq1jDsQxChZ1dOR2vTHsnrDpS7XP9yRr8s4HmYzS3QBTVvtY7DRO/w918R+q/vy28hQ13X5AUFtoCQ0g1Snvom7HFjZ94VqiH7x5TJQaROdfZHVVpXq+GpixwUdWnjbOs8Tnh99x5cowv0467mwjkC3Yorm2dlxkhEBTsOEldGllebrrfu6HUsxjsRuXvDXpnmTI9RkfABaLIvLrlN/RxBXBkKgXg1kwfVq5eZkgyNg0IENV7tFf636W3xpm0u5KpX3bUGXlgojtYTA/YEr/z1OVQ== 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=jgjhE9V8pRbjyUsxda7KtE0cCEZt2CWfZlfnVVFkgT0=; b=K1RFX3JTQWSQKIldvJOUYhKgrq5z5hYFUkJ1y2h7Wz500htjDHUfll3HYisp8ktm++spJ2u7O7ld7X4dVs5xSLqIRZ113DHrmzCoGdrnkNM8hlOxcNWCBOC29YNFHSxTVsRH2UGBW8pnIw9U3z+1mjtXmug+JwkCcbUWBjPKomYIAd+p/NZmGPugtNvhKL1j+2WCSUvsS6XIxrIU1PbK1WTgf66h/umUs1gx+NiHeJoy/WHXkuGRGU5IR1EzOBOtfFLtkfsXaac0D38aBjATTGZplnQZwX8+0VpN/rkzfkMCohU0kF8CAwAKJCeS+al8w2rxf/WrObgTXXgMGtNJPA== 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 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 AM7PR04MB7000.eurprd04.prod.outlook.com (2603:10a6:20b:104::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Mon, 9 May 2022 15:01:44 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5227.022; Mon, 9 May 2022 15:01:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 4/4] selftests/bpf: add bpf_red test Date: Mon, 9 May 2022 23:01:10 +0800 Message-ID: <8a186af1c7c19fe4cdfe3eb768be7bdf498a346a.1652108279.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0213.apcprd02.prod.outlook.com (2603:1096:201:20::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-Office365-Filtering-Correlation-Id: a177904e-b76f-4818-2d90-08da31ccd4f0 X-MS-TrafficTypeDiagnostic: AM7PR04MB7000:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sj5VBY8Z4gesLE8p6wmucg1lDon8vCWauEXjf/vNgGh9hoFIlbPMvtBshY1hCM+JWR0HuxjXO7A5HZy/vEO26d4sz8HatNIthsFE+cYlFQFyszNKiWNRHcduLQUYH+XozOCCrpedhGIE1A+XGfYaRVas6FWTB/Hx+5SwOWv2MkD0E1pn69Vuv24VbX9SU5jqI/1SDlV+DBNcMqt5H8ZX0pr1F5HOXKVxcgRhVD7izLGOCak5FcERiaE7J+KmV6Vn+mVPanMy81XQYk3z6L2eWdhw7joDyFMc8Q90WVTo/bC2orYmQ323bhUyRIBMUhOcpy9YtU9fnKMUFcqATR592qkMijR+LRAhGfFrEP20sZIz4IQ85CxN/TgFLrmZtYwYB98OarzHbtsn+QzXBeSafG7IKOA6IpvoWD9FNcJ65hTYKqWuMNrtir3BZBBTKLD3re9zTjYOeUrh9onaKoomU5FvfPk85QGNE/SV4lBLwPKGqddGwLBkawa/ow4gZMp4Ag5xkprJLnPXFFV59fCupNRPn0v1/hkTvFhqu0PBaS1UTCLEo4hVzZ3SriNJgaEhy6lI9dKgi2+ZEmxYr6R0IPg4jdcS7wC7XJ3xy/qqvDF+Hd657epubCTy6F2t4Nu1yQ5+Cmh8uiPBS0FoOwBZgiVXUxb1EZURVFZmPJtzgDBh8+cXUP8o93vLlY7/0HaN 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:(13230001)(366004)(6506007)(4326008)(8676002)(316002)(66556008)(66946007)(83380400001)(66476007)(86362001)(8936002)(508600001)(44832011)(5660300002)(107886003)(2616005)(26005)(6666004)(186003)(6512007)(2906002)(6486002)(36756003)(38100700002)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fDpbYpPzTzdbw9kpHoNzqrLrmnurz+oEoyDaeI4PYqiNk6a8j9+rV35Ct9Qe?= =?us-ascii?Q?eP2VGx/Hkw5UvAxliocejRTPN+2OoXf1ktyPO2K9uscdIIrx5iNaeK90cHxr?= =?us-ascii?Q?hp0lXHRrzMTnYAxbSv8o9eHnuZHwzf1ZadsuDVNMX02aFb0GR3AfWLoYkBp6?= =?us-ascii?Q?qQ7tm1333LVuVH06kHhaPSqsuqTFixSERqFdsYAHKJVpKKzhYdrn2YR3maN8?= =?us-ascii?Q?7eiJvSwnDDc63wwLN29NcAGNzCAK6jRRU0ClITycON3joztQ7fSCBKzs4lvj?= =?us-ascii?Q?yXl95KOlHBeLvxiTMJVecv8/LbQmTpaKuw4cro2aC0us65lkzF28p85Dnfb0?= =?us-ascii?Q?hu+vCT2u3oxn8yOk5Q158KPwAVL6AQxqRA9LcU/5q5tkxDDx6xo9xfE+49mi?= =?us-ascii?Q?RAmeGcWj4PFTCo7B/U1W1mGFv5Iwvzbk2P9+nmiWrip/LORGw5CokI8+fZCm?= =?us-ascii?Q?kXiaMiRu2KJ9VNXdsO19/WtdgVAMJy82FumU3Fn7jVszFI+cl/3jhuUfliKQ?= =?us-ascii?Q?9KHhrv35y4kpXuDG5iYuLPBUsUfS/8JUAm44BWcit9GAQrjvl4POsGTqoUu1?= =?us-ascii?Q?LAlxMyCOKnlGb3DSos7XR1Xz5wC1W4rDDM2Wu0QvOrhvonGR/lta8C8it1WF?= =?us-ascii?Q?Zee7DK4kPFnU84KCtCN+9LBN42wQFzjpqyWf+NzHPIcMsKLGX/4xQClv36yJ?= =?us-ascii?Q?OuMkom+2pX3PXp0suMaE4fjBbliDd1vNptPFAC+HAMrZO2UUKjkKmLjKE2DM?= =?us-ascii?Q?0Igqg7P8raHweXPfwJWVTRs6d+m7/d2EKt5Liv8gEJQkXMPmqtE2l7fkFtun?= =?us-ascii?Q?jS1fGmxq3SJXP/YVtVVpv+cCqFtkzPNBXkphAUzwWYqwBcCc/d4aREGqdg5g?= =?us-ascii?Q?IjWejfaGwOUq5NUklBH4hFq4rxbPceUzD61Rbzh40CNPuyxhN04RD4LxAXWM?= =?us-ascii?Q?MutidUrsYs2+NtNLvT4HSxCyZbWE3n25uDZszNpFjGaPAJbYNJSv8Mrzry2+?= =?us-ascii?Q?Uws2HISFMmion98A1GlYToWXVzwZg/zOf73nxfUhQpLGxqQ60mO/LSzxBA8b?= =?us-ascii?Q?ZZZqqXPs4DTpgih21NDN0/43WPjpCcZExYHuUd3cA+6fN9GVKH9DUbtFEv1R?= =?us-ascii?Q?H4oFdF95Qvd6GQQTF1JkO0QLBJr71OWFEsq0tbGZHeaiTxL09qnul1ywqnwQ?= =?us-ascii?Q?qJSlVp7ycKdbDJcPgWlBHNGopMAmEIIwaEnJDp3Gvw/MTvjsOvIYaKNhLqIE?= =?us-ascii?Q?9VOKD3hdzZEsx3Fse72j3E/bnXv7jGIWYXMCXoXk54EBlyaPmofN2dzDDOEu?= =?us-ascii?Q?Tt/pfmoOLFTQNRpobJ0fqkLo3PFrEpB/FJlcHwl/OaVwGiBEI/m4NqjlsP51?= =?us-ascii?Q?FLUq5+xSRJp+9AtjMGs7fhhFIeBr9F/0JFZCcxfmGUrojxDsNyeLFoGh862i?= =?us-ascii?Q?vGtz/csV6PwF+cHkoCuENQpR8Vyd5T/dqVym6SrSRAPJwPI0t6minUKeDIJe?= =?us-ascii?Q?sSZJv/jGl4MI7boBKtqcLvn19FvhhUaNOyhPcif7bfIa+c2dMu1/qX4tFSMW?= =?us-ascii?Q?/y+LMjrLmjDum16yDtlCzgLGkY86dj6Qs678snanCKqV4bWX5zBqzT6VQfcW?= =?us-ascii?Q?ZAr1LajfGynFdyfN+I/NzIMkWszLEs2YpgArS63JnrJ4+FkNvfm3Mi5td5BD?= =?us-ascii?Q?dcdVQSNQRIbbeQAdYzlfeNujmeCuim5R5NXDgWoDclgLaqprHGrPnNqZdl/T?= =?us-ascii?Q?9jmkZg21mly2WYrToWlbVkdttGA2WEo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a177904e-b76f-4818-2d90-08da31ccd4f0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2022 15:01:44.4914 (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: VfWpO2x2y5ijN84DGdbIJCqfTwZ4I9f7vIHJmXkCsd+POwhfNhOacfbo6njynG17HLSYC2oZeiaWnM9366BDYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7000 Content-Type: text/plain; charset="utf-8" This patch adds the redundant BPF MPTCP scheduler test. Use sysctl to set net.mptcp.scheduler to use this sched. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 5058daf15ce5..7dd36e92c0b1 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -7,6 +7,7 @@ #include "network_helpers.h" #include "mptcp_bpf_first.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 @@ -401,6 +402,41 @@ 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; + } + + system("ip link add veth1 type veth"); + system("ip addr add 10.0.1.1/24 dev veth1"); + system("ip link set veth1 up"); + system("ip mptcp endpoint add 10.0.1.1 subflow"); + system("sysctl -qw net.mptcp.scheduler=3Dbpf_red"); + server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); + client_fd =3D connect_to_mptcp_fd(server_fd, 0); + + send_data(server_fd, client_fd); + + close(client_fd); + close(server_fd); + system("sysctl -qw net.mptcp.scheduler=3Ddefault"); + system("ip mptcp endpoint flush"); + system("ip link del veth1"); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -409,4 +445,6 @@ void test_mptcp(void) test_first(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.34.1