From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60069.outbound.protection.outlook.com [40.107.6.69]) (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 4D53F8F4A for ; Wed, 12 Oct 2022 04:50:55 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mM7Z5kvR3cNqllqXSQoAECQMq4rSOvKlnO+HMmp4GYsudq94xbCGNOymslSYeQVgirtXNhF5Xm8WX3Qc8nZhjrquPat48/lYx5bLa99nW03pHbiEO9pU+moaQxsLr0h2M/0OGDoDjh12uYKn88dvUTdrNB0KfoReVGra6qsxMzCPn2adXrBxxts9PGsNYYmGQ7WZQyXf8V0pqFhXTNqaoWCKApcE/CwFyyixp2VBpe9FPhR7HnuYbkDa142qn0hpD5EUO2CH96TmWKe9rnyTolnWL4IppTDVNhL0nnatGJP09MZCiRHo6opRdPvJEYVA5LnmsAJBrPl2FxdxLjyMZw== 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=8LpdY/g+tBiEUovNjfo7qICy3b84Yd9DVMb/FwKXUG0=; b=TQ13TvQWNwP9jyB0xNTroSbq8W/IygNiYN3vnPeZ+0veHWPQteDk+4+NVh4XxMKg9uJUEJNdJ5Q+lw6ur2+UAQbIZYkhhqQN26MahiIEAiON3SzqUifxFHjlMiEkcCztbJ6g2eiBugu+eoegVJatIS6TqDCDMpCK+cF07CeRlgaMZdmEJfgzmbun9QrkkdNx4qkhj0Nn53joNxIg1RsmvDQjBKI6vw97jJZdlawo7Vnj/4zjZfkI7mHwrp/4Gu90lzA0G7CS2YNi/dVRKuzxKAiTG+gRRjvOGNK/pzGQ5j09zd6aLaVy7H605nxnAB4CiYod0BIKy3osRrnf0k6OyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8LpdY/g+tBiEUovNjfo7qICy3b84Yd9DVMb/FwKXUG0=; b=LFLutSbiDKWSIuhOvdbByxkzJ9Y6o/Bgt04Wneyj7wpEG84iQGgMrYx93h5S5cT3fvaZjY7DtVEeP9nJ0PpoP8FCYrnqCFCYSOGCFmS0cU3B4LaDoLdE/FwvlsScjOuc67apYMLmnBNMB2AT0kxDBk7tUfMzWpoAATDs+XhtF6RyoGdbyVqCLblB57EL3TY34XXR3+R8dM/rkLV2wRrpijxT4nCdrtyt5GVpH8h08Pncpsrjs8nJ3JFlOfAFzduBcZzINT9fLxWkO9+LGi5QgUSoUP0uNTyFgekg9yZwaeGhKle++i66M6SDfnDcVDvmWhk1dYHOxvWfNZ+kw+JkaQ== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:50:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:50:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 01/16] Squash to "mptcp: add struct mptcp_sched_ops" Date: Wed, 12 Oct 2022 12:50:22 +0800 Message-Id: <408456b3b8dcf84c23a999a740370cc805383d0d.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0187.apcprd06.prod.outlook.com (2603:1096:4:1::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: ba1fe657-af6a-4e30-a937-08daac0d55ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QcnFj5qMBdGfd1jsAsfuW8nrPawn9HN3X4QcJ96DDkiIm7NfSQl/nP6yKIP6y4qaxsGE5TW+b5KcB17FsyrEv6TqvX2+ZiE9r8u2QZunw9c0WYOz9Y+T7SbtnbQ1P/R7NT2wOBRZtkLjHJtcA+R+r868CbJ1kJToBumR14ModgSDh+sxVLlHf5GBMu7PwmHF7ggWGiUPLRn8W2cf6hotIo6faPszebLxyFSK95OqqJxqANCK+UeU5vntr51AbFZOQXGL7OyTfqUunFEKb8QyKOtsCTG9moLN1+au1u1MbT7k0wCjT3GalZZA++NdWzht4N46ksLwEpMph6biARoBGO6aZ+x8GSLGAjoGO5ABQhOt0e0GiPQ146WvKW0svqwpsn2M8eQ6vph1EQ2MDeXXSp1wWS0KmnHQ1B4lYPMDrUnwovrgJyt2NRvxus1cr4Lrz6n6QRPq2TUj9XSnwCf3LHwO6bLbbEzLIBayhgYlcanRhrbybdbiTXKHQ8+nMeZC+8FEOpaI7TCKy9QxiRzHOzA5trMhLUOEP2IMly3vuTbarE04Y0C0TjLsSzU0HDff4Y87MVJhKzAb3+EIC8XYu2nvygrEHhw8dOKiBdJr76v/sZGsCr/IgzkN9gNMPqYdidPBd1lSDFjXlW6Qt7zh7sMC/5Ja4jq/TywONuJvuipBqjRPnoXVW2GGaNaxK/fwjmnBbhUhcTK59wL3OvkZn+k7FZ/Ub+NwxMEdIYlGZfcTQS0uQ98tdti0Ig8D3iq3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ocqjQMKhSpwZeB6DtNjvztAEcH4Ian7gd03IZjDF9NhWs7HaBaGw1/PUKVEY?= =?us-ascii?Q?sBANaqffiaaJKhuNfXl8p4Sgvj0vl7EyLzv9p2kBZWJ3ORyZB6v1ThPf1EEs?= =?us-ascii?Q?IXcASPBFMVGgAJUy7p36Y68akodNsL+bk9XTTr5FyQBW3kMuCevb50PHmPJT?= =?us-ascii?Q?qn4KXhCz+narOWO/ea1wWDFgqr5z4H6CksQ2vlZ9XqUfY8qUC7tiHbKN5z5d?= =?us-ascii?Q?9CWZkrexDBYW8HzNPAe7jOSKCGR+FlSTnNgF4p70HPLQw05ZyI6JVvC5SVVC?= =?us-ascii?Q?YBC9Dcu70L7c+Qu4a8KQDYayX/GHouR0QLsh1xDi0I8uv3LXxZ7ejp1z6lkj?= =?us-ascii?Q?HGIwJwgyBONgbvjomncw4o88MFF63kzRCVoyzsaJZHToAJQ0eHygfDCmuPn0?= =?us-ascii?Q?zcRpGOGNxUYvBeg0dQbVi07lFPsmYe2YfIrQtcwW/LG/pdQ6dmsiuU0asOLJ?= =?us-ascii?Q?O8OsAsMUFohCwLLa1q2akocspNYwFv91PEZSLhv2ejXdfZQLoJZYPTSAgdvk?= =?us-ascii?Q?Kc09fyKD/bOnuWZFp8H3FpKrr9zNz14qh0xTx0NG5ufAKhiiWIFrabCkblx0?= =?us-ascii?Q?/VMBbenhUfHK8ZlYdLpcXTMofYxgKoa+ZHE2KuepJmLfUtae/3xCgHzAygno?= =?us-ascii?Q?Dzldq72C7fpa41MRqVI08ym2FB3/B2Qo8Mskjtl93o34e9UOlVTMpXJP1Xit?= =?us-ascii?Q?rrtZR14YGenO58uuf9tgKA20ANi4Pkik6aNDrv7D8/xuPpdDTuUhWGI3mUyN?= =?us-ascii?Q?PAOFCaZnGOLKZsaOq9zzcyqu7xk2srGkNyP42Ak1eBhw8Pz6SBpBwmT2FDSX?= =?us-ascii?Q?IrRwx1Q/3Hl0sMwbn3huKCaDrCoMFdwdRnw58P6T06JPkA4twRzdxowJ7T13?= =?us-ascii?Q?vC4U6clPOc/OfNAg1KWzYtKe9w/GzfPqS5PTC4BUaKoppMLI9Sile9I0i6m6?= =?us-ascii?Q?A/PWgt7UeAZBLKzaXPhlO2TeLoUjDOgqvLNnI2fmjzb/72CIOn8vw41fGDxD?= =?us-ascii?Q?A1He8bVP/75Ujrsp8Kz1N1Mj2sXoYGUcFinWAodS8qxbA3ZnzdzzOstONi/R?= =?us-ascii?Q?ns2F0sfGh6LOWDMWAd0a5fholfAdYgLyBZzrCXwx7bNdJIkirc0X5sH6rUHf?= =?us-ascii?Q?XV3nIWKaC7irEeUoyvOw/gHxCuqHcts7iBe2yRdzXjXFrNZ/oj48KMfpjz4X?= =?us-ascii?Q?RQjp8/TF/vAgjUyEzsWYwI9xzyazyBG2VEVPOEcLk/BpZ3UPk45UpQCZfIAM?= =?us-ascii?Q?zNu6wJtoAk3Gn3NdH2YVF7p7B7+KFemh/JVjMGe0KJcuaDgvhWeLYI6jF3Q0?= =?us-ascii?Q?h1amSRwZ0iWKkVXqfgjufBXrr4RIlsj0Wcl3PpeY9zO+lzwlvRmjuOW4RRU2?= =?us-ascii?Q?mpozHNSRDB864G/6fCHFiD1sQ6+X4SsIGEZs1/nB34vTR8KZQyIbOne1p7Nh?= =?us-ascii?Q?9CnyDHhtSfmbCRbx60VS4E2BmYnsm1qAPn7qlkUeB3XTFrVDZlq2LPTBlIwC?= =?us-ascii?Q?DOnVWVmQVAfZ574t/ylZbuub4jpQts0FoNaBHtV+LSUwvAd55YMVGXXfwWI0?= =?us-ascii?Q?i8xAB9FQzdVzkCrTSO2anINq8mVSYrGELIvojvFmbYT6lHX9Kf8GHqi626Lh?= =?us-ascii?Q?1Q=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba1fe657-af6a-4e30-a937-08daac0d55ab X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:50:49.9462 (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: 7u7aL5gPYZXCMRRP4YZAKInFT5w3RMR2LoFRtRULgN8F+xoevkiRnWPxWFcuTuhCXdpimen/pKi20ajMF2Pk+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" New api: - add new data_init - add snd_burst in mptcp_sched_data - add an int return value for get_subflow Signed-off-by: Geliang Tang --- include/net/mptcp.h | 7 +++++-- net/mptcp/sched.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index c25939b2af68..cac5b0d512fd 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -101,12 +101,15 @@ struct mptcp_out_options { =20 struct mptcp_sched_data { bool reinject; + int snd_burst; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { - void (*get_subflow)(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); + void (*data_init)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); + int (*get_subflow)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); =20 char name[MPTCP_SCHED_NAME_MAX]; struct module *owner; diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 9b128714055a..6324a8a76382 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -33,7 +33,7 @@ struct mptcp_sched_ops *mptcp_sched_find(const char *name) =20 int mptcp_register_scheduler(struct mptcp_sched_ops *sched) { - if (!sched->get_subflow) + if (!sched->data_init || !sched->get_subflow) return -EINVAL; =20 spin_lock(&mptcp_sched_list_lock); --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60072.outbound.protection.outlook.com [40.107.6.72]) (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 77AA817CA for ; Wed, 12 Oct 2022 04:50:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KDBkFq/z2+w90p72xRptaKJCkJUxfAyU5Wpp5CUt73lUOMii5YLDMNtsxY6MTyezX5STeKM1vqmtc618pPeEv7rBDKfC3wx2+nlciGIcjo5vwNZpQreZ+S2L3x5fDv91/O90TreJATHC/eP9+KgxQwYeYh+jPP07SRLsPA5aPgHzsGG4pqz2Wou8lXrUxKd+6Qq6g+iGct9+njAdkASuQv4tuI1nBEwz31y9RhHv6iVECRGP1H32UIKPpKb3M15Ak4rVqyEWE3Omu0eNYRvidOeB07+7RzISsIas3siX+XRBXcdpvPvXe6kZGGM9YZrj9rMxLRDypnZ9+WG+/mTB3Q== 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=eyVsnM3nu0INoWwE2u4/FukNHYm/VsXjeKvXtL48DjA=; b=bgswOGclKqzZcAkq1JwNyLZ/hrh1hJoI8DPDytl66k/xAZzs5xSLLKu9eKDzf103WczC57kSR8fiaIAt469MF9lJxISwKdxYCZsubMB7j9Q+V84YjERU1wzE8xEOShrXpiqbPgUlAajmr6Fj12TfjuwkFWjOtOl0caOEoz1aiBj90D3S4K0tDeYldq7U0FIvah1LvRmpu/D+WXbyQIyLECPOcqXwxRH9F6IGletahRHQvChopWORdrYN9GcAYQu9iZT8OwAVqHwTgZabT0jf1RZXuT1X+1yMKyObhGnR0mdGUSRO95l0r7daUiR4ljV5OPUQznpUi6R08GXKkMyvNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eyVsnM3nu0INoWwE2u4/FukNHYm/VsXjeKvXtL48DjA=; b=MbKW27INDJwc50Ky08bBc5bBD02xRx+5KRv1DwDyuP2LETwJnXuvGqxqEt1DHmPeJCQaj5qZesTt80SOk4//4YnxrqswNfLp5gXAqYFGORtaDi8t34c1i2msfBpd+iiGpplKACSDIGstrGqoB6zS9OI8geBTFvoVYYCwkGG6dsoIWxhd9L7jL1Qs42JpQC/U4MmRFtXVWRBrAs9U5i/6xqo0m1SUMDukMLeWP5CwHdTHFJGxJ56Q9AU9ebxaQs7IdDZH1sOIG/zE0rUlmk0WNGFwjDNqB4PdUXdN4erQhg1GEvMoQddV0d77jzFGqKq8LGVTDY26YfCpUdxJe1+LPw== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:50:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:50:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 02/16] Squash to "mptcp: add get_subflow wrappers" II Date: Wed, 12 Oct 2022 12:50:23 +0800 Message-Id: <6bd5b40fcf7cadee559f9b7cca60f8011001ae55.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0197.apcprd06.prod.outlook.com (2603:1096:4:1::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c574c74-5217-4eb6-1382-08daac0d59da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0rBj5C08QQOxeGkr+SwMMDo6LBo3oUcKH3L0vVNzKV7cmKu2Tf5KWouYTCYbOGARGrZSagWD/twc8J+4/0PAu1F9FbKkE4YhQ2QJd8pbjxjs8rn67nXBzlzvxvvJGxcXa46R8W3AsHRITbwdYt2yid/RAZUNagvoKboGepyJ3CklCudLnQrEg4vS+Oq4mnYAxinoaj+LXHajQVLjqbrCnF/wO69xcwgdm49OLLGZevBWK9UUmuUqGgOGGXoQi0y6eo4ppWn0ePBJnZLc7/zNJ1YJ3aB3dL6avMBKroZQTQ9JqMn/YKQgJNOkHxonMRcMUQJ3lw4WXcTmotK2uw8xRS49raZ2Jpdwe1MjFziasJLWplMsUbxArKb3uNmezXq9BlAa3myeMvxsuGTZdqTJD3fBa+yLII9m6rJx+O8j0uT61FWL+28t5tdSvtbpPk0yXs6hp3MJqmAVMXkB9BmgPqLiCoBPs02fNkpy1XIiXcDJVD72ZwG1GKcOD20xh+w2IC7FGdbmHTWTIeXP7927j1H1MHeBdiih/AyiHSwCwl6dN1oCoXQGcG8YKnR78CNt5OjEpSC8NkA6NtaUXqCEPL/2uDrOOlkgTD1IEjfROKDyNr3XBmWyPSoH1GLTbsq8D/8A5VpIaHm1Ut4JbOI8VN+YiUsu2Ls7kaGF764QDKSKrMUExVRU5GZ7GncexG4HbYfEQ7pzIaGPzWBTgYRj/2vHc+OEU+wi2mD0ayGvVG8pW2ua0HTfrH/sWVyQX3r1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8ZH2Pf1mpgYBzfwLdE49jvArhBccozqdRN+zePE7YQbCFBI9GZ6bAz7Dutx0?= =?us-ascii?Q?BO49QYvPfRCmTiwvPlUR06KPhRDEXPTt+6ZPDhCb46cVGhQJH2EkhOYvtd/h?= =?us-ascii?Q?xBc5QpodCcDHY+y1k18mo+/UHzRKgthQP0kvLizn8pHCThX97dD6Eeyzz+Ou?= =?us-ascii?Q?Lt924aoSgHzE5un8lnKu/HCnpEDw68puc+XtAnblkd+v0PJOMVT00IVrDodk?= =?us-ascii?Q?QKDqaleBF6m1D3QCQGHkeqZF/RB1nw8zCWralY81WUelFijsCoETUeMRuXza?= =?us-ascii?Q?2SFTp82/xpciRqJsD1OcLmb/Sk9GZg64V1oM9jodB8z5l+Ezmij74GGbOu1p?= =?us-ascii?Q?/LBseXpnwYo036kPl6IgqMRQN/NnJRzQo4LoaVsVCt7ypgAH5lnXegb0BIbA?= =?us-ascii?Q?DTuOsiyDaoxS5mUlq32MhUap2wKenc9mAW8VWflC7wa+BX60uX8TWJX3zdDi?= =?us-ascii?Q?Z+/WNnokiRVv62RCWax/S0je/dhsloe1sLtxsCjplkXQFSD8r7Yw6mJMERCm?= =?us-ascii?Q?31xi6gxS8/GzcuwhTy3UyWDca4/qE9jkV9/Pib5DcTvgWj0aFqP3jtl4zlSa?= =?us-ascii?Q?QqKEN3aAt/rsZezOBda57OxDq804nYz7We4GJUKlmPUArvOKA0gloka210eo?= =?us-ascii?Q?F1l36KbvCCzYTPeBSZmyY3xroiplVPsg8MpG/AF8vAehmAVxVRPAb3izzIqu?= =?us-ascii?Q?MlTYGqVTOaXgSnWZtXqbcWt4EsVpL5ld+5dv8ow/+WCljSDzampFNw728tmA?= =?us-ascii?Q?djIpzUEJD4wP65attvUwd15s7lwW+Qgk93iq2npbst+T3LUR3aHDKQBPlo5B?= =?us-ascii?Q?SxdHchj58bDBkPrAg+ncb9Zy7IxTCe3pug5QSejsWS2iHk6oAhyQ7ciTAgZN?= =?us-ascii?Q?GHzUKdYE2xi0h+qqh9G/AoEQOSc15mY5y9SLIf3dhO0QUAAYOd3CGX8S7nbk?= =?us-ascii?Q?mG8yEIyNLtT4UbFyTGYpNlJ+uUIzLF0hLkk+wuJ1tBHZVzu7ljC2L1Pmak0S?= =?us-ascii?Q?iM9b6ngntPvAM5CtHIAxPKX7GSnPefA49nc2ktaoPChr9eqki7sncdVU8Uy7?= =?us-ascii?Q?tOjH22sF/B7TccujW+2td+oIuEEH+ftUidExpKfU2tugli2tvpTuM5DFxzBQ?= =?us-ascii?Q?Jaje7cDxRyOHj9C9tI2AH/77HB0aH36BBQ6jT3cnpX7cywxRZY71+J7jOe8D?= =?us-ascii?Q?XrqpUgbjK+e9FoI+tqZdGCYGiGHHtFj6cHVilUey3dTPYtiz7sCcL3WoQuTp?= =?us-ascii?Q?YppEYZRxT/jJY/lW7DG7ArrMPqBnvyFaeTWlGWUoT4/ypxwNBLSA2L2MEe6Q?= =?us-ascii?Q?6P1Qo9qVP8i7Q67fcwqhMLA8vYRMXNkwE42cwx5GoSIGCt/8SdEBvgjb0o3V?= =?us-ascii?Q?yMTg0EAJHeZb9EgBLNrYFbEBqmiSZD5CM35QZgEtYKr+Ag3vXaEtAPVF7+7d?= =?us-ascii?Q?MswDezIuC8+QeQSVPh15mNyOCU1+gC1MJ9/ta8k2HRHPtsUz7CPF+55mMUqb?= =?us-ascii?Q?JjhoL5GUsZmttUDGuq6L1NLfhsD88t4fqEc4sC2HNsD0CVa+K5AMJrTp+ADi?= =?us-ascii?Q?uY1/BmoHqHEn+0h2A37s86Bk1yu2Qb+b/f+rkmNqI9DsqL/F9ceATiaY3S10?= =?us-ascii?Q?Qw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c574c74-5217-4eb6-1382-08daac0d59da X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:50:57.1175 (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: CVaFrF5J4wCSZUK28Cd7XJilDb0rj4PHGjIPXwA7X33tQZYtva65+wfZc/jzYJaR/3HyEZGGmcqL1K1QewFS+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Use new api, use the return value of get_subflow. Drop mptcp_sched_data_init, use sched->data_init() instead. And some cleanups. Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 6 ++++-- net/mptcp/sched.c | 47 ++++++++++---------------------------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 68a2b22a47eb..ee9e7e55dfe0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -640,8 +640,10 @@ 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); +int mptcp_sched_get_send(struct mptcp_sock *msk, + struct mptcp_sched_data *data); +int mptcp_sched_get_retrans(struct mptcp_sock *msk, + struct mptcp_sched_data *data); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 6324a8a76382..c459b01f9a9d 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -94,34 +94,9 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_co= ntext *subflow, WRITE_ONCE(subflow->scheduled, scheduled); } =20 -static int mptcp_sched_data_init(struct mptcp_sock *msk, bool reinject, - struct mptcp_sched_data *data) +int mptcp_sched_get_send(struct mptcp_sock *msk, + struct mptcp_sched_data *data) { - struct mptcp_subflow_context *subflow; - int i =3D 0; - - data->reinject =3D reinject; - - mptcp_for_each_subflow(msk, subflow) { - if (i =3D=3D MPTCP_SUBFLOWS_MAX) { - pr_warn_once("too many subflows"); - break; - } - mptcp_subflow_set_scheduled(subflow, false); - data->contexts[i++] =3D subflow; - } - - for (; i < MPTCP_SUBFLOWS_MAX; i++) - data->contexts[i] =3D NULL; - - msk->snd_burst =3D 0; - - return 0; -} - -int mptcp_sched_get_send(struct mptcp_sock *msk) -{ - struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 sock_owned_by_me((const struct sock *)msk); @@ -145,15 +120,14 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) return 0; } =20 - mptcp_sched_data_init(msk, false, &data); - msk->sched->get_subflow(msk, &data); - - return 0; + data->reinject =3D false; + msk->sched->data_init(msk, data); + return msk->sched->get_subflow(msk, data); } =20 -int mptcp_sched_get_retrans(struct mptcp_sock *msk) +int mptcp_sched_get_retrans(struct mptcp_sock *msk, + struct mptcp_sched_data *data) { - struct mptcp_sched_data data; struct sock *ssk =3D NULL; =20 sock_owned_by_me((const struct sock *)msk); @@ -170,8 +144,7 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) return 0; } =20 - mptcp_sched_data_init(msk, true, &data); - msk->sched->get_subflow(msk, &data); - - return 0; + data->reinject =3D true; + msk->sched->data_init(msk, data); + return msk->sched->get_subflow(msk, data); } --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60077.outbound.protection.outlook.com [40.107.6.77]) (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 20B6717CA for ; Wed, 12 Oct 2022 04:51:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AYnLoSb9scWExfT6HKczHnZ0wT2K7bx2dgBgN8Ot88TzLH6PCQjSjclxrILX56VCLMw2Dswtt/T5qqfO70WU7uDTtt32FnBdyb/VKYvswCXRPID+bcLI6AIpqrgyyoEwJleRIEy1gszevBrzk0TGLlMzFWLaXZGjvfFlDyR7taiB+LN8493Qz0DGU3MGFrzg+SAiZwwvgvgDc/ZBhbig00YozDBGQaEzPPXwMYwdeJWRwmdSyEkya2xsA7lPxKdYL76STPjWA+u/fcl2/MwrrbjxnlHXjE+Vx1e8zwuyXxOHo9bDzIwG0Rq2dhl5LghuG09EaeMzWCzrY/HtcnrUyQ== 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=6vAjbZn4WFWplMBDnrhrBd8HaVgEAkKqZBD4pJwNvkk=; b=A+KqsOcwWDgUprkbYdfcC5G14MUhws0BBCrFjOoRwbG20hA2M+v2BeGd0sxuNDSZzFB/1nQQ1u/eZeAigIAvj+iX/8NrW/eP3Ar6Rf8BOlGqpfKRcrfhyKMPOXSnC5l+OA0zCuoTnJlRQ124LjNbOA+l6GuECg3RMadq3b41qG9KTMMVua1gKUym9fw9DHPTvJoJY1sGLBq8ARA0dVmTlh9pF/2J2+fLSH+KJyMi5KADZkxWjFq8lq9byk3Ui6eP2VHf1oEMNUXFfKGaSIurRbD1DgI4ejeFMzjKlJ3RzUnugEBwa9ikA3cVvJM5hqnodEEYriRexPXMcfINzcjqGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6vAjbZn4WFWplMBDnrhrBd8HaVgEAkKqZBD4pJwNvkk=; b=4yknukbTrkn+2r3W7d369vWRdcMrjBB1V0YYtQLfymEDpjjGW1UqOAYeLnbMHuboTrD4AH9AuCUHcO4uXBSF26F3Kr20AVRyWMLgGtPvr84nspGao5vWZdfwmxkk2gIGO5nx5z3/qIRMzBO9JRXP3yAXTXwGsTvrvZr2W5R0iQ9fdVyfkzUqTxxJb8Zum8nm94zPhlVzKFTnQ/zvnESjxMY0QGgeR4DWmzBtLc1glz5t1fI6qtuqmnEbuXKUCv0jXtavTlqqNZ+HhhkXX4YA848gLKFjWfMTAUdhbE9Weps9xiB4z2F7IxrsUOvdpWDqz7fpOf60GLa2dxXC818FjA== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 03/16] Squash to "mptcp: simplify push_pending" Date: Wed, 12 Oct 2022 12:50:24 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0205.apcprd06.prod.outlook.com (2603:1096:4:68::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: f27e0a91-d735-4952-4273-08daac0d5e0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AxrZpTwoBT45hsGu5fjO2wPysUoW6+/6x/c+rHUrGKLr8v1LD+jPANziOskqlc2HW6NbSih+Nsd/t00K5vN51XE7puoVjv9D6TJnthGhK/ThorgU8/enFivDMRRANSYq1dSSiMUX3b07o0VSnoKwnNo2e21/v09h5xSIdNZUQnvIoylpO3fXiFEaAfmUopKmy1XIItDcDZyLofl2KfGop+ZRhcZ8XAwl8IiXLy68oHKKQll77/0y/GapZZfpo22/tNX9+uBD4smHD7tigiPuMmNmPnUp3uL9kO49r+yorXtPrpNu6SAIgoWMU3xk1xLXA8bQHQirTMk4IS7P9xCyf8SeBPGEmXstqjdFwsHvbejANriIdnjwnj7eKzstbhczXy1PAW9gB7jVMKbG0CmQPmuPXY++xI+TYEieGPZNBQqqnZgKZavB2J093RZNs/j45+NOx1aEdFaekSQZ7S3AsHROZwfx+H9P+C8qdlvLtcLwswsTeloSmdapA66DbVR1bPLKBVTemv5Fy+ZI1YfjvzjRnm+m6ScdN+CePhDfg14NNAxeMwoN4pwkTKI8O8x7plRPEfzB0U+6ELKRM6fDuWlIglYyFJ03z0LKPso0dQNRgOoW0e06gsnOJW1R/1x46EoRS+ev0VtL3OzS7v3ESh/B6r0vJ7s34VVfxzyAYiZtVuJNQPiayuysvC3F4uy67fzk6C9U09sOwWrqfRzwR5jX9s44iHz4cVjuaM3B70rSJnvVYE4t1pjyxhRFLuYQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0Plfp9ruq5PBGcR+K/blQkEtKjXLlr7dDRlhQ+IehF+qWCIo+OdV43e+SWj5?= =?us-ascii?Q?/QWvQ6o+m1IP+nt0fYCwxp87rWFKj4R5g24/lWOqX8cFnbzHT8NjVlyrJOI7?= =?us-ascii?Q?KfQBvrodY6sROfHGetjN1mvqwZVQsHDr1gH03ZNJIUCRGvkFWMXXf22F2Bj4?= =?us-ascii?Q?NQHFQp/UQV1xHe5kXsqU6tQobzAYeSZCkjPUDx4RJMXFFBWEroZVvlYgdOD7?= =?us-ascii?Q?ETl4tvaHy8et4ovqw2VYhlJp+YcVIxqctntqrjEp5w6FMiFo8WZZuGfSUgIN?= =?us-ascii?Q?H8cQSqpuND6Zi4c1qptXWyoNZtjJ29iZpFOnoNq/edr3zEstKNrwLmH/j8iN?= =?us-ascii?Q?ZtcOz8zavH1ZGghXoMj0D9rqattbv2S6pLkFuul3LgOBMjsxF2s9J3OKAgmF?= =?us-ascii?Q?+yGnfs544Lo+26FKiaklCvMFcV72j4LofE/ECFc1XoTUjHGSMGhs5EFA8VEB?= =?us-ascii?Q?cnn+vndLsn4mQeZ020nG9ZRo0ldNCf1Qj1zDNE81teCZV3/ebKON0Z50wnAX?= =?us-ascii?Q?m7sIyf64QxCE0T+HCBlcRcfGO7Kq7/ESVNmqEFOYdFZqdF9Zuq/LLJwr/IVi?= =?us-ascii?Q?9SMenmZQHWIjWCoZzpuSW8l1EFViq23iDgRRWVumGb/vpV7fTRPbOdf8mG4m?= =?us-ascii?Q?6nFFsqlNPfTzkwq+pVBiIRpFCcHsiws6ZCAOWz0/RcnniOJRY1IJKL6d8Vnz?= =?us-ascii?Q?8eUU8LiM/kRgSfr04kiA8nXwLSuK7hnmDEKwNLS/Fe5Wg9siqqdNIZQ46U9O?= =?us-ascii?Q?9AYRcN7CHcRL1eyfE2l1GpuHckZCPxSTH07GkXYBZYdHKENIYN1lLJeSZrLD?= =?us-ascii?Q?nTlRxHeoXOU9V8970/GDlplumESOW6Ueqr2cPCI+Pimn1AGyE0RMwzPUoQ1E?= =?us-ascii?Q?l0Z8mT4t4vQ3ht0pZIPGviXe+NNQ8THmsf3D0izE/5931H/n+SMnfg/knAqE?= =?us-ascii?Q?MC/eFdWC5+AQuJLWLWCYABv/cknmfv9w4K2C1y470oOrYU8glY4ujRQ0Vnyu?= =?us-ascii?Q?HVzyH6WhADGHztxfOJJkpknk0vRYvNoahSMyyeEopmjKpaUHP5guMZw67suT?= =?us-ascii?Q?3K6Wm6nzMKHA5UpW8swinInZMC9otVY5psXt3DAsQgr8s+GoWRGcSOAUJIbe?= =?us-ascii?Q?7u6pTazb+xcZsvrbfrGX0AOXCplVdPIGdrXQK9YdpQBj+mGnL8nlkePxhoRa?= =?us-ascii?Q?Ez5i3Q3/27Rx3KLn7HaGQwwclUyhlTjcb48eJWQ+SBjMb/dOMfbQn4Eh+sRy?= =?us-ascii?Q?RsynT8FEFliKL247DwhOIufwmBVSu1IpYDbH33xgVWFpB6JXPUoeCMmbJrNQ?= =?us-ascii?Q?Xu/Nh1tR2BWSMDObI9RRAYWi1jnUK6XyFqBUteFsg08+JXKPk1hrOS/yoeY/?= =?us-ascii?Q?KWKSzsxVafgdnFp9ikbdUkk6bTL5prwk4Cw11VvBzUAuYf8ShjOiBkOtASa9?= =?us-ascii?Q?1KgqqAe/6Y+yv594l7gBugUIE4pAWhEAqHi1Bn9VAynb19Z6a0z+Ho0mSxw3?= =?us-ascii?Q?3PC1eyn8vuEhfEA2QHOEyA8ZLsqXU+jM0ys3IJcThGRxmoP1BnMISkFYOMJr?= =?us-ascii?Q?YIS9Br1BGLsXj3lQxWBHmvmdZIMQlUY7/i//wFOUMowfSpo7UNeqKuK7UVy7?= =?us-ascii?Q?aw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f27e0a91-d735-4952-4273-08daac0d5e0d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:04.0232 (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: wCrX2XPpAp4G5KbKv5MLAjYL1Ct+sHhhjcsYn53b8XAqfquI7S6XLBP6uBln1JfLIOqfmlDwg6iGnto5npII2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Add a parameter data for __subflow_push_pending. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5ddceeb1d334..2cd8e18d917c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1512,7 +1512,8 @@ void mptcp_check_and_set_pending(struct sock *sk) } =20 static int __subflow_push_pending(struct sock *sk, struct sock *ssk, - struct mptcp_sendmsg_info *info) + struct mptcp_sendmsg_info *info, + struct mptcp_sched_data *data) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_data_frag *dfrag; @@ -1561,6 +1562,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, void __mptcp_push_pending(struct sock *sk, unsigned int flags) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_sched_data data; int ret =3D 0; =20 again: @@ -1575,7 +1577,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 lock_sock(ssk); - ret =3D __subflow_push_pending(sk, ssk, &info); + ret =3D __subflow_push_pending(sk, ssk, &info, &data); release_sock(ssk); =20 if (ret <=3D 0) { --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60074.outbound.protection.outlook.com [40.107.6.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E20017CA for ; Wed, 12 Oct 2022 04:51:13 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lLX/xNwB/xPG9ryVoSMupcmavk3KTF55h/Ikq0LKgkpqklXTDKc6Ys4qpPYmeOyCCzmDiFsQgGUIJiGMwNMMSHpfN6H6EjfeOwLK0nk6eVZABqgRq7oslDeMekq+5GU1+LdSoeAikjmPGeBfvNJy2aFtDe+m8/wb24NrfXOzYD/Js5Fcx/nwyNYTlwrey9lw8KIaafo0ZdS+X042yulEiMkQknNePpAnByjC62NPcS4fLttYJJ72bxmg4RYBjKTHfIy+tCmI0t4yRvVn6kr7NLg+BO9ETl4hrnGnI62EXRo4td2tv1GgJabj97xyHD9kDXRqlDiP860C4zZKspbBwQ== 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=R7SG65Ugoq7xWqzXfFPyxFOhGYbg+VUMD9POr5c93k8=; b=K8nj5A63BhDPYfxlv2GVm/xhE4UzP01NklEY63n8B+CapySbbqlfcV7Cwg0rX8Z54X8AjJO3jKlrKy+KqXBKgN05bjT7+hX6AuMDjma8K5a5JOkkk8WKAQe5DjyXltP7EYnuYlj8KFLmRvu3kw8UZx18HvFNAYozLvuQFizN+DNA/ZfQKYin6obfYP28LVH6mah23Db7KhaDlAwFEv5eHnZWPGPieRVZ8536FV7u2Z9Lc22Ta4jc448fBjF7YBeOCSK7J4j4T4rTXNYgmvgIvDMyA5FuBwF4LPzczKDlLgDbRzcAe3btF47MlmLnz3k2/rd+pZbSqwW6G0M/96dksA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R7SG65Ugoq7xWqzXfFPyxFOhGYbg+VUMD9POr5c93k8=; b=zdYamHuv50zu/9PXK5fvZRIvTY+hpUSAWMbHkZamIN0lGzeIobYBQtldWx2CoKEmdhVgvoJNbIF0B7dasr7Wz8AYZGlYpj4avE1FQtIixmQMJV4s2RXhAazzYPner+j/83sSwbBRHC1w5eLSHktyiqVbCkv2OpU3rSNC4nKX3t8T1u1P66zjN4ceFs4WR0PGYNrASXksWjNFq1WywnPU6gcU0SYby5F/8aUSdq7bOvkH95d6/k2huViiSjoJrEGvPUA9dSDglWnZ4IB1+7IMxa0pQ1w1epCECiDPie3G710Ns7BiPFdSpJgcL6V/LLu92I3rOPP6hL6p5bKZKTlTtA== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 04/16] Squash to "mptcp: multi subflows push_pending" Date: Wed, 12 Oct 2022 12:50:25 +0800 Message-Id: <24c4007e75f86c1a69d275733a4a1057bc62615e.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0214.apcprd06.prod.outlook.com (2603:1096:4:68::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 58eab1ab-fad4-4aa7-d5dc-08daac0d6223 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Od2aHEpjw9HsA0ChNkcHzqchSwnDTtNHUwGwbsJc0+yEiKu78QJAtJZPG7RcvpaTiG2RKDHBl5vS9xZ4mHeb/4E0KasORIR6kBGtoHB+IXK6/AOacJM02jdWlg8ovkDKGT+WBc4ougc3IoORnS+VCt9l6yIniDe4vr7R8uYk9ThSK1CvJLIYckiAB/57xE19XRwz5JvcAcgirKkeQ3d6qCcH+et2+crQZfdTRGzTCuyaZFLQNyAMN13wZUDbJyfKpxTYhmBTZI03LgH8GVXq+ZKZ2tJG4jwCXQ1MnsXAuWpFXy9wERvG3HsYXgdJiZv8ahUPgWecvw8JSEeripG7wZDBHPs9/J4dg5vCHDtu1G51sUc/kD7+MuZKMjLoe6GHhdiwfLOutqFRXWiTqoyJrAqa8QbDYInqMgpyuKAWril3mnSaL0r/PfrhOy9lM9MUpjtCiopVc2LuwMHmgDSnTnNy3E0kdJ1Zi9+tpms+MnZrLHNvBvaWI4Z7I4oqT90qUaxSPCRLWs7zwLI4ray4NgoHh3QINMsmBmp2LSrLeOU5Ntrkp36jEHA0vz2mPhBrHisXp3fF02FDhNRZNZDsDBkm64Vc/d/qrRAPPAzDv7RwayUTWJWu3iT8+xMmGLOihIIrVI2TXNlRnHY5xYutA/stbQjeZ7I6E05uQC2xFxWzgpVu0huujjkDp8S3LGAUFcdoFkHr7XFfIWIuP+IZ4s8lJ8JIcktDZKoNBTPirgs6R+rtnLjQUjcI4P4xcReg X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(4744005)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7H7LQc15y7xYaq5LwGuROtqzdt/hbEpnYgLa/FxJro4aiT3YPFJJEYhB+Jtx?= =?us-ascii?Q?sQzkFl2RwWldtm6qIJ88ZBLH5QP8C3B8Y/Tf2HOT9/oKJbiDXn/DqNVvBNa2?= =?us-ascii?Q?icp1wLR35EWa04bAle/Dq4dWQatKmaubfQ0jaF5vzhAPiWm2HCeDyef51kM5?= =?us-ascii?Q?ddq5ybtkxhz5E7vyYh8S2Ydlx9pgBPfSybb+SvCsTnUAD+XvpPqH2sAv53KM?= =?us-ascii?Q?LrCpeT2KroP9STujjdetPx3iRLM3o1gbjnAvMT24Gd802Z6idpASw37lFhcA?= =?us-ascii?Q?0VNO8wPNtQzxI9WArirL0M/Fx/yzbS+SfnoU08drLyAj+gK+YQjhVNKeYLxS?= =?us-ascii?Q?vrGwRzcDxwGQ1DD72ebGv6YoHOsNiq+QMezUnDom3HBJ0mgg1NW4jMBZHxqd?= =?us-ascii?Q?WfqOIRZObymau8mhkhekmCekWqrf5mgTy8c++jYdxCrKUrP27XZGEGyKCgIS?= =?us-ascii?Q?cXfpYiSMpDRPzvZoV3MhBkJWZrbHA8O6vWAEL5eSvDGc9ZbpFxp+bF+KT6YB?= =?us-ascii?Q?jmik4rXdtQ2WoLZ8RJvR290t/qx0eWEJg6341BGW0/U7kr/lMXEW6lYpHz8c?= =?us-ascii?Q?rICE65/iQodXEFLCno3VEAlYPy1We16rsuMUbP6sswmyNyQLAqSoQNeZ6SVk?= =?us-ascii?Q?ePBjGkAIBaUKBM1uzLJreYVdeMAawhAsh9oWz2XoaUI5TiQbR3n3pRl3+Pce?= =?us-ascii?Q?jVWyTxB7pgg1MBfQNzuTqbpLBh2YmIAC92KAGRu85SQhswl8ym/cSXTUQsGA?= =?us-ascii?Q?Ut6nJTlfDkA++1kZIkt0focjPU/9giRYzjUDK2ctnqnOX6S4680z9x+8WJ+a?= =?us-ascii?Q?Ou3w4GlU7YOUCXFDNFAbpKcJl0W6Hhh3v13PDniGsSXvh0sGjwp55/QqLpFC?= =?us-ascii?Q?6anJ/zzpdrOU2DFuh2BDWg0gMG7/OGQPjaaG9mhHcalYfrRQbfsc8eNTGmN8?= =?us-ascii?Q?PLtlqMEiutAeCeO9a2vLrH6ImJuQw8Cq5jJh2HM8MFUtgYi/8al26QU8SUNn?= =?us-ascii?Q?ISeZBcYJ0CoCJoDGBdu/KsUfrxL8gbYGGPB/mhCvcNmquOf4L6q0Iq4nXa4K?= =?us-ascii?Q?NSGIQ5ZnfFdDgMzGppkiWvTX0eUSybwpuhVYMx7poT0S88BNW2wWijZcWcf9?= =?us-ascii?Q?0eLKmBG4X1yWYMMDWt/NLv6ZMQu4S/2ApLPdbByaC9NGrl3jyLfOu/bjgDfO?= =?us-ascii?Q?NfArX9XxQBKzwayw3ofjTOlE6N0M8ZQ2JNSY2tP7bMmWtknuPkGgBnGAZYLx?= =?us-ascii?Q?acbyQ/r5nusUlis7Jnbku82d3D5Z2Q8jhBekQv6/obabU6azJfy9KgFeffVu?= =?us-ascii?Q?NzpIU9so2WhfoawMHAtdeUCKfUxpqqFlgEDmdaNAZ0dEKMcTqktHu0u3j5mx?= =?us-ascii?Q?P4mijAEylIqvFMkdf1IQHnkDAf0PQYl0HxF2l5zAfbGrbf6Yzel0AnKTVTOy?= =?us-ascii?Q?W5tsPBrFGlFbC7hnj421i5neuKhW08q/F2mFjy44TcoZeO2MGCqWulcVTxYa?= =?us-ascii?Q?0NXEV98cLXnu44x5hJ60U+VtqJHjyU3iijBLrV7dsbt4mhrepmQPwAxZTRXx?= =?us-ascii?Q?o3DX19qsccH2NOJHdmmOKGdZzfOWCOe36Vj/qMvoQIv+Ke9YP8OYm5DAZw+L?= =?us-ascii?Q?Dg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58eab1ab-fad4-4aa7-d5dc-08daac0d6223 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:10.8508 (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: XkP7JDGYvHSq8r5fTR5cf80tf6pcdpaT6TszJV3J5hEHcpNKeAs47P+YUeCUX5JuHVlOn1SR9JhyixeUKmazUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Pass data to mptcp_sched_get_send. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2cd8e18d917c..694c07855be9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1566,7 +1566,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) int ret =3D 0; =20 again: - while (mptcp_send_head(sk) && !mptcp_sched_get_send(msk)) { + while (mptcp_send_head(sk) && !mptcp_sched_get_send(msk, &data)) { struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .flags =3D flags, --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60084.outbound.protection.outlook.com [40.107.6.84]) (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 C458017CA for ; Wed, 12 Oct 2022 04:51:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EBy7i49LYaYXCDxrGCZTkJHwVrlcqeAfBJ/LR3NU48Wf9MOxvfNhRejs5fsUSRiX+pwSG3HgRfsuypnDEa9OZv4CHlXBkWl1G3yBEpCaGFNRLLhtnmoMRowQ0OEHNTX50uLiuPN2Ou34DxbcrrYTkqI/YTz638ST2sibruXo+sIdN86yIYUW0nqnUMpiigKj2yYkZM72eqktgcrlGNPIJdCy3V8FQdZVa4b8RU0k8ZwPom1BQCt6YiovUZDFJLeFFHr6nMqslWWQUmESYxyWoSIHNVl8FrqGrxI7es3cG7feUqKQ6l06cJ8cKWC2RlSYZQdkldJiqrhtBOyl9cW9Fw== 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=wxZgkUIdqGdN3WykiFqN0t7incaZ0AXJQmvF15SxBn8=; b=npPkfULDRhmkZ0S5bsy//SlIEcjFq6sFC0Umrf1pzhr6JwiI+CUqRlUYraM+rM7CB+cE28sAcKYQ1YhQn/f6KHrEx8PaO4f/bYOJsJcUcvCAmDKHST4ogoz9ZuOpGPJCxKHdvQef7x/LxCRKxXHc2rq1fH7TWM5SAQXw32zVF+2o4bzPIh0Jiz5C1TQWOML0OAYCZBBpdxBRqji4Rfn4lg7hHrxmg/YhOjSLagGjlsX90YC81NfG8EluvsRubtwtGGEa/t4bYCNYKsafT3Z5crQVUqm5jUlZ7FVQ7Alni0BDGjngC2kPEx52Q9EBWbbbOY5FsvLO8UiHf4EXK/yPOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wxZgkUIdqGdN3WykiFqN0t7incaZ0AXJQmvF15SxBn8=; b=PzJcgXsBDScYDpMeJZ7aWGsphQ16CbQgPRBR1a7wtRBEdQoTXcYIpDcx0n72tmEajd4WXNugFVTsW8gD7vtI4Pmq17u/+ROviG+qfNkH+oB+6zLqiSsRoOewSQz8mj5c1195vIpw2PnEfkRjtizmQC3WrV6ORcy/ok6+xzTBJ8bbuCyPKhi9kWKAl9mfQv9C/ewQtHKlPKN8x6Awaq/C4mzLMLQ8tdEVBxB6tdodpnwG2tpBHmsqgkrwihdY6tR0F0ayFwKC1y7gPFaYmiPocE7OzjcIVoYIEi1nNNmukHVvxai+HXgn4QTIzYLh9XgXG3asLWZE2OPSc5RT0mm4EQ== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 05/16] Squash to "mptcp: simplify subflow_push_pending" Date: Wed, 12 Oct 2022 12:50:26 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 83ac1935-d3d9-426e-1b54-08daac0d662c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bLOsmz8EjqTnedEx7h0RqdtxHbZAFiNgOv/AnYEwYNuiMjDt8genXhMSHk3VwdlN1TGmQrZdHb1Kmwcyv6kzhat/5cR7J3KtS+Jgz1DQbR6cs7MhLEpfAaC8UDtSSb/nhHziBf+a2ErCJmNrcpgZhehUfMgjq5On3BOgTkv2AY0LSo67amawb0rVkbDBEy84cpcVFhkUisTqFKIMIPAkbmlXD8kgL+uabHdFAN7jXhqPNwppViuUUnq59SBqeu6NwBNEz5DEzfDP5p/fMQQDDXN0/D3AHEO1LJPYfolElD+KnH5mU75GsABlY8shYsirEs0h2A9cENuEyzUkdtrpIgdEr+YRs+2t3Es+YRor0pzLF1l5pwM+2nXtr0nvcKbYQJQpt5vO+fd+zN6Zv7+pM8D/QhesGAmR0H590e9yubEvpO0gL88KCKQ8dnSV8m0V0McHXsYtGRG5SA0OyHAgFSJl6Ccf51+TEl/oCrU3LT9X7vpAbF/tGV76CUmPkMHUbAqyAOg0dqkbOupO10nPKNYSPkgTxAYPRTz6AWI18TJDxuGauJSdoJ/DIa5yq0X23GN2t6OqxkltadTU+3tiYjzrNgzh7Ttuk596C4SpNsNU24PLFCNoSuXbmjmdvMVa38x8OatZPH8TwSQ3PnrqCjn4qaOEDvy+jmaDbT+9QUrROHl35tzlyFwa9ITLWp7uoVOFLC/fjWcORMU8h0JBA53ieFJbJ0to5EL4B9URY9MxrvkOCq3eEb5pWPJ+X3tY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(4744005)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WQ7CN5TM7kxusMCe+ZuKPuWOVzEVbz9kGkfkm4S0H1Y2T7VOeKTaelu/kPrm?= =?us-ascii?Q?DPl1L1aLOZt9sShWk6L6TSnl0X+0pLsAa4d+eXoc7foi1bJKLi8CYaq9dNaK?= =?us-ascii?Q?+HsCHNFskvqoXac30ZeAuqHa2GQuakZFfOyy+Vn/769w9bP3AS+ChW8AVzUL?= =?us-ascii?Q?FSgEfRc0r649h/xKSwjvj7evqtxIrF4RKqSk1bOfoemq5IwODv929LArWh1o?= =?us-ascii?Q?U+6oOxWm7BtFo96sy12dWGvfcPXF5Z9xj4B5tVWqsEM0IvkrfiGWXIoVaz/B?= =?us-ascii?Q?7E7U9SZMDSQW1naBRvJccdDRxLwiDu0A1Ab9Bp0dsoTwYn/rQRoln3dYYalo?= =?us-ascii?Q?rv1lxm1E69Mh7d+E9MvLMCbNuvMe1RdPF0PCTb9pbSNAdnVuPMIsi+Y8XWIb?= =?us-ascii?Q?rEGWFvdjxK+2n4ziiFTWyo0GT2OKqIQYGiQQva0yZdVugUf0ol/cn6UYiNK+?= =?us-ascii?Q?rj79l8PEZKIjvfHdzq6zcNRT6/6bRG1kS4hUMvA1yOdpkdTlu3jBV6lLfN7W?= =?us-ascii?Q?K2xgyAfGVc+5eoQFttQkxpJABcjltoUu+uImZH+KIhW50Pi53Puw1hxOBv99?= =?us-ascii?Q?2g3hSa3OH6bsmY+SO+RV7n7L0dH4HvFpgBFVqUK4OWbWlAOaSNg4FntDNJ3A?= =?us-ascii?Q?A2y9Raa3ivUxUJn9qVcMVF7X0CBjRc3rX7aPqIkPc8v6mTmlwen42Pu3coiZ?= =?us-ascii?Q?Ex9nOHmaYPs4w+6vQedTisbd/XL5KIenIHRLJKWCIMMnhbz5mo75XeBHMg+/?= =?us-ascii?Q?CXXAEs6IcRxlYo4Hau/Yxp22e70WRx0vaf7B/GnSJTeZWVbqgrsVP8IHHITf?= =?us-ascii?Q?hncEO1EzUm9hQnSrPW4hNOK/WrSnM8iuPdyyB4aF7Q9mSpj02W4rhBgPiKry?= =?us-ascii?Q?VpAH8txMBSJCXHV6B1xvzJ9kQHMWPwT9LexeTI/WH5a2HQFaFhCXbIpaOXfS?= =?us-ascii?Q?dtJEdzjsiPjIXBPGF1472jhFmtUMYRJkaiMgUP+5eWbMBFL2SSRq6VCFZ/Wt?= =?us-ascii?Q?rQmDAoQoueCG8o0vw4tsr9D29erQefoG/9cvdfnropZSiSzDYZwT0ohQOYEy?= =?us-ascii?Q?JeByR4cwrxuGFSxXGfnOWAfKr7ANYX/AYimkUBzCvRq2cRp1K5dM0VQ3Gwkf?= =?us-ascii?Q?/hM375A9asND9XvspPdcPfCUG4bBVHRio/KIziQpqDhpbizoVzlyZvysLOC5?= =?us-ascii?Q?osYdM/ZmwFSTJdjb6dCW9j/jomWcN0PDEWl1EO7IV8U22CCGtDn4PpzMbpEw?= =?us-ascii?Q?F5oywDm4KOD3ydvBEAWDXSnQf+xKKTIGQRF5rFApsnz6C6WL0dcdqFyA0sLe?= =?us-ascii?Q?4O5rW2FAcw/XZdHPw7v6HD1sYvCBZJKTkKzqQ6NMOBZrmPYkdsz1PgYVZkXT?= =?us-ascii?Q?ynqEzV6/vG93BRlpRR9rhs3Syq51F5dliKrGWfM3snEHL/USs5yh/bTWsSRf?= =?us-ascii?Q?E+drr1HFxQI1d8mtUWFYxkNh0mDE4I/HbS6laT/fomsSAz47pjnEkg0RNm/M?= =?us-ascii?Q?ok/qXghpGuAL+KRI/AIA3FetTgSOzF3S20nXtOcqiwO4Dv/A0ywTZ5hlB7ad?= =?us-ascii?Q?MXpAmWjerJT9lgZ2M14zDotLDTeImsxyCQ0CzUGuAW3czzKqeZ5BbZ5BNezD?= =?us-ascii?Q?uQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83ac1935-d3d9-426e-1b54-08daac0d662c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:17.6315 (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: XPd2Bx86/y4yt+fEfP9OFd89JNpShp0sreDHBKDbBcn4I8hygDP96ssN57X1yIvEGh2w9tO71AU2k+Tl1niMfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Pass data to __subflow_push_pending. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 694c07855be9..0f062bf63447 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1606,6 +1606,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; + struct mptcp_sched_data data; int ret =3D 0; =20 info.flags =3D 0; @@ -1615,7 +1616,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, * spooling the first chunk of data */ if (first) { - ret =3D __subflow_push_pending(sk, ssk, &info); + ret =3D __subflow_push_pending(sk, ssk, &info, &data); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) goto again; --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60049.outbound.protection.outlook.com [40.107.6.49]) (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 49FD717CA for ; Wed, 12 Oct 2022 04:51:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eZ1YnMVIVEGOMfIqlf9wQF+g/b352PDCQpm03GC+nCvI7KXnd3BM/0xJtsBBFbaUOx7sN33dBzbdvxd/LXGYfJZurZeFUHKvsq8BZ+MIH0AMtt2QLEX4ZZ9Pim45o0ij4WJqK3DLtQsUeg+PgmPxs8kX+kNYrvOfxayMkVAH9oZBKXnZ83zPIRUtvYeDulo022MW/5hktEEazMwILIs5NtRDpEbyEbr/xfbv1n6csY6DocVYXPtCNiCgeW7kWK4Z1Y24FMYd0injAqzWNJqitVMzX/JZ+vuwYVXFRM12MrNmb6c95cMBXuvvI8FRxW1VGqlWKnKprgMfKObgGiieVw== 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=Rk2oVjLR6lQaEru+Kd2FoVg60IhV7Wx4P2acJ+dPX+g=; b=SluNYgWupXZaYjP+OtnMzliNH2DWJcl3sIG3fYPBb4SWLamxmsks2lra+wN/thhe3Cf/yNRfcT/bbYZ67/h9EX1MOWL8tCAPb2tVX9vWxjBWenZdwQhFfQTRr7GXB3MsdOq8OHgREB91dxNeznVE7X0HcB4YzJzpGw4kTyWPcj1b9zWFZj2Gm+rTmRi7mTHsSWgpajSBnK8qunto7mYrm7vHeVi9AzFZYHvaH9OJh7gASApw6moUev02QVFh8ih6pYVlNjYF8N1hr/AUWJpwLmvFaaBHM0Bcm6mjHYnC2q6iECfatjSJXAnGYPe2OEg6nEm/9Mbx4ct6MfT2/NnDfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rk2oVjLR6lQaEru+Kd2FoVg60IhV7Wx4P2acJ+dPX+g=; b=20esau6PzojWmUrcpb57+4aSirGjl3dbxJMvEj65edV05LckqEqz2sR/Wwax5JhT5VvsfeQ6R79jgWatNpE/z5ZkPe6aADuyCVAsa8E298Lt/85fmClfT7rdc0HNY5FhChq4B5MOKjEx7eyZ9w2sQ0QhzNoUD38FVtdt6pWhm3NzNI6fO9MK7vrHYTmjE5gsopx6dIngeCCV33oosYCRGCDEILvuXDQe/8vQpIw4dqFo31lXayoUHhZ35s3bfSV41p00MFtAJCm07SbGRWPYEcDVD5s6wQDxNoobcMjD/6+VQM1R6JvJ1Aa9lf/zcuOLjB5+o1BtKcIi08rAtQwhhA== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:24 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 06/16] Squash to "mptcp: multi subflows subflow_push_pending" Date: Wed, 12 Oct 2022 12:50:27 +0800 Message-Id: <81ddbbc2faf43e74d85c35209550874bba48c9ed.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0041.apcprd02.prod.outlook.com (2603:1096:3:18::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b33dbb8-0a6b-4cd3-008a-08daac0d6a13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rRj30hKXFNLRCn6x6XERJ7GXBx8XloxrHwQlldfYkLTyuDt7v0S3VpHvcau/xAYUBjnUi9lROZBR+9F5VRPSrb+qpW910G4DtDcl/tl1SVcQVqqB+26Nhi14Azqr5N4+reWESI4vDUY6LAxfRENB55VPwTAHsgemjONJeoMCjY2kV2gWGmue6fDTuHQ+FTGHgjJlGLbpu1286Obaxgi0WsrhFm5g8E2bf3F2YKe1lD6nsKWTeT5O4ylImS1ShLJS3Mn//CiJCav2aUIjRTe8hjASi6hiL2ryRjhirSW6RS19W72fI0O0aSM0vPofGp5zap7vYLR6P6VtpWjxOUKWXoIYHKDglv0Vfg1DmPxq4KhS9OjDx5h+1qS8ADiRX4U1YLLfZvriT0lxYM5AQj/ckiJZQNNaduv/WqQIEPHHLKUeKglbOHfrVz9XQYy1ULqQ/d6chFDAV1dYnpyhCiLFaHSHyDDWRZv5OUJ63thjXv+OC+lFy1SCogLvmd992f7EAa9nIxgHaJxj+qiyjvgPT7xoipGcBDfOzP77IPANBCc2TluUaRkgxCrws9fnBFpbewpq43c1jnG4ppMrp/aQO8kXotAw8OXqcfbTdyFLba3a9FveYaK/2MpmvNegvG4pOG9RaZ56ULoAhDf7tRxhXePrrySd/YCeFyEpi8xfeSzBIjhfDLaYcyIrmiAVoCjC+7yM+CB7GcTVo/MaHXazi0b39G0bIeeqfda6cOjS6GJn8nAkkrJ4Ws9tiacWinJB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(4744005)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6uV0lPRx7u9hgViMCDMyhbQcU/1IoLqqYJIS9ea8vknrwEJTSfuahP9HNJNj?= =?us-ascii?Q?e+i7o5FxPglM7YnfI8SADwwzO/dGiwOUxtjFMkOjvRrihixuXZNF89BRn21x?= =?us-ascii?Q?sE3cSN7W0Nzs4VNNlITVv3QNRuh0hg/3SlvGdggkZ/6wPlPU5CQ+6OWjIOu3?= =?us-ascii?Q?nAr/89Am9YHjCugqFBOCqzzx9UQ6qUHyUifaIJ6WUqtEWdTi4BuZ8woQsaqn?= =?us-ascii?Q?YdhqOp9CrwOo3nnYG60ktg4n3PPSJZmc7H095ZLhKPMyvPkO6EO7TcnZU1Y+?= =?us-ascii?Q?X6MV8YtlLkbjtQOfP3E1AYqSnz2pXS6oeU1I8X/P1YCwmSNu5fyIwZAMx2jA?= =?us-ascii?Q?qd27rho5k/KgQAAnRMyC7dpNmCC8e4fLTyu/TPiyqyDkF5QdCYTeC8WzC1F1?= =?us-ascii?Q?1uYClNVB+tdB2L2Y+XOd+zZr1EAH6++urk9OVuWvVjeRvgmtPpFK9KW4C6g6?= =?us-ascii?Q?aG6Muek4GumXmOl/HIfGGIt4orbnZ4DOJnPgUWPQWyauycAa7Enmk0dMf2rr?= =?us-ascii?Q?7g06ZVzIXiL+8MiQvFxSgy4HRjZTGwIaqe41bOA3MFic4REPiKJsOkvSbqZN?= =?us-ascii?Q?XRhBAjft9CXSn40SUvewXfnWngwO8xolJpYBcV26JXIkQZzKNR2/ACh+bUCO?= =?us-ascii?Q?fETW3Ofx+jc9CMEI2KnYtpUiXsgt7hKs3yYXndOvWBUWNOsTygxCfk9XbrlM?= =?us-ascii?Q?0ZGPAHmx7nfDkZZPDy4GMvslrTk4dziZV4Rs1LVTCuaMXiIuI1OTTnKeGIZ4?= =?us-ascii?Q?hnW5u6BIW/q77rcDxgEw5cAiw8AitUVVII9bvdeetyFTZd7bhTaCzhFQxuwg?= =?us-ascii?Q?JoNvdKzZmTYkYc7lFqwObuQvfV+lsaCRnQDWUknyF1SdjxWeQcOnv9pLjeGD?= =?us-ascii?Q?hm+EEHffJZ/K0lYLW/3/piCZkkeyfrz5nV2q60V7ikq4fo0tX4c+0O6/8P06?= =?us-ascii?Q?rxphPBDbPZCt6j1HMWTgsw4xZFzDJN+qfoGBprLkdxA6eS1OYQTeMVc+Jxly?= =?us-ascii?Q?2yVei6xPdALG9LpSjC1IRTXxknaPcBRtyntlLDOhG+8NzOeNb9ojJ1d+u7h6?= =?us-ascii?Q?O7/tV3BkLrGIo72o9cCXs8DBED0lSS/YbvgfqvdBwIGelk+xdWi+AE46U/aa?= =?us-ascii?Q?PQP81XF289A6mLvIYXOwTspkitES3mQYvoCLITsLxdiC/q7h2C61fu2KzO6L?= =?us-ascii?Q?BxERex4BAkK7jFhl8FXogMleOXNsq8XyM4TyV6A8XzR0waP89c5Yo8aTh9kv?= =?us-ascii?Q?zaNgJVKszXjrxcMCwVSmRTqOHby2nmGN4K8yEpUOJtTSqUTmH6RmMGpM4SDc?= =?us-ascii?Q?ZLY2m2DUCGcqWcF0xE0HmFKl7KwdgS4EsbUdzHBuxrwWSB6lau/g0Mr3xpNb?= =?us-ascii?Q?9XwsZNToDylj1sAvoeGvV33Wlrj4dHjWfDu6865WEbcKCtl7RYPj4j06po1e?= =?us-ascii?Q?Au3oRSc1zzl8cR4ela/oS59kkbqmjz1Ly/7NpebPhTQiev4en1gD6fvnnl89?= =?us-ascii?Q?jXBFuLBB+svzlqGaoP3K9a5QlhnSMSJse+dACo+rqeAXwdyTCdBhDxbLof07?= =?us-ascii?Q?GJVrsA52e4KdK8/c+yO4VGRv9UAdliAVz0ILSLSehWNabPdEV9SBqCraR2qS?= =?us-ascii?Q?XQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b33dbb8-0a6b-4cd3-008a-08daac0d6a13 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:24.1466 (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: N5WN0322K0S+CX2Yv1BCnmQx5Tou+NqWGV32P9I2Vy3i8UMWNZeDajubaln1SYedKB3V098P8eSm/ZYXlYLtGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Pass data to mptcp_sched_get_send and __subflow_push_pending. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0f062bf63447..18e439e180dd 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1626,7 +1626,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, continue; } =20 - if (mptcp_sched_get_send(msk)) + if (mptcp_sched_get_send(msk, &data)) goto out; =20 mptcp_for_each_subflow(msk, subflow) { @@ -1647,7 +1647,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, goto out; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); + ret =3D __subflow_push_pending(sk, ssk, &info, &data); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) goto again; --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60083.outbound.protection.outlook.com [40.107.6.83]) (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 38BEE17CA for ; Wed, 12 Oct 2022 04:51:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lqLAIxY0WAF7MO0LL8N8sWS6VAbIYAxF1xJN/ZvEgI37KhSMGkPh9KNvZehbV0rI71s8qkQeZVXcFCea2clco3UBHNimo+yafYGHtPbbzPmOhAKcAvdCR1i/6fpvmYDShya6fmr0pR8hXAEvGYPL4ffL02EkgEjZc07BfI7Yu9/uMJ9bbqwT7kGwCWJdwTXE2nihvMA84r5OJ/PozRxzuogCROqoCuHVQeiCyOmOe6N24WxfdrZb51mxhbbFIYOgfLxTsmgWrOvR9awjuI9qeJ4cXTwJ0w6H0t9OdC77ruZwrCaOmQVnlVemuyhLyC5uZAs2eSRTGVoG5rPRNrPphQ== 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=JBUSMUsPmrHQ8wzuAJd3VSUSQUxo56dkeKi0OG13yVA=; b=Z0Q23SW9w+/ihFFDgsB5GPGFKb/ZRwQ1m7uxjTZZ/bBP2Iwntq89eqgecM8wmDOHltq+opcwxo1EDi3gfsKYAWUW9gMk5VgDRKc5UPKVvtakXkRIMKaNurla9rsREUEms4i+5D7DBAjLg/LXlG2EY4y/VWFqtahDMnXU58WRmIWZKEtKXcOvDD5IqWBtqDbs5iBVDEyYHAgqZTEfeR7FLYwBc1e/g94T97C3PgpXTBMJqGPv2yel4WthFM4f8tyK6XvFHJ2FHi9f03luY0DKlXY6Y/4IuqiycbOMAua+2jJXWFXT8d60KBQYgK15Ggq4tJ3BLVAmFCaTdVbWYWxAXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JBUSMUsPmrHQ8wzuAJd3VSUSQUxo56dkeKi0OG13yVA=; b=sctjpuQzKQAz51auLH/nsQKxp8LbsQOlfv9w71FM5mrGAQ+u6lnhLGi5DQ/CW7fAHlJDiQSVjSxo6CcTID7XI3juPu2vmY3KP/TT7If2Zm3EyhCWWPdDJ7/JhqEhOQQFzc0KqysH8yyrNloLt8ulL9jc1aWWLFap01WEhM8xyNrgk2pNRzgL4H+/8JT3uW6THQ8sFKAXsIYUsoDyTn8+LpIA8qzQHZBEJl1rOP0FDvC4EyXE2rIN6+H30BBjeIbikhPHAuO17jOCr6CiLnIv0dZaKKLzbO0od+03XaXtdEeAAM4utiBy1nahF0FRNvuHaQ5k14nukBvAAe6HkmqOiA== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 07/16] Squash to "mptcp: multi subflows retrans support" Date: Wed, 12 Oct 2022 12:50:28 +0800 Message-Id: <1135e8ffb09bca2ea627b7f624fdd7b0578f8061.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::9) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 07f914ce-71eb-4abb-4e43-08daac0d6d9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vo3LPrFjx/vYRCznmRz2PtFicm3BNhB4h0TBwX1t+qUlOYeVLWGtSAQW0KJ09pxsvXtq2td8tRfC9FmfoRceErkQ1EdotEmcTMuxAACabRD7VoilOq+9AOHWpsS5wibCAPqErRp4UXwL4rDRJZ7AgwjIdQyTdOIc+Sl8/vZa+fAZDL72r6rQaC+CoGRzITq3KjxKPDOA9tsyRSSyPUwLWufXAu3IQcAV/6Xd02RBvpAIDuvpzydb4jCNY5/fe2mRom9HjjhLLoHRq6cHLOEZPH9DHJqrG12BjoaAijBAqYpQHkGgRA/sghUXVSh4BTPhzECQtzY53n/2AdyJumSRAzOQd7rQGmCcY4iJ+wEj5t05slahwcK+4GySe6vb19SglUt5KveL/BZAT8HWYljc4nNYvr67y+tW1kfU3XqWq3HlzvwV/Wz/mCNu68kBrgnBzquremGLjnawGZ1bR1UiVoRTrZ5Jl8auWMaaDYa3ATfqWgMDmdsAo36L7hTK30HYu7/rwvLBqFQs73s9FXd12/goyGv22tWyNG7bGQPi1LIJZWQIpX0AS4Ubbf8I25xM3+Wh7CrDFV1DMTLeJfKJEMJR5oeJRYm9yz3lyY8lTPG+vswJ/AjbgMvqJ0dfhMHcOf2pqvkopcfriX3C7R/Q/A/mW+3FyCPQsJLxxd3InVgUwSSk4yUbkGyTGS7GsJBqDij8l+JROVOBZKa5zxyUir0V2M2H2h6nWiF9JW0bpoSda6CQpU5pVmL9YS1Uy20c X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(4744005)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ghwIUnE2u0av4f2/31KwmtCq/z9RwkLp7VhkKs7KyF0jIJAJUkSSfyPLyium?= =?us-ascii?Q?irNaRG1U8M4UQyHemhEOfZoGMDS6Loj+8A625shM11OiJnxvl/mZkpZK+SIs?= =?us-ascii?Q?KnLdmPnaF0/sZhbB0jgdATaK2KzxJi9yAgwgC2enYvSLxu4mXStV7G1xtWO2?= =?us-ascii?Q?BplUg94H6gFIMLUvHjSwSJDUoIoayv7uEVoeO3LULnZiyYb0QjHn0RaEwz4B?= =?us-ascii?Q?tO6qDdTnehBp1VG3P0uEfZBcvP7Ro6TntylZYga0ZxyhNh1Ds7nU3pLhgmOS?= =?us-ascii?Q?RbNai2mbJdfQyzXMHN2q1PCW2CigiizijVMO0HTdMlgi0gA089eLxDYnuP2R?= =?us-ascii?Q?zJ2g3hVEQ9IR/cFGGt4GmgXZV/uK/3xEHn4O8Lq8qHLVLsE3KQlWCHf/jI/t?= =?us-ascii?Q?KYJZT74kbhHCzHmm6ejZ0CcE4nl1fVOutH4xlDKlBlO8+czHntc8di/u+SRV?= =?us-ascii?Q?vzaha/p7vndybj9zh2PKMzfT1R7leq+/xhTPvfmtwcIJDSOc4XAV4xScCrw3?= =?us-ascii?Q?ldPNura09nP9QxCdevZKb/Lkhn5jlAXA38gUOqdmSMmyIXGp8LmlUax//5Eu?= =?us-ascii?Q?aIDKMce/8lnDAk/iRNvvSeh4YLZCwXEsO7j/kGHmLcrHG7IvaI/Q4khL76+5?= =?us-ascii?Q?3v3qFbcQe6GbfrGFCDLu6EwGKHp3ziTCpDmVYs9Ucvn0UzBCoxj5UDaCcQGB?= =?us-ascii?Q?iXdWBmmB3ktb4T2cnFOf9pfgT3MJkXzwNh/3ReMP+N221K+fyiNHksP+bVRG?= =?us-ascii?Q?ED+47TO0X6EWnOkHaC5AeQlH6nQokqikyV9nPA01oeEeHhaPcKqnTdqhCZCg?= =?us-ascii?Q?UPQOeMr4kEoZFjziRG/9C39m9Wm8PYGcpaQRGllTHD42RtYOrZaoTwvS39ob?= =?us-ascii?Q?hEjwTJIplptZvrqGiOHzt2MrcY0053DhEuYycEl/8wpJzUruiy7uHzjI3Dd0?= =?us-ascii?Q?tnWt9MgV42Qh7hTY8zmflPt7rWpKHbUb4U53VHyu6fa3+iaC7JEwKSfYclhM?= =?us-ascii?Q?558Fr7ox94vWISpnh3u8AcKQTy9SvzxjQkJuDbCe78x+C/tuL/iJ2QJ+p9WC?= =?us-ascii?Q?SZ5th6NgVPWB8j8mlCdpYkxhUlzhEpSIaRl1VJoXHYMFU9NYcJtQ4cXXWipV?= =?us-ascii?Q?9U4jq+/r5gQuO+3ik3WdJI2kTK6DahAS9hY3XvgOd+dHpSNL3AgCltDaWsQy?= =?us-ascii?Q?9FWbn3xtQBmgIOdC7tEUVLhsZB1el9xl3zllMq6Sp58Gh03uGR0+9BTmPhxJ?= =?us-ascii?Q?l7Ns+8D4FlNGnlqE6Py0iDjgzAZWauT50g/vkgKIRsaCt6ONkrmVtBecPBeC?= =?us-ascii?Q?ffO2ihdjQVjR53Z6wpgZ9HMOsCrI3+fM8aTS5PNAE3LGUbKERiFYuQQc4s9o?= =?us-ascii?Q?YfewcI4HckKgqaOsQMSCA0Q0VinxNxKUSQyvM8xRYPhKa0DS11D+oQUNtRam?= =?us-ascii?Q?q8Nf2olSiqhZx/3Er1DLuP+8JlYk29/XHBwBeQd8Ik66iBX9Z0rpmdtivhJv?= =?us-ascii?Q?5bROiPpHlGKlpzZBn7YHbnktXBEyIPT83rO3jw8yJBwcHSZZoquOwWRo0pI+?= =?us-ascii?Q?RJo2lGeCkWpF1MQmwVhb56JhKfMk7wgcwIG3JO9AwIzTseYdBI7LJKctQesE?= =?us-ascii?Q?5g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07f914ce-71eb-4abb-4e43-08daac0d6d9f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:30.1149 (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: vobVZi42DjzLsPfR6bM9gfWzODiObtZNBtWjxD8JjlWRW3dT6it064b14S0R1t8oPu5aWm4mScW+HEeLhTHH+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Pass data to mptcp_sched_get_retrans. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 18e439e180dd..0d9fae5718cc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2489,6 +2489,7 @@ static void __mptcp_retrans(struct sock *sk) struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D {}; struct mptcp_data_frag *dfrag; + struct mptcp_sched_data data; struct sock *ssk; int ret, err; u16 len =3D 0; @@ -2496,7 +2497,7 @@ static void __mptcp_retrans(struct sock *sk) mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - err =3D mptcp_sched_get_retrans(msk); + err =3D mptcp_sched_get_retrans(msk, &data); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60061.outbound.protection.outlook.com [40.107.6.61]) (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 547BC17CA for ; Wed, 12 Oct 2022 04:51:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cHiHZCQ1WaatLQ73203VAF8T/xR36nXNaOdi+4JmMILo7N/o4ZgidcgejxSbDnmsXey2riBEf2UnpsUgraebwJXM8lzxqrxG/c4FfOgdC7jbpH5iVAaSTS0JjHDtsbn5F4M90rKn6Fb6OybSHdVoA3PwQb8GWdpG/sb0No6gDeRLpe1czBs9Qo2t8fTiDOR2rsjQstalFjjUuvWKSU0oCxoVuIYWVEXF3+KSloI4FUUAxq23y95WhWRBG5Xm6FSNvh/b6Sq73s9IWIx3vw6nRUoZ3ClzOKeUiHdL2YqDBjEsc5VLH1D8bzLaED2FPMKh/j8KhG0WiT67Xw7fFaWtJQ== 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=frpfUlHl0g4mqeO5XoOX6vFqKuKbluUcWAc5PZmZE9g=; b=NXwCZP4kxF1j4q5afutmypYBCcohWDPu1dgl/Ji5X+X/6xFvSoi31uq6Xe98RQ1W1biXrupfXQ1eAwRYqIs4sfOQVt34QwvHOQRhtziBEE+suE+oOkryPAM4x8KoBkt35xb6tbgdK+cinh2V0XF0Is1OBfkBiE2IzU1gAVLXLHXyXgl+48xXQOkuxjiyqzzLEfJUrbhqMQNMtJ8Lb2fV7iFSJc7J+NFdDKBvMkRswFlDWcIyV6beQXu3V2BOkrC6rWkbBFHHfj8XKoL68zsQh3ik+yo7higbnT4hVy3cPDKZBdVyE7BiF4arFtK8EVH8n9AVptUtz1buKOufxf+PVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=frpfUlHl0g4mqeO5XoOX6vFqKuKbluUcWAc5PZmZE9g=; b=whIdbQSXWkAZvmgu47VWF1IM6Cu3irrjydD6E4Lxq67stfX5GurqzVRP+Az946KmtSV+YscSr1aGP7llEcPz6bR8YKgY/hBWaN6Sda2Lbhx4X1VXytect20ilMFreJzf2uFLjyfqjJvU9wEh0FzGA1x6WmHTGPl01Ul8y5mRu3ZY0faggUIP5eNq9ufmDPI/PtLy1WkLyFxCfnaMluIyYAx3K1FtwbNzdlzcpTXqXWFN6Q6MXEmtaHLGlRyzURUnP+TG1eZV8ZNj+eVwBhZIVF0JQiTO2jiF8cGLZIAVjXqqMccA4n8u+f+WJ058QR3sSNSzQA7TauhrQ53lt3gifw== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 08/16] mptcp: use snd_burst of data instead of msk Date: Wed, 12 Oct 2022 12:50:29 +0800 Message-Id: <10bc4f8060728d5b58bdecb2f2f122f319624589.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0019.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::6) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: caaf074d-05d7-48ed-2756-08daac0d7116 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +vpi1zvx/Ly9wxLRepkF13rmols71wLMjufyTYaQkAmPaDRRUs0Opz1gsv2xXgf0LdM+vUuzSgf8Vyqr1qbAW5+yNw3qTs62rSBHKRZV1hLQqgA63NC0S5mtArS55dv2H54V6b6U4xnffKFNRA1XnVWMV8LwB/DJZoQkP5vhAYeXisHcQuTLfBDrsy3ZDHM8AXmo9GdVroLBbZJxosYcjW1yW+feWC1FhvBOKV9Cjs1n5jCDeBQ4tyeLTcTVPId6htLTXL4pUuQsLdUDBnahfvQ2vw2f/hzJNUFrLOYHKRNl1YQgTm7NHhTbZtspM3lnQXOz3Uuiht79CfoNy5Fiws9NXhtpWCi/eDnsFGlxXMTUBL/Jui99CuufdGK3XzAIsKhorJkOJbIg9r0g2VWlP9KbNQ2gYhcuLbESnB9+31FQb6N70TDnOiNrRIiawBpt+bQdyY7g+YmRFGORrSqQgV3WMMI8uXR2mmbxnha1iGQZewrJJ2JhSTadVLQtct8QOWgLE7uzBCOINrcOMyKAwW4lK3JO/VzMAkrqdB8Vy0eeRfR/4yzpcRHS7kQ2+NsT+Cwbf2opbqvlbMzTgeabpUFzE+WUUiWVdupk/kkI3uLfNtKsoCgW4IkpZwdGKN474uM4LbAshcrwbUQfyR68EjYoIbqrzMgTbMutkD5HgvVSWBaxRWiMVn93rlMPnknzvetlMPJ1TjxPuKlQK7f/EYaBsNGtlSvG6ZxM6stEjraznavUsUQggXXOyMiGzkuP X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/fd7PdWWj1Ols60rSlAnlddA6x6QCAIl9YhLfIwCnY3txqkYduZeKETtofPJ?= =?us-ascii?Q?G2DweQ+Dgx8jSTrAqVdbrSGdqR7Pc1qU3jpGCrt4LzjbgmdhSBBXz4VUbtgP?= =?us-ascii?Q?iufibLWcXOu9D/4u1H4F0kuXaz3/sJZze/aiV+7PDkbh65ZOR3nq0CXX+VVd?= =?us-ascii?Q?jXDKDrZzyszPHsTiQmOZc7oAILw/ZrvwO+63LpnLFShEMqYGxXQTuQLuaGDI?= =?us-ascii?Q?2CGFQx1ZsJbdgnjmoutJAGfSHRMT9+S7RKeHDpivFjwm8TSqNEXAWRxFvWi7?= =?us-ascii?Q?kgrOGrgfWvx1JbWI0z+Z+fhMj64FUG3IJqWMRd3WfBq9B4Uv/kkUykXgMQkc?= =?us-ascii?Q?UO96SZPmkwJ5285BEV8y1K//0ilNpdtcWQo3EzgQf3wyhpFiZ7QHTqgk4bbn?= =?us-ascii?Q?9jE3kn/HZIr26ypd42wykarN2l/3n5iK82969MPvki6YAzks6u86jBm71g+X?= =?us-ascii?Q?9uURHj7qF42wL2EbCgqVfbFzuS0Ch+ap7WBybQ7ZGZFVOYD+hIT7bIni2eiD?= =?us-ascii?Q?d5uGeM1zUfhgj9HoA3cnCT7uLlcJBX8HekJq5t9lKF4NOvQaHVM17j7pyuK1?= =?us-ascii?Q?6is9w5pMwS64VhRGHMQVR3f+xF5rWz/q+0sy7dYV0Zq35EWy8rvKavDoVE2n?= =?us-ascii?Q?PVo8nfm6VlbHBW0uscgwjgELaVBMvVF/BsNVpLh1lQQtT8gbBDI96+V3Kn26?= =?us-ascii?Q?fSHzCGjuT6m20jcXcFPQ8lPOPDq0+xGUOjkF+9AcxNEpnELz1bGjj1dKRxqe?= =?us-ascii?Q?C6NQReTa9IZXCD960yNUBjpqIPSLr1xpcFvZ3ix6O2MRftpbgnB//qPoUrbg?= =?us-ascii?Q?VG9jI1GZbMypSI2867pNb3ADc9JQhGxF1ylLCqYSolU90uceSVTmecaJMGla?= =?us-ascii?Q?eMgfJcVzCk9k2pcF+rHc5wauc2t92OvAdf6E3TP4iipV/QTLR2/5hfavUcgq?= =?us-ascii?Q?XsAnbsEuyJ9JASW+cfhtQefApz45IatlRlRyjdSPIJjIBXVJPy8grlQLO0Cp?= =?us-ascii?Q?uUQcUjVtA1b6kzJfjLOuU2FdHK2poFpI7syxPJLTuQIHrHOV0W0tVtHEB2/X?= =?us-ascii?Q?3ti5DdY0p44VrPArAk2nNoEGfTgYBRXxroOs3w/fMfh/liFQEwtBCm/X6WLd?= =?us-ascii?Q?uSoIDcyjoyuOJDqO9XQEzeim1iA0F94soGnHVArFD8WeEsjvp8kEPwy7PNLa?= =?us-ascii?Q?7n0HGfJbOqcgKi8LyH3MlYB1BuZDsMuGgm9hcvFQgzjJ25GMhFOA68ggRYyY?= =?us-ascii?Q?Ry1XJlk7K9mEYEFA6kiK6IdwDSKz0k+5xBo+aBNq8dChJsuUuDk4jwZTfWUT?= =?us-ascii?Q?uh5VivkX09p7Oxi75yxBiM5CluyVBIUUzh1wB8asD/6QeSeHysA9THa5N2zi?= =?us-ascii?Q?bMO4gft/rWhedAbI/eYqow0UMEMkUM+RaGeQKOIHQ1BG9sdoOxNF/L7ve/vE?= =?us-ascii?Q?7ibhuwjJOsjddI3tjAvN1ixXhtyYKQ05fPeB34TqJaR6GgWEMS2A+EXulARt?= =?us-ascii?Q?sHihR0M8LS1zoK//qCGJnkRa8pmcgTkF/9Bc5dllXBI2UWOQlBSRxEpvnY1s?= =?us-ascii?Q?TOJhyCwMNb6T+xDehGUTgKu6wppKV/2kDJbKva2BCWHhqOJNQyy+u8TgE4ON?= =?us-ascii?Q?dg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: caaf074d-05d7-48ed-2756-08daac0d7116 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:36.0832 (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: RvCjpu3cWhrL3y6tf5hOTZI/Zw8PD8S2jVSEp7D9xUnl3bELKGNVsuOB2RercPKT0VWlO9DrCT1D5qKmLDKadg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Use data->snd_burst instead of msk->snd_burst. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 12 ++++++------ net/mptcp/protocol.h | 4 ++-- net/mptcp/sched.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0d9fae5718cc..956c8ea0edcf 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1406,7 +1406,8 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -1476,7 +1477,7 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock= *msk) subflow->avg_pacing_rate =3D div_u64((u64)subflow->avg_pacing_rate * wmem= + READ_ONCE(ssk->sk_pacing_rate) * burst, burst + wmem); - msk->snd_burst =3D burst; + data->snd_burst =3D burst; return ssk; } =20 @@ -1488,8 +1489,6 @@ static void mptcp_update_post_push(struct mptcp_sock = *msk, =20 dfrag->already_sent +=3D sent; =20 - msk->snd_burst -=3D sent; - snd_nxt_new +=3D dfrag->already_sent; =20 /* snd_nxt_new can be smaller than snd_nxt in case mptcp @@ -1535,12 +1534,13 @@ static int __subflow_push_pending(struct sock *sk, = struct sock *ssk, info->sent +=3D ret; copied +=3D ret; len -=3D ret; + data->snd_burst -=3D ret; =20 mptcp_update_post_push(msk, dfrag, ret); } WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); =20 - if (msk->snd_burst <=3D 0 || + if (data->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || !mptcp_subflow_active(mptcp_subflow_ctx(ssk))) { err =3D copied ? : -EAGAIN; @@ -1616,6 +1616,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, * spooling the first chunk of data */ if (first) { + data.snd_burst =3D 0; ret =3D __subflow_push_pending(sk, ssk, &info, &data); if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) @@ -2282,7 +2283,6 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) mptcp_data_unlock(sk); =20 msk->first_pending =3D rtx_head; - msk->snd_burst =3D 0; =20 /* be sure to clear the "sent status" on all re-injected fragments */ list_for_each_entry(cur, &msk->rtx_queue, list) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ee9e7e55dfe0..3f97bacca67d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -257,7 +257,6 @@ struct mptcp_sock { atomic64_t rcv_wnd_sent; u64 rcv_data_fin_seq; int rmem_fwd_alloc; - int snd_burst; int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; * recovery related fields are under data_lock @@ -638,7 +637,8 @@ int mptcp_init_sched(struct mptcp_sock *msk, void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); -struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); +struct sock *mptcp_subflow_get_send(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); int mptcp_sched_get_send(struct mptcp_sock *msk, struct mptcp_sched_data *data); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index c459b01f9a9d..f9440b935c76 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -113,7 +113,7 @@ int mptcp_sched_get_send(struct mptcp_sock *msk, } =20 if (!msk->sched) { - ssk =3D mptcp_subflow_get_send(msk); + ssk =3D mptcp_subflow_get_send(msk, data); if (!ssk) return -EINVAL; mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60054.outbound.protection.outlook.com [40.107.6.54]) (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 5484917CA for ; Wed, 12 Oct 2022 04:51:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OTnNs14kLzOcPyRI1Bwlt2bZgjrauHq/60FQIG2KabqqCuyZJujQU2/+HJXEyNSnXTjvbYXvnP4fMdwxOnRqo/1OKv/o1scS0jo1IuFGVwtd3nczq6q07dXCXR93EIAuk7fcZwN1l8N6MWtSmBn57TQ0fAIjWQfenOnQ3ZadK3PeNwyem32eYepsEzsrxBqVUP8HowIzGpSp1b9nzZs7Fa8p+PX5ZXska6InVGOjiprExUAHxe1AQmblI8dhyPSWftjVsf3AFcikhizPcHkjOL53Hu4hIjGhNQAqalMBelwWU38NRwQnopQ2U5tD8aqWrsvDPbrMzUzbzJIjt4CFIw== 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=KfswZEZVHBOGeFTqc5psgb42BV1tvAq7wKQOwzt7mJM=; b=hG+5eD9kGIeYi2RPCpAP5fXDPLgZBDK/6POstiKdfE1naBn0LXD0cdkOK9QDS7wntamRa06ng7iJQdpoPdPoXOLmIjVfAHy+uM8BpW30hpTv5cYKIeOCRiS4C2LYe5WZzluiX0+mjkKJI/39BskqHxq78Ye+8X8UYJexzdYlsxD9Nu7a4WnpUQB2CpMrQ/I+gAcBnJ3jmbvXGN7dMaeSRt8MF9yjG0UJHBtfFnomLGVtvkt8oRhMJUXE2+k3bd1Rc7/Irrc37d66Cmmo1+KAEfVg3PPDcMROZ/OX6ydCMYv8wk4J4SFNVnhuK52Jh0O5CqZbcyJm7/W9ASkwwEmrqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KfswZEZVHBOGeFTqc5psgb42BV1tvAq7wKQOwzt7mJM=; b=Oaw6rJLUlxwAoTSB4MOnJder3xCvg/Q4M/TUZRJQvDpj/AVtx/IwmQ+ukqkoBcDloCnl2evt6l5v6TDxqKqZl8zJOEV6h7ggUW+uup6yNG+shl39Wka5b39qWsswpmF0LrinD8bAX1MfLohfpLvxP797teTKo9lmgF0rj92CsvIzXeHJ2vBjP9cqDBuHyUaGLp1zte8ut6lR1EkhzxbpoUs+/GXXPY1V3s9SUUyWEQT7cnpj/qF5mCU0YhetttTvI6BvGIHepRf4tUptnaeIV/1uSCSHZqZLvUccnt4lZuw29OvhE4Gd8c7rWZTLH5a4kdlNO6R4NgGRpU3RwS1z/w== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 09/16] mptcp: define default scheduler Date: Wed, 12 Oct 2022 12:50:30 +0800 Message-Id: <03837d5c7c1878502cda32e0261066b4026c8e13.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0033.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 182fe542-a52a-4450-6081-08daac0d74ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SwwtK8I1eIw7SirdZG2xTG9LcqfGmaOyg6qJih+g+ZlUHPhJTiRSx7WinnbdplL1bznuwm1bb1sSniVqOCTS6DggFZz/1HNMb9iSpWqc9qgPXLynioeAsNhBntczR1QkEOFtgRCO6muL36JBnlRbxmk2Fmei2RUUIutsESwXrlkeqq262vRMHpVjwqPlPSY4wHMYQidpIJlecj958RjEDA/ayy8N5o6xPo1A7C43rYjjVRBSHQ2K0ZEwkvjqK9ExHEQL75wXZWpTsxvBdCuOfpg9Yob0B7hto123SjI1qS4JxoYIbWR8Cd/nMS+Aaa1fkbnzBcZzR/9QlIZ8KA8PBm1gJGBDz88uf7DhAAjIE0K1fK3KAcunK3G0moXkSPYCH0A2nSOIVNacV/0BIBFRF8oxCIfV89MmdwhdCA863oKr1CcyEogO3k/ru1NupPijT5suS3XI0b9+iPJ/4eGBAKHMizI6L8jxYb6/6hEJrNzbKkJsemeTYfSisu5QNhof5JfZshHlgUyB3ZyscHgvRwgVleaKbsbKHvsaONVO9nTyzHGWZtR3NTKGNiqwVc+B+U/YB0QR0iI7mWFoEJfAHOoVrnN77tsuVcwMVQ8WkRyDCcuRWf3SkxAiSTtbZ7W4P8biHVhwEA1+zx5eUnlFGDuv0DwFJFIrXyCe2x0XNDM7djlghvNwuwyu3E9M9WAaK06kNAvwSMChHQWAzaidNWcQCTtSuKfWSWtnboL38aLfTpk6So8cfYa5Nf+p2iZH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8kOI+7W+/cgKZfR7cQfPrCwx4sbweoRP0HFnv4AAj4CmBwebJYYTkTZp5FtS?= =?us-ascii?Q?7IEe4yl7fM5HU2uxpt0GHD8UgrqlOWwiI/Y6zDBPvOyKF86R17L3InFKOQbj?= =?us-ascii?Q?cRzQTCE5BBhEMlMwu0X+NGljVBgW92pifhfqEL3p2K2Z6pKGHH9MkofWcrKE?= =?us-ascii?Q?XOhV/uWlCaTdFHcgpQxbJMpXVouujXMmsMqnNcCHKhR+0Awt9WzcVf4fPBgx?= =?us-ascii?Q?7oi6UVyAlCv4WCg0yEoTAiHEquPEiRCusJ5JWyQ/zUICu3YYSQlQqpatrikx?= =?us-ascii?Q?zBvHrrATd7GN+RUFci4+WJ9I2hJfilMVWyld3U9Pxe3tRV6ndMlm44C3vvi+?= =?us-ascii?Q?WdwhzRZr5pgGyXSpgbwfmqc7ExASDOiU8z0ftLFRG2mJlmbx/LYrsCByvnRT?= =?us-ascii?Q?fkJ/cRvVfA3QZG9kL1LmmG8IVuA4QzA4wLBwtfP6C8gj44Kbsk2Q9T/l0uq8?= =?us-ascii?Q?8dAJKXg08ZXsTtTevnTJKHDvXBkvziXz1kUWVgn9fk4DeEhCwH3FEDFRo9kT?= =?us-ascii?Q?OlhENDXuOVcmmPJRZYw6ahUFitlUgD4kl8S4EWpnBbDgyHDBquDyB2NEbxas?= =?us-ascii?Q?U4UGAtngPu43yQLndaIpWdMm4UpwK6xn1Sv+qObP9fOnI5dVaoP+Laxr5ASK?= =?us-ascii?Q?kl+jQDR9C/yUgYlMsgumXwjtTbem8jd9PILOw2pYI7DvqUx+ZSurua8lhy6g?= =?us-ascii?Q?mpVIjGvJC0zgywbZ25Q6UXk/CpYa6I6pFyIKgMcJmf4stiKgov3JVtVwXnIP?= =?us-ascii?Q?Q0lmEqq7r8ZLE+mlweKGBi9yQrKr+74p5AVpZUmtKXXB1TzrGVkggfVcxn8K?= =?us-ascii?Q?Nk4NOIqGJgciTSLx3SfFvD4V62JtLo77tAKS4+GkuJfX80Ek0srSFlzCDljr?= =?us-ascii?Q?MFGQobUrqG8pvcc/uKtAZZsFtg9jpwa+6DELDUwnAWBSBD0MWnGiXgc8Zg9T?= =?us-ascii?Q?A/oJQwqpiedqyWrY/YSYYq+ahtc4EtdOdSvxaoxGAus1FtNX6FpulOtfyo2Y?= =?us-ascii?Q?7O4MG6jpaY0eorSQ1G4C5yMr9p+M+nFoaX7dUEfBocwCAkthOmrcRx70B2ko?= =?us-ascii?Q?AJThC2N8BWcXsihk+BfqR+XGbOxEIETq8C7Zd2NlrMq66Eqjzq05cv16ILHD?= =?us-ascii?Q?GLAZwj4csAa5CfodZck0LRRfTp0M/O8dNuZPfGwyyJxY2Lec+XPGzJ89igzM?= =?us-ascii?Q?Fq7YhHbj6xjsc/wx1X2PN1beEWgSb55HhubtQNUmwHX0/obgUTVeWZOFghkQ?= =?us-ascii?Q?c83vjJKPWTCJJicLrj1UMxFEcpXnA8D0ZZUaol8NS7tz95/R8inCuYHuyenX?= =?us-ascii?Q?RUhf7NwZBIEbkCDQr6SzxgXYPEv5ok8z4bM0Mlkquodjd0KsugEcPf+OWTfA?= =?us-ascii?Q?cP6gNPpE/HANftPxor31Em/4xBD4NALgOYel25+hIPWF+kdcPYjQK4Dqth1E?= =?us-ascii?Q?UoK0n95WfwMAembdVZYjqXjgjPizsJiCjm50mIrK5diUzrzvIEhLIABV07ks?= =?us-ascii?Q?kxnEUGc5VvYhMbL7/hQAGsWpICz0Qq6UqwSjZZCxV2ex1q8KsBS5c6cfU2B0?= =?us-ascii?Q?xyUs3/VML05FWqFLyeupXs/bAzhB9Anv9C0hB6wM4647dp+zBpMFYnnG1FSK?= =?us-ascii?Q?nQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 182fe542-a52a-4450-6081-08daac0d74ae X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:42.1452 (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: eX7ba0XUte5fz4NfBssI+w0Sp+j8hnG3GbV8e74CHN1Vy5oOeN9LOyh+QDPnZtTRTLZasaUj/4P0zAn03fhIeg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" This patch defines the default packet scheduler mptcp_sched_default. Skip deleting this default scheduler in mptcp_unregister_scheduler(). Use data->snd_burst instead of msk->snd_burst. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 2 +- net/mptcp/sched.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 956c8ea0edcf..3f0829ea2ad9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2211,7 +2211,7 @@ 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) +struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3f97bacca67d..d3cc84b15929 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -639,7 +639,7 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, bool scheduled); struct sock *mptcp_subflow_get_send(const struct mptcp_sock *msk, struct mptcp_sched_data *data); -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); +struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk); int mptcp_sched_get_send(struct mptcp_sock *msk, struct mptcp_sched_data *data); int mptcp_sched_get_retrans(struct mptcp_sock *msk, diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index f9440b935c76..14b3efb347bd 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -16,6 +16,33 @@ static DEFINE_SPINLOCK(mptcp_sched_list_lock); static LIST_HEAD(mptcp_sched_list); =20 +static void mptcp_sched_default_data_init(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + data->snd_burst =3D 0; +} + +static int mptcp_sched_default_get_subflow(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct sock *ssk; + + ssk =3D data->reinject ? mptcp_subflow_get_retrans(msk) : + mptcp_subflow_get_send(msk, data); + if (!ssk) + return -EINVAL; + + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; +} + +static struct mptcp_sched_ops mptcp_sched_default =3D { + .data_init =3D mptcp_sched_default_data_init, + .get_subflow =3D mptcp_sched_default_get_subflow, + .name =3D "default", + .owner =3D THIS_MODULE, +}; + /* Must be called with rcu read lock held */ struct mptcp_sched_ops *mptcp_sched_find(const char *name) { @@ -50,6 +77,9 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sche= d) =20 void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) { + if (sched =3D=3D &mptcp_sched_default) + return; + spin_lock(&mptcp_sched_list_lock); list_del_rcu(&sched->list); spin_unlock(&mptcp_sched_list_lock); --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60073.outbound.protection.outlook.com [40.107.6.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F30217CA for ; Wed, 12 Oct 2022 04:51:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lOtlzyAE31n5tdDcY1vqOY9J7km4DAEjivEkhsxxfCrmKqaGCT1utHECtPFt8i/neXmqo+2N57it65eMOKXX4ptF/TeutPQOR6PDn1mOYCYD1xJJPh4F1dmYDcHTn5ddVYromrJZ9ODbBPupFOeoDr8VN3vbcTLw2EiiJASQ80SVB5PiSJCFHoEETQbBBjKiK0hwB5fZ9dJhZQ8S3/i17sg66Jc54XN4alTFt9jP0Lo25jNxcm85euRRSl0QC6+JV/BiSC2eY3/3/uYNgHmQkMm7KS1VhlaR0/37KTFjSkAZLYc0SL4n/s0XVrwWMldMbp+Qz6ZtRW+ky36r+yr9kA== 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=YkvWR3eOrK6CESOXYU5jorf2JxV72aIBftIS/u7UIbU=; b=ipIhjmms6rpyVsnlyUV3Uc3+xJStmv+1Sk9Nvc8/wGoY+/7OTou9zQ4MEhNWQI9BuNqjm3uxV/jFnmdue4pSCVlBe+9LKcAKOhWvtbGc4sFZQ5Foobrrkehsfq/RsbkYf3/YVyogshWz547HlFCkQtJiaWvS3lpXsa56lH1W+JVRAAUqYDb/yRYrZyaghT3xvA61YCYB+iVH7inFm5Hy4/xl4r2PSPt7JBtxtAIedj21+IwB5rjyXqvgZAfhxOO/7W6HnbTBVBmeabJIpHJ18uuy8nsUlHrXk4FIhzX/Ausi1oG2x5XEAdH+B0z6g3XtUwpyhhFwlBww8aNl8eL3yw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YkvWR3eOrK6CESOXYU5jorf2JxV72aIBftIS/u7UIbU=; b=tkxw2ZQNMJtsqB/ld9iqEEEW3vVlzIsG/5vjnQVlzCHTvNAHdlmYExlxtR3UxSNQ2MATM5J8KbezUeyk4mYtADqEcW81HmltlTdNSE08hQiHdHvFgj9LE/Is4BRo+lwHE97+4swBE4ejYh4Ifwc+wVCto5mXJl69i3pmJqFg8ag/GAgUVvGjHwOTarMzATvHWajTTophDEz57FrrolmyosEDk3GaJO+b8fwANtZIzsnRNsK951vqL9ZuXuwIWkU1Vp2IurfJFgK5an+4/5bWUa+5IWzLGwLgqt83f7LuXpbVWb4+g5LN39kZpttesYJ7rZrWSM6ckBZMPtTSWaZI8g== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:49 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 10/16] mptcp: register default scheduler Date: Wed, 12 Oct 2022 12:50:31 +0800 Message-Id: <47a6a4513adaeaa4111554ae880d150dadb9bfe2.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0218.apcprd06.prod.outlook.com (2603:1096:4:68::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 79264f3c-ca5b-4c73-1ae0-08daac0d78cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sh95YriTeoqlYX70BolRPrzzrURLVKGmpzjXIkmMzKCPHDyrXJYJ7gzSeR7xpBDWSzJigR7R7KOGYAITzuvmA6E4StFpO6aVLarqCKaVQm9HcF0L5Zf1fu6n1Fg42fcSbUCAMaRTV+VVIeYKWwOQv+kHH7oPtSnJI6GnQeZ0tUhIz/IOjSLedDj2d5xhAGWrCKllgbFRQZJsWo0531+MaQ5nIL8berXJbDhLxSRMMzISIAwv7R7p5knegXxvMxe7TdVmiM46WXAIr7Qt3YIVoZhv4tQ2ktFXq6xgkD/wBAiveb/N1onBoQf5hNDI6Fn2Kc67Yg+C9HrkZBNjaGYpbzVlCcie49QvE1lokx/vUUDjsrCVrTZWOScHAU37x4nT6kp+tQdBe3t1CoiLrAXCN6yoS+VeKYXMUqpDNM/EY9D2UQvzR9Ugrk8ZtM4oI01b4BWHW96uS6OXcu+JQVpodpSKESJxtIS5/Kq1EBTTBK/p5jS84dmUq0x6Dd43MyQ/Pz6IRQvfANSSIAIFbVgVBwN4OnuL23Xsxv7HiQtndR+fWNnIZ/oK5zrIa3zo4E0OwZ5nbjIeFe0QWTLhGpI75diGs3C7TJiEIuh8PdDpAmhFzLtV9FrEVGmvP/Ui/Qc4u0u/Wd4ZWDLclcJRmKK9ijGnV6sRyT9g0LxKuXyHH62vjJFCHNsyjpcl1g8HNPRI3/JlF1GqgTbkJhGbALtJSRzeYVOj5D/BM3rgdxDnxr9k70/dV/r68QGHrH7lhwgY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GFs5Gy9twYkQfbh9RtBKmU8KHAMf2qDVdIL2jqqJtu5/wYp1/Q0v6Zr6mo4l?= =?us-ascii?Q?XP+24kfQV6lOpmnZH3dH9Yu/3o1daGaophUBHj4mVwXalzvIUVSThWFMRJV/?= =?us-ascii?Q?Wwp3Oa0/8rDgRDdyIrEpBQVMEV2Ea0bLiPbrPkM7AWnPbRyY2FeThAFdZDIP?= =?us-ascii?Q?dFuYgAIM/uiPyHkgR7mIPgJr81CAd9KviiL5/Z5WNv1D1wLTh4Sme++CogSS?= =?us-ascii?Q?1+Rt4W9Uv3NFLvh5amJ5CI+s6u6veCYJL395kzMxnQ5L03q7x2ElHp+Hjs0h?= =?us-ascii?Q?ckLMHsXMtuP4msaqz0JswHDsTSzTROyRsq38/+mK5oIdIKWb0GaM3G3NgL2p?= =?us-ascii?Q?fGjnl9sh86lh4YmQRzctE/khMpwXJl4wbw7D1zRyHwTg89JJURqvvlEdElu0?= =?us-ascii?Q?RUIycM4avuBiVOf6Cm/pIT2C6iQHN2x6S8eVxTRtYrNd+KFmhaCnKcH/2qNG?= =?us-ascii?Q?qpgPwpU6swCvJyckH+egiqVi4r80imvGGZL/ojagFf4g+u3YrxpNVNbg/9/n?= =?us-ascii?Q?xLygfGy86QVpeoftliLIwDCFGpSrZDIxx+HxDrbdHFRNuPGM+daNiSEtWCuV?= =?us-ascii?Q?oG+cBUQaFrhlw5S4Dlc4oDdMMggGTgLm/qM7E1t2JZEI7uzmffnUm2QGvotG?= =?us-ascii?Q?l0HohogLNx53IGuswWuGV/vE5c3OXFtCcoMdZ4/lefGqSLkT4LDIi+SJQsRK?= =?us-ascii?Q?TSHtfcWvDSGq2amyfaBbKMR04p5aALlgx79YHVCUcXJ7LyrbSA7b9ojnXUv9?= =?us-ascii?Q?dsIA6Z5mEk8opWk/YdJ/LSFF2VxH+ZZiSbkXV/T4I6hWkSwDAJsz4j3yX+jm?= =?us-ascii?Q?k9kMQf8qhGe/kWwtrHMmc/SJ7HPok8JB/rSU7oZDuh8KWNKm7O6peNdsk81T?= =?us-ascii?Q?U64ekQoHqUMGS1VMNDZRF8GyNCPdlKsZYM+L9SsjuI1sQB7guFeDLotSBc8+?= =?us-ascii?Q?UTSQAg1L/CvbiMPW31nBgSg/D6nKLhpSFuAuzGSmzMxQvyIn/NPYOYMP0Ji7?= =?us-ascii?Q?IniIbGcRNqRbM8kvTIi/OSGmZNEG2I3C5EQQsR88OBSSueIjzVeD8NVXpg+w?= =?us-ascii?Q?j9xLLoixLKO9El75295T9d7xIfDOb4S7cFT9p29HFCcWvdRL45ki7TLvuczK?= =?us-ascii?Q?fh+mlCQXEqyaDwkdnRyY6sHILoa8PBFw8DkynIUSaMi1RTYjbzb2EwSCrjut?= =?us-ascii?Q?FrugQbN2LjYcMq2Seg9t1Wy6nngNOv6+ZnUJbiluKLdO6QfKAL4y+7uV9gmf?= =?us-ascii?Q?8fnBU7hDWcrCPcKZ1vJedDWL7tAOdItXv5v9NVlNWZ7tchLcYzP7lgRLpxDZ?= =?us-ascii?Q?jEfD1tvjtSY50JWiAQp9kWB0f1mfXV9zdwkAqtSKxdeH4dBwF5lhm+jSv6jK?= =?us-ascii?Q?jy7KVom1VjQUswp7DEVWp9VDZ9a3C6OmUp4QuKXLCzQLgSOw6LueihaQRywO?= =?us-ascii?Q?FNRrmw7EzUSIRsoOB0jQRmsrYbJm229iMJr5B4Q3A1ZbJIHefJjGgt7cK2AN?= =?us-ascii?Q?BtA+Tg9dyxiX+z2eXvuvb7h6llCsdoOPawhKk0jNbnBN9W/qQ6dBYJl4vjmf?= =?us-ascii?Q?89wFK2lSdoyBtVRHBesKAdwdsyePS3VovCXSmsKvFmnvpFlXbuM2M1WNuRzx?= =?us-ascii?Q?uQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79264f3c-ca5b-4c73-1ae0-08daac0d78cc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:49.0665 (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: 1s7VV585QxY5DZrfWiMfSouAKYo1NtLLj9lDqMQGoQjoXaAV9njjNCHGeGbtKK1a0ilqv57LPwzYt/TppOguYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" This patch registers mptcp_sched_default in mptcp_sched_init(), which is invoked in mptcp_proto_init(). Set msk->sched to the default scheduler when the input parameter of mptcp_init_sched() is NULL. With these changes, msk->sched will no longer be NULL. Drop the code that checks msk->sched to be NULL in mptcp_sched_get_send() and mptcp_sched_get_retrans(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 28 ++++++---------------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3f0829ea2ad9..13d65542a4bd 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3890,6 +3890,7 @@ void __init mptcp_proto_init(void) =20 mptcp_subflow_init(); mptcp_pm_init(); + mptcp_sched_init(); mptcp_token_init(); =20 if (proto_register(&mptcp_prot, MPTCP_USE_SLAB) !=3D 0) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d3cc84b15929..669584978213 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -632,6 +632,7 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *= info, struct mptcp_sched_ops *mptcp_sched_find(const char *name); int mptcp_register_scheduler(struct mptcp_sched_ops *sched); void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); +void mptcp_sched_init(void); int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched); void mptcp_release_sched(struct mptcp_sock *msk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 14b3efb347bd..cc9865a79ffe 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -85,11 +85,16 @@ void mptcp_unregister_scheduler(struct mptcp_sched_ops = *sched) spin_unlock(&mptcp_sched_list_lock); } =20 +void mptcp_sched_init(void) +{ + mptcp_register_scheduler(&mptcp_sched_default); +} + int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched) { if (!sched) - goto out; + sched =3D &mptcp_sched_default; =20 if (!bpf_try_module_get(sched, sched->owner)) return -EBUSY; @@ -100,7 +105,6 @@ int mptcp_init_sched(struct mptcp_sock *msk, =20 pr_debug("sched=3D%s", msk->sched->name); =20 -out: return 0; } =20 @@ -127,8 +131,6 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, int mptcp_sched_get_send(struct mptcp_sock *msk, struct mptcp_sched_data *data) { - struct sock *ssk =3D NULL; - sock_owned_by_me((const struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ @@ -142,14 +144,6 @@ int mptcp_sched_get_send(struct mptcp_sock *msk, return -EINVAL; } =20 - if (!msk->sched) { - ssk =3D mptcp_subflow_get_send(msk, data); - if (!ssk) - return -EINVAL; - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); - return 0; - } - data->reinject =3D false; msk->sched->data_init(msk, data); return msk->sched->get_subflow(msk, data); @@ -158,22 +152,12 @@ int mptcp_sched_get_send(struct mptcp_sock *msk, 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); =20 /* the following check is moved out of mptcp_subflow_get_retrans */ if (__mptcp_check_fallback(msk)) return -EINVAL; =20 - if (!msk->sched) { - ssk =3D mptcp_subflow_get_retrans(msk); - if (!ssk) - return -EINVAL; - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); - return 0; - } - data->reinject =3D true; msk->sched->data_init(msk, data); return msk->sched->get_subflow(msk, data); --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60085.outbound.protection.outlook.com [40.107.6.85]) (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 E21B517CA for ; Wed, 12 Oct 2022 04:51:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CqPWJ0+4r0DCMyyCYqR8CXbjcjtWldPG7/w79/72ZjIyNS0KLtLV7WrXSaGotcXZc/8vaMK/BhIZ5xxjLf91DLvfo9132f7h4NlmIrbwtjcKMzOr2L1qHf3rdjaOSp++8nTKGBfi3fZKrqa0ajl3zVXw/zVu92ldyH8wW6Z+/V3fxIqiNw40d018obJTAtSXNCoCvtncX8SQ17BrlnNiWd1a4GNSSfoGpeI0+snR6n1X2vgXDXzruHIQLcgGtsZu7LmBp7rFL6su4D31aGUCo/Y7zLiyDj+1omf18VJ/Edh6SWPrEfLRx7PB3yIXO1UlYTfWDV1qiEgeqk1iOp5DHQ== 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=JVlyGCMX9kAyr+Bh12N3oRWw7xIyi5YXYjWpaGwOQEU=; b=DWFnyK4Ns2744cGuY5WtdLAkN1R1SQ6qDusDG4r3mdaFbpy0hTo7OGRHoss7rakEci2ioXINzAaCnqiRxaq3kXaYqTGJ81hUTqU+ce6NFASI1G0CYoJl1lRi7vNgIa07EfczNobzDbxx7W7VInnhe6/Ff4U+zy3EutuErYrPulVcHtd4OE9zLicguk//To4qNuspMG8vbF2OfB9YQp+97TsKz8rkiFQnd6WZGGmOBnKTKXRwJEZeCAm1N1Lc0JWAFADraq6egeH9Fw2zgBuZbw1rbKbvACHgNdOxOitk4D5FinBSNVdHl3sUf/I1HGQ2TRoSGWP+N29T2MUFPX3QzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JVlyGCMX9kAyr+Bh12N3oRWw7xIyi5YXYjWpaGwOQEU=; b=CO1UNE4+sjiqRLkyL3BLxx5ce7RrwUwFDQMCkHu14J8G+3FT8p8g3ma/xrFKSDteKC1gWTWPKEy5zZ3g/8tVALaQf/iwGn0mb5iiWjLFDRz1e/1TXiaXCEAt0UwM1xkYTvELMogZckgT/A98eowsUB2LHEsdC1jcL70UhXTVuUGUToH2qYkPWhSFO057Z/AMF3YckdI+Dm4NNX/2ECshTSkk85VJg/0J/ceZ+x4AXUcnOG+k1CClYFvYVSvmyGABlwOpgbQlQLzFspXzsDF/GPCXE7oJaTfWTTGMB6GXsib9lyA337yhKg5M28ZZ3+0fHL3eG5LzZjYmzmkaELoDmQ== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:51:55 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:51:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 11/16] mptcp: add mptcp_sched_data_set_contexts helper Date: Wed, 12 Oct 2022 12:50:32 +0800 Message-Id: <8d50be20eeb939a3461d648fffaddf6856d37111.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0215.apcprd06.prod.outlook.com (2603:1096:4:68::23) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 1db18404-c0e7-47c1-fe0b-08daac0d7cd1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ygI4qbrl/sNQ57EGd88vejq2GJ0WmF0HMDIrkhkQfOesC6fHKv0DYQ24i4c30WCYTX+VsSD0+rA+nwC4Y4x3Vqt90eRVYTYR80LEZ0MbFfGqR9hEHqWvhIZfqAU/0dmBv6TGvppiLvaU4Wmd16wVeNMyvGVoMiWiWfnbTYPiu3rmScDcHA7cp/qsVPmgCyjNs0en8pKIRaGsxVcvfgGMzyBcTOX3dI4Gf+GTohKiOrIq10JHeJchR+uMfDVe+kzYpZDasN0sqYIHwDi3Zdkf13AvobwC5ioGrsPycWJlWcdjynnL0jVvaOkR+IDyJvu0mFUy7YWuNFCzXQjGsxm7wVoorjJOSxxuGkRDbZgP22GxFz7dBbNMShMKUg/Gv8/SAji0CxOp1yEHTr/PnRDXC7SMcKA8wo1PGRP5trJIUi601lW/lq/x1Dh/Nng365wLd/PvcYUJ2eIV4oIZLweGkmY//34E+iuk/AnthJUSln6r2HIHIDuDapb4RzZUtnxzZIpBgG+w0atcBpX5cGwztahvRYkTOUjhNGV1zTPJ5oGz3VeaffZZ3iDOyjaf3pd39ORYvy+ffURaaVWnFdFLizUnxgidj5uZN8rpl/vRkvvAEq5x0BSBPF0Q7uYKxh+2wdGacKz671E0miJuk+o9mWW1jgGoAf3wg3Et3ayCGUElChCKHh9ekwnvs845To9CqwgulAH75v3JeZyTWvqcpC7HYwn9GMz0bk4fKDJJLGMk8mEAs7W0zeEm7VMooIWz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PjxQr8MTr2vxy8Oju/KPNCz2PkML6EYpAuOVHNH9QfT7CaOZdbCGqAHAfTbZ?= =?us-ascii?Q?Kwz3Vx0KA2U9hwnX8QrEzLLnc5CDBbgLUiFDOub5Keb+H/dUsj41fVeA1GiF?= =?us-ascii?Q?29cSDC2yPb+1UlJpa1MIWZFZXNZqPZFj9n4smMKFo4uM3ubkLZFruoc5aSP7?= =?us-ascii?Q?6ZHscHO2bhzD+kEjpQam+Pd4LaVLRes42M5FXEu/kqUxWZCoDmt1/ABcDPdB?= =?us-ascii?Q?M5HwMkmpUaBM6cRnunfN5XgILGUP/B8mLZj8c8YGlyHc/Zmy5DGKz3cK+47R?= =?us-ascii?Q?Kjy2zEFq9FLVpEAOlfZAZrBGDHCWFQAr+9IBp/ELqi2hZGEnxDtDV63sGAcn?= =?us-ascii?Q?uRmemn1rUGovpZYHYNBRYEjARF9+4CfkcwYkvECDosMJmL13ygsxe4QFHefs?= =?us-ascii?Q?vUVQrM4LjmyR64cGGOOTpK3KDJLtpl5OXMu/HXTMJfu/LbzxKSQ4uxPHILdb?= =?us-ascii?Q?311wIKFnpwLSAyWmOtZRhK85R0Uzi3EHapm6tEHBjoE41g6G6XzARJaOjuq9?= =?us-ascii?Q?29n8Y5XwUPIpZUsIEJahWendIoWtmZBFtHdTS3OakXoKrn3mt6PuLmm0WRvE?= =?us-ascii?Q?s5NhZeS+/cq2wmix8j3VVePm610+Xyji6OziB8OqwNYxIHaUnsI/LyKtqOEn?= =?us-ascii?Q?Icub5e30yX3dz7iS+8Q7sFd3NTdnLTdb0KHKrRlNYVyxJ5DchlAMiKAmK4+9?= =?us-ascii?Q?jr4TEBWgZOxrYcFhSXyRAu1ENmVTFYGtw+YNXpLuRakzSX3Z5xVMCERlAeth?= =?us-ascii?Q?4hToaZXPN9fH/EJEq6RaBK2u+2gF3mVQEhC/WkfKDB0c97XQcyQvJsgfTEED?= =?us-ascii?Q?VdXxcBig5L99ztC9qKq428hwdNqYbnetqsoqVXaBTBxWAfhW417AiPusdFGu?= =?us-ascii?Q?iLY4D48AsFfoUSw19W1kkkoqFLfq+QmfokKgNc7sDBfAs3ohjnY+H1Lby2RT?= =?us-ascii?Q?at0khXXz4fuCcKGbludfk6SiXyhEDwxf3UlWqZtMZnj2FjpA1ne6dtKRrTU1?= =?us-ascii?Q?kauWVWYCbhgtcqHWClvDaBxHdypnGXFDzpjZqalbOsQFpq4MSwXo3rhTVj1N?= =?us-ascii?Q?RPgBkENetQ98CyRQYouTgBWY4YP1MRNpNHUgBkojNB1BUXqr+YLeqWSHgSa3?= =?us-ascii?Q?aAgdWDQV3Tj2v9G2XkrLpULyyiD9UB2bFStFktV7fynSu2bkzeAXn+iTi2UO?= =?us-ascii?Q?7eUAlAq5yTLfoLxAl5xMgkWLb7cM9ZbS/2hpDhli+1zMYAcT8gxD5Wxq0PZz?= =?us-ascii?Q?PtDwXnc1HEbudbe7D9f/5BObolTpWJIG48R0DmwMhwFcg2rHXPwR7cbFMbrI?= =?us-ascii?Q?jV4eBYhtGg+TkLqJCcHwT35Llw9VJNO3r1XtyqxGAfX0RaYarz9hucntOcEo?= =?us-ascii?Q?tV5jbkmfJTz+pHZhD51G+6jt3ZcCZ6dqxy/PgTqVhnhqr9YXhwxYWs5KoMYa?= =?us-ascii?Q?fARVmofDAsC0IuILjjzAwDysf/mtIrCjQlUHwlkcXtcyVr7G4JR3gW6MIOqa?= =?us-ascii?Q?DP6PQqkCT4nicbue0+0+6skzwZIUOLnFZriGpuJ4irt13bXslT7QwzBf8WaF?= =?us-ascii?Q?myCCiPev/jKaU72FHj1k3EUKzswQHcEOC3+t7opAe9DptMRqpIZzyeMUWIwO?= =?us-ascii?Q?Dg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1db18404-c0e7-47c1-fe0b-08daac0d7cd1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:51:55.5973 (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: Upf/Ji7v8wWo2nvFQ+Cu10Pj7ski2Dm6J4s7s1Z0dx6JxEH6l0mlOUwkW1luYPVIi9vJT4+jsrxzadgrRc3jpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Add a new helper mptcp_sched_data_set_contexts(), it will be used in the BPF contexts. Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index cc9865a79ffe..99d7df8d9b58 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -128,6 +128,25 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_= context *subflow, WRITE_ONCE(subflow->scheduled, scheduled); } =20 +void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct mptcp_subflow_context *subflow; + int i =3D 0; + + mptcp_for_each_subflow(msk, subflow) { + if (i =3D=3D MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + mptcp_subflow_set_scheduled(subflow, false); + data->contexts[i++] =3D subflow; + } + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i] =3D NULL; +} + int mptcp_sched_get_send(struct mptcp_sock *msk, struct mptcp_sched_data *data) { --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60042.outbound.protection.outlook.com [40.107.6.42]) (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 9AEE717CA for ; Wed, 12 Oct 2022 04:52:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GPlxlc7EQR6its3WTUrGsjQ3wCoFhyDcZYQIvtpDRnFqL4g4lbggIAUuIfoL+UviuF6KGqagAqmVoRqSdFANc5gdz1y7awv2s9GrmMe7JApTLlqGVcNwnDFu6l5+s8O0j8QSCsRKwd3GtRw/r/+NRY5lUZ98hnm4q5P5IYPR2MOW0e7O6VBNqqmyMe/eSaWQcZqJSBWZwuUGgw918MCbs2IP9vL4ncdZ/LkDB7F/j4fFA8neAZC1e/1leRk1SOxBu+Dhp3BSg/EL8wVPFZQ7awjsR/7erHaikKHm4NSz/pWQ9EIXzKt9BDost65Z/IwpeHmshru6tTA17I1YGBu86Q== 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=8rQsyp0KkFid8EMt0GRM6bBdQFfudT207JfYQ8QLgt8=; b=P2HVEw8bq2Ng1qkMyu1/GtUEuiM2/qxltleWpwCSSGPiIvDzPBvcAJFLjrp+eqLMjmnSwlQRCv+d5K5Q9omlt+6BNU8cUWKY3pdSQTm418WpTeWCdnNq9HPCpyctM2lNw4jwl3tVTMI1m9za43pG8JkP7QCR1hGeR1QVJte8H7e7EJUtSCfa6lJSi3gVPfsAs08dYCXCdsIqs8F0PLIYElAOYCe/kA6zgAF6q2XvQOsUrmbT1w3F4Uyb/ECaiUkCgi2NsdChvtoOkdOxVCZpM+aQD9WoEtpu0jdVA1zSHLf0TMKPOU6MJkiGIhIwcIiFfxeFWsVwXmMHTr2y68lKzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8rQsyp0KkFid8EMt0GRM6bBdQFfudT207JfYQ8QLgt8=; b=dpQSuHIlzkv5vkXJyDpxEnMTsDTRUYS+hGdX2JrWjjP8JjMjbGNvy/B0odCNGX/up34c74UBbrvBsY/ONWmF8i4q6uDvr/p32yqCkBLy5lk+EFGXz9c008w2u6lkF5n3+lslURHdfmEUiC4P3nd7uJcxUjEblpBW2RR5ll/1aHa81PJtTXxiZK/LDp+k80gK+dy57N6pjK25bqOvUFmKDUAW8qiHraiJDsjwewIQY6mJTRP9MU9GNQnudFz8oB0LHTpbVwI59UxNu6PhZzLJ6lq7j3CpSJ70Uoz5wDWWZrwm3rzyzm7icO35Npek5gEwYotIB+Z1UETgqhMiQyaBmw== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:52:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:52:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 12/16] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Wed, 12 Oct 2022 12:50:33 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0168.jpnprd01.prod.outlook.com (2603:1096:404:7e::36) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: c72f48b7-4620-4a1f-1c97-08daac0d81fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QVmBTfjB6wmjG1iBmuhR55pcCMoPi726kpqRg/XL2gLl8C6b8UVXK7gFIB70zjz0X56gnjBYsN6GITH0J0nIkUn74qi2+bTrN4NX6DjgS+WExxiENWiLStGrR7eK6FWpQtaEowQWsVWKslowWUUWd9uIfRyoTQQEVLoGF6Z7g1xZ+PFrkxse8EFeZAu6MVThyXig0Gpkb3uRjwlPccQtvzQ2H7dPTsIIJNxJlvojp5lklvvzWdkOhTgLMJzj2XUSHNkaQdv0GnjKm7DgbreKCU0lKROS171w5LlzvYuQ1NRYXh3uoODd5NJPK0/eCBcFEur3fqI61LU2W5t+zYsA5qgU0SVLVrmOqtw06/+Oyuam3Oz86YSN8c8GyqSnuGddTB1Desb00QYWYhg6T0OTatUkYMCgbXNC924vQBAKqNlgTHw5t5byF2NgzYvZhtzIDRAy9wlzE7PRV6Tk+ir0TIGhydsM9QjtS6bs1aNW1JKMA0qKm/v54EhhnRbW5p0licTFj87GcsLy12s/LiklJ6IY+Tyt7AIoBUnOASY71K3ChvMUSbID52NPu5MlpnBjfO5OOrIezH5Z+XmhviCFEkVwkueFq9VxMEp8ET1762JBP4PhHeZGYiX8DGbSwGC3UJZBmMzlI8Cc+t9IzL9bGWwiSzaxAZR0s95oeXp47qgOUJawRxdSPI11FKW0XR+iv6y75unpxwRco0ASlU2qOZAjfn1U+mzbifw/1xoGSHZH135MzMUoSvjrcgPiNY2o X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E60z1F7MNTSx8moGQeLmC2Rpe5vDzLzG7tbai+O8hBobkUn6gn9tdP4rruo0?= =?us-ascii?Q?CcLuVdmkG3lLidKQZ6LL1jvbjxEuQnHbAOrb2IKrtAtPWetPC171as8Y9Wzo?= =?us-ascii?Q?KO+0fWLmXyBQBlXcnrxalIaogYndcFVPCsFOoPm6RvfZjo0//qretWxOKI21?= =?us-ascii?Q?SijwvhaMl+/UhdlkoVyWJMX2sglD1EicApG262+V95zxjFJSoRR1yqLEmjTW?= =?us-ascii?Q?jK5+1kfmUKbCM4Bd1gHL20EXssCoYYMXsMovdKpUtcNrhG9+qN0lHqgJPMEu?= =?us-ascii?Q?wIK5133/lQit5hcjP4H9sgNwJ5IjkriKWChr/Pgiw81ebzCltGbGR5Lj116f?= =?us-ascii?Q?+TpLxLUQ0+p86oXcu+CaIDpnqJQtiNB0xITmiusYFdRfVbtJsCKmPaOlr1vj?= =?us-ascii?Q?WjP7lULRcYVD+LwT9cZBxSbfZ+OmweGe8FqXnMcbQY7rF9z73PO9qs2iBeoL?= =?us-ascii?Q?v6TJprznhpBijeNjPsK0kXJWagFpFuTF1+gtVSgD+UYDojSjRsHBVJ1r+avr?= =?us-ascii?Q?LzBLKoHaBXneWvo708CWT6IiLmwIijAwpX5rmuNz/kKd6Bdmj0Pb0ovHd89C?= =?us-ascii?Q?fLQ/jYG9kqud9/3MruBj1p/06uB8k6BKEE6oGAvwYdORu/aYtgjrG/PjzAla?= =?us-ascii?Q?Z5q8nQVXmqX2xfgXZ1zuEBP4vzVgCpstRuL+eyPZox2FH+nohm3wwp3I4a6l?= =?us-ascii?Q?IUYT+cvFxaKTH5OV/8cBg7LebHRdvwTIfXuoAlzyNFHnL7+ehES42g3/Yx2t?= =?us-ascii?Q?jqc7wmHxwTe81faHILw+3S+clN2iC7v80h7cMxJEMrrUj0Pczvteg2Aax5Lj?= =?us-ascii?Q?gWGxTxpaDK7Ts42drNa1sM3pcNgzo6AIFiltJxirIsZ+p+TdqeXprAlWPVmm?= =?us-ascii?Q?mWNr7xDc3e9jvhU6eTkduMHZ7gwHP8ST58Z8Kf1nLRB71THM31RwWsQKSY5M?= =?us-ascii?Q?XbD7p0HxHxo9NvyBngTEqHWH3xHkBBUmAZ5Lfn2zzHTqY/0rhz8g+DoltXEw?= =?us-ascii?Q?cY5DYkXqmRbiWFwN6TdUoaLAe9DcPB3pL+RqjUv5aTnC5eYk2cFsPL+g8pC+?= =?us-ascii?Q?owlSucAFNcLvwp6TPtM9Ms2fV4/ufcelyOJSpObvAFZQBOOngAZ7Nzt8W5K2?= =?us-ascii?Q?SOXI7ytwtR6pM0IuWwsLO3oTGu3ctxTBNbst04JsnfUOhpG1ONLTFRHL0BsW?= =?us-ascii?Q?Nx5QObQkzYqkMpkiO6uX87HzZF3ddyKGR6G0YhMLy3KtG8LS0G6ONZJjq7tD?= =?us-ascii?Q?qgmz0Gpn1LgKEJUBy9stkmzHaOiH/PhJy+8JMZvfjHG4gcvM3Xc4uZW2cjlk?= =?us-ascii?Q?KNt4EujZLDaOeNVOPRmVfSHCJUp392Xf2tropzhQZQAFjKwH0tawyEwKoTXd?= =?us-ascii?Q?fKgEeDDLtDPeuIHEpnANIkqaQ6bxPNwoMGq6KU9Rw34Z/vwykpM61CmpTCEG?= =?us-ascii?Q?JjWwGJnwjvdiYwW/v4dYrax3kW8+H4sCTQweVLcklsBjK2goQBSLgSa/TUtj?= =?us-ascii?Q?B75YviuG1kJkD2rsxFdvcR7+Dp33RJPMD6ih+aZoqytXPbdMRWZgyt54eTrE?= =?us-ascii?Q?+fMWqoQuRSJjjEZ0CqNAqBl8Hdb7JkH5J3ddGy+sa4H+8Dnwpm+9HonDuWne?= =?us-ascii?Q?wA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c72f48b7-4620-4a1f-1c97-08daac0d81fd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:52:04.2841 (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: d6cm7pHIHUThM3npcbURywc/yaxe3B48cUFikCVboOeJK/kwzg7lUDAKNieGIITCQFQLAsTxwGacOQo+lt+9bA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index c8792e6f125a..ee64b29bf9bb 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -240,6 +240,7 @@ struct mptcp_subflow_context { =20 struct mptcp_sched_data { bool reinject; + int snd_burst; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; } __attribute__((preserve_access_index)); =20 @@ -249,8 +250,10 @@ struct mptcp_sched_ops { void (*init)(const struct mptcp_sock *msk); void (*release)(const struct mptcp_sock *msk); =20 - void (*get_subflow)(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); + void (*data_init)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); + int (*get_subflow)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); void *owner; }; =20 @@ -264,5 +267,7 @@ struct mptcp_sock { =20 extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subf= low, bool scheduled) __ksym; +extern void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, + struct mptcp_sched_data *data) __ksym; =20 #endif --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60081.outbound.protection.outlook.com [40.107.6.81]) (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 766C417CA for ; Wed, 12 Oct 2022 04:52:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JC/+pXFEkapsy0ygfU4aaeoO7Y8KomlHRz1xGX01jDloS7NDS/a8kPJ4NqTOLQGgjGYr3WhNbCHHiOBvZsGyNlspoP0qhgHDA1KPSFIocr8vsGFu/zW3M6RlpWVIxQY5lZCW6P8ViLBUXp/ALRA4qkLixbuDCJummGhDDC2ZVT2laCLZoSccCMB1JM/k84kscWheWupQ9PUv2HlKBNgZFTxP5Oqmtu7fxm18ioXtMwPNrV1noQOO7Z+EHm0vfyhTuZ7Ro6v4o9KpMJSb/HuuBwPROeuFtPuEEUVBR4bft8J1P1T+BEhW2DR27u8YPlH6DrfjoFq+iAmIGE/fdq0BJA== 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=AJjowJ4690G2NdLtiQ+Je2I0ckCnZXEC/DGaQQoUNmE=; b=Iz1VgZIrjsWV9DQsfeEJ2DYcCZ9n24qq71DIsOYpKlApBFgKQVV2Qr+x6w83tjagSkGEwvfb/g8R/IvBLcrHXVHqLQx43LV/FjETtZsLV797mbCi+lNtrSuHwQftWel+Jre9GN5mpcjmb9AJ0yR8qUTBha3F6R6xJceDrI42Vjq74Ih+4uGEKXnCthrdgV2zTOeXHFX9ELJjR2ZJ2Sm13WDRzz1EOqPRGWmutJGFP/WQEBukJC6c4bc9WI8kg6ebqJgEQwM/TNa3qMPfjczxympYS+BQzPkWzs18xuoEQEY/gCE6D6CD0KnYgjee1XdDl+pcri9UjPEa25dWXak9Ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AJjowJ4690G2NdLtiQ+Je2I0ckCnZXEC/DGaQQoUNmE=; b=roTSvyOv6mwBne2hJHXCR12BJl1AkRw2eVCSH4SCbytzeNSDNkHyWfXYjwLLolzaSfCZNF2VLb7+tVhQinadKv/AeIvZDU3KOgrv6M/q20N4vdW6SNBSfvvppxT6Nd2XDuoiT59HHeMsI9rP4nz5QyRtRZ9O0mTK6yKvvd4UOHq2gLaBMEuwArIiM5qe2OvNF+uT6YauQ7l4v/cCcl7dVpY4PmQaT/QLj2rjRPj0cMQtMcJLSGW0obgpb7ucWaIYlRqEy2d743/8obfXhiTHeBCPRQSaExiY5LHEh7vTlOiJl8cm53ME0wMLdwuT8oWbbusWJPdizdrrjQet0N4Ydg== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:52:13 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:52:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 13/16] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Wed, 12 Oct 2022 12:50:34 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0167.jpnprd01.prod.outlook.com (2603:1096:404:7e::35) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 9cf2b631-5cdc-468f-102c-08daac0d875f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sWkdhYZFwr7dZ0IRj3oik0GioLFOBzq/J9aocm4RE6+lixq5+sKoo+FVh5LvvWcrFZDVFKcU2DEFRcmVZjN1DAtsJkCSvQke3H6Nv3gfrxMCbUcXaoWqn6Yfl/QYnG7IsqhMc6yI/mSWi4Pc/u4whGkedE0w51Kfyg3RdGToCjUgM92XOW9C+n3X3MjqUZ3JzIBw6RvEuIsBDrT7eV5YnNM+E+LGdZAAWrxsi38eFU2JD02qYlEGOnzpBRPgM91fd1LvNI/qXrkH0Kb9fdCa8xGcYUd9Ev4Pq3arecaRGFNpguNo6TfP9g5+uilsP1YLVtT6WDeCbeb2gpwlBaDd2YiLv3almn1B7Wf1NBBC59c8yCSLalKOMKZGWKxVO+jDU9XhIHj4ET9qc4BDaz+x7Hgrkn/4HozEcXqVJQjMQDPduHFtdoMBJBBiM6Cr+b2jUtqp7uh9KGbAmJfcuyusY96scvUCr50SG2otsIN55qyZrDj2N1Ib6EvQ7UeV23MWWyi7oS++wYvAz7ZQ03OCIicNW0Rh7w9Cg2TqxHSoRkcAxjwpQpirip8EwBw23D4W5RdqCivD7P6rlSN5j8ChcBfQFKL8hXAnd7XnpGX28W9G6WulusVM/UBx0OnrB4HtrAULtyDjFLbFiOT7oYGKw4hwFoHdiDFBMOrj5Vs+ls1/iAV7KEIWsWwQ0S9/bDO8X0C+zoY3eTghhlH7Mqixs7TMQkrdrHkTfvinbT578MXsrSxP67T4qefP1EhNauqa X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(4744005)(36756003)(8936002)(6506007)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6BpVduc0vvylOgCffIMBg2V9b4O1b05+M+iBmX24vgOmVUthfdnNSRoOZFOi?= =?us-ascii?Q?YpA78f1lAhgymK9F+d6GADuN5KKp4EenLrl7rPR9uanCko659lNw5o71Ywr6?= =?us-ascii?Q?0AlFlihl3v50J6HbOnzwCt/aduO/FNPWyrxnnjF2Oy14tXfgG664qNJfUSkJ?= =?us-ascii?Q?5fybxkTofNjH289Qd2xQX7LMzd7pTMitXn5NmHqENyvoOHcq8tQ3XrEqeeib?= =?us-ascii?Q?SGFW+rx7ij9AyMhPVllRxDlC2PPd13LMFqq9M5PBM5pmlW/bFT7wRVezeeGA?= =?us-ascii?Q?4rI86ECLnhU312gcbni3ONVv+nSbi1981XlH+XkcRn4HRPJvOz8RXtkl9ZcW?= =?us-ascii?Q?KqUO+re8IfmAnSoj9Ttndxc7da6DNjNYVUguuMH7qH4nwwsMmtyzPoFyqeR+?= =?us-ascii?Q?T/qS4iHbMb2ZONpNAA855G+0k7lG0OIm6N25oZm/8oZGRXmyy7X+oFxF6q+y?= =?us-ascii?Q?SHcYCfqqyqyR55JI2yuB1xePrm6jQtdZY1icXbnEdcBet7LVPI4Q4rvToegi?= =?us-ascii?Q?n4AbEa+M2k76BsiTEcjdJm8Umcp3nWx6tNfPQKfjdaehwy/9GYMvoA5eZ2oh?= =?us-ascii?Q?amZrqJdwXv1RFvs1EYNg44gIdQamL0uIMM1SJbZAWTXHotRxVY1NSFOAFIhL?= =?us-ascii?Q?ckQF0FVNAqGNnFXd0sQ5cibZmWFiK2DdkGunN/gDzKBejOKBMIuD8yUuSD82?= =?us-ascii?Q?tyirWZvCn2fBYPg9odaxWsY/RZsl34oGLFdV4TDc2RCTjBAPnnpoyzDbHuWS?= =?us-ascii?Q?GMBoeRUh8yFwQ8Ze9596JE4+9L9cXihWldH7gytORO85ESzHLoMom9aLhjCV?= =?us-ascii?Q?Adr/4Lb9D2R2LfgehzjSMiTKBr6Ig7DKtk2a2SPr+AtQeGxepPpT5YPCoBnV?= =?us-ascii?Q?kIWD2LbtvTXiO/vgSk5ijKKwf5+ZTeOshdYJL9wjtQPyPF75QSwOmbZDZfhl?= =?us-ascii?Q?SfSvDl7bSYi+1HC+P/4ltuDdE1qW1iELqyIESi1+1iGKApFSUbMlBeyD3wqH?= =?us-ascii?Q?Of6cioqmpHF/5jsNX4ROWqzuobMY5r0bFLsb6mdmOSn+PuqH7ugfRKco3rpE?= =?us-ascii?Q?tnuxgO/iJi9Ih4GdBJA3U6ZlARqOI6Mwncr5GYBxAqQJwZt7c9BCUVSjI96j?= =?us-ascii?Q?r9k3C9sxSJ5yq8lHFyrLBQY7PGqfAiaPaoT9UqePHg/ki0eX0AOVLvN/jANp?= =?us-ascii?Q?PwXMreJYq+P1onNOjFWdRm7qFwza7fCzUbWvZzPX/BOe1lJp4KW3/+pAmscc?= =?us-ascii?Q?qclNyKtibXhHYIlwOrRTTyihvohgJq7ZnSzdWV1qw1rodjHWKNOGwK+83pvu?= =?us-ascii?Q?7eLgz0op6vbzscKrwvae/0DvZPERqYHqprhwctfn3Ynfmcsu6mvbnLEjT/BT?= =?us-ascii?Q?ZBbZbkmhGcTRXyQ8ZALosRCGJ3LdMQxn9yP3JwT5WvXDTF7mQ15kQjicdAaT?= =?us-ascii?Q?l6TqJbQkeTh7Ne8BE+zEDcq/avAINBPsnB/efL4yhvk2OlNv96qPYjJgVoZR?= =?us-ascii?Q?2tAQWJVWQlxrAEy9VoB4O9NxCOxtaTliLLyz/RfRS68fiCB47NhXq17KcAPK?= =?us-ascii?Q?WjW3ABdATTmdMcwzQmGsmeADhaMxoeCGNTjKAVVeAKecD7ld6OkQrU16Pt8j?= =?us-ascii?Q?/w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cf2b631-5cdc-468f-102c-08daac0d875f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:52:13.3146 (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: k8hWdesWPoHvqM1NyXl+j5F+gFWUm/0QNfc/2cMDFLiItMgMxZS74NMklRdcLQI6bjgfSaovkKHGiCv9YCOJPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Add mptcp_sched_data_set_contexts in kfunc_set. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 0a768898990f..03decb05755f 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -164,6 +164,7 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { =20 BTF_SET8_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) +BTF_ID_FLAGS(func, mptcp_sched_data_set_contexts) BTF_SET8_END(bpf_mptcp_sched_kfunc_ids) =20 static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set =3D { --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60065.outbound.protection.outlook.com [40.107.6.65]) (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 9888B17CA for ; Wed, 12 Oct 2022 04:52:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RcuZL8ucLDS7ML3xpoL+kP/MJp5OWUejrsuATkLoXDETVuqhrk5bQEPD1wk6DNqS/COJflAHRe6E6NeBx3c/Hceb+S6jjwvYg+L5LJWLIKpFt/FQ2bHF5ZbA6qnRF7cj1jmedYc3HtP9ByT6BmtLr3FM9iaa39TTXcsp1ePXDWLyufXofxQhauyk4A/zLJNtTLT99VGPWPgLMfACE3ZDhepu/3YL9T54VdghFZEjeh24A6Wr8riw2SI7LQgObdy+wFrU57KW0AioUf9BcN2x8j1cC26czXFcRLW72JRxM6DzJuJjuu3YLITp6O+W03cQ9h2mxNFPjKPQJESRY4SFRA== 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=BnDh4myN5PG5rA51tFqnEO/Baj34uQClbwjqgpGiogc=; b=OjhOUeFGy9Zic0XRpSQvScaCw9k4joJL+TNE6Z3vvW7XjBIcHgtfPPRmnKvUUmBpCm6vjz+OAtY8Qz7LiI7Y8hvbv4wxUTbuMNEC47bbw81U3H4mEZFsiPN1inrZ4U99ZOn2WbZSsQ2SuyOl6vPqY3sCC3FIKy+jPOsle90UDGfqn/3PncJasCykjQeMkWCZ+K9htbh+2tNJk0bNU+uu8NX40k0sgVsGHXPuGgErwanNg02u+lrMKT2ieqcA3rKQkhcJSjzwiW9OENexBFj/V/AbFB3+RpLkb1BRXZOQb79FM2joN6rCnobXo/5a93S83cCUo3TkyQDCdE6DdigA2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BnDh4myN5PG5rA51tFqnEO/Baj34uQClbwjqgpGiogc=; b=PimE8/GtcBmzr34ZrMWPL27sfs0ce31DRAfrnvSOQv7KkfAyjhmABT1W+aMHy8Pp323feEL339siBgg7OP9goIjv+5NzE0ToYyTRo7HwUmNXRf54648aWU0W9TQTAdULihVUTgJ1ZjHTEZOsyjAevRWaTkGVWJTqgczKBZ5w3y6HijzNG2gFB2FsnbBNWZtNIPXlaNVcxv6WJL1kRqhy20/MHdqImmChcsf4pelYsPWdDUgZcuR5vwMZLUVflg+oqz0A1cZxfPt3H1Qtra1GleMuFxSmPlwUsy5UIPlUumCaV6NrD3oF6XaPhQb0ZP8mERYMJlUX8UKUzs/XDxo2kA== 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 DBBPR04MB7722.eurprd04.prod.outlook.com (2603:10a6:10:207::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:52:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:52:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 14/16] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Wed, 12 Oct 2022 12:50:35 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYBP286CA0039.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7722:EE_ X-MS-Office365-Filtering-Correlation-Id: 95030512-6aed-44ac-7047-08daac0d8d52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d3uyGf9eoef0EPPP1R6eRdiQ2+tTDtU2Hce6QIbtDxDVPOAZlEVjeFeh/SM1HAIbFw6OKRvCzq9Xu/vgMyFnuhJMvhJraqeIypff21FXkbPRhgtzFtNjpRxAXazN/6dsTT5YZUVog2TreIU45JwEyQuvFZZT14JK3oshOz5Zj9xfzXW2qIz3bcyhG/JKQJcjSToDWDe+4+mieUQmnOZEILWrN7sYFhNqSSyRk3dSeMly+2Z8Yw0N/ytnM6BbG5aI/JJQJNpqnM6iW2Wt6F2qee18HQ165fScwPKHvMT5kX/TBr3kwZHpHAcCevFzKiBnKzwLsdRP8t8724VuZ3L30g6yo6++jBUE9D8kCNmaElCFpMW37yvFqNjXQ2dXLNdcSRdd5grTkRF0Dxw7QaWEt1SXYIrCYjF7A8bZv0WlKWfV6w4vRn30QwahT7p+JPy1WZ6PTpH/wt5j46Laf8Bw28Cicbrx1uiCKGETPMw/Q5PvW0KHmYV2oJMRsQZFcj+4tafGjLigfMqlxN55KjpLBora+EM22MQN47iLc8jDz2QnVJN1YZgxSzZrV2PhUX8ZuCAXZqoen9ZuWKSY8VpNhcH1e293PWvV/E6nH7ncby2Fp0czgk5Bt607tndsdDf1iL1l4A81/OOAKUg/UI7GB0ilsLjkotxB4HPiylBl3E2ofWANAutZujHw5L7+Cz4kzSFmV2pTNZbHk7otbgw8mclyFQkxF0JwjvBhJOHBhufi7din8rcoBC96OrUXvH8c X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(396003)(136003)(376002)(346002)(451199015)(6486002)(478600001)(38100700002)(316002)(6916009)(186003)(66556008)(66946007)(66476007)(8676002)(6666004)(107886003)(4326008)(44832011)(5660300002)(26005)(41300700001)(36756003)(8936002)(6506007)(83380400001)(2616005)(2906002)(86362001)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xKBy+LYenq6v6/LR8stiHQA9c8I9UOUiM7NcutNGy2DMfAfbct8/bBdsJs3z?= =?us-ascii?Q?iMTi9NPy3RxPvtOAm0YsYeIMwDyHrp8+Q3qQj+HMpEI2F3oVdmwpdUvE1Hgs?= =?us-ascii?Q?RwMO1fy8pmIeOmZaaCIY4NF8Tj1eR0T2PXV171GxzgdL7wLgS7WyMh1NP2A1?= =?us-ascii?Q?NOLEUdveSepP9yBSninsvmcxB6Rm4tpwhCvILgDPn9QqQdzfqYYWyNBt68w3?= =?us-ascii?Q?LhMmLk5ViaANaUi7T+PkS+J0guuS5IfiZrt7NzFRU06mXwttsm7IHJ4OO5hV?= =?us-ascii?Q?JIKsW1nOL/PnQnlZH2JXQF17qWvbY3i6LDtPnAAwFdKUjqUfMKg5Ap4hTHIu?= =?us-ascii?Q?/V2186q7U4nYquZd/0CY+9cKJyLwOPpNWiBMDBXmlMT5GUJVvfLlw/3UI9DL?= =?us-ascii?Q?LJ/66frWjuy6ZiRIQz4/axHekRQYjV0tYDa4dPx6mEfFWcdW/+Fzdx603Us7?= =?us-ascii?Q?e7THfjSk8SCL1lKAe+Afcuei0TFnves+k1TwG52wvO3jPWSpUfZeQlTsx4wB?= =?us-ascii?Q?I/jSFR8gXKGyG7WitS/h7n8P3aujnenhS+zG9K0Llcg2QEw5/kit/6RXI2pR?= =?us-ascii?Q?foGCL+U5LeM5fYkZIxmvevcfQZDGKrtscY624QkMT7HKyUYnCUOl2d7RKMTC?= =?us-ascii?Q?VTPs1VRto5F41zHvs2G+8eiwM5hN0nwD2Lx7rkiRTEjLILaaxB4LMu1l2ImE?= =?us-ascii?Q?gNcuKw0qrleCGaynRVbEWAw/nRTDBmoxSBUWa0QRHeZAI6Xb57dq2GdeuFAb?= =?us-ascii?Q?n4oddO9/ek+XmdlE+bFMAr4w1nrAteXGwxYT3K0LB9YwK0wmZEU7GT12Jp09?= =?us-ascii?Q?iQgkCtta085WNsLEvXIt6ju0yvexQG9x/S1YCT21D/K1QiGqITM7IlO2hoKI?= =?us-ascii?Q?JCw9gq3J0l+zf686PNrzqvn0mFoR02EL0AUUvBS9DfNeWd0ONfcdrqHrkGxk?= =?us-ascii?Q?86ce+dVZA3rrPw2QJTcUxE1miecNmxItTDrcgppyblGZ4AOWSyfydHnNRff3?= =?us-ascii?Q?VLYg4rVWkLVwNYksk9/xg1pDe6EGbJC1KPnSu75+s5C+SjkhOu63rSzqCEo9?= =?us-ascii?Q?F+LNUfY4qkHu5l7zZcJiHWyBa36hEdcWWklskA8CPZ4Xx3i0NuGTbOeBowcd?= =?us-ascii?Q?Ma7ygBBjA9h1NUGn0qvfimFO2Yjv7NUF49gkk7HZsRYjbQe1Vgyt6rSloZmE?= =?us-ascii?Q?e8gJ9OYeHMyaMKRYDXXeZb4F37BatSUzd3zd0IRlR+Rnn+6WiFDYfArsdX3b?= =?us-ascii?Q?HEj6XrCt93g4CsVC2E1ZWeBYWNc9B35VjHIZa9p7WryBWXN7OMXD8NNjuppm?= =?us-ascii?Q?4Swqt7FvPZt1fGY5fZBlvrTQ4JBWMCiX5ChxHoUUruJq/DNcuPcE4YwEc2Ij?= =?us-ascii?Q?mnvY/nS+/Dq2mS7cRBPm/PKP4vttPqNmskFTHNcfVhquECrm/HQo1SQU6eEd?= =?us-ascii?Q?dR+meiZHcoBi4o4HP4JQcntEkhQuEnvS9Vs6G02jib/+BiEYc14Zs7JIcy8j?= =?us-ascii?Q?mAtar5scc002PFDStphjX1u6wzEdmmkVTquYRXGpyVyjZcH60J1vT5xy27Lh?= =?us-ascii?Q?OJ+liNFA5l1kyOAD+CtQaz5oWoMwztEfKf3yh+csVrNnMJ9m8fpaXRjRQhG1?= =?us-ascii?Q?Ug=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95030512-6aed-44ac-7047-08daac0d8d52 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:52:23.2826 (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: U83bJ3xbR7MGjqE5P3NMd318yhPpU5M+i+TCixQxZ/MHyZNheIYjza5sOpK56SPJe25bzVNaE8wPP9wNwqfquw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7722 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c index fcd733e88b02..e4caa2dd8c6f 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -16,16 +16,24 @@ void BPF_PROG(mptcp_sched_first_release, const struct m= ptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_first_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { mptcp_subflow_set_scheduled(data->contexts[0], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops first =3D { .init =3D (void *)mptcp_sched_first_init, .release =3D (void *)mptcp_sched_first_release, + .data_init =3D (void *)bpf_first_data_init, .get_subflow =3D (void *)bpf_first_get_subflow, .name =3D "bpf_first", }; --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2082.outbound.protection.outlook.com [40.107.249.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDE4D17CA for ; Wed, 12 Oct 2022 04:52:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVy4tvUEP2L01yumrNn0b4rNxcR0S12yIjPcABF70nF/Cjkfd1wT6IKthmQLeKcJgTLgjOX3bgrSx4h6YjzM/hPdJR6LZpzxiQqROaKavm4vfj73BcJviFPcXZHGJOoINiYvKGr2d7dB+vncxdBGhPt63HZAC9TnBzFTuoRgGsWLwL/7QoAslZqX2Js3Mu9CGOjSfktpjyAiAG1IlW0HL2AC7YyGrFVSsVGR3tmtytWzTQaMiCD306JT9dcxG2/HF7zZRuXZYDmEdYIxhl+fprFk41jKPRPZSW6D5ClV4gpWVvMHFnEHoZYQNAi0JjnEWS7BcBcnPFgXGlIKIsXm3w== 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=0PVfXsdGgJPJNdmc3V3dkJQzFVGqb+WIe+7PEFL3m80=; b=GfOIEc4lBhJ5VAtPlavzDmdaky88fhRuSgH2DNW1tfnowwIyJIwVxYAjvyLIynKK60nq6HKIP+QG2+cIGyiVZ8cLCkky+34EMq/lH4akXCydcUzBGb2mUZVd7ELj94Xj/1B6ehZtUCQzexyn6zJ7ky/SR/rtCY5e/ggic0kfGuDz9HxFmkj48kBrWlPWPT11d+CJmC7L1Ub7OPpGPxlrX0CsKlmFDtZE/C5PpyEBRkKNfNsrZwa1Qx40djxfxgob8doaifOcGjQfESoeErmW/4xxCdCTmi2w5zMSEQ7AxgGgR5xf6GJu99Atnq3DRD0ejwrhyAnNZmKv9YLztNN/ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0PVfXsdGgJPJNdmc3V3dkJQzFVGqb+WIe+7PEFL3m80=; b=zk3KGWT++Wzt+l6Qg2Fj4Gg7JPjNeUI1ezjetVhvEjKjXLD+gIdfsCp5QEaorlduB+ZRIYGy+ASO4cAYjDsbYIYPhPrc4uukKpU6neZq5C5X8OfdqPvQwYSbsqk4ig7MEOwFjWx5J05lcGhjaVUhIXSzJz3QjawF4uewcJ+W3CtQp/bWrfOlCvQIVcNnuUmb/vSh12iyrOJCUhX7q3YJCHisMYXpFNTFG+rherCsQZAyI/h5W3F5c/oTmFL3YBeyIEtJZYObWbItv5axjGIu0e+1Mbiw5WrEGXl9wUQYA+ihqGxwVMYD57N+L2srBAs7OT6nRUe7hOIEKg5k3YD54g== 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 VI1PR04MB6959.eurprd04.prod.outlook.com (2603:10a6:803:139::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:52:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:52:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 15/16] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Wed, 12 Oct 2022 12:50:36 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYBP286CA0026.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB6959:EE_ X-MS-Office365-Filtering-Correlation-Id: 15f0347f-2997-4191-dcbc-08daac0d928b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vm8AguhfQ+Wi0/sWG6GC5vjVEaDTvVwv2i5k3UbNvNT485SNfxfz2CrkTTlh8zFBGzZ6gK+T61nJc/7sSgAM7RHSvQQvn/K9tZd6yx1w/JppTwfO3GgXQa6CNRXg5s2o7/1PWciwx2oRbSawgyz259Ri6yHswUrygFYf+Q/1Ck0XTpLIbTUsmNxHvxZSCSyKkmr+V1fYXWBtOcP/8qaUmuwUFcA8M+9J0VP2iCOFWVdOheBo+AlhroyCjHwfGm+8RKRcwKuyPlRIWjtTpVbTIgFEI3ZGdUaTGa6zJWsLpFQF4mmwBkF1mXmX+ZB1t0igKiJYbBB3r2E9vI85zuywBqkLkySiUI57+rzgaoJn5LfOU8jxVdBecoFKfCr7Zzm5RAsG0DL9UdeXaQhjMyn6bNhrJpCVaBQ2Txx2LvOAro5rz5iUhVD5L+Oe0kN62NSvj/rQOYjbtYUE2e1nPATjoHtp+ukImGDaRRDczGgtyv36r8fGURypfiuOKd5hNe079zU3ymZOEwyjwsF4j+Jfu2wooBYnqaZgQMJ0gzPWNlp6LO5gSEib/ZWtY1g5qJBEhLzVDsSp3psNWKRaezoa91ikQIUzV246XqjekoGxEJyOKU1PWlq/BONAR5/Ne/Wbe8u1t1DqKm5L01U7lAFJ/7P0hA5DA5i/EA2ZLXD2iqJ8E64s7GxO0MqaeJ6Oq3MxwWb7L7abPc1jKuGnP9f2KSGFrP4UsDlCyFPtzm6GabkzKaUVmkzhGYk9V133cSHc X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(136003)(396003)(376002)(346002)(451199015)(8936002)(2906002)(66476007)(66556008)(66946007)(44832011)(41300700001)(5660300002)(8676002)(4326008)(36756003)(38100700002)(6512007)(6916009)(26005)(107886003)(186003)(6506007)(478600001)(6486002)(316002)(2616005)(83380400001)(86362001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?akRSzEZO2YTlX4Mv4cX9b9MMbjOP9YEambUc3zYf+6RTjCmcZ0che75XPpco?= =?us-ascii?Q?e+XfBQfQ5fy2lTvDQO5X60QBpvRPFFDlOeVRhhvSlfrQBgbbJwqLGEAVAp2H?= =?us-ascii?Q?yuLfWgY4iAwXRR23zeZzzWTBSqSwQD0K6O1Al7WwiM8kheFRG9PlGXIEJjH/?= =?us-ascii?Q?rrldCqQzaF62FIjpFjGEiRZjrx/XrBEq+tbOcwRQyxM3PF+inCNyz98ujc8p?= =?us-ascii?Q?T/NJYOq+E3jGu+99QGdoELO4Cah3YhCr2zcZ9M2b7Nw89y8utePC5PhU2Ldt?= =?us-ascii?Q?JhAUw3nH2AVLrSueMIzc5+axbHZOj1q+xN+sfudD1dcIsMqLb+D5kTzawBai?= =?us-ascii?Q?imhynBSPiaIuiXS9VVBv6yf35FSMXD/r67GScQDXw8/kJzC8PbxQ6eKAKcsM?= =?us-ascii?Q?DfjtIBC06OS7+YeNSwqp43tm+URD7Ti2hrn+MFonxWq2OacU03GN8nC3pLC6?= =?us-ascii?Q?S32K2BpnoHg07xAaF13jb7LUOONShp+0+7YZ5mUveoqXTBLhmnOSSgz5rYYX?= =?us-ascii?Q?4bVg3TlnjHtIgoURmj5xBXTfZPLL0w4112J+T7Y6wEZtnd63TVN0KolZUEXa?= =?us-ascii?Q?kaIyl++rtYIas+6nufwaJhz44092I4TV+MEu6tCBN4o5WY/gnUxxdZCrkgHO?= =?us-ascii?Q?AQ2LCKb7O7m1jQLsQ8lW0j8R6foc3uql9XIqZ7L5aYkFXu0ZH779DvzwvxrJ?= =?us-ascii?Q?FIfvS4HqL1GV0XrMoNz66Z5s+L3UosnpJjwQhoSwZhbYwIfGNHk3/4xxIqbD?= =?us-ascii?Q?Kg5CiVEkGAoSQ9FqIY6yZgFLd4sF8yuY4/8f+4yHIVBRpEKcRUBMRG4PcNWg?= =?us-ascii?Q?hauH/YOPj+ACCSpEN5bMeTlqGYviwWQK63H6C4RkOWe0pAmVNFjW3ZpqpPJr?= =?us-ascii?Q?pqVHBgGSeue2cWYEIK7ZO9vV1DGGf17HvbqDgtqtpfx+krI/u19LHLSkSC0K?= =?us-ascii?Q?6rqU1VpEvU3YAroMeodJfAIHOwscJV+A4XKfxnQaF2WzfCa8JzuNV0NzzK2k?= =?us-ascii?Q?05QmyL4z+Y6uoRX1Te1DoQmgM2JosCq7EW3TARWVVs6Lh9Ic+7jRoqpLHgaZ?= =?us-ascii?Q?upsDL110aA58YgchRZUvHeyAJYzy3B0Kf6xxyulom/AhMRJHJpLkg46dVNwm?= =?us-ascii?Q?0ZWCv8vWntHfIFD4u1TxyUnYe8WjDhCJL0ygioJS7lJqORC10gSSKWDobtTY?= =?us-ascii?Q?OhOsY9FEFRa5MwRWKup5HI1zUQKmcDCYECGQdCcP/2TEiJobmavJMmxDQFP3?= =?us-ascii?Q?r5mFEmLebVg6cM50WokiH98IoEJTj+4RbvP33s47Ij6ctHVKQMoJpCZAxZfF?= =?us-ascii?Q?b4qKojdleicThd324QiIqPpcwP82uvf/SxsDaIqxf2n3U5wS0gsE7wyGD/dS?= =?us-ascii?Q?YlJB9I83lCOTJBGqZhR/WjF6iXV9pvm+2jTfdTsRJNEZx3I8ufUy0zQ7Nd9G?= =?us-ascii?Q?koexGxIy9WPK2QPLYphgflhBThsaCn8NAI7taVvqGietOTXi9RkgjeIF1JRJ?= =?us-ascii?Q?9bGKHgy96owbmyFLAZnomZzh5KUefcBfywPUTaiwXICgaJ+KdFilCFToG8bn?= =?us-ascii?Q?pkNsvoc3Vc+j2VvEmhiQIDY3Wjcef9dQYPJ/LiAy7VVgLO9iW4UgRa2L6IDl?= =?us-ascii?Q?cw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15f0347f-2997-4191-dcbc-08daac0d928b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:52:32.0632 (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: YCRrx0UHiVmUWXQoHruoZOdKqnYvwYpk0ObfjwPPklZA5YfIs6Lixa2rJmPMxLHhC68PnibJE/tLwdF12u/hSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6959 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/tes= ting/selftests/bpf/progs/mptcp_bpf_bkup.c index 949e053e980c..b2724426676e 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -16,8 +16,14 @@ void BPF_PROG(mptcp_sched_bkup_release, const struct mpt= cp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_bkup_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { int nr =3D 0; =20 @@ -32,12 +38,14 @@ void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct = mptcp_sock *msk, } =20 mptcp_subflow_set_scheduled(data->contexts[nr], true); + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops bkup =3D { .init =3D (void *)mptcp_sched_bkup_init, .release =3D (void *)mptcp_sched_bkup_release, + .data_init =3D (void *)bpf_bkup_data_init, .get_subflow =3D (void *)bpf_bkup_get_subflow, .name =3D "bpf_bkup", }; --=20 2.35.3 From nobody Sun Apr 28 20:09:44 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140050.outbound.protection.outlook.com [40.107.14.50]) (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 742B217CA for ; Wed, 12 Oct 2022 04:52:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TcCwN6r/e+8v79tM8W6fnojA/r09tMcqjt6JuDptgwb+yNgrBYU4qPCORJag5yq9yQaUuf8x/1zTZ+leex1mcFQaw3flII2xdYGCWlLshblaysG/wD/PqSHn4l6w1RpEYRRvUUIHyojOECj2104DQLXGD91c5s+XgR+WJmeWm9egXfamwmz/sNK8uk6NTvsiknbbTxAC+eAYzjUN6au103kYvfGvJIEUJOrLTmVI1r/zt6rZD8dTuY/9NBlNRRqArih5JX8npRPIoeU5zR8AD20nS8Jsyl4xnV4eCPEAtqFBfjyCQJQD4G/6b8rYGXfEmS0Xc6XuaTTYKOQvued7KA== 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=6fC+BdENxiyc7CebiQ4TrS61NNftPQY3q6HUYqzm3AE=; b=Gh9gDY9Q2GVTS37wQ7g1npsXrdcheR7f13LHVTiW2SLf7dbKlVGDjawZiGTnKT9n0hnrErmwqUBIxOpfVKhPylSopFwxlMKk655FjMq9Qe4e+RDyeur2H25sAEMZt/daMptBnEkzlN2uJNiPSf18bcOpgtNQyWpkeX9F4OR+Oe1qvTlmjJCZbaxTAK1EIka30hFOSkiNoHEX5DULfFsqTnQm2/Y6D/B+YOddtkIidQrbZdx4UDpt/FwwoQchKCsaEncCzpom0o6zIyrBi5YnfDNHPKVJrnyQerwkVUt4se6yKkmB8lZGS4yBDPkYYqApkzSdlv3ejDAmYwsb7GWEHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6fC+BdENxiyc7CebiQ4TrS61NNftPQY3q6HUYqzm3AE=; b=0XLeK4eecL1Snj/w7R7jYtywBUYyUkF5T5RrGzIFr0MACD0ybuuARj4+YE5Ndy+TvBzFhjE6vFvfDkCsMi8KGEK6PFj7YbZ8H45zdbX0DsK20+p7DHOdBnKjcW3apzmQIJ4DEGPyDqkJt8INgx3ahOOYlBn2sQf0VCfDqaxbqdokILwJgoMLSdKCxrWE7Q7o2D0SQeog58VdpHj2IH63HMBYyLYtYtFGPy5W7vyWlSpA4auOOgRt7Xx9MBTINguC06+HDTl1JsGUU4gXFVI27trU3KYaTjiZxk7ZpNqVGhI740U/SAG9JAng64jXs7knxySy4OAF1MmX/b9JVfsNZQ== 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 VI1PR04MB6959.eurprd04.prod.outlook.com (2603:10a6:803:139::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 04:52:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f426:b04f:d9f1:cd5f%4]) with mapi id 15.20.5709.021; Wed, 12 Oct 2022 04:52:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 16/16] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Wed, 12 Oct 2022 12:50:37 +0800 Message-Id: <28d79bc2db7e326c0f102a2394a89ca20e7f5c53.1665549881.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0002.apcprd04.prod.outlook.com (2603:1096:404:15::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB6959:EE_ X-MS-Office365-Filtering-Correlation-Id: cd70abd2-6f8f-427e-e8e9-08daac0d97a3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qCrHI+S7876K6gsqYNdyBGfqwV9n+KhBxDaNPYWIsrgPODq3ENBaDBCS9ykmq6e8Df1fl6PCHFWLPyiNoxRctbATu4wZ8cTisj9bxi5jUrv7f3cg5LpqugpbDz4G5ZEoTEPZHiVtDdo/06kRFm0gqbr55HlAyudER0zYmflGlMLtSjy2eP9IhNFRzcrbA68/CiOH4O74QxZOwwkkw0PJqDADsmXXoI6xlGFqQlcwnJIWi+o+eiEvj6ZAflDVa8eFBGNg6a49+kUEo8HqaYssEDLq9wfvDA3jnUsM10LgC/xktVGEz0M3I40atSfa1Fbg3b0fq1edALcOL67ahaHyLnKwHNKpu9FMnEpLUW36RePxMm7pNZ4BJ78i6qA0g8s4/YRLWKEIhkANpdIQG2KpFNkHHBpRObQV84QnxnsRi6S0gYqrKiCgTXRseg0d0PaHMgHiiY6mMeqK6b2D6hRCtRjfdVbMQ8+fRaweNOO2U/2zUoCn0FYu7A+dNej1cCikhwrKaGtsrKuRNcn0/mR98kwdZ2LTQY102VsrDYks1Y71tX9bUJz2HZZwdUZQ/stIVSyrr+MWk0AIYg0DUvTqz7lwnNv9hd7ZUtxBDIBT7/QhB0ICeIURNx8dx8xCrr0FgCWmPWsvBTMxUQVx9KQ+kkVf9oH/hT7yUCDlrvKWtfThQfco5kOptqDmuTyGCJqBpES5JDdN5p4m5OeCp0UPkX1EWuh/rsGzmDRt5eRj/e4e/D8Y0I+hJOlXnJl/mWmY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(39860400002)(136003)(396003)(376002)(346002)(451199015)(8936002)(2906002)(66476007)(66556008)(66946007)(44832011)(41300700001)(5660300002)(8676002)(4326008)(36756003)(38100700002)(6512007)(6916009)(26005)(6666004)(107886003)(186003)(6506007)(478600001)(6486002)(316002)(2616005)(83380400001)(86362001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x6kIwtf7Ms81ZjthSGAh4fbH6R1XYgjmqD1+6fp7qVAGFxeFtarg0mXepR+x?= =?us-ascii?Q?jz5/E5hc7zkFTQ5PogOmO9Cf06LwZebKss92DpI/jQpygoDdgca7clfDSGC5?= =?us-ascii?Q?0qifSOHHDR46peZd4bZI8IrSKWc8DKmrRoLqjWM1IaK7JEVGYxNV00Qg8WyF?= =?us-ascii?Q?4GEvAGZFZ15m8XxFJXGJIZGakJ6V2fJ0Lvy8gXDvP3Qx0EZ1Np8M2PoBi//o?= =?us-ascii?Q?akawXJOohHcNKANPPcfFWxcl5DQbQGwi/os7qhPDgCkFl7Lrp1T4GgpkYtUV?= =?us-ascii?Q?FtPP+f9i3ijkQLxZD8ygaWC/3knn1AcA/frjCkx7VJ/HnZTlnj5g7QexZJFY?= =?us-ascii?Q?1/3M9jY/hk6ZUDWfoyr4vvPDEWRpkL/VTVBGB3TlQxg8VzNhyiVZ6HnnNF7w?= =?us-ascii?Q?74gdGgP2QdtwrdyCSKBIEHJ/T7teAag76IGu60YTcsGHq28OU68Bb+FK2X3w?= =?us-ascii?Q?feAj3LmIDvNILnddKrpWNmLnoP9BrgHhN3ChFN7rpaTSjPOFqeqCohrRrHH5?= =?us-ascii?Q?6BH5M4hwFx+2inlWJ4B774aSQMgD/uCd7sQ3lF3VIbnbhZsxPDSJ6axQOMVq?= =?us-ascii?Q?cBpUlKPVww0EQmVVg6wuCpM62AMadpSlH1+UDcScmcG2V4jgMgAdWZeNvDeY?= =?us-ascii?Q?kfhIzvCSUQnFqQdO+50NAS5eyBf3za+3xakcNUP0zlWd9zDVWv87PZGhLp23?= =?us-ascii?Q?6xITx3oYa55+ADg1/q3Ueo1E5gurK80ReC8LSwqG6Y0/s8HOlB4Mc5n7Wcj7?= =?us-ascii?Q?yfrBKB/eoPPLB8yypWuoGMyluGq9mqfZSH5B37qAKmrVK6Up82kiq7Sw44+F?= =?us-ascii?Q?8uUG6HkhP3ZuBJhVmQ/82rBtQ8pRr6pXzBZhJlvKMOiyInM64gC0qYhhDLom?= =?us-ascii?Q?BQ3VbkJtKSfVaFRA9dPoAMbCD2uQDNhmqgZoWwownumUpC2zOq3aPrTReo+E?= =?us-ascii?Q?PnJ0mBT3sGbUWDnyom8ZXmIdxZd3Qz1N2Gsq9af+Cs7XGG8HTIe3mVlMZyhn?= =?us-ascii?Q?x1tG7KM3+JBk5myrdfM8uIzWTSP8gbwvRpFFvngo6YOemqC0JznHf66CoERV?= =?us-ascii?Q?JWq+dNDvSH5lI9S3gAvMw00ty+5m+tSRXXJzY2FxKD2RFmzFvrMmclGwOYUi?= =?us-ascii?Q?Fm3Uexp7TWPKzK5WJA/dotbl03jM1CjquXvzm9B8NBxmsE0s94o/8KMSM8mE?= =?us-ascii?Q?Z6pFq8zm0c9S7sltylRvfICh77fKA/Q4SJcEOsAbChdfh8rpqI195KFhfKhK?= =?us-ascii?Q?vLBYMS8PWwDneKpnUyw5DXn22oBXdbPZeJeY7XHAKCg/b+O7ryeazqOaygXS?= =?us-ascii?Q?G9n2v3/V2o81zF3HNulJgu1IqcFnbtVQRny9Bk26BCmt4zNF2G75G1HqgV4/?= =?us-ascii?Q?pQIKZhrzt+APs90q//f5UNNfhAdR7HPxFETWUJgch1MrvYKgPXVF7H/uzTWb?= =?us-ascii?Q?LGWHtLZ2OsGuUBzsb9KRKGhUimmaV4YVSvmQr1ihXFN4IKnkED+kRSQYYvd7?= =?us-ascii?Q?CEpqeAETjl6v0dU+sf4W/XfQvC5aNluYeJ2ZNaDwvucIP4z+padIDf/bhzTf?= =?us-ascii?Q?QDME9yyVocAPBgYkmW5vV4+dsCsbs5DF3vbV5BBCAh7wOMCUpjF6V4GCPVzc?= =?us-ascii?Q?MA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd70abd2-6f8f-427e-e8e9-08daac0d97a3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 04:52:40.6094 (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: uIOa6tsGSnWZTKOIzPV1mCE75do1gD7q/lVnW3TrobZY0N2gIWjVRTBrY+Y0s6G3l+KoMkLB580GCEhnFrRe2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6959 Content-Type: text/plain; charset="utf-8" Use new API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c index b7156f6aae8b..2d27523b5a7c 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -17,8 +17,14 @@ void BPF_PROG(mptcp_sched_rr_release, const struct mptcp= _sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_rr_data_init, const struct mptcp_sock *msk, struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) { int nr =3D 0; =20 @@ -37,12 +43,14 @@ void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mp= tcp_sock *msk, =20 mptcp_subflow_set_scheduled(data->contexts[nr], true); last_snd =3D data->contexts[nr]->tcp_sock; + return 0; } =20 SEC(".struct_ops") struct mptcp_sched_ops rr =3D { .init =3D (void *)mptcp_sched_rr_init, .release =3D (void *)mptcp_sched_rr_release, + .data_init =3D (void *)bpf_rr_data_init, .get_subflow =3D (void *)bpf_rr_get_subflow, .name =3D "bpf_rr", }; --=20 2.35.3