From nobody Fri May 3 11:17:14 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2044.outbound.protection.outlook.com [40.107.105.44]) (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 1A8B820EB for ; Sat, 27 May 2023 12:55:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVvUw9jdDcPp/FxGZGyKU3N/gjup2r2AFEtA3RHs0bpgW4g4XCRyLY78yzMSzv8FJnm/pNXuyoC5xwGZF91ZHtcMtbeG0wkAu+Mzl8776qh8ni7rQrFn59ua0Xr/b2fxys7Hj88BJLkHd5y3CJESIp/dmaTYtyfR7HomPfKfAfqUYbkuRAng8apMH4UIKg6BqJ2KrqAJ0UduLAhPk0Y1nQKufJXFeCZyRxQD1aBWeoqxciLZ7RZkxvh+JeuFYr3T9b3rPDEhyGhELdGySZWUSs3P1Ll3jnSS/Uj8Lt1Q3JSv7yGNZLSGwf14adzjskdVnwDWFDt4xVRPr3J9bH4zTw== 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=g0ZSqvikR2fSxfDVOU5QIrHLufHY9vGgZNoWC4hWuxY=; b=fvWjQLRmBLeZMUO1SAZqeqjVOv37RiaH4klYMfweq+AvXysHUrCUAAw9LT5q7JmygP7vwFo/TZ/qJyfUSwJEsrdJ6WKV9i/SJz2pNMM+jlNBZ2RSg5QsUiojo64Qd3fzOKGIuM4H4qxqXqkZXsNEpsu+YWqcluKrlriVuEuyez30Npik4f3H4KJRzv4k8D3Mru/tgTQ9KKJhVVJrV2aBunBBpeQfZPbimweMkX1LXrekOTc21i7UA33rQrWsnqXIuVkmxNtbBJeby5yfseWSloQfP1zA4cxdyeEjgL22DevIlDP4ltqnwkudsx819GcYIkCTIMeW0sYGxf1lAZQUkQ== 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=g0ZSqvikR2fSxfDVOU5QIrHLufHY9vGgZNoWC4hWuxY=; b=YJ/O/NW71bdBdzgRRtIMh7FuVh0PzvXtYJRe6rTZlcM8Z4GyjyCkoNUsUB4EgbLKei3ts53AGrz2VO/yQIDHH84DO+ravFp6hPHpQ0AgJqxdKkU2+oiUiTN1XFTgiubjvU9HZgSGOKwyvYuYfKyIl78Rv9AxGA9gDHpqKq5juX3YLQuXiVzi5XoBMl3LzWrFkCtQCB3JARyj5fGSojEGj3pjA2NX9dwTepHUIFDSQSK+HUECI0KOvxJZcZVQfBtI3Wd4KTOw51nm3mK55/oP/QKTN/3+smqy6dNI2TVRH5zAEZ4Pb+kd+aYpfVtR21DhQSaGSSbYGGHfr97XWbay6g== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:55:48 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:55:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/8] Squash to "mptcp: add struct mptcp_sched_ops" Date: Sat, 27 May 2023 20:55:30 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGBP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::28) 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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: d92ba660-899d-434e-feea-08db5eb1b1a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W0FblKBGlzEhSnd9rng1Iwvo4JkqYAFXjTwl2qjqVj0/TyaujJ7pdjljoDIcjYHsqNo1LBkmRCCztgHhh/mdLG2g6C/6m9sfz/dUnKMX7QXvaWOY1T4Cy5Chct/C2vSHtne+ucZlMJTNAjlE7K/RIPIMsP8blI75fZ3iJxBH4NSVnOtU0ZVmta/V4lfkh63UaRkYoMF6WPckJx1Yy8/Pzp/u/ZttibLRnuO9TX+oI8KbGqqY1VDefmQ5I5vHkuhcFELgRG3AYRfCs9HVASochbIBRDRbYNUTyJgZorF7NMbbmNmS+LDg4L0v90WaaJ2v/pm9qo1xVRPEGsw6hMeNkLwkXOt0nL7n/fyFHZKU5GVBztWc1BUauyoyW18ChXNnU+mVJMxxTvfx5DMgKjU485N9beUVEbW+rbO/ffjvcDT+yGkLlQnqncr8rQrcr6jmzv1bp3El+OeIB2925iMn2hO5OOGMlRINvRjuDNUM4QFCaM56H5YPCMbQ1/GVy4Eo0Ff+Uo97YE0NeY7KXD/6eGAbXIkRaNhN+ac9IdRz+qjk5kJDrsfF3wZMgAK1/ZQO 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(6666004)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(4744005)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fJPi6JC2yZiopT1Bo/Z4a0zWRy1JcrtazgpvLCAikKf3ygyNhbGtu4GM5BlE?= =?us-ascii?Q?fW0Ziw0X3Zss35hD1LZkWrz3aJMSJdXECLd+YOSWetAe1ZvhQIP/z2ATY0l9?= =?us-ascii?Q?8DEPkvU8OV3hTzmfB/JbdWaawSZsXnrtwGLecnQSZFJ6L7sQ0ZnWgskYYb+f?= =?us-ascii?Q?JxSBEFbStjnpvlQgcBy8xUoG6eHPUO6PC3v9r2WLuYOTQxw66zfyNVPrmHMT?= =?us-ascii?Q?gjl7u4w3Orv4G10FRjhnf1XuvzXBNL9+X0SYOSmCw3a4+yFWiUIycFB/WrHI?= =?us-ascii?Q?iS40RcEEAXRl0TXKBtCpYZPpgHTv64gsYJkbY5s4Ab5/+iaRvluhX3zxyRHx?= =?us-ascii?Q?D8cJtdf8dlbPamSHy5xQbNMZu7ofhiRRX1QFWvl1bMV8wvodQD9hwF/1GMLh?= =?us-ascii?Q?nv/m4SDzenAUL472ccmrsETGCLcqgnP23iqOG+xUeyNoSPeA5FUrGyYJ0jwQ?= =?us-ascii?Q?hy1FYIPSvrTQ9F4P9QmOzL7vLdq+tpslEQwpcxPH/RxPTSRXiFl/JV77WwlE?= =?us-ascii?Q?WxOfNgGAEjWYKSB4Pf0hSf4lz7ETOWJhautlGonFLzSMFk8PwS3wtt/5L35K?= =?us-ascii?Q?djHzgBtv8yknc1IEcGRK2UG5ufFPfWwv2CnsMFQ8rIb5zC/xhcpFLJX0aRYo?= =?us-ascii?Q?+kxOLTuKEChcYW00MKN7sF0EPC8dzP493FGIuvUg07qpyjrR5d6lznVu3fEy?= =?us-ascii?Q?ebARPCuRC+ny6RVsSoM68hVqd09lGa90e0qH1a6VRM5DdcpcJEHsUQgodpSL?= =?us-ascii?Q?ZDKlHqNORXGGlde5BXznPzFXdn4Evh8Ipg1csmxoYPjUW/kvJVg1ZvhF4JYQ?= =?us-ascii?Q?U2DOVmhI8iwDBVl/MpMn0I92tpc134wC1uN7f/WmGjbms/kJm3sfVDTIEWTN?= =?us-ascii?Q?/EC4mMYxC5Dn+jr6Mgo/A+0RnPbpi82ZZv7RvenwrSD2NLQHvSiTFGMmuFyx?= =?us-ascii?Q?q/OMG6jFqjkw5CQM+sYFVYnfRh91qVtAOwCj/ngPJFnkROnts+CY0zarbkdE?= =?us-ascii?Q?7KAnBq7dwRnAw4YMHl69AQ6Zw/upZlmhnDv/r+Iyj1H09P4mhmTqyKFJJYes?= =?us-ascii?Q?tHPAmzDXq8XOarm6PrQdxBlVCiF7R/T+g2dt5yinDjeQjDIlN9qFrs79iOny?= =?us-ascii?Q?Sfn3FLCq92BpPVrOvZZLFeKVWx6SGz0ew0nIuY+unpG4CDy+pKTzhPr9U5Id?= =?us-ascii?Q?EusaZunEFRpNm2qAakB8GF9fmBctLul+ejnKr3yvRGyYK2nbM/jtQE9/z91Q?= =?us-ascii?Q?vYkRIVtw0UgiJbAvQ/v8wdHsbxQQ3yOka30DgrQMtqfKw/n6uGW/Y1pbsyuM?= =?us-ascii?Q?eaivS1M2d5IKk7wlopBjSj1v8MFjho3UK3riy6zeEA/i0/NG2W462RvlSzvT?= =?us-ascii?Q?guJDhH4zqYdKmdAx4OkL2Sm1tyjL0k5VE9Fk3ZpY7ddQwiWrmOfLQtxsGK6u?= =?us-ascii?Q?EwybJPosJnkpBc4IPeuwlqhX5y4M0BLGfR3P7M8BVzobna3y5AtSx0bWIGB+?= =?us-ascii?Q?AdjkKMbxDARVjLZxUh6xAval1SR3j3QgLZ+ptEciu7/8eSZWVgNY5EoDozDC?= =?us-ascii?Q?3JyVcZksNQl0fYEa/RDXnrhMvhJ1JjYyd3f65/gy?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d92ba660-899d-434e-feea-08db5eb1b1a5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:55:48.7414 (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: OmKmnwIvqSm5YYlTIQOeRzsB+bANU828v/iZS8ZPKAEwWZeD+tN/lrpxlqIgU5TtfaeOLEiOh2qgk/kSVsLGYw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" Use two tabs. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 828b10ddabee..4bba29c99172 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -100,7 +100,7 @@ struct mptcp_out_options { #define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_sched_data { - bool reinject; + bool reinject; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2042.outbound.protection.outlook.com [40.107.105.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 8650320EB for ; Sat, 27 May 2023 12:55:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FJCRyDCAn3Knds2941sKRCz3Pp6jrjFXYzCiDINTCfcmHDUTvgl5gCIuuGNJY26j/bYlrKFh9G52YcvY9rVnMp5UV91QAC+5jXo/cmhqE+mbd69F1+q0t7NJAROc47LspKQgx/8agC7oWI0dGAm310KPuosyo7ofavHSZ2AmGgSQlSS2uPjGTgp2V4wyHzkKglaOBUKchnJktDxG/eC4eJo7cKUmZ8YMc/6Gk4EaKD0Jk3xdfxN/mp1xeOIWvOBKiAGb6cpsEzYkS8SQ57vRoJ9iToijfhqBZ9RM4Fljqk/gZh5qxcyv3HotTRuPcRxPdlL1RsmlWzj1ykNOrFg0Yg== 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=CymOiuvSfL5wcTfwoa2xmLmU2Wyea0af6QThOQ8sUsk=; b=oQlJdyljgn1IpJ/ZtcCHZasDoGBB5K2yJdkmUgDmxcRI1F4UJwh8VWjc9zWvkyp7LJ1xrmYZuorPZASGz+ILCAGyZjsH6tLd2TNYwTk5oQZSc55BvzZAllNEgw3So2/Ja8SgkkWLJ5qJOcUR8EVQmPzrprPvOwt5DPLzWqe+fOKYePELHg5V+xxZM9kJ14j13ACTx+j7871BLUUc16r3sGmP1Ix5cUAPa1M5gDem6DKpQ1UZEXGiSwwAhopvDxxbMoNZP2Cq6/oPNHo6NhHvdK93JZUWE7afYaaam+7fV149PYQt1DmGn++ZcHneb+7Sx4YcL7Qe8U1CE2Yjz+4pQw== 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=CymOiuvSfL5wcTfwoa2xmLmU2Wyea0af6QThOQ8sUsk=; b=dN7kwlDp9EGCIODD/1tTbynZZGMOHNxVFdEIEgu2syTT7WinLuRtD3xuBmGsELyjjWZVoIhLpNG3P08hnyY3ihswTkvP9WZk80lbE5Bsj0V8rwo0Q15cdOUJyYon2rugvSbH07iiMiMv3SPf/E3Sn2nspta4k4obiU9OxuCqLb+N134iXn5ZAho9kVHC7nxcKyw0GI62Hu8Gg2PaBmWFiHYEQzp6QF0nFWd5oZIloPplEyt/O6x0oEM+SwmzhJzl2gdArLjpb0PL38pnUmcr3TGNQonduZFYYotyroK8hhkSKmWFDPoDSt2HOaecf03TCuq+1hSKlcKCbfTVHvXEIw== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:55:55 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:55:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/8] Squash to "mptcp: add sched in mptcp_sock" Date: Sat, 27 May 2023 20:55:31 +0800 Message-Id: <1b864e2eb89ea8ffc974ff9f52340517052735b1.1685191581.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGBP274CA0023.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: 4117f3d6-e093-4476-d154-08db5eb1b579 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yyd9bVH3hDDZQu8+/p4OId7cjSjYWDW3o1xk4YH5xXhj/jL3nX0+HxI2kMPeFcduZA738H42ZI47XBqI0tTOzBMuL0smnAOgXxM4jYq2W1TxEsrlHQkIByQQgVguyXPk7InoeVERAbXn5iRPoK6dLgnwrKkZ5chS1DCJzyGj51xx/HLXzutXaaXf58Ed/rMwwcCNu5IJMDfapxSiGeetUCtKT4VKmK7tRa0p3+OX2ap//n9JUIFcKriATFbG1JW17eb1YxsnwBPXebxardu7it6xhLAJuJ7f+dGAB7kZIvWx131s9M8jPHoCJLyjv+Rux6Y9A2mn/7EhUrdXToL26Bn18Q2jaz6J4hFiRX4Ywupco347uj0oSbocRt8DG1RMo6VQxAJabcdCzek+/Ue8ZyfFStk6ALwhpaBQxRxCuZqD8uiXUpZ9iH/N06XBif6g6QfDoiyQSAy53UZ7NALQp6QMwE4+6OrnzguEPhzj91eKATKK0Mc8C/m9cy+2bn6EaDNs+kVBIORMB8vu7ABuU3qnr/DWzn/NTmYs7d6on+HiUeWh6Vd+QxkLYy34BUSf 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(6666004)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(478600001)(86362001)(186003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bup0n6JApNlM5ajv3BaQRrF/A/DlrCALWIZSbURe2sqFWS4F/8yXv05uLPjg?= =?us-ascii?Q?f4YCWp2LpRlrFpGpzLySXUeLeJcyBDt9LDdNmNvq7zxSapUQ2CVsHXOUlRDe?= =?us-ascii?Q?AchhtRzbn5kyIPb/z6nWYojcblRYffmOMFAfBHLYqty3E2Ag8dEr/EMPjrKd?= =?us-ascii?Q?dj6V6Vb9GV1MJRAKL6BqYjelQSl6aGFQp2rtnb5sqSVuuh7P7qfPqzljRG3t?= =?us-ascii?Q?WfRKP+6J21anrdz2uN/yAshzHu/vg4UyEbJGckHPaUlLqpckowNvj6K1dWe8?= =?us-ascii?Q?DtlmIPRoy8hSZOAeUUpLJA9Sv3hSmh6Hep5cIejtLIu6CwyeiIHhnAdsGTBo?= =?us-ascii?Q?v5EOMEnuECNyzcxiorgGw8yoBSYMJzmoyJwRLyBZTMD/2xCUpdOLerDrnZOG?= =?us-ascii?Q?q7YvH7c8sB5AU7uCb+eNjHqRNwkscnWDbv45OSVxM4a5R9cxH+4bBA339lCZ?= =?us-ascii?Q?WvBVs0l/JHeFe0mBOz8wpsznVueR80NkNK+4uO3odmQbAgjyfagHdVa8P7fr?= =?us-ascii?Q?yjlVZufAbnXnmCKy0zvhpqlvSPaZpJURnv/nSi568G+fVFDF/wSZCsV+Is/9?= =?us-ascii?Q?qOspUX7ImebiJTEGR8KKOw1OwCTCG7RojDUqSFtxHIZkVE5XkQIOAH8AoSjP?= =?us-ascii?Q?09r/XDOdvooki7HIPEI97qanfNejkigJwVHYMl/BakCoD0pa4AkMZXoZX7qC?= =?us-ascii?Q?dniWCNImLrm5FuVG/qT0gntLSJEizYKzycLBgIk7+jZ8sRvlT7SfZpi0j9sr?= =?us-ascii?Q?qgSFSvCFSV/STeiV1waqhde7pDd38Bn0PWXsA3u3O7DTrdZxiBLJgj5aYBx5?= =?us-ascii?Q?YmLcneUHPzS7yulQyj5AYTE/73Gcv6fjiQpDJfJTLQu7ZnDM2fdFt+Au535i?= =?us-ascii?Q?Mf9P/sw1LdPdMl6k26rgS4cGC+9iICOeWmtCEQLIcceHOZQYiMmBuJZuRDVq?= =?us-ascii?Q?a0uWGwpbNRqzvOeTJTy2qB9DKe1Ac0MlwzFcpXH8J4i8sZXx9huiNMZ+o4y2?= =?us-ascii?Q?lq29TEZayATLj0vKdLJ6wOkLJW4XsTBWZvNlnB1B3o5f8eYwqzVxYimw7NVS?= =?us-ascii?Q?Ueiy+OroJLsGuumMewIoEBprbeTRCicHxN126lhlsIDFOgWIGYLTQL8qZFhF?= =?us-ascii?Q?kYU0IOLs+7DzZYAon4bAjJ+8OxGRfMm7Ug3HzGDv1Ig6J0KnyGBZhRidtg6h?= =?us-ascii?Q?Ejfc6z2PRTiQrwEvwtV9gcQ6H4/S1tmrgLBzNCxMalh/ya4pUP+FytPXl/pM?= =?us-ascii?Q?mTU22mblG8vguxYchvhFcs0mtzCm/Y/1j0HV58sxQPRDOxoMQ/bPs4ROLPgd?= =?us-ascii?Q?XL9wv5KM0U6Hm0d9wryDxEEnToHt7mDmdNIaUd8vkJoHkXtVf0+5kRWqiwO8?= =?us-ascii?Q?63V/LldjWQXJ26M1OpRFDLFMsGgoa2tdyBCNNxeukeUKIDvqU7sul7AR7xDe?= =?us-ascii?Q?kDBFRizcetl8vLrWFQIhFrv3VhqyowerpUjHq5tcdBSJFK4aMlDlJM9NUXM0?= =?us-ascii?Q?uZzbx2dAidIV6cIETXjmtbFP5/nwgoVz5V1RrNOZ+K3PQObWpmQ6Vshz3o8y?= =?us-ascii?Q?XbK05OBwCyJnb3NgQZa6PCeg6gqxHCPDknTTEw9Q?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4117f3d6-e093-4476-d154-08db5eb1b579 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:55:55.1431 (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: cRXrl9DDxDcj+MHYv4+nqqa+Cfzta2iurMz3/X7J9ihy2fl6HUL4O1o1+WuldromgzNDX+BHOOhSMN8qxSORRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" Add sched_data pointer into mptcp_sock too. Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bd3771c7d79d..09a5e23adca1 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -311,6 +311,7 @@ struct mptcp_sock { */ struct sock *first; struct mptcp_pm_data pm; + struct mptcp_sched_data *data; struct mptcp_sched_ops *sched; struct { u32 space; /* bytes copied in last measurement window */ diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index c7c167e48d72..fb0a5004980f 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -64,6 +64,10 @@ int mptcp_init_sched(struct mptcp_sock *msk, if (!bpf_try_module_get(sched, sched->owner)) return -EBUSY; =20 + msk->data =3D kzalloc(sizeof(struct mptcp_sched_data), GFP_ATOMIC); + if (!msk->data) + return -ENOMEM; + msk->sched =3D sched; if (msk->sched->init) msk->sched->init(msk); @@ -81,6 +85,8 @@ void mptcp_release_sched(struct mptcp_sock *msk) if (!sched) return; =20 + if (msk->data) + kfree(msk->data); msk->sched =3D NULL; if (sched->release) sched->release(msk); --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2040.outbound.protection.outlook.com [40.107.105.40]) (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 0497220EB for ; Sat, 27 May 2023 12:56:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3QGbGG8uKeW5cJGxp53emYBYQ0ftzIZQyrHr0A+MHOXOsfW+zzaFeLOGlLvU7D1bFXNltdDCMU+ueov7W81bXVVwjNjQFuH6LWkUZcphSm39y5W1JWnEDwdfPKIHV5wxiFFBPCpC+qqw3BjthpZlGqFry7c4895yVFte01GQ5X/mYAlh+TI90nHLc+v41GSJ6Fwsv0WusaH2YpCk+84+kmAzTFp1uKbejXqL66pxyO1Pl2ciCf/522PeRaena6jkwZmyK9RZqt9zplMFz7anLITsgm6DefdYFlyhmAifbrSsWnGjooBHw7qfM2J7UON8kS/IoJ3Q/3jrPlpsRw3cQ== 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=nQ9H09HbhNbOHAC+Ffjd/nb9kksQBT6yOON7SkFuDLk=; b=aZw5eivHVLJLzaZ3OHBLs1vhaSO5pD4BvPUQSowZvfigeRzMxeV91tPkdDqzuGbQrptx6k7ChbzrAoZmDnFicFaiijegquiqLyEIjIOSdoCHkgvmzpwiQLZR02jLHt41HIi/7NfksTFASePxdSP5Ttpv/CEsaXQcvYEmrmKpGXBpVQiB3unbZ/xY7q6lNnWwzvkJ76TO8LSDeo3fqwU8stWj3THBdGT+quMNSiyyLyYPlJ3Vww9a0bBcZegatWahpQxj93x80z4GZfPT+QVALuVzZ1hovpLPE69Vza1cT9YPh/ZGSFEv6BOvRU6Hb8NYKyGrpUkq/S1kQo3aCvtCjg== 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=nQ9H09HbhNbOHAC+Ffjd/nb9kksQBT6yOON7SkFuDLk=; b=200ZI0lUhiLf5/onfWzH+XfQCSAyqagwMpm7dbLaga/8nP8q75YHT85FIIVXvtVhFlHoIVUF49SS4gWZ+FfgmKMZoAgTpcCpXds3/F0iuglbL083pX9Ih+ESHh4K1HnzgQQ5dOgYLO4lcmJrgsfXjmyf3dgEchUlbRRJEsYeMejQs3whUdVKnafbQvuABONkpE5r/SKcWusz/NoC9Ivl+riXry+5j/T0wITxHIfEFLUH3aPP0gfwMWM/TvgSr82y17XKWX6xbiBcEXj9waopJzTPuR+J1DM6CShxfL/nd9n94KU9U1tYxqihstFk++NmRBmU4khLafqf0LuRvHF6vQ== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:56:02 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:56:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/8] Squash to "mptcp: add scheduler wrappers" Date: Sat, 27 May 2023 20:55:32 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0100.apcprd03.prod.outlook.com (2603:1096:4:7c::28) 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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: 5381ead5-5374-4cf7-7273-08db5eb1b9e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LBM9xGBUINKPzkb+rViQF9xMUzVtwE/b7oik7qO4zPWdpgc2MLeBZ/0nFjnkvV8sbnqSVh0kUEn3BA8byaInhn1hlovsqEDMxGH8CwScWq8hpIQHM05BotZDVDNkuKBpYJ0YHEpQh+8ipi72/xmmsKHWeJRBRup6gnd+WbeEOxXlAZp9ZTk3DDZgWlditZg93U1a9q7MiH0b+DHF/APB0O+WSkRPHc0SB7s3yhaeCEpuSKHOIYpOfXJo3qPDj1pgPnpFJ1X5286+L7gj0JOrc61a/rY9SsoSBkQTejmLzjLuiCAFLa5Jpg7ohkt/LFZmQAHp8YvkAXZ2BPHuepaKGG2Fvj+bxYas06+KFB2905m/4m4ZK+Bn+LGgUvJgDVJV427qQmuJEs1QNprlpL11lca8EDwE2pQvMVYkC3hOS8yr+zr8ujngOOeIr9Hu70JoAC+SFhM2evJRHRpg1+Jh912UVFizS4t1xLfyFLQO+I0vZU9OwOFAJXPF9QtSkz3ffUL+FKEX6dOJMAVaYbMHyCQLf3HPeQr6KZHF9cMqZoaGlYq1FEl8DFhyv1X79eIq 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(6666004)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oH2nSKEFeMJyW56gQGgSMclzm77Dw5heO7W1gqlWa88LsmEmsKxQtelqZQYk?= =?us-ascii?Q?Irh547f9V5fj+zfbh7CepFBSLOwrrx0fpagyuEHDrAi40rWsfxkFMRH11XxR?= =?us-ascii?Q?P8HZrWqhJkJc8vAFFoS3Iz797zyTcuZm807uA2uSKWi+Y4gjBaLRQWf+hh6a?= =?us-ascii?Q?tSR9J52a1NKA+Skf3QDp8C5PUVZGezAY6OS8T4YdNbBZLrdeC6EPC+dLAPZl?= =?us-ascii?Q?Azh2AqtLvYg1Dzw2ZAGhEUeEPtlvPDI3Eu/8NEVE7giNnhPWORMZaMUrrevE?= =?us-ascii?Q?8EXsZN9324xWZE7hcsosw5Quti/4piCVga93yjHqrbZLsAExFF/14sDtN+aI?= =?us-ascii?Q?7xiq8E5K/jlhm2iBAt3JDildscGNzgMkF5J9RTfEwIeTr6woQ03UZGAamn7h?= =?us-ascii?Q?dIN2XjSp/QBE4rklHsVBXwHXHsSTG2SKJwSaAcNewzSzMKfRLgmV6TALknJP?= =?us-ascii?Q?Y95RGMQwGhfHwWNe7mUgtqHc6hOUBVfk24qBGU8j84e2Xko9/177W+RMJb2O?= =?us-ascii?Q?xIhM3uxs1gbVKTigY8hsHGr5+lpOve8gQ+GDZLl5o4h6sVpGUvOnLCRSUk3t?= =?us-ascii?Q?E4jz/AjgKYjGdpGPRpAQa9OCtqncCOkdukmgQe0or+q0L0DwjIAUklLZ9c37?= =?us-ascii?Q?/jqNlIQldNiNnBIsrP6jviziRzg03FlBBjSWK4/bSQbbn1WxgfefQnjQQf/A?= =?us-ascii?Q?yGVybupnt7DYXDcpYVJKlH2vidKB18CkdoG4m3NPEFGAgXq5clFbw9+4QqUm?= =?us-ascii?Q?7jhMkdJ87EDkAuvUEqzSx5awk8LeLTe6NDUyZq/kxArNmG5wZoG9SjLpNTM/?= =?us-ascii?Q?wImVoytV+x/OMbh4WC50n4OMUtz87TUgJV/btvi28nBDu4LSvH56+Abcbtzk?= =?us-ascii?Q?w9H/sxy3XH9gNxClRLesDpR9y3UlG0FTLCREHWt0pZax0fjL2AF8PdCOLdB4?= =?us-ascii?Q?kFz6W1aYGAx3K/Mk6Ox7vtO/gQjB9ozXm+xVdb2fxRZT2JtVuqrwzbhov18U?= =?us-ascii?Q?qa4qM5QjFky0HftetQOC0r4V5XDuiOdPvYVsCO4LQXnw8PG3FOg/1mjXnutv?= =?us-ascii?Q?GF0nf67+5MFpmGx4EoWfP/riSeWaEpC6jzsSFrr6jrcrEWeC6xdiIH7Ro+yf?= =?us-ascii?Q?D55VKjUZN/AV9XwTj0H5Hj5xJln+XKz0w9nZxeWQoj83CvhFeU3cW25BYR7E?= =?us-ascii?Q?uI2JhvCe0RIcIkAFR/vHA3gxkntMRqE5C3lReGq6wjgJN/ygLaNqmeEe7qgY?= =?us-ascii?Q?JjltlUe3d0Tq4iYwUNWBLWmQJDsFYGUIB3tDJPb53q6MtllG7cEMLhH2vcbC?= =?us-ascii?Q?1r7r1xF7fgHAwzg8958aDMb/2moZ85nS0uYUyi14vOWWfd+gjtcAXQCdtihA?= =?us-ascii?Q?1mOEzIybHdgvsvfQxmsGKOMqapXg79zdmjMLT5hLax5M1dwzO35FNQnqCNZ9?= =?us-ascii?Q?euwbxU1U7ssXBfL/oFu2JVlJyqLQNBZJwa/mjT2mDc+GF/tvfhYT5XmEscxu?= =?us-ascii?Q?x8PI3L5C3jEuWSKDAH1v1KgoLilJonyY4Wb4tfEOqVKOw8mBD4nkmyDkSF6s?= =?us-ascii?Q?FJBJq/VtGU/4zxudRhGNpyV7eK9O6yuxbuElKtXe?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5381ead5-5374-4cf7-7273-08db5eb1b9e1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:56:02.5258 (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: lcF0Wt7zj/ZDzDdlrxWVGVJIKUYbs+o+YZxZEiNjxe3KbKAOG3hgRAohabTz4oGPEw+7AP5DcY1PFXdv6EJn5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" Use msk->data instead of the local variable data. Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index fb0a5004980f..414b646dc9b1 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -122,7 +122,6 @@ void mptcp_sched_data_set_contexts(const struct mptcp_s= ock *msk, int mptcp_sched_get_send(struct mptcp_sock *msk) { struct mptcp_subflow_context *subflow; - struct mptcp_sched_data data; =20 msk_owned_by_me(msk); =20 @@ -152,15 +151,14 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) return 0; } =20 - data.reinject =3D false; - msk->sched->data_init(msk, &data); - return msk->sched->get_subflow(msk, &data); + msk->data->reinject =3D false; + msk->sched->data_init(msk, msk->data); + return msk->sched->get_subflow(msk, msk->data); } =20 int mptcp_sched_get_retrans(struct mptcp_sock *msk) { struct mptcp_subflow_context *subflow; - struct mptcp_sched_data data; =20 msk_owned_by_me(msk); =20 @@ -183,7 +181,7 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) return 0; } =20 - data.reinject =3D true; - msk->sched->data_init(msk, &data); - return msk->sched->get_subflow(msk, &data); + msk->data->reinject =3D true; + msk->sched->data_init(msk, msk->data); + return msk->sched->get_subflow(msk, msk->data); } --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2053.outbound.protection.outlook.com [40.107.7.53]) (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 E871E20EB for ; Sat, 27 May 2023 12:56:12 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SiZm9PoMCbsxUENBjUnLy3Y0albgyLNqTUC+LAGxcWETdh8XFABOUtCGnZEwwKJb125p4wNOk1AnycXYI6VBAU1qRSQpWFLVNPv1Ug66Pfa8yNEf+VFHCVfNeqFq0oSwPNpTpYQzk5eJru6vI5BAsWlBZHXkOCgUzhUMYCxaeLizLofGqALsR766y85xoH/C7TBr5OBxsGDrFb0UD6yE8r3KQaQf5oZrhAhXmHocsUP71eK2CsEZSpjpUQV/T99UvSxTSHlsPr584SfDmRqDIehZF/Bh7e1EsSIO/jf9pxoLYO46vXohCNuO3DitqA1sju2dcSfY+xZB6M+r3q/O1g== 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=I/qjHRg7jJjBUegLayDwYwe8+M0QqEH65ES/mnOKsAo=; b=DmR1LseF5BQhfWljxlQg0igD7g18lK5Fj4FhlZcI1QkFSX/4A4m7RBeertG4uUIEt2NoV9gcbZkyJXgBk9K24zk9XB1A8KnzddgL1liEXyWwODHrygVfZ4b+fRmlW/aCkaqmjmyBD9vge8hCShZ8y+IyU5A+li3zny32VjtkinHzU/aXN+I6H0hM3R9/8VWOiyurPu1XUCZ0FMqlgbJ7PPdTTfmNu3wdbnS8oBawl7G2m3qs69QwT9Wa0PTgDSvNSZWNm/nS9A7U2xd55bga6xIWEbvZPLbxvv8o3VFhhYvTC2zyY/vUA7Q6VA5L7tkJVSov5fqrSwsaUZIzD3s9hg== 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=I/qjHRg7jJjBUegLayDwYwe8+M0QqEH65ES/mnOKsAo=; b=Hy4X2sNHOYbbZiGNYkOyLNtLvUEjWX/Tt7cRpfsxi9G8EXmw6JP7xvWbnxg2vp9ntKp6tJoKjKbJDs1mOKtVNEG0OIx30p+lto1/GY/ZA06FBZdPApjBFyKTobt2FIZHBV7IZEwDRfhCR5miK0+6ARdDdJ45FPUaFMKokmYf6kUxEPmhcl4/aSZi9erfdFf0QRlsNiUhY+9CiWjAOl5EyoqqEA9i22ELCulWC4P0qNpD/rYynF+TC7WH7/moFXvXtPsRWF1uQm4BCVIRH2VxJAGrx9sPlPKFHElLQGx0wiuXdsc4C42jI9Nx0jrAfX/o9kXWrBJ3zl8ADfMr/n08DQ== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:56:09 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:56:09 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/8] mptcp: add last_snd in sched_data Date: Sat, 27 May 2023 20:55:33 +0800 Message-Id: <93395093f67a860f818b0f34ba1770f6bdf59dcd.1685191581.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0093.apcprd03.prod.outlook.com (2603:1096:4:7c::21) 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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: b605a100-b33e-4a2a-c7e7-08db5eb1be1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2TITwV1jTXbn8Zpk00Ge8u1WI43a/1Z69hY/prkPV5YILcbybZpYIr854Oq4N6u32gT07mU6FUfwtHkLr3jLT/XetF3eo2UD1QXbkAQnweheet9Tt7p9b5tJyzqnpmqZ6A4mozY4maFdEzYFeOnfB9EaFR2OKQUxfJLCO8wLieao4orIe1u0NOOHQA8hhEz2tr+x75PQjjvo9ACsFHsXCEzyeL41CVpWdd+Gir8xOVe0gwA8VGiDRoVgITnjgHobM5/F2BQyIt+xVGS1V+nXAqUjweElrIk02jQTJCxYN/9U676ZvSUXtmYcayAvUiHjpP01nNYyVBC3s3fLdC9B0a3+Cf66LeARfQSPhFmfqbzTU8xuUbTsGK1hIQP/6znexLSh0nUrw7o/Y6mQUpRhzhoAWX1AHwRWQANL7NR6zY23vAdIqhX1xxUqz0T4BoOF4a2YIIPnnJrjSFqGUuTjKhuP1nPjJ3fQQFCRkFuSgtu2Zeez/82cDxpN9vYCBjOqofI/0GoV4lFUdh5MThUnZ6IiV5YDI7TcMG6/gQukeaEFZRXm4EGHylqZpAPrlXdm 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(6666004)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YE6lgbRS+0R6PWQJphK58ppSS77dk5jgEKc1FGGGAomlEXSWEGY4Mzdwt6yg?= =?us-ascii?Q?a6o1K4VCZQzS0S+JS92thB1Cz/NiPZqYfoNR7+l1WozmP/iOqyDKNUdOZt8w?= =?us-ascii?Q?6H84O35FKfLKDka1IyU7+7jMexZ4jk6T1hbtUt/j4cq+sQacTv5Z2/POXG8N?= =?us-ascii?Q?WlsAaXYRUGvfAsjox2MxotFwSlKMD5O7V0Rt6Dj2ncBlfi+yT7qookTnqvR9?= =?us-ascii?Q?fzY399Y2jjcjz7cy6WpjHMT6YAuZZRVXge3mVaoVU0rMYld9Ns9XPZ1gCLas?= =?us-ascii?Q?OffQMWXloi99G2AXZVQnhS9TcRK7xsl1+UYvpl7eGmJb7yss7UxDK5eyBMi4?= =?us-ascii?Q?oTLntvvNsYCImEhftZ5SDaQbq3QDYtwhf9n5jwzAEHDZ+kEG5zxvudoYBbBp?= =?us-ascii?Q?VIpLvLoZDlR1bUzzEaArNheTQJ42TAD/K/qZ/bOsyAOY7xw2jy0h42sr/ENT?= =?us-ascii?Q?L518CTd5RwzT5ZgY8DTaqvyhgcvkQGtWjOPL9MFlbrwRO35TeSX4E3ILtUbF?= =?us-ascii?Q?V1Dx1K7yDtgPyz4Wmb3QlPGRgv5B2NYl1OaS/VwO4QpglWmXCs7W/ws1u+S7?= =?us-ascii?Q?lHTNagLFdDqsUyH5Co9rTN10j5T+l9UAURbvVmnrpUiHGQFjvhpd4UHb+zUq?= =?us-ascii?Q?iBuso+HNcC2+nuN5AW9rZaNb17ibHnzDJoy5Txv8yDpYoaFGrJ1Qlj8OLGzE?= =?us-ascii?Q?x4TUAuJ3eIJ4OUoKSn0bIKZEz06AObhnyLyfdqi3Omg0EVvLvoiqZnQu9Fxd?= =?us-ascii?Q?lXVcLzIMAagWMd+43/tSZ7zjHlnRJRJUH7nQM2wU6Omyw+Pv5pqLs/KngEH5?= =?us-ascii?Q?vh5rIJuKNtKfS50q89rDfv4Zhqqx+q5dLOkYKvUT4eE/fhqgJvwJdYBFhZSF?= =?us-ascii?Q?3R7eBRMses888GT6bgqFasijTVY1d2Bt1ckZMaHJNB9JdzrgsvAFbQ9Xwb6O?= =?us-ascii?Q?0WXias9vdoKhVBfc/epdVoojt+1DU/ciYuuindZQMnyG9okqbJxx5T4XoyuJ?= =?us-ascii?Q?Da4wjHnkQuoMlwu1qzj5f0cO9GycCH5mfXIQCMM9ygWx+g59kiFhQYupkgA6?= =?us-ascii?Q?vYYAA+Mct93TKw+7w9RSfUc7TlEHQjlV0Wv/n5Xwq8u2jec1bDXg7ZgCilMr?= =?us-ascii?Q?pyffSKBvwusMrsl+gTMO7E66ZYmgJ1w3+SS+yCQ0Ar6knzkqvdKPivvCYvX5?= =?us-ascii?Q?P6qXdOUuC+3j7tbarLIjLEiuxL65qiqFyYs8IEtavnJGR4Wy7WFpcZdmFRMf?= =?us-ascii?Q?GyB8PQI+YeIH4ujLr5YIj/lMqRp5I8XF9myxt7ccSIZhG2ezVQ2JVrfIqrRS?= =?us-ascii?Q?Yui8w/kFbFIxrrctvdXT7C9Ub7KJqwAGyokxq0bbWGKSaEsU4cgbzopS23bT?= =?us-ascii?Q?WA92bgqqljS1tsRX/3EhEwQEdyupmQKstT0qFRs206XiP4wkFv63NekDp1E8?= =?us-ascii?Q?WuBz3DWXs6nge4VFG3I7tPnyJL8HCkX9ooiL2AP8BqdbmDo3MvG2w7QthZHb?= =?us-ascii?Q?DNeNNYvTieVVk0S1hlVy/FBX1kekTHzdSRrKRwUOuXM0GzwRxLXQnz2OOToH?= =?us-ascii?Q?zx62wqB08HPgkz6R+VAoJ9ODxmsObTm16WVaGnKj?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b605a100-b33e-4a2a-c7e7-08db5eb1be1b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:56:09.8222 (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: ZOizYDYlYHuw4S4z7Y47nmtCdx5li0htVz07RM4EV/4EaQiSkQd+1abpN/KNPhdLzOihvDd0R6FRaFUq/RbV0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" This patch moves last_snd from struct mptcp_sock to struct mptcp_sched_data. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 1 + net/mptcp/protocol.c | 14 +++++++------- net/mptcp/protocol.h | 1 - 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4bba29c99172..4fd84768c5a3 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -101,6 +101,7 @@ struct mptcp_out_options { =20 struct mptcp_sched_data { bool reinject; + struct sock *last_snd; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 763f709fd5f5..59d36b354f6a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1619,7 +1619,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) continue; } do_check_data_fin =3D true; - msk->last_snd =3D ssk; + msk->data->last_snd =3D ssk; } } } @@ -1660,7 +1660,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool if (ret <=3D 0) break; copied +=3D ret; - msk->last_snd =3D ssk; + msk->data->last_snd =3D ssk; continue; } =20 @@ -1673,7 +1673,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool if (ret <=3D 0) keep_pushing =3D false; copied +=3D ret; - msk->last_snd =3D ssk; + msk->data->last_snd =3D ssk; } =20 mptcp_for_each_subflow(msk, subflow) { @@ -2457,8 +2457,8 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, WRITE_ONCE(msk->first, NULL); =20 out: - if (ssk =3D=3D msk->last_snd) - msk->last_snd =3D NULL; + if (ssk =3D=3D msk->data->last_snd) + msk->data->last_snd =3D NULL; =20 if (need_push) __mptcp_push_pending(sk, 0); @@ -2640,7 +2640,7 @@ static void __mptcp_retrans(struct sock *sk) =20 release_sock(ssk); =20 - msk->last_snd =3D ssk; + msk->data->last_snd =3D ssk; } } dfrag->already_sent =3D max(dfrag->already_sent, len); @@ -3142,7 +3142,7 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) * subflow */ mptcp_destroy_common(msk, MPTCP_CF_FASTCLOSE); - msk->last_snd =3D NULL; + msk->data->last_snd =3D NULL; WRITE_ONCE(msk->flags, 0); msk->cb_flags =3D 0; msk->push_pending =3D 0; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 09a5e23adca1..21d59b0875e7 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -266,7 +266,6 @@ struct mptcp_sock { atomic64_t rcv_wnd_sent; u64 rcv_data_fin_seq; int rmem_fwd_alloc; - struct sock *last_snd; int snd_burst; int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2051.outbound.protection.outlook.com [40.107.7.51]) (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 28EB220EB for ; Sat, 27 May 2023 12:56:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C3bFTitWE9vr82YdN8eoD1RQdOFJA+RCH4L/0TorD/hly1A0vnA++DgLJeEMBI+zP/pNmM+0xOVwgTNAU9mk4Rgeme0XdD7NTic9TAa90E+MXjZNziFcPGbw0ypaFy8dwGlAg5G4lqxQUnuqidNjK6FlfNkt6MEi9zKQ9rh++yKoDlGJyR0Y7MguOOXHqAOEUF48idTJlDvfRYc6Kv51s2RItF9mCaogQLuO2WGw1wPQgiT45pGNak+af4N75YgHkbQ77nTX8S9oQunF/jtJDg7mNpctmULCvgGnXSxI53jvkRGRvDxdpVHD+mStOA8NsbjWqaL9ipvr9ukEj++4oQ== 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=OVCf23pHbJT1HJQCQhY3kX8s21RFx7jKuR0SgHaereg=; b=RTpqwmiIwXe2+LAxWVSHAUrZskiqjuKek22h3VpaQZHVb8sbhwoc+gh6uCHD4Xj9ITzGUwLrZgdMKCNCF0nHZq9rZm+UYgCamXpmhridziEMoyqsM8+AFElaxLuhbj/0VrQWlUhryTzD6fkW1+bnrr0MKlUXyoqH7awj4GLTvxpcorPN2uPeXGVMfShPpwh8Z3HxuZkGjL73TvzlOfP8wrbYB99lCRm3/Q4phLwW554IzgdkQ+C79S2iEivrtVJ+zckPaetATfC0r1JcJJ7ACEmLyGhWHccsJXeLf+rPvOFqjMD3IcyyQ+IGwveLWbjLKIlctVBLag/VPYw0bSTmuw== 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=OVCf23pHbJT1HJQCQhY3kX8s21RFx7jKuR0SgHaereg=; b=KdpbJWbid6gCvTE9aNiy7IABkQ6hDHQLkwi5G8TAZff52oZArNPTMlclHF2g6zV6zyQJyoOPeTxG1fPGwaOxj2GuvcFNItw4+FSgJBLyFQFD/sODJTH9YAd9h3tPzixcR5zjUzzKyWHkxaXit2515vefBP0EdZVM4BCB0WPvzUCGNpIxm3bRrAnLn/lbamww/BuFTkWBmLC2CPBHDhR7jG8Ygw8tmUy2Uh7Ai5HcyBXG86s+MXA+Zads2TaewatkwFbGfo73wkmfgpK49TAPDo8P1h8Dj5tihCG9ijyHBUE52Jx3cv+ZvLal/tIEn6yQ4u1+BMOLFgQdgSBcJuOung== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:56:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:56:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 5/8] mptcp: add snd_burst in sched_data Date: Sat, 27 May 2023 20:55:34 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0120.apcprd03.prod.outlook.com (2603:1096:4:91::24) 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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: 404f17a3-4929-4fad-7130-08db5eb1c331 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cQ5Ei6juEg18HptvUfQzAPa34qD18ZEE5Plmb6yAc2Y+7HdoRPaOGaQ5yf5mSq9jR5tD5+31YlTerp2ImNSPnXUDkGLCyM6+F7IpgfJIaYJems8jxR53V+zLUtWlu6WxAIK8j8w6kezc3QPr0UuDj7xd5ur9o0lJri5QXgbGCCkwm2cQ7QEwODu/p9Rrs9BAXPoXvvpQq24ddP+bW2clxdVp97JGDVj8BzmhiC/tYzgGSI66pX/MKmjHbrlkcoc1T9NfYQ7+Ag9Zdhpdd/THZTRMV+ZoIHcyGB+vlfkN1o+inUanCE2QP7nFdkPdZwySZwX7KoYbjwQo3yDd2KpZ6Vrf6Yftn0WRGNpjWu5X8cKMUSqXvhYiEFrDYOeh1P779mW3xmPzAsZwUGseahJMyBkAnlNctH8e3Ml3RLg+t2eI3kU1l8/EZNBT2dSfxUp3WglHjSoCR6OkBEiffmP0hBZZBxkHCnfJuPxBt5z+bhK1rQG0wzESRSm7DzjsItEXRbGp5NFruO/3ZFKYUYq+xnHYi61j5K+PPISSavNJ8y5opeSOKOYofAxiZRDNLxdr 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(6666004)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6nLWWsoCi0RT8+UTbApDIw7nabpIGZQYso2YVpSIUwS+of8NZNk9R6lzc+Rh?= =?us-ascii?Q?fdfslDPKuWnndJM2wZMgUdZ2mDTSk16JBU1VIF1hYyP10fmfIl15NOrk2aQX?= =?us-ascii?Q?7i82hiAJSgnO+ax6JdkbLBP3hgt07pxvv7/T69va46I/DrLnQOrgiWKBTK2O?= =?us-ascii?Q?668PX3ZzJqjjuCU+oinTZUNwCg+58DbOc/HrK/ajpR124nKII6bT105VOOQ3?= =?us-ascii?Q?kpx0FYhRsgq4CCSD/GRih7hcZU43w1K4V7ymnnjcbigUYDvkjwGJsnNYHBOU?= =?us-ascii?Q?lsqSA7mEurdBB9Lu+dXz8R7ae506jzRp4ttFoEjQsdenK3OsONOgfh6m3xe4?= =?us-ascii?Q?q3WEwsIG1XaiUgBAv/PdX/d2QKygardt+MKuYFekapWZE6BkRxYEM8onyQ7X?= =?us-ascii?Q?xBd/56TUR9O6/kF66PXCgCfd4ERyPWMyMRMaTXoWrldHZMBtPrlsHm9UyS0c?= =?us-ascii?Q?ZsBxKY61hWnbSmC9OMIEZFDsbChtBeViGpYBs3APJPKyVEJDYc2yw/hr/Htf?= =?us-ascii?Q?JKoiES0375Irh1TCKoF8lpBEngDrTPUaNBF8129LQmVCG8QH5f4LHa9AfoGX?= =?us-ascii?Q?97fIoCQxINpzSm/LjT5SU7BopqxKDD6WkRvKTn4ayKOXIkjvL1k0CRg8J5Sx?= =?us-ascii?Q?Y91lj5/thiY7tK7eNEVoSHrz8G+Dv/JtKFvuZGiAIjmiy1nf51ob3Smh5MJE?= =?us-ascii?Q?qDAyS5GdldVtaQqFj0csAgpZ6oq/xmGgS90g+l90T3+BSMSkCbUAFy0zLbid?= =?us-ascii?Q?nxFJRaCglxAt6Gxxrr1OIltyxty7obpE9kNQnFW3amtKfckCj6MKTYMOObl3?= =?us-ascii?Q?m0HZynFmTC1lYQ3j5Pclvsl/ajP1m6orfnb0+g+TGZDwkJSIvTJqkLRq3RXV?= =?us-ascii?Q?jBOM45VMgkr4ICFmPGC0a582yCfMzefTPfH4sK8y7Q0L9GRjuk06KWaj1tBC?= =?us-ascii?Q?bj9CbQUHuDbAu9sHWE9Gb+Vz2qN3HWsVrEeVtMUQ/R1rDJhWFdog/UvkG45o?= =?us-ascii?Q?CN6E6+tmWrVu56PeFA0iUcp720d4oulSjRtZt/9VwlJiib01wKICY3nc73pS?= =?us-ascii?Q?DiLM06T6xjpx79BSq7h4iOTTI2KckpQVhVQ7KAeQOy+rlPafnSzPCF3cAUBv?= =?us-ascii?Q?Z2FuugefAzIWj/GK8bpyK7UzrZ3jxpontfOGs59GsWU80ZIWsE6ghE09DAVG?= =?us-ascii?Q?mNLwdYEk+LYhpj3Wl+UuHbetJxI5PDcBa+fHr3/PMQCYfoh4zBnL4xWImlFW?= =?us-ascii?Q?2pf5OZL+A0x6tA+RGEPQfqt6P/41NWmDai2UEdM7Yei7VaQclKkQjsHGwotl?= =?us-ascii?Q?kxVdb4suZz2NXfK8V90s56V2s9M3qy7uyftg5we6LTPkABPZNPdmhi1UbIxm?= =?us-ascii?Q?rEPWEIDaE72leTUsiHDRwWmjWMJWjzaVXeXFh8IzLLIvfan3KaofehK4g9Ke?= =?us-ascii?Q?CAtns3kueSTS1YbvPYAqybJecONL5EcSMe10I/EPIW5seEvPqK8IbCYU7xlk?= =?us-ascii?Q?WkTvPgrnHR9X/Wbg/m05lxNrYJ6HKO5cA9hvNGMwCoqjqAHALaewkzg64UCf?= =?us-ascii?Q?qzsO4PKEr1si+Dzv184zW1a63PX9eyugC3cnvyRE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 404f17a3-4929-4fad-7130-08db5eb1c331 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:56:18.3657 (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: PqcKQvFslKkcwWMbwqVJ+MFNzksJ+JajbN8R8CcdThhMVyCEAYc/XTZOD9koOFEbzUC8/5rHwV9v2JeLdgXbJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" This patch moves snd_burst from struct mptcp_sock to struct mptcp_sched_data. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 1 + net/mptcp/protocol.c | 11 ++++++----- net/mptcp/protocol.h | 4 ++-- net/mptcp/sched.c | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4fd84768c5a3..d24f599b151f 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -102,6 +102,7 @@ struct mptcp_out_options { struct mptcp_sched_data { bool reinject; struct sock *last_snd; + int snd_burst; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 59d36b354f6a..83bdbd0a7bbc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1416,7 +1416,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; @@ -1486,7 +1487,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 @@ -1504,7 +1505,7 @@ static void mptcp_update_post_push(struct mptcp_sock = *msk, =20 dfrag->already_sent +=3D sent; =20 - msk->snd_burst -=3D sent; + msk->data->snd_burst -=3D sent; =20 snd_nxt_new +=3D dfrag->already_sent; =20 @@ -1555,7 +1556,7 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, } WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); =20 - if (msk->snd_burst <=3D 0 || + if (msk->data->snd_burst <=3D 0 || !sk_stream_memory_free(ssk) || !mptcp_subflow_active(mptcp_subflow_ctx(ssk))) { err =3D copied; @@ -2349,7 +2350,7 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) mptcp_data_unlock(sk); =20 msk->first_pending =3D rtx_head; - msk->snd_burst =3D 0; + msk->data->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 21d59b0875e7..760fdd888e31 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -266,7 +266,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 @@ -659,7 +658,8 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, bool scheduled); void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, struct mptcp_sched_data *data); -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); int mptcp_sched_get_retrans(struct mptcp_sock *msk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 414b646dc9b1..e1c8548a52c0 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -144,7 +144,7 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) if (!msk->sched) { struct sock *ssk; =20 - ssk =3D mptcp_subflow_get_send(msk); + ssk =3D mptcp_subflow_get_send(msk, msk->data); if (!ssk) return -EINVAL; mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2051.outbound.protection.outlook.com [40.107.22.51]) (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 75ACE20EB for ; Sat, 27 May 2023 12:56:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DVuprhM2Kpue0z9Frh1RPAEcjtm3h6QukSE/pbHVGRnUzvfSnOStITSD5A1FrNN3qHOe/PSDjqd35b0E7YqCfSUfpLrJIorb+UK0Y2Wps7vDtNq2lJFnk9+TctXhY2jtxT5sbxNuqT1dtU3qcLeZUrkfKvOX7KBhZtXmEli4FsVgtrQV/z3pR5FfJ1yNx+P4OIhO4fj1erGAROU7Asv2CbyE5ZJpbz+ENTC0HRCrzWOmACmfCEnC8CS2COWf/qcY6TRMdwSVZriBf4567V6TQGWtFX2PKq9iB128oHl+GGbknsgCbREcM3BzhGc+1rvs/+IxCFV0lM8+KcbEvYPG0w== 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=UK5Y79Per6GMJgO0SoIuINhs49NEm4DbLqKMsmC/DBU=; b=PnBZ2UUH2JiRi71wIH8zO7QctnC64XJ5ZTarku1EszgK6KDMj84Og7oq1eRex+64jaByAZCf4j2CtOQ7zVYqLckl6qxQqTZ0ulDsikZbBLl4o0X/gMfE1rpVPPOlpe4Gw6S3xBt+MK7BXsxAE5WZdDYNPa24F8d7IUFUlhM3uiOfIJp4OR8svmO7CvQa6L/8AQCZWGB/vnfFMu4Sdldsgr2HWuhKC8kn4yxQfdhP8V/KwFhBU2ogGtv8gIk43eV8JBIs+d12NKO+I0u2P7URIXx2UQ8FgxHhL+LIj09SLVt55eb8KdiaesP/KVFrhE1xEwTEgyBv5hWomsvdv00CwQ== 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=UK5Y79Per6GMJgO0SoIuINhs49NEm4DbLqKMsmC/DBU=; b=n9DJzEMsq1zfvyF98YCAsaIXG/Zj9eYKd4WmF0NVd+GMKXGn5kwhSfwMUIVdmQqdaiS1l8JNzPd46QL53o1GmHkD/Bgu5jSxZ0MZkeV9jB0/S1D7NbVP7Z2X0BdBAGkii96d704EaOZuJSVl/t3xKho6YTMrsvE7rnCp6xVc2GimD/sTYg8KOVZJDLeQrvFrYDOCtv4vJnEGzq3+9C27z3W29o2S1Ic/pyOZSZy0MUZczxhj76i2WgphCv1n7dK1I6quYocxSaijQqwo5KmVHj9X8juB+V6tycn/4JaknwWgQ1m1Rqds0UCjlbUsnh/5YEFjKphOTCbhwc5saSd26g== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:56:25 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:56:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 6/8] mptcp: register default scheduler Date: Sat, 27 May 2023 20:55:35 +0800 Message-Id: <5da8df506f527dfb2b8ae2e5dc72ef28b7f4936d.1685191581.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0132.apcprd03.prod.outlook.com (2603:1096:4:91::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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: 39e5437c-f62a-4ddd-e95f-08db5eb1c7b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TMGBqQPbQeHNNkX/vCVMJ5TLcgZSk88yPJv0K0z42xoPsaONtnpbr97AJSVGCxM0Pr3MzdDk1GqVvGgHFEujjryMqDflpSEB4wyepG2KLX8afBB9gDJRFvQs4U+v6xleUmNoNwsYyi20U/TQSsClYkv91rQlsq6P0FbxM0MGn3Tx7P4wEvNWAz6pF6yRLv/ctvqcXO6cyNieVq6KC/gazJIf3iyefy3p+E9IW2pmr23lCI5/2jPJraSGB1PyuaskLlYdPg1mU2tXQiJjI1PNgcWawxrE96smOaLx1Wimb7Tyj1mEtloTT6mjWvcRAFU2W37MLeZlObMyAK4LpQS07Qox8/ko/BtQvSG++b+LIoLP7gwCHdKIrXwSiX5AHShEFZtqqhswE4B8vdjhF0btPA9pZlcl7goOV0ITbKmb8SxTCHEZ1zLCF/1JbZS5W6x2nLK4rxCgA7ehzgYvNVF5MoQkX4U0gnWMeUnskKE05YQSl2l1kAv4MGBhy8uSqJJ1/R4q6bRG+Mo890nzaaMHqgIlgdnog3WbYrw4pzEkXRpZbzRi+Xg4yLqyAngYUsC4 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(6666004)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sEnTY++QQBxtE/fGneFIWq06al/UK/eD/oOVoi5mUIGwm5dQs8Ei5fgUQaNu?= =?us-ascii?Q?MA85M3uxrOBoREfJ+xtPXeUAPDpSHqeZ/DgrSiasO1hyX97jttWqLJJhFT06?= =?us-ascii?Q?Xss3StO6yItYZ0Bp6n/8lwoEr7Yvza2ugFH8I0sk80w5lKOZXzkag9DGWMyp?= =?us-ascii?Q?V8vdDhnEehhFSbN3Ny2UkTL1VtoaLsTNYOIJ9dIEtTYzMPqUTSzLLs/knbDo?= =?us-ascii?Q?B5qpnVCEDQvZvz5qZL/Ljrso8xprAghzlDX+ceou5Vt+R5GKg/CYa1M6hHA3?= =?us-ascii?Q?ZSs8fjPeosPPt8O707KBngp81CnBuQbZgWgEei3zi6zMMaVTZ/CbJGRWVwJe?= =?us-ascii?Q?fcxiyLST0Fya9ZNBzhcHNbtMBKruUrxo4At1arkfooOFEr8GWl7QJWJxLmvj?= =?us-ascii?Q?WPsU0NaQy2D+5wDWHltscxcTtK0/GU8h91pdDrIqGSNRd0JxrmRjdml11H1J?= =?us-ascii?Q?Pdik+W4Sr3Ykdt3iFq1CtHISBua+v3oxrBxg92GjqKEo8DAV/ydTqaTCbqnm?= =?us-ascii?Q?C/4bfgjz3HeQKtYzLkBzFf2ds6F98fWu5c90JD2s4yfr+E/6bywgDFpi0BhY?= =?us-ascii?Q?qwOiBBIcQCPpBwEI+h5QiIAxvupobpMRmgW7OSTD8WXxirPQh4S5YmJ6Vwkz?= =?us-ascii?Q?yz4C3Ipa5oR0YF1xvzGINVCJWIOiZ9iC/I6bAQIKqV/KNnWQdIyYvkgC6uOB?= =?us-ascii?Q?l0Ta0dzuYCqrNgyKO1MwoVTkFfg96ZB168iKBtw5U0i1You1PYGjDHTmxKCn?= =?us-ascii?Q?gzxgMpcklV9jmxYcVZQBFuiXUcWSlqTxldmaA5RhpFCSPVncv2n7+MKHonYX?= =?us-ascii?Q?/C+bZ11gTcWDaYEHybvSewYnjnHh/B3DaxYQDKqWrs+rNdauewLXBhqieUsV?= =?us-ascii?Q?EDWBxSwUBxcpBj7pVsJQrSArntDCZn9uDRZCV5Y22FmNuOYbY7XgmOrRphNz?= =?us-ascii?Q?EFlfSWMVBT3928uuGdqZv+pgFAbCVgjs8XQS2xkhzK41KOudbp1j9s8emXgS?= =?us-ascii?Q?mS9CMuW3tOmgdJybLuzy/rkrLOWnSMXm0Z/UsXi6RnI2qxJ+CSkJLCvJ5IqF?= =?us-ascii?Q?8CsAVqegzXaWPws02nEEPPpbQTPjdkfBhcYudhbcZUyP0Vre8WRttxOxTmDf?= =?us-ascii?Q?bE1967hkIZei7X5l+1wsyctmC4sZIEJ9W8OMjsJ/1hVCLyafpI2DZjO0D40H?= =?us-ascii?Q?XrtTKVRdsmrC4eIcgVOyTfjQxN+/EBbp6lO63egjhuMjyKu8HcsiX4L1+H+O?= =?us-ascii?Q?QOyqtTuqxL2oJz02Orwj5r5boJqm9yo1CY4DbFflK7ldZSnvqr4l8sfwLZwg?= =?us-ascii?Q?7QjhctpSU+rTbg6OLChxAzivCrXrYFm02D+0ZH+yO8aFEK45rCn92t3EftaZ?= =?us-ascii?Q?uqqq33NVLoeG0Pjd1kfN1SEY2ZbsHEoa08BuUGcQVe+xbay0DXduY40ehAnI?= =?us-ascii?Q?aWGIm1KIqjZrhwFWwhOHUivLYOHfwwe62JncnDOLhwwpatNVTLR6WEFbU+ym?= =?us-ascii?Q?Jn7qWhTZSn47W6J1vwMSYZPw2xL2f6w0j+SNNiFUTI2Mzw+1PrbwtsZfypFZ?= =?us-ascii?Q?WM7ezzQMxRUzjm0vrnsQ5z8TvQYYf7fYnM8OEGig?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39e5437c-f62a-4ddd-e95f-08db5eb1c7b0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:56:25.9084 (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: 6bYgevWqbaZcp7lh4PSkgj7+UxpJzxeYX1s/NQL//wxapaLMUp0T9MXKigu5PUre2LkaPBUsMPvjB+nwyFwNhw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" This patch defines the default packet scheduler mptcp_sched_default. Register it in mptcp_sched_init(), which is invoked in mptcp_proto_init(). Skip deleting this default scheduler in mptcp_unregister_scheduler(). Set msk->sched to the default scheduler when the input parameter of mptcp_init_sched() is NULL. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 3 ++- net/mptcp/protocol.h | 3 ++- net/mptcp/sched.c | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 83bdbd0a7bbc..5447f8b0598b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2278,7 +2278,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; @@ -4005,6 +4005,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, 1) !=3D 0) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 760fdd888e31..9552d5f581f6 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -651,6 +651,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); @@ -660,7 +661,7 @@ void mptcp_sched_data_set_contexts(const struct mptcp_s= ock *msk, struct mptcp_sched_data *data); 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); int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index e1c8548a52c0..69f9e56ffff9 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,16 +77,24 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sc= hed) =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 +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; @@ -74,7 +109,6 @@ int mptcp_init_sched(struct mptcp_sock *msk, =20 pr_debug("sched=3D%s", msk->sched->name); =20 -out: return 0; } =20 --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2078.outbound.protection.outlook.com [40.107.105.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF0BA20EB for ; Sat, 27 May 2023 12:56:34 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OaQkgFLtIyiJwT76MzxgMnGL0zwW3vAzSW9Im2+3H9Is7ut5H5oiFQNDMZfHrFYtgAGqxIxcJAJ9mkBLOqyx0gkGCSW2GbZe+0oEjNYMHeV2TiBXmdHv45F8ntq4KFeL+66Q9AzvlSrnYE/hZ8PJegEjnRjsqUO/meT/HZb8YYf2m3XzMYP/dwEcjLBEMlt0pBEzzApRpvIJeRu8QyMsyPMEpg6hhhpzHYKDxVD/ZHXVOwk3FerYyYcBom7jFuAUw4P5deC3/KhdWo+CvRBEgQnW9CZZDv0AAZY7yzNqzfPU6h/TpW3iSjYert+VrQUvEzK8w/TYjMSUr8v/IKUEtg== 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=IAAXpxTwQ1Zi08PGAKLlb0QSz/kVoLq/lZtYIFLzxNM=; b=RmK02unA0Elnsliad1N4jMZd2QxNCUEt2nriHqSr3n04DaENEifKNlneC1ZDCKX7+Sn40V03fa1R/ATn3HuRJ5j9IVDmPeYzfXmsWiRIfYttUWFY0fLf+3koIYmrjWfPCzl7cKFGNli80lFSWBOMmpW6K4hb+5Xu5JqbBg6WXtvRX2Dx2Ut+KhRFpdo27LoSWR0/94qjEW0n7rQWrs7cJeegUNpDXX7ugWM3iaKmumCfziDvMemJePs0xUMP1+PtkbHA2myf4wW5oRiB5rEqcjq3QKxFjMMxONP+QqCBxPD5Wp1ANGWYzVCtJGHT2OIqdMqvIG5Y6liVZpPaep3Pdg== 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=IAAXpxTwQ1Zi08PGAKLlb0QSz/kVoLq/lZtYIFLzxNM=; b=eypVjJnwUVB8hTq76+dK9iagz6rwFvNnYMlDza3UyPQVxvtvbrxddb9eJXTbF7D5csNYF5El7foOIS1WHSDD2TRYBOvebyf3jzmEUubG+MZIazKyqEUvtZB4o4wJCW8XHLk82H3yXGHOn/9DWAdHAZUNGNHwrJdjorjblEX0/DDuVQr585RqxsET3+N1uhsPZFlaqtzXeBGPcimhefx5bp3emcSGZgW4OewsvYRIJhSlZJBFldpgmS7XrdMLsMD4jmCEy8xPT7Sm7tMK4AeUG25FsyDQqZ7Kl8Q46eOvuudgMTmmouJ7HhRL4aJ9+5s2kXaGyJMK23EFH3ud2Xnj2g== 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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:56:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:56:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 7/8] Squash to "selftests/bpf: Add mptcp sched structs" Date: Sat, 27 May 2023 20:55:36 +0800 Message-Id: <4a33b191343c7714c92c0ea7b7fe406b80f9a978.1685191581.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0206.apcprd04.prod.outlook.com (2603:1096:4:187::21) 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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: acf3a0d1-cd0a-4316-69d4-08db5eb1cbb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rp+NOJRVC5jD6Bh43gbY8qzAvT1CHBvt/wo6OyeWZ/mkMJxNR9tO+CBYKBNDjLiG929ZTJLymE92fOWfDx9GXx+TCKya5JK1sHWQNkDa3jp2zL9K4+LbqkUjBhNEz5ld7R0CgwchoPF7y7iy0snrhn2mQXQUt7Bd9gP+VOGrfi03pUuIiR3CAdqjDR0N1WeugYuhoNri8TxA3PYcH00XYH4hk81DOHz09RbrtoAMulmZCN9tA4Fye0ATcUmULFP1prHJnw7gX0F6PBlJdNrKHMYeijY1v3hxE5SrGUWELuqqbk/SKnAJgKdHgAlNzDxVT0oAzvqFyJOzs5H8ODl+7gQKPlelbMoRtTb7+2h1B47kqXvoVmflGtf3/+tnrtelE9mBd9wsk6uWgxM1npu01TTZwc8VxeNaS2RgFDqjX259RmVRHRntsDTsHaF0XZgMrGUmYMfr4TZoLZ/PtpMhw6ljh0EC9vDT8kCXF28tpQN6ULfUdf/VqSE5rkp+RYmx7aCvEMNklfTg6PiqLxA6WTtcoyH/JdsUBEb3XZYWlPMHPaqZwZ5l9pZ8fTKtgTRE 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(4744005)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wEzPfZ0Am3c4SE2sShjRBGks88yPtnpnqRvJ4YIYzAzPiCsk15ZrhBJhNzr6?= =?us-ascii?Q?lf+2ShbjYvDGFQEov/p+bfW9ej71gunD+B0SiidG0kP8wK3WnrUOW4Sdu/hY?= =?us-ascii?Q?zZnao9/s7lnUIoXmCcGMRXMQU2PagrJ51gjEPscULu7WiKJJ9Ik18vxp70q7?= =?us-ascii?Q?liIiGUCy+Ph3uN/eTyrhOYvdEI/pMVN+YxT85Bos0io0TfGI6TZefuTI8+Tb?= =?us-ascii?Q?mhmZg+0f/C8C2jMT/Pv2Itl66guHDD5P22ZU7VWaxg4Ajub/0vj2ODQvqMfK?= =?us-ascii?Q?jDXXBFDXyVOoMNCeWprWENA3ghTZmzR27h/e00Rv1F85iVrJXajK0icVFGq4?= =?us-ascii?Q?H6v47Mb+aJEUfaL00N3bzm5QwQRgcuBGO+NbBPztP+Z2e58iHsFgIm82lpUv?= =?us-ascii?Q?UjNdK/vEDvVdtU5nFxNFedjysKRHTQ4vrqYZLr2GF9KeoDXkGS80mJTkc1dn?= =?us-ascii?Q?msXaPta094OeS/bw/CUA3KLtyu2oOrmgYRlpIU8nwXIZqiUX4DtSwsoPJB7Z?= =?us-ascii?Q?FT5GLNjR7zYj090Ot/pCWJGPi5wkP0p+ZvxXaSxNyt5p7k1ylUBoF1D/s7Jf?= =?us-ascii?Q?qJpV4pW4xcv2PNsYoW1CRuc2yjYbpSZ82jumqNatfc4eHq3KI5c+e9gjZiwJ?= =?us-ascii?Q?slkU1WP5SJPtrokSZvFS1pCjMJCKLev1WJJ3I/+AI+mXuAcHtbAuoklyp795?= =?us-ascii?Q?Z2tFc1DqkAnW3pqt5lROU7fLLSiuDF0CKe71XbJyRYeg9qHN2hGXWi9RuoqR?= =?us-ascii?Q?zLvj0hvzM7jWl5OZE6RChj1Si/4U3YQ+f+hI3n2WJmkOTpFzuuXNpWqxYVpS?= =?us-ascii?Q?frV3yeub3P4wNzxEUioPxiG6uo+4juRYGSOzoUHO0xqLGAxespLhp8zdTVxm?= =?us-ascii?Q?grXlXZNX0Gv41gkRp7sprllPYZJAWHsNEl8f1HKMHqVzHn9L21OOGN6mWGJG?= =?us-ascii?Q?+mLvHFm6bpNBP0w6WKD6KTTr1/jJPxVwhwAFP0+ZAtpRD2CwgDb/F4nxrMFA?= =?us-ascii?Q?M9MNSFV6v0zIx7Q+a6beZN5tTRDs7gi/u8Z3D9LvBhUQSBEZjSY6lBodnmB8?= =?us-ascii?Q?7hn1w2q0s547TKFOEbNC9Q2faxP4CB19R4GFTod8Q9RUq7LGYRVDqwUiv/Xk?= =?us-ascii?Q?y1M5gP/iHvNnZtGR7XvhtyRsGhGrKXTmIRnObJ4cVn+em7WPEuOEXbl8Y11R?= =?us-ascii?Q?xO+9bAH6fsaPkx34H1tX10kRNMKTyelZD7WDFeQQGEAgPB/l/3J1XIo+smgo?= =?us-ascii?Q?F1/VHYMHKlHxtwQ3WBQ6ZNY6i332VhQmuIvHuorqN+TwBfJXdB8YBj5svTSI?= =?us-ascii?Q?0oakD0CGqJNCppTl9BUn0W6OU/koVFSkGB2UJgoac4jPMa2l3+Vj/SvIcnt/?= =?us-ascii?Q?5CFPZJy7qVg6Me7baKVQ1TmrWj+OGEhOsXm9NEkFarcHbhXLM7txC5+Ah7fy?= =?us-ascii?Q?mOyEIrVB9XFiOQ5XU5uoaob9fVrgXvqi24Vunt4Dsv94VE9vwce/puccD3iK?= =?us-ascii?Q?yydiDuLS5S73vLl44f9Lnsjwlrd841ZUDxS91iSBuh4bKF8qFgoABxi2yL2N?= =?us-ascii?Q?Cl5yhIY2nmoUC99sT+YlU1usoS1WPgKBSVN2rF/N?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: acf3a0d1-cd0a-4316-69d4-08db5eb1cbb4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:56:32.4521 (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: qut7t7tIPLcykUnI5jPXF5vYF5L3QQh71lH3TihriAjD+mqPZjoJ/YMgCQm9YydD1w2JBrpg5YZiFhgtfxDy3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" Use two tabs. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 72c618037386..fcb023a749ad 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -239,7 +239,7 @@ struct mptcp_subflow_context { } __attribute__((preserve_access_index)); =20 struct mptcp_sched_data { - bool reinject; + bool reinject; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; } __attribute__((preserve_access_index)); =20 --=20 2.35.3 From nobody Fri May 3 11:17:14 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2055.outbound.protection.outlook.com [40.107.105.55]) (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 3E87020EB for ; Sat, 27 May 2023 12:56:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bUHZUaEsZhoj57Azentx5JWMIcByg0ANWYGrMc88Y2uYqYWryyeC8Td38347dCvl06gT6dS+38THYsxvqv6g5SHBG8QZx94MoYAIwCPdLcaDA+/htREPTEEZjtigaG8KBZjKM1V7GrgHxVlXBU8ZcgfVMX1zGdgUbQVLjhDDx77d8fBWJpgyJ8JABlhLmkjICpmbNY3Ku2aAqW6mMELDYZTm5oakjns5PMqLykePUKg28748Kv2TSBugvhmTwMiwOOYo4EavTl/9AToHCOdaxVEn2+owbdLZQmTn3Fv5IauyzOQPc/BMyIS+rqo5qS9w5Sty13VJBMNB3O+FCHWwGg== 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=otDUYIFuNZBrPMT4ne45nnq6N//qpmKE9zvbkoC9z1s=; b=YTuIaDrKFOtT/OQ/NqvWlbW96C/wZw52M/qwlGJdruoa/vfMc+4XOxcEntZoSGLcxJWgkHKeHFy6TjFxSoVPTHW8+5vv+M2uNs2y7pj+ef03o2JVApnXKAGvw2ljpFoSsVPvI7EEsgYvlWaC+7F21IYxTYORA7Appx6qJlMmnbWc0s6Ca3JNa1rL9Ia1fMr8yy8OWjb/c03hJ9D0TK6666f7zoAorzsLmqezpHdjVvaA6OlaIATDDEd4FQAUhyVbtcWnpMyo7jlXo/KK4z6QQwDxqZplQD0Hc2VidkuD+HzkRo5yj6tz0k2Nx06znQwJg8fY3Wg3NuzgjWg5nPth6Q== 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=otDUYIFuNZBrPMT4ne45nnq6N//qpmKE9zvbkoC9z1s=; b=Wc88OLDdgfy2Dobfn3jl3H0ZH8xiWrwbw51lVD4fOpeGaYke9atlU9Wdzst/REG7jP0HFeCk6BYEl2mTbUntYECjXq1x2C1MT0YRY7GMxK1XiNOG4U3UcpJcMpr/txIWH+KLVtMkSoiq/CkY2MxMwrh9DbsKtSX+Df4g4/iULeicA+zrK64gcFG2Ugug+fBSZouyqFvxdMvJy2+qAc0eo5NOe/1wnl3V75Yeq7Zb+ExU7cKvtmsl4GISSQHbjRzZz/Dd5c9Q/oBfySVoM4rVqQ3edGdd//oOY0lY7n23XE2uhWvU6y0RCnlI4xJl+45GJR+i7nSBhCqaF8yEzDcT+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 AS8PR04MB8371.eurprd04.prod.outlook.com (2603:10a6:20b:3b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.19; Sat, 27 May 2023 12:56:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6433.015; Sat, 27 May 2023 12:56:38 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 8/8] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Sat, 27 May 2023 20:55:37 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0203.apcprd04.prod.outlook.com (2603:1096:4:187::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_|AS8PR04MB8371:EE_ X-MS-Office365-Filtering-Correlation-Id: e0d437dd-5aff-4f48-3c50-08db5eb1cf88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yeYTagqyJmic5o8ANpb2yyCWgpbOZuV435OdTzceDFCZ4dNDocJryD3Ktqu+7GHFtSakvJeeSKBCoDm8LJu7fvYv+y/dAdZx2ViG7a8PRvgWVNMKn4oJDbJTj4rhVBSe6ZQhKd5FNfb/Hq+CnJEiICSTvFU92bkd3DFHAGOtDD9+RcDbC46JL5meOrv7n3RIGeGuANJ+Lte8sotDTn9BvWaef06blH4z3d4jalWu4BweGYV8esAZtIQ9QiuH46grkpvrJD1Zt0XgAM5lnP9/hlvYW5uVGmiWW0UjKJNDlwsfNbR28ltBFv2weDeVls/gqGzl9zoNXGB1JEzampqseCPPaaeUo8xQs7F1UpPYbXwXa3zqQqb6MnbKv1w/+IgeA1BqJePgvBaxgK+knTGeUvAolEN/chKLG3G0yz1XAsBQjh209aM/VwlxOBRimpxVfugXb95EwmxJwLRtv8Kq4gxl6vXJts1gGTW+fz+hzh0XPwFcQ5Qrvg8sqyd5rDCLcqZApjslp2ocFkvN9HXvTJm9Uv0y2xhGbtKuwYgjP8WUeOU79yWHT/2mlcoBjpmR 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:(13230028)(396003)(376002)(39860400002)(366004)(136003)(346002)(451199021)(316002)(6506007)(26005)(6512007)(36756003)(66556008)(107886003)(44832011)(66476007)(66946007)(6916009)(4326008)(38100700002)(5660300002)(6486002)(41300700001)(8936002)(8676002)(83380400001)(478600001)(86362001)(186003)(2906002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jGlLoj6TjNs8iNlhzXsDX30s18sxhv2guc6ujtjIh1lBkm6fM6ot1i2jJTmU?= =?us-ascii?Q?mBeT19T0vqPdlXmmBFTW33ObL4fDulMEL78rDyzUdN561+DkyIdRERyQRWnW?= =?us-ascii?Q?cv6BmfGBS4Mz1YoQD2DLG5xUxGkBGlTU48wFOrO4p1hfwu2scpEjwCaoqfun?= =?us-ascii?Q?xpvefYTeH1xPD7dLURFbD+rx5zwCuJ/WXJ82KUiPgFtOVPIHDd40UXYxpEcj?= =?us-ascii?Q?vfTIxo2zhPtr1zwy8PpsdUVo8MO7wmLOPxWdsySVEURSvpF+B3mmU5sD/j9s?= =?us-ascii?Q?rAZbMenNOjNtIP2CqBPqDyC1qFZwuAU5T75zJ65jXAga53NDKUZ9kUHVOaZ+?= =?us-ascii?Q?lYgein5JjS1biZ4G7IYQPo8W6jIbhm4r7+A3YJhs7Rj5PgqS1rwnBYQ+agoT?= =?us-ascii?Q?jE4ptTDTz+v/tmYpi5tlZ+xiFHrfdjP+UAZ0IFXfW65uerIUlQqxo6JT+Wav?= =?us-ascii?Q?tZgjphR1cH4FifWwOxywfKFgZTE7hjImagExTPGnBZ9uqsefxjES16DsYGfP?= =?us-ascii?Q?ryQhxFl4tDS5EBFurmVflHKECIg3Jl9C12fmFWY/WJGtZtFUHUeVPn5e+FXS?= =?us-ascii?Q?dlRtJHPtqUAtR3VPoctgnomr4zvvUdt0Tg1HzKEEsG7XeVi/j7t9lZUFyq/I?= =?us-ascii?Q?YYS49zmfcDIS1V4xQvaWSLvi2KNdsAWNvlB+NYl5O4eyhQFTZ/XTDRGoLOzz?= =?us-ascii?Q?c9ufAKZqxV7S75Fab27GmAWHQkH+SHusrTLxCH8avLoXiurcUuJbgPLSnnNb?= =?us-ascii?Q?toLDdSGT5QZe4bKVCKqc/dy7HRX+nTm1gj1+gz4ZKV979vvfqKxE/MUnhzdw?= =?us-ascii?Q?YbPZoGs1PFjqvzuUY3Tm4C1P1R03PvFhtu7JQuRTzRTpVXmEF0sl8Hi5Cx7T?= =?us-ascii?Q?XKs22EYZzLmxqR+mQk8DBMaaXgivT+k/NUlMIiAIWP6cQE/Kel7iGUo89M72?= =?us-ascii?Q?X7v5Vn2SwlWTdfe75rB1vjqtRAqRgjBoptBd66/qvyUsEkLOoyMPJq2tOLha?= =?us-ascii?Q?gMjhqP9sIHxTePPzHIfTxoTZpe6e13z3Z3zlXxT/7XKwoxDuGMhbcK7RGhv+?= =?us-ascii?Q?5rlcQcYzgFL/PJ43OSiAMmRNhynFpX22tjuoia2VrLLSuBDEp67j9dhMHmbZ?= =?us-ascii?Q?k1njLlezzAODbDq6lI6EhoqeYzpG1GhbKTE2a6NykcnufSG3YsNuL46jc5BH?= =?us-ascii?Q?6QdPEI5NbCGWQbKv1M5jvQoUEe+m2UavMeH2OtMUU+rBSER0YZ1w1sERKVZV?= =?us-ascii?Q?rrycvQp7m5uOLd42j9ti6azwDCj3+ACAvghqB/YN4jnOfbeZgy+bsw9H4byx?= =?us-ascii?Q?0+3UZvd9Pc9yH+U6ArFZjyuW7QVGp0e5LQ99RBt/vIoQG1hesWk7mj5t0kJv?= =?us-ascii?Q?fHB3N29Wk4zsUMFqGjBmBoLnZvRxAte1MBVyQAn02zdOvI36Xp4KHfQ+VP19?= =?us-ascii?Q?SiS8qOdjniPe/ADaOvF5LrZHdkkNd/hm2Q1aPkqnFTTeNLbxKTP4Vd6Uiiom?= =?us-ascii?Q?fYF2yarR8fMIBvd8VATIq3baLdgN92y4AtRXJz2Erb4BOJ7kDB44ezY4txkI?= =?us-ascii?Q?mg5g/azWi8lngWr1nSN6hnNmvwnRJHqHrCJoR9F+?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0d437dd-5aff-4f48-3c50-08db5eb1cf88 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2023 12:56:38.8554 (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: 0gtSKQcNusEug1vCjo6ouoOgIifMKesmWalCyOiJjtLLt5hRRU4cRvb0RONH+isMoPuln/gKf2SnYtOoRuPArQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8371 Content-Type: text/plain; charset="utf-8" Use data->last_snd instead of msk->last_snd. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 2 +- tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index fcb023a749ad..b6a0789fe33b 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; + struct sock *last_snd; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; } __attribute__((preserve_access_index)); =20 @@ -259,7 +260,6 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; =20 - struct sock *last_snd; __u32 token; struct sock *first; char ca_name[TCP_CA_NAME_MAX]; diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c index e101428e5906..4b4141056fe2 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -28,10 +28,10 @@ int BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mpt= cp_sock *msk, int nr =3D 0; =20 for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (!msk->last_snd || !data->contexts[i]) + if (!data->last_snd || !data->contexts[i]) break; =20 - if (data->contexts[i]->tcp_sock =3D=3D msk->last_snd) { + if (data->contexts[i]->tcp_sock =3D=3D data->last_snd) { if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) break; =20 --=20 2.35.3