From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1901:b0:4da:e6e0:f39d with SMTP id h1csp2395124pir; Sun, 5 Jun 2022 06:30:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBWJzQKFzanLBi3iUGjLKOYACdIVD7OgQsHmEqT92o9/Cc7Kc3bbenVNRHOXQp+FBdjeZb X-Received: by 2002:a17:903:41d0:b0:167:68a7:c3d with SMTP id u16-20020a17090341d000b0016768a70c3dmr6345700ple.161.1654435810239; Sun, 05 Jun 2022 06:30:10 -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 68-20020a630147000000b003fca9e4e3b7si16724664pgb.319.2022.06.05.06.30.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2022 06:30:10 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5552-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=SdCUash9; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5552-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5552-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 B34E7280A7E for ; Sun, 5 Jun 2022 13:30:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E76281866; Sun, 5 Jun 2022 13:30:08 +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 9496E7E for ; Sun, 5 Jun 2022 13:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654435804; 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=y/zdKWG2EBqMzuN9rcmWq+IpOR4s0ra7aCa3OsLQBzw=; b=SdCUash9RiEf0F+G5GcXhRDXOQ49iGAVTy3v9aIEohCPViSXPmXLGQC4wixO5ssApP6K+x gy8KGhnsb7DfApg4oUGL7uznmyVftHzzJrsy+D2DoumaE22avRMMy7IfGkuF9nO6L4YRvz zVqnaIe/Ph/UAMJwjCoaN4Kie0nRRGU= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2052.outbound.protection.outlook.com [104.47.14.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-VT6uvFqqM4iGCA4uV7mItQ-2; Sun, 05 Jun 2022 15:30:03 +0200 X-MC-Unique: VT6uvFqqM4iGCA4uV7mItQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TbecyBAAJDnTrPqUcPCtdHYE9YU50PIhlE0PbcUtPRwmMjfN/N9YyeOPfddDXE0MgA6g2BKNvVbj3STiQPNzojjiS7l9YqcMEi8my+uyRHKDZX5C1nAGwVlshUE++5dIS9qjJNxqHYmxfd/1mI0wtjC5FJPwQ4Y6i8C3K291TE0IGm/cmtdBEfcDshv7tVq+dH0NMvh5dkryGQJQO6meAr890NxGu9O1K9izD18EEbFMtN82nXCelE4ah0PVVGjvkrv6CzfsUKd6ereO0ZbxJQG8DTY4NpCQIgPtFQZE8cW0RMXH0Or8ls1NkaEcQWC8zBVuDaIKoUCb2cYBENTfTQ== 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=sWyPHO86ltvZ7vxj64NyInBIg1DKQysrlAB2kZTCdQA=; b=GJK6ns5djOxNozig1h2I0+DyD90CI+obJ0LkjAw2IIgGrUu6VXd57ZxNOuYRPU5GQ8wi+5Rf7S0ywLwm0C1PCVse/fgXaqW746zPXqEmR8ooEgvNG4ILopmdAYTIorKx0hZ7R8fvZ06e0/tE0n+ypNr21lHcwBchECE45cjYSNK51sHJSPeyU4TZ8k3FjRktQj9Bti/XxrBwB9Sp8ofMHvc+WVPeXpILnfI2PBT97Y9AN4qX+WjrHZs3UUB2ZrjrUugdbWhFI5+9hG3zD+L5JZ4T5s2dm6mGAeXhcPFLGPNonbkVrkqLGeI2N3b80d6gDiumCUtuZ+ScI4z75NXAPg== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5028.eurprd04.prod.outlook.com (2603:10a6:208:cc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18; Sun, 5 Jun 2022 13:30:02 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f%7]) with mapi id 15.20.5314.018; Sun, 5 Jun 2022 13:30:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 1/5] Squash to "mptcp: add get_subflow wrappers" Date: Sun, 5 Jun 2022 21:29:36 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0197.apcprd01.prod.exchangelabs.com (2603:1096:4:189::8) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 62969358-4648-403f-a0ea-08da46f77e70 X-MS-TrafficTypeDiagnostic: AM0PR04MB5028: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: 3BkQvyvWE9nM/d5Gps6F2YNK9s96g631tvxeH+GhlJQcaBXjFR/z0k3VYmAeYgaad+8T1F6lYz3WZ6uwvtRMDsbu6YtRpPBz/wq80zyTUX9yAYIMYZHE5h4URinp4erNC7GttFb/S4Xmto9A29GDI6D6M2oN+tOdBbBkIpSsKJ3QDtNZX1KDWz3uyHIfV87V6PeG7x5hLO+wACd7ovV/XNCG6P14SZLnTuRSk+UNg73w7+CwDDL8jr2EmnffAFk+/EVgZRZruL9R3JbbWJ/98DRm31f8j/zUJnepKgQDAzMwCSxPov39o5Bo5lH9tWQMFd3DGdkPxcxhl+eKdQzdvEh8ASQDe5owRFW1ZAgcNdXHucAm13PAnKy+6uq/YETZ71dywGdYuhChXsspbT+KuPFlEAbBslKdSBWzLgFIGad8XYsHipkXkzJb8wEKbEBgGj3j9HEuO1+HYZ3aT/gIvD8D4FH3CH7CyTj9Z8kxVnac9TdWVix1Y9FuhZcTsQZBxLf3TKNyJ/n9zeC2zBjm7haxP45uP92rxrh1UjEQYhlL6y5VMp+mJjiZSMvefpitmuIsmkekDxWfnxhKwovTxRMC90PgYPERvVSyyGWZoGhxqcuR5Ey4F8HAN6LBhAWtO4RNkBNQlK6BY9RwpoQxVUBXkQqF5ce6WRBSWitXdVk3XGzf0KSiqm2gJWWmIZo1hvHYFPRdQQj4BrjrPY3KvA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(66476007)(66556008)(66946007)(38100700002)(107886003)(8676002)(186003)(6486002)(86362001)(6916009)(26005)(6512007)(508600001)(5660300002)(44832011)(36756003)(316002)(6506007)(2616005)(4326008)(2906002)(8936002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HKKAor/2dLn24o1vSSy+CMNdzOcwqqAsuXQ8IkN/oc43da7j09qjfc3gQ74O?= =?us-ascii?Q?sytJhXRYwrLflwlLoZq/mlSbkXdgj1fqz0MD4coIrBsN9gLrBBDiw1VLStlX?= =?us-ascii?Q?Mty7Deuq01URfL+bwdcYPIKvmQDNO3u7h1zfEHA0G5l1iF2H5IVq2EA5Hd8U?= =?us-ascii?Q?Xjdvin8G4PUj91TfZmAQYBmkmG6ML65kat+vF+HCOI2aKVa+ACZ/WM62UjwS?= =?us-ascii?Q?/e7LExfIKfSbM6R/JcXK2gjVp4zx7ThMpn53Xvyz+fW3r6hemGI72FpU+FC6?= =?us-ascii?Q?asok9XZ3ASpAGm+lMTdok1KNT/wSxX291GPvV5/JbSOUf9+KF+0xsqYaxr0I?= =?us-ascii?Q?5j4I7PZKK9Y498YIJdw4Ac2kKABh9niLE/UA2W4bjUNGIh9rfZimpl70oPfp?= =?us-ascii?Q?Eb1YVmlpc66YNUX7eVnODrRZmPaqWC78hRjG/d44tc3Eb6p5csW2lPBA3aP2?= =?us-ascii?Q?EtBaT5/hOcCG+tNY+SU8d3/NVDFU7RfMYwNkO1RZDRDIXknukUJaNDwWUuuT?= =?us-ascii?Q?Q46Or608pArJUy2Qd19zPZhoSPRt4/C+1mQq2B+4RR+n44uHuXlgEZ6iyrM8?= =?us-ascii?Q?hQZw6T72e8oMd4nu9O3IQA7vZltK9QBpvVcCWQe4Cfe1bDtTxjvb81N/AhTi?= =?us-ascii?Q?WwbUsrF0lClxzrIUEV+xFQvubfR/SoTfS/qiXLv8V9ybTpMgTmhmeM6VqsDK?= =?us-ascii?Q?v8fRbd0r5+EZI9s0w7pEsL2p5mucc4oFEdoNuW11wqN3bPm6VdqRsZkmgpAX?= =?us-ascii?Q?TXzM/Jbf7YO/xabS7xMwoonMG+Wiu/2QvHDusa2u0XsOoaAMN+efT62UAJ0D?= =?us-ascii?Q?+ZoQB9M8NacN6NBEryinVpvT/vQGN2wDJ9mltXIkYIvmKpcbSvv4f93u96xm?= =?us-ascii?Q?fw5Zb9IijplDUR5bZNt19J3AF5qxFgfRCm3ZYYFFvCeK9CjC9VLu/gTqfuSu?= =?us-ascii?Q?5R67vZQu5NOlno1hV1KZvui0zReWMR/HbQ3fTk2/Fkyb818/nWOGbHoAZSdU?= =?us-ascii?Q?5bZCCJM99bUmfzRMohQZtwR2QAEdnnxMNViBX6IkXw0Q18Q9KP60+NMWKOII?= =?us-ascii?Q?2dJEQNJa2WQqJcfQTEhrmTJit0+siVUESDxDI9ttrxFVbkK1Mr55ujAvpejZ?= =?us-ascii?Q?jv+5tKINkVekJ+Jc57jYba1CRIgWuXlGEqAhHXqdOD5BCYfeBusnfPPMDYW5?= =?us-ascii?Q?J6N4CLkTgYsRg0Qaf+M1cCkge8qQrk0N1oaEs2wpmgWZ8KYONdPQJ0zOjG7L?= =?us-ascii?Q?qizsNPsjNClgVZ7EtO19WTmYNdE4veCOJNFzmGRTV6TyC/Bitap7gmMUmLmy?= =?us-ascii?Q?8nG11hhMNO9OujLEqXKrg1uNurMD4Y5OevJAT/uMJEs4HIQi/uQFFYGYVP1c?= =?us-ascii?Q?jNNxBbGdw32nL9u7FcU4la7HzgXTEbDRnIWf8Z/eSn74ErejGwP+GInP2g4O?= =?us-ascii?Q?oEOJznpJZHA0r/bA9aa8FZxSXrr/pZHHZR4xwg/7Ag/SHJNraYdgSTBIU8eE?= =?us-ascii?Q?IRDVnQBRLx+jgO3iMDkXThkkJ2HRRuAoSl+6karguEP8L59vbyNrFs0rpEHD?= =?us-ascii?Q?ow00mfluRLmRQAd6wVYnt14oslpwO5cGJIQh7VMM8EwZqoBFPC1exw6ecGSn?= =?us-ascii?Q?wDbIsNHOi3miW04+BHsLsJUxe30bQnD4RqF11DvLFz+8+BiY2F+9yJ/pBl5D?= =?us-ascii?Q?kgub7TjZCg6yBBbzYPmV3ZlcFP6ltj39IrGdDO2sQ4qtXMtQ5+s43AAY4T18?= =?us-ascii?Q?2Q66N2nxXOp80v0rKBcx88/9KZtOg6g=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62969358-4648-403f-a0ea-08da46f77e70 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2022 13:30:02.2116 (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: L+iGdKEuBo4H589XvthPNQZ9duddYlzQASwRYk+pzZwHLYQt/ZDwGCazdfxbO6QWeQcCH8BRO3itsylQsQmMHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5028 Content-Type: text/plain; charset="utf-8" ''' mptcp: add __mptcp_sched_get_send wrapper This patch defines the wrapper __mptcp_sched_get_send(), invoke get_subflow() of msk->sched in it. Use this wrapper instead of using mptcp_subflow_get_send() directly in __mptcp_push_pending(). Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts. Check the subflow scheduled flags in __mptcp_push_pending() to test which subflow or subflows are picked by the scheduler, use them to send data. ''' Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 72 ++++++++++++++++++++++++-------------------- net/mptcp/protocol.h | 4 +-- net/mptcp/sched.c | 59 +++++++++--------------------------- net/mptcp/subflow.c | 1 - 4 files changed, 55 insertions(+), 81 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d6aef4b13b8a..06192eebbd57 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1551,7 +1551,6 @@ void mptcp_check_and_set_pending(struct sock *sk) =20 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_sendmsg_info info =3D { .flags =3D flags, @@ -1564,45 +1563,49 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) info.limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; while (len > 0) { + struct mptcp_subflow_context *subflow; + struct sock *ssk =3D NULL; int ret =3D 0; + int max =3D 0; + int err; =20 - prev_ssk =3D ssk; - ssk =3D mptcp_sched_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) + err =3D __mptcp_sched_get_send(msk); + if (err) 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)) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto out; =20 - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) { - mptcp_push_release(ssk, &info); - goto out; + lock_sock(ssk); + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) { + mptcp_push_release(ssk, &info); + goto out; + } + + if (ret > max) + max =3D ret; + + mptcp_push_release(ssk, &info); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } =20 - info.sent +=3D ret; - copied +=3D ret; - len -=3D ret; + info.sent +=3D max; + copied +=3D max; + len -=3D max; =20 - mptcp_update_post_push(msk, dfrag, ret); + mptcp_update_post_push(msk, dfrag, max); } WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); } =20 - /* at this point we held the socket lock for the last subflow we used */ - if (ssk) - mptcp_push_release(ssk, &info); - out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) @@ -1634,7 +1637,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_subflow_get_send(mptcp_sk(sk)); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -2195,12 +2198,17 @@ static void mptcp_timeout_timer(struct timer_list *= t) * * A backup subflow is returned only if that is the only kind available. */ -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; 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 @@ -2453,7 +2461,7 @@ static void __mptcp_retrans(struct sock *sk) mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_sched_get_retrans(msk); + ssk =3D mptcp_subflow_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -3107,7 +3115,7 @@ void __mptcp_check_push(struct sock *sk, struct sock = *ssk) 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_subflow_get_send(mptcp_sk(sk)); =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 d406b5afbee4..a12507dcf1d5 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -632,9 +632,7 @@ 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); -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk); +int __mptcp_sched_get_send(struct mptcp_sock *msk); =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 8858e1fc8b74..9427d15b4c69 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -117,63 +117,32 @@ static int mptcp_sched_data_init(struct mptcp_sock *m= sk, bool reinject, return 0; } =20 -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) +int __mptcp_sched_get_send(struct mptcp_sock *msk) { struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 sock_owned_by_me((struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return sk_stream_memory_free(msk->first) ? msk->first : NULL; - } - - if (!msk->sched) - return mptcp_subflow_get_send(msk); - - mptcp_sched_data_init(msk, false, &data); - msk->sched->get_subflow(msk, &data); - - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; - break; + if (msk->first && sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + return 0; } + return -EINVAL; } =20 - return ssk; -} - -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) -{ - struct mptcp_sched_data data; - struct sock *ssk =3D NULL; - int i; - - sock_owned_by_me((const struct sock *)msk); - - /* the following check is moved out of mptcp_subflow_get_retrans */ - if (__mptcp_check_fallback(msk)) - return NULL; - - if (!msk->sched) - return mptcp_subflow_get_retrans(msk); + 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; + } =20 - mptcp_sched_data_init(msk, true, &data); + mptcp_sched_data_init(msk, false, &data); msk->sched->get_subflow(msk, &data); =20 - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; - break; - } - } - - return ssk; + return 0; } diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 8841e8cd9ad8..e7864a413192 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -881,7 +881,6 @@ static bool validate_mapping(struct sock *ssk, struct s= k_buff *skb) subflow->map_data_len))) { /* Mapping does covers past subflow data, invalid */ dbg_bad_map(subflow, ssn); - return false; } return true; } --=20 2.34.1 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1901:b0:4da:e6e0:f39d with SMTP id h1csp2395305pir; Sun, 5 Jun 2022 06:30:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx57qaGdRSYYoWQ1JXbteVt83AQ1N1IIUsXhTCvNGR0xEFA22WKmRSxVwAxpauhjGfVG0xm X-Received: by 2002:a05:6870:5708:b0:db:2ef8:f220 with SMTP id k8-20020a056870570800b000db2ef8f220mr28381687oap.198.1654435833541; Sun, 05 Jun 2022 06:30:33 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id 91-20020a9d0c64000000b0060bed2b1fcbsi3889234otr.295.2022.06.05.06.30.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2022 06:30:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5553-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="mb/mTPYR"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5553-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5553-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 ACEB32E0A01 for ; Sun, 5 Jun 2022 13:30:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 415D11866; Sun, 5 Jun 2022 13:30:29 +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 00C9F7E for ; Sun, 5 Jun 2022 13:30:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654435825; 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=cAJo9INBSqvIwcjehs+/byKlNFxKs4sGkO9HHSwQLgs=; b=mb/mTPYRns+eqPc+NC8g6yD2Sq1V+JPu6ey6hZ3AbZCtnhcS8in40Y6EaX3LrUVGjKDSvt l5lVwKKhscPdrxtseLnGC3DxHZTAyWDE1uZ5pFy6tLL1Wz60uhdn+df/C+N9OQ9/ewkVEl +GIYLCciffi/qDTFrMqrVvnoevLjDAo= 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-40-3oU3zKfINLi5Wa2AjVHx6Q-1; Sun, 05 Jun 2022 15:30:24 +0200 X-MC-Unique: 3oU3zKfINLi5Wa2AjVHx6Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SjVBrQw4Ji4oh+RElLY1IPSOoLYmb/8C02cnfwDTPJkkTRSEBLMDg9VZ+yb9l71fMgYAgaP1XI04OGhSsIUjDHrHgnd7DToeUnEdl3fnghy1XOUTcc4xgIJXEqpxPA+iQQYH6qeKFxY15q/jKlQKUQNw3yOtVWJKFsL23Tw8JhacgMqk69lPqmS38ZdThBv0DW+npwzUl2ezcXhnp9uKLvkIn/Ipr8vmq4Q8zUc6CBQboX8vjbK+rZBbZ1ifGtwybtChUf1ZPeGlCXFdBlDxF/dXzo0eNKmWqRrgHj95ykZzkgT7t+hFAaho7SSp86KnDkyc2PsB3s/CihNFic4nVQ== 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=pPHHk4eIiSKUF/LPheUOfa8QNfSB5igLwxWmjCJV91E=; b=RcpOCkVhdmmIf+TXK6gyAPctNQBsiGooXWbL2LbhJnLHK/PyJkHhiiHl3qtff7c5F9CaxDCRBK1X9jWFM8jRsEGffIcfN9IUp5GZkE9OAh4iZ9sXAWz3ftee/Kgjn6q1FVwma+xbB6VDUex9/hSvd8Y3eeSLsHhlnhGO4u9yyqjKhhblPQukCyrSdYB7tYEpJGIM574zxm8GRhw/4Igr/Wwd4pKCwBJawc2hAsy+dnCj2Mxdllj5v3ISNR1tu8t/Kc5nTeW4rwIfLlvQvjzMrpeWiCsOpShLmcLXk7S425RVfFv4MvFKb1RKnp0bGx3DfOKRmLI3jgYWU9HcrZxgYg== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5028.eurprd04.prod.outlook.com (2603:10a6:208:cc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18; Sun, 5 Jun 2022 13:30:23 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f%7]) with mapi id 15.20.5314.018; Sun, 5 Jun 2022 13:30:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 2/5] mptcp: add __mptcp_sched_get_retrans wrapper Date: Sun, 5 Jun 2022 21:29:37 +0800 Message-ID: <3868742e177e864bf48526683f5fa06b15dde42c.1654435294.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096::15) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 5b0f9120-8129-4e72-7615-08da46f78ae6 X-MS-TrafficTypeDiagnostic: AM0PR04MB5028: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: JpFkV0A6sgJovcSt4bqRtdsjSIaTGhogZacRs4a2XtLJVISe8jgy6tH9tHAXQlPW2MEWMSB8CwHcV+n2PvXeV5IGYKV6qqESFlZF+VzU21y+SR/qvp+k25duf1WPuvnqxqax/a0L8uiucAEdHO6kPSJH1FDcyFx6R+dgOKORRmY75VgiX11fNvwjdERvqWpxwHCiT9MOlG0UEW8+VjTd2TbtiyouBIbe7CuV4l23Hg6MLRG9Lm+ucc3pH368W0s5c+r1IUVrH/uDeisMWFCj3/HTClUR+8jHgslil3AHvnaRns3TM3zmawNKNz3YVHwoqYmrRcvwD18numF6IsVizLvFetkVPB1/trICnmD6F/xHmzOoXccVYxvzEprbzd5g41vuAMiIN654nXOZepm5Mfkwrc3CTFHUH6nFsVeJDAqJOzebVpTpca001ES0dgiyaDQk9lJVeN0UaciWvYra4tO+8Ow2T/BvPh1/+m07uc6Hcp0OaZuafAeco6PIDSgfV0FYnI2SOw92uNuh5bfcHrbjwPW665B8Y32dd2xTNJ27gISWj5JRt33huRNY4FOwsoWsmD4In2tegvjQExyb4XT55QYZybjgN6OeD2VOKZ1zyh1bF8MHwA1HLIPYiuiwG0BAjiFtMN2+pWTL0dODO4N9cUlfongAOlFlPea8ts1XMZ2KvebgvxNkH9twMJawEA81tED7UnA0LcpgPNv61A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(66476007)(66556008)(66946007)(38100700002)(107886003)(8676002)(186003)(6486002)(86362001)(6916009)(26005)(6512007)(508600001)(5660300002)(44832011)(36756003)(316002)(6506007)(2616005)(4326008)(2906002)(8936002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5lvSzRlfFsmMbpjIgo+b9HOrmYdgq2VeXlfKp5jztL97RVBzjHY8rfkNBQLz?= =?us-ascii?Q?z9dJ9mClt20ngLFa+qY/OjYOW/ruyEYsPMBTtaR+ou6c9KtPKTzr9gpliEDS?= =?us-ascii?Q?1YPgFxNpiEMGT6GvK68Itj1STg9nccAZiZJLzJZziA5GrRlidxDqplSNTNNN?= =?us-ascii?Q?/mCYark0KveqlZr2JGkxW4B4ATzSWTFhZL3stZR2uJfPDcPWjyOfFrxAhzNj?= =?us-ascii?Q?tXHwbx4RqTJhU1KdK6P5nzpr21ao/yOrSp04Oc6NV3Ws1KSJ4htuw1+SHpyi?= =?us-ascii?Q?Pr4vRVvfyNJvWm2WJJaLSckJvLf/JrFZjsrnjA44vhnTw724xh0Mx7rkvSul?= =?us-ascii?Q?nLUI7bXhHj44pw6seAJqDo9qU6cpvg6YasyDqMPB5AYS8CasNInNpVYpd8ii?= =?us-ascii?Q?ASqw4quiKDiEyC+/00LALnlsnT1CFfvMKYL9CXBn2+kuivVD8FW6Bl+KsTb4?= =?us-ascii?Q?UYdP1q7Ihew1fYu3nQ5DL8i0XGaQ3gishYjlF4gTrtDXtJXlUtcW1EWpTKeK?= =?us-ascii?Q?f1WLCN/ahSd7gzh184taqLaQ/oxs2Ixbu1N/oyzZ3VUt239t5+GJ3inuLR24?= =?us-ascii?Q?lSwvYB1/MRO3doHGODIAUklGG22tP+Sb85HP7HdO1YqF3qzHLEnyVmpVh2Uq?= =?us-ascii?Q?+R04Oq+n3dMyw/jBx7JZF0iBs0bwcjOd5hqaHrt4fntpVO+PdAjf3j0FAQha?= =?us-ascii?Q?AaeIiPhryw1TvfL7TdsNoRnoN5Spz4gNvy/VOq8FVP6L/1sw6lxCL1CI1Xde?= =?us-ascii?Q?n2Jkg4wqS7X8hr2dLj+GWKdVH2nfqlPToBiD6QaSbT3QBulcvmY3LN7qv71j?= =?us-ascii?Q?Sj4CG/BYZMOBtjYS8OybH2+c2m+6cigcwNRxzSz7f04sE/6sMrMnsNoYi3Rr?= =?us-ascii?Q?uag0BrDqu2WIZqVJh+K/U6ohgcLX/79Heh3snYRR5MRMTOIyzP8uIVhEBc8R?= =?us-ascii?Q?9oBo3Ko7TkAyhSN2tTnPj6XJnCb3ycSl5vpmiJk9oHXS1PD0h/DHPu8XpjmR?= =?us-ascii?Q?qIT5FCxXen0yxGebxfwfKU8vhbKBG9NEOp0CR8Mfnw8+1zUaOsyXbKQ5f7wD?= =?us-ascii?Q?r/2Q8LeFILKQMMKmw/bxcTONYMX2d5nPvjLsY1i6pJmzbUwk8dpgViPeYMSL?= =?us-ascii?Q?pS6+k7CYI8UHd6NHUe/q/tCVnCskMuoCIlvHYTvLJAF7OT1JaeAekrBppc3C?= =?us-ascii?Q?7fni/73kbqiELJcfnwLfwD1c29nCeif/Yi4KwJIWE8170HkxBXPz0dc1S/+J?= =?us-ascii?Q?DyS70N3E8g+64h8zbVdicewu/YTmE3Mvk3o1GYKNQl8VlO72fUW11tLmRMLS?= =?us-ascii?Q?oHLf4Ws/0/XlGLN4zmyusepsBA0OGg+SUVH9Hqe7TFxcLp7P5GxbHV8zQCNV?= =?us-ascii?Q?tOaZUaEqG6aOeyRA6zEg3Uh35J7fSGOMsRRfibji9jN+D1Gq3lnyoSFfQPk1?= =?us-ascii?Q?93JAp0F+n894dL9riF8QmsZWqykAnGNUf/uoMn1d5wmvg93EbiopY1oLooFY?= =?us-ascii?Q?QKaA9KT3sdXjIb3SqsClae/zUXUUmRyw194QzQR0IvZDMf+WHS+cliddiuLw?= =?us-ascii?Q?fc+Lc9bWgAFpx97fRoPvKXPQKnbWLJOmTX0reGNdThOGfst9YWW4wWXNBwrb?= =?us-ascii?Q?r1kgXxeZepYLNl15Y0ySDoUQJeFMgM2OaDcSVs9JWvr/89VJsCWSQkgMGfWL?= =?us-ascii?Q?KJoM63HSlnIXeUgHnOJ2MpgZyuq1NueqyJbrB4v4GUr3ibMzKzlBed5tsJjY?= =?us-ascii?Q?aGPTKi1l7nZRhMTWepSTrBIlGQk1bLI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b0f9120-8129-4e72-7615-08da46f78ae6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2022 13:30:23.1165 (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: EjU4BX0N85R3ILWF4YTHegq9alQK1+T8+8FQxrRIlsjybgLX3OE7g04PxgTCsg1a07RajeEAorzRqOZ4GVxsxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5028 Content-Type: text/plain; charset="utf-8" This patch defines the wrapper __mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in it. Use this wrapper instead of using mptcp_subflow_get_retrans() directly in __mptcp_retrans(). Check the subflow scheduled flags in __mptcp_retrans() to test which subflow or subflows are picked by the scheduler, use them to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 53 +++++++++++++++++++++++++++----------------- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 25 +++++++++++++++++++++ 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 06192eebbd57..3ae237f89bfa 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2198,17 +2198,12 @@ 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; 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 @@ -2452,16 +2447,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 err; =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)) { @@ -2480,32 +2476,49 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_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->al= ready_sent; while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + int ret =3D 0; + int max =3D 0; =20 + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; + + lock_sock(ssk); + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + if (ret > max) + max =3D ret; + + tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, + info.size_goal); + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; + copied +=3D max; + info.sent +=3D max; } 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); } =20 - release_sock(ssk); - reset_timer: mptcp_check_and_set_pending(sk); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a12507dcf1d5..4669d34f4d7c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -632,7 +632,9 @@ 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 __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 9427d15b4c69..70ab43c59989 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -146,3 +146,28 @@ int __mptcp_sched_get_send(struct mptcp_sock *msk) =20 return 0; } + +int __mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + + sock_owned_by_me((const struct sock *)msk); + + /* 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) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } + + mptcp_sched_data_init(msk, true, &data); + msk->sched->get_subflow(msk, &data); + + return 0; +} --=20 2.34.1 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1901:b0:4da:e6e0:f39d with SMTP id h1csp2395329pir; Sun, 5 Jun 2022 06:30:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYGLAOMtdsP2Q7LW1FUeTWQvHzP2M2ajCiM6lozYMe07tdW/xZOgCi0pcNijxZPwHMuMVC X-Received: by 2002:a17:90b:1d8c:b0:1e6:8032:a8dc with SMTP id pf12-20020a17090b1d8c00b001e68032a8dcmr20562549pjb.99.1654435837388; Sun, 05 Jun 2022 06:30:37 -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 68-20020a630147000000b003fca9e4e3b7si16725871pgb.319.2022.06.05.06.30.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2022 06:30:37 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5554-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=NA0KIdBT; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5554-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5554-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 1848B280A81 for ; Sun, 5 Jun 2022 13:30:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2AC0E1866; Sun, 5 Jun 2022 13:30:36 +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 4EE697E for ; Sun, 5 Jun 2022 13:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654435832; 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=wQ1ra6XhV/M2I116+WKY/KUQgFeJABF3MfgX34w8D/4=; b=NA0KIdBTONe5CpAFMov1nIDxf/odJDmmWjvp1VBGSmDHWWBW5u6UYHnnQ74YqjCZCyqRGm 7k9m+VwU1pkvfgoRar5dqNkV4PnLtJMa1/nhDKuvmeQ+2PbMptCulvT1uU1XFbFMVWFo/N Ww1xNSp4KTlcQWb5Lw2JDcOxn6xxVi4= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2112.outbound.protection.outlook.com [104.47.18.112]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-17-efPdGbr2P0q4LpPPMRnyTg-2; Sun, 05 Jun 2022 15:30:31 +0200 X-MC-Unique: efPdGbr2P0q4LpPPMRnyTg-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CEyKtACEnATnOq8r1FL9+Yj14nuFXLWFqS+EQFVBZQ2E+g6dhGNIk71ZBjMCMGg5VwMhKRcvhukXAGn+zN9JHqTSPPuvAd2r2LRwlhnof+5P0eMpvMlRP9eBHlBMc/jYYW1rH19mAaSo6E9eB4fbsn9BGmnHyy7P2jDgoIfhfnY7QNKrQSC3EAlaZPNslQPRMHqiNoVmv2OVIS136rUE9SsJf50H+kAKPhRngWGSr72T0G1N/qva1SC1cl51QNwSUzJ7xEPhFCOPJ5mgYA6Qr/e0HkMxZE08QVqeRt/GKLdT2B7YzfdvBHCyPtXDDcJYFde8ODgN4Xc+a99yHCogLg== 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=JtAD0+YgFA6dgvNyoZQmE3xddbY5NNPSF36PAulImug=; b=VRKfir+2/23LMsEURY0V+f8BAs6eBeBr4dday7b2pwQFvKdXxBQLfkZ10ylvQT1MlQeadVjXku3BAdkmRhIPXTESs3CdEnBDfKilo8XaGAeuPPiokwfiGwXtQ7rq/hZ5pmb5g1fSB3n+xouW8hCeKMzW+GZCVEIOvQIYnWopFrMFrDSgT3DTb4gXGm69kXgVPcxlOhMZ1cQrSc5BuB8Op6KgVWzlFkmfD1QDjlgX99ufCNMX3FS+Rr8MfRpr3ItIFExtS6AqHsQ8esUPubmCQ7jR5VDBrvmnynMQBUgNJMS0mjwvRZ+pQWq2ps1VMwsYiSahAfW2J0VzqdTaBBw8tw== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5028.eurprd04.prod.outlook.com (2603:10a6:208:cc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18; Sun, 5 Jun 2022 13:30:30 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f%7]) with mapi id 15.20.5314.018; Sun, 5 Jun 2022 13:30:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 3/5] mptcp: add mptcp_sched_get_send wrapper Date: Sun, 5 Jun 2022 21:29:38 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0191.apcprd04.prod.outlook.com (2603:1096:4:14::29) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: ff921eeb-7e08-40f3-bb2f-08da46f78f2c X-MS-TrafficTypeDiagnostic: AM0PR04MB5028: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: gUE4dxQ0Fk2IljL+1DbSo5z9V6mCDNTeGSSJe2GIscfdVnUqpawWIac3O9e+mI7Q1LE44pCYeeavgGEF0Qb5Gs1IfM3dOfkSP0SU6UtXXSizRxk6BAiT35lTYMayBb1jXIWL7IG+9o/uwpYIIiytZYeMpb9M7GBNvinQZzHTtNQn/V1l+HzmiDLd+lqrM/sNKyxO2fu74Fs6CaW4fRxhO2Rxdx1ww8eHUqMm8j+k2pLcpRp3QWLj9RZe4yQ5GptPm0ZofRXRVBVcqpwMIPLXSTko9Gh51VYxkjcvsHX11YpXoifOGGIYSz+TwG7wIsOY6HnOieyUj+lBAczUFQd8uuyKRLMwjp6g3OBxJYSOtelGjTcucO9yUBOlqdLbUI7UUphcoOU8w0IQG8SASsbbNwoBX7l7riDeIO2hB+XpU3JM7GHCdEYACtw7CfAMLtfCeNnh8bex5wiJW20pnin47AXnmK6a5A7PQNO0Ycot3sdCf5puWUbBURcFnvdpzcD5JA6UnrIlJGXPCqSY63QADp5V5ZNYffnNJPSFSQB1YQuRTUcZ2+2rXLhhnJ+V6tObsyOiPs9NvuSttWcG/QV5GUJp43mv0gvBPCaqLM+ynCbbAdfuOImdr7ohc4S1veegyeWnNO8FOE31kWEc2eyMzwpUBzoa7ajZZwFtbp0QiamXuH5D7XmslkVf+o1rPTqQYlulimFgcFkcHmRWpsO91Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(66476007)(66556008)(66946007)(38100700002)(107886003)(8676002)(186003)(6486002)(86362001)(6916009)(26005)(6512007)(508600001)(5660300002)(44832011)(36756003)(316002)(6506007)(2616005)(4326008)(2906002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vVRGg80KTYMg1wMl8vaY/VNCeeL3awV8h3EFsu8wsfbmfoniRLev+9WYdASY?= =?us-ascii?Q?ZEowI4jEUxtR1Y/A0T43K/mxEh/jistEB47LJAuuZnC0ORtZiSmGG2zlP6R5?= =?us-ascii?Q?nQF9KPuZAiTXnbbk9ngsXRSQOsQpyMUqQ/r8OYYvxw1bEeLKkV+WXoJ7bIKs?= =?us-ascii?Q?8soOYYlxSpSG9MhGh2RdXVE4yti8Bq9msuSZ+U/SGJu949Iy0akSdgJmXuf2?= =?us-ascii?Q?1cGsia2IlyhB8Gx/jZ19g0M6ZuwIT5WbI1e8/zCK/Cbyqui6ypgeD+cFr4tB?= =?us-ascii?Q?NLzJ0R/rcSgCLULpzDXDqzJ99v+6IfJIID566PZqOhHuVyotCyxHgvXJwa/L?= =?us-ascii?Q?xY2lXdCvoyyAnRYJJije6Sl8FX5TGMyzrTU2/EnbRO7l847gT3QgSo2XUFXu?= =?us-ascii?Q?cF4TjAMju9E5Ujv7/JRno4nHr41qWVWep+hM05WQqoVTVVgCooODWYDgErO0?= =?us-ascii?Q?P/dpr+9MidabBr2TbBb1STfnsXlIA3xyrohHdyYQaEnRHcsnJ0vado4IrQAg?= =?us-ascii?Q?sxO0+xJSbh1CD7XLI3V5moZA9Xd9HmM7hz4fLk417sDWTiPIPWjEDtid7Q2I?= =?us-ascii?Q?EAKd3gXewRJT8Dflm3D/17UN3INSq7lkiI7hjvN5xwcxn50EQOhvXoPXlCRv?= =?us-ascii?Q?Rk+E5rfFOA9X0yr3ILxPEmGHlX4FKpyjYgduSWpNNX+95eS0C/fT+lVrjOQY?= =?us-ascii?Q?lBI1TjKE7aG2InGAqqHA17vGOi5+2ogBqU0gddkbW8An2kZeES71O93oFh2U?= =?us-ascii?Q?CMBfmIi4oIk6n74abaXkaboqzr9iwQ1LVFf2U4gcp05FEqrCeGBgmFsUKghn?= =?us-ascii?Q?i5tVy22lHi3cPRPwZH9IUfqdI30fu+i6GfZRSAPL5wwSaLA2dPDwdQCLie3R?= =?us-ascii?Q?9h0tFmzOcFFzH7OR2QlziZk8SN4eocTeabKFQ2VJho9FPfwigLykuu5e7jTd?= =?us-ascii?Q?1tnRjviQHhTDFccGF6b+jDjOwE9LHijegYcBCRn8EGOmShJcwtr0XEhrYdB+?= =?us-ascii?Q?kjbw6cjRPZy0idocXAwYV+VXEMFRO7hx0kThSn0p2l4Qsvbpxi/Tl2wFoco7?= =?us-ascii?Q?5RQRVIhX4ajEBGihwQIiS4UfDZVXu4UbkhLkQ3Og6zqiMNs0XUHpbKr+elb/?= =?us-ascii?Q?X+cgct/bi8WsXq12ukgl47VZ1vsAOtxPrUNLzUyCBRxiStRSzvAOnBhmvYGs?= =?us-ascii?Q?bmXELwKtg/30+V42LNRoWN1eMXBBJlnyjvjaCH+4bYXL27jn/K23XUThrE7t?= =?us-ascii?Q?0moEqZYw8XKTbM5wPjNjjxhhC8SVYv+r8zIhOo1RoIsrvrA3MDHtQw1HeZ8u?= =?us-ascii?Q?Ujbbur9PCudrwiNAdjKed75vsuZtHWpKda1t+Wek6Us2iBQpRvXVh96XEQUc?= =?us-ascii?Q?+tuFAoLBVg23X+PMqWeSG6vQw5A0C07F3PfqGXlgLztf+sY/OPaL/Aq207wD?= =?us-ascii?Q?xDMOBhv219mR1Iua4JBeQzxF3sVlU2vclDBLF/mfVVoIHiR26EhoT+3C36HS?= =?us-ascii?Q?LpAmabWl8DcUTYLqXv1j4cXDGwLgKx9xeyb2AhQmTPMczQxvay+AmEZhp5tr?= =?us-ascii?Q?MqxAV2iYdJUWHjU7+6q6jP2Hlq8cRnRWK61zMPfTdHz3HrfyXNs4AkBa18Q3?= =?us-ascii?Q?f4S8Wsfy5XjN42YhUmwriUAYxkJJVj6x1Ph36CqSRaCWUhqNaeTxQ5v3di8b?= =?us-ascii?Q?+FuQ1/yEmnbidG9vVylT7ElOgcRw+Azntt+VOXFqMPkLLmMxcCT4PY6mFDBx?= =?us-ascii?Q?+aYUyNZEvLzqhGF5yJhpKpdMiiY4ruU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff921eeb-7e08-40f3-bb2f-08da46f78f2c X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2022 13:30:30.3348 (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: vGUe/5QsrfcHddhSl1qEiD7QWX6t+U+c40yDgN8QTvBa5gwg+9/IapCJqk5BiU8UOFgdcU+dtZgSjX0mU2r1TA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5028 Content-Type: text/plain; charset="utf-8" This patch defines the wrapper mptcp_sched_get_send(), invoke __mptcp_sched_get_send() in it. Use this wrapper instead of using mptcp_subflow_get_retrans() directly in __mptcp_subflow_push_pending(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3ae237f89bfa..c15635341b9c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1637,7 +1637,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_subflow_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk)); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -3128,7 +3128,7 @@ void __mptcp_check_push(struct sock *sk, struct sock = *ssk) return; =20 if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_subflow_get_send(mptcp_sk(sk)); + struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk)); =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 4669d34f4d7c..6d9e8ec5c96f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -634,6 +634,7 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, 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); +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); int __mptcp_sched_get_retrans(struct mptcp_sock *msk); =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 70ab43c59989..273a3b65d1b5 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -147,6 +147,26 @@ int __mptcp_sched_get_send(struct mptcp_sock *msk) return 0; } =20 +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct sock *ssk =3D NULL; + int err; + + err =3D __mptcp_sched_get_send(msk); + if (err) + return NULL; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + ssk =3D subflow->tcp_sock; + break; + } + } + + return ssk; +} + int __mptcp_sched_get_retrans(struct mptcp_sock *msk) { struct mptcp_sched_data data; --=20 2.34.1 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1901:b0:4da:e6e0:f39d with SMTP id h1csp2395383pir; Sun, 5 Jun 2022 06:30:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2/jUddGioCbkpdtxC0y57Y+HqQe2lh/+XRDWCIIK6t1M5B8wlSqc++TJYK9VEX0ffL4e/ X-Received: by 2002:a63:4666:0:b0:3fa:287f:b714 with SMTP id v38-20020a634666000000b003fa287fb714mr16623829pgk.398.1654435844911; Sun, 05 Jun 2022 06:30:44 -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 s68-20020a632c47000000b003fcb49d9ebesi15853305pgs.804.2022.06.05.06.30.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2022 06:30:44 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5555-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=JrhwwHnQ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5555-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5555-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 6900D280A95 for ; Sun, 5 Jun 2022 13:30:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B723C1866; Sun, 5 Jun 2022 13:30:43 +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 E0C387E for ; Sun, 5 Jun 2022 13:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654435840; 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=/SsBCKaGSnSib8yKzRg7exL65wED8f+Ur/LUxp2VQOk=; b=JrhwwHnQrZsQxD+yKASyu3l8iT6c/x8nbTo2c/n2vozweDgT4fuxf0X7YSoyEovf9zkozN kUIbSScTGQLNb2lVkny+6gtr0f1JMkSUfzoDZqw8WwlTDX16MkDqOajDMLsw+BwSWfgP3a 0zfg9oLpI3JOOJsULdawE3IkekkHNYA= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2055.outbound.protection.outlook.com [104.47.14.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-27-Ibjy3cadOAuVj--M2VgaRQ-1; Sun, 05 Jun 2022 15:30:38 +0200 X-MC-Unique: Ibjy3cadOAuVj--M2VgaRQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bvuA6N3iNGgPIZPkiZg62IjvwhzVMnZZKF2e9C7OyTNbhLnFiP1c+ZRa5zQ1PVf5zjjIU/NDfSDCP/0CeoM7hhXZAsLT9frZbBG3Sx4CgvTq1pyx4YsmPfgm2XYSb72ZitYLo9Cp65o15HX3O5dSRg17GYAW5cSgs0Vw1C0loKy4Q0mt3s6Xj65gnDTn2RWqf5bis8ZsfUIeQppHbeqGIhEw7zNoi7rr2IZUARxJddCWQxI5NJp4QqIHZmumZ4uO+l5BFRrO31Wy8PYD4+PUdIDwsDpsOvSf+1PnEM7FuJCVy+YoiI5sAmtZhmd1QzoFpAWBnchG8QDde/ikACGbKQ== 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=uP3UBW9MaHYoUECvpYCXr/Jf/GWdIt6ZXQXJmbYnsTE=; b=LobYJjmhurTCDeP5iJk4av1kscZBntSAfOAYw6sxNeICpmHsDemqEgNMElpiil5VvLqbdx2ogv6iwEGHK5xzO3PC2z8zp+Xa7j0avNs2HETiza8HGyiU2fobN/Pl5Mwn2k2OIx642gbVhpG8UHCw4F+Wl1cTW+ocKITi+U9hTTd4MCNR+TnEDyLqGSelwan2tX86OVTxRYYHWh8eh1Kozr2GN8uZCKY68VMyZ/kjSbcAJXsHTxlsh9ZylbzBrGVSs5vm/8jaqesWh7APSiTXI/8r1Pk8ao4zdBMU6BZw0JE3Wk20ps8eD9NhSe+i0eHDwicl1LKhu4x8LjmanxuWXA== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5028.eurprd04.prod.outlook.com (2603:10a6:208:cc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18; Sun, 5 Jun 2022 13:30:37 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f%7]) with mapi id 15.20.5314.018; Sun, 5 Jun 2022 13:30:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 4/5] selftests/bpf: Add bpf_red scheduler Date: Sun, 5 Jun 2022 21:29:39 +0800 Message-ID: <080d75df1547c5a9db985c63404f40c86e01ebe3.1654435294.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0177.apcprd04.prod.outlook.com (2603:1096:4:14::15) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: eb5d0d0a-49e3-4f3a-4176-08da46f79311 X-MS-TrafficTypeDiagnostic: AM0PR04MB5028: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: gagCUQ0BqVEP5iw1sBlMXXKAFPnJE3gKUjmQlMwUjap4PnGLz6B0tmU/EmXl4lB92mSWP790zaci0d+CgAVi/bXqB9xF+c75/G+ov/FHBcKL9+N6tWPouccs01bn0/aKxyJ11JKLfNumLdobHNY3VzeBdT6awoi9rDiglAn+ckiBvhjYzaZcn9EldQLwETBwDtY3hFcgHnQiyGB7JQlPJsVO/ovqxq+4IfSv4Ys0OECzHAxcxteoJMCNzTe91Rr5QBZB9xo63YwQ2VymZNXUDKAGh/cmXmZKcHvQ/Ubo4vm76twxVHOludlJDlMZ6j/t9c/tTukClrBhLf2RO8KO6lT8UyWoH6zhlF5C6ECBCFMQAsMscyw7Xa4sFN3N1cDrkpRj3WesVIm4TpGrr0xI3aFNFTKYLigOSghp8iyjeYxFDIqGKgJQ7e5SBsrqRj+FOPyyM0HJbLkJtmB4BtRRzsWD9VITd57P/0SCN90WjFcBBxrufDsY0r2goXZ+rzB3qfFS3G2hFtfTffGonRkoJgEmTbPQj57bD23t0KnEIyiwoYuSZVrZir64dI4Iq6HEvW/nShfPzAHRV7XwtB9AEgvMPmVdwWlHRyCDess8xGJJ/tXKvv3bKWNRH0e71e9WoPKJts9/ISckPWYNKRAxkozFImLZQLRtg6YAWa7Hq0CTywYd20qTDVeRpkiQFZ2I+RyTIK8lut9oCfQm5vfStA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66476007)(66556008)(66946007)(38100700002)(107886003)(8676002)(186003)(6486002)(86362001)(6916009)(26005)(6512007)(508600001)(5660300002)(44832011)(36756003)(316002)(6506007)(2616005)(4326008)(2906002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fZtxVxnbDiC9m7AqGI2aOAYAl1i8+krLB2vsI0R98JnQgcJTD/iaTgN6o5b0?= =?us-ascii?Q?Tm8gNAGpHkd+MlpjoVQr1kJkgP+0kGeFw7xFIr3X0Wh9lYYIAuqUeo96Sl3H?= =?us-ascii?Q?/hcd3wqc4fdD4R5jNXC83c27BbXnc4i3SBYP+wn2vKpDlTV6P+7RaTnQ05Bo?= =?us-ascii?Q?Ir/kYoDp20oGwOUs22aLs5Xfj799SuIbAQqw20Xx8zLkGq2Q8ykEeBApvndR?= =?us-ascii?Q?PTNNBUnjOzBTVindUDS1gsOTBG04hTkF1oQcQ5wemvSUpXfbB2CcC/Sv835m?= =?us-ascii?Q?n8HMJqQt+ao1jHjn0Yq5A2h3MdLD56hZr9XEOSjGrNIWaQsI1HvD9UyB6JYp?= =?us-ascii?Q?f/DJPYoCcc4uwihaNP4eLqNz1UPZj1O0+diK7LEMiVmuOhq579nexbCuUAl5?= =?us-ascii?Q?I3/HfDddwO0fM69gFu3Nj4tlWhSkiuDwdMdXPONj9C3hX8gNPMHqPbejwR9C?= =?us-ascii?Q?LYFujOuLOCJAvKjUm7EemczW/XfAAbxVoAwMnW9QcTuIW/zZ0xcNsD3LO8fW?= =?us-ascii?Q?/N0bveK4rg9iGNCC77avDaoeFxSMi/2ccUaj1UbocI36DAa30MH+FFZsPx0c?= =?us-ascii?Q?tTKSBgDw8wl/45GjuDe5/H5V8E9QUQXMjcT0QhKu216TCXXybaqeh5SdArxr?= =?us-ascii?Q?CMbzIMl++1mrTxjAbMPXICUCh3g/s5jq1sPGqIJ29aY6+Q4zi3T5ZqX8F+2P?= =?us-ascii?Q?LMlL966dB593Cfgh6tn2qKACWOtFbeql2jxUITdz48XLAszLo8yDSPWMGl/B?= =?us-ascii?Q?OUjHclD6APPsywgxX/n43ujRSP0WU1rxh3ypNHXRlfSKAwEro51YigfHsQ9G?= =?us-ascii?Q?tyY2Jb+35qm74XqM1DRT88Yt7g2NV5bmG/Sp/n87olQUAB042lGm1Ot3Hk8e?= =?us-ascii?Q?kfA1Bn8KW6N8oddq61r0UvmdZSyzqzFFXSvZ92AtM97qYIq+6we1s/tKm9WW?= =?us-ascii?Q?/VBMFxZQyD2os4jQSW4pUp71qGhfdqLDyW3RnjfNMrN6lVm2R/Sw67BQYI46?= =?us-ascii?Q?DUftjKh2qUHjsDpmQELqGGSUf+U58Gfct648NgNqrhU3ffz6DqKFGlyYDK0Q?= =?us-ascii?Q?YwQOm/gm/eZC6hExhBdUgKjlPQ58Kkof/k5OndV1f1Lzs1O2L4MkDZBKj5v9?= =?us-ascii?Q?ni09v+9TnJYLdXS6kVoLDJNTzSbv5nWQmUPFFZlBpZMccO/qEl0m380IbBeO?= =?us-ascii?Q?x0AP4i/AhPDiVaUPoxVvpBwzUU9G8guY5ZWHeEdOV2cRrZ4FYT+mLPgFxW3m?= =?us-ascii?Q?2+Ajovzr8GVz41Zf3wObpMCV6NV4IP0U7/B1ymg2LDuVmwn+yfZitaF2NuDr?= =?us-ascii?Q?2L8BoXrb+9+XhY1S4QstAtOdiLeCa/urA4wnzpfzxrtPNtfeIa7d1gXhhcGf?= =?us-ascii?Q?StHeTGHrIwZs76/JPFD0mUob08esgtcvIzF4I3vdXHRRA93bo6dqA+mMm500?= =?us-ascii?Q?2VdHhHRJ8HuL+CH3hye4yLSAwq1qa+tWYWfJxSPV8ggjNigILKPDQ+mB0E4+?= =?us-ascii?Q?F0qdiqWmLlqLG0cgFCXBum5Pf+f+2g4L5rvc69L9lerYwzfw/GJj6dNXTm7t?= =?us-ascii?Q?7eZiwXkcGJFGcv+xlMFRhlOlEcsYxiDuGFXl6GCmVofexmZ0g55J7LAIuZZR?= =?us-ascii?Q?RfuwsImKo83QICsSAIAqEeJTWg0O6+0UEoa9UbYlfjUmnNI2BZonfwj78QY7?= =?us-ascii?Q?C62D39XmgJaDo32ke5N8C1CgB2LC6uTIP7OEJI0zwTMVziiXMDOuffxG7qfU?= =?us-ascii?Q?vBXtxo7wI/YFFWHNa9KRERFfMk2/GO8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb5d0d0a-49e3-4f3a-4176-08da46f79311 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2022 13:30:37.6312 (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: CnGiRx5hXs40ke5MW4qJzYffZxVg/twcY6c9ThM4Xo4qBGbMXw/LanAoUvwprzxEKDSJoJqHSpjFWMI74R7hWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5028 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 | 36 +++++++++++++++++++ 1 file changed, 36 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..58f90473e495 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,36 @@ +// 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_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); + } +} + +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 Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1901:b0:4da:e6e0:f39d with SMTP id h1csp2395561pir; Sun, 5 Jun 2022 06:31:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkWLmRaA6mAX60I3NN+wKrAuVghdh8xjujnwNM1r82rfwozGV+WFjC8GUz+pOfxUTFhdcR X-Received: by 2002:a17:902:f60e:b0:158:5c4d:d9b0 with SMTP id n14-20020a170902f60e00b001585c4dd9b0mr19758605plg.63.1654435862469; Sun, 05 Jun 2022 06:31:02 -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 g2-20020a170902e38200b00163d77ce6acsi14885796ple.615.2022.06.05.06.31.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2022 06:31:02 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5556-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="GgOx4/kF"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5556-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5556-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 34DA3280A8C for ; Sun, 5 Jun 2022 13:31:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 480191866; Sun, 5 Jun 2022 13:31:01 +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 546227E for ; Sun, 5 Jun 2022 13:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654435857; 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=WWEP/wyamLnZxSSxtJeTlU7/dVWUCPGItWuKR8r7UlI=; b=GgOx4/kFwTIZfuDlK8W3+ga5DFmFlD0k7TYJGstkSCMxWm7G+1sfVZ9BmF7T743T1wVgAM 3MwaFTUQJZr6nIbJvOGHtApaOBsTIMBLspnSkrisPQJp08Gv8OYdNCbvAxKK6WYgm0nWwg Elv9dl1Oi07PdH2h3MoW/WZMSg64ruo= 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-35-pFtTqeBBNIS88ecGcXH87g-1; Sun, 05 Jun 2022 15:30:56 +0200 X-MC-Unique: pFtTqeBBNIS88ecGcXH87g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OtX00tipttE8mRPTLLFUVel3I4jeP7kgODZDJV1rYNO5UdrLMUaCpowiliOLQ/MKzMXmd66SW/N9fYn5WI1azME0LRSjJDvOlIv/4J5YCFER4JMmeon+K0b6JCVAhtOm4mf7XfoYhdgy2KVJRC+pg9HkU76e8i9MCLCv3E7DLFs83lNay9NuNyKI/Gkj7ldx/3PcH20w0CLO+RKPUscOazFX6N3URSd5nuINSPSgvkbImvdZ+SJIONbp+VzZZAoyTIXwsDRZUVwb+8t5DrSMtlg3c2R5oFd6FdZQOY8lj8sCqZdC1C2SIGyqOlo0wE7fZyoeBb3KWbdSigkZPd9wag== 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=ai3kSBQTYD2GmYnF7gbvplw4aV/HQnCWdyQ3RtCEzMc=; b=lP7L81CF4M3W+Fqbop5HuG9wBStyiPbOMhutpPCNn7r1RwmJ+uTDRfxHS95CJuy8Q43C6hEbeUP1uVh0aA6Q8CcZsD8sTwOes5K79YuegXE6EqZ/RRt8r5XVnfq7vZrdE+4hRnPP/GDNiuiTobWcV705CZ/jQgMNFG0EpuHtiBHI9TaJ7yZs6EEG15iHzZtiYQ8F24RVjzznxbFzGpnEyaZnM9JsKW3XKSHGYFpvDHV3BIpOa6drf8JhRE5bnoFzQUEB8FA58PDoeUo2rVEMQuAlhELEERHmNgeVHNH96k+mLe86A21PlolrUxCH96fSHF8m5IJnTCcJ7u4r8E/ONA== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5028.eurprd04.prod.outlook.com (2603:10a6:208:cc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18; Sun, 5 Jun 2022 13:30:55 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::5082:d38e:6d50:4f7f%7]) with mapi id 15.20.5314.018; Sun, 5 Jun 2022 13:30:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 5/5] selftests/bpf: Add bpf_red test Date: Sun, 5 Jun 2022 21:29:40 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0106.apcprd02.prod.outlook.com (2603:1096:4:92::22) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 3d81aec5-8e13-4ac6-655d-08da46f79e4c X-MS-TrafficTypeDiagnostic: AM0PR04MB5028: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: 8sr8ywZi3zD0lOsJgFa78I+0jlK9yy5Abf01XU0sKa8bdPL5K4ejYGs8g0dSzekzAJfCY2XG8cOZuo9fM+M1yXmiYxZ+VjC2d1DlqbkKYDzbvnssDHIlsaJq0AR2GHZZoss4RAkxsdKMHTuEvNt4E5sxOcXhrIPMKoF1JnGy8kqkFisv8J5n90o2yVVeiiJD5Znpsf6+U9tlDVJGGoXy0JEAhP0Y7Ud+qOSLB2v6w4mGuTGuhw+FiJdQj4vTLmC5HE9A8I6FhrqqWjqkpwTKDTFKRI4BI+fbFGopbvl8Fcp0wnPRTYnvYaiaytx5s585WrGBJ98iN52HPqCc3aJkHwYZ2tutycRefDuJlO9ifBFi9QUanKsyOQz0yIS7yQzSu3rDl9oLfqtI+Vn7ngPv/rTMQsLmLwjDYaokf1a/8tjSlM+sNujzd7ln6ddgTROMfFvBNM8Mm6wD7mvZxYcYzG77XtLChPO52Xj6gZSkR5WvBPbOCAiDbHmQdeelnnFT4nOQ3spiQuTa0vgRYLcC0kd/R7nb0F4YZDDByqc1VDqn1PGShvAzg3CjjYHYhJTzZ9LEj7hQyn4kOhRRMLK14bomAgdrzr/87PeNEUuWCAfR0RoIJbDpLpQ1QHxpsgUDJEJ1o9qYaLBuTfbYfmptT01rc9XS3gCvO+RGchwLEJfiWvBPLvSjwl18MMtYeHFW X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(66476007)(66556008)(66946007)(38100700002)(107886003)(8676002)(186003)(6486002)(86362001)(6916009)(26005)(6512007)(508600001)(5660300002)(44832011)(36756003)(316002)(6506007)(2616005)(4326008)(2906002)(8936002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dj87qw3RYhlW9p+TXd+vV4IZwLCRW8ZdTfA6bJ3c6viVPPlRyAnqnDNGsjXT?= =?us-ascii?Q?ttLAgFzV5wxcBya6S8s4WB0SjbVexC8KZibC+2VOnB/7ArJttvCj4vTbaard?= =?us-ascii?Q?tUQPKVCsebScjxM/vEGDp58POzxE95hbZ7xjYQgP/bzSv+7i1b/jFuGS2OSz?= =?us-ascii?Q?bGhKwVhtC60wCo+Lkzdcg+Bs7YNJye+rWtiuZzHOjvD84rvhE1v2y4BTYFAQ?= =?us-ascii?Q?MZF3cHXiHF2s4BlbN10KSij/M3PjZB2sSIdca+rfYlQl/ESFQ/eb36E5CGWe?= =?us-ascii?Q?Aioliy3mhQzoLSN8k7hMBsP9DAuAMH0Ks2EdTNaXekLY4S/mKz7nMQs/QJ16?= =?us-ascii?Q?2rDNBauVQRZMfAiNRl4kGOMl+IoQtoAITDA1J+1oZYXEHDLrDmOSyEG6H7pU?= =?us-ascii?Q?NItKvm2NYXOTdCL7DCW4fYnUc/BTQEEQJsVA67KkXDv47jU1wEgRzUQYIY+o?= =?us-ascii?Q?kzQOECvMGv5prm4pkhbQTrRph84BXr1KEvOaE72TkaU6dtmtjgNaNbtUUQoH?= =?us-ascii?Q?RbRtsu9McvVKf9CH8t1jE+H6SmBjKjPjxH547oJkB1Nao0IOYCxHvQTAet7c?= =?us-ascii?Q?64J2vRs7Y1KQjcgL6ctjzxAHRYR2kg/C9YdtIciSNf7KYCLS0FGigu4CrZzl?= =?us-ascii?Q?5O5g8LxzCRq88tlUlwIbsSfqP7RZN+Ke1dhMpopBxCtes7sLbHoZdPv4vAT6?= =?us-ascii?Q?GwLBK6tbp/yrvTJsmztA2jNdafHDovEe10hgkiRcxIcF/RmyKsxd5l+pXdnN?= =?us-ascii?Q?eiwYUoPco3ecB8oyMgXE4vr6QlkRbDDUqMag5pdY8YjapktXgQA/75mcHubB?= =?us-ascii?Q?GWj7G/xG46yuP21kWR68m9qwV9ekSoP+/j7E3TZy0mOaNbfoDJNoQXAU1h8l?= =?us-ascii?Q?Wm94kw+3SSt1euf0bZB2KHCKwjBRvisDesnYX7K2eEYtK7vm4JC26i2WrW9o?= =?us-ascii?Q?sF3tlZJFzkYUDfTgcgGmp2Xp3q4XGQWJty4yF6q5/T4W05w2qWqdkHq/HWRb?= =?us-ascii?Q?/uSAZ2l+fcshA/lgeugSG3YuL/jq0uMMjqmIICRW35Mq2+3NSKCwviCke7Hi?= =?us-ascii?Q?1VLGwxmD/zdfDxFY9RxvB603UMInfewImE2ycp1LEI/UQO3auT91iRvW+GVg?= =?us-ascii?Q?NeXIC0F3/bMUihqJ75eR2L89JVEXRNsSJBs3z30usDedA6jo9E1ODtOfTWv2?= =?us-ascii?Q?Xf12lb/+c4MlHsWJkXqv/Q18eBE234+mL/fwlPgJvi+D6zYFlAJnNDscKnzF?= =?us-ascii?Q?C1nyyPwxs1zEeSS6kcALeQ3cvF/qcC1dIwrDVi6Ta19pTgz3K1v9PWdjUI3n?= =?us-ascii?Q?AripPIbW3kcQ4nPNdH1Vg7Ni04Hh2SvZmEfIAnGk+553wHz0tscq3oXqCfL3?= =?us-ascii?Q?tUO+yBzf+x4q5C2bBisvhz78Nj/lRTjPREkuXLNqMM67++Qv+lgf5/lbI5dx?= =?us-ascii?Q?PatC8o8dmmMGgLMbamrBgeEScgtXZ4lC0k9aJmYaLtXNS8Is5EuDzMGGdP18?= =?us-ascii?Q?2+U/i+enuBZElCQxWJEeUS6/z/+RRNvGKyBJ25kvmh/ceJHpEWqRJpnDsfhC?= =?us-ascii?Q?USoJnJvz8CehUx/OqCsgwrLSPFWbqM6lqbFoqZhUy68n+KDX9GpnfN18mvos?= =?us-ascii?Q?8a5k/oxhSQOX0CPXFNSFWI7QNtcOVhSF6KwuvnBQVHNi6o6MxpJibNvhOArj?= =?us-ascii?Q?9rTr+szrAYysKWJABPF5YHKN03VIZr4psLOqdHzjr3r3tAd7tpIrd4OEfn/f?= =?us-ascii?Q?XNCXao9nLnAMW52kHsvPSUU7EmrWL7c=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d81aec5-8e13-4ac6-655d-08da46f79e4c X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2022 13:30:55.6300 (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: 4yI08dUMjnjeE9d7CRe5IITgPRfGXmmq0qdGPrF5yMpX+/4OZLs2Q26jPdVaq5ffl6mgFoNFAuQaXcPpbWl8Yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5028 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 | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 1ecc8a2b76b6..e321cd046368 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 @@ -362,6 +363,38 @@ 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; + } + + add_veth(); + 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_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(system("ss -MOenita | grep '10.0.1.1' | grep -q 'bytes_sent:'")= , "ss"); + + close(client_fd); + close(server_fd); + cleanup(); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -372,4 +405,6 @@ void test_mptcp(void) test_bkup(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.34.1