From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1195880uab; Mon, 6 Jun 2022 02:47:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhS1vgcLyLrn2+IdT7vqzzE/9Z/yHALO2CMP/MMCqYA1Cf4XhhCX3N0G3J4rxe4Hwi681e X-Received: by 2002:a63:d504:0:b0:3c6:ab6b:fd2b with SMTP id c4-20020a63d504000000b003c6ab6bfd2bmr20472364pgg.437.1654508856030; Mon, 06 Jun 2022 02:47:36 -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 z3-20020a056a00240300b0051b4ab0d190si21461599pfh.126.2022.06.06.02.47.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:47:36 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5563-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=dDnWURxN; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5563-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5563-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 A5FF6280A8B for ; Mon, 6 Jun 2022 09:47:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 759F023C1; Mon, 6 Jun 2022 09:47: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 4F6F223BD for ; Mon, 6 Jun 2022 09:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508850; 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=J2GXbNYTzDYxhfNKMRPmH40wmPbVTeqdqTT7C3ZoW0c=; b=dDnWURxNNFaW5WGc4ldD6MuRhffbo3U+eH3tGJ3xOM6OFNewehK+NDDoa91AwJngHkBA+S geWJ+PTqkcxfqWBZGN8pOP8vDk3aLF9JiMGXIybflwcFsxArXyvlQ4D9HnbcCtISNAo+Ea J0FHnS6xmSjKICIoe47hnMnMDAZZazo= Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2054.outbound.protection.outlook.com [104.47.0.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-45-Rizd01EgMZuEc7S9Yn8MbA-1; Mon, 06 Jun 2022 11:47:29 +0200 X-MC-Unique: Rizd01EgMZuEc7S9Yn8MbA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HXInuzh4i3gZcSHATDjzXlxZhyEwtxJkS41Z8k5bHxJzNYR7jLTE+eiHZP3YGbr1HEfL/sNbT3wuHG4WFrjAM0p02da2D9nl0TiXoRwo8yr4ssXSt3pQHPAsBLHDLdmQzK4V05p2nq4tVp5ZZFCEnW8CRYuGOS1spJeE1VH4kl7GStgglgwTvRETtMeGCVvKsPNAEqpJEPZlJvOsEqOyXL7xNA+cuGzBl8U7uWXK2JaYeZeNQSf1cBd9sj1wpHnCrCaKVJhUdF1IkEgH+zBrehiout/TapbtdU54EltjrAaCgyWotTUSRzclGrItTlZX3kEkiL5C8fk965ail++/Dw== 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=Lob2rto+af6hEU5mPGx5/WYvVNnRMfM4/NK2pqNdOmg=; b=X3nJoqy2QZpY3FwKYGnbtqikH7ZG+6BEV+J1vEV9bGi+oJ+UN3UNKxnw3icf58BA+2gXhUwLL7JV1Fq14KVPaAcAXWzXAHpSOXMqDcrsXcjWqTiUa0IBlgR5PXU7azmn3rYK0yUEIdVmu1lKJN3sUoz4/uq3z5drjPyjcR7wJ/2RkKUaguxgMGpqJs3I+w/D5fr2BBIiAfe0ZOvK+1xQNnLuTs+PK6OoA92T3gR3s1WG5khyXprQB/++5G48eGEHSkPAZh1I+hMgHm7R08d4JWc6E8A/ewhm0eVU3BsVmgB1UJZiHXWlhT0xSC7BJ7uaaheMb5BP62TggbIzuhfXfA== 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 AM0PR04MB4802.eurprd04.prod.outlook.com (2603:10a6:208:c2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:47:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:47:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 1/5] Squash to "mptcp: add get_subflow wrappers" Date: Mon, 6 Jun 2022 17:47:11 +0800 Message-ID: <663067f1da8c6418d60f8587d9dc96af33cce167.1654508532.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0008.apcprd01.prod.exchangelabs.com (2603:1096:4:191::10) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e8b09e1-3ef2-4e23-84bf-08da47a190fb X-MS-TrafficTypeDiagnostic: AM0PR04MB4802: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: Hyx0aWi7Mv9B8jFKysJUup4aLJozhx9K/UkMBNy+rzOOSB8IkGzdo4951/29XDyOstvn51wiNJQZeAxsmBY3FVI5+SCsiOheV6NC3A18ew5mFD5COPFS94MBim/P6vZVu3qhnJlgZ1VqO86tj9y9eRoljmfLLhGPaf9u3HiJTnufQg6qrQGUO1W/pRrF5ga/U4qkAQe+ZZnD7DRZUxIzbwkuC5Gk0Fv+3oUv/bZFzgO5dRRJNiqJ8LqUSHJRpykfvWxpCqncp44SV0jWMMxFJfDSPdrHnVY7q88GEgvmMsNeffYoKOZbc9uLT7v9Qp1ZbjQy/Kk/VZSUeJn8nRlVmokZpp5Wv2l6rNJAoxKmeLvQ+yTVX+XbeWN6UyTO3riZL/bHCi36U8OLRRCzz+wkaipfDkvk1N9sVieMiQaAfUwBnLo4PZoc2br0+p/xZj4G22LBlszAhIbAo6HAwyZp295ozEW6Vi6FhzZ7h40Jo5NwA72EssCutwTjRc9hZXHu00H/EuA6BMUVrO/ZbgPMkqaf7CBgpci1WeAYeTaz0lnbJ0+t26K8mx/+pSUU4dq+5eXOFrIlSxwEnIfJ1xg/87xjeB5Gie8AnWfZap2DZ1JCYQjsD5zjj3/4plSLYk3OD9Tt/IQ4fPOlWizp42zLL6Y5kEntgYE6trUewpAfJQXYOc7KfwkfOgwzmg1l/G27ZDWj6CekTA794MgZ3q/TVg== 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)(66946007)(36756003)(6916009)(38100700002)(66556008)(66476007)(107886003)(316002)(5660300002)(26005)(6512007)(2906002)(4326008)(44832011)(8676002)(6506007)(83380400001)(2616005)(6666004)(508600001)(6486002)(186003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Lc/nYGVgJJUtWwfojtEqZVZ/sq8Xlda1YTTcmq4QKDBybEt27sZDsjFnB6y+?= =?us-ascii?Q?r1OkMqYXFt3+ZVCz6TCNRH2jT8wb8kz5uZFd8FozMs8XDfp6e3n2dR3jDohl?= =?us-ascii?Q?SOBGQjlzbcPbW5eASpY2l4C0FWX1xKejahLGhl2RQbGuKO1dTy/x0p/uPzzk?= =?us-ascii?Q?8mvwUgxnxhkcAK6lbavd+KEIC52PgvWJRx4OiMS8//l9+XL8hJHfMvTVneE6?= =?us-ascii?Q?fNJwC4rDY4/vCDkpM4WExb5t7Vt26V7GyFHDFXnNiwaQ26BFDbZ3PM+vq6/K?= =?us-ascii?Q?31fuSRpwKVpVczG5/4ESY4qgNrAN6BtgZZSodLSjK6ruOIJvBZ2E+vhptGAP?= =?us-ascii?Q?rnxOhO9vhHqMUv578/Fta2Xx2/hLdd2ePGbl0lQZPUxhreFw0MAwWqanenaj?= =?us-ascii?Q?mtEnkSHJJl+s1XAFmz3lkkANRNS5T7kya8iHxrXjR4IDZpFvhoLcGSOHS3BW?= =?us-ascii?Q?nI7BopFzxjsvzALzNdlIay7Rv6OUbWeQ1QbLjdIIZ1g3OiOmxqHdx1UR58kQ?= =?us-ascii?Q?q5DRPKyOtJyBEPbSgA+VIykqBf8pyA02yuf/gjPNh0eMesG7e9FDYs3pMFuf?= =?us-ascii?Q?qrBGUY2e7HhBCmvucfk4QeYWs3qqKUB2oQCZo3zCJJf8IZQK6U56mMjfyEtj?= =?us-ascii?Q?brrbzgvv8HNR+WFsTUI6aR3AnvxDflGLiSjgL4U8jcLasqLqwM+Q0zqF7rxj?= =?us-ascii?Q?FSIFIaiWwZpzlWb+2bi0OloCmdOTc4vBXayNsun4OLGyOF3GMvACDIfnBjk9?= =?us-ascii?Q?T6MKD127DKjU+uFNd5OdrPjXmnd2+aFVSCHCo1bAYBWOvuOf7BrH+rku+9io?= =?us-ascii?Q?VGudp65XF+1Tueu9POhMMuiecnmMvQmquLLaS50SPvrp3TMNgO4i7FecVZL2?= =?us-ascii?Q?jIoLuOZN6YPv/ctCeaEr7sRuTB848CK3s8cVZ/Z5z1yn8sXNUrfae8RXmao7?= =?us-ascii?Q?jYAw0hwdKJ1dlstzs/tfE7KupYM5/2rUfRpPyDXCGO4TelJHLvRosoiomJX8?= =?us-ascii?Q?brsuGIyAkunWu8YE2EcG/J0YxSR35KrmFs9faUbIs0vrWOFonTgTUsu+4RHN?= =?us-ascii?Q?2D+KZMg8gjPHym/rIP7Sfw67ikkaSReLViJQFc+sedwj9VSe4SisZAI6Ux8v?= =?us-ascii?Q?kgCxoFeWeTAqu+nLmiDJVy9y1dlTr2t3OJZTcaBADeaFOfrDOQvvsyF2ADZG?= =?us-ascii?Q?gmy1y5yi48rpdieuiBoctDyNjZQjjCrD1deFn229RkoXInJa/R/vs1OfYe0d?= =?us-ascii?Q?ZsTpYQUybfUhKzit3qOVnhauNPKLftt5u3yc/vYHqIZ8NDn5ifzzwp/1aGkz?= =?us-ascii?Q?hkNAix22wxnwYXRS6d6Lv6v1gO8tFrxwodH7zJ3jgieGJ6tqEEry7s73y5tN?= =?us-ascii?Q?knq5HWxmKEq45LdJH4FFwvBr1kzqZpKw84n/wP3WtXqZ/PgM90F+3nfC76T1?= =?us-ascii?Q?ogaTIXEmeJTNTSp5Sgo1NXlYa2/jOkteB4oMtBodHY5X5DZDg4EgnMZSAJVf?= =?us-ascii?Q?omQ2IOldrdcf7swQ20U6eDg1omFzF4h8aX2t8RuX1dFhIG7xH0RIt5ocLBKl?= =?us-ascii?Q?pIPSK7v7X4Ukx2HEotYVRK21i/4130U7OInRlLNkpQJL1o6eLH8SftrxqRwW?= =?us-ascii?Q?xUl/OeKCMX5fq6oXCvnpV5DNDzpTYRvlUpFOhWZnreoXuqPZJhU6xJTVmONW?= =?us-ascii?Q?Zy+JKXvN1WjczPTdThlEC0ZRTecnfrAhRbIo0tpOalUXA4zD20RNXGY70I42?= =?us-ascii?Q?GyKWthwT3kaejQmNjezgG7TSp0xDD/g=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e8b09e1-3ef2-4e23-84bf-08da47a190fb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:47:27.7024 (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: d6WTixblNnvlI2PgUM22i1zoWrnKkqkXDg9TD/XlO5AbjtWD/KOOX7C348r1LOUOdwxBMmmWYXiUd1Q7tLhcTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4802 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 | 76 ++++++++++++++++++++++++-------------------- net/mptcp/protocol.h | 4 +-- net/mptcp/sched.c | 59 ++++++++-------------------------- net/mptcp/subflow.c | 1 - 4 files changed, 56 insertions(+), 84 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d6aef4b13b8a..c7a1e15a66fe 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1551,58 +1551,59 @@ 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_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { - .flags =3D flags, + .flags =3D flags, }; struct mptcp_data_frag *dfrag; - int len, copied =3D 0; + int len, copied =3D 0, err; + struct sock *ssk =3D NULL; =20 while ((dfrag =3D mptcp_send_head(sk))) { info.sent =3D dfrag->already_sent; info.limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; while (len > 0) { - int ret =3D 0; + int ret =3D 0, max =3D 0; =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 +1635,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 +2196,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 +2459,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 +3113,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:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1195901uab; Mon, 6 Jun 2022 02:47:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1g8GBAfuq69rsEDCCnllM4FUMTb4IcUiwxVJdE0sIKOw964E25H/vVQ+xWHLIslTlzOJr X-Received: by 2002:a9d:538a:0:b0:60b:2190:ed53 with SMTP id w10-20020a9d538a000000b0060b2190ed53mr9613545otg.295.1654508860669; Mon, 06 Jun 2022 02:47:40 -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 b6-20020a4ac286000000b0040e9dc94de0si16992199ooq.2.2022.06.06.02.47.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:47:40 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5564-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="OLaz/rGs"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5564-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5564-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 787FA2E0A01 for ; Mon, 6 Jun 2022 09:47:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4375A23C1; Mon, 6 Jun 2022 09:47:39 +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 56E5523BD for ; Mon, 6 Jun 2022 09:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508855; 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=lobe5Z6ToDAMGitJ3uCKNtxFPgeWsnUoSR6X7mvJjIs=; b=OLaz/rGs6pIEJ7ERZRM+QHCb1wFQUrydkvwwMBeioeZ/XLEXR+HcZhDq4G4b5gSJhsn2sh 2c84RwPys+omAtS3mBfC/qXApRHN56iNVqOOgr/QFYDahPJYgT9eyFIXJySKz+yceCJM+E fzejXtALSGboVYy1wgPA2p779rOxsJg= Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2054.outbound.protection.outlook.com [104.47.0.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-18-D7_Qp92wODmqESTmt6cK4g-1; Mon, 06 Jun 2022 11:47:34 +0200 X-MC-Unique: D7_Qp92wODmqESTmt6cK4g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yb65RAcWNfAdlOuICAywh7sI5kGi0nQ0vHX1xpLHJreO69+B7FuYi5dE84yayQntGxDEuzAwrRrnPpEXcrUIZSThvDYNldFJLqIFB1TWNDkV1ctN6IWZijUp3DwP5iKy+8IwS3T9CmodQGhZj2Tljpj6mJxKtWCGH5GGdKBVJc8Bawt6DuPWMc6MVKq2YlLwF0Sg4ItmkmcYjs/TIlwUgtRA9OnSa/1cFLyd6xJEiGlI6poOYAUMhWiw3/wzO4fz4xHXQmUb/d7/kX/ue5R+hMGw9FrSXVp+u7ak/k933Osn5A0fknXkmWSGg6jd6Sh4A9ZLTigP6LML3a7wH/kpzg== 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=p14LMl5K1qay0uFerUt9ZmkS09HYtblAtFdNB3QUoFI=; b=PHQMMJaIIy3VdoepvHrCs2B8m764CS/t/YtxUw0c30cvyLyEUKMCUCe5YlVPOcYHX6XnCbG57KWCNwlnbDJg4/IAigIKGuTuhB6m3nkPGqM7fbSgForbBjnGxJ/C0LN8qfljUStQJ+ziU7eUJhlpV03/crmpkRpf5gpES/MUgC8BkHlcpIK1FZ0LwfabHCv00gLXeIjoqXkzWBSEq2nCxCSkupTAShl5gj/xC/euH7swwJav2H4oMQ+aPPK1rlG3uyVBmbsTcXs3EYR8ToCza5+NwCqwWpmuIYgqxN54RKKg57THtcY8ozpxHpN+tJPYseUP7iasMQ9gV8FyyfXsfA== 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 AM0PR04MB4802.eurprd04.prod.outlook.com (2603:10a6:208:c2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:47:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:47:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 2/5] mptcp: add __mptcp_sched_get_retrans wrapper Date: Mon, 6 Jun 2022 17:47:12 +0800 Message-ID: <08e0c77af83d0e79a0899c2b2a4cb2ced7124fe2.1654508532.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0015.apcprd01.prod.exchangelabs.com (2603:1096:4:191::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e26b8031-09e7-4f48-220f-08da47a19477 X-MS-TrafficTypeDiagnostic: AM0PR04MB4802: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: +2jf1Sq7DO+g6USxuXcXRzB4un3ezeNi2y+EG3Mgtwh3j8fUJVl7SMYcdd8n/81+iOc2TGt+9ykFzZZ40H9zzJmPxyotSYMclwMOe9fUQEL+T9Vg4YCvxDZmPHbHjB/pabYVNs2HzcFSdBGizzPeeBmZk/NycIPZMR+P2MTnMauzARJAdAD+gBpbWV24euxoOLkfyDd6gDUzrpmbMiUlabUlaTM4PyipbE1pyyDTXHT+z0/JJiJA+rd2skDdgW/c5F/mOsgrCiGqHlU3A+hJj8tje+NUwcpbhfFTn0LA/2ybynRWpeVSqDUJcCT9sCW9CJFuIj3TidWf1UGCuOqtJTtjEK3R3x4EpS1bEAaADWaj487rqMUKXUPQZ15+Ltr847QvvZy4H0VBTDbQw1Hw2Y0Eq0OcVdUXz6NztshqBONDrhyoZ4Im1Qbp7xK7Wd/IdXjyXkqsjgz4JZsANfNYUcegQlrJwVi1pdWKE19IBRnJFx31YUG3z5VQnHipzX0rkEbW5Y64of6DgaIcjIsTR9eEfkIZKTWEv2uqJaXElUJzib/1y187TKOsyokVNBHG0PgtC50JHK60EfU/0oNCn94GBzWe54FQEEeZ+gWqWNYKe2KI5NiiIbxJsOyb4rpYr0BD6YWhT4ciUs97tMysRchkSe7R98HDgeTqpcEMj5dBEiqJy1a7s2ikvoh0JWPYshgMmnuLFgvggXjdQRcSlQ== 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)(66946007)(36756003)(6916009)(38100700002)(66556008)(66476007)(107886003)(316002)(5660300002)(26005)(6512007)(2906002)(4326008)(44832011)(8676002)(6506007)(83380400001)(2616005)(6666004)(508600001)(6486002)(186003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WcNUVtUpiPFqXMudn1mzbEnjD9XGisCFeHzhMXBkAV5Y/A9eo4DdOpASNQbs?= =?us-ascii?Q?Rs+P30rjN+wotBENqeRvl67DVEjgvloAxz1L1q+u202oSb0W8796UMJ83Cxw?= =?us-ascii?Q?KyzpzZr1jeZRAImgUr7M+ZKlT5ZY1wrbakkrxIHV/pzusqFYdOIW62BYKN58?= =?us-ascii?Q?y2Vel3lX3esQsDbzf6N/gWNABhf5dU0DgCFc/P8ROOL5MCvCKySykwMeR/O5?= =?us-ascii?Q?qrimWOSNoxOFnd2GflOupGaxShKYK5lvXUa1gr1zAVfpjj1FXKWeVaVVvjWY?= =?us-ascii?Q?bnYq0gXLTtzo4vPUYeIF3/WVNU4Y6Ro9yoPU70lyBPRiEFbF3w5idlzZtqm1?= =?us-ascii?Q?YofB9wAm3CLqsztM8kzdXx4xRfck1/2nDzINfblN24bYOJGv9dKdFJ7ak6aJ?= =?us-ascii?Q?C1OwntXzWWGlxm4xYu0ZQ4cuKi4TevZxBpwGgGhwjX84ZKDq5vEOAcASHydf?= =?us-ascii?Q?5bm9cpGvgONwXmUGuxUxy71lSw0GlmrvmBgxiks2f9/liBzj5yVN66exNmd+?= =?us-ascii?Q?+UbhNtHL6GhDRsTvIklwFgGwBsKiV/Y1t4dE+AKbePuDebsc/dY/G1hinWUB?= =?us-ascii?Q?EUt849q2ovM5LplnNR1wMsofL6KXJrSZQT1lN7fBPHnfKHwcwJsBB5GA5/DB?= =?us-ascii?Q?cs4+vNRV3ODwzHtZgudPBq4ASgn0IfFW+iMFe0EWWAU0Scfe6VlcH2HEzM7x?= =?us-ascii?Q?r3EC+t+1mmyPn9Au1Ih+OM2k6t7PIh9FJ9YPyHCr8GTscWGgfnWRO8q0erpX?= =?us-ascii?Q?6GXA9vyxwDag61RMUsKwNWFOB71eZ5mWbTzpzjnWIYPC+fmv3A28iRXpJiyM?= =?us-ascii?Q?cEcc1vMHL231eHe7DDYFu0MYPVMuC+D+g/RnlSuVCtpeQjL5oC6sRDB/9wVP?= =?us-ascii?Q?B/lcrFye26pJ7Ba9eYa55nZAsXkhw8qgaoQAcqQkDqeRLB5XwxvTJ4b5m+sP?= =?us-ascii?Q?7+I2YUDZGyZ1j5pkmB7H6kU9P0ip2bviOBcsV2Kz9JOEeh8Pioa4EFx3wq1y?= =?us-ascii?Q?EjOoFwz6JBR7aha84OA+v8iSONo42nZrWt2LfMV/BvDii56afCcpfwkinw39?= =?us-ascii?Q?80OJenYPKmGwN4W93ju/2CvSMMwIWNzQznQ2xPeAkfZe/rBDZLNodsb75EGI?= =?us-ascii?Q?0KuruljHwBxgcJtlWk6KGCeQC45ZgmBi4+kJxLjmubxs9/AF5RHTb9EQYL9I?= =?us-ascii?Q?ZtUazwMWtCcPO6k/WCZ+Ib2H2t/sz2TuGFuFAYPNepHBrI0LHwBUdszoh+eL?= =?us-ascii?Q?GqmQ+mVoIKETMyU7Y+/GgdtX4wCByp3fOCTBoOsnswFj5FjCv6AaaGAOZjcU?= =?us-ascii?Q?hl2qGcKh5wfWMmuJP7SfDhaOU1kPasitgZP4XegFciGpa06puU5PnzCKFzp9?= =?us-ascii?Q?hH/yXqXDx0bS6xVzS24yFL62GWP86UzQx1E2nb9TX53Bk1ET25/maKOQq6mv?= =?us-ascii?Q?cxbMFehajnW2Ydu0G+oQJNqHl64uEgbnzmwkwjcuw638MOW2n3H3CLaB+cof?= =?us-ascii?Q?I0QMSHoGVMFLuJ6VTq2Fz4En5lxZauJ25Tprj5yH7J0T8bYHTVUK8eNBuMn0?= =?us-ascii?Q?zzbV1OEASwzmWj0vPMLL+8L5arVbVLo7BBN+x7XPC8gfkbGXl5BOp+V704M5?= =?us-ascii?Q?bTIjAkKx4YHkE0Yp4f9eWcfQmoM0BwKFDcjCQBNoxUNukUTJjt4UdsAFy/wQ?= =?us-ascii?Q?OJCPVlDTSxq/D43ue0Dnk88y/QU5gqfEmcYaYQouE1hyzy8PQNAEfSKYlGde?= =?us-ascii?Q?e7f/aXtHC8C4KlqzwxhSvATGlhUFXSk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e26b8031-09e7-4f48-220f-08da47a19477 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:47:33.5613 (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: HKKGNxlyyMZywUNenqqfbUyh13J9ge8Jd33W0no8uRhwSQ8rISG7fvsKEHi2OnaqQXYKO8eSP0FBZW7phKXyUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4802 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 | 52 +++++++++++++++++++++++++++----------------- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 25 +++++++++++++++++++++ 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c7a1e15a66fe..999e83eae821 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2196,17 +2196,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 @@ -2450,16 +2445,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)) { @@ -2478,32 +2474,48 @@ 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, 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:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1195917uab; Mon, 6 Jun 2022 02:47:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjTNQpGl5iK2qqfPqDWh/m2GaDT4t8YxPYpm0Kg9ZxgeeRuJrLg4iXn6AzJpfLJRAB14+b X-Received: by 2002:a63:144c:0:b0:3fa:6f09:a3e4 with SMTP id 12-20020a63144c000000b003fa6f09a3e4mr20581916pgu.102.1654508867489; Mon, 06 Jun 2022 02:47:47 -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 w204-20020a627bd5000000b0050d4f5ccb83si7135537pfc.311.2022.06.06.02.47.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:47:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5565-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=dzdEq1g4; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5565-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5565-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 28E9A280A81 for ; Mon, 6 Jun 2022 09:47:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C51223C1; Mon, 6 Jun 2022 09:47:46 +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 8718923BD for ; Mon, 6 Jun 2022 09:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508862; 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=wZf7IBWY8ZgqjoM884e7d2fwbgUfXwPyqPbeKY0nsu4=; b=dzdEq1g4VM2r1gAKIoDVdIPjJOb/bwUCbbHPksRPEAWSUixlD/qtfwC6UT0jH32Kd0xZXN FK4d2W0OT/MAzNGmhh7BmzJtsIrdFScvhcHMLibKiRY3Kwev2vuHRZeggLPBhdw3mJrWed Kxi8a/C8Z4dHknyUpRPLkVt+ENNHrLc= Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2058.outbound.protection.outlook.com [104.47.0.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-a8f5klh4NnKw5RM321jeHA-1; Mon, 06 Jun 2022 11:47:41 +0200 X-MC-Unique: a8f5klh4NnKw5RM321jeHA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OTU9e4rX0W3LO2SFjgyMCKZUI9PLrUkBw3y6yPa14198QXljv8Yg9lgTA/H/7TcYUc+gOHvmMNAgxzyIzb+XHpB1CnpwPyd/Gol9JCZH4XQYAHqbC8FxslFkCX2YxuJaeFNNa3k6K+UR4OvMGu2xUHOGI8wX0Y3BtUlKet0uTKTmuB+wsbGT21bSTUv13/GPu8cOq1AQozq9VysLHwSQtKTduTfLQkh0tPZPZJ9vaicxz7o2wok5kTjSwQ/Wh9sR50YFEiILV7K96tT3UNgPdL7k7Gh0lEWm6/KnG4Ivz2DHsvD7sDX7ePCgYlAPUJNv3OcFXsz1KU+vN23e2KSCSA== 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=eMApmYzdyz2EWIHY4EidKwjDfbvUtaDuDbGcTannMyI=; b=ZD12bHT7QNSDZzasFl6vb5opbW6nCVFLvosq7oeSKisZq9Y6rJb3Rue7NtyDcogRLPYyAuxSJreT1HvA1yQFmM6VM69rpMY9A6u7npbHNuiwgm/szTMPdjCczsnNzecW20yNUuceSWrBwLOu1wobU9PBGmNNcxi6fXZ5dMx0dhC68rCvDXzGYCYak4Cn+M5K8yn6dZEVKtFEIJ7DPzawrHbjJjS4WnkVK+SnNyGyP+lsHA1SDNOF9VaByXqXNjBKLdktMpz2cPcvJYUpuiXQtmDLXLQHQyhWNNOJrWR90lIApskHhv30vWBKR+UJQCyNQaIUoTx0astD1OZiSK3a6A== 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 AM0PR04MB4802.eurprd04.prod.outlook.com (2603:10a6:208:c2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:47:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:47:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 3/5] mptcp: add mptcp_sched_get_send wrapper Date: Mon, 6 Jun 2022 17:47:13 +0800 Message-ID: <0d87803df540cb9e103b3696a366b5355c0104f7.1654508532.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0018.apcprd06.prod.outlook.com (2603:1096:4:186::8) 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: f52f7e58-5c97-4362-653a-08da47a1989e X-MS-TrafficTypeDiagnostic: AM0PR04MB4802: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: gRPDUYmCPpM1LGPFPbVNsC9NubqHSpK5mdFuHzidugAxdUu1AuTzITjo0HvKSPbu3Jt7ZIef2vl3XgJj7Sog7NiSMnDpGjB4d54NtNnd4JgaUiGqdiUDNWmDdnTBIrwlUPV4DvNp9VrWxL0fC/cqyORHdkhPJON7HMvY9ELExo7Gau1LbEI3fcPuf04SXF+DEfM6QLpAWw4uZk2vOcgmIGEg+5knUJVaMjvPVzWN7XseaCYpzPjuOmosl6GOX/Vbnkbh4unG0QE9AHE61chp8iGw1f65DdELlnm9Bukhg6KYIRfQxhDGItqeS8TwUFZ/VCqogGG40l3DoGN/uOeLaG7sVrNlaTELwvCbcwEaBaexnf/Dgs7PJMxQ44clWRzCvMmRoxZQi0RH1Xv7Vf+LGXNMHELQl2nGn9br8MdxSpKhDgQSWAWWg5i6jKM/tm+Lv8s53PTGgG7feOgEnVzKZWlf2vNGwarnniQeA4uhqSkLLqDayzPzDefMgO4MZOWCtqe4e8z9Bn9eCsZgpUOL73kTlMgRjU5+Mw7bHUWkFB5cY+Wm44sZUv/K6+AiPdaj9bkUpF+goiwj8I6beyqf/w8EyHCsk/IOYDuseLU034XHVtiDw6ABccvCxiClRhXMTug/c33FsnQsFdLPLlsHhKo86pwFtgiRGC1ikJcEpS3z/x/hR/q14Mgc/+Bi1USi0//+4cU+kLe+EM8XTofItg== 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)(66946007)(36756003)(6916009)(38100700002)(66556008)(66476007)(107886003)(316002)(5660300002)(26005)(6512007)(2906002)(4326008)(44832011)(8676002)(6506007)(83380400001)(2616005)(6666004)(508600001)(6486002)(186003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?B66QzYAFT3VI4B4ZEs/asRj+24xTfG2SHGXs3ZW4ZF9Y58RyIOH1gsO82x8Z?= =?us-ascii?Q?3Vhcs847iPCt1LdpPE4D+ZGRRtiendU8ELUn6v77YXhGoO3U4YbFeVzsEJXy?= =?us-ascii?Q?mc8/u8/TqWOvFS6//gt2Q+vRugSBak/16taLvRJvxiAf43iOpc4x5ciHVOkt?= =?us-ascii?Q?zN0gLxxV8yeInKNfxFEdCQGMw/OjM3c1340KTWJGZMg9CKekn8IhhlimBSu3?= =?us-ascii?Q?6l6HHjmFeKSjO2s8HVAu+4IMFEou+uYRWq9EpqzqOrc5zZYYTNmpgMwXMZ3Q?= =?us-ascii?Q?71F/tyDaf4M2RW3ZixKdYaAbhHs6QuQMp6HnNvaLiG7JmsKVb/CU1sUPdiK9?= =?us-ascii?Q?EaQJZlyP2oodw/OwkT8XdBYMSZS/e2uYbRY6ha+aN+4sa7RVPbKtOgjfAoab?= =?us-ascii?Q?O59cm9e6QNckbV8V5oBeNa84yyAK6JP7CNjpV/uQ5CTZLjnhpGHsJ4LRJ0QS?= =?us-ascii?Q?hb1T1y/XIQe7NHiZlmS78clM5E4Q5HoB84SBqa5ElifOmttHZDwrO1GipUeC?= =?us-ascii?Q?muwJWpMCvcu1yAUSV5ER+UHLYq9L4r2jTCgrluL6Z1RTucbAJdc010jFCU4l?= =?us-ascii?Q?PiW6bnU5wTqZMwObFumzVzHNXb1Sl7XKdjWrC+wbbQ4zu3FRsFWtndhOg61/?= =?us-ascii?Q?4zkys/yE14D1iMdFqZx07t8Z6ap//EsyTqNnSTfzxJPQfD6EU2SrSqBoCkm2?= =?us-ascii?Q?W2hKum0Fq8hY/lBD38tivVL7HrXVjI3N12JOeuN5a9LH7PrN9QG7zJAZAWkr?= =?us-ascii?Q?nVHTzIA3rYEmMZWVapg/uDVNFiPGuOs/PNAWv3GUHK8enPeoXxgyq6EUsYVz?= =?us-ascii?Q?7ix59V2IhTVcBRX9Yklx+QVEcx1jc25innkSngEbiyUNHWEXuQ5BFWawlULY?= =?us-ascii?Q?R7TyPt+d6OQdqkPqxUQmquqc0whmrpYzedUG2RhYW1rvo/BD52WZ8YjbFiy/?= =?us-ascii?Q?RpBWuAOkn9wH1UGLWDNYxSIEn9otSB/NyzuZHyz3lWMYQAnU7OfdM3IUT0ae?= =?us-ascii?Q?s6BXNiDksc7TfyQ+GoXqLV+15cavYFhCNz61T7LYOsU8X+1NRfGE0IQU2iXP?= =?us-ascii?Q?MbgQ+03KlcRfLgKmYIRL6c1OSSQVVqz6mU0iEnVY+U6UXcrAS8KsFL+v/Ghk?= =?us-ascii?Q?I7CLgQzRMgzFLIbaNXlUyELSGrmNJy2OIL4KDUTmUs3v5KdcVW/hTsBhhmb7?= =?us-ascii?Q?mbEq06aupCtAEcF+xUVLelbH4i55e16K2V7ZqNECkjp1pkCNyYDXYMJ1opTF?= =?us-ascii?Q?NfxRb3BTjGlc1IRoDvgki0AkDnJZuPLiVvVBVuKPXsSmqQ8ZtW9vngWVdSBk?= =?us-ascii?Q?OxnGA3m8DhH9R6q5Iek3GS/RDPGpuvRXSrDZBffcGYREtYc5OD9ETJNTz+OO?= =?us-ascii?Q?uN7EkOuVER1evhVs5koSADMKGzqAPC5ONGD3rGobzRl/4h+THSdKhz6w/xiB?= =?us-ascii?Q?gRXpAqs5lAfkYebxcjy7J7OZSIwKk3JnIHFiItmzFfKeQoAqJwN14C9m8ApI?= =?us-ascii?Q?WiEvEyUgupVlsCPKXS8EQ/6eOl6zZDX8bmPwS9JGexSNZ+CPW5tpUgYzIPjh?= =?us-ascii?Q?ew9H6DntT7bhDXyMwBr8VC0EErQt8InSqZwFCCtT2ash1TTn9fafIg1beEC+?= =?us-ascii?Q?ggr482w2vUAXLCqsVGgDXRKpvFbuxi6+OCJBCA4+cy6vVGLjxrOaZ3XRyEQR?= =?us-ascii?Q?4tcZKzKOcXg+nnTI3hT6XOpks4l+XJ0WNeU0HNWAaePf+IYeAI3esIYirCRf?= =?us-ascii?Q?oCAYlCXS309JV1bVKY/GzfCFkz8N2Zo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f52f7e58-5c97-4362-653a-08da47a1989e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:47:40.4982 (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: j81r0AffnJe9asYmIbVOUPcjJ4sWrsJOaWC5VFP1bjejN66DN5ranUrb2oGmVFHvLT62zkrRoiMou/Wy2Y0ycQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4802 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 | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 999e83eae821..16612bed5890 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1635,7 +1635,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) { @@ -3125,7 +3125,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..70c6b7b86f23 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -147,6 +147,32 @@ 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)) { + /* + * TODO: Redundant subflows are not supported in + * __mptcp_subflow_push_pending() yet. Here's a + * placeholder to pick the first subflow for the + * redundant subflows case. + */ + 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:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1195944uab; Mon, 6 Jun 2022 02:47:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWGlOFlL5Vyxr5d6mz+3guRxZoZyE8z8t57qO/O91zhHciDz9x2RPS+PM7/NtOjSEkgCxe X-Received: by 2002:a05:6870:e30e:b0:de:ab76:eed7 with SMTP id z14-20020a056870e30e00b000deab76eed7mr29708990oad.101.1654508873799; Mon, 06 Jun 2022 02:47:53 -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 l4-20020a056830154400b0060b11301659si15212376otp.127.2022.06.06.02.47.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:47:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5566-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=DdwbWIjg; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5566-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5566-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 A08312E0A07 for ; Mon, 6 Jun 2022 09:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8D1CB23C1; Mon, 6 Jun 2022 09:47:52 +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 04A4623BD for ; Mon, 6 Jun 2022 09:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508869; 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=DdwbWIjgBMuy/5JjdUADpqzxBqMzKqO0Sb9Pgrg0qGM1MN9rvNDDVnATmiMyPpcZuQOsxz BJuDU1/mNV+VyvWTV0FEyAvoibNkghItSJG1riwKk58LX6u4aCPkXMAVtoIvfq5m8LIljW jDp4Aku9HR6uu6MTzL+8vv1pQJ9HuGk= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2051.outbound.protection.outlook.com [104.47.12.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-S0fbRGjKMqC6FQsOCwzLBQ-2; Mon, 06 Jun 2022 11:47:48 +0200 X-MC-Unique: S0fbRGjKMqC6FQsOCwzLBQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kBe9ZU+YIEd4AqFbkkrd/xmVPcoNgt5KXaudIaB+LsJzK5mvsN+fTkkT5yYMMaayFIlXPW6ImSNrgxmtEiWpFiYN7cgF4HnSePPLPxwYgnEWo+Zwdotp0/gL4Y+lr4Gc16+Xmkphep6t4uPcjK4HNO40oYKnpZZRO1VXRAUZ4WotzjfUJN+94OH1DEdF/cgmirCaBSxrs+w0c7KLCwbQsROTu3+G8NSNj0LIkAkRxnK+y1IrTGeylJzu07v9+ZI6z9EyB2PFH2a9oCo/xHVCyR4d4qV9qE7NO8tuivm8ESR5/5JcW/hiJloPGoIfG9bGYsoAbVmXcvJ4aJmi36chZw== 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=SFlVgKZsf+GRBguA3uRTPXlsPu05jgwQFuAAOdYaaEus0X0hvfhgYf42PpVElRNTfp/oikictYp1J4FFL5GQYNjCcqCjYN7MX/HDOsJDPUc1iAjWiChreuuGxCeJ/TmSaaPVRK8pst1wt5gxAwYo6swV7NRuC4Jm5EKFGy10kGlafcaxzu1eM9nCz7Lq2Wp9bvcrVJhyZRt+We5jEF5ilEvsxIAGQxyorC+MkFTCpR0KFIhlwrGkUW1spIpn0j5tClVzQ57YBGVY///VMOgrwEHva+5SnkMdesEU8c+Jy/VplCjIuGkczLpe+7mp2J/L/4CFNMtNzo1jNKMDz4/iEA== 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 AM0PR04MB4802.eurprd04.prod.outlook.com (2603:10a6:208:c2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:47:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:47:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 4/5] selftests/bpf: Add bpf_red scheduler Date: Mon, 6 Jun 2022 17:47:14 +0800 Message-ID: <25eec1eb990715df3012c1b5c4c5e9b8a99d71b0.1654508532.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0007.apcprd06.prod.outlook.com (2603:1096:4:186::9) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f38d7d2f-8566-442e-504d-08da47a19c28 X-MS-TrafficTypeDiagnostic: AM0PR04MB4802: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: O9d0U37O92t+l62GG1K7X2LNt8bbxasv9mhk6q3QjUyIxLolxai+MLkvat4hHO9wsyFk9GCNLx4btm0P7JwQBsG+8I0rpJLyPjGlj4y1oILWK9/ug7BVqKG89TZWRIZW6kzoOJtwxXtm8ReE0dw0gVomlXF7agRPB4wYVl0TgcGXEhzOgnJeKMU7wkO1cmMJsy6VKYYKjcPt2fWNWaKUPuqyAl9Z0cqVkos6aR2tliU5EF051b1570k5+EuIu4geb64tAvepLw8KLeZ8lNFE8QdDxrxnq9pJ4pPEDpQUjJlcAYWPJhF0IhLpwlebhfEljNdDxnL/iKdbomNbOLw9QVPjaOYnjxJPgsrl5Cj+UNJG3LwZz9oLHnlEiADNwSTspx5qjQHl0psrYktgRodtIdnvsHddFr4avL9ZNmN2YC/Z758AtxDgbRH4sI+aTOafsCUfkMnmM61mFuqJpElldcRIfzPM3wYqETMDWp8kJa2CtSmh7v8l209vPePkZmtMZ57USMnLSwATtAu++Xz9ltkIo+6SvKz+SzfspGUqW3LC7aXGZPOLyqR/f7ddsUft6nby+CrKUij210vSDjuDzhtMPcTImrhJw0NUbYJxYr8+CmYGsQOC1lYy/ip0kMJkdGOsIctXHKijhRvqq0nLaH3Bdf2akKl6nhor1BPS3B8J5e/Y/TgcVMfR/92z5VTyq5S02iWcKKQn2UCQQdpGNA== 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)(66946007)(36756003)(6916009)(38100700002)(66556008)(66476007)(107886003)(316002)(5660300002)(26005)(6512007)(2906002)(4326008)(44832011)(8676002)(6506007)(2616005)(6666004)(508600001)(6486002)(186003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fgIWybtAmvaDsKi3Z2fZ34wayWh8SQzW4DDaGjGm8KdtYXeGGP42WjSYl10m?= =?us-ascii?Q?Q3Su88BkCUfjMd5nxrUiHZBqR+H1jo6eIdy5tkoShGkuLbXg2qM0suLnw//O?= =?us-ascii?Q?DplsUXBO7YMGP3Hur1Vg69pUgim2CkuIvKJYWPBL98/+vcNwizTlvnzVVojt?= =?us-ascii?Q?hRffhf1GVtAMM3e6emJ42vCTA5CZhB+2OgvbW20CgStFgod0JUpKxythI4En?= =?us-ascii?Q?UavG8sHtJ5DUEkQdhEKFD5JP71kfBwVefWRjxiCvnLtXOw2uECw9sLAHErwI?= =?us-ascii?Q?Ss3IVd7lQs715Pcp3V/Q22dICx3uw/v2WLm7UMDarxUqYP2+pSeCBPWFfljq?= =?us-ascii?Q?1UvTybbp3JyYy1xsGR5C0W1vQPmpt/vio7O7OSrtKD0Kl35OAgold4U0aQCr?= =?us-ascii?Q?IR8HGqEn5Dsw7nNkB7LmqyvB5kH6Rl7GPRLx9ZbBrNV9DOZndYSf21rHSuKM?= =?us-ascii?Q?ukRyeUPyi03VH80ik2QxX8YYX5tl2MgauhJwl31bOLYblfiGqNmGv6/+edt3?= =?us-ascii?Q?EBandedSX1r0PG116PrvoXpANeaMIGuMU/mouyu9IZTT4nmExe0ZEpIe/YbA?= =?us-ascii?Q?9LWSUEwQIXBbD5u6FlA4LEteh0/vSna/ywR1hipp1hSSkMUo0hKaX0VOQCrF?= =?us-ascii?Q?u47aYOkpmqR3tZacmtYOB8fZ4T8tjp8qYuTobLOKxL1RQuhm05YPfE1gtYhL?= =?us-ascii?Q?qhsqHKwe0BDNoc+wEMOX8iespo6Gmqt39NF0WAVoG4A+LoGZCEoiqRXD+tmC?= =?us-ascii?Q?+NeaqMRr7UkJOsH6bjqPu3CqNLxkCNIyVAkFG+tYHNSwXYtuaBZkjuHxShiV?= =?us-ascii?Q?rBWzGMG80ideOkaCJ9VCbNHrcwYoewsmLRKhcP7xrz/IMVLkl32h7uxpd/ca?= =?us-ascii?Q?rDvGoWZlKvMFanVAcm0/5H1t/vPp3cGKLsANaNqSEDNXVFYJVxV7yikASGZ4?= =?us-ascii?Q?pVT8+o04lEMTN6K+PMepG5iFeqG+/VcgaqCta3Ewj1xhz5KylBbAy5E/unFV?= =?us-ascii?Q?eECubUpPKTeDixyiC8Rsk5XsrWDyG6J8wSoT5vUXAzHvkcaqUJvVXrBrZ8aj?= =?us-ascii?Q?qMXYiTfsgIsZXVN65RCev/bag90VKFT8Xtx4evA58NO/boujQOfmzVncO+Xt?= =?us-ascii?Q?TIYe3lIYusI+qWv4qyS5EgWdnPNrOPIXABIk5ttssLVlEjjgGcONuU22j62q?= =?us-ascii?Q?IGqWxhskPbuVmH6UQS/+jUAlH0TitJhh/HoNh19X5Wy8VDgtmEFbA0aeF0we?= =?us-ascii?Q?sF/VY1QrJEkNrPhUe7Rr/FR1k/j27LSUBLV5GKApdyLWZ16tzyjBbezlr/UK?= =?us-ascii?Q?jzPxBoBdH4f6LyMoEBkHajnWCnUcs/EohA8zHFEP3CSd0c/ku53MpjsZRSb0?= =?us-ascii?Q?35CpBQAVXolx0vOZ42vlcTRrff9ZUllODhi7QYTEr4UVTjIq0Y7q1O65sPTY?= =?us-ascii?Q?xc8oYbV0Vg3iRWdqEk77s5A7iG3GqdSfohtk4h5chGvdN5ku9S7N04mpN5pN?= =?us-ascii?Q?fpic0r9PYcpA7UKQxnnPUuURcab0L5F5pXhOfWa1/reLvE9LB5lOFnhGcCEa?= =?us-ascii?Q?VGFNFDzthcdE0z9RHO+efq5n1isVzHeCtFu22O4GsaYWr+Rjnzrm//JlBBGY?= =?us-ascii?Q?qYT5W2Y5R6lTTmJoiizWLvgYxQtm3H4I4CXcWMhxG09iK3M52pF2k+F4HanD?= =?us-ascii?Q?C66xsR3yIldO+awUKqbXB8WY9tNYg+rkNorlF07GDerMAnCuoAKPFMp6EMhA?= =?us-ascii?Q?0eiqBXTe6IKXqXn03NbaN7AkQrjXI3Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f38d7d2f-8566-442e-504d-08da47a19c28 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:47:46.4196 (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: dFQwRfxq4PvenPJYX73N/NIqJTkui1ikqp92gXUKNaOtDXIqZpp/owGRbSFPsI8IWOYVzNfcjTTHKTLwXWst/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4802 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:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1195953uab; Mon, 6 Jun 2022 02:48:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfteZwiJGjxzna3s2md6DmU8MhVadNMclH+xiQBYR8a+L4ZyXdjWqIzcK6RTNYN2ygGcb/ X-Received: by 2002:a05:6a00:1a49:b0:51b:8e5d:424b with SMTP id h9-20020a056a001a4900b0051b8e5d424bmr23431804pfv.66.1654508880299; Mon, 06 Jun 2022 02:48:00 -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 x14-20020a170902820e00b0016227beec46si18470351pln.143.2022.06.06.02.48.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:48:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5567-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="CQ/DpOGK"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5567-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5567-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 E18EC280AA7 for ; Mon, 6 Jun 2022 09:47:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 08A3223C1; Mon, 6 Jun 2022 09:47:59 +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 7E29E23BD for ; Mon, 6 Jun 2022 09:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508874; 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=dcxFYknSSqn2iCp/EC6eSvsoTZmmfAXbqcIbOIVxtBU=; b=CQ/DpOGKNQfrGss6c7e6NGElWClT6aGGxII81rUSuznMWDELdC9dmWE0KcHk9AjEWmZMIN HxFX3+smBgIT23QHFa03C/WWBSirSHp51WEM7oSeQatIRykkk0uhMVQM/c5uzqGoiqpWag SoF0ZtYTrE5V95m5kBUn2TAtwsux9Ls= Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2057.outbound.protection.outlook.com [104.47.0.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-1yT--EyOO92x12rzERZsCg-1; Mon, 06 Jun 2022 11:47:53 +0200 X-MC-Unique: 1yT--EyOO92x12rzERZsCg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KQAJnJFtWsljb4VjbtsftjmWIwx2T6OpqvLsC5mxsRfvhOsdjn8t/BB4ydvmmsC6vjaED5bHKramhcBKSDBd8QUaMBMvlanP8nXSToYfxXyRHt02AEtbT6vQpGb4eNnlb8+zDs3AiYjROFaM/b3KNHqD5BlYl2k385LOS36b3a5ZC20CsC8nAOxVODwf/2BPdrDxRfY7r2fo7vPd1JXmK2TOiAGxeELk9acUKqhq/SPGsKCY+/ml7SltmIw8X6yGmJKmyHIZLMwBNYeRXXcsyqCL3rLkI0ezQcSc/o/fn47gFQ1j9ceiY28q1MNXTVf4Q0jFL8gZHqcbtPudZiVtEQ== 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=1MJQgoHc2RXthhjd/g/4xWmqUBrv08pWo3t2q2k3m3E=; b=GqvwMAvVVhHckdJLAgRaaz7F6BF+I4NEpdBccN0otTHBjnLqXv34EfSCwRO/06U8HJ/KCm73TfpG1G8wXlTd6rzFwMAR1M1NGBYzbjIS44VQdBuA9qfSRHlgKjnCxe/x8mCb1pzKH9mTrP6O/mCFuYKmUeWVF5SMLPM5Tvz5sVnXvQiTrOu1aLXO6oHj/+55ZU4eb8tp58t24MEzbtSUoJLL4uPvTgyWUBnDOnzqQcb48o4Km0/rxQgC8Hd5SgGlrHxgntEIk4Kryg9ZMMpT+Z3ClNEgltW5ccE0az+0OwM+Cq/neQ4jfhYUogJnNkFBWUK4Sae9VKmPOziTtehDWQ== 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 AM0PR04MB4802.eurprd04.prod.outlook.com (2603:10a6:208:c2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:47:52 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:47:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 5/5] selftests/bpf: Add bpf_red test Date: Mon, 6 Jun 2022 17:47:15 +0800 Message-ID: <9555cebeab769c715468f99ebdbf967a715a3b59.1654508532.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0005.apcprd06.prod.outlook.com (2603:1096:4:186::12) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aea76e6a-28ef-42e6-9bac-08da47a19fd3 X-MS-TrafficTypeDiagnostic: AM0PR04MB4802: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: km3h1XNd06+K7FQ/XG8CNEZyxXE0M5Dzhi7Uy6g9eD1JJhINHKTiyN2+s9UWILInN1qfRv3VjhIVo8qlrBAVFeyJNH1J/hwXGHYi/Pvk+KfSoh535zZC+TK4nTe4GtIRdJtzXrq9zCDwVAs+a+aUXU97FpBKPqGlhk4h6WbFJVV+2aPeOpAGMi0zhZbm/PhN7L21ctOXHbTdsjCfJeyOXhdsgR2KC7tAVU8Cj8B7Uxahcad8Z/TE14XYYum1+NKDdNwfyirabBHtFgZhriG6ypaVzYajL8EWW16WasRxum6TKXeH5TaNr2kIGU4CHevBeOiJjo5UjEkTA7FtrqFyLtm/FQyTcWm/88f2lybusAFPTzh+trdD8RIuW8fhXWSCv85FNNwzfQMSEe85KOGbNVru0GM/rFfnm3The2dydMRR0i7/WOzORvYVivCsmBqdszFKvLNaclo7lvGBqJrRjql+v2TDTiyAdx3x1ikcNMhxm+LMTmt3k+aQd3CQwGfx1+hGfa2l5VVMCHddVHseTWMX7E/QwAR5NqWhk0qxN4deaWVzWVAVDM4eMtJF6VpUYEq51CmjNBpUFRauVgjMDdph785NTrr95KCTEC5KulpKRWLg/P0J35LTTJz3l0fDIJMZUzQ4ZQQvTLxl26UlN9NVIyu/jhLLOz3XZYkXpRhFQs2RE0iEZspTaJlOuuFR 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)(66946007)(36756003)(6916009)(38100700002)(66556008)(66476007)(107886003)(316002)(5660300002)(26005)(6512007)(2906002)(4326008)(44832011)(8676002)(6506007)(83380400001)(2616005)(6666004)(508600001)(6486002)(186003)(86362001)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eYW7vNt4GUYbPp3vjkD+VW5AVTBplA7/uDbI8CEtXNkR/6uAICBXDgpMXdaN?= =?us-ascii?Q?y+crRSpvVmtQrgj9yZXwZm2CTNDbs7czbPQGIgi5O3aYNAP5yvh/puNsotSK?= =?us-ascii?Q?kDSFYZ3zbwPwUnmPpdha89m8yedOv+TrkCAaaLYiUUiEwGS4vNVRcJ+9NcFR?= =?us-ascii?Q?XHWhTcr69+LRPFKgdkodU7lPPMrB43zUMgEHgLwcQOn2x43hOcLm6XgesLbt?= =?us-ascii?Q?20zgiCXclKXc5UIdKe0CEaA46B4KQccXAJPTW5iOPFBQkqME3+kqtJu3NrXm?= =?us-ascii?Q?bNk9tRlb6mq0yvveer9aO4NY0K48SW1YF29YovZXlBQpeNZUHF/Ptb9aHfpT?= =?us-ascii?Q?xkz9F+qPI+xac4Ja1AQaJTWXoB0ZYm4oof8IhxswUo/bVdIcg6Hzt+xvzXMR?= =?us-ascii?Q?vUUkFsz9CTQGbhdJgoTc4qudaTtj6tdB8aai5mauuNWLCcrVSluM8Ay3+OvV?= =?us-ascii?Q?tgKg3B2gGPcSUVyV2S6LapZl9Q71nBA9uwIbCo+I4w22qyP/18DtV1dFT4V8?= =?us-ascii?Q?hT9Ly+azPBQDU0hjfHbsSbhYbKv+hArYJZPZX9Mi1J2Y1GiBXBvkmryNznY0?= =?us-ascii?Q?OXnsEcTtrGVvy4oQst2FuSTpO+UxYE54MXpAs4h6DPBtHN3GKGhk5p/aNMkf?= =?us-ascii?Q?jgKtGf4dKDKP0VuTemZ60K4xruL6p7ErMKoY3t08Ji+nNeT2hrK+Ng2Wduxh?= =?us-ascii?Q?9CBeksgElzwdG2O1S8D+QVJoodIXxhzZkFIovGZ3LPmCOMF6rV50lKl/gR+F?= =?us-ascii?Q?wCW8J39Y1cbf5EegrIDnPv3s31753uSJBTK9JxGFx6/Y0aAVi6krZYQRuEe8?= =?us-ascii?Q?D8e/XISVDTTRQ2496Rk6caEZnaYNZB3aTcsR3UJSNYWiFVNRhTqxpDVRL4M/?= =?us-ascii?Q?AdZlXdIRBMAXe3CvOISL2kGvxzGgsz0Wr2JDboFKv6PfLlH8zoFrcDFu8Dhx?= =?us-ascii?Q?b1C48ww6YA7f+c1zmBI0eyBnVskBnryESlrQIveRE9VRvlUsT6nPiF00No24?= =?us-ascii?Q?dzIomsVfcAAAyGKyqmVok4GD5cC8kkdp/1k0f31rEoGZ8q+aPQQselkeAq9V?= =?us-ascii?Q?iUta8VbPBKBuJ68NVX0M4qr638mxDy79Qei/lD4I19CZZAve2kzpOx2BoKau?= =?us-ascii?Q?99C9gseDpp9cRdMJ6bEyEwMQCVygI16vT8iYYTHaNRv939l3QvPKOHpUelHO?= =?us-ascii?Q?a7i2o7wEP4tG6x0u+zmAiKUyu0Qsmj3gHvA3N/U91MERGVu+EAzQsq0+YQUc?= =?us-ascii?Q?6PnFmCL9OmW4a+jjrPhw4DeCVJDCQcLmjEgdhqHZAKpoAWPUyD+2JVQmg8CO?= =?us-ascii?Q?G1EenUxJB88u5tdK7Na0vcljmiCtIHVraUNRYQG7oAZzMZC4x+mlj7ykc+13?= =?us-ascii?Q?yEKryR+cxgZtR48wraH9fcM6XmYObiYGJbTVTLEfa+UHZblIyoLm7qEAvYOp?= =?us-ascii?Q?25OB7+FA5QhA3y2B0ttPpBwjT89f6cT1h6evB6YFUPaATR60g79h+ckHOozj?= =?us-ascii?Q?QPMjZ0G8NfKFZzyyaU8K0d+LcZK9LTtorqVeWWfeZBKtA34VwomlAGU0DamQ?= =?us-ascii?Q?3OtDQsO7Nw4dczwhxE//JMwxkG1qxeOBVcVrm+6oRm6x1B7d1WjESEDw4Mis?= =?us-ascii?Q?a6qQLdWIzK4BZGGzqluZ1W9zfURRYaNBCWvnxx+4VTMSaxcz0VPa+3W3ERtA?= =?us-ascii?Q?CJmTAWNRf6YMmL8JsU7kQgvTC8wWAJ1X2LGwmunUUF7sILOVnAi9+lrMlYZd?= =?us-ascii?Q?MhCmGUM6P4s+13J3BGT73lcGw7rL6uY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aea76e6a-28ef-42e6-9bac-08da47a19fd3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:47:52.5910 (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: JzCkv6IC2Zbanc0VmtOF8H0NiKTk1GSLtUEeZKdtL5wLyNrrDue26RTufTztqLqz6EnyuQV2ejlp+ZaYeVw2EQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4802 Content-Type: text/plain; charset="utf-8" This patch adds the redundant BPF MPTCP scheduler test: test_red(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been redundantly sent on both net devices. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 8b2fe1004323..9f3242c7920a 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -9,6 +9,7 @@ #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" +#include "mptcp_bpf_red.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -381,6 +382,37 @@ static void test_rr(void) mptcp_bpf_rr__destroy(rr_skel); } =20 +static void test_red(void) +{ + struct mptcp_bpf_red *red_skel; + int server_fd, client_fd; + struct bpf_link *link; + + red_skel =3D mptcp_bpf_red__open_and_load(); + if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(red_skel->maps.red); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_red__destroy(red_skel); + return; + } + + sched_init("subflow", "bpf_red"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); + + close(client_fd); + close(server_fd); + sched_cleanup(); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -391,4 +423,6 @@ void test_mptcp(void) test_bkup(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.34.1