From nobody Fri Mar 29 12:34:35 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2077.outbound.protection.outlook.com [40.107.22.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 16A64257A for ; Fri, 2 Dec 2022 13:30:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=StDqgpMXVUk13Ve/rXIrH+LYuUmrqJj/duvUXosRR6Xe3lZmxgVmavOzlR2+iQzroFQzc5l2L0XRFvDzDONiReWFKxAR/24iwsC9qeOKmAnLquKqO/vLCc9tUnGOhOioC2bfA6fBcnJ8GW1R19rXvuMXlfOSp5Tabz8FvhH4iHZTT+ciVdywE88KOC9YP1E08f0j9zCrD2nsgRt5xeTZvVhTL9bmf7e8aL/BFdAaJbtK5/Nz704rMec0ASUKmm+5oJsM1oun9UNwG4klg41/9B2PQeV6e08Sqh5zOTrDKQHw5kuYQyz8bg2kJYPpbMqR8/v94udz3EJtRN1vAc1+NA== 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=Kz9q0gJnpVwfDpXUYlVftmGAroFYmhWCrjPWKzh9eho=; b=CYovyzk00XcqbvAGYuMglXrCtkGDlIynH2cSEtedoMMUpWD46TRbl8nZH8MzErzpeWErEFbziz/AnRrJWoQOKI4GfV/pQ04veQiRp4MuoMW2HwOizQFnu1kSc7n3CNdUeqH0LAkLecrKIa05VFzw+vSbUc78Rj9/MpH6q1RAbG/RLtHqJDQ4ntDGRdzcx4Hl9OnogabTiiCV1OlxiWP5duSeUxvUa2X2HaS4vr/UQD5exLWe/6pTnV+6Lo0ayJV7LPyIBAHcxo42vV1WzNLy/YuXjbwBcu5bM/ZqUxceBwEDWUFlF2rvsERUgCoxL2x9hUCCfYDWZqoQlZBSTySlTw== 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=Kz9q0gJnpVwfDpXUYlVftmGAroFYmhWCrjPWKzh9eho=; b=Z71aRhX/Ee4eGxfcU9f9ZawO/626x6VZBQnNyH+vessatQHLgX4hmlKewd0yp2NI8uI/68wWsksYtd2GuIKMMfQKf9gbiuLZB7WtMGe53VK3QRhFH+NIPfqHVKLwijWimNS/dZAAIhK2Hi+X6x2RIlz+o4lHbqOvJ+jmczOOywFTUTGamLLshBZUnHer/2dKMBb2a+sMh7AOAjPVOi+XK5ijnZrP+ffvA6RWwLkKC3ecNrfeSFA0cIF4N5nfgRhqKG2kS0jjE/YNfW1rYnlEuMWVQzu2g9gPlhiDm9PnFDzTKaC0gf7ncHm8miIdFkrcrcZgO5/q80/IU6f95ETo+Q== 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 AS8PR04MB7509.eurprd04.prod.outlook.com (2603:10a6:20b:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Fri, 2 Dec 2022 13:30:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac%3]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 13:30:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v22 1/5] mptcp: add scheduler wrappers Date: Fri, 2 Dec 2022 21:30:13 +0800 Message-Id: <7572b8c0a954b1336214b6b6b04393b7dc2c7404.1669987293.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0034.apcprd02.prod.outlook.com (2603:1096:4:1f6::10) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7509:EE_ X-MS-Office365-Filtering-Correlation-Id: dee4f970-9b99-4985-bab2-08dad4696396 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U9YxDHnB5C6XozJYdY2zU1ECRqyZAbrqGsiJTwyOG7kQV/DcIMh73tDE+xX6WhAEt/8pgyRaTJC0DPeSczPg6DcYs6kTJxyF/9yl1xLUPfvYivTJoIkaLNdAJmxuUvqfzBqwEv/BRLGhBmyZCx/ENjhIKU0LTjKTQ5ObRJ5B2nrn+fx5UB50S6CCySQOL/Oie8nteDokzqIW3DL4HnSNxMjyMwdhNJzKkVGwOiIgZhK7pg0/cMbCVa7bp4ynf/cyhk1HIhEWn+Lj7ZVyRCS2ZzGA+OUHrEGPTaQPdMD/6nV3AaHfPvpSY8nKKnGyg0AspfVH1wS4PvRxw00MY803d8st5mEEGflVApkwtydNQkew6iEHNreKnLmbArKDLbZ4ScH+9UENTqfmcRp6sGdjyX/WsZP6Uv6g1KxiKFvZ3FBVsf8mvZLDQ5MgcpvoAgIQoEhJHhzBxrGeE6eapHOZpTbS1nK3aCaotq6JB4r8/GohJS5Bv2M1D1BHE4fqQQ6dTXGG7/qVwwimENa3CtQXHpQ/jTUmh86sK2Fuwb1bZi2l5i0kEwE4eMTxNf8lY+FZ2iybuTF980XP9o1KkpwXUoX+QVTy7raJ86hHbElj3AO5uXDLRXRHTp5eCxbzpi7fA3FQsffTUXQPaBjhQ71Drw== 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)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(44832011)(2906002)(36756003)(316002)(83380400001)(6916009)(6486002)(8936002)(478600001)(6666004)(107886003)(66476007)(66946007)(5660300002)(2616005)(4326008)(41300700001)(8676002)(66556008)(6506007)(86362001)(38100700002)(26005)(186003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QB1Bj5LaVgBFnGnT0o03ZyI0lo+r44HCtvA+B96A8iKwrWr1ibq0hz8qShuW?= =?us-ascii?Q?7D7rq+5ZmoPUzR4R7ZTE3jDajDi5vhILY4cAeaRELFCBaYAEgXSZJ5Hdv9Bg?= =?us-ascii?Q?82sOBm8nu1ikd7zi0OwTeoldG9hmKUoo45FZmD18eKXFSUr5nCtiPAIiYCJP?= =?us-ascii?Q?P4xAfYD93Hr/pMzKaYhsnjJLYwinnB7qiL0x17EFLSTqu2H9RGBVFouCraLb?= =?us-ascii?Q?d1vglKGse/dyL3cbix8cydaJtUdYAWG78NMfjOWakWA+ZYvVKFVcXcwf+dCs?= =?us-ascii?Q?2kMKzbLiLRmYOmJSIiSh2S9QOLCCZH+aoEFhcgtp5PS/sTOYEI9zxqEoBuwF?= =?us-ascii?Q?EP2AmdPRwEuBtVZtvI3whjG2Qu95jtc0dL36PoMOL0+I526vJVx07pZdRU0T?= =?us-ascii?Q?Qo4K+vYwOoMUiDseLnsglsaecHNa8Dnwx4PuTD86s2zxHHALoqt+OvolTOpo?= =?us-ascii?Q?5pZrFU0XpA7rAky5cbi7essOzaSy3wv1xC2cUHYTV/rTMWnd8dAU6tI5hn6h?= =?us-ascii?Q?U5UZzPTJNU/oUquUtTC/B7R3TxonOa5VgL8yaqxazsekOgaNgpN8AgCxmEDr?= =?us-ascii?Q?10x0QA1Wqrpf5rw1sJKGoNsUP8LmJGGBoCUcA2SN8iJBaw+yUIFpqzuWPERF?= =?us-ascii?Q?lyRaqnQNAtCwLsT8Uk5XpJawLZa+Xd8MKPKewxUVAE1xI94IkPYIjniTbZ4W?= =?us-ascii?Q?soUwK/yua9dTHOdlFK9JCGFPI3ZgaHs+TVPgwREWqfhX5vIkSbB4vuEwSu/F?= =?us-ascii?Q?NgZzeEVRFcX+nrUwP7zqXa2evFFbGqOv2IeM4jJ9wy9R5sihsE+cuFQQIArU?= =?us-ascii?Q?LCsUvFVwlQujrrgUG6QyGHxAgl1pt9vkpB/jWbq059IteN8+UxTB6F1gHjDX?= =?us-ascii?Q?z8MEUMhhl/DMJPoV7TG0Hr1lfO6gk1p1dvgtjSBnjoTXqkwDA09qLURdbLGF?= =?us-ascii?Q?VN+QhLI3Dp9xYPuEK8Y6dJajSt5B5qP4TXDc50JhD8hoXy+W2xfTpIoP5UFM?= =?us-ascii?Q?nexzMARFzkvrKl4mBz+ThQXehwQ/StAKM/ssnyMtVVL5xU/a0mjMKxFt98sY?= =?us-ascii?Q?tI3U5le4SVdSo2UIeGnb/gboZnkX0292BFAolQzvsKKo+TqWT7wuqG4oW8cx?= =?us-ascii?Q?948QQb6FMmMFZ3ccjEP6/KyrV4bLNqo/RobVEUvZzutRxPjSHQ5VAKBmdtVN?= =?us-ascii?Q?EW4kanrDWLz8WZF1qIr+G1Xq18P1cXfspmAPpBNN4gi8mkJBzn5W+SxRSErh?= =?us-ascii?Q?wfWtPwhcjAil5VOALKjQsmcc6VTW80+lygn8ZZ5ygAJ20uhnUyqi1cFNJjhZ?= =?us-ascii?Q?zGNs7EFdWzpz2Vz33OE3U2ayX9SiGJnef1khp8mBwkU2upFT/yLsYMh5YQR3?= =?us-ascii?Q?VlFglrgCjpSKDYtTHOJteAxLPe2Yr17ePbk2OHfqoRmoGO3rImKIa41lXj1j?= =?us-ascii?Q?g8RfTUdebS+W+YtiPW0aHLfFdh+kV9NEcG7lCmiA6Oyv2PovuoA4jTOQEMSX?= =?us-ascii?Q?rEWZctpGvio/zhPEsBFL5LbyoxpZuHl9sg6zHAzpVkcKJVSppKYBj9PBoIFh?= =?us-ascii?Q?pOQxhC6bkL052aJI8vHM6m2VPKD9ILUcEd5fi5UVEq/HWZAjx1AjvdMOUWsu?= =?us-ascii?Q?Sw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dee4f970-9b99-4985-bab2-08dad4696396 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 13:30:33.6635 (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: q81RpIfcTcW7ZUPV+sAEdB/WOmdVzc6I4DOHpzKKnD2GsPW1rUn6AjD3ATsjjMJwVjB2EZ37FS2wcmVJEIIvng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7509 Content-Type: text/plain; charset="utf-8" This patch defines two packet scheduler wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke data_init() and get_subflow() of msk->sched in them. Set data->reinject to true in mptcp_sched_get_retrans(), set it false in mptcp_sched_get_send(). If msk->sched is NULL, use default functions mptcp_subflow_get_send() and mptcp_subflow_get_retrans() to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 4 ++++ net/mptcp/sched.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 99f5e51d5ca4..d8ad68dd504a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1397,7 +1397,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -2213,7 +2213,7 @@ static void mptcp_timeout_timer(struct timer_list *t) * * A backup subflow is returned only if that is the only kind available. */ -static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 224f03a899c5..adfb758a842f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -657,6 +657,10 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_= context *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_retrans(struct mptcp_sock *msk); +int mptcp_sched_get_send(struct mptcp_sock *msk); +int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 0d7c73e9562e..c4006f142f10 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -112,3 +112,53 @@ void mptcp_sched_data_set_contexts(const struct mptcp_= sock *msk, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; } + +int mptcp_sched_get_send(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + if (!msk->sched) { + struct sock *ssk; + + ssk =3D mptcp_subflow_get_send(msk); + 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); +} + +int mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + if (!msk->sched) { + struct sock *ssk; + + 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 Fri Mar 29 12:34:35 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2049.outbound.protection.outlook.com [40.107.15.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 55C05257A for ; Fri, 2 Dec 2022 13:30:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W0SwOuS9Zk3CWOAUVsM7rGh8nUa7OP+W72r6k6RzvtXfhJrCENYzC5zboeGd4aMLI2VjX+ewD94WyDgS9p2DBf0z2LIk35FvBhwqjVLBZnoS9c8wuETN6gC3/EID3J7RtL87Of2i6EBlsFN43qBz/UCXkVafYr5+d11ygqWUwt7n448Ej2gVfJFaxJe7Jf7E7uINqSgQYgBMU7e/2gAnnf86fq6OArHvT9ebGso2cRfFcbUtroQ7UYWD/rnSWzBG7rLe+vmd1Drs01qD7nABZ4ITSDRIhOkMUFHwHmkmc0uRw6ivFSxZVMGzDIdM5X+39aDZAPRb+hkW50yCCQcTvA== 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=SJ6J42si83t13BaxdeYjkqENRj2fVAyTMP36NzIvvbg=; b=AEEngaewbQmbi8JehJsUMI0QqtmkMcK+BTg1xHrxjIpY8IYnQgZXCSMt9QqpM5DjaZBAvlCuIIZTBB5/JTRyWJ3BJgLH4hpljK3zWfiL4easGL7n5xPTwx8OOI+cKT33VEW6sEVRv4rUO7IR3Qar3kor3mw39Fac3DjEs9yFaeO6yDLat22LE719tLeHBSjUcmwkeIeQUX69/cf/vw0dNz4RxFVEniOGOe2Xx7D5vJVVRG2Wp2hf2EoxvCPwGcpMYOtmeAj7lla4DHzfIWvnq8UbGQupYWOeubCVWzG/9xl7ulUXiVyDlze5HLk5QCYdHzAofPChkEwugpOF/Ix9XA== 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=SJ6J42si83t13BaxdeYjkqENRj2fVAyTMP36NzIvvbg=; b=EhhtNUwusiolgldquT8oBhXxjoeLkFw29N0KPGKlNbsyypJF6K9OhG7HrB+I6f3p2aVOYVTUr4FuucmN7w3bmd3vvyVoNml32UYkmr25yhUoh3CRdvhc24hZ8ENMCGIdOqJgmNoWoVSnhzDdu2KgM5FWJVdE1IUlhIFFtYyV/IY3vAs4+5uA30FquLSQ1M41y+Fk8NS3rNFzvHOZtfHlbmObDE0uqhvpbHX0AyMey9OmVp2TGbU7XkWgVxVOZLCvNP0tQbOEy/2bblYtPCivHcvFnSodCd8Wf9Xu2lS/U8DrtulrbONLH055jF94W2ZSvKkKTr4BWPs5gwzSq71fvQ== 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 AS8PR04MB7509.eurprd04.prod.outlook.com (2603:10a6:20b:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Fri, 2 Dec 2022 13:30:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac%3]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 13:30:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v22 2/5] mptcp: use get_send wrapper Date: Fri, 2 Dec 2022 21:30:14 +0800 Message-Id: <052d8257378ae7fae5e913f2c3a4007eaef1a856.1669987293.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:1f6::11) 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_|AS8PR04MB7509:EE_ X-MS-Office365-Filtering-Correlation-Id: e5b68036-bc02-4f28-51c4-08dad469676f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Os4Fi+r+0VTCpOm2j24tDrPIie4pHsonae0CQikMVHDEOe0/qK08dGNQuAgBtsZzjXWni7+nYCJlf7AcDyMiG071/lJWRHBY8oq0q6DSsli+P0uU2nluhvHCAzVKJVKs88O+LkwAV8rsQkkGT6Fm/jLyoHIquIam6GV22TCf9/oli9FuICdUwJj18Ms4fDznv8WSnM45Gdn//bvKbfCBy+4wHh88EldhLT5v5hivhE0JbR0KARlI0s6EJfhQ7vvuJDLGYb8HF20CoNq3tCZqIdKqveazEEA7W12AdG2ndJVCAemcq/YwwSFWwU75Q5kTTzGV4TiIMLIcQqo8MBbiJ8jRu1EJ/2NhLld4CTRKOmbP7Y0OnsA67cNNslS2rwJj5+P+Z0XRypBEFyyUede7B4dcOzERWwGNoOTRtgAqTe1YC43IHf/Vwy2VjS9Q4rU2ivyIhC7HIKK6nde7nfs4k8EVKoizqNrPJQhlGTcNs2VJkwbT1Gvgi28MfXTXJg9UR0nDa9ZF4Lv9JOyFvYQtqmyJqzViIcJxpeNJstPvBZgOO5S77ocy66oqwcugKYBVU/nL4ifA04HvYAq89Afz38MJld/45daEUeWbcrPzA7C70w28EZNCHcd56NWLWk6X4VZjUxvlyHq8uV41sN7eVA== 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)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(44832011)(2906002)(36756003)(316002)(83380400001)(6916009)(6486002)(8936002)(478600001)(6666004)(107886003)(66476007)(66946007)(5660300002)(2616005)(4326008)(41300700001)(8676002)(66556008)(6506007)(86362001)(38100700002)(26005)(186003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jq+LoQLNBaKaguQllQM0IxzCukuJT/wUbJTqTecHWY9UdSnspEdv4esOMFnK?= =?us-ascii?Q?+iNHYUezfNFfgREVOyYloL+DZWsJJfsO7hgSg4i5CRQ2DFxqiPVNAUO1Rej2?= =?us-ascii?Q?UNzz+bihOZ2PLHUf5W338FbW+wjk3C2Nc3A1VwM6mQEIEoA7TnVMKNS2f1bp?= =?us-ascii?Q?AQUpO2mmCM8IhT3+62YgUcgLs3y4BRJMDcA5YyUCVQfLfcqZMyAdZigE3j0V?= =?us-ascii?Q?76EON0rrNadvcYx8YAJZUPYntg9vKZKbUAk4rR2Roq9s2BQbjbh4PbRA9F7x?= =?us-ascii?Q?7rsM0im3znRxv2tD/MaQVyzrbZzaWkffdvxKqombYUsAj3BHuRt3xNwrMmYv?= =?us-ascii?Q?8k7Wkpe2b7VDQSZSFxgE4HpvozANbUZjBgn/moedrAgk38+YeU4ZWBLa8Ocb?= =?us-ascii?Q?octUUGybtMAnnpAT5V68TKMvT6o4UxIEGp/lfVHdpiqFkWXqfENillMDcaNG?= =?us-ascii?Q?D51dUzBuqoPprV6Pd/H/9j3JMH5JQox0/w5bBEXkuftNP8eGMSkMiMO52jFi?= =?us-ascii?Q?Qw36lRRSrodOYjqeUgu6a31r/jeUmBiKDTMgnVolJAdNnSNTVYFIagcm++D5?= =?us-ascii?Q?VFKFVfp5BBltLfxSrIV+W1ju5YPCN+oPykmdpw+3JmYe+NRmluT5yU8ytubj?= =?us-ascii?Q?SKznPjH6VFFKJLcXcxb/+5X/4EapyJrMOWc6TXf9yVLYIfxO1PrKVleLxyg/?= =?us-ascii?Q?ntonqmiiwH7jg8qKaMXSo9o+Cr538WP7zzQRoNUALjtd4nV4aX3WluDoQQ9X?= =?us-ascii?Q?uKy7UMvKpEenyfsxUA9g1q4Rw5KWZuTdgD+a8qbaGmcyzBmLMYNuMtZQd4rp?= =?us-ascii?Q?ekvTHVAkg8A4KM+ROhiSttpJpqhOpfEFGuuMmrK6qwSEJ9WokmJGEJ26Rge/?= =?us-ascii?Q?boAEJooE9Cq4/+baUEZuK1H9thsh3w3dbfvU0TZyUHx9P0grmNBhTFOxLa+E?= =?us-ascii?Q?SCBusbc3YTebfDg1d2LxgrbkgmiP+AEYTd5/Yh7vij78CQ2NFVxRmTnmo2lq?= =?us-ascii?Q?BJlHu5nL6Js7/yKL/eTkbsL9coJVz0a7tFj7LNGLzuwtCFhScfI7Et+/vLnl?= =?us-ascii?Q?Jyqphe/72WxCmZkpml39RGyvgO5RfeOiqB9JtyLmEL9bkfe9SYcTvZRUd8gB?= =?us-ascii?Q?R7GZQlgcLT4ruT7asjplPF71JDFc3rBv5m5aP7lL9tLGVa1JllvbxNaTSYVK?= =?us-ascii?Q?Y8ANdrZR8m0jQtdcLLAwRRLxgKnd4w3Vl0/y4SaSQPU5RCe6azrn7I+Sk3tf?= =?us-ascii?Q?CC+gXuKkazKtEXvyYRUCh/a4tiUbFVidKgMFUwf9IGjHbniv5yYvQ47/z3do?= =?us-ascii?Q?FVsozzft8HgDg1bCvzCUallahHNWfTCPHEzt6JaeBx33xKrDXoXJzHKVRX3U?= =?us-ascii?Q?goRINwjlyZYVEbMmAO3WOxjg7WzXpzcVZEciODFjseJVovh+YbTYWfTU/yDG?= =?us-ascii?Q?YEByX1sHFrjwuNeHtl8wiyyKExrwox9AIJYvPlxuTPLcSW80isfsXzUnSym0?= =?us-ascii?Q?GpVBtEi+7P9arv7cC+lhNmkkIEA83pc+3ihCEn56I5qcntAS5reMT1Z8ijuK?= =?us-ascii?Q?zt7Ekah69jD2QqNj3huPI7AjOKUVoMqoxdxfPn0ERfBncydVoevURbFkmoe5?= =?us-ascii?Q?rQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5b68036-bc02-4f28-51c4-08dad469676f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 13:30:40.0068 (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: WxqufriKVflMfSWi7Fq+/ek78C3xI4AsvkJSnG//dCm1CL4aJsYW2dbirfLT5rMPut/YC9VEjprCuUAESSTv5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7509 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_push_pending and __mptcp_subflow_push_pending. Use get_send() wrapper instead of mptcp_subflow_get_send() in them. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Move sock_owned_by_me() check and fallback check into get_send() wrapper from mptcp_subflow_get_send(). This commit allows the scheduler to set the subflow->scheduled bit in multiple subflows, but it does not allow for sending redundant data. Multiple scheduled subflows will send sequential data on each subflow. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 129 +++++++++++++++++++++++++++---------------- net/mptcp/sched.c | 13 +++++ 2 files changed, 95 insertions(+), 47 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d8ad68dd504a..cef6086c7f40 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1408,15 +1408,6 @@ struct sock *mptcp_subflow_get_send(struct mptcp_soc= k *msk) u64 linger_time; long tout =3D 0; =20 - sock_owned_by_me(sk); - - if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return __tcp_can_send(msk->first) && - sk_stream_memory_free(msk->first) ? msk->first : NULL; - } - /* pick the subflow with the lower wmem/wspace ratio */ for (i =3D 0; i < SSK_MODE_MAX; ++i) { send_info[i].ssk =3D NULL; @@ -1563,47 +1554,61 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) { struct sock *prev_ssk =3D NULL, *ssk =3D NULL; struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .flags =3D flags, }; bool do_check_data_fin =3D false; + int push_count =3D 1; =20 - while (mptcp_send_head(sk)) { + while (mptcp_send_head(sk) && (push_count > 0)) { int ret =3D 0; =20 - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); + if (mptcp_sched_get_send(msk)) + break; =20 - /* First check. If the ssk has changed since - * the last round, release prev_ssk - */ - if (ssk !=3D prev_ssk && prev_ssk) - mptcp_push_release(prev_ssk, &info); - if (!ssk) - goto out; + push_count =3D 0; =20 - /* Need to lock the new subflow only if different - * from the previous one, otherwise we are still - * helding the relevant lock - */ - if (ssk !=3D prev_ssk) - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); - goto out; + if (ssk !=3D prev_ssk) { + /* First check. If the ssk has changed since + * the last round, release prev_ssk + */ + if (prev_ssk) + mptcp_push_release(prev_ssk, &info); + + /* Need to lock the new subflow only if different + * from the previous one, otherwise we are still + * helding the relevant lock + */ + lock_sock(ssk); + } + + push_count++; + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + if (ret !=3D -EAGAIN || + (1 << ssk->sk_state) & + (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSE)) + push_count--; + continue; + } + do_check_data_fin =3D true; + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } - do_check_data_fin =3D true; } =20 /* at this point we held the socket lock for the last subflow we used */ if (ssk) mptcp_push_release(ssk, &info); =20 -out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); @@ -1614,33 +1619,63 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk= , bool first) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; - struct sock *xmit_ssk; + bool push =3D true; int copied =3D 0; =20 info.flags =3D 0; - while (mptcp_send_head(sk)) { + while (mptcp_send_head(sk) && push) { + bool delegate =3D false; int ret =3D 0; =20 /* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); - if (!xmit_ssk) - goto out; - if (xmit_ssk !=3D ssk) { - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), - MPTCP_DELEGATE_SEND); - goto out; + if (first) { + ret =3D __subflow_push_pending(sk, ssk, &info); + first =3D false; + if (ret <=3D 0) + break; + copied +=3D ret; + msk->last_snd =3D ssk; + continue; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - first =3D false; - if (ret <=3D 0) - break; - copied +=3D ret; + if (mptcp_sched_get_send(msk)) + goto out; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + struct sock *xmit_ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (xmit_ssk !=3D ssk) { + /* Only delegate to one subflow recently, + * TODO: chain delegated calls for more subflows. + */ + if (delegate) + goto out; + mptcp_subflow_delegate(subflow, + MPTCP_DELEGATE_SEND); + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + delegate =3D true; + push =3D false; + continue; + } + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + push =3D false; + continue; + } + copied +=3D ret; + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } } =20 out: diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index c4006f142f10..18518a81afb3 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -118,6 +118,19 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; =20 + sock_owned_by_me((const struct sock *)msk); + + /* the following check is moved out of mptcp_subflow_get_send */ + if (__mptcp_check_fallback(msk)) { + if (msk->first && + __tcp_can_send(msk->first) && + sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + return 0; + } + return -EINVAL; + } + mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) return 0; --=20 2.35.3 From nobody Fri Mar 29 12:34:35 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2079.outbound.protection.outlook.com [40.107.15.79]) (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 54A86257A for ; Fri, 2 Dec 2022 13:30:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gnayvx5ICkoyncRkXFaFUdYpwpVx6ZZY4c/uDKusQf/8RTY0Ki3W6AKADySbd5gMUD+kLdvChqc41XrLX6gOYf4TSEy7TKmqky6KTEon8CFIKqG+HG/Y34E349OIhxxM/th03jKDr+vDU2/x1EqTgAXwfbi1CR0NzdW4Jm3leTB9GhjLS4TNLfN30eKvBmrdMQN73lOaHUcXfudhRk8KVgSvIKDVUW2ClJYjJH3J7tjPvwndSaXul8LfdtMOpVsFGIJddMokfwK5uig1T4+gWQ9Jcqv1nhXhzKte37L4Ddg2ZgA7vcyEpq0CSvYd2cchwComZEVkoDw1k0yWWWJlUw== 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=gNdkSf04xJooTcmleaia12OtFegwG0+BCWISpCKfs/A=; b=iSF4VM4gjANfI/gR/v3PNW7nxNuXjMxcymiX1l54TZItbCRHZ08qElUtOjbM+BBCAI/iwrCUKI8tWLEjvi2g8SwnoKLGTZENLCnzmUuz0Zrfr8byWkDPTiJTOg1R1GqbBGQ83ctSGVDXN125nXjKOSrUo28XmpehF4xbhgwgY6UdX8woRHiHPdXbUOu35oF5hQhmXVvenwXikL2gZogs8uIXgUqh3sRPRJ8sAaWlvgSFHQLHAqE2RvxXHkaxY7u6xBe/LaYbpSOAs1HvQ5Z5P23Pi+pgWweME416moPpKqo6Gs76zuJW7E55wcR1n/IjAmxxN4LxczTBKmxCQM3cag== 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=gNdkSf04xJooTcmleaia12OtFegwG0+BCWISpCKfs/A=; b=SRZOBPvvWb8IXmB19243KLg96BhJ/AtB8SO7/1bMXsB0Lsc8RlSr12AyBU+xpE4E4uADbqrzfznW3xxN5cqDsEWsZOdSUlUzpTJtqF130PJn7yXjcrbJaNO05yk/UCXsVptLUmo0bDYLg3nQGQfO6v4EpnjU/eglET8Aw5/UZ5eUa09iS2pfRsezyYMnyH1h4OI2KcfDSiZ9z8khJktYa4gf8Ff5l5KEbs1ZYROHgxURsfgyzn3zqTyCUbn10bLxPsXCXKRzQMAwV10pHTR5bs0DzU1nfqczWvmnRxxnscbmqRFPDr+gFSGO29LvAq3AuZLrPFaUyhy6UOWRm81c5Q== 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 AS8PR04MB7509.eurprd04.prod.outlook.com (2603:10a6:20b:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Fri, 2 Dec 2022 13:30:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac%3]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 13:30:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v22 3/5] mptcp: use get_retrans wrapper Date: Fri, 2 Dec 2022 21:30:15 +0800 Message-Id: <9aabc1cc8a9bbdbcdd887904f1ebbdcc5161bdab.1669987293.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0036.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|AS8PR04MB7509:EE_ X-MS-Office365-Filtering-Correlation-Id: 5221f7ba-f515-4bfa-0d81-08dad4696b6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q8RWO+fhhNJxd97rlhvCUVu3WQ5tBihcr/I0OXS6B2Mb3bGOIIVfk09Nz3JDR2ySigPXOjHldzS5bq3EVXmeYESdG05gPx7GT+JwL2UUviXjb+bVCmJcp5nRdDPdgla8MVyjPxVQRTHbRKv/GrJC1vkHGP+HeYFqtihVxcWm7xD9eMTkAkLQoi37qF/T+EhGMDICYziqCwmNpCv1wKN9kM8iP6ZN3CzpnwAZ5eQjcYry0e6ea32LR36iJykZX3dNt9ey6quW8As80mQfNf7CJMQDQxsb3PtIGkmEfdbFMsayQcYoYS3x9wkNia0P2WcfxLO3anLwV2iU7jRxS5XeVqeYlw4Vw5qS9LFgbKs0vlVlrAwf79QFWXeHvWlOjLGDMxNSrDOUQ0Uh0FsAqQj24FpiQgnU7CapvQfJ406+7GNeWO4ouR7PONHC821/VOi/FVHQsMbKIyL0f4LsXFbGHJCOiPc+TrqaS+m8h5BsmVjJDoeaofpf0QNgAxDVcbtCbdZhfpZWtAq6roVIaALFsePMMuSvguY+GBL6o/1v0+jORBEncoKSAdjHLaltPEApS3m2DS4qZelWq5ian8ncyG1DyJrpcQEO9JMbe1520F/b5ObhrDlIMRbgAHieMWnyt/bwD0ZrZuL+equqs6fCSg== 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)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(44832011)(2906002)(36756003)(316002)(83380400001)(6916009)(6486002)(8936002)(478600001)(6666004)(107886003)(66476007)(66946007)(5660300002)(2616005)(4326008)(41300700001)(8676002)(66556008)(6506007)(86362001)(38100700002)(26005)(186003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aM4/Nje3gVbtk7W4BdEBFHIIktEIe8tkg7PRbvqOd5Tb/TJ7yNFj4x5bPxsH?= =?us-ascii?Q?v2uvxcE+aYzY890hCOXrnrueOYsNnC/l7tYdzSG4Q6plHLgh3jbTXcuFQ6wy?= =?us-ascii?Q?g9q3M4Pez+xfPvG+cjhbxX8C2JFv7ZdHm8M4OxFTnyqNdwBn4PK9lPIUJRYg?= =?us-ascii?Q?eDzvNW/1muPonFwHp2AgyxmV6TjaR5drKGEIT/kXxzU4MzrV5bNNOQoKeRHK?= =?us-ascii?Q?8oTbGso3yGIEEQEFFNlgIeV4OdsD1h8f7Qo7I23gWGAyBMCNIWX7fceS1+LE?= =?us-ascii?Q?W6NhnZASi6xOmJwyiLTKU1Ds8OcFtEicVYqcYl7atfi4Dcg+mkYZDgHuIkn1?= =?us-ascii?Q?EBBm+FZgUA+NT6tcemtA4r9/RT88VZdgDhLgDfoekFegGvhV6shcrMnz4GvY?= =?us-ascii?Q?XzQOWzmUHUryRckiKPSKUlsKt3l3BpyaWMgV5C34V+rPDL5ZDfWD4EbjFvUl?= =?us-ascii?Q?NJnjKvr6Z+4+DvDx+rCBmZU8rlATjG00fpvoE2UOqkNHpI3/seUVMJQk9tds?= =?us-ascii?Q?x98aYxtj4/mK/nfKSGVyHWJjteaBAs4B9iatdVWTiKvtkn3G5L8rxhXxwJWA?= =?us-ascii?Q?nWbtb5+zxttpE2Je/gWTY+VSws+cPCFK9RavwlAN/Dg+Ev7C+AqUrgpAgvCe?= =?us-ascii?Q?2j0XrE8/idRRiZljQiJ844PUJSwt7O+HtE5O6l6e66BZzkwwND3GGbCx41mE?= =?us-ascii?Q?quQfaOliklXvWk70mcisbT126w+9GJmJhAa3Na07DlB3CtJgRl45iGK2r9kw?= =?us-ascii?Q?c6ccfaC3vcVG9kabcs3C+8B8fHUg4WuLDOQAvK8MDfYqRxHjIqfHh85UDKJc?= =?us-ascii?Q?fmA6eYYV7H7jG7DGpYJZOtdY66lRKWVyHsAwC/9e12ncwwA9/p58XQz2qF7f?= =?us-ascii?Q?3/NUTPB3oJEn75V+PgI5j2u7hWlxfgGa64FAducAEzmzEJECHyVc6u5BD41V?= =?us-ascii?Q?UBgAPviiDsWGgsxydpq8ixlP57xYaz2WKR4yiKzZt3B3jlkOdOTgm3pg2S5u?= =?us-ascii?Q?YdUNDKA8xwMSTNoZFQG9aXvjbqaqIVKMtiLncZs5DOYjJMJAaYuHLdiVMC4L?= =?us-ascii?Q?S7FTvWaE2TfACb/cuhbV2UEY+m+ECXKS2PEb2yUfLbvcH4IbmSHM2o64suTr?= =?us-ascii?Q?fDM9ipCeS8JvWnJ0LgbY/3ipi9oVGruSsaZXVc6a1ePZxMQG0QyZXOaHhl06?= =?us-ascii?Q?FTXcMMZUTqSTgDMO+Qp9aDKUOs93DKq3DhAjMXG2jgSiDBN0JMJUPiYY+XSM?= =?us-ascii?Q?41dwXDFUvQeomHAuFMcVAq+ksAJKMaHUYKSyGPtbz80I+ZvmCahWqj85I82C?= =?us-ascii?Q?GngWcwg8BxPiRRRXh+k1w8d1BkO361oPrOlU1S07YdB9dFvmxEseLk9Na+RO?= =?us-ascii?Q?R2E80ce3tDWmCnLSA/cSlZ4btnGGBZz1WqYXUX/zE1PY0pKv0MelQSTSQR/w?= =?us-ascii?Q?fkWgIOQjNI2nbnEn8xlhC66Pl2ej5OEMZ0an1C4XyJrDM2b/wUbkhvp/T/X5?= =?us-ascii?Q?vHcGUFzCHVO9NQIwzKPhRIVrNlBEaDoFfrWq0TcgpdvkkYrCmyur3U1XJNSn?= =?us-ascii?Q?M9HGuxIhms3fnSQngqyvEkCRvfcRh0ss03/Sf0b5EZufC8YULcjXWo4UB3gw?= =?us-ascii?Q?XA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5221f7ba-f515-4bfa-0d81-08dad4696b6e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 13:30:46.7875 (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: MoMiwF4Gg5ybji4FJA4anYa6HouF/5LKgpKagNZc4vrCsT6IfD+wE1+JLs2869tbcWACxz6LShD9w4V1piL2tg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7509 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_retrans(). Use get_retrans() wrapper instead of mptcp_subflow_get_retrans() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Move sock_owned_by_me() check and fallback check into get_retrans() wrapper from mptcp_subflow_get_retrans(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 67 ++++++++++++++++++++++++++------------------ net/mptcp/sched.c | 6 ++++ 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index cef6086c7f40..7d7048b0774f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2254,11 +2254,6 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_= sock *msk) struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 - sock_owned_by_me((const struct sock *)msk); - - if (__mptcp_check_fallback(msk)) - return NULL; - mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 @@ -2528,16 +2523,17 @@ static void mptcp_check_fastclose(struct mptcp_sock= *msk) static void __mptcp_retrans(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D {}; struct mptcp_data_frag *dfrag; - size_t copied =3D 0; struct sock *ssk; - int ret; + int ret, err; + u16 len =3D 0; =20 mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_subflow_get_retrans(msk); + err =3D mptcp_sched_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -2556,31 +2552,46 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + u16 copied =3D 0; =20 - /* limit retransmission to the bytes already sent on some subflows */ - info.sent =3D 0; - info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->al= ready_sent; - while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; =20 - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; - } - if (copied) { - dfrag->already_sent =3D max(dfrag->already_sent, info.sent); - tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, - info.size_goal); - WRITE_ONCE(msk->allow_infinite_fallback, false); - } + lock_sock(ssk); =20 - release_sock(ssk); + /* limit retransmission to the bytes already sent on some subflows */ + info.sent =3D 0; + info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : + dfrag->already_sent; + while (info.sent < info.limit) { + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); + copied +=3D ret; + info.sent +=3D ret; + } + if (copied) { + len =3D max(copied, len); + tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, + info.size_goal); + WRITE_ONCE(msk->allow_infinite_fallback, false); + } + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 18518a81afb3..c55f2f1cb7ac 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -156,6 +156,12 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; =20 + sock_owned_by_me((const struct sock *)msk); + + /* the following check is moved out of mptcp_subflow_get_retrans */ + if (__mptcp_check_fallback(msk)) + return -EINVAL; + mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) return 0; --=20 2.35.3 From nobody Fri Mar 29 12:34:35 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2070.outbound.protection.outlook.com [40.107.15.70]) (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 3AB48259C for ; Fri, 2 Dec 2022 13:30:55 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XcszNjvKta2fkOPttfHk8wd9ZCQiaNn2LvT7NGrKGCYsKNoi5b/tvhTvsimQrA/twKAhYQkQHuzAluOeQECcEAXFPdh4oaRW0dtglBNbRT6NCD1TwVACIWTimSWwpWF2reG5WSUo0lUQz9q/JE92N4t9blrtSQIt7GFUIM4BtnX+G37nSQ0DVg4Sw/F4CxHuK3OJd/AlQYpUhPYqfP0fxlRP1ktuALMzMn5KnP95ISW/ag6l24DTan+9qWhXCdE4uNadakJARBSXjhB+HV/dsCJugJTwht6NILuAhpcTDEn8yoA/xg6aALjITxQq4rU20yhuWHNbKSJ5V2VQvDC7Lg== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=eL4sVnh0j6Ll2J43B+8BCGPnqKN6PRWmGgN+ZX1EeW4/nbkW4xdxRZkyJ6fZYnVYeW0KE1TfSnOVOO50zG9l9zKQAieUInaA02hS5LPrfGiDBQywP59fybrr9SW5DwX6GpxoAh74QdQ3EBsmxucuh5PEay0tCxRm4iLxis5dhVwa8QlvZTxNtwSZHBuaVjtThkyPFMlz9ugo7+CPTqFkdoSBPDJpk7xQ623Ah03Tk2gZEq8NZ+N55/TXhcgyE/+2CSqt/mQ1UV+VcCkKTcQ/InF/GCJuciLSEc/OWYVfF103E+AsqGeYqHJcX1BGCGl6MMblXyHy98FGRfKQl3cl/w== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=Ym3C0kM4yt68T2QQyUTQGSgX0EfIaLM+FUY8CX0TTivwygFxWeoXlCnovQN31Wnsk8NfzLQssged9Z+THpdW9uWmn0iWp7B/XYIXP0t+5Mz92sCeG1kBRAhJGOvE+49624Y76k49ya+KLZnscts1AWrlUnNca2dqeQthgc0IbAzvi38DsiHV4rn+UeYbQXiFEGa8F5b96wwm+YdvfeUHK7xnxHaV9e3IdNv7YtLUjgQO/l8kJvkwybGF9WPrOIE1z8/zr2ZlhzqmKDVUTY9Zv/+kzHw+thNAsQ6w1O+RlauvKD9Zf6Ya2jzTdSROxKoaZey6IRT/uKC39Xte/m2TPg== 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 AS8PR04MB7509.eurprd04.prod.outlook.com (2603:10a6:20b:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Fri, 2 Dec 2022 13:30:52 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac%3]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 13:30:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v22 4/5] selftests/bpf: Add bpf_red scheduler Date: Fri, 2 Dec 2022 21:30:16 +0800 Message-Id: <62299b41d05afb9d7b9f6f5dd41cc1806383313f.1669987293.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0042.apcprd02.prod.outlook.com (2603:1096:4:1f6::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB7509:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b21d342-a20a-4128-f666-08dad4696f16 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3GcBruAXxMjWTrkDfVy8agnZPOzaP97slawiqJsC7CoRofJPnc12rpCp0NJnPFa0SEd3LH+2CVt4hmDg5hm4BQUv0pcTr4mxX6Q9fx8/f2PQs5hdd7p1JXnOGYB8+N9rAIwRS4pIIiBnqAks9rMqpu5wWc85JfCxJeI9W9b0GcuFVLDPzoBVWJPf/d2RxuYyAbbNvlRbdaVX49aHv4U1O/ny2bNAz0twgrslJpdpnsoLt5Uo9gtaASzwm+65dc7Hph9nKC9/0vq+kE9Bkk99CLSc98KSJNwOExbMFxuJtSyy53TrwBZERC24VzIbD5dj4poh/kDgUvJstNofzXtAsxAYnlR62/qbC3oAOtyfHFgZT/TNC68Bcgj1qSIfUNVEQBNgGfWzS4K2aVzqWmIm0UIoC6bjLIwvKkSGPuwy4rabpbKVWUFJZWo6O/id5yIx35ep/ZNZlda/oN1YZgh4bTLldXBPUNsb1irxUr7+iF2KbhUCnIgX3D1afONvOrQ3k/OLrOKiUzf/AVDLNA83N2x1Nkx2Cg0ExIKd7weMeZtDqSGdXVyGrtp4f4tgFPWd0rFxJ43ln7Q+JovYsR6JFyidzY0apF10ADSlR/aqnrfPhgY+YHd9ui2n2mdKNHIGwSWXJhp6BgfT5lRKrp5KIA== 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)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(44832011)(2906002)(36756003)(316002)(6916009)(6486002)(8936002)(478600001)(6666004)(107886003)(66476007)(66946007)(5660300002)(2616005)(4326008)(41300700001)(8676002)(66556008)(6506007)(86362001)(38100700002)(26005)(186003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FNc+aYqeu+QaC982L/iHQlJtpWJWMp690Y8BjlE6otfotBhlv3JZlxnx5LRQ?= =?us-ascii?Q?TV92EeH8N/1HnxXNL+Ms7s9rKhKkhpnH2dPGoYTw9Z2S4zg1eJvF/9KVIrn5?= =?us-ascii?Q?lCVYOdvN88YFY33sPNtVWdK21NjmVoVKvYf6J9ud7FHESOBIPdxTMtvpKUFe?= =?us-ascii?Q?YMgXBAkQt81MahosFHqS3uaBQMqPrwOeXIRz/dxXxo3/mL83jex030Hb7Z2J?= =?us-ascii?Q?oTotSUfnaYJ7CA8aYkHvp+in3ya3rfAhD5kS8AdnHLxJh+0pYuyTuY/7tnS8?= =?us-ascii?Q?mw/JDf1aFvVTyxV/hrWrAe2qwfoYV23xIM7j2E5TZvYNQdJYmHjt9IwcR8eR?= =?us-ascii?Q?936E2Rya24ZmSIjmu4MahBLCR2LCmlkAAcoX/m2HLq/3OQn4BlMnXN5my/2Q?= =?us-ascii?Q?YrDZfrahQvzt3VvwckftTDIkOR5MlnD0/d42Vhpn+KeY4xiJPg6T2osnKecl?= =?us-ascii?Q?70P2ocKgofh90843B7eyIMZ/C+VbjDoPfLtfm9VN8qwxXqhZjphy669P95pI?= =?us-ascii?Q?rJo3rYtVTczuyv37puIrL298G5q75hCL2nmTIxIRp01dZpbcjs89vWttdN2W?= =?us-ascii?Q?59J5QySNuJgsfwWVZqq3JD6zCu/OEt5LoebQMhWvnbqQgMfvvRoj67MV93P3?= =?us-ascii?Q?/nWp+Riwf3ekYTrYXBQ4MV6Kwq8I6x7hP8yUbFgVN1indmLjQyBLxEfVm04J?= =?us-ascii?Q?iLuL5DKyAVI3eeq+VK8ARzxJNrXElR2P0662TmfJt5ED0sq8d/o6+TpiQqG9?= =?us-ascii?Q?mp+IgKXEY7eXl6Vtw5PBYjtbknoT/xRI3lOAxxyF/FpBlTOxkskrh9kqoxHh?= =?us-ascii?Q?1XX70BMflvFnodKmqt+JFOGnYqjG03rbVRhBeyO/7UFVeF8Te2dq8AdaIiJa?= =?us-ascii?Q?lm4HfK9UwtwnigChC0zcfOWcWvTE37OwBhaHMNJoMzDxA6W4MdGYDKF+fGFZ?= =?us-ascii?Q?KhCRkgj4s/LxZiIqruZ1barytwC8NmBB83qF41xs2U2W8qmXkvc5OPHUlr5p?= =?us-ascii?Q?ORC6kiShJpGtqY+jt364DPnv7i/rM/Wv+KadPstWG0J02zbD2Qs/QNpnhU4h?= =?us-ascii?Q?Qt3TLB+gbzqd1V2IrIdTIbq/CfV8saBBjieqBgttDLv19D3+cVGwnDRwhcnO?= =?us-ascii?Q?na4OpYx15SpSkC6c0eTTze4phqVVDqH5moqg3YNLUDttODgu0Zx99BoiChnu?= =?us-ascii?Q?J2nEEzdRfWBcBHDknO/TqRU8MePx5fMA4i6MVgJc7bpF7AlxYI1ga6YGIAyU?= =?us-ascii?Q?pACC2SZplTa4f10XSYqcPuNl+uGR9fT7EPv6uDyrxMUFr3hZB94JXQdOAxp9?= =?us-ascii?Q?pC3DvHJ4/fLpb1lcbQ+5EyAQhDs2cCLMoRAt2BeN5kmZQ9w4AO2+aTkou+pS?= =?us-ascii?Q?3rEf8E2xXFIbrCcUK2CBW3Drv8+pA4dpPmozThW9r2/XwKf+PGTIXoGpTc75?= =?us-ascii?Q?nXDUnbM2Zv01yTLS6quTl0L4nsAiSsbMmDANN4YLFjAW6UcoWpRZGbPWWLA7?= =?us-ascii?Q?lixRi+jgN4Wr3QYAp7AzIEHDFf+swsJjYm4Ii05CeussdxCgdUrjD0oW28uT?= =?us-ascii?Q?4kEKFzQCpRj6OI/oAzbVbhFjgYLnXkGxilBL9ZQ8NBmX9RnLUgxoyuXxOasB?= =?us-ascii?Q?8Q=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b21d342-a20a-4128-f666-08dad4696f16 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 13:30:52.7870 (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: t27pvxOxsaIHZ+cDYbAsujJjZMLHtakTsGUUciFETpKRnNdqIhwRSth3tqm2lBsF3e5ldGQ3UiD7bkLBWx9VjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7509 Content-Type: text/plain; charset="utf-8" This patch implements the redundant BPF MPTCP scheduler, named bpf_red, which sends all packets redundantly on all available subflows. Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_bpf_red.c | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/test= ing/selftests/bpf/progs/mptcp_bpf_red.c new file mode 100644 index 000000000000..30dd6f521b7f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_red_init") +void BPF_PROG(mptcp_sched_red_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG(mptcp_sched_red_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_red_data_init, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int BPF_STRUCT_OPS(bpf_red_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + mptcp_subflow_set_scheduled(data->contexts[i], true); + } + + return 0; +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .data_init =3D (void *)bpf_red_data_init, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Fri Mar 29 12:34:35 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2078.outbound.protection.outlook.com [40.107.15.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 615FA257A for ; Fri, 2 Dec 2022 13:31:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BzhZVsU5ZtuKDqFaQAN7/XyKWXn6yMUQLCxAvqwqisSDnmt0c4M+z/ubpi4VA72DbQqnzFoUHNgCGzYs1apUz2PZJlp9eQkyL41rVYPJaMnJyTf2jFP98Q3CR/XYdOeDOCJWPxYJeuqNGTL9neOEeqCTAql5Vo6gTPgxcP5t8Tbq8nAYqm3Qp/m+SXbHB73qLyfl9SpdSpT3e0onbhPWWzaG2n5EjSQkfzk6tk64Gvq/I86zul5tqgKGFGFt8QdlLeUV84lLvHZjqQrX6liquv3UPP0YM4jS6Ak6z00d0mSoV53YdV3NsAzX6eH6fFbokCCuy9OB2NrmVME/NI+Wrg== 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=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=LLoUoUd4wqvG4goJlssGzQLNI8bJ4jEy9EMgoEhNoEeT9+WhnMd+RccmfFOMYKjay+pHQUUyVn6HeDlxJVzVtkeo/Puq/cDc1xFez5B2y+yzxGojb4bGNbcUuPeSCDTc53d9PGGJMbiRF/I2zqdZpMxSkbgRFrvdf0K1gQXaO/dU31l6MNtcQgniy7/IhfX1QLB9lX2npPaM7+H1w9iatYem6ijgopDctboH65iZa5lWwas7ZbK1L62NeTk95cu8UPdeaaIwUL585qBv68z6UPTN2kk87DVQFHb6DJX8swwTSeP4qhFjGkemBxLvR88O3i2FSv108L0jA/twbAglZQ== 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=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=mThMqSO8UtYOFPBVeCDjB9IJPDdbOcCALSmX4QJr6I3jI7dlAMkE2DfAvdP8c9FC8W23K1ZcsgYeMgnIbYDQ00NWHxu4ICtfKhFcRzUPJjl86a538KywNIzGctICwlruqM+WTnqe3MUpjaw4TJ4rHuhB+aUtdefJ+RjgZL3dbw2vbvComHGjTtLuI/8jsUjo344T03HKT++yu8lAN7yfWV/p58lzzDe55/3OP6eMA+oTvRwVLr1quxqEJeLT8KbC3Fn/bOSN2jTYARUngf83j0Qz84PJmwBh9G/bDTfM9D0kSmtRUub52Y/jaVmBAvGaxlwXeSbi+h9Y8P70usi2OA== 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 AS8PR04MB7509.eurprd04.prod.outlook.com (2603:10a6:20b:23e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Fri, 2 Dec 2022 13:30:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f933:8754:731f:f6ac%3]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 13:30:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v22 5/5] selftests/bpf: Add bpf_red test Date: Fri, 2 Dec 2022 21:30:17 +0800 Message-Id: <409d2e76d1dd4e35f99e0d38083fbc2a64406859.1669987293.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0045.apcprd02.prod.outlook.com (2603:1096:4:1f6::16) 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_|AS8PR04MB7509:EE_ X-MS-Office365-Filtering-Correlation-Id: 154bc2fc-62a3-42af-c49f-08dad4697328 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fL/xsW/aFWHYvzRxxH0ir+Kg9+KVoW9Y7NFPq81FWYtRkQBXmW6yRxkbPpMU3aSCTDXRZHKvcZ7gibilZ1d6IbSL5JhJNd3LO2O8M9UBJHKGBFqEN5wv7V+s2AjUBvGsjIO5JTv8xDtZ5MPu31IvWGa6amjwuEUzM9c9BITHF1Q2hojKJI+VUUiJ/fqMTsdvllnKXOyYrV8qdZ4PrpTYlhsGWhjtjS2YuONn0Ypp2Vb4gjI3PqvRbDx48ilacgDonK0hJGzeAp4EH4dmGFub5e52XNJZp9oCnHgT3h7t/xfOssZ3LVil5hp5I6LDv8gGqAc+knYpLfZfRhzW8NeaF1itN+TYuihuRFUrE2o/VLi8u312kPDCEjiVB24+hms6zB1+TVrVQgAUUht6Xr5bJK9TfE3gGZ4HYcCCiMPUjGrHuGKD4ZgTiCkcBYP8cEZrSxh6sqROWFWuOWbUq1+diXoqxk68rdAgQNMUVjFwC/viY6E1tOYHrM7n11lyZkOTSjyzIweqyym9uBoMEv/50a1SpOYodViarXY5QGKQvtoIUTLHNZA0aJpvTNY9gGDg1h4z1JKekXDQS0Pr1v4Qqn1OyyMg4A+tZPqi5j43quAyQWIBVIBp445ClcCD/8ZH 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)(376002)(366004)(396003)(346002)(39860400002)(136003)(451199015)(44832011)(2906002)(36756003)(316002)(83380400001)(6916009)(6486002)(8936002)(478600001)(6666004)(107886003)(66476007)(66946007)(5660300002)(2616005)(4326008)(41300700001)(8676002)(66556008)(6506007)(86362001)(38100700002)(26005)(186003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ByROXksYsHAdxEzReJAE5Kvqwr7mNxkjLxKO9JscSS4AhKOoWAUmkJ0+LSj/?= =?us-ascii?Q?Hn/bLT6a71P3MGOaKo7AwShM4o6cQrtmRlvRnYrPbQo+Da8e2pUpj5l6P38H?= =?us-ascii?Q?ZZNLNooHs/c4ic33K4YXWJ7rUw2j3lfGCjO2MQ6Pm3RPScV1ASmgjhMBdyW2?= =?us-ascii?Q?TcoJZNgXWSxskt8tb+5EhvZhzxfPbpgAnUmYCK4U6WnyFekcJYeQc5yDkKba?= =?us-ascii?Q?5N1LNAhvo4n6maqKVFO7WJ0rHatZ3axRYybJcZzpf3rluczIglM7HNRp/+Oz?= =?us-ascii?Q?XlrBfaTz2vAIARt/IYDKvnxib6IchZVHEfanc+VUfUsX8fiyjO5u8xFdF3ad?= =?us-ascii?Q?Fg34OjmsokwQ4E31IuQfEkuMCyecYI1Obt4c/uplklqn9x3r3U8h85CtfWAO?= =?us-ascii?Q?dUgXRq77bJbNOw8kfFLslc1oLsQXtGuxEw0aLf0GWJqRMCQIoPH9BIl9R7/9?= =?us-ascii?Q?j1mbjWhESeObsC9EG2m9dHH5hXplKLYbq1BDdCDmrPo0FOYex1KYjxvAmFwx?= =?us-ascii?Q?s+e1yDM9iLNwxZBRJte4yS00V5rRRgBJRdL6hqQLHBlVLAJ/fIuXENJXJQ0z?= =?us-ascii?Q?SYpJ0LxERpvq46dSbq709Rj/zYrtM/caORm8hVqIZQAUqJs/EUSjubXBps1F?= =?us-ascii?Q?ljKgVRxho8734CgcE/Inm02LSIKBATRwWtbrfSaiSemPXmv2KLreFFlFTGnj?= =?us-ascii?Q?b1vsZpd6DcgPI4ivZ6w1H/lxT0RRbZZyO/qybLrK7i2ygk2Esz9ZnUYKMVtX?= =?us-ascii?Q?d87K4JbLvBZWSz0XxQlFmO44fVcjRCMe7CajhOrGu58YBqLRLqEJHre9ewe0?= =?us-ascii?Q?FtW+Cjn9hlUv6ePMVe0A6tGFqpXYKlZk2y7IcOAATy99ruhUmJupApeMILZ4?= =?us-ascii?Q?ktIt3dxfLSUMhcZh1BaLACNw9d8QzUGubzc/Vt5yc3TwKA0mRGR3JoB9AEyr?= =?us-ascii?Q?hL+MwdgOxBBSzzD7qYuwiE/CC49bWbFEfFLn63AvIuf4sIXDn5hMLkFgyWQK?= =?us-ascii?Q?0SnrwgbvXeMNZLUGfJVY/X2lo4WKtNVtPpX+FIw+AAB6Ist5MYjrI4wvfQo0?= =?us-ascii?Q?B1v7d6J0v423cmFfWafZVF8jr3nJyBaykC9HjlmjniRqABMVI2yHyrczZdCu?= =?us-ascii?Q?Sa2goBAK4pqJHuH3dPdI+yZtn5dtIv1vtVzQthsJbTadpARIL6LPuLz+XRaG?= =?us-ascii?Q?UFCW0Wpm7z61FFTn2tbZqt3CX436uXMjyJs+A7uNDMcomoTBlXVnyWu9/vGS?= =?us-ascii?Q?gwG0aoj9I0IvEURPEAr0APKyM9ikHCiVP5txblPqgh5FTC8sjFDsDD58noCj?= =?us-ascii?Q?5LwlWsZ1YXRPeICbPkzoQp6Mf6cDJjXDjnwQpqumTRZehHVvhDXWd8V1vSgu?= =?us-ascii?Q?MOlV0LQhwOoLMl1xgH/Iga0CtABQlvG1XyXzptwC9nhYY89hsjgvBm2ltI62?= =?us-ascii?Q?XBCnAxpB9nxsJa7FCTBZqrTpQTuOKuqQIGbrCHyx58KW2q7pi3nFU50DwpXT?= =?us-ascii?Q?4fpp47jczOl7duCJD6Ns+U1ThvGAamf2mQhwnpZUhuDyDJ9/dHDrpz6m6XOf?= =?us-ascii?Q?Ae9Ko+q4ceL+Gnddzu+sFyTT+RjmUwr8blUO3h3ABb/NgP1BTbKljPtbx/qs?= =?us-ascii?Q?7A=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 154bc2fc-62a3-42af-c49f-08dad4697328 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 13:30:59.7708 (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: IHnTQnei6TqEIjOcfatoY+WhoUX6pJTRjgzGNOdI2Lhzc4Qi2n7zWs92Ne2IDOdQ09/TnqZrAnd7hjjvJqnh2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7509 Content-Type: text/plain; charset="utf-8" This patch adds the redundant BPF MPTCP scheduler test: test_red(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been redundantly sent on both net devices. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 647d313475bc..8426a5aba721 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -9,6 +9,7 @@ #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" +#include "mptcp_bpf_red.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -381,6 +382,37 @@ static void test_rr(void) mptcp_bpf_rr__destroy(rr_skel); } =20 +static void test_red(void) +{ + struct mptcp_bpf_red *red_skel; + int server_fd, client_fd; + struct bpf_link *link; + + red_skel =3D mptcp_bpf_red__open_and_load(); + if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(red_skel->maps.red); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_red__destroy(red_skel); + return; + } + + sched_init("subflow", "bpf_red"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); + + close(client_fd); + close(server_fd); + sched_cleanup(); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -391,4 +423,6 @@ void test_mptcp(void) test_bkup(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.35.3