From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689189uab; Fri, 10 Jun 2022 06:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuUk7OPnkdqMhvr2yw1mRNPZxSXPSgHSqMSyNaXDSmKRbq/+utHbIeDEen7GO9EvGkYNk4 X-Received: by 2002:a17:902:e804:b0:164:466:e488 with SMTP id u4-20020a170902e80400b001640466e488mr45133848plg.161.1654866360015; Fri, 10 Jun 2022 06:06:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866360; cv=pass; d=google.com; s=arc-20160816; b=zOiaaDtxH5w+r/3TSEdd3oYki7gcCopOw7dETeh2wKdWz1gE82pZTEdI0Z6IKMSTzY j4SMtdPAtiZQYoBMlVYzIsHyfaq76Clr6aDM2SkxT6V0ObXtOE8aQ6dg+e+ZQebgPSNJ CfZTZjFDcPwTZKuR1jXSYD2v6tjp3wI56mC1QhRpvGycAWMa3CawdaF1vvxqVENesonf ePf22RHkT9Uk2iB90UM0E0KLAGQphhbGTRQAZuC/oS4V/LFadnAFZVwHxHg56Xsm1Ans TxtW1SZTBSNwc7DDSPuIM49/GPJKUZWu2CqH15LHaXKsRV1BTRAt1sMbl/reuenKuGey TbFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=JuauZj02I7AYWy6nBktosFe7d8yFyeW98n5zES2GGfM=; b=eiEJakpCwvjKWEaZYeSQ8Q0W0UcfzoMrY7JgujvMWDk8vHL3+v+t5KoBnczT7TPHo1 dsM/sIfHvhZNVTgaMnhnnPJmqyzk+nDOuPujf5HU4tIo53I0ExqJ0QR/5yapPKdMoTCj EUlCMsrLj8DjGfI0zgM2RW+po3DngxZBjf9eC52PhtbS0FOKywVvOWD2Lb6EjI9uOvoz 1Prh2ZJT/b7oCLhYePUjMo+IXL0zh7l/yU2pNDEaAA5VRsqNMhRcGSehQoWBd9YqLLL5 LLe6ZTcGXjVmMcYpcFQsqm65W+Jy8NmN7c/yBb2xrWx+aS1m71s+61EfyUZpburZw9DD 9W3w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=kisnfktT; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5620-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5620-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e11-20020a17090a4a0b00b001df3fb83daesi2685364pjh.157.2022.06.10.06.05.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5620-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=kisnfktT; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5620-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5620-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4FC7C280A7F for ; Fri, 10 Jun 2022 13:05:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B30A644; Fri, 10 Jun 2022 13:05:58 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130049.outbound.protection.outlook.com [40.107.13.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 AB0107A for ; Fri, 10 Jun 2022 13:05:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bo8AMBUJ8Qns2bUFx+lBTTVEqaVPJ2QHGXeK19u6Glz3NznfrfEFllVCmSwM1/bMSxwk2ZY3IvEcsm5VP8vX7CzT7ICh3Apq8MGW7Hngn+lfZptM0DUOVZzEbh0R6W8o6dKokRsetP9hpCl4DVVkfcDuuTAe4/JqjlYHb8LJ+xgMW0tPUUfNFEpMPQUx3q/hlhVHxjm1frxBItZ2y6gMkdYMTqxL3XFDwRyhSPWuANHbI2PUKWCM5u1E8hVmuq9gwaOURtCWXWd06/4KH5CsP3YY+pP1C3L+RvqNsQ7RNmL6mIb0cUEC/92xYjvWK31k/PdddtNaOkxUU1egAZh2/g== 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=JuauZj02I7AYWy6nBktosFe7d8yFyeW98n5zES2GGfM=; b=e+aNb6snS1cOSN9rPVRQLi+caAEjSXMAbIf5M2SUGs3e6A5BUZ6w+XPi07en7yp19bb+NkOBpK9V8M90lN5qVAv5oUgToeqnbSBXnwQ9SM7eZy+iaiRCu3duEMFa4qQwPVZysn5K7KlGGWx8xQGFxN8dOsm2OGENBD+E0K38ZmEOv35hygv3wVh8IjnweNISVcqksMFD39elo82vvsMc0GBMDoE/56mM0FriGWrvMXVb8x9+HatpO1OGZ6C7PNPvbQ9aGSxQYsuIkyZpdLw5hcZgA6B7Ko4IHexezzL7kLEBBnbsNSWNOVCClRxZQz3coqXbh+/xFV9E+WC9qGGfHg== 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=JuauZj02I7AYWy6nBktosFe7d8yFyeW98n5zES2GGfM=; b=kisnfktT0pldnoFExXW9WAwXg1/N2aka8Kq+U7qCaeWCNSmvDgmDcWpuDGVrjw6G1gb+gG3wXBfd4FNCVCaUAbkJALZkQNdMu1hN688sFX8HXqrzqxgR+2v3jag0mpQrRQdjk/wY/KIuUQ02zpgHH5i6ZenvC2HQX3teA+zkPTLd9UQgX0cJ0EpUzUSBp/wIIPdN9rk1cqiUNe/x0EdD1Cfp7d7GyR5qGimUlQURKH4Up64SAk6WHdHnWY9q87W9W96UF07eV2XSFOqLA+iL/6gti9SrTQbXE8nIKLLOBb0sMB3XQlRvMFtHHpcgaId3o85Mwdcavgr3VZO4oOKClg== 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 GV1PR04MB9150.eurprd04.prod.outlook.com (2603:10a6:150:25::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Fri, 10 Jun 2022 13:05:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:05:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 1/9] Squash to "mptcp: add struct mptcp_sched_ops" Date: Fri, 10 Jun 2022 21:05:26 +0800 Message-Id: <17cbf2a479974da043b87ed313670d3020504dcb.1654865847.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0203.apcprd06.prod.outlook.com (2603:1096:4:1::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-Office365-Filtering-Correlation-Id: bbc488fb-1ccc-4020-af31-08da4ae1f3bd X-MS-TrafficTypeDiagnostic: GV1PR04MB9150:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wfm1evTBSI4T/NrDj+OHX6q/W5X33bvt5nkM7bsNxxKyYHY4mTAwVKMrSugXNrBL5LeoAwgYiO6OmAxvXg2lVuXUFQys21br9mvfRAaPD3Em9NIT0/VNnccyLXpyeGEnguzIVdI0JkzshOmjZtXWpCI8Mub1U2fSWgwgenUAYgdl+n06yveMOZULxosZsW/lWq+fDuH7nsabY7rPRE6o7s2J1JLTYO6syDGuSEJSYOALHExYGRkXhVVomHb0gZlA2IeA5PHtR9K8yTj1TU+gZlb5mYbpgnYkR2Kq41sbQ2sFr3NatdA/LHS0UrQ25Juu3H91N317J1no9JRADhROTCBcCxB8H2TDmNXHHWEKT+7VyzE1Oew7kv1EoiWkZw3fdy6USiAwBl2h4jQu1ZmOi6Qw0qinis2+h7psT7JO1mYNsSfRsS8pHzEyFrJpFt3CuZJfu9uDhBtdGAeb+FqAkIsq9i+AcLdoEjb2vfQkkzd3gp4byQz2oxNPpoZ8HVbXA79osT6YQBQY3hYNE2QN24BOMhVkos70M1Jxb0EcApAj5smEsIxGY9XZO1p8yvygtZ5SVAGDyHnpUyznxZKSYuL4o9nqyIkVlYyGwROhHmr37Kg/yHu+tyGTnMLSasHz/jvtXbStLOvnt3DQHGvopEzRO5TfiFoT7OmM+sdWexvQYyl36XghsgMK7b/JqXTELrYKSkdnsdEISwtTdI4kLg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4744005)(6916009)(508600001)(44832011)(5660300002)(316002)(66556008)(2906002)(6666004)(66476007)(8676002)(66946007)(4326008)(6512007)(26005)(8936002)(36756003)(2616005)(86362001)(38100700002)(6486002)(186003)(6506007)(107886003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8M1/gDSgVrWdk3GZbyxdFJ/NZmNRkzjylAVEQVlFGBTU5piAUsApx8ApZXJl?= =?us-ascii?Q?ONkYSaa+EAhyiVCz4HIeCTxQDUM9GzwJOHTLkuCWXpDYyRH76XRffw91GoGO?= =?us-ascii?Q?CwHdBjVgEqPKbznGLPAS7QpxfHQ0jkFPBGRLmXZfBGu6wNYeCIb/ulFookpH?= =?us-ascii?Q?fVc9dGp6uYFqKulnk8ELsPaJK8KRawMEF1J/MXGb1rIvJsSYabsZWUltV/Zh?= =?us-ascii?Q?RFZMj+Fw+2XRTPCQRRHFvUSkVlOiVLWJYFx0480DgIfRFSxm3wYpoAwHh7Rf?= =?us-ascii?Q?mK1n8VGaEIG9/unxcBtbOXSjuqiTfjOeesUh+W0AVf0YIoKwcnvKJ8gLnGTP?= =?us-ascii?Q?N7SSVugHgHXSWJCTdcyu/d/Q+ukdMALt4jo8zM1aOFihkqg5UgfQfhJWCcAj?= =?us-ascii?Q?oGDbw4tA3gqcEOM5cJrSms72AyG3GDlO4NrCtRdlEv1PwoVQy8QI29HvQDge?= =?us-ascii?Q?OJ1M3Aoa3sUDYUKM4GUHolJh7PtCfyCO0H68xQGCBhuIt6kldN3ShKW6HKja?= =?us-ascii?Q?nA6dmD/3IYtyQ2G97WJlC6aMT90AzKil0Zwb61owhv/dkvW74WmlrvR7noTe?= =?us-ascii?Q?kt2UTQdIUrAHmJm0nT4PINcgQWXzwxR+9bMdgNIfUQsrYIIPNxpUSEpQfXiW?= =?us-ascii?Q?0OUNBJzhGVopoHb1y6JHNp/BtMYDr9rbpmmkv5kbT1BT7Op/hbeVJJ/IiFQp?= =?us-ascii?Q?aBsrreAJLZQSJbCAa3ixFdlPRwvZJW6r8cnhwdxoQy/BFxPZIJIHuu3jcZNc?= =?us-ascii?Q?/xB63slJL8Mb1wA6M4UAi7TmsiB2G1QeXgKy1r2JBtiV+3rxwxKimUfBLLsy?= =?us-ascii?Q?FsCwYKXm1Gc7LPEKx5PtZ+sEpnVzx0PaP+Ef992rTKDzgd/OYAKWWAdKc/Ck?= =?us-ascii?Q?5cTLRPI7tkXrXBJiLx3d2OpA/twAdy9RiNfSxKz85GyXejnn0gpV/oZ7ttHc?= =?us-ascii?Q?UqifR9UdgcQDB5w4yExJJNmYcX6dMwON7Qejv+LobhbZnPtXHI5RbF7sw2NQ?= =?us-ascii?Q?udXHM+zhfv3lCSfSObuTh0FcLPu39sfYh2engdbkyNV3bxvG2G+raeHysDg0?= =?us-ascii?Q?tqAUdG7iJXoeP8RC4ZFTsyHAvxT/YKm4Ndffg+8etWQS6Qs6+dn8WsSEs8tK?= =?us-ascii?Q?3yTBMcpBnXRL5o8ZWwo7UaPRo2G/N2yNEdaos+V6/i1KZdBC+ue3x9GlAn30?= =?us-ascii?Q?XCRrn3RLf5fVThoAg8mLq6DnaUEU4atHcbn4llwYQRaDvPulWI+PkGLBOHQG?= =?us-ascii?Q?WIVC35ul34ZXaiCBw4Qc/J/m0im+XXlcewyimj4CltaG87ydIyBwMO/Hd2tr?= =?us-ascii?Q?E0DeZ6HPW1SDr6w59w9H6askrtuknINOqKdWvHScOc15SHa1LyJT6thRph8/?= =?us-ascii?Q?udz2eNUzwCeBE/1ckjSKL4dppSx78LvBTDk09GkGQZrvJYZXA8I3lDnFN0K2?= =?us-ascii?Q?XQ0fmV+1ZGTfJGO+b8KGY4q3+f69hmuk1ypX13NmGxePPxR6ITEkE5YBG01G?= =?us-ascii?Q?OMtu/hdqmvl9ZP+7l3jHmVDF/C6F8oScbS60gfzRZ7BSZ6hgv8QZjpSUXrUE?= =?us-ascii?Q?p39piV3YYQxlDUIR7oY9UJXRSAyWp6b+bPHUquMs8BkP5QRXJs7ACYgfnAey?= =?us-ascii?Q?0P8XS090Td+94BUrZrG1+UeJiyxZcnTJcGy0Mvi601el/5Yb1xZdoyxymVV0?= =?us-ascii?Q?O43IO+Q2zZrza7DCr7zbkhx6/xKTR1HuCTDzT7JEiobxEo+hf80qMQ8YCxkY?= =?us-ascii?Q?9QgfbwlSotbs/Ynb2F1v9sRVXyO2XC4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbc488fb-1ccc-4020-af31-08da4ae1f3bd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:05:54.4519 (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: yNgx+cA9a503Tuk6T2rblNqbfZD6VjHix//altnA3lJ3IfJoKCh1FssUAz0cPMNjvB2tE7BPBXeZ6xPZ5CP1ZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9150 Content-Type: text/plain; charset="utf-8" Add redundant flag for struct mptcp_sched_ops. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 7af7fd48acc7..5f34e32830ad 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -109,6 +109,7 @@ struct mptcp_sched_ops { struct mptcp_sched_data *data); =20 char name[MPTCP_SCHED_NAME_MAX]; + bool redundant; struct module *owner; struct list_head list; =20 --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689328uab; Fri, 10 Jun 2022 06:06:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA72+7ZH+WQC1qipAXIhViR6MyGVU9YfjsD4jX1hO2SzWwFhZPP5H8ptxdl7lbnbCzNdg/ X-Received: by 2002:a05:6808:1719:b0:2f9:ab58:73db with SMTP id bc25-20020a056808171900b002f9ab5873dbmr4506349oib.201.1654866384922; Fri, 10 Jun 2022 06:06:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866384; cv=pass; d=google.com; s=arc-20160816; b=VI1RN3KxeH/i+zPUzWh2Vke/vOE9iNtB25RTs+jdiC4YjU7kV62jJ2PSx9rwVH736z C7ClhIGu8sxymNClrdvqkBDDxRM8HMUe2sf8YqFPeEri5gFpjp+0MThOOPm+U8KykIi0 SXwHgbJfNSmBB/zWr77hadA3C3YMbku1HkI2b2HEUTiF73t0Rmy5EyEDp1bUY+9XZNeV UK5ZmaqS0Oc8E7Lwh1MV7aYk2NR//sm72VwpwgI19DoCne9J2/CrBPnLJ8lxKt26tOl1 szGJzhAaPmrrN+NSSbRP9zOYZeXQ/etvgTF6UsUNUA9o8UncvUtJr0P67NuQE7eX/UlA mAwA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Wv7CiusYeICfszj34mJ88VjlU3IV5qAk5TZfmNFtXnU=; b=aUVVPcZ5OY+BwHK2HkEv3uHotn8/M7qkoRm1Yv2uWX1ERa10cOng3REXYEDyvSMQ/l 6f3WR/jRstxPbxlPymJzGnUwC6gAeAOkA64lw96h/5RwwVpjKcXEE7Zgp3ZtQmrHmoU2 gzc5RMnMuOJStDIgVDe2G6S8LfcHtYvwdDRoPHJ0DjE/S3DxjoS1m5JZVdzL31LM/vXe KFmPX3jUAkIPo1+Qk7ZA1kWBNScmuKOSwX1kNAjFXxk3Ca2r2QNHn3WXxm6xXb6s+Dnx yKpvSrMUBi5XjyNiqsKdh0awP3IY8pbmheHuc465s41NpvvGUQ/vKlx0m1ymKbtHKVti zKJA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=iRC1JtaO; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5621-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5621-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id n15-20020a056870558f00b000f5feb79ed9si24447455oao.145.2022.06.10.06.06.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:24 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5621-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=iRC1JtaO; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5621-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5621-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 7B5802E09F8 for ; Fri, 10 Jun 2022 13:06:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 32EA2644; Fri, 10 Jun 2022 13:06:08 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130057.outbound.protection.outlook.com [40.107.13.57]) (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 AFCCC7A for ; Fri, 10 Jun 2022 13:06:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O/GAAQV+asqPuPWF3VvQt0AAaRdpPRDgDlweB82QF+7i8jjWar0bxtnssKkJZAnx8uAxTqCzqK2ChhcOhXmoCnWvBHeDyNF+sN6kxQGbJDy8Y5riDv3yZOsj2joL3s9DwEMHrLpwt37ZTiZpq8uT1+vCsA6L8ufkRK4dpau5d+pmbBBH4SVxrzGIAG0jwYvxwZ+dUYc8vliziopYc13CB9Nxxd0y+dzDj8i0eeulnuNB6TT1bj59YouRkZoHrxRHrLUV8vOsxI/PGZb7yXk3JBt9KEi9Y41hXT5L8xqGabzF9yNzPIBDsMUFD7DhMgYPaeiqZCVy1GW0Yv6oDyZxoA== 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=Wv7CiusYeICfszj34mJ88VjlU3IV5qAk5TZfmNFtXnU=; b=mIRrDuDZDGENes+LAkMxtDZgll2xIhZgrlbl9TZAja9mUwEuGejqDKcmDf9st8HdUBm76BaXIVyCUgSYoRl/aivBXj/Iot2PhRk8UX7EZfnwLJylIm1WRCm0mQBXCMb4Jefll71oWdJYTy3nE5DEx0LlIEf1Ct7P4GKIiUH2TUfL1E+mUrzkFse2xbASdFMitrRQ7zzmfQyrzhF+OFWXQjqLHxfx1H9jtk5sAR5liTdzU0meFAGWzvFNyohF01ZV8evAD7ttGbhwBLVT0KGtc2aXQk0tRZeYusC9hdkXy0vp3ilGjjfHknlzgamDvqOP1U1wnI8eEZuLnw0o207VBA== 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=Wv7CiusYeICfszj34mJ88VjlU3IV5qAk5TZfmNFtXnU=; b=iRC1JtaOOF8TvI0caqeWGuW/RyWttG2+ilq0HiOQZ9xUog3kY9Cl3MO+wD6HLPKWaKx6uK9/qPNU62x5nE7NKzOuCbFMU/4ii+Ic0YGRKEKiOCp0ioZ3lRh1gCHwaY0Fc+dssHqzLTB+zSc5/iz23hQE8wjLEvoY/Akcf1SrGxoMvyFg8yAZ7QJjclsFjuAmbagHZeNyLFn8FB1ls8QsRGs3JRSIIeKXFDuAY8+kzh5jx6N5WUbndb8rLHnntuzDKXmkroLaO5ExkTgTtlHFC6DJ7jIzr58teZBeCSKVvdjwXgcqWYpxBEQ+j6ac2KZSRDnDcCsiQn4BqeNwQFDoUg== 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 VI1PR0402MB2925.eurprd04.prod.outlook.com (2603:10a6:800:b7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Fri, 10 Jun 2022 13:06:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 2/9] Squash to "mptcp: add get_subflow wrappers" Date: Fri, 10 Jun 2022 21:05:27 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0190.apcprd06.prod.outlook.com (2603:1096:4:1::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-Office365-Filtering-Correlation-Id: 64fb93a6-e63e-448d-85de-08da4ae1f753 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2925:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WQmTh0YKRExUutyhVibhn9aSeWCzsbgKK3PvmIfdVpp7BASAuf8DalMRmzj+ZlDJszlxsKn37/HbfxTLuc4C1drys/wP+hS76x90x/wXVlw6WNIb4P3szihVugBcXzQZwm3t36uj/pgLHHmERuOYW9BsRtT7tc3W922JD2hbFH0TQnP75SP9iuvxzEZ96KbTQ8kDXPRcICSQ9fXEQSCCHTMH/ZGvEBW4JSAYor/oFoD1VKFhzV+omxCoe91EUqCt1WoAIWc6YYTkcEsleY8K49PRDwEwtP1OVhpW/OWLcW7tpi9d/GPsoRYdHN46efeD28ToQDlJ+UsudCXgZXGnXMj+Q8raL4BDrCMjDy9ewSiZ3vCYptxZK9xFn6NfkN9DOJTCmmAuc5YFDCJFcKi+jGCpaLznS05Fq6z+rNmWZGjA4TBI69uxZ2bTiyw5Tzui6sk+rZWE5NAmW9pr5ro8vRrfq9sUAYktS/5Ggxi3IT3xposvLr1WjBPFTtTDwjh6H1Mwmo3pX6I4pLGGX1xt9GqeuPpEGJquPonB1bQ+S/V+7MTTFD9U90KebSX/jK6ruJMCN4yQ1SaG95Gcz4EPHoigMkD58Sz79gQ7sMncOQJZI0Ef1lO7I0A2QuheAH26vxNwHemm2qmrKqbPGsA+K60a0AIboC6gxYQYh365dVnmYEg3UpLDlL/BvcLpaRE0DbiBcq4JfhVkMcwrUkk5rQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(186003)(6666004)(107886003)(316002)(2616005)(36756003)(6916009)(38100700002)(2906002)(6506007)(86362001)(8936002)(508600001)(6486002)(26005)(4326008)(66946007)(66476007)(66556008)(8676002)(6512007)(44832011)(5660300002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1zw7vUX576cnr+9c2r2Hnwab0E5CL/IXZUxrX9lZoGaut+IQ0yq9/r+Tb0vl?= =?us-ascii?Q?kwqnsd6YCg4ajTM3EfEOeuXdCj4/Q6rqFpfHBl2VD75wZQbFnFJodMUv1GeU?= =?us-ascii?Q?nWs9k9Iy5VeFOOLTAxyL6eARu7jxLSVJfs4f4s+q6nG5Mrf5+vt4qzEWcovE?= =?us-ascii?Q?CPBYuwaxo29q478KFdKN25cTnK+/1HRGZROXoLyB4q0Y4Y226BOjrEY0L8TA?= =?us-ascii?Q?Lr1JEk+bBmIpaljtFJuYA/+EogU6MMfhlhITlboaYYE7YRQHPGNL+fde46M5?= =?us-ascii?Q?XJFhjnTyfjHr/3X2H0r5Bj7XEqZl2I8qFlyJajlDQNZ6teHBCEkzu65O6sW4?= =?us-ascii?Q?8NC4sAb0KNMcH1ZacajWl6t/1zoFi8Ue6BRQVA0aOg5jM9zH4ANsPO6cGA19?= =?us-ascii?Q?1z7CT+iNe8zjTchpl7F0ddfRQhGJJGmBRTOiFmo+u8UgckF/ODPUDk17PIxx?= =?us-ascii?Q?loAsHypSVhdvjYIVZQUQpwmwdoxXMUClzmJNfy0ygY3luJCh1KxaT5lRZJgL?= =?us-ascii?Q?BhdLXVNtkuegiPoC+S3GLb90RRVSzS6XXBxQ3meF6RyO799KLLpKh+gpV5vs?= =?us-ascii?Q?gUsVuoLHNlIQqoldeQgFpDt2oO0ElyhiabW0Z9ka3QZaxPOB1Qv41PynGL93?= =?us-ascii?Q?bQ2cwZrhQmkQ4os4yyHsvauueqLjF7eerNgaLakxvpW9kdhlOhaFkYcUDn12?= =?us-ascii?Q?vmLDOwv0/h/qRr2SyjifkuhJLlvk9rnmfu1/tlPkn+M3Y74MZ0G4+exptn40?= =?us-ascii?Q?cFDeuwErGqa6RFfGyy3eSn9v6mlzJnQ2ExIUBbuqr2BWFLbCE1tExIH7dbry?= =?us-ascii?Q?8N0I+G0qFxd3sMlrE/KlHJoJXQ4RWoA9ZIIyEeUXjd/GAMIlxwYBUl96qWn7?= =?us-ascii?Q?CZBI8jXm2WhG8IBN9vD5hElpN3NdhbGS/EU4hptDMiN6Mss9uixtY3SqjkIB?= =?us-ascii?Q?cBXFOrCXTGEMiqjJdwrC28ySvT+ewofT6eo1OdlYECKpLsmx7IGN7EQa3LwV?= =?us-ascii?Q?xPKpGU1hzACbuG9zBSBHH9nExnTdy1ib1xN0YPRRVeQr9K/DjuCb2rUhVWCT?= =?us-ascii?Q?ZGaP8iuClQvRuDXrppYcL5ruQGwrzQ4LZ866XfaQQFS/lzHJs8Y9B/SPEPwt?= =?us-ascii?Q?xLk8IgBo1WZ5VpYn5WePAzooe9gDa8pAO6mkkAqfFTRRQZHHkxmteeJpThDT?= =?us-ascii?Q?beOMdQ14KO91Bzou4aeVExKt+TSHXZk1tMLCe43OnbMPrc+hI9C++38jhbGf?= =?us-ascii?Q?h2CamnGPi5FhzT1W6E4FG2cqdyg8eD8LdvdSkgqYoCt+gxSTT+gLR2NIF2xo?= =?us-ascii?Q?vEGPEZJYD1mEolLqPt1ow8/DPkfL57Mp8Y8t4Ba1T9U24IScRPOE2qDsJh5K?= =?us-ascii?Q?nj1YBJjWpYX9lqj4eDpmPUcLMd5PrHH45ItFVJITQn+8q83btYVreC+VMmcR?= =?us-ascii?Q?B13PVJb/L7KAgaydxsWrRwrSJp8aN96Urpf6PNSUVFyBmzwqhUSfUKbi7Os9?= =?us-ascii?Q?fK27z2y/RoA99LffqpZY4DcOJd9+J10uXIf397e/0mPMkMENdhb+1AvPbLCe?= =?us-ascii?Q?qCqCWWUu9VZLjGRRggSHJ2pg5MAvgKlg4Kah+U1CmBkyZOkYnLQpm1GAoPid?= =?us-ascii?Q?DldbahcSZg7fiATjZzI9KqAUc2dDNwIwf1diGG8GXDyEyvcS8id3/m68NCSh?= =?us-ascii?Q?1PObgADr1M0SCXjnVr1k7dOaDMNJroNXOgE0n0g7OY4RgbiIJdczzhGBC+ko?= =?us-ascii?Q?Zi7eYZySx3IhF9fz2GQm0oswYdydzUk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64fb93a6-e63e-448d-85de-08da4ae1f753 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:00.6389 (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: 5UlJlbWwyNubnZHSKg6u06yvZ424063PtfHefyWeT8FmiGThoPMk4amU0r6wB9H7W1Zp9cvIOCCNkUQG2L6k2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2925 Content-Type: text/plain; charset="utf-8" Please update the subject and commit log: ''' mptcp: add sched_get_send wrapper This patch defines a wrapper named mptcp_sched_get_send(), invoke mptcp_subflow_get_send() or get_subflow() of msk->sched in it. Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts. Move sock_owned_by_me() and the fallback check code from mptcp_subflow_get_send() into this wrapper. ''' Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 15 ++++++---- net/mptcp/protocol.h | 4 +-- net/mptcp/sched.c | 67 ++++++++++++++++++-------------------------- 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 58427fabb061..ab42059143fa 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1567,7 +1567,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) int ret =3D 0; =20 prev_ssk =3D ssk; - ssk =3D mptcp_sched_get_send(msk); + ssk =3D mptcp_subflow_get_send(msk); =20 /* First check. If the ssk has changed since * the last round, release prev_ssk @@ -1634,7 +1634,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) * check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(mptcp_sk(sk)); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -2180,12 +2180,17 @@ static void mptcp_timeout_timer(struct timer_list *= t) * * A backup subflow is returned only if that is the only kind available. */ -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 + sock_owned_by_me((const struct sock *)msk); + + if (__mptcp_check_fallback(msk)) + return NULL; + mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 @@ -2438,7 +2443,7 @@ static void __mptcp_retrans(struct sock *sk) mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_sched_get_retrans(msk); + ssk =3D mptcp_subflow_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -3092,7 +3097,7 @@ void __mptcp_check_push(struct sock *sk, struct sock = *ssk) return; =20 if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk)); + struct sock *xmit_ssk =3D mptcp_subflow_get_send(mptcp_sk(sk)); =20 if (xmit_ssk =3D=3D ssk) __mptcp_subflow_push_pending(sk, ssk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bef7dea9f358..a5a6e8aed5c7 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -633,9 +633,7 @@ void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); -struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk); +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, int *err); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 8858e1fc8b74..527ea07982c5 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -117,60 +117,47 @@ static int mptcp_sched_data_init(struct mptcp_sock *m= sk, bool reinject, return 0; } =20 -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, int *err) { + struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 + *err =3D -EINVAL; sock_owned_by_me((struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return sk_stream_memory_free(msk->first) ? msk->first : NULL; - } - - if (!msk->sched) - return mptcp_subflow_get_send(msk); - - mptcp_sched_data_init(msk, false, &data); - msk->sched->get_subflow(msk, &data); - - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; - break; + if (msk->first && sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + *err =3D 0; + return msk->first; } - } - - return ssk; -} - -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) -{ - struct mptcp_sched_data data; - struct sock *ssk =3D NULL; - int i; - - sock_owned_by_me((const struct sock *)msk); - - /* the following check is moved out of mptcp_subflow_get_retrans */ - if (__mptcp_check_fallback(msk)) return NULL; + } =20 - if (!msk->sched) - return mptcp_subflow_get_retrans(msk); + if (!msk->sched) { + ssk =3D mptcp_subflow_get_send(msk); + if (!ssk) + return NULL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + *err =3D 0; + return ssk; + } =20 - mptcp_sched_data_init(msk, true, &data); + mptcp_sched_data_init(msk, false, &data); msk->sched->get_subflow(msk, &data); =20 - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + /* + * TODO: Redundant subflows are not supported in + * __mptcp_subflow_push_pending() yet. Here's a + * placeholder to pick the first subflow for the + * redundant subflows case. + */ + ssk =3D subflow->tcp_sock; + *err =3D 0; break; } } --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689259uab; Fri, 10 Jun 2022 06:06:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBEREiBbgMW2osKOhFYLBUDcwIk0iRDIV0u85u55OCA9TgD813kz4+9qpbHdUPeS3gLAGA X-Received: by 2002:a17:90b:504:b0:1e6:a0a4:c823 with SMTP id r4-20020a17090b050400b001e6a0a4c823mr8848811pjz.190.1654866373409; Fri, 10 Jun 2022 06:06:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866373; cv=pass; d=google.com; s=arc-20160816; b=zHQDF6RfIdNaGZO+satAxH180fLSqLgHKhGlKsAZcB1cXmIoCtY52NRCJBOG5Y2OiL E3oC7gjF2Xy4IngieQzqWCDL7jw04R1DP7kmT6dn8iRWidev7r03CeaqEXIqRcG+I9WZ iQWvJh6pbelP6HqbZomE0n9f9dngiLHTwWjWZnlj/rTs66E9WY8skv2VucQBu9VV4N8f d/47vs33uCZyuKwZrMle2lZjILVpBk2lRXM42jFjixxz+QsIBIw17/0oZzaUsysmO18D UeJw2InsOd4Nkwt0ABKJaCZYj4nuEdLItN1VNMOrYgqfX50W8E5B7Jg6whQ2A5GpTwgx vVqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=UKVdeKpUGp9QrdLtxrbUjQoMSJ7Gr6pgRXorvM3oM9Y=; b=U5M+/9KtaL0X3BAkgZKU9nNejJPSt4jFd0M9JHkG09k5uQsH60Pjz9/bmeNLQmBkKw yYlgxYxyVJcWEegr2oRdHWj5pcKBRCVqlxCnFzFiJLecpXjWW8ji2z03I1EFaPdOZZdc FpxWN/u9tIocXOcvaJXHVZm+NPIAKGukAHNFlY3o5P1O2ag21AHKJgb6uf84wBX5eBnN 7dPOd7G28HRwVeG4OW7H26bSuqEXkd650ostOWhFdikhWXj/ZWoKEfXAAY0CvOsoKaoa oX8gAGneILDKkAeQuY8AOHbD14P6DXyFjQzxzaA1kSRaKtrIa3ryCeR9UbKn+sbeGVTJ nImA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=uaaUgaKq; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5622-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5622-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id o19-20020a656a53000000b003fc5a7d389fsi24874574pgu.582.2022.06.10.06.06.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:13 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5622-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=uaaUgaKq; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5622-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5622-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DD2BD280A95 for ; Fri, 10 Jun 2022 13:06:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D0343644; Fri, 10 Jun 2022 13:06:11 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80071.outbound.protection.outlook.com [40.107.8.71]) (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 BF03C7A for ; Fri, 10 Jun 2022 13:06:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cTqyqoJXVz9G6Uv2eqmZd7CNXqlpwUEpsSFZHafIhm/WIemHXSxrcK17aSCSehdbaRlowxnhI8VcugJaxqVGbmvaOf2MWTWJ3Lpd9FjWwUfWid8A7qSz/KmlevjvPL9HzNiFuoAPAnhNzzMkom5LXWpEJdl5CDXaH32Vd/UVLkT/FTW0+25zONjOvlixnF52idKXMWDU32Zn4f9BdBNl2NZO4rMFU73YJZZiDP+v0KYvEzz8dHu1SThBDvwxZZTry5pJwQlnfxzk323hIBB+5GiJ9yb8jcqA/0/KubSiyqT3Sd3RPOngbBoOwIPEH5ekF/sxD2odadq3gdI6vuG1rw== 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=UKVdeKpUGp9QrdLtxrbUjQoMSJ7Gr6pgRXorvM3oM9Y=; b=TR0VyrskkikfwwXQ11BrGe+yjApE+iTcg6s9lZniVo8yF9QmPo6Dhhx0lTFz0Vp0iZSLv49XMFpa1hsuLuwhgTnXY4y73j4FTX+o6E3jKfrOszQCVTgSwJz5+npDHJpF23jxkbfaWX5e7f62xYbv6YoTXFTrngyKuCewtlE1VaYsP1pIHzKn1Gm5SBn5X41h3sVQ7miBfa3JJfBt8GHG3aF43sXv5eSM/49cVpbviBXxScGlb2mQWd7yjxHOKdLk+98LGC2dgaJgubP6RD/MydXMU40/R4iaaL/XGfFfkrzM5msIuOLvCBiVTFesSiqeyKYomYuFbXiD/JObscNLlg== 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=UKVdeKpUGp9QrdLtxrbUjQoMSJ7Gr6pgRXorvM3oM9Y=; b=uaaUgaKq0vCEVaGtrhjDYlVely9KBnjtygrZwMIpAX+X4BP4R1BlUPt2JeH5+lykBzuwvAHwx8UT+ym+IQ8O9mu0w672gVhVU8wTeMyBiCJSyX6iIMZ95fI2AsiLKE9F6FZtnjMCf9Upxm8WX1NABrUN6xowbJDTz0jnyl3aDxXlbBNAXB2sTz3MwdiZCLIkLLtoGRP91Zz3ApCwlIPW0EYpK4Tw3YgCLAR2RycZlzf/0ugD2lBIh2uvPxUxA7P7wjMgsIMTKiJ2mgwmkFtXP+TtvkIeIhpoIT8+yeB9ZdvAntCZtsFlD+zEl4BZ5Keb6BPfJ8zsyqTMT23l90VBDg== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 3/9] mptcp: redundant subflows push pending Date: Fri, 10 Jun 2022 21:05:28 +0800 Message-Id: <7918875de1a12ffcc6221da479cce24e4e556889.1654865847.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-Office365-Filtering-Correlation-Id: d756b079-3263-453a-710b-08da4ae1fadd X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P1pSa3aoOTDazocL6cA2CnGgXmkhMHodSb9xzCXpbXPIHl5GRIvs8LbwMP+bkvgivZrhkis5pS/L//lWlTcXOnp9RrT3J7bxqZUjKJynGuCJ3EzNpCxFXP/m5Z4pAqfv5BH5Ar0/fBeodefzAe4LO7BdfonPnLe94GcI3s7RPT4hs6W99rgTlzshONAo27uehNFugzz46Erc+T6OKj8UepCSRsiFEsGjBGgdQg4vFxTPZUmaclrn55GQSau/vxsItXljKDT+IQpqkAKKQa28u1wSDLRpUJtTOeXsahG5GmePoNJlYkDHhC6W93TPefXi9duTi617GUlP/nY4ffHbxBxC1RiXy3HuzNUe8B3UxpEERokGd5V/9bM0VvXNZPBS55b3EIM3mzBeHpHkmNHkN6H8EYw3J2BzXHVQhno8OUWHaTuEVX668LSLhwN5eoRnIfiuiUR+rvEbz19B8qaTh6JU/+KCL/vT+s9+kqKHNQU95eyDF4H28CX8E7FScmMcLiNHR8dRw7Qivhtvzq5Q5YjK/cmHTcALpNg5LKCeDQAo7gsLlKZI4TqtV1h6e/55gO9xMPDcjRqQ1LXwloqIbEDzVhtD3iqevup25PBKbHleKvvJLh/aRw3vOf3w2Vjn2YNdFY+A/DnrSh4QrJPs5T8qb7nYvfhx21baKLOfAB0mTBatWeLj+1Upk8Qbia6RWHhm49eLzbJ9UZ+3LkCZvg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(44832011)(86362001)(6486002)(508600001)(6506007)(83380400001)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vcmylog2RJfRcyjlYooiyE/0QBaaqt8KTHHF08JzpWOigf4W/LiRhcHTL6xa?= =?us-ascii?Q?h77aXVFs+tCSHybsr4S8xTcoVHfI5XLU1uRs5B6Z7Add2hhHKISZCCgKR/N5?= =?us-ascii?Q?IqQePZwGYGw5/DWRtCh/KdC/gDbyXTHO45z9GVQf+eCsDIN4HAbeoRbuGVh6?= =?us-ascii?Q?XojswpLpIEwA+qplfhrnveSmw2Pp6GTZ5eUt9kiMG+5xmlqTz4SIlDdr6QOP?= =?us-ascii?Q?ERIfy1pmDflMNwPhYXOH/9C77B6/H6z45CdEjNSU8o1J31Yn28SaZ9ie3qHm?= =?us-ascii?Q?NoAYWmc45lbXEHvipy6eYqUPsnkoK2ITZ283e2TomPpMWxYufKyHGbkikgc9?= =?us-ascii?Q?5vIbMXY1BYekZ8+qoDRW8XXL7NkAruM+WD7wEtl26Z5gJj0a3SVohig9BOuy?= =?us-ascii?Q?7wPScc28sdMWIe0ceNcovRXGtzZtIROegroPNPylDHlKHBwW+vlnN9rikUfk?= =?us-ascii?Q?pMTgRFW+iAJSv9aALRch9gpqOJEIB8yI2Gr+9JfehWpsndkvtzdX3qKEFegN?= =?us-ascii?Q?58QkMuKFI02LdAn0ixFxpnx1ygLiHdb2GyyuBZYPEufYUWVoBXjyJpVY2rsN?= =?us-ascii?Q?sS1VKtDe1T1X/la2cLjTqKklNqq/31HceWZvqnz3o86gbx7O4PSximOBKWDA?= =?us-ascii?Q?7BiDA3P5IPrnhTvctvvW5YDvyaSYoQtGEijgpIK0BYneID24sUmRrntxaMgM?= =?us-ascii?Q?RAO7OesJ1udUTtGW4IFycQd+P3o3eB9UpaDnXtHQYa5efDXd21f85T+bU/Ph?= =?us-ascii?Q?+6UO0+SB4CPSk5Y9RD93xuSElvBMGucbSBujubDfuOH3KdZKNH1qiscfgkjs?= =?us-ascii?Q?ZDEX/pvP8slayqsuP9Zev9HV1dpvP4dzhYxdt6DuTrfYDwOuM4bNhlDN2mGd?= =?us-ascii?Q?ppsVp5u9t/cMJqWmW2Qn+7RKpzX/d2K6Dx04BvrgczBHPx0f71wg5obCKylo?= =?us-ascii?Q?sNzBi1ovHUmz9qKpM12wmgYH2Ly2rvr+BFX2vYeB8K/6TmYej3UvHwiWkEfh?= =?us-ascii?Q?4/Uf9MGupBsxPqJf2aklQbjaGVPrmSuLbP+/dR10ivGsmcmvsObUau/euDSt?= =?us-ascii?Q?EaOdzE/gMc8CqXsEIfbiSl+kJ9PiYyeRlZBm9b9yt1W4cKssJUEyPhLGAiEh?= =?us-ascii?Q?j0AipMAkQdN7KR1XVg0WJQtFFsGQuoIKML4IBE23XyByVo951BllDoturRv+?= =?us-ascii?Q?6Jab2dpEFgsvN+P6SxK1AaKVNGdT48CWdP8TDKjKYWjPRZdp9VYtSXuCa4ch?= =?us-ascii?Q?X+jHaQ8KOE5gkt5YGot+sxF+RlOG2cxglKcSVbbvIseINVHv/S7hBqMx8i2y?= =?us-ascii?Q?nIK8SM6bbnJrlV8pU+bAYVRoqDBIO5zkOsBCPFeQ4QbpEzf2XpEaJwkBOEvk?= =?us-ascii?Q?IT8rM+eUGjAtZ5azm+q17++7pj1ICUpQOk8cqk70XLD4qXb2hMFan6vWw4jp?= =?us-ascii?Q?y3kSkIyfx7GL1QfmvjPVOLTyrm72aRrVmOgvmV79Cp+ekajCFCmwyhtfup6Z?= =?us-ascii?Q?5VtDg2RiHOVmsx4bv5JOUO5IOqBWl2Cy2QAq6fGb7XafSXI3gL0qft9MjKuL?= =?us-ascii?Q?gT0XFol9omqbHqncQfzdYfk6XD4ZzSztvLI8eQxxfsimk3ysWXVLTzbmMtZB?= =?us-ascii?Q?OxsoojU0+2w2FW9duN7wX5OpER4+mjqyouVTt61sM0ttI0Wwa9OMge59eyqz?= =?us-ascii?Q?mxrtx39ZjDCdPUhjgASoYZ3pQHSDMLLoSgO525FgyZ+cNfmZHm2jOYF2pA+Q?= =?us-ascii?Q?mjyo+1cijok1nqGHfp6Bx/w5RoD3zQM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d756b079-3263-453a-710b-08da4ae1fadd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:06.5759 (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: pStK7MBoTkupoVPHeRaSIEcKAzPaKrLKw6yynkpC+jhVY9k+Zp2tjSBZs8+ax8U9ld3gMIuaSmHqgASjdz6vuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support for __mptcp_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Redundant subflows are not supported in __mptcp_subflow_push_pending() yet. This patch adds a placeholder in mptcp_sched_get_send() to pick the first subflow for the redundant subflows case. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 73 +++++++++++++++++++++++++++++++++++++++++--- net/mptcp/subflow.c | 1 - 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ab42059143fa..257b04315271 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1549,6 +1549,62 @@ void mptcp_check_and_set_pending(struct sock *sk) mptcp_sk(sk)->push_pending |=3D BIT(MPTCP_PUSH_PENDING); } =20 +static int __mptcp_subflows_push_pending(struct sock *sk, struct mptcp_sen= dmsg_info *info) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + struct mptcp_data_frag *dfrag; + int len, copied =3D 0, err =3D 0; + struct sock *ssk =3D NULL; + + while ((dfrag =3D mptcp_send_head(sk))) { + info->sent =3D dfrag->already_sent; + info->limit =3D dfrag->data_len; + len =3D dfrag->data_len - dfrag->already_sent; + while (len > 0) { + int ret =3D 0, max =3D 0; + + mptcp_sched_get_send(msk, &err); + if (err) + goto out; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto out; + + lock_sock(ssk); + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, info); + if (ret <=3D 0) { + mptcp_push_release(ssk, info); + goto out; + } + + if (ret > max) + max =3D ret; + + mptcp_push_release(ssk, info); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } + + info->sent +=3D max; + copied +=3D max; + len -=3D max; + + mptcp_update_post_push(msk, dfrag, max); + } + WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + } + +out: + return copied; +} + void __mptcp_push_pending(struct sock *sk, unsigned int flags) { struct sock *prev_ssk =3D NULL, *ssk =3D NULL; @@ -1559,15 +1615,20 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) struct mptcp_data_frag *dfrag; int len, copied =3D 0; =20 + if (unlikely(msk->sched && msk->sched->redundant)) { + copied =3D __mptcp_subflows_push_pending(sk, &info); + goto out; + } + while ((dfrag =3D mptcp_send_head(sk))) { info.sent =3D dfrag->already_sent; info.limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; while (len > 0) { - int ret =3D 0; + int ret =3D 0, err =3D 0; =20 prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); + ssk =3D mptcp_sched_get_send(msk, &err); =20 /* First check. If the ssk has changed since * the last round, release prev_ssk @@ -1628,13 +1689,13 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk) info.limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; while (len > 0) { - int ret =3D 0; + int ret =3D 0, err =3D 0; =20 /* the caller already invoked the packet scheduler, * check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk), &err); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -3093,11 +3154,13 @@ void __mptcp_data_acked(struct sock *sk) =20 void __mptcp_check_push(struct sock *sk, struct sock *ssk) { + int err =3D 0; + if (!mptcp_send_head(sk)) return; =20 if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_subflow_get_send(mptcp_sk(sk)); + struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk), &err); =20 if (xmit_ssk =3D=3D ssk) __mptcp_subflow_push_pending(sk, ssk); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 5351d54e514a..021b454640a3 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -881,7 +881,6 @@ static bool validate_mapping(struct sock *ssk, struct s= k_buff *skb) subflow->map_data_len))) { /* Mapping does covers past subflow data, invalid */ dbg_bad_map(subflow, ssn); - return false; } return true; } --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689336uab; Fri, 10 Jun 2022 06:06:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJRFcyHpXcvn1mNMdvPL4WoufEunnpQCqXbzjC/LzNxr3WUemp0+zm8y79H/yvkGHsER8N X-Received: by 2002:a9d:eec:0:b0:60c:3147:880f with SMTP id 99-20020a9d0eec000000b0060c3147880fmr1417374otj.231.1654866385471; Fri, 10 Jun 2022 06:06:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866385; cv=pass; d=google.com; s=arc-20160816; b=O/zAVaHrJPR7CJ3U/YDVT0mqaG/apX6W+oypme1G1fNQFM7SojWN+jqe/QwGbrAlir bQ2QT8xYn/phY8oyIWXkU9Q1Ti4d4+rvoHdpJrojvQrvVHQlYe/XQAWuwWvgixF8Q5OL qbP/wyZwDQ9VZ8qyKC4UthQ2FXJO/a00WB/eRQY962TruRApftQvUmXisgCvuWbXcgRa wW8On5rBer1tRWE50uADFWTvKHkTIFLdGBUaE66f6N4pkrRTJjyFxvWEzXlDCXn5nq+8 fY7ofPX0a+qblEulQAd69rFVFLyQ2wsTwWSBA5QW/PIfmKhcS6D4r4MxRXStgMT5dPMa 9Maw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=k//k8OTe91q8gEkdwGPu8BzoNho4qVLoVa1cgp5VN5s=; b=lVK11avRTdmGS32Vhn7idcfdVdyF5EYcrAKN6us6e5saiyiKvp2skP//F5EVsNKxrN EUb1oIvLjNR6KTOFuIzJYer4iT6iYpLbbnV4/T/FRvRS1AdeTIna28pPKZ644FrDKupk +zJBcKStmxU1NHh24c2MlAkW2J5difWJxrBk1p6qSb11xJ3qfijSTySBr/MRd02o1D8j vRyCzbIqhjqzgofkueH1UKg9nnU4/iuOp4EjbG6vA9B1wR6p/ygiOkb97I8eBEKWHMZP Tzrs36y55mTEAGnxx7SAyt6FRhrUauVqyzHWqhUTBaMdwhLOCcdzv7imxB7DqyNrvcNv oM+A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=iV3shq65; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5623-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5623-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id ch15-20020a0568081c0f00b0032b7cf0fe04si29207778oib.251.2022.06.10.06.06.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5623-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=iV3shq65; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5623-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5623-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 93A1C2E0A21 for ; Fri, 10 Jun 2022 13:06:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1BE51644; Fri, 10 Jun 2022 13:06:17 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80084.outbound.protection.outlook.com [40.107.8.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4760D7A for ; Fri, 10 Jun 2022 13:06:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=odQNUYUU6JrQPBzyf3CxfXABmV850+1ACHM8d4Qgfe/roD9RT92MRRGyPA8gUI9TWts2p/9ErQbLmpQ9SbVjj/DQRccQbiT7DjcHNJxFjYJL8ApyvLWkaquEqh7YeNMU5qf/W4rEyzp8jZ3vsKAht2yEdZXBbgE6fm+1YGMxYvordZ2DU/MrpT4HZMhyRX6JjSTTFlp4vB2F8khlyFZeGjgsnINay6W5AfUBQBKr0xc6M2AfZAEUEoDq73JcqS4cQIKzaEvavxLsvF8WQlp+H0JhurwEKO0s1ry5iWHYegaUfbyk6UpJaCYVBmFQLAOAg63JHMXAkW4HNyo2W6whKA== 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=k//k8OTe91q8gEkdwGPu8BzoNho4qVLoVa1cgp5VN5s=; b=J+d+sWvmOxLwe7FFsaNT1rcScN5/uC2fN/+RjNzRHweQt35YA98hF7KC8pVgPsVgOl2qBgGBBKNESJRD+FsyAxyiJMMEk0zuUJWH1tEzBxkzoJ3U6iWDvdLIMxqAOIsPIT0NXD1Q4kOPpyB8lGsWZcHwt9uONE++JdT19ZtevbX0SttgkqAgbMTLT7H4rNxi6g8ugvP4Cjt1c+M1ywgDQEQdpWtJuCQnXWE5et6hu9VgqPSsOw6GqFdKalffKinY84KvlgUUeXMSBuVwdpZG83vlQ5wx5tued1bgYTk7n4vVKYgizXgmDFth4qFP6BAEOMM+d0tn2UCeIKbPmjSZYQ== 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=k//k8OTe91q8gEkdwGPu8BzoNho4qVLoVa1cgp5VN5s=; b=iV3shq65tDNog+zv7EC0PmDO40GGI/2HTKK3QcGKrrKPjkj7PfxuB36bWup8U7lpQg8DfXnLMYO1EOubPAyvzW4zCyBlm3nUcvP8I27ez1bQj9yjsHjmyOHj13DD04Ve7M6C0UJvzS2wiHu96fFcKZokKXtsxtx+Kg0BD8DM5e+gyDbGcrhQc+fIDVj0CsyB+Ow7tLRQl4ZaVKY2TVA2qfJIWwxFfpGjpXujDXuO8DhwyrnRy2zWbLfCWJLafxMIrbGyjnmMbjyskz5EUzXrOzvfJXWM2+mLxlDWSmsTC2gvPO34uhVoFR10s0FaUi/NOSd1aQar3grqG4N0qHYNuw== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 4/9] mptcp: add sched_get_retrans wrapper Date: Fri, 10 Jun 2022 21:05:29 +0800 Message-Id: <8913ed36185b60f09a3f0fc9dabadb5e11395432.1654865847.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-Office365-Filtering-Correlation-Id: dcb7de0e-8729-48d4-e77f-08da4ae1fe51 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mks0ZOgMG4KxDIZZB6vMYegygnVYyvoGVH6HpBWb73Ht7YAZiFMQyZxOPZx43Q76aqq6m5pbH8a5k7Qom+66Y7s3dACSzaSxKsYMC/3GQaU+ttOp+lRdXjKqV/XVm2nMrwITU1MdRhgUNfYd8kyauB96zxVazbGJv/CI/9icwq2ydZNC96bFTjoKMBwJduuaLQtlLcJd/uBrvOMSD5u2TRiV/Jg42PW3f9XQ2Z4Mz38eKM5crv7RPoZHRBrFndV9/hVy15WUTsopGUkFkwc8PHU73FrB7q8yz36FiCeFxy3uC59H87OMDUA6rBSKmr9pL1nIf3Ch/fEVDKbcKPrROWLk5j1l4NOcm5pPLD9kcISDzbdZj9UAC5lEVtTuDczfG1ulCJDk+sTa07Rj8TDveSwy2mwD8BDMP4LE/kpXpibRFoowIJ4fzewt9gBH0Re7RvdBxSqqIHldNRQKS7KapfF8y1IpaHr5JnuJlbROPl/js2250ZkFtHCVazTYFrdIYRMiYk71CaIlonOBr/Q4E8Brr0D3XJ74Rviru4XHZqq9pjQonb55wxSI/gfZCV82d5/lvJrJap42k1wyPkMlIueLxpVh2OHZG1G+M5ynYR0632py+47b0cTG6fXxSkwExICNOLaR/KFMYymCTQaYGUSqHwc6S5000B4qt5gstrlBvv7RkrwSFUe6EoUvu1TTYyhgm4OWzJKIdPBkZrYJKg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(44832011)(86362001)(6486002)(508600001)(6506007)(83380400001)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yqukfgF2BThJ73hni7EJOa1Cxazf2CVETLrDM+9DCRhuhspK5v/ALNxkv9ql?= =?us-ascii?Q?eWrf09z0QT2H7XE2fnPkSv9ZdXVK62Aax1wdD0+j28Lb1MeE3H3D3I1uKtSn?= =?us-ascii?Q?x2gmsUfnT13TQjL6bXDt3XUhvOflALpTtSt8nirL4swFswaHRYlvn+gLSGt+?= =?us-ascii?Q?9QOOBz2mR0KOP/uZwHRPKTXHn+ZA4hk29/OIGg3MGbhLmGrIXWmbIAIyMr/u?= =?us-ascii?Q?mmmdgiO1Flw2wNN6chxpnyK6/tMYKFJwDHV2KSo99pRTuawT3tcTTIM8Spfe?= =?us-ascii?Q?msZIyXPh7Ne0ioWvU4qFs/MYWKeieSm1YS79PZDdo7xMOFmKnFGT8Ryb/TAz?= =?us-ascii?Q?wsQvtS/GSQ1AM7fnEfr/GPPGU6I3oQPmf9DxeL8CHxb1+iG2+UVao9trl0M9?= =?us-ascii?Q?yoBCTac9XoJmbCkSuVaMpLraZDlKLzhImyAe1ScgGGnZ0VNn6ch1QvlZFnTN?= =?us-ascii?Q?CB2QF8BfjsNnnmwMyY1ZQO9AEfmBteqQIprRLVpmGFBThebklfQeyix9jW3L?= =?us-ascii?Q?bfMx5z6SknD9QwLPk529NQMzreBSYCP1ZLTaaZvSeExw0ESx4swvux/hghbb?= =?us-ascii?Q?fPqsEtt7bmo9z3OigxWgkHlOjGewnwa2koK0ue3Hl7j9zmzhkFk1MhjnxKxa?= =?us-ascii?Q?Y6bp25X6V7NtzEl5GQNCpVG9StEAMerGk9ltifIrmho0n9iP82xE084FRRs+?= =?us-ascii?Q?+41Mq0h7ZOJzSH82FSLof6eP4UIpODKiMTxWxUBlyi7A9QkwpNdAwBAzhaGG?= =?us-ascii?Q?7ZAkXgR83MzAr+JO6AiprKsl/G12u4gI3/2+bkmKajPum5DkcqaJvKn6cLNE?= =?us-ascii?Q?VwJj5/jHokg0Phir8Sqw4sLC8BYRJb+fjpo8OnDukk0MtJCF7o37bv6sewJ7?= =?us-ascii?Q?ORM19hrLXJ92Sbh/qKD5QHp7Re5kJkIO/G+r336j8qGNOnHN4GvQLiN9H+ql?= =?us-ascii?Q?1V7neXgPC0bv4wJO+bV2erVcy+rYP94kiv/2I6UjjSIUlo1kA+rTfmJykUp8?= =?us-ascii?Q?snU8PouJTGN7PAiQWqrINedqjp0gggs3ffmrCCOiuiguNdiab7DrGffZObrn?= =?us-ascii?Q?BemS5JhXtufPlsBxWH/ojmvoUsulTpTpGfmJ5upzvHFoM9Vj0IVpYZJzfV6L?= =?us-ascii?Q?fYzCifyO5v0vRd5PQz3fUOFkjS/Opoxu38OJtpfScxddDiTcLr59MDTEjFFD?= =?us-ascii?Q?qxPef1PyhD3RylwO5rn0iBSa2PFg5Fynliizqo6tmf+9B/EvjYCHEZjFjLhV?= =?us-ascii?Q?+W9IHvfbR4voy3cMvd3FdNR2ZgTPlQ/xqvSueBCSB5pYP5H2KVHBNVXiiQ52?= =?us-ascii?Q?TW9j2WhKRfhL1Kqm0QNOmHf7Wn0UXnTJO9WVkjngqOnY5zBnOl6L5ya0gbeP?= =?us-ascii?Q?BxX3INW5OYTqV0dVpc0tlscoz/XjPNZn9CbjUVTJqV7B44+t83rHF/skENvl?= =?us-ascii?Q?ce/9wjWkFajjDYdg+A9Ytn+ej1Bra0g8rAnTxhMXrbSOm0T8k8wRssXTccXR?= =?us-ascii?Q?U1DNLvRoNg4KHTZFWGtX1Za3N4gUnDIjDTieL/Jgf5COv/V/ReqGCPfE4y0A?= =?us-ascii?Q?LweQu86+0II5ouy4oRwiCHbDxs0xgKaGgHUTnwQ3SYA0IK6PA4GjjbJLSsY8?= =?us-ascii?Q?U9oKEfksOjxs6ysvoPumoYTXiM3tWbAdZXVU/zZv+NjnY0tJFHH6VmPvQmmi?= =?us-ascii?Q?44Tf880gs1VHRd7Wm0k41wi3IBXZ1n0PisJn7ssr56mIsq+XweEwJCGi4h4t?= =?us-ascii?Q?sRZxfh5vW5cKFhSMPmEYPWIxCTSerhE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcb7de0e-8729-48d4-e77f-08da4ae1fe51 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:12.3723 (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: 4G7e7RPa2Dn2Jlj87gio90a9ecK3D9559Mi+yLrCQ9IRFYAjCr9I2v6XsSFtPnEK+JOyoy/DJrfRr1L8oK8+EA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 Content-Type: text/plain; charset="utf-8" This patch defines a wrapper named mptcp_sched_get_retrans(), invoke mptcp_subflow_get_retrans() or get_subflow() of msk->sched in it. Move sock_owned_by_me() and the fallback check code from mptcp_subflow_get_retans() into this wrapper. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 7 +------ net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 257b04315271..3bb3445c1eaf 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2241,17 +2241,12 @@ static void mptcp_timeout_timer(struct timer_list *= t) * * A backup subflow is returned only if that is the only kind available. */ -static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 - sock_owned_by_me((const struct sock *)msk); - - if (__mptcp_check_fallback(msk)) - return NULL; - mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a5a6e8aed5c7..c4ce576458a2 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -633,7 +633,9 @@ void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, int *err); +int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 527ea07982c5..0ac80eb9a428 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -164,3 +164,28 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *m= sk, int *err) =20 return ssk; } + +int mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + + sock_owned_by_me((const struct sock *)msk); + + /* the following check is moved out of mptcp_subflow_get_retrans */ + if (__mptcp_check_fallback(msk)) + return -EINVAL; + + if (!msk->sched) { + ssk =3D mptcp_subflow_get_retrans(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } + + mptcp_sched_data_init(msk, true, &data); + msk->sched->get_subflow(msk, &data); + + return 0; +} --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689337uab; Fri, 10 Jun 2022 06:06:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMyJECHGPCE0ARxqn3/W5TmWAGVtXAfCbeh3FE90IaZDDo9pcQVBh2/iXtpgBLh2VPUUpx X-Received: by 2002:a05:6638:1389:b0:332:7cc:4914 with SMTP id w9-20020a056638138900b0033207cc4914mr3746833jad.119.1654866385433; Fri, 10 Jun 2022 06:06:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866385; cv=pass; d=google.com; s=arc-20160816; b=x6p5c14g0LBlAacyWGWjLL4GK50U0ChMDtOcUVN82sEJ+by6EeiTyuoHVzJApUydMK vtyPl7N8/DfGwWOiKiw3h0wPsoq/8aQNcMyoWPoDbUlBip0Zqi1bXrhM1dPBe8/3kOQH CUsxTlsTp/0SrS49aZQXR/26iZSvIWcHDPSlpi/o+/ahMJqtWtIhMjUXcmTXQvIJDOKv 9PC/CmzOVGCZ1RvB+1u5T1cQLZ7XkCoVMFfRYlMcy/wHtUlOCatfzR0kGsj5cM/kCgJk +m99MRKqra6b9b9jTWi860rPAFWFYa6tFTgnG8JX69bCs+QMm/wxHQw84a95Vy7/EUCU EzZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=lmfye/CJQFLFHzRYvTxcqvA/UX8WP5N8nxfO7DwCy4A=; b=pJbKsfSNZjY+PdfqejjabWoQaMnU1WUggQ9WH5i43XBiXC4Dm0i1PWfrQ3yTwlCMez EPKIrXS3fyQP5edtIlqV7S68S3tNuyuzZ9dL4tvy5/5jzjRdVppGiB4S3wqQ24BnBuhh s20qFW3zUArXUHM/qPRlkQ9ZUAioagG2Z7gTwe+DXxQHzceAtlZyMnvdvy/Cq/OAwIlm c3asQM+sdDhbNWPWW/o3EOUXyntDBRMLMQLLJ9hxQte7ziT8iePRyFP4cuEblP2LQvz0 zuQM9+63Oss8P4RaP335Nua/JdsKGq8+LdDkWM9G72npQZhCafPSxabqo330V14KH5KA 6hVA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=2xzwPxo2; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5624-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5624-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h2-20020a92c082000000b002d12d9fae1asi7370183ile.181.2022.06.10.06.06.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5624-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=2xzwPxo2; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5624-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5624-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id BBC52280AAA for ; Fri, 10 Jun 2022 13:06:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CB375644; Fri, 10 Jun 2022 13:06:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80049.outbound.protection.outlook.com [40.107.8.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 C4D817A for ; Fri, 10 Jun 2022 13:06:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NmEV9lU2586T3Pu59b2pjmhb0WPeUXpTJWuTCsIrJ3d/G8R0ZmDXyfzXH2MlCYEt/jQQH9wRQdO2Jm65G1/K6mbTLaR0nPrCUiAPBjPM4+rIZXkItabmsMigLvg/nCjltJkCftIe2OoYURx1w9yTuuIEKnuymFdA3e6A1OyQsYIEl+0zfK3O4hipiKV+0af+xLmuixo7Y19mEUjBmstG4w9wMBWhFv+m5CyQ3mpKAV9k5VzDp850lm8Fg4BWEvMnrnSf3J69Fdd6IZi82mPNkhIyU6djIu7IHDDptqRSjYg+A1BfWVpAIBrOYMeIiY6Ut4Ue28HCAR40rY2gQAxXKQ== 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=lmfye/CJQFLFHzRYvTxcqvA/UX8WP5N8nxfO7DwCy4A=; b=Xe90dIbfxYTA9xqPfd3KbpnwwkTkCm30hz4b+QXeCwkAw38oom9yG53LaAPwLNd9vVXEgsB4xiXmNw1cQ4yqhH7tuRUqU3b0+WIT7qc8fvCCuGSFakqJi24ou9BzOagqt4e0Ly3l8xWD+l/SoCMpUUrlx6XN6wOnlc4gg+tK2h30XBouEy3DQMbl7oxXqWVYMN36nFGYF7BnNMmAyGuWAAGNA4ghIZqxL4EDnk6VB/smv7GKRYhTNH2RLyqQIJxu6AsUOFqtd4ArFuc83gLDUdod7QCc5WIO7ltTxx8Rki7N9Oo+zD1xVX9Cz6LuoS0elSvHyqcEwWooXEr3vyRUcg== 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=lmfye/CJQFLFHzRYvTxcqvA/UX8WP5N8nxfO7DwCy4A=; b=2xzwPxo2H3YtruskEkossYMKcMyqMpF6ULW1+3/5W8I4LczihnEzRbUJSjHfVSxYkStZPnmJ4AbMK6uoG2ouoOdpHENKsVC2sXiyG5x1iXrrgVBK4/+v+XacYVSuzRVNLV3qLskGMZaWSRHoVleCJkfau9fT9dOnprOPWYJmD4tdjyr/SeYVe2MLhNAzCDr6mMVrg2ZepnvDGJLHFpXsN5sfY1ZzAEuwF8z6Ouy1o6lNd6Z9gOpSBc33Mu3DxBpXzh1x78jUfmj+wPZ1eaxUfY8f8RtJChY5wUz97x6rSUVsr/gZIL3wIRugZsBmHxkx4VccD5QLnh7ZvvStKo1pjA== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 5/9] mptcp: redundant subflows retrans support Date: Fri, 10 Jun 2022 21:05:30 +0800 Message-Id: <6dbc73c8c56b540167488f9fd3f58e6417ab5620.1654865847.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0107.apcprd02.prod.outlook.com (2603:1096:4:92::23) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95de72a9-257d-4394-a384-08da4ae20250 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TXiWELaeFy+cjjns2DGvzmHLvu2ViLtEcuoMzUUd21Ss3U5/bZ3Lw6e0Mm/cgrIZv4uQ6QE9QrG94MUm0U7+FsJlzgU4mwyh4ny8JuuednH+OVEv7ZaJs7llZm4uJvKN2DWp5kVByDLAz/mFLC1Q9WQmSQQUGVScyU/UlQc0yEgtVBD6Om88JXwbuwe1AreNcPx0v5aWoOgOwmij4YAojQd0xUYhEPJmDKm2hEDFOf8g0zqvYBlTSIjQexug5SFLkbrBXmLEfwRn9NEHExCYSTWRe7qLV0MMddaEzxbht6AviLPJ//5uwH5wdWW2mLibwlh72lMfnXO2qM6Qfd4n+dWqOtgDnawZlqZAhAYHYZjl7ME29gvAnyfIjruDXtZDyzHI3Eho/ac3MPoeyCyIyFAvmzLxjBU2tlAJWxUUOUdcg7bHsDPOE1ri4Kr2f545uaISesQGNcMkw4EP0SkSH/kq/afDoWhKYQvWXm46AK4neMLSUN9rZhXUs1HbkMu0LsD+EitC0+OTNI7LnzpVKmG92AHMIPxd6AzwsX6bzII3F+c4nwfFlXDge2VhLADPMnnHooqebmujTs5+cBMe9+lzSPM3/YSYDyHe0kyeAiZOLY977VX7hYp26De/vEXQ+UCrTmPe04ZjhZ05PdgTcgdkSXI9f+rz24h6zd5kbs6LIC/zX6Fvf/6zvJIiMnxhRc6HAV+PSb9liy3sfx1IsA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(44832011)(86362001)(6486002)(508600001)(6506007)(83380400001)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XRky8Tx6HIb7kehakRLlfzDtJiEeJC8bRe5cV8mEbysHCYwmWYYFgEUfr+ns?= =?us-ascii?Q?MDAQ/enbbD6uu+hvE6EMtkP7a4SyQQt6RTmuZBIDbiSbEuMG54GmN6od9seS?= =?us-ascii?Q?chjA7Q7CC0bv2mFs/6s/LkRxRZzBlH/ptYjITwzziQhtX+H8eS6Lqu+zSFKd?= =?us-ascii?Q?3qS3b9j0+HE/lTTqqK+dL1e3++qUcCb28wlkhnPjQh7MJUKnubKGHfnJdS2d?= =?us-ascii?Q?BTMPFFTzVSO4xwaOP237mTvXVTIjDHu/S9XpyTxVT/lwYje7D+PDLbDFY7st?= =?us-ascii?Q?TIy/+8DhPPkEaFb6LJ6nOP0hI6lOYJ/BAEyHSOmAhPtrwVpj4luCJyL2kgma?= =?us-ascii?Q?acjw/+ogplYKTb2ZfTzHdsQUvoyOQ/gAc9JZov8U8P+iIWUXzqFceYCHsYVo?= =?us-ascii?Q?8CJeC0If/PapKDWyficvsuvNnHK3YllaAF1Z9zW6Ys1gzu/aahIlsZOk1rRC?= =?us-ascii?Q?Vq5z5tDkuRNYszv7PqaCEqDF2LTiem9Obt7BgaWLeWEZ5+Y9G5vqvEaSi0Yn?= =?us-ascii?Q?Kkj1XIbtTGBlBoYMmFZ1TlIUbtf41jJGG0wX4jlAEo6H52LRG1FAHc9TUO1q?= =?us-ascii?Q?gP4xAMpZIsxbOiev3r9nJLOz6d/0rFfZZj/TJf/YJ3bm17uFKPgEJ8IHsR/R?= =?us-ascii?Q?DfbSAGOwV37i5CzoOmmzYrIHnF6X3agrOvTbgR1pc0XTaIWqHTfaOb+SAjPM?= =?us-ascii?Q?IfgRppRWMWGanurcCyPWYRaCBCats4GwYiIWNFPibhBt4SYGXZOSmIE/SP84?= =?us-ascii?Q?00HKGDQbYRL3wAiV5lgDBKyy8aFpKGZzGr4OWr0nOjnpZT8ELcPlnEyUvcUz?= =?us-ascii?Q?C/IFeb8nrdOeEpQlXTXkx8kAwSfcs0PUl+wYYyAVzwZRqwaHfqQ8MAI6Cbm8?= =?us-ascii?Q?SklCYSlLXFjp8ZT307yCpbQ2OoH+RtY8Gro5l2tIHSnn50bzPiFuU4IRBpRZ?= =?us-ascii?Q?7oBJWIOwsnQchAz9g8twIoOWGGqMOzcNDTW97raP3Idg+BS+6KVtg7azp41y?= =?us-ascii?Q?biD65byoo4eOmaP+cRaiEn7Rs7aX5lD08heIihJp8iW2O4yDVzxzRM36Yvyo?= =?us-ascii?Q?hSUEpfWBb2Qnq6EQ6Gp1G9q0MApDnd6JgZPwjkrbL6c3gBzIoJJbGkT6zd35?= =?us-ascii?Q?5kRdjDSlwMQaufbBsqtdu1QgTzGa77nT2w1gno+RO4Ip+aBYIu1iIlgqiaNW?= =?us-ascii?Q?92Tzv/LfU3NebdF6+rez1Oz7GqNHEMTtQXENiPA3c5VGHXxA2IkF8gXvd8HC?= =?us-ascii?Q?+Oge+s/h+ioOOtcTh+d0zb6qyMNqkfl4gt3qPHGzJgwyQOK9uTBc5UFsaG0L?= =?us-ascii?Q?IWR8ijZlS+2wP2+W7Ty3EqkfJNi9z5/T9MnVhSpO9PsDp3sYjludOQUHSFS+?= =?us-ascii?Q?34drQth9+osNpE3HoQa6i00gSMPwx5Ks0NEr2Gahl2uFHB6ZZIqlgze4F3tj?= =?us-ascii?Q?M6Yj3qXH+uA7imAuoaOUEg9yKInchqI4CQkOyS6Te+gzb/CiSav+IvXWGXKT?= =?us-ascii?Q?3TJ9Zf+R8X7b2RvlRqtdPBpqy094yYEBHpQzvwSFlY8OrP0ucBEzCtE+eY61?= =?us-ascii?Q?TAVJeO70Xk4pNPmfc9QpPx66yWABhQR6LBNhD3J3vbJqQD7VsDp3H8y9Y55X?= =?us-ascii?Q?c0zVaW6XZ+hSc9Z9OFWyqMAD9zlQS5fbN6eJcor3Fyawle9Z/1am3lrgJHgw?= =?us-ascii?Q?mJZBBMq7SD9OoUrEWQTO32SwG55UrdBMiiJTKYOtYA09kRyjPuakA9gv4U+D?= =?us-ascii?Q?X6tL/+KQlVs1h58P5HsGSPM1UUpwZOo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95de72a9-257d-4394-a384-08da4ae20250 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:19.0906 (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: uQR2E/xeQk9wSQiIq56fpdBZEwOh5rwHndp0L+I+xN5We0jEZ7EB8VSy9jJpNBRt4Fnzkurgiws6Zn0/ND2kQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support for __mptcp_retrans(). In it, use sched_get_retrans() wrapper instead of mptcp_subflow_get_retrans(). Iterate each subflow of msk, check the scheduled flag to test if it is picked by the scheduler. If so, use it to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3bb3445c1eaf..14d3637d1e88 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2490,16 +2490,14 @@ 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; =20 mptcp_clean_una_wakeup(sk); =20 - /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_subflow_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -2518,32 +2516,49 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) - goto reset_timer; - - lock_sock(ssk); - /* limit retransmission to the bytes already sent on some subflows */ info.sent =3D 0; info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->al= ready_sent; while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + int ret =3D 0, max =3D 0, err; + + err =3D mptcp_sched_get_retrans(msk); + if (err) + goto reset_timer; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; =20 + lock_sock(ssk); + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + if (ret > max) + max =3D ret; + + tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, + info.size_goal); + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; + copied +=3D max; + info.sent +=3D max; } if (copied) { dfrag->already_sent =3D max(dfrag->already_sent, info.sent); - tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, - info.size_goal); WRITE_ONCE(msk->allow_infinite_fallback, false); } =20 - release_sock(ssk); - reset_timer: mptcp_check_and_set_pending(sk); =20 --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689432uab; Fri, 10 Jun 2022 06:06:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOd7CNpolHShW9V1IUhWACGwtSsXwiAwIo5aTTDl0QtQZYGoxk7xADX6lhyoli6U6Zsbn8 X-Received: by 2002:a05:6808:10d4:b0:32b:1230:5cbd with SMTP id s20-20020a05680810d400b0032b12305cbdmr4195546ois.70.1654866402112; Fri, 10 Jun 2022 06:06:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866402; cv=pass; d=google.com; s=arc-20160816; b=0XMkk9zpvJFBkQveTqTPsapX3y9TzPo0Rno0DI9XFUP7bx+7Ae744BtKA7ZjC1M+dt RY2oGuGIgjktA2ARDMxCuCYH9ZQ97KQC6DmoaO8AdZtkLob9cUnwUgBSBUgu6guyRLjC JN4e90WMAAP07WZ2UkcGvQLCmrgJx9rGaqYaDleN/hUKDaJfVPLYLbrYJD8FjQPV2IJM wrrqoOBJ6hSqXkDiJRj5gp9v5Cp32f+x/NBT58x8u3Duh78DzKItJBQ6mtPM7Irg03Xr dR2rLwbw5lBVUCzTKoBJWiLOA9/PUrv6dvWAZy8j2ReYGj5LC5QCAKyZSiiPXhbTAEFK xziQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=pLGcH3CwasmJidIX2ZumZq+K3bw9z8vgYlmk256tK2g=; b=vpESY+dOxa9rL8t8UaxV8DxvKKmYD8qWPWCkMSqAMEuKbaWGU5ZHL/IHPUKLqAIUcH 6Mo3r1ZLi9ynYjCtnvIa22iFrC0zlC4XEtMytm2n5TLGGa7FybBR9kdJlYwyEHYDyby5 JbG51Fe+runnJTG1tGEJitTcdAsE3l1G3zNw2aSg/6RbymviavyQ8estVu7Bh3gFZuWi Zi7tC25iSDZc7wYh59qcLWNy8Rx3yMimJHuMoLQZO0J59Xd8K9T+0AzRSo33DJ4xlNye yD30Dog8KeeYjl19bJ0y0LHk0ATq2mkeXI7XY7ukLwMy827lZEe6ki54eXUVy3JKZkI9 3zPg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=rUBFFeVg; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5625-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5625-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id x2-20020a9d5882000000b0060b13044369si25830381otg.38.2022.06.10.06.06.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:42 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5625-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=rUBFFeVg; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5625-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5625-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id DFE1F2E09EC for ; Fri, 10 Jun 2022 13:06:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 805FA644; Fri, 10 Jun 2022 13:06:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80074.outbound.protection.outlook.com [40.107.8.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80D467A for ; Fri, 10 Jun 2022 13:06:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P84Eo0oQaLKE8T3Y/Wrod/0kiuooR3c8zhEOnFfMNQkOzNMrYEbewD1pXTw0kfB8n++vEnk+E/gL6Qew0O8xZkTsidam2wmQN8L+lx3hT1N1UcoQWscF2QYEoSbRCe6xRdqFrrVtEQX5IlcK6DNdmFTBuu9RSwkmnv3PZWU8U2ifa+4ukSAWoRKM7F6ndNap2kDfIkzMDmlpIg2c4Bu8iAlXm1eYviO4SFs9g1aliGj/jWm4SD4e1yqiFRiu4eIt0Htjlwfp5KCVnDntNZo96RhW4bapI+IpOLq6mBhcflyovRBBZJTLF3NwlU/u9lohzXWmILX+rZdOAsUen4nwKw== 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=pLGcH3CwasmJidIX2ZumZq+K3bw9z8vgYlmk256tK2g=; b=noVSCs4Do6cWm9HkZtMKx7FafllOwR+TjF76JVLml6N6G14XZEqT9HLZoDqUp5naMoCG5tO2dGupPf0TRcjxOqJrTOoqRFEtilTcADSMek1FMBMtrBG7CD6HFiKX4BdSVIAvntNe6IyyE6Fbc+nBxJId57HyIJedwI8ymeghDKr9KfAgzzd68gFMdmwLoBd/Keh2dW30ctJ8JRvvWkNRgRAsTnLr/qSIPp1WWq/EOSZNDCiFdQ3ndn78p/3fapFD40d0GyhCPE4L7zV6fsGOxm97NCD/q5DXasQR6ZKmrwOSwJFnyZqWq+p687AriFigI486kMaY8PRDcxDnWfQfWw== 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=pLGcH3CwasmJidIX2ZumZq+K3bw9z8vgYlmk256tK2g=; b=rUBFFeVgGkrf+i5lmgbsn5J6cj/WgNGVjYBwnfuCVbbsvqIno1nBzo2P+86tjdsKWJb8BH3Em3DNXo7lcokKrXBvptC7a+ZsdebL3afc6AlRgOe78ntFmDHvKrVZMAELSSVvyspOs6W6g4Ulc6vNr/oWDrhTfBqWJKqnirdTS5anirp3s1AYKwDgfC3e6TPdxoVfv9g2K0qWNaRW4ODkcKvM9bJQDEahhSFKpLZ6zt7foBp05ys6JABe0pPvvZo6weBlpKz4/FuqFHPX/LtrrgyBx2Vj57+u1A8teJk0OwUY+OK3vPa31VKXlbaY8HdSkzwlJVty88yyIGOXixKN+A== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 6/9] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Fri, 10 Jun 2022 21:05:31 +0800 Message-Id: <3f26b39e0cad06e80451f4f6be2cbe1ad21b2532.1654865847.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0118.apcprd02.prod.outlook.com (2603:1096:4:92::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 933698ad-3e55-494f-bb0a-08da4ae20c80 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jjCNenBPUYDGIbhjwNZS/WKpPH3K65oa92xWLy7W5ZNf/rvlxqrsQQn+3jbEnqGQaN0cxKrHpXYJ6XXaYwpJ/9e6Trm7W8HwQ0eOtICUMj2KaIPU4PjDiO3XGjwSVzLtGGkHx2AnQo+Bdur2e5c2czRmEpJSHPROyX59NZklCnXeVXHXGUqhpcT1WKgAfX/bvlDrVqq5BD3pRnDKHoSnVraZNVW+0Wr69ezpfyv6Kw0uTVuY26LCTD0ZjnHCd7pS46ls6eiFbJXyi4yihYvYIdxEuUkzBEUZsGUdS9XtSB8sOXp+V0uIVwZ8kfelQLN9CxbbjYyj86m/Pi4VxWPvSCBy/b4rw3P/74o3zko3zSCMY8WLrIE+eZ/oMJI16yf6T/Dd1iMqWRFhaBpgXwhKiyX5uQ+VXohihHPyhCa1+kndRiZ+5ePMslxXYd9iiyuRsWYhrS3kE7Df3XakPRnjM7oPGMBxBsG/r+OALtdz3S0/k15JIQjaU7q99yoqIhAelQ97rJ5WIgSgaBLw8G4oQpLOeunZKc3miRE1iWQ3pcVMgtnv/eQYBPP8+lt3tKWSnbiimk1Y4CWKP4ZshoHmK2SV6z8OSY4dE0ZJiJ7mdmU8vBGSryTU8e8/EMlAVU8IBYgDTvn8VWjHGMYCnGn7wY4cqqVCiZJLvlFV2sOIjRIgRFxX/A4+jQcLrgamaszfsgfduJRMbowljlfUm4jN6g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(4744005)(44832011)(86362001)(6486002)(508600001)(6506007)(83380400001)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E0XvP4QQzLRZ3y71dotrWRa4CSoAyDwtwJyZ/6ReO1XS4OBoJrnBRVVM32t8?= =?us-ascii?Q?MKgQcYoUGyG/6wnI+78t172cirqA3mdzJs6SYySAvlkBI2+MErrPjjBFVMem?= =?us-ascii?Q?A7zV93PC8g1S7380sr05U32qCVy7Ury/HC0hyHgK8EH4DLOBYafN9WmeX4OM?= =?us-ascii?Q?CsTHYHxdATPdGTeRvp2WtpTD7sMmQHV9C0ChCLOtUUVXj9Ot/HAtXimOrOpn?= =?us-ascii?Q?AITVWht8yKO+QdpPearVXJfy10P9Z+FlAoxOjFM0Krs286g2O8JA3j0gkQVr?= =?us-ascii?Q?uUeiGE0eh+7TlgAt1cIP6Nsig670d7N49y2qK8L2ZMXjddDkQsNIHL8zpy3Z?= =?us-ascii?Q?YidPcCJNkuii9xDh/bp7uIVnvJ3/a1OIv9mfK/+BqvLC33cpjPKdnAto0kK6?= =?us-ascii?Q?/Pd0NxYjwlo3nDP28jQpmJ/PeCemH7Cs1CD2OUwAnMzOJr+vcpuMpI9NNFNj?= =?us-ascii?Q?vAxsUDlDbW/c1yZleOqCQGJoYvu9GooX8kQGYdnVe77f9cGqs70HZnrDiLnN?= =?us-ascii?Q?7PDJgn+6VS8hAeJvsBAmet3DmsK1Q3NG1edNW0YRcbN5vwNbT/hMnRf/NXi2?= =?us-ascii?Q?Z09bEAnXa/P4apzQL8gAzwd7oiNiBw9XZ4PKeSVnFrcPoS9097pD5AhlhVZL?= =?us-ascii?Q?v5i4tp7NJNVNo+fERZKxWMaPwOWio/EI0DGWRtEtigNanZiPICedENevXlzM?= =?us-ascii?Q?+PHvS5tvTln9RapR9TrqKIFC+0MRUDLiiSVa7C8V/ZcGWnUquFZZUzjL0lyv?= =?us-ascii?Q?kwU59HYK86mM/R4M2QfvOlg0vraB87U2qrX+JB+OJMYYy/qHYLSJ+OCErL7b?= =?us-ascii?Q?1Bz8CeLltOFkFkwSEdfJSdQNvTtzec2lmyy3JfZtTTnI0jdnJHuo7xcB9lya?= =?us-ascii?Q?CzKA63JNvNwX4EphG7iEDexgp3hWhuwci0foGFDh46GImVzgVmmn4U7LD6pG?= =?us-ascii?Q?+N62WMPosqiTOpcJxwndE/GTPFBgghpbPsAjWyGioZf9PDHfqlq1wyMGOjq5?= =?us-ascii?Q?itpRTTSBCfWixLf+SYdB5gnV6/FDQMZt4wDlOxFLTabrsYqJXFF4I7ToYl49?= =?us-ascii?Q?oSlWmYqLLYO1SqE74UgTnNjfd1rVr7fCva1qh8/O69zDJMMayptvpxMxoh43?= =?us-ascii?Q?VnnQTGmP/9m8jfZCwHabT5O74TOboDAwH6yUPfWxhm4Y7WU5I6H+ZJy/QUG2?= =?us-ascii?Q?+9pVi8PPLVeMwYqnI13SLnH7NS96vT4fvVHBkDhmXTXApnjYJCCKem7jCSV/?= =?us-ascii?Q?0LMAvY77BJ2iYJBqjMF24fKkufDZkkrr4k1/nDu+3hZqNyoy5sy7pMhVhpj7?= =?us-ascii?Q?xH89mNFqLd/HkSROqC2SngE0PyNGTNoHXUhrCiClt6w6HbIxuc1tR5sXbZuw?= =?us-ascii?Q?GGa1HICIV6pAb7JLmmJ7pI0vcSvsfYFuOhrjt/cZ548VsXbcEJhNV3Ya5q5o?= =?us-ascii?Q?Uh1/noyoBMegGw+EyjDwdt1eOkKvIdtH9RAWAAKehBCE/h5UdKb4okql7XPK?= =?us-ascii?Q?11ooLY3y0aoxpbI1mSAEhBfRhxQOQXSvLEoz/5E/LgLxidprxfgEATE5esCy?= =?us-ascii?Q?/kALZSIjQ3JGGcA8oyWfdPCrlg30fJyadKPYjS006jCtxXAZjTTedkToAGEg?= =?us-ascii?Q?YCNeOWevD6pczDcYplmOIWYk6J5HmSZ31BPBXBhz+un9qZu1Lb7ETRNF/6l9?= =?us-ascii?Q?rRN8MGhbGKNGJ2IUQxvxhZ7L9TpjdpZ1MHraXOhHAVulYszbEI6tj+Hmiq8M?= =?us-ascii?Q?ia006lQlh6M5NGsWY0g2o1h+env/SXI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 933698ad-3e55-494f-bb0a-08da4ae20c80 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:35.9955 (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: X8NsmHTSz/akG+JkDSQlftTM5u7mlSl3thI8dX3s429BRhSY+ibDv36Q1XwxSdii+JCuFNuAR8viJas7k6UMug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 Content-Type: text/plain; charset="utf-8" Add access to redundant flag. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index e86dff4272d5..66cb9d6051e1 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -125,6 +125,9 @@ static int bpf_mptcp_sched_init_member(const struct btf= _type *t, if (mptcp_sched_find(usched->name)) return -EEXIST; return 1; + case offsetof(struct mptcp_sched_ops, redundant): + sched->redundant =3D usched->redundant; + return 1; } =20 if (!btf_type_resolve_func_ptr(btf_vmlinux, member->type, NULL)) --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689456uab; Fri, 10 Jun 2022 06:06:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG9ekjMQKenaZZugdiqH81xy8AHFTCVIy1XbdageitvCXO8AttLyBwFlG/hMKIRcMOlEjO X-Received: by 2002:a17:90b:46c6:b0:1e3:524c:7f94 with SMTP id jx6-20020a17090b46c600b001e3524c7f94mr8757939pjb.177.1654866408246; Fri, 10 Jun 2022 06:06:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866408; cv=pass; d=google.com; s=arc-20160816; b=a+7mrpY6c2FFfNhF+kmwMa1dVE8thBa2BGloasqlrf5v3OeqlsBXgmfO+CaAKsuZ/c DNZZamW6vA+MGgFQzxVLTFxuhJ8ymS3HE51nhx2KTsHmHZKCP+52UJNSvWhL8RCQLkxd fdUw6dgCP/xUMi93kbFwlV8x9DOLvA7/ac5NBZhYGYiXhBxcwxukcqOt35/p2j1MmCXl emkHG8p2o0QFoK2J8Zv5HM2qYb/7Ryv3WsaXHRrppdfI2kWC5XfjFb79Ex6Vfm3rkQSR R1dtwHy5nQBQaFdylweNSDxdh5HBxDkBzaF8pGQelWE73zzKjuETSgA1Zw0lfAUmblvk wKug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Is4brtMMtcD/9QHxIvOsPSI/DV6RBOb2bkvAGvAprus=; b=EHJ5iWH4JhHXsFfOZjDNxdX0dUNriD0g4pW5mmLl8hVCv6mocJE3cVX9p5eXT4varQ JGIIMJjGmKTY462C//WlnpLQSrY9DcBTckDfDa32lobGABguDXDZ7E3Y3rFYBmrJB90i BgARntEkaQwNXYrjWsZtLvWiPfSTG7e6UxpG0sV6QOmuT9THzxK+Hs3aVv5Z0UTL2INK /jEja5NPChEMbNSaayMpG8LB0QsW2ofFVAwcskaw0IdMg91CNierXnEjkJbhKKmszm5G +/Wj9w7Zoqbdx6xYrAXW6dmda+7MoAn+xeUcYUs9+sNFHkP8k3vyANuNB+iLnW5zODE/ 7UbQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=s7wXsVew; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5626-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5626-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id s9-20020a17090a880900b001e31c6cc63asi2779213pjn.43.2022.06.10.06.06.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5626-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=s7wXsVew; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5626-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5626-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A40AC280AA0 for ; Fri, 10 Jun 2022 13:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C42BF644; Fri, 10 Jun 2022 13:06:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80042.outbound.protection.outlook.com [40.107.8.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 39E237A for ; Fri, 10 Jun 2022 13:06:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AEKcBwnu4yZP69J3AfgQPtCIL8OOKYfncq/Ar5Vq9dohOKOfg0EdDDOeWkX8AzqOXN7jeARMhmHJhQABexOZtTVwXGF7FmiiY5UqbdrbW5g4OaY8mC8UGnJz39BF3E+EP5qFfL0UlAelLK33pCd41o0PdRkqvMjEgGSgSK2fpq/FPg+y7QdaT4v/B5Ier9pVaoR5jgm8G+Emiu9l2eQdyyCoG0S6DipoDdDaBpyjGQY+Q5JzLW1XXxuRCkWT8ZJtwFOrh8dtFNO5OJ+XVc7wCviSCtgzfOJ1VvysEi5n97Bd5D/Jd3mGl5JIOXihTSpjxcCS6LlbFkzfUejY1vXKrQ== 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=Is4brtMMtcD/9QHxIvOsPSI/DV6RBOb2bkvAGvAprus=; b=iP9PfEzEINAB78ulI25NjOQqM3GNyhJmdYuJPT2RG0WBB24jlzpDhNB5bFwInRen8y1Mn6IAeF+zjBy1HUp9h9AVXaGkCEKrCsSde4ytwJvRbGk2cnkAeMaylzBKqNhV9bnhKrSlBxYCfGWOCECay0fvrXRaw6B8g+D8KgyGhmfkm6ijtP1yHYKL3KbLi8RNaMbwLFXOabkwAvnPEXebMpbLnwzDNhp4g3i/gNdlvzcteh5Kl/zywGkkCwq26/8wz/3NpwEjqvzLO1gC6WpHlV3vGwyTpqi1cg8I7lVbmGS9PQ9TOQ8ktnQFO6NkMEzABAjapNWgZC4I1B0LjH0e3w== 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=Is4brtMMtcD/9QHxIvOsPSI/DV6RBOb2bkvAGvAprus=; b=s7wXsVewoPobr2i58JZREhdUa6Uc0kgCLjHaMFvn15/Dc2ISfJ45e8678PupXhFSZhZsNGhwIDnVn6whAP5kbJJzZUCbezmEVg/07IfwjnmUtKY1iITF2Za32uxlKC/E91yX7xwtB2bP9JehAqKa2QzITFmpA2TrGmox/g2DmETBc/Erhwk8xfk9ipyVihwCKQxciXGUMqGDi/jfs2I2E92H2Sz6kX5BFgBsxayhye9o0iXx/phC3zn38t+F9CuBbuRdoa1p03ZYb49OkqyFy/revjz7V69FTEuSpNR/WrZEUfGUKaczlysmOh7cUtDVFwUEHqIjSeMaXUEvRRO1lg== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 7/9] Squash to "selftests/bpf: Add mptcp sched structs" Date: Fri, 10 Jun 2022 21:05:32 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:3:17::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d8de03d-e70e-4442-770e-08da4ae2107f X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: elJC22rXi9/ShlDAVEFUXKib889m00DYs+dymwRRCu9XTtaWwx2J1EkV1rQVZ48+0SMmc7ljapJTearlG4D5B4wnhcM5K/eZeYuC2u4SNSMSHQc5u8FTXCcgDcM7xViZJHLR1xfCRVMPpUrpLrRfYzw1PKTfyVOIxX1px0Jjdox/6t4oZ4RiV6d4Earl2XLM57ari/MZziuwyWm+bCPDHLxU2NGtt4XXEQt5ZtngO5ubsPOoB8EWg4wT2s8N/DRD30xQcHBS0D9N6iQ7Ewg3QyuSOptixk85YCZxUvX4eeg2SjGM3c9BHyXOhPneZ9qXwSnVvf1QJ7c1J33YQh1hLzR0YZ6DJA/MEeKVs3MPQwo4ByxKfG1+kj6TidSGZdWcEQHIW03EXS1iGVipbaKgPVi6hUQi5uPsTbRh5PiHwtr2raYVMHsRQwF/cIrykJYS51c4QcjeUQYqH6zogqlYT7uPsalakckYIqy1iIt2IYUAwSuU+CIBsohUU8+WepEFnQWJNJjENppx3lkW9zX4Oq8nlUFku1Xn5sGbv6Qm/UPcvb641v2CF/vWnopL3CREgUJkYEZci1EJi2wwtDbI5m8jgAkHJPdjloy8ZWBFZrsNAfmkExA6UVentj4OWFgU+qb6HYyi1fF94Yg2m/mCk+dGx5sAkii0q9DF8xrKnCKiDRYRIuyZxqV06vo1Qpl2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(4744005)(44832011)(86362001)(6486002)(508600001)(6506007)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kgCs3FxcbiShyIewjlb4gJy8Pmc38RMLYcJHm6HNCc6JpVWwfPPBWCMiT/SK?= =?us-ascii?Q?V3p8T9KA3m6ldSBoGFsIyhP50QETX6/P953GzuUaw3WhwPaperdkOcrVpNfZ?= =?us-ascii?Q?esN84vmxZvWnwxu48+tvWsfg4M9TaKuIupQ2qfbH+3knghduiGVKU7FVZBnW?= =?us-ascii?Q?WLV+ECbe5kG8sqNqPbPHIZA/rSaRnqMWN3duMPYKEPF21sn7d6dyDy3FagXj?= =?us-ascii?Q?v8KGHeSvW9lO6XG/Zz8imzc84lrijgffKxUI1rk4zIJxh3RzFFD9lLFJy7wl?= =?us-ascii?Q?bx6oBTsvGDioiJhoJLDFsONbA3aMUFRV4nBjquaPZ6j/wEWP5nNJMLJu/xyq?= =?us-ascii?Q?icJYL47IV2bDd4bjPN/HwfiC/Op7MthSjxeEPK31KQ1itWc/7AqbkrHDGIHz?= =?us-ascii?Q?0e0KNWUcly7vr6+OZEysyO0/X5jRRWUo7FY7OHOFXirbTuwEmJPwicd0i4iC?= =?us-ascii?Q?cQYmOZRWfv4YYM/aRkn122lXIDV1q057O/525EjEknFdX5nFF22swCv5E0kj?= =?us-ascii?Q?4bKWbUWRswG23jnprzCkBfdTvfmc+7aSRzgzSyzb+zdAKThinDLqb/ffbTLN?= =?us-ascii?Q?dtolTVo3LNfpVy2UVwkSJaxrNZ44iIpBVC5PZFhncEEHMZWBAxvBKnSoibFm?= =?us-ascii?Q?MSce5jBBNHqPi4nDvyQdSaI3Bdjyk8pzGx3zAYcQI83ce87WmJni+H5QTSE0?= =?us-ascii?Q?xolF7YwFjNIts2PC3Tq6g/TgD4IaB14BIYbaEh6g/c6mkG00b6wG7AM4MuP4?= =?us-ascii?Q?ctkotyqreu7ZfCZmHf1TAEradvaWsnOBq9Q0keCQktXyBib7FpP6b/eJcfsQ?= =?us-ascii?Q?qxXv5pOf4LEs9R+3iDmLDUkGtwfwR7t3+hINVj/S5nhdOjTIrrs4z/NT5uoN?= =?us-ascii?Q?I3wVt70yTTXRiFOveiWtIaMmCCBqZu7w0HXunMaN+8Rsz4zCQWpXH36Au70R?= =?us-ascii?Q?4JkYBpP4Gjue45wLxYiCDlYqeIFJ4nI7IVwlTQSo2p3nF2lzIGm3mzsXHDiG?= =?us-ascii?Q?wHHbnn7W6m5KAqe9X9xifbiDd4QeR7LmoCIVjc++44siqVWhjxLkuAuaAiQN?= =?us-ascii?Q?6hc6f7lNgf4Q4STuhdrhWfPjTPGeyphszNfX2athEq6Yagrp5zshrq+UqIyz?= =?us-ascii?Q?75XGkjMTtyFgfzpGiv/KwFngPbuWNOsELBklPe61gVPRXyxfRg0FKXT6LOhq?= =?us-ascii?Q?PLBp8GMpIVtgfTGK6YkpT+G8VwvH85HSeshRouZMQKbwvWl5ivMREf0ljm6A?= =?us-ascii?Q?ORD7BztP2fQMDidke8ey2F0pxtG0BrevCvlJRQ492eY5lRvt267+DF9JAy1C?= =?us-ascii?Q?vffwfrHTxQQ6qy+74jpwQBNRWmR3CwSP8feJMaw8R/aayA5KFgMNM375gOOQ?= =?us-ascii?Q?JT+5OhKFDymwfAMPJ1EsY9S3jfYabzSZghbQLcnNP1HuDnqoVJ9RugMZiUkY?= =?us-ascii?Q?GUnLbhAIPLUfRtKB9Rels1m3CdphEoXLunK8N6+a+7RSptg+RVCi7+dHcLPQ?= =?us-ascii?Q?hjWTs4eWyW+sXnDMBA0i3VXXC+fnINTuTe5iMqmECgTGhDsJK8y00gFEygn5?= =?us-ascii?Q?rfK5D5YCfuG3XRg0W88wJcgbqCr4Jg4Ljn9KN+6HvntZ+55V1ojEt/BFJ+TD?= =?us-ascii?Q?RrXPSoYkb9VgACoLYCe0filh3fiOaUKdnYgPmgBg9JreAVRfvHQlRZ4RKbo5?= =?us-ascii?Q?eQJ9hszucgj0+lzJXjkEGsQFD+dyUSL5xhhd4gIPYX3i3UulcGe3pgnt/AKN?= =?us-ascii?Q?gBlc8dm8eWBBmlh53+3COFOx700JtTk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d8de03d-e70e-4442-770e-08da4ae2107f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:42.7137 (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: UebBDk5THgUk+bZM4G6zzluti9qrUD89SV1NgKu6+aHqXd2EGdhnjsB7vojSIcgWwbdm5pQs9Ka+XMm8U6Zj6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 Content-Type: text/plain; charset="utf-8" Add redundant flag for struct mptcp_sched_ops. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index c7d4a9a69cfc..3f570a4ffb12 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -245,6 +245,7 @@ struct mptcp_sched_data { =20 struct mptcp_sched_ops { char name[MPTCP_SCHED_NAME_MAX]; + bool redundant; =20 void (*init)(const struct mptcp_sock *msk); void (*release)(const struct mptcp_sock *msk); --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689496uab; Fri, 10 Jun 2022 06:06:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOr13sids2riSnzzrsy6qGLVnQkcT/xOdaM8yhqBGK0vDMNoAJ4YGozoMjFTv2eUpv7bBf X-Received: by 2002:a05:6808:23c5:b0:328:a5b8:267 with SMTP id bq5-20020a05680823c500b00328a5b80267mr4345904oib.10.1654866414649; Fri, 10 Jun 2022 06:06:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866414; cv=pass; d=google.com; s=arc-20160816; b=R+cD840zS5HYpPixf6PSHqHnS720+YCbAJQu50SeeE8hhxMFiTUyIrS7btTh3Eq3Bt DyC2H8cXEhW0ACRtnzxnXm/THGdtQskZhmtCuDCM6vCa/QgnAYc077Rlauc1Hq/2ttwL tIxPIs9ZeaW2x97R1zoAdlUx1fDiGQXcRTKRJAnR01dRMeaPlwaqw3FclAi4tAYUzM0r Whn+nrU6RIEPQx6pTtvD2b2Scg3JPuQsbVDCrjmk/qCTk5PY8kTtA83tEOd/JD2/khWv z2Pszp4Z5xRMpfpe7txDomYiNV4v8oo6BUFZJPG29Mgjt2c4M9WadeGj5D3GBYRClH2i dXqA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=HD/hiDlJ52z8ttz0eoV469FO5fEXYqXBe+l/EsYolp4=; b=Bu0/q2mTTUUOZ/Qez417PnJYeKjYsAB+pWzRI02JALuRdwI3ywQFFvbsK2OyED1t2P NXgkgPBxiC0hxm7zdnSFFtjqEu/C4xJSOfqbRU6sBeXkcbU0SHZvXRftkIXvvD0GT0DP 1l9hIj74g4P/4KuGz0PfrOcL1wjgo6Ce9nZbVs4XqqXWIECYrzE6KfEqlw2RKOC3LILg SyZ7+A1RdZPJhf+mahYG6tllh67xDwvbJDH+c68r2PcCtw3+tDEW106OtSTcCUZ0JJ6L jHKCRhKdNPcQwbX+B4n1hukctEaP9Xdi1dJKKaHSUIuEhqYjJWgoZJjSMv/XCgKI2qRy 7wBA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=BLL7qzSe; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5627-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5627-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id h4-20020a9d6004000000b0060c2e17c9b8si2920401otj.141.2022.06.10.06.06.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:06:54 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5627-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=BLL7qzSe; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5627-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5627-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 138092E0A16 for ; Fri, 10 Jun 2022 13:06:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9CEC8644; Fri, 10 Jun 2022 13:06:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80073.outbound.protection.outlook.com [40.107.8.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 102DF7A for ; Fri, 10 Jun 2022 13:06:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cDdVmu7JF9FaQTuiTwN9b2Fjr6K3hkKZQZnqwW+CkDnPEI3pS0ZesU2gmUgIAdxj0air8DPJB60LlPOGqn+W/a2HUXT3ELznVz6H6ZILtqN7Jd0D3FD5Zj753YvYnxJNI4EY8rAkDkMQ2HfxRzxazDznPDiAITr018ORU8z6x84ejZkUkf+6SGQSS12BJoz6AHYJMoNrUGtJxDQMIZh/mZBVANTNAbniUXJdAkSMwjG1/AguK0zN+hYHWr/2gx2OcA1PyKsBI2HYiC2AM7fGajA2A+i85ztz4TsliKv1DzD56vPUNWgfNR5lZmpkcRXpTI6LyW6fziZU68bXl149JA== 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=HD/hiDlJ52z8ttz0eoV469FO5fEXYqXBe+l/EsYolp4=; b=d+NA18GsGV4PHARdbKRxvX6O6cFR/sGjlqKb74vDtZLe9FWbVaeIEtm8pMi5sucNNekDKTUknncJYTX9I44HtjNYTU4gCp3Qj5CSAbUTA0fLeP1slZFRmHtj6YTo3lH+y6UkKCZpXyvbdzj2wWe30gJfu1HoJWvask8oRKvxeNk699zjyiN7xOHzhN3f6NmbSo7DV1+2AdNYDhg+sJ2Ju/3Qmpyf5SbmlHjqOocsAlvTmLblsPw387yWXfNO+cm2IJUQiEpP3LG2dvtjGFZTJjOwmOxRiFUhetC64hP8M6F8weRAzR8xXWc/2suit9bq+EXYA6eOpz1/rspV+UbIZQ== 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=HD/hiDlJ52z8ttz0eoV469FO5fEXYqXBe+l/EsYolp4=; b=BLL7qzSemI3mcG+XUD7/AM23ipNtHgUZMpwZIYLF85mSNFaSXLz5ORCT/zlqvRE/LYCUbC1HqsiV7Fdw67BV7ranthsDU8sZPiLoKS81cSUYlrM+d8ybK47OYShI3Wu+RxuvyYaIvh2Izwgr7VyrH89Eq+aLxTUkv920EiEZ292QdPSdMIYLui64Qyp9uBQIqSQWMQU3jVYwGs5hnWQgKGcJpU1Cgg99FUtiinLqAYcOHMKMMVxKrZgOaXkGZdGLgUgtaEYeiBxYjT+MlsjZGG97WYlWcuQIH9s260qVlMezgLd6lIGGqb1c63BvFluB35BmRN7KkYGr5+fdg7SB8g== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:48 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 8/9] selftests/bpf: Add bpf_red scheduler Date: Fri, 10 Jun 2022 21:05:33 +0800 Message-Id: <95951276b9af1983c94f8e20a28d04cf3271a659.1654865847.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0192.apcprd04.prod.outlook.com (2603:1096:4:14::30) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4ea0c97-1dc5-4252-9dac-08da4ae21404 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: extKAdKrM/X42IV+ox7YCqtnAM8Mz9y1afIlLqk/QMm2XipXmYpSGqidPtcU04ePHw4H33p5xX89NdezVZCNQgmV5DzsL0UasKDtUytYlKgPQ4bLnystvAk54aDRYhKQc2BLterqPOb4bN1uQAzdMIKTtCeZlIDvI+/4lsmjlZgB38NDXZUjg6EI/uCTvspuJ9fgC4IXUKDl+pOxDyJsxy2nQGmOgh4TN7lpUkVTX2I5xbQRYs/Eva77uelpze/ncR9Y/E1j+hGSW+IHx47nZb+QtgfNMVLiM6KnUDxGLukG49H4jUA/vGWd/7O/gwj09Qgpp9opl/XMuyjxNHw5Fj/4kKnM4bUtgGMgvfkvlODiwJQKW/Tc3Ka07PoFyfisv+BhG1j2d2doPFGaJNtcL5pqFXwruUWZnr3LM+lOTLweMasdveD/doVLcd2yuJL8TKPLstc5yw0VtZVlY5YlJaUIo1jBF62Mnv7I05QDAwyTeng/Kt67131joqPfYWjI0vxazeEa4uEg+o1vbk1Z6K45ka/NP16Cup+xq1rxoMJa7BwEt1FKURGnJX1yz+vnYURLjfCs4r/UzJo/b9mMBiKwI3DPJMThNAVeuIi21LN+PKHPzOPRcAf6EmxchqTukCFZJ+Jfx+rRfPQdvJHg4t8I1L9MBpHG2RW4a5URZx398Jz0DMJP0w8bmeXF7s+j8aV4pOp6xcWq+CL1Nq3XRQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(44832011)(86362001)(6486002)(508600001)(6506007)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BtkVzhRlLuVJdMMACCql7KlINO7P12ehVKWXaKNuO0uER03OuoK+fuhcGo72?= =?us-ascii?Q?H3PIJEx0TvblY1KVAQSJ+U7PuSGJ54f1MCxkMxdcb7uw8ipxir9LYwkcJoEU?= =?us-ascii?Q?wUUf99E4CsSet4UW3BXAapCV+QqRDiihHWhG320bA3sAQwJ5VPYo1dIp9S0z?= =?us-ascii?Q?sl2GM9Wak9pt6nBLsSfws3BsBReBRBviFHQb/fXaJRx3nXMseOuScjCx/tFA?= =?us-ascii?Q?GwQwuiTh9UJOrI/qoGDDHspPO02RIxL0qllCP6pwXm7pZwvnDAcVdtZNScAl?= =?us-ascii?Q?rQR8ltJ/wJemC5lOWsq4aUkXR7foXhSwhV0gVZghZkgCqno4ssseJ+3Bj7io?= =?us-ascii?Q?GdSDBJO3gT96rYwKAgFjV3xC8k8DyL2kQJNuKh3fqik7rZsO0ynY9AcO8b/X?= =?us-ascii?Q?46pUg4zgVo1I7rj0RGYT5ploFq+hqwy+spOdHDefYEapgWQ5qYUvr9oWLvBe?= =?us-ascii?Q?6qa+Fmrfs7/AwATt9LaKkjz9ic8NnpwPAhy2QG1g/CpucXzdsXYZDXZ30vxW?= =?us-ascii?Q?H28RQzpqKSrvkf+mtuCAwKxxM8FO8y6OBiVSSTGwH6992RjWd/BjLHWHmMsp?= =?us-ascii?Q?q0TXM3TlO/YbLmh8vz6eO6Nq4aSTDS7OHjzJfbXg6h6/3ZV2mkieJHaYYeFr?= =?us-ascii?Q?xJh7HyHXhtWKWiXGTV4GClwVStZ58d94dOB65twlKQqIdnf8wXUXnmvlBdn8?= =?us-ascii?Q?7QbNhlwCnG0ZqKAM6ur5KtSOsFxST7Xo9hEBzRRmoccGRKKCllPXI6lW6dr6?= =?us-ascii?Q?bZKlMYkM+CYxvjvh9pGPwVvbOjZeJ3A9vFlcQQ+B9J+za2N4rTvYHJtFyXcW?= =?us-ascii?Q?N+Fetet1DArq9KKooKLsV3QsTzbbFSz7Qy2U3x7fgFQIKZpz7HrpyTJNjGRn?= =?us-ascii?Q?P3ecbwI/XVs0srLxX50UFEoRBHkOLHx88NiXAkIydABLxqVV8mxtWFBjvidt?= =?us-ascii?Q?ZE0kH37NNLtLo1qiDUdo18rRmRP9fJv+J4qc192qDEL7Go4tgG/nmx0xFmbe?= =?us-ascii?Q?wlVfrR7RHLi0mk9vFpsolB7VC9gQsy/qunN68/4m27gW5Ct5uUmN0O7JXELf?= =?us-ascii?Q?Wsy9kAoWu6uVLyQOm2sAQqH+8kxY97bl5qLWRQNQl6cw36mBE+ui4w3C2ywn?= =?us-ascii?Q?n7pHbc0FQnC6FqzQdt/lkpz90K2LJXWujMO4wZ1rN7vp7S+EWJb7MNZfsz0E?= =?us-ascii?Q?NRD33nooogczJ1Hn8sGZTIhXq3YU9aUZexyVTN1LhHj04mIN61QmwC7tSAL3?= =?us-ascii?Q?h52pnrCl48NmXjBQbA8S9mLkr0x+LYFQNrGq3//k9+1ANDkcmt0qhVKj+MQD?= =?us-ascii?Q?liq0DR33Is71WS56zZGAMj7k+Nzd4qK/h4RO+tdLG+3YJ3DWcBp94WMs7dgq?= =?us-ascii?Q?CrfqkauGN/WTpZKGY7vTSfqEXqKcApipQz8+5Pp8wABemj2NNRhui+6bQ5g6?= =?us-ascii?Q?V25/Foq3c/Q9FEsmIqtPmPICQTwkGd/vhjBJpj1gofTvnXdwXVHoML4GbPMB?= =?us-ascii?Q?nfMouX2z2XoF3wtsq9/axiKFgJBQVFOh04V8BqXwVu2s0HZt2xUYyb+1NgGk?= =?us-ascii?Q?Ij4ZC9HkkDBKqoNfPafSBEiiRzeZ+sf2TXXZF3FvbN8s0djHaeMmSNfNU3QG?= =?us-ascii?Q?NnfkN6CPOp444Qhcozl0Yp5lE4J3h2GwSxfipP2Mdq17Satf8uU1CbqqeMa1?= =?us-ascii?Q?lsw+sw+LAnNxgGbJSf2LmDkgukxErLfBoLPLfvjkcMIJNPSu37hemq9y7ie4?= =?us-ascii?Q?JCz5/846ai7IHG7mfvNY/LPtJBDjYMo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4ea0c97-1dc5-4252-9dac-08da4ae21404 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:48.5882 (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: 6C5cHn4YU86k37H6UKAi8jHjjcK64bxmOunfyElI0TfJz5mfaW+pz51VTOzzaEcgQn52oHmo2PBX9px83r4ZcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 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 | 37 +++++++++++++++++++ 1 file changed, 37 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..8592c881471b --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_red_init") +void BPF_PROG(mptcp_sched_red_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG(mptcp_sched_red_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_red_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + mptcp_subflow_set_scheduled(data->contexts[i], true); + } +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .get_subflow =3D (void *)bpf_red_get_subflow, + .redundant =3D 1, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Thu Sep 18 06:42:57 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp689530uab; Fri, 10 Jun 2022 06:07:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVc03h58axasUoAfzoKIGj7y0Op2zt4KUTY0nG2nHJ9byVNGq1DRB73ZN8AG8yOaKmP6S7 X-Received: by 2002:a17:903:258b:b0:163:cf73:c083 with SMTP id jb11-20020a170903258b00b00163cf73c083mr45491521plb.127.1654866420925; Fri, 10 Jun 2022 06:07:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654866420; cv=pass; d=google.com; s=arc-20160816; b=uXkh/NKnrHutbWwvNYP178I8C8IgcxZHUHN4CGMILFYBXc0DEaJ2qCNnmVDi+8ihU4 Y3M7PmSogPi5Krqd92tUUkK+GaXIdC048vwQ3qb6Ys/9kjXzZpQIPbma8DdFjf1qDdqp /i+5g7znILweMLVRVC9wNAUUpDdyGDzrkqA6MfPwGnqZzjshoUbMAOr4nP9q8YCNwQpQ lD/DefJbqYiZEjhaB104KzY4cmegMMz19qi3B+GP+YNImOfyUFnqPFvV4OXxeD/0qlfY L+0V8gN9E/Drp6osHEmMWB/sIzg92vcvULeIYHTNUJNrVXUYolnHJgp/nIcwEcS7SYeU IFVg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=ETlvzmWytP/83+T2Nxst6fhGxsW+0kLk6ybpqQM5+CgOMQSyrNidcveWc+yGMgVK+V qpACJX3wViI4XO2yCHD++d3rTM33NwAthCStqSj8QCvp+cwL4rZLf+fuyrXpS7Oa8PKt +hAAGudqhTL4D64+RNubdcEkDxq9x2ldTdyEXZT0OsLlGVHV1JGD1It5RxnJfE/BKM4n fOmPx6keMX6klZNhyAYIqKBeXFkT8qk3feNona7hpD5avPRaA69Jpe4x3RQXMtF9Op78 qa+OG3QYLqSjZ3TFmZrAtM+2Vzuhva277o4OfKE6gpM05DJqlu8zuZt8FbX3sAVL7D/k bSzg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=xBRS1tlC; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5628-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5628-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w5-20020a639345000000b003fad857c97bsi38165628pgm.314.2022.06.10.06.07.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 06:07:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5628-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=xBRS1tlC; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5628-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5628-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 6E718280AC1 for ; Fri, 10 Jun 2022 13:07:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 858A6644; Fri, 10 Jun 2022 13:06:59 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140047.outbound.protection.outlook.com [40.107.14.47]) (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 0C59D7A for ; Fri, 10 Jun 2022 13:06:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZkOVjfvnlwullsfQHecOBPKFsqnkQMcS9iVPpiNzjXn3B2AdXBiwMxB5L5lP+VC+NFvDRc4L+/Vn7qFdWabnSiKCZZQ4s9CTZsGXsWOH3NEiuEqTMvVbN/fRvAYT1vXldogAbYYYoUIX24tBIK4atNLqqOJEq8vt22Kr+4vbcY7v7Sxu0Na1uAvbYbkna/xbGr7TLgbrQB9g2FqSqI8XDx+TM1ao5dL/WbEUOcDVHSYKkUyIy0vHoKcZYpg1xh4BemMD1Z0DrBk26CQWT73hckXPS2alcof+hDeVwbzYJEtQ/4+bLjcOQ2kfW6wlyKRdqsVwtGb0DNaBCFlq5bByyQ== 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=BQ6ZH+eOylPRHUCmYYiOJoSF1hYr08xlT2VHiIJy6uH00bW3f+oj+TJ4rElHIYGLRFN5SqHIVtdg9YkJhefC3NyLBs5/You2KM9Vmk3NTIk9tGgIH9gsGTdmj1JN+yrSQ4h7IdFJiV2d7COR4ZE3ZgWxesndW/lEqkOSSphfPwi9GKwKJi5NAgoNV0huQiUOV3hqxeDxVR4o178eOuK5mriXVz1Ec7t4PtbSXR/uvuD3D3Q1AbCeCB5r41+X50hZj8g95EGJPPtNnj6QpP73uP6R6pcuHvS3SIEV9f7O2SV+zVkqNM7RCOBNMKvW9b595DwLUgEVFmKIuFnwK1iqNw== 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=xBRS1tlCv3UXvjQyGAQ/M7xqIKUghhLj4+lqq6OiZSetPqzujoixBN/sBQvBgYh+clQtfSaQCH3/x4ybKJ/ivi/qgW+2UGvTDOyxwYtJSuhq0HUG7Y1BA2uZFzi8OmuoeAXhMLw+FCD7B5q/khK4bIa4WycuXs9aEljcZCE4yKSneK8wl6nn2zlkwzq4y16DnzuBxAE6s7TQ2Ec5dQ161mmOGilK9q7JXcaTSctbNclH5Gwqq5UZVIwCCq8ayyfNvdS8VGN1wjTTqCzuu8SdmNDOhYdD4sjuOV8NzZxld7Txp93ei3r2sNzerezpshwEi8ivXvV0aEBnrvNtOPprpA== 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 DB6PR0402MB2725.eurprd04.prod.outlook.com (2603:10a6:4:95::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Fri, 10 Jun 2022 13:06:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 13:06:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 9/9] selftests/bpf: Add bpf_red test Date: Fri, 10 Jun 2022 21:05:34 +0800 Message-Id: <36aefd62089f887aa9e640d5dd1ec513e8fca592.1654865847.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0184.apcprd04.prod.outlook.com (2603:1096:4:14::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-Office365-Filtering-Correlation-Id: f8d7a8bd-fa2f-4f96-3d11-08da4ae21761 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2725:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vo7iTCFdhfwMxoJvIyWcbFsUiqpHNp+CUdlBWHjql424rBZGrzWpfwJWdmshy27HIPuzJPo4AZ+ni+U5fc6+/upSMuvt9JEQlOjUFRj10EVVMAXsost1AB/aD9ZeKJKRrNLRHcIqKUKoSsPW5T6CwHA1w/Ye/cvB3sO6FxvSdktaxipdo7X9srR+MS/LDt3rV8MfRgmFL0UrpfAGPs+dvGIFpiDDzVQs+IK4zYNUZ6ljbTyhib26y2T3EKHy5IGiCI+S1QZMHyKgan1OYluHhPz3OScA3R0+0eL1vTVO8ZrdYmdl6oit2UmtVc6dnxO0SQlzfpxjiNPDKeE+UOq4WMCESrlQmm5Epn6NV1KplJv9pFD0LaC3yMry79aGEL5WDgsFlxKArOOip9Z9E6dHCAPyHXrOiqnQP4y+99rTLR5b72xUrxQ4DtCR6MQGqeij0t80/JwPL5lpJ3Xl8Ne1iS0kMM/OGsn9djS0xDonXafd+4MqUoyGi6qfzUcNHOzl/hbxN44D91UUnxjeju5C+O0WJusas4h4NyQ2eYZdUgJYupOSJk+muwoouqAJHcum/lqpQahcboqAjXyydKMTm172F9KJbWoHRrqtsWn4CuZBWNLZ4B8b5AGPX/lkzC+r6OmErTNPyQlo9mD6eMT3mbhTGrGHSZmP/ALCI+q6uPE02uY94ENWAq7zKgffK9fa X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(26005)(6666004)(2906002)(44832011)(86362001)(6486002)(508600001)(6506007)(83380400001)(2616005)(107886003)(186003)(8936002)(36756003)(38100700002)(5660300002)(316002)(8676002)(4326008)(6916009)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3XV1c7h68++zBGMeAdGL9fZA1vE9tUmMpRTHf0QoUNkPGpNKnjsKiplsWI9R?= =?us-ascii?Q?H9C7k4GrHnlg7sWTEVHCrkBrzL67UxhrYNin0g2hlVSLwYNJzXuQrXIpTY1R?= =?us-ascii?Q?xDpycKHDj1rqusbtE20bVTQmyI695bRICyDo23dHlgMc8I+9Fwp7pOSsHxTq?= =?us-ascii?Q?ArhjaAPVQhyiDZ9hqUzRUkYLhfsPnTF0WcmzxPqMqwq9bwdSYEz6JHhCB1IA?= =?us-ascii?Q?r2i52N273qqz0ixQm8xT6Y1deIBsDFgYnt1VHd40b9rw+57l84e+04wcsPY0?= =?us-ascii?Q?WjjXl/ZNxlI6iSTSHlnr87uEqk0WZVVtL5CMVXQ5KIKCwoffQIqAvBef82oZ?= =?us-ascii?Q?4lgaNBO1Rzd+QWtPbGBXcnCMX3Q3n9iVFYqHlO3WcgwQGko7ChIYOZaD0Q6O?= =?us-ascii?Q?Xr+gQFcrp0tv/wqIYPqx/xATykkF8lh5AA6jiUeiezSqzpWlRZpaHgBPEgKx?= =?us-ascii?Q?r7AxBjiZqpGjkR+kVvARr9Zoer0bLIajbu7JcVflAhVV1KhwRWaj92RsDQHW?= =?us-ascii?Q?UZ1pBSzyEKlxluJAeWDA0TjeqseIVdK32PJc3CCkaMUOrICgifN6HQTAIZ8u?= =?us-ascii?Q?b4HvzSJ8fmTfZb69M+OfDhOucJR5GrN0WCcQgdE+FS6YfQhPgWCluOcDi1Uv?= =?us-ascii?Q?pDgIWYDrodfAnEmy+GWqfGPWZoLcnVBbB3i1YNG+pRl/YStQYbYUBc7WKDB+?= =?us-ascii?Q?idZ3LrD2wRVxqljnYYTMw3YzZQuTWIL2iSyk7MP1XQ2QmRPUeeIV3ChAee/u?= =?us-ascii?Q?8rHQuioWf5coN86W/bb6rwuu9ECU8RA26CFratpu/kbgYM7hxtb+h31s2R+O?= =?us-ascii?Q?BZtSram6BNPDxnCIv2ANZ+j4Qc88sC/ejR2Az0GT3qUhuSHMKcCoyCl46sYD?= =?us-ascii?Q?ZM7Ole+RA5DjO2KKsfiGMOPIBP6Kz8LcHXUf/mQ4ZfvoWtPZ++Q+qApRc7dU?= =?us-ascii?Q?Xk7tqyeqiU/QunrqdTCsL71Me9Z6TACI0nSwW6gtJzVk+uAgJd59ZG0Mo0SC?= =?us-ascii?Q?+w9ZOxDZuU2zhTk8gjChDTzosRYF67iON9C2H34lna7QBulYrlYoeSkjsPye?= =?us-ascii?Q?HXicw41Y38nmtmNhATGRZ0C9BgQy17WI6tOU0Rvcpa2ktsFI8pTh/BReiSi5?= =?us-ascii?Q?pzrvYuOhDx7I4kt2+5rJM6T/1i0pTteUsL4oupnRqtz+rJqDBaM9bB2PL5bs?= =?us-ascii?Q?0ZNDIZYtnUlRq9n8EZ+sXPAcmdY4o/d2oQRY+ZJAgThNZx68x5Azkf7vVpOW?= =?us-ascii?Q?u8IQqEBEyKHJchJxv9DAHzRgX9XpEOViYwAjbX92DQEoMlsxyp8RfTCIxJgM?= =?us-ascii?Q?vewlT3VRzf4YPQJ73ConXZPH/Wohobgflgt6xRc/QLgAn88X1CzFwAmBsHce?= =?us-ascii?Q?RGZ65CsV88uLebW5puyAiwSV2DLd7qIgx3dQXwgsYx5/TMfW9YuiD8hVOmrI?= =?us-ascii?Q?6gGLUsDWnqyYOqgtT5Ns+RzclmDo0ztwPFSSACDfvMDGbv6nr+fQzpHJAnhb?= =?us-ascii?Q?LgYjacd5of18P3ERzUWWwcPj+26UuJYzGHCghClJT4Cnax2gZio56jq15o6j?= =?us-ascii?Q?HxPxnOpJTEuqLB/BUGURpI9RBc7B3UXvWvmCC2afENbEUyKCC9eOzBJMH45V?= =?us-ascii?Q?Q3KiWyUoOnbhFdf55WE4/UHRXYU6TNALl9cqvSpjhJyOiDR4g1G1tWHClEWH?= =?us-ascii?Q?KGyAFg2tuQdThCJSrLV7BuRGci4BNyCNpQW21y3AZsvfgXVk2klktFVNWnkD?= =?us-ascii?Q?zh6gjd/05MXA5XYk3fLyji9x67gxVAM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8d7a8bd-fa2f-4f96-3d11-08da4ae21761 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 13:06:54.4315 (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: OXHLERHFidmM8xdJ4n6qeAoHAnQec4K5ZxoEVvZrbaqlVKS0cI+CXkp4Gdh/0QdglMlkMNTty5rIND9vZvNczg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2725 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