From nobody Sun Apr 28 18:39:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:2547:0:0:0:0 with SMTP id l7csp28316edb; Tue, 8 Mar 2022 19:36:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5laXa6HP/3m1nf9hhdicyChy4Dkdxd01V35/CHqO+Z2Nuf3RwQZmPCkxI+7ASL5ZNuwyg X-Received: by 2002:a25:e0cc:0:b0:629:17d1:7ba9 with SMTP id x195-20020a25e0cc000000b0062917d17ba9mr13959467ybg.200.1646796986358; Tue, 08 Mar 2022 19:36:26 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id x10-20020a25e00a000000b00629215bbe46si506998ybg.600.2022.03.08.19.36.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2022 19:36:26 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4170-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=QMMmmzvj; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4170-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4170-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 ewr.edge.kernel.org (Postfix) with ESMTPS id E4D681C09E2 for ; Wed, 9 Mar 2022 03:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D1C46476; Wed, 9 Mar 2022 03:36:24 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C0FF15A3 for ; Wed, 9 Mar 2022 03:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646796980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QczyTf36WLF6RiwPjZcEUbZdKCp4RFvJhvgbWA4SnIA=; b=QMMmmzvjfxJC1WVGZf3eFPWUCRwpKGszmVGZrBQD594CEnZDZMcyLuyetScucswGt99OxL t8L/Jr+hP98fltCH212gmw0I7/iPXLGkcGgAZg4b122rIVi0C8o4n6jAzoKCJE1vsfQtyY +uFQfj6zOKcZhmtrAxA+ojau/dpRDJA= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2057.outbound.protection.outlook.com [104.47.2.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-nPXgjy-wMruAMfYt9wi5nA-1; Wed, 09 Mar 2022 04:36:19 +0100 X-MC-Unique: nPXgjy-wMruAMfYt9wi5nA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=avCqQh1XUb6rOEn/Q/qug31e8wtwfWc1zPF4ec9/Mj9QLQMonj6aEbZzLapmDZJiPqVB47NKJvabg99L+B/xI0aaJPwyn/BVqXBH/smg8WTNksuIUyaeTDldK1nOS9a+b0t1xP+eFmN+X6AgvgPL/dJmvFFTFIOhEie1ojAhrnLXTuC5yZurrkFh4Q7yU1mrUmaB65iN8fyo/2uAWBymo0xKc2ygb4VAYEGd6SWPBeG6N58Nmv5A4bE5Ke6zLAkmG0QtZEJn6Wtw0FBePqL2isbEPbnLA6hgcY4gzUs2kVivSvM0jiY7I7To8HvW1S0yAhjhb7FlQfaix45unSejNQ== 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=gZ0l557PIJKHti6t23iVEEtFuxpn33BRZk+pmmHRMtM=; b=l6RgHXdrNj0Iz5NE4UxkTIRXdHRVYg3bPtjv3TDyODwK00eEG/pSbPxlwi5xkL0bSsWFg0ZWIB4NZbgxbqP3M4m4Fx1jfN7u17No7znKVCHddDAVDBrBDYBOeJERfkH+5pAmHUTjDSNEDd8j5B1LokJ05zH77kP61nhACDI3X6yRroWuy9/RhGNdHcU/+y3anObyioruBwQCOzb2ere5N51FLP8FHuwEHARCNbY/nPdZ7GEn/CpZ3ChQsuJIhzIcW7w4cwzpttGSAbJJSfPKweMNZJbWHageDCWKLXJDObyAzDPBqvAjOxS4wThZ4ovKqpl7UbMjFYXB5GentenWIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB6333.eurprd04.prod.outlook.com (2603:10a6:803:fe::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 03:36:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 03:36:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v10 1/5] Revert "selftests: bpf: add bpf_mptcp_sock() verifier tests" Date: Wed, 9 Mar 2022 11:35:57 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0048.apcprd02.prod.outlook.com (2603:1096:3:18::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: 79f53dc9-2f9a-40ab-2962-08da017df8be X-MS-TrafficTypeDiagnostic: VI1PR04MB6333: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: nNjh+y6B1MAcoa7n7+YSAv9GED1kaV+0JZ1IotLuOwqYArgrzC8kgks9KojV/r0CgZp+BJbua2zI94XyK/FfA0su/GI/SfHKn+G2wXxt2X3K+2N1pPUiPitVs6O/LnaWkiORXb4RZj43xr6lJEcu8DUyvO3LOOmHoi91kKePjDQmeRnwUslQkAux4i+Qp91LE7Bc+8ZP18hrWY9ZFYnwRTOplu3/BNJKYZyLfSkUANDXh5ev2a+oeP0Few5P0FXtshMGmE9zf3sRpdC5TQmHw5j/LYbWboWNfWk3TmoNyfbxhvUTBg95KLHyJDNZ6OD3YPH8kkpB4F4Dp1BFsWuQYPrwcTUDUuYj/s1Qo52LEm8mWiAPx+2+VI0IE42+928PUuKnnFNKc+ksbxd/EH1gVPySrdTBNq/isYKwyj2HyB0IaaFItFASk/UYwEaPVlXbUOvHufJpuM52deGouEl5sPuuHhPXqQ2Y9wmh3cuzJUOcKfHcwJqN/QK5+gUqflnSwZd2V+scfH+SQCK6mvdhI5QJ5r/cFAkgK68VbX2d3yu/FJ4Yd50RUWF7VaSQUi/hrf6w91v/WJFQotM2MLFOo2h79fH3U0wN+9YebMByei7sWNbpp4JjvziMNRyuh6ED0TYWc4+qtYMB40Cc5g2naycpv22yPoaGbP0zNzVie9ccLmhESfCaxFGOArwYwpY5m5LIFzTWqAluV4A61AOsrg== 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)(186003)(26005)(508600001)(2616005)(107886003)(316002)(83380400001)(6916009)(66556008)(6512007)(86362001)(44832011)(66946007)(66476007)(6506007)(8676002)(4326008)(36756003)(2906002)(5660300002)(6666004)(38100700002)(6486002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Dg0Mc5hiW8Ay3ey4QTom1PJ962haK6J51BzkycoyLL+jbDHPqYXaV2TaJ46a?= =?us-ascii?Q?fzIUMbOuaH0mxRLqTgKDIPh34nw5uxP71zj/W0gzDYhjgOpHNnnY6muXGpLK?= =?us-ascii?Q?GYF0lIDHYFKMJHHjVXg79A8rQUcNGhFZ9q6I7MTQ4OfjoZCkJl1VGYmTaGvT?= =?us-ascii?Q?6a2EGOrjxVJsuWnoGBv5vNTi/3mZBjVluZWRYhxrZawGrWq3nDAZL5wzJkja?= =?us-ascii?Q?mAs9CBan7tEbLAqU7Zao0qlFBcD1jKT7OOJWDPhWlY87YbQuk0Q0IKFJiXE6?= =?us-ascii?Q?+9iLOV4g0cqQhlnTDX5pWuTQzCZaEw+8qO4oORsPACUq6edd7nNG1ahSmywc?= =?us-ascii?Q?SmB89Oj1jHbQsexcBJxLbWksFilVqJKomdW2VOV3dOK0mzr5EJFc6EbPDwof?= =?us-ascii?Q?CIOvga4wGEnThy163rL4sTQh7lYDNlFvcxIsicpb/+yHOpBd2uU5X9cl+78l?= =?us-ascii?Q?3CyjUqDCOB4Yh2sDDbZjioQW2dNm+jqIzfONnGCWAx7a1zpnJhllWYcDHEhM?= =?us-ascii?Q?gO1aFJncIAXaJsSC42Bkj6pYkP435HuAfJtnGX0p6WMxzTHD6sCnJo+I3Nef?= =?us-ascii?Q?dY6sTXAccDqvRGDv+I+q4huGzmt1x86+UeYulu0VIO+/1MW/BI8108YCjeJm?= =?us-ascii?Q?9BBImKrxGnaK5C9UPGvBtZKLnne4XHcGeWVEpCyUYaaepgKXFqkIS3gQk5Gi?= =?us-ascii?Q?5eO4sx+pNC79dXUJttRVcm6ypZ7Jbh9fA0fdPlux59u7W3jrlqYk2QSy/dG6?= =?us-ascii?Q?Ax8jNoGDGX9dagWDhTmMU2pv6YTz6c946gEMnrm9pAI2mDd2m9KRNVF9t+QI?= =?us-ascii?Q?QkwCrwoGrZJ6Np5MS0L/kX9JIND5w4lubfiL4yWnjU+3tZ3e2rTU4rtVO1sB?= =?us-ascii?Q?+DuMal6vn9AnJicX0mHiVBT2aRzkW1zd8wEBAkHFdYLTerdCeGoqVw1+uU65?= =?us-ascii?Q?FFD1sL3hJPII1XuYDhoZqL6yMqiV0mKlMD/C6PxtKhHxavFmXA7wjBtGqlzT?= =?us-ascii?Q?qWiCc46EOr8F6q/iLphpxUvNhcOZa66x9iylrVRrr1iiW0DbJPURCZK57TJh?= =?us-ascii?Q?n9SWeYIoM5+LpYDPpxNkbavgUX+ZxcKSNErryaXg5AY1VNnJIBJvdNOyYjWp?= =?us-ascii?Q?eLbZShen+zyMvrpf3vGOfe9goYMkKL+Hc0U8Jqu6Y04JdAEQn1g+ZAvxvfOQ?= =?us-ascii?Q?XZkF5la8h3gyVSmqZ5NoYpWzR9hNkjDDPOKKQpnLM4Ijlrw/dp7fBZvIbytE?= =?us-ascii?Q?PZhjln21txmjaiNYTw+ekvN0ntudgXRwgnODbIfxddrrYDBUKx9upddiTTIT?= =?us-ascii?Q?HdVoF88ro5sYGg/REujCOv+BjPQEwo55mgwfi3quVBatTibC59Saf5FYjyIV?= =?us-ascii?Q?FskVlEl9I2c9VAJQfcTeFhR/frM3bnyDW1lvfYpKCR9u3eVPM5GwqYrw/5Sr?= =?us-ascii?Q?kW4ueyASsTJgb+dUMQv3LteIWoWaMVCIiTMDZhCzJR3VRd1HpL7dZHT4uEZp?= =?us-ascii?Q?s6sDBrmVbTfo/5dX6JPzoRJ7wINJcFuwlt+xK8HwrnOUcwhcR77wHHWM2vhE?= =?us-ascii?Q?EfFRv26l1fV97H5JJfIpy4z94CNSBxp8orV0I5c28FGW9J7nSO5I3SJzpbTX?= =?us-ascii?Q?xRawULJ6ObUhad1fvi4PFHM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79f53dc9-2f9a-40ab-2962-08da017df8be X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 03:36:18.4598 (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: 0irSrzNFKaRgkoq+sPngQWrcZ+PHozo4c7mlqb27KI3+Xx52ST9d8Hb5NjuxV0nnJ94sfOzhlFX3JR6a/B6VxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6333 Content-Type: text/plain; charset="utf-8" This reverts commit f48f0143286db0d8dbded9542d9a2535533dd3b9. Acked-by: Mat Martineau Acked-by: Matthieu Baerts --- tools/testing/selftests/bpf/verifier/sock.c | 63 --------------------- 1 file changed, 63 deletions(-) diff --git a/tools/testing/selftests/bpf/verifier/sock.c b/tools/testing/se= lftests/bpf/verifier/sock.c index 1f85588091ab..8c224eac93df 100644 --- a/tools/testing/selftests/bpf/verifier/sock.c +++ b/tools/testing/selftests/bpf/verifier/sock.c @@ -731,66 +731,3 @@ .result_unpriv =3D REJECT, .errstr_unpriv =3D "unknown func", }, -{ - "bpf_mptcp_sock(skops->sk): no !skops->sk check", - .insns =3D { - BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_1, offsetof(struct bpf_sock_ops, s= k)), - BPF_EMIT_CALL(BPF_FUNC_mptcp_sock), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - }, - .prog_type =3D BPF_PROG_TYPE_SOCK_OPS, - .result =3D REJECT, - .errstr =3D "type=3Dsock_or_null expected=3Dsock_common", -}, -{ - "bpf_mptcp_sock(skops->sk): no NULL check on ret", - .insns =3D { - BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_1, offsetof(struct bpf_sock_ops, s= k)), - BPF_JMP_IMM(BPF_JNE, BPF_REG_1, 0, 2), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - BPF_EMIT_CALL(BPF_FUNC_mptcp_sock), - BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_0, offsetof(struct bpf_mptcp_sock, = token)), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - }, - .prog_type =3D BPF_PROG_TYPE_SOCK_OPS, - .result =3D REJECT, - .errstr =3D "invalid mem access 'mptcp_sock_or_null'", -}, -{ - "bpf_mptcp_sock(skops->sk): msk->token", - .insns =3D { - BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_1, offsetof(struct bpf_sock_ops, s= k)), - BPF_JMP_IMM(BPF_JNE, BPF_REG_1, 0, 2), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - BPF_EMIT_CALL(BPF_FUNC_mptcp_sock), - BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1), - BPF_EXIT_INSN(), - BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_0, offsetof(struct bpf_mptcp_sock, = token)), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - }, - .prog_type =3D BPF_PROG_TYPE_SOCK_OPS, - .result =3D ACCEPT, -}, -{ - "bpf_mptcp_sock(skops->sk): msk->token cannot be modified", - .insns =3D { - BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_1, offsetof(struct bpf_sock_ops, s= k)), - BPF_JMP_IMM(BPF_JNE, BPF_REG_1, 0, 2), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - BPF_EMIT_CALL(BPF_FUNC_mptcp_sock), - BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1), - BPF_EXIT_INSN(), - BPF_ST_MEM(BPF_W, BPF_REG_0, offsetof(struct bpf_mptcp_sock, token), 0x2a= ), - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - }, - .prog_type =3D BPF_PROG_TYPE_SOCK_OPS, - .result =3D REJECT, - .errstr =3D "cannot write into mptcp_sock", -}, --=20 2.34.1 From nobody Sun Apr 28 18:39:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:2547:0:0:0:0 with SMTP id l7csp28342edb; Tue, 8 Mar 2022 19:36:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3X1Kjl2HlsUOsXvr0XWoSeux8SpIMmcCGGRpKpZh2uEx4tulJcTjrfl1hx5iRhRvddIE1 X-Received: by 2002:a63:471f:0:b0:373:9b10:886e with SMTP id u31-20020a63471f000000b003739b10886emr16600285pga.307.1646796994117; Tue, 08 Mar 2022 19:36:34 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id o62-20020a634141000000b00373a24e7c4dsi781931pga.69.2022.03.08.19.36.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2022 19:36:34 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4171-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=THGgfDTe; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4171-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4171-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 46DF93E0584 for ; Wed, 9 Mar 2022 03:36:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4A6AA6478; Wed, 9 Mar 2022 03:36:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD6CD6476 for ; Wed, 9 Mar 2022 03:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646796987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z0MPY+WSQNwWOyp5VgV0CTw/sHdvnUiJvFilkADeg70=; b=THGgfDTeNUeTMojZtyJT2orqqoeVjqQaTIIFMdiMoaWBULbZaTksXXl1weShQY89WePkYU A2CaeRcm4LRJQDMIb7Qosa2hrSiPKbW7O7tQ7pKVSjn9L48hiICH5z9JrNMIsU3Os8zTm6 7GOPJ2QNdoV5RikHxI333LfXrYhfnj0= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2054.outbound.protection.outlook.com [104.47.2.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-3-xN6Q_FmfPFGQ9QOGt_btOA-1; Wed, 09 Mar 2022 04:36:26 +0100 X-MC-Unique: xN6Q_FmfPFGQ9QOGt_btOA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FKdwkCkGPvYEJunqCFcmQIqY53VmM1DCeCVk39S+9z/rK7RrWzlKGtslnCdRVaTHySvdjP4txbo11c4rpGZ/OpukkJx/qOpcYW71dG1b5uXUZdr0cb86bDpYnW2xjJhynUoQLolacrB22L9YZt/BYEh4VPVWqCChXI+2ntgpZexfhVPWg6A+JnXiky4pvetJdowIEv7aZeASup9TVw6XZuxfzxPWXmZa6PoFIPTAXwl1kT74trIu3has0JbG7Kw99vAal7xoJHF9G/YO940T+kyi65p60Fids9RMEtwFUOtjPYg5a78OoUzhCTTy9BWR3rYSa00yF+tJgEitZ2vCNg== 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=3V/CJY3nSxaI4fRpLm5g7E3duE0JKWPCKp+lNt1FwUQ=; b=XNKiY/FzYxSKAC3QkeEmSh5Kily/Kx1ae4vaKXnDVUcXNgvrhx6YMv8fgUqZ6kLMqWaKxQbDkYgL6KDPqt/OJQ4/oWGl8IwRdmD9+y1uMAOIAnI8FTK00zkMzRyvJEf5YvcNQeY0pF8yof/F4jCrNV2dhCzVo4dY8mqTCvD2AwsNna+T1sH1/kXz9XaAa+XhEKUoynEMfekSREdJC61/L2scCsaa1qprNWcVxJFr7vZ2WF4p3C9e7rRgVkrFu0otjKq/jxPGd216MBylY4JM4emmAhw61wpWwFklqpqeqBkg4cUATcdswr+FavZA9MRzB/ReMl2FTHPOg5qa1lBKTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB6333.eurprd04.prod.outlook.com (2603:10a6:803:fe::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 03:36:25 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 03:36:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v10 2/5] Revert "bpf: add 'bpf_mptcp_sock' structure and helper" Date: Wed, 9 Mar 2022 11:35:58 +0800 Message-ID: <5d0f38a0fb220bae4f170f2debf5a8b8a031ba7e.1646796538.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0117.apcprd03.prod.outlook.com (2603:1096:203:b0::33) 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: 97eefcd8-9ed0-477f-bc3c-08da017dfcd4 X-MS-TrafficTypeDiagnostic: VI1PR04MB6333: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: Q12M9IPlJME98tlWLQOQXLYw+nXcATkytBI5LqXfowA5SLdjx/poncxHhNP3p8hLS0UXGmCZnFZKsxmkXuU6HezhmeCe5VbdMaeDvYmYZcWpxD4aBicieMrPRwvCOHcCEcT8Jw7Vpcz0axriCoU/o6hx0FfspZReakxXVhqAZigWgfiOZ1Z9JTp65j3M6KpiO5gYNOW+xtYH3D+gmAr14nr6pbz/CYWbUs4OwHdfGOSGurPHBniypZDPlXL2nbSVAEj0G7RvdV9WDH/rGhm+ae6Zto8IPTmlINTspIkjhlEPD0CQaoWOZj+DKfaK6lM1bJwxm5T+3fJRVZi05aUHrlHPQ5/6RFHzmGz0u917JyyMiVgynshgwZP5fowCRCBHUQ8ZCJvgKNiu15Wt5SvL6n/xAK1YuajlxkoI6yfj8dqGb/bmEvONTSZ+ABDaYfTYVMJXTR+pQ3CzOYG+xzpstzawRIGq9vypplns2TIXXwdBPb7lFZyxIgB7D1RnuaMvviJO6noucaa6P0AWoCfqSBo8ZM7Vux5YdZWISjiLD1JbAD3YbbrVw4DmUPuA80brvMEDJWGAo9aHnYkcwjXyVBrm2h/QBImFJT1xwAw99DmzjJKkrEo37uHE0fc/xoV0Hy8fGdf3uLl0kxAbtJ4JrYGy2MMou4iocX7W8gEEB8PejWbz6rQdRPGpXvr61gWxy1maiTM5Uyz2E2KJuBAylA== 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)(186003)(26005)(508600001)(2616005)(107886003)(316002)(83380400001)(6916009)(66556008)(6512007)(86362001)(30864003)(44832011)(66946007)(66476007)(6506007)(8676002)(4326008)(36756003)(2906002)(5660300002)(6666004)(38100700002)(6486002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gHL5zzdGGz26O0sa2xXzvGUHkYg3xVNeGJU4m0Rtl+nRg4G8CcoxAW5QUnXR?= =?us-ascii?Q?LBxum5O3S5dvXu/0euVQSsqg2b5TNot3/zKdMQr0rHjrss/fb53dcP5/ISYF?= =?us-ascii?Q?vJG8mqOLwWj3NQjb4N8xsCGgF1MEvkDkEajBn4CH5tlaRPMa2DORAUhICy4U?= =?us-ascii?Q?sj1W84HgMdv3/Flpri3yGZ5bzEY36RV06FB2erIx+jwgzDrO978QjPyWs1XC?= =?us-ascii?Q?QWvtOHoVfu/GFHMno3ZRpjWanXxzpSgmSnIX41UyawfyfJWtzeBTY77AA6Ou?= =?us-ascii?Q?d9Ddpki8/RCfnJFbK0omaNT+TE9T02eUl0BFUz1ccrrCaw3G4jg+jLycv8/a?= =?us-ascii?Q?9e21S71+6iqXvOuNtXpe8Af1xCPIrCY5wz8vLJBsxTD20y4WzVsQPgTjhHFT?= =?us-ascii?Q?ereeWurzJ1SWanH3xhGjs213HHR8J3QGdZ/PvQotQH8AWhXUKhsrukVFbGVS?= =?us-ascii?Q?hp8fndKDCQpxBslNj0qoPSHyiKPpMQvdNR9L9x+VunBAXUKSnG3Bkaa7wpG+?= =?us-ascii?Q?ZFX4NEGpxgmR/k3EJEYyAUpFoD31sjbxpVK1F6rHR5qFT/m3uHfM4h0u9Zyh?= =?us-ascii?Q?KeHJfrgueCejrFl/bRUGs/zJ4tSSi/jepkcGwbVVN4SsLcZwr+iAlEFdRZ5/?= =?us-ascii?Q?xFhVxowns/SulXoWducCk08UgbwVhN4MR8Aiy3BXRZeTY3RkoYFhviJESRao?= =?us-ascii?Q?lKQN4Aob2r3qj819KZCySW7905NbtF9J6gxblD+pz5I3pFmrMHXkjXjaLuR2?= =?us-ascii?Q?c2j4gPpBfuGNTKF11MIfIam/yP4vPtjdBV63TNRJIJ5wylDu5JMW+NNB5ao+?= =?us-ascii?Q?kG4rnvd9RnjXMRu88510Yg9A8bTqS7whwyr4If/NX5XCCS9N5NGLXF8YIbgS?= =?us-ascii?Q?nDWNxjgmlB88m4styx87YzRyiX52wp19UFCYtmh///LK3weiFSLwVr+ZOQ+Y?= =?us-ascii?Q?ZRVCGrs7lmdySeLwMYLftW4Xjl19CnOwNz5IprGSsv31b7sUH7k2JWg3zXxJ?= =?us-ascii?Q?nEdOMe6N0mzFuqOvbc/QnR62IhiYuJPNytv0EnDvNjTj2Adjsjrg27RZ4whh?= =?us-ascii?Q?M0PMfei+Ik+POuPUnFDEEyyYuD4Poee5yCCqqs3Aqd2Sc/sfk8gIZpaozhMt?= =?us-ascii?Q?vaXlrsuTlkIzAGq6PrdTV/2ST5/3hMn1rIY/iiYI9+lm/Hsy6vnNJdPxTmFc?= =?us-ascii?Q?x45eBE/qZcSDqEEi72e7z2I4i6x0Ch0rclcfzzi7pe+/T6vpDCeu63xZ/aS2?= =?us-ascii?Q?eNpuKtV72EdnnUcRjg8bLZ55XuqDWHTorygkY7DWlmlC1cN39HzfXlqr/rBc?= =?us-ascii?Q?OwDXPfsyQm/nqQfJh0ArMQp6tem40y1JLrI1LYCxtRy9n5ojDrljzkwuFId8?= =?us-ascii?Q?fnQpENlClrF3BRef8lbedmivCvTfvfORcD5s0n1ED9vkv0By/6clFo+SM/6m?= =?us-ascii?Q?Z8ChopMyl+emTFKR0cP7Qi8KPa60iQrX6a3nbDu6KmaFPQqIDLvIjgRPjg8P?= =?us-ascii?Q?vV3bhPreUWIWPUPdpGOTDABKzEwZt3OJjpdvbZBAwc45a34gVKP2jOmSjX8X?= =?us-ascii?Q?hYsoq2a2wav0IGe5A4+OA2SAC5LkouD+jVm8srK9AT3ZXg+9jiE0YS91LIhh?= =?us-ascii?Q?qoaYlYs++Ix0pB3N8dFHRyY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97eefcd8-9ed0-477f-bc3c-08da017dfcd4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 03:36:25.1936 (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: wbXPEKJcPU3yn6xTZEcY2sa66OQ4IVgiPLkaVXuAK08dpuyIlzTkYUniHKT1e6NAfRcZdTp1s8aV529/0zRaXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6333 Content-Type: text/plain; charset="utf-8" This reverts commit 2ee22ce38ed4c7a416ce887eb6379aaf157634f9. Acked-by: Mat Martineau Acked-by: Matthieu Baerts --- include/linux/bpf.h | 34 ---------------- include/uapi/linux/bpf.h | 13 ------ kernel/bpf/verifier.c | 20 ---------- net/core/filter.c | 4 -- net/mptcp/Makefile | 2 - net/mptcp/bpf.c | 72 ---------------------------------- scripts/bpf_doc.py | 2 - tools/include/uapi/linux/bpf.h | 13 ------ 8 files changed, 160 deletions(-) delete mode 100644 net/mptcp/bpf.c diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 5a17c1e3a6bc..f19abc59b6cd 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -407,7 +407,6 @@ enum bpf_return_type { RET_PTR_TO_MAP_VALUE, /* returns a pointer to map elem value */ RET_PTR_TO_SOCKET, /* returns a pointer to a socket */ RET_PTR_TO_TCP_SOCK, /* returns a pointer to a tcp_sock */ - RET_PTR_TO_MPTCP_SOCK, /* returns a pointer to mptcp_sock */ RET_PTR_TO_SOCK_COMMON, /* returns a pointer to a sock_common */ RET_PTR_TO_ALLOC_MEM, /* returns a pointer to dynamically allocated memo= ry */ RET_PTR_TO_MEM_OR_BTF_ID, /* returns a pointer to a valid memory or a btf= _id */ @@ -418,7 +417,6 @@ enum bpf_return_type { RET_PTR_TO_MAP_VALUE_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_MAP_VALUE, RET_PTR_TO_SOCKET_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_SOCKET, RET_PTR_TO_TCP_SOCK_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_TCP_SOCK, - RET_PTR_TO_MPTCP_SOCK_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_MPTCP_SOCK, RET_PTR_TO_SOCK_COMMON_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_SOCK_COMMO= N, RET_PTR_TO_ALLOC_MEM_OR_NULL =3D PTR_MAYBE_NULL | MEM_ALLOC | RET_PTR_TO_= ALLOC_MEM, RET_PTR_TO_BTF_ID_OR_NULL =3D PTR_MAYBE_NULL | RET_PTR_TO_BTF_ID, @@ -499,7 +497,6 @@ enum bpf_reg_type { PTR_TO_SOCKET, /* reg points to struct bpf_sock */ PTR_TO_SOCK_COMMON, /* reg points to sock_common */ PTR_TO_TCP_SOCK, /* reg points to struct tcp_sock */ - PTR_TO_MPTCP_SOCK, /* reg points to struct mptcp_sock */ PTR_TO_TP_BUFFER, /* reg points to a writable raw tp's buffer */ PTR_TO_XDP_SOCK, /* reg points to struct xdp_sock */ /* PTR_TO_BTF_ID points to a kernel struct that does not need @@ -528,7 +525,6 @@ enum bpf_reg_type { PTR_TO_SOCKET_OR_NULL =3D PTR_MAYBE_NULL | PTR_TO_SOCKET, PTR_TO_SOCK_COMMON_OR_NULL =3D PTR_MAYBE_NULL | PTR_TO_SOCK_COMMON, PTR_TO_TCP_SOCK_OR_NULL =3D PTR_MAYBE_NULL | PTR_TO_TCP_SOCK, - PTR_TO_MPTCP_SOCK_OR_NULL =3D PTR_MAYBE_NULL | PTR_TO_MPTCP_SOCK, PTR_TO_BTF_ID_OR_NULL =3D PTR_MAYBE_NULL | PTR_TO_BTF_ID, =20 /* This must be the last entry. Its purpose is to ensure the enum is @@ -2221,7 +2217,6 @@ extern const struct bpf_func_proto bpf_get_local_stor= age_proto; extern const struct bpf_func_proto bpf_strtol_proto; extern const struct bpf_func_proto bpf_strtoul_proto; extern const struct bpf_func_proto bpf_tcp_sock_proto; -extern const struct bpf_func_proto bpf_mptcp_sock_proto; extern const struct bpf_func_proto bpf_jiffies64_proto; extern const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto; extern const struct bpf_func_proto bpf_event_output_data_proto; @@ -2309,7 +2304,6 @@ struct sk_reuseport_kern { u32 reuseport_id; bool bind_inany; }; - bool bpf_tcp_sock_is_valid_access(int off, int size, enum bpf_access_type = type, struct bpf_insn_access_aux *info); =20 @@ -2360,34 +2354,6 @@ static inline u32 bpf_xdp_sock_convert_ctx_access(en= um bpf_access_type type, } #endif /* CONFIG_INET */ =20 -#ifdef CONFIG_MPTCP -bool bpf_mptcp_sock_is_valid_access(int off, int size, - enum bpf_access_type type, - struct bpf_insn_access_aux *info); - -u32 bpf_mptcp_sock_convert_ctx_access(enum bpf_access_type type, - const struct bpf_insn *si, - struct bpf_insn *insn_buf, - struct bpf_prog *prog, - u32 *target_size); -#else /* CONFIG_MPTCP */ -static inline bool bpf_mptcp_sock_is_valid_access(int off, int size, - enum bpf_access_type type, - struct bpf_insn_access_aux *info) -{ - return false; -} - -static inline u32 bpf_mptcp_sock_convert_ctx_access(enum bpf_access_type t= ype, - const struct bpf_insn *si, - struct bpf_insn *insn_buf, - struct bpf_prog *prog, - u32 *target_size) -{ - return 0; -} -#endif /* CONFIG_MPTCP */ - enum bpf_text_poke_type { BPF_MOD_CALL, BPF_MOD_JUMP, diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index f2e5c7bd4f10..3f6dcdf4b915 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5086,14 +5086,6 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. - * - * struct bpf_mptcp_sock *bpf_mptcp_sock(struct bpf_sock *sk) - * Description - * This helper gets a **struct bpf_mptcp_sock** pointer from a - * **struct bpf_sock** pointer. - * Return - * A **struct bpf_mptcp_sock** pointer on success, or **NULL** in - * case of failure. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5288,7 +5280,6 @@ union bpf_attr { FN(xdp_load_bytes), \ FN(xdp_store_bytes), \ FN(copy_from_user_task), \ - FN(mptcp_sock), \ /* */ =20 /* integer value in 'imm' field of BPF_CALL instruction selects which help= er @@ -5637,10 +5628,6 @@ struct bpf_tcp_sock { __u32 is_mptcp; /* Is MPTCP subflow? */ }; =20 -struct bpf_mptcp_sock { - __u32 token; /* msk token */ -}; - struct bpf_sock_tuple { union { struct { diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 1bb1b5d0419d..d7473fee247c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -430,7 +430,6 @@ static bool type_is_sk_pointer(enum bpf_reg_type type) return type =3D=3D PTR_TO_SOCKET || type =3D=3D PTR_TO_SOCK_COMMON || type =3D=3D PTR_TO_TCP_SOCK || - type =3D=3D PTR_TO_MPTCP_SOCK || type =3D=3D PTR_TO_XDP_SOCK; } =20 @@ -438,7 +437,6 @@ static bool reg_type_not_null(enum bpf_reg_type type) { return type =3D=3D PTR_TO_SOCKET || type =3D=3D PTR_TO_TCP_SOCK || - type =3D=3D PTR_TO_MPTCP_SOCK || type =3D=3D PTR_TO_MAP_VALUE || type =3D=3D PTR_TO_MAP_KEY || type =3D=3D PTR_TO_SOCK_COMMON; @@ -454,7 +452,6 @@ static bool reg_type_may_be_refcounted_or_null(enum bpf= _reg_type type) { return base_type(type) =3D=3D PTR_TO_SOCKET || base_type(type) =3D=3D PTR_TO_TCP_SOCK || - base_type(type) =3D=3D PTR_TO_MPTCP_SOCK || base_type(type) =3D=3D PTR_TO_MEM || base_type(type) =3D=3D PTR_TO_BTF_ID; } @@ -554,7 +551,6 @@ static const char *reg_type_str(struct bpf_verifier_env= *env, [PTR_TO_SOCKET] =3D "sock", [PTR_TO_SOCK_COMMON] =3D "sock_common", [PTR_TO_TCP_SOCK] =3D "tcp_sock", - [PTR_TO_MPTCP_SOCK] =3D "mptcp_sock", [PTR_TO_TP_BUFFER] =3D "tp_buffer", [PTR_TO_XDP_SOCK] =3D "xdp_sock", [PTR_TO_BTF_ID] =3D "ptr_", @@ -2778,7 +2774,6 @@ static bool is_spillable_regtype(enum bpf_reg_type ty= pe) case PTR_TO_SOCKET: case PTR_TO_SOCK_COMMON: case PTR_TO_TCP_SOCK: - case PTR_TO_MPTCP_SOCK: case PTR_TO_XDP_SOCK: case PTR_TO_BTF_ID: case PTR_TO_BUF: @@ -3671,9 +3666,6 @@ static int check_sock_access(struct bpf_verifier_env = *env, int insn_idx, case PTR_TO_TCP_SOCK: valid =3D bpf_tcp_sock_is_valid_access(off, size, t, &info); break; - case PTR_TO_MPTCP_SOCK: - valid =3D bpf_mptcp_sock_is_valid_access(off, size, t, &info); - break; case PTR_TO_XDP_SOCK: valid =3D bpf_xdp_sock_is_valid_access(off, size, t, &info); break; @@ -3830,9 +3822,6 @@ static int check_ptr_alignment(struct bpf_verifier_en= v *env, case PTR_TO_TCP_SOCK: pointer_desc =3D "tcp_sock "; break; - case PTR_TO_MPTCP_SOCK: - pointer_desc =3D "mptcp_sock "; - break; case PTR_TO_XDP_SOCK: pointer_desc =3D "xdp_sock "; break; @@ -6762,9 +6751,6 @@ static int check_helper_call(struct bpf_verifier_env = *env, struct bpf_insn *insn } else if (base_type(ret_type) =3D=3D RET_PTR_TO_TCP_SOCK) { mark_reg_known_zero(env, regs, BPF_REG_0); regs[BPF_REG_0].type =3D PTR_TO_TCP_SOCK | ret_flag; - } else if (base_type(ret_type) =3D=3D RET_PTR_TO_MPTCP_SOCK) { - mark_reg_known_zero(env, regs, BPF_REG_0); - regs[BPF_REG_0].type =3D PTR_TO_MPTCP_SOCK | ret_flag; } else if (base_type(ret_type) =3D=3D RET_PTR_TO_ALLOC_MEM) { mark_reg_known_zero(env, regs, BPF_REG_0); regs[BPF_REG_0].type =3D PTR_TO_MEM | ret_flag; @@ -7479,7 +7465,6 @@ static int adjust_ptr_min_max_vals(struct bpf_verifie= r_env *env, case PTR_TO_SOCKET: case PTR_TO_SOCK_COMMON: case PTR_TO_TCP_SOCK: - case PTR_TO_MPTCP_SOCK: case PTR_TO_XDP_SOCK: verbose(env, "R%d pointer arithmetic on %s prohibited\n", dst, reg_type_str(env, ptr_reg->type)); @@ -10854,7 +10839,6 @@ static bool regsafe(struct bpf_verifier_env *env, s= truct bpf_reg_state *rold, case PTR_TO_SOCKET: case PTR_TO_SOCK_COMMON: case PTR_TO_TCP_SOCK: - case PTR_TO_MPTCP_SOCK: case PTR_TO_XDP_SOCK: /* Only valid matches are exact, which memcmp() above * would have accepted @@ -11385,7 +11369,6 @@ static bool reg_type_mismatch_ok(enum bpf_reg_type = type) case PTR_TO_SOCKET: case PTR_TO_SOCK_COMMON: case PTR_TO_TCP_SOCK: - case PTR_TO_MPTCP_SOCK: case PTR_TO_XDP_SOCK: case PTR_TO_BTF_ID: return false; @@ -12810,9 +12793,6 @@ static int convert_ctx_accesses(struct bpf_verifier= _env *env) case PTR_TO_TCP_SOCK: convert_ctx_access =3D bpf_tcp_sock_convert_ctx_access; break; - case PTR_TO_MPTCP_SOCK: - convert_ctx_access =3D bpf_mptcp_sock_convert_ctx_access; - break; case PTR_TO_XDP_SOCK: convert_ctx_access =3D bpf_xdp_sock_convert_ctx_access; break; diff --git a/net/core/filter.c b/net/core/filter.c index a07b28997ad3..f64454722a7e 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7850,10 +7850,6 @@ sock_ops_func_proto(enum bpf_func_id func_id, const = struct bpf_prog *prog) case BPF_FUNC_tcp_sock: return &bpf_tcp_sock_proto; #endif /* CONFIG_INET */ -#ifdef CONFIG_MPTCP - case BPF_FUNC_mptcp_sock: - return &bpf_mptcp_sock_proto; -#endif /* CONFIG_MPTCP */ default: return bpf_sk_base_func_proto(func_id); } diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 0a0608b6b4b4..48a9d978aaeb 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -11,5 +11,3 @@ obj-$(CONFIG_INET_MPTCP_DIAG) +=3D mptcp_diag.o mptcp_crypto_test-objs :=3D crypto_test.o mptcp_token_test-objs :=3D token_test.o obj-$(CONFIG_MPTCP_KUNIT_TEST) +=3D mptcp_crypto_test.o mptcp_token_test.o - -obj-$(CONFIG_BPF) +=3D bpf.o diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c deleted file mode 100644 index 5332469fbb28..000000000000 --- a/net/mptcp/bpf.c +++ /dev/null @@ -1,72 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Multipath TCP - * - * Copyright (c) 2020, Tessares SA. - * - * Author: Nicolas Rybowski - * - */ - -#include - -#include "protocol.h" - -bool bpf_mptcp_sock_is_valid_access(int off, int size, enum bpf_access_typ= e type, - struct bpf_insn_access_aux *info) -{ - if (off < 0 || off >=3D offsetofend(struct bpf_mptcp_sock, token)) - return false; - - if (off % size !=3D 0) - return false; - - switch (off) { - default: - return size =3D=3D sizeof(__u32); - } -} - -u32 bpf_mptcp_sock_convert_ctx_access(enum bpf_access_type type, - const struct bpf_insn *si, - struct bpf_insn *insn_buf, - struct bpf_prog *prog, u32 *target_size) -{ - struct bpf_insn *insn =3D insn_buf; - -#define BPF_MPTCP_SOCK_GET_COMMON(FIELD) \ - do { \ - BUILD_BUG_ON(sizeof_field(struct mptcp_sock, FIELD) > \ - sizeof_field(struct bpf_mptcp_sock, FIELD)); \ - *insn++ =3D BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct mptcp_sock, FIELD), \ - si->dst_reg, si->src_reg, \ - offsetof(struct mptcp_sock, FIELD)); \ - } while (0) - - if (insn > insn_buf) - return insn - insn_buf; - - switch (si->off) { - case offsetof(struct bpf_mptcp_sock, token): - BPF_MPTCP_SOCK_GET_COMMON(token); - break; - } - - return insn - insn_buf; -} - -BPF_CALL_1(bpf_mptcp_sock, struct sock *, sk) -{ - if (sk_fullsock(sk) && sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_mptcp(= sk)) { - struct mptcp_subflow_context *mptcp_sfc =3D mptcp_subflow_ctx(sk); - - return (unsigned long)mptcp_sfc->conn; - } - return (unsigned long)NULL; -} - -const struct bpf_func_proto bpf_mptcp_sock_proto =3D { - .func =3D bpf_mptcp_sock, - .gpl_only =3D false, - .ret_type =3D RET_PTR_TO_MPTCP_SOCK_OR_NULL, - .arg1_type =3D ARG_PTR_TO_SOCK_COMMON, -}; diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py index 6ef5c44a2a9e..096625242475 100755 --- a/scripts/bpf_doc.py +++ b/scripts/bpf_doc.py @@ -623,7 +623,6 @@ class PrinterHelpers(Printer): 'struct udp6_sock', 'struct unix_sock', 'struct task_struct', - 'struct bpf_mptcp_sock', =20 'struct __sk_buff', 'struct sk_msg_md', @@ -683,7 +682,6 @@ class PrinterHelpers(Printer): 'struct socket', 'struct file', 'struct bpf_timer', - 'struct bpf_mptcp_sock', } mapped_types =3D { 'u8': '__u8', diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f2e5c7bd4f10..3f6dcdf4b915 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5086,14 +5086,6 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. - * - * struct bpf_mptcp_sock *bpf_mptcp_sock(struct bpf_sock *sk) - * Description - * This helper gets a **struct bpf_mptcp_sock** pointer from a - * **struct bpf_sock** pointer. - * Return - * A **struct bpf_mptcp_sock** pointer on success, or **NULL** in - * case of failure. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5288,7 +5280,6 @@ union bpf_attr { FN(xdp_load_bytes), \ FN(xdp_store_bytes), \ FN(copy_from_user_task), \ - FN(mptcp_sock), \ /* */ =20 /* integer value in 'imm' field of BPF_CALL instruction selects which help= er @@ -5637,10 +5628,6 @@ struct bpf_tcp_sock { __u32 is_mptcp; /* Is MPTCP subflow? */ }; =20 -struct bpf_mptcp_sock { - __u32 token; /* msk token */ -}; - struct bpf_sock_tuple { union { struct { --=20 2.34.1 From nobody Sun Apr 28 18:39:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:2547:0:0:0:0 with SMTP id l7csp28390edb; Tue, 8 Mar 2022 19:36:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4Eh6lqNetCHV+BIB6tJ2EHCwApqn8EQFE4vuO3Ki+duLcqwQwsA695Pzbui8ejdJ1gxOP X-Received: by 2002:a81:b288:0:b0:2d6:39d5:31a1 with SMTP id q130-20020a81b288000000b002d639d531a1mr15334309ywh.506.1646796999748; Tue, 08 Mar 2022 19:36:39 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id a2-20020a25bac2000000b0062422ba19b1si440463ybk.96.2022.03.08.19.36.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2022 19:36:39 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4172-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=lBGDupq0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4172-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4172-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 3E83D1C0337 for ; Wed, 9 Mar 2022 03:36:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E2B536476; Wed, 9 Mar 2022 03:36:37 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0379E15A3 for ; Wed, 9 Mar 2022 03:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646796994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O/nlC4E3fz5ELjikySL5hoGVkfPO3SmwC/tXxDav+nE=; b=lBGDupq0SAYAzKIxgL2sBtklLDHjdYA4Cg/leeB+3ZHyhf6aP7cHzvY816tW3xetsQ52CP 13T0sg3fv1CFVob3FaY+RyGKtv1RR+tZnN7XGF3lqV/R3xM5o5VBSwF4KR8d0OpAFK78Sr WvvUfXyooKTQdcWt2yplcGKrVGKjcq0= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2058.outbound.protection.outlook.com [104.47.2.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-Xzo2vKvqNfC_h10We6jS8w-2; Wed, 09 Mar 2022 04:36:33 +0100 X-MC-Unique: Xzo2vKvqNfC_h10We6jS8w-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MWyj4JFaQoTNjr/B1zhX36oIhFEmj4SfgmA+A4lX/ScwMR0VVM6zI1hZSKKbgDZwgfF8rKOHSe7lTkIWQ0KcZ24wuWJqBw9KKIz/uBN/fCtJDBxnDtDlZy9jGGmHBccqQWSAHhSdka6jPYTSiBqlHbYKuaFii5qNaRf2iK/j8k2n55RgDSefjrDyiiDZNAwOAnURu4tEZkI/3/M8svqjfVHtp94RHiduAvfws5ETP2yp9dZmOg5O1S4mZWoe0n8ffPkndqVrzLOGJ9X4KV+IsZ58IVvF4aKNG7dWRg/X88VvuOcc1k9aKXf5zJHT1egIL+bFhE00eR0uQTUgedMbFQ== 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=otnwuaxxsFR4Pb1eCGuCdZoItAe+njPTU6au58ElNzI=; b=A9LpeS/uGVZdmvSPxCi+yoo9IuCb5w80jA6VkcYW9BZFxoJo/sMRB0j20Z/Rxi+r+MuYhaE51RoVw4Sm1EXzOYAqFYjY+rQB/D3eunM+jrsJHjuLia+Gu/RNVtRIqSqLLihW1PP2qHvR8i0axkXc0h5bScwGDsQWWiFxcg/jKrVZQtaZiNh9kdDxOg5iHH2O2cl9/zg36JTakBzkG9dRVk485G6fjn5uzuKSNYw8/jcN0NVeUSuUKaV4hXr3mhQyibEtyiaPkA7IViJPcHsYYfVzCHsNRqE2A/mi1Q/XoQtbiojhVNUf1K/jWcHhV9zZZU/aE37jx/+dshi/p7Mc4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB6333.eurprd04.prod.outlook.com (2603:10a6:803:fe::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 03:36:31 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 03:36:31 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Nicolas Rybowski , Matthieu Baerts Subject: [PATCH mptcp-next v10 3/5] bpf: add bpf_skc_to_mptcp_sock_proto Date: Wed, 9 Mar 2022 11:35:59 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0115.apcprd03.prod.outlook.com (2603:1096:203:b0::31) 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: 319ae841-e612-4136-f2f5-08da017e008b X-MS-TrafficTypeDiagnostic: VI1PR04MB6333: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: GYDpwZspY2ElUQRxTgSKptJH+1npnWk2pvP9kT96RRLrNNt1qQjowmVAh96jLQWkG8FrIjL5dNNc8wZMWePFxIvLcQTbyfntKKtFSVQcQrvkeisvF398Y8VvUV7CJK6i7S6+XqWnIbMKrMlIHbm3PaCizJR3H5m3JNW6NMttxz161/85VoGtPy4mdxSGsvtMQGxIkeAUFJQA7giH76U3DPhA3/0h/vy1qd+UuZe9oeS3SQ86eJMLt2Lzo2am1Vs8FXTDYsssmuwoLtTanmdlEGI+Fl8ToLWAzGutJ3VNcEZ2TzHTkZz2vGmsdLca8PRqYEyeQS5UNd8BpRO0mqIurz75i4wLONx8ePx10+QCPyN2URcoSkDinr1tG6LQPOmxp5JhNEBy7bP2UCQ4MBxsfDRVI+52oz25RKJHEQvDxrq+MHTfz2LHC4swKjl8HKvBOE4j2FUxay8QrEFAMHQG9bHbtx3NRBzWZ7OzymY45ZyfbIqbP+7gSW0Ru4MPfBiqyYkgMe9m3URn5AODnZBrEYhKxDX9HAiQnUo44EJWVK6GnNeXkJOUn/5sDhrU2siEm+pN7+PiSTS7oTkrC3Frvfhj2P5HVNJ7dPfKKVgidrMVZfkXMKDovQvjFBmc6u+0ZgNW7R9FaX9bXYt1qJD5TwEjlpmRFnBbWffr/F0unep8quD1PvQucTB96HzR94xp2N/QtJQfVR2GYoy9QefKBg== 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)(186003)(26005)(508600001)(2616005)(316002)(83380400001)(54906003)(6916009)(66556008)(6512007)(86362001)(44832011)(66946007)(66476007)(6506007)(8676002)(4326008)(36756003)(2906002)(5660300002)(6666004)(38100700002)(6486002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PBuAipFVuCgOjPR0b/isIEps+R6GWVHQUWJOoOWYDwDjJ0qee8rtzZOf8bw8?= =?us-ascii?Q?hqGQ4XeKsavMbHtM4pWWe9uN21Tuda91uZE7kEk/Fi/Wr7gZ+7RKJwQrBENZ?= =?us-ascii?Q?6Qj6ytJ+FHed7eRtak66OScbmFbrM5pUUY+1u2+hwbEX1oh/0xQyPU2OcQ0w?= =?us-ascii?Q?zja3PbJGjGT/YA6xH2ykimeiGKhXzIlPM1U3GinJTrNw5pG/WKxpZabZzqxm?= =?us-ascii?Q?3YwzkGRTPtETtbzwOqjqkfczvr93qmLYVecUkAHHd8bZunJm0LNBArhWpr3k?= =?us-ascii?Q?tB1zeSWqfSxK0BHf8THn+micXj3Dpz5ab/fWCBT8Y3+hU/bw717Qt3Sx3T0e?= =?us-ascii?Q?BE5Ed5v4h45N1s4aWMT08LgIvyoIXinXQmuqRjjt29bFMZ0c4xzexBWEhmRx?= =?us-ascii?Q?7UEV8DYjbvFqWUYnw2ip1Lc/sXVSYDpQbjPOCkNNCh1F/yOKRK/oDKLPOtL4?= =?us-ascii?Q?MB79YgH5bDHvHgJOsLsBa7HlphZmEunmuKAGanKfPJQIHaXxG0uueiOB3RSu?= =?us-ascii?Q?Eo/k8xm6TpXGNjfEM7wIfTSoKkQXipTMzRamaXiyDgHuMKzx9x82jpSEMLBK?= =?us-ascii?Q?xx7pYxIUsGrsXLPNqzD27mkAjHP4LFzKWtdp+UsMi7V3EiwMCseNUHSYUU12?= =?us-ascii?Q?t/R3k4K4oV7/ryDW+rShhCeJNno8KqqCJc9/fPkKaBLZqliT+ToFd0PdEhWQ?= =?us-ascii?Q?JcqccChV0FSKSCEGsv0EV2CWaDev1zXUJOqvIImCzgVCn52AjifC2hHeCnW2?= =?us-ascii?Q?U+KD8MkJUJEWAc2jpqfL0wGZqxcjfwJvYQhuUGsu1Bg668LhWB+faxHIaQAq?= =?us-ascii?Q?kaXc6u1lWAJIdNGgL2FzaVtBy0D3Z62S6rvR6QJgKFOS8fyDJkBxzigSIafB?= =?us-ascii?Q?x5ONPAp75FB2hmQbhANysV/36EQD6xUawWHBiSJWoIq+uhR3E2kF25XxQqNM?= =?us-ascii?Q?n2wwgkVnrhoV/PHf5r31YsGnuE2Kc6h4UXTJGZjljqqEom9zM4uXVsgbGsyw?= =?us-ascii?Q?6/XSTHCATGXzLDcR8cQKlNlxU/rC1OEWatn8eA/UWVWxZJsMhULd95iIvHtp?= =?us-ascii?Q?UJz5yf1EvkDxSkIAGELkEUJGJSUAasn/HuX5Z1KuSugYmNMnVCduVUGolIds?= =?us-ascii?Q?gyeiZlZO9+PtfTUcdwbiGLmetmYFzmZ+IPzYJBcb6GLR3RCzEAJwXlbmSUTT?= =?us-ascii?Q?BGssEUosuZVIWJRSG3sLjgISbgMcQtCp78ho+iZPGmTMkUQ2bv34o9rcA5u1?= =?us-ascii?Q?rdHZEopcsTx9osHs0Wm2ta5pXh2vYQvufOKaALFCJJmLxgcDIAn2Zy9mmR0z?= =?us-ascii?Q?Z5eAtmaSl47q4+96lWm439oVNj9zpfp3vFY2Wi7sFxJnHHngMRnb+1P4iNdd?= =?us-ascii?Q?B0M/YC0tMI0tPcia8pVKoH2XRJiE0wzvFSGqxenIcII2mQM2YooMWpFdRbwV?= =?us-ascii?Q?HcC1ED947Gbf90cKM60elGvx1FQ4fOMozSv9mqJ/kguOFCPd8Sog5h6KKP5q?= =?us-ascii?Q?5SL5Pd8TsKS4M8j/cocysTv2aK3ziSpBsRongI9HRmYIO9tVEO80oLd4Sugy?= =?us-ascii?Q?fK5DV3piWJX8HWG/h7Otw5OmV468Czt8ybWYdNxsrsHzGvctdmL/s/O0VGAn?= =?us-ascii?Q?4sqduBcxfEplYYRKQ9tSDjU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 319ae841-e612-4136-f2f5-08da017e008b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 03:36:31.6618 (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: SZMQRXnxe5fleJe3fCpl+RhuJO9E89g8VtH29F4POfs5p9b+ov5ThoTnt1KfPLWI+a9drVwfOvnRU6JefVH7Cg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6333 Content-Type: text/plain; charset="utf-8" This patch implemented a new bpf_func_proto bpf_skc_to_mptcp_sock_proto. Defined a new bpf_id BTF_SOCK_TYPE_MPTCP, implemented the helper bpf_skc_to_mptcp_sock, and added a new helper bpf_mptcp_sock_from_subflow to get struct mptcp_sock from a given subflow socket. Co-developed-by: Nicolas Rybowski Signed-off-by: Nicolas Rybowski Co-developed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts Signed-off-by: Geliang Tang Acked-by: Mat Martineau Acked-by: Matthieu Baerts --- include/linux/bpf.h | 9 +++++++++ include/linux/btf_ids.h | 3 ++- include/uapi/linux/bpf.h | 7 +++++++ net/core/filter.c | 18 ++++++++++++++++++ net/mptcp/Makefile | 2 ++ net/mptcp/bpf.c | 20 ++++++++++++++++++++ scripts/bpf_doc.py | 2 ++ tools/include/uapi/linux/bpf.h | 7 +++++++ 8 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 net/mptcp/bpf.c diff --git a/include/linux/bpf.h b/include/linux/bpf.h index f19abc59b6cd..b28b3d8c3df2 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2354,6 +2354,15 @@ static inline u32 bpf_xdp_sock_convert_ctx_access(en= um bpf_access_type type, } #endif /* CONFIG_INET */ =20 +#ifdef CONFIG_MPTCP +struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk); +#else /* CONFIG_MPTCP */ +static inline struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *= sk) +{ + return NULL; +} +#endif /* CONFIG_MPTCP */ + enum bpf_text_poke_type { BPF_MOD_CALL, BPF_MOD_JUMP, diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h index bc5d9cc34e4c..335a19092368 100644 --- a/include/linux/btf_ids.h +++ b/include/linux/btf_ids.h @@ -178,7 +178,8 @@ extern struct btf_id_set name; BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP6, tcp6_sock) \ BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP, udp_sock) \ BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP6, udp6_sock) \ - BTF_SOCK_TYPE(BTF_SOCK_TYPE_UNIX, unix_sock) + BTF_SOCK_TYPE(BTF_SOCK_TYPE_UNIX, unix_sock) \ + BTF_SOCK_TYPE(BTF_SOCK_TYPE_MPTCP, mptcp_sock) =20 enum { #define BTF_SOCK_TYPE(name, str) name, diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 3f6dcdf4b915..a88aac4457a9 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5086,6 +5086,12 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. + * + * struct mptcp_sock *bpf_skc_to_mptcp_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *mptcp_sock* pointer. + * Return + * *sk* if casting is valid, or **NULL** otherwise. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5280,6 +5286,7 @@ union bpf_attr { FN(xdp_load_bytes), \ FN(xdp_store_bytes), \ FN(copy_from_user_task), \ + FN(skc_to_mptcp_sock), \ /* */ =20 /* integer value in 'imm' field of BPF_CALL instruction selects which help= er diff --git a/net/core/filter.c b/net/core/filter.c index f64454722a7e..b5a01d80f1f6 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -11121,6 +11121,19 @@ const struct bpf_func_proto bpf_skc_to_unix_sock_p= roto =3D { .ret_btf_id =3D &btf_sock_ids[BTF_SOCK_TYPE_UNIX], }; =20 +BPF_CALL_1(bpf_skc_to_mptcp_sock, struct sock *, sk) +{ + return (unsigned long)bpf_mptcp_sock_from_subflow(sk); +} + +static const struct bpf_func_proto bpf_skc_to_mptcp_sock_proto =3D { + .func =3D bpf_skc_to_mptcp_sock, + .gpl_only =3D false, + .ret_type =3D RET_PTR_TO_BTF_ID_OR_NULL, + .arg1_type =3D ARG_PTR_TO_SOCK_COMMON, + .ret_btf_id =3D &btf_sock_ids[BTF_SOCK_TYPE_MPTCP], +}; + BPF_CALL_1(bpf_sock_from_file, struct file *, file) { return (unsigned long)sock_from_file(file); @@ -11163,6 +11176,11 @@ bpf_sk_base_func_proto(enum bpf_func_id func_id) case BPF_FUNC_skc_to_unix_sock: func =3D &bpf_skc_to_unix_sock_proto; break; +#ifdef CONFIG_MPTCP + case BPF_FUNC_skc_to_mptcp_sock: + func =3D &bpf_skc_to_mptcp_sock_proto; + break; +#endif /* CONFIG_MPTCP */ case BPF_FUNC_ktime_get_coarse_ns: return &bpf_ktime_get_coarse_ns_proto; default: diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 48a9d978aaeb..0a0608b6b4b4 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -11,3 +11,5 @@ obj-$(CONFIG_INET_MPTCP_DIAG) +=3D mptcp_diag.o mptcp_crypto_test-objs :=3D crypto_test.o mptcp_token_test-objs :=3D token_test.o obj-$(CONFIG_MPTCP_KUNIT_TEST) +=3D mptcp_crypto_test.o mptcp_token_test.o + +obj-$(CONFIG_BPF) +=3D bpf.o diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c new file mode 100644 index 000000000000..da79dae559b2 --- /dev/null +++ b/net/mptcp/bpf.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Multipath TCP + * + * Copyright (c) 2020, Tessares SA. + * + * Author: Nicolas Rybowski + * + */ + +#include +#include "protocol.h" + +struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) +{ + if (sk && sk_fullsock(sk) && sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_= mptcp(sk)) + return mptcp_sk(mptcp_subflow_ctx(sk)->conn); + + return NULL; +} +EXPORT_SYMBOL(bpf_mptcp_sock_from_subflow); diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py index 096625242475..0e5a9e69ae59 100755 --- a/scripts/bpf_doc.py +++ b/scripts/bpf_doc.py @@ -623,6 +623,7 @@ class PrinterHelpers(Printer): 'struct udp6_sock', 'struct unix_sock', 'struct task_struct', + 'struct mptcp_sock', =20 'struct __sk_buff', 'struct sk_msg_md', @@ -682,6 +683,7 @@ class PrinterHelpers(Printer): 'struct socket', 'struct file', 'struct bpf_timer', + 'struct mptcp_sock', } mapped_types =3D { 'u8': '__u8', diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 3f6dcdf4b915..a88aac4457a9 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5086,6 +5086,12 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. On error * *dst* buffer is zeroed out. + * + * struct mptcp_sock *bpf_skc_to_mptcp_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *mptcp_sock* pointer. + * Return + * *sk* if casting is valid, or **NULL** otherwise. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5280,6 +5286,7 @@ union bpf_attr { FN(xdp_load_bytes), \ FN(xdp_store_bytes), \ FN(copy_from_user_task), \ + FN(skc_to_mptcp_sock), \ /* */ =20 /* integer value in 'imm' field of BPF_CALL instruction selects which help= er --=20 2.34.1 From nobody Sun Apr 28 18:39:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:2547:0:0:0:0 with SMTP id l7csp28429edb; Tue, 8 Mar 2022 19:36:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJweaFppL3EE8Ojgbfu963kIlFN4jGhjNICg+CY/VpInsPKuqC+Gm676FQ0gpx3VMGX8xMIW X-Received: by 2002:a0d:dcc3:0:b0:2d1:44a4:14be with SMTP id f186-20020a0ddcc3000000b002d144a414bemr15584828ywe.76.1646797007013; Tue, 08 Mar 2022 19:36:47 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id r6-20020a0de806000000b002dc39774779si462541ywe.85.2022.03.08.19.36.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2022 19:36:47 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4173-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="m/VI2z/r"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4173-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4173-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 93FD71C0A40 for ; Wed, 9 Mar 2022 03:36:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3533B6476; Wed, 9 Mar 2022 03:36:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9042B15A3 for ; Wed, 9 Mar 2022 03:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646797001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hX1ldgh7TUcFLin3Qq5uxCXenLmhGeSGDZ7u0Hv4PV0=; b=m/VI2z/rLR3rmlhUi3whInTP2DaM+JA0evTW6wITBdCUGXJMspI3v9H6LhB0dnpqCJnfB+ CnH1Nlhnp4SvYlgyUxPsWDv+0Doo20bgwWTQ9TO8LAtsgbwfECRQ7DlMdaHuHza9Sv8dRE dtZNrcsxSA3HvSAye9B0jcAc8uEsR/Q= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2057.outbound.protection.outlook.com [104.47.2.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-oQ9ZRF4MOLW88tRGQuR1Vw-1; Wed, 09 Mar 2022 04:36:41 +0100 X-MC-Unique: oQ9ZRF4MOLW88tRGQuR1Vw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NoKkaAWT3o/DOAFHwD0tLwdWXuhN0c+lyCJwMlerjiF+v5TKsP9gXXT+AldoZTLzOcdsuCJMwaDFHBHRXIMHgzmb3KiIXIoc1ieis9uasrhSMF9Tr6RcOdbfO3M1TEnHZ3q8SE4/C7A42yj9oO9TBaoTUH2hVKxK4S2pKXJaKV3/TUGoKfbesTjjFbh5UaUXkW3+rup/o1v8kIn0cP6U+Rxw9d7RtaEZSvx3nUlllKpOv3pTDGUMBY4Vz8dH7OTW3vR6ljYNGQleRWluRx1w7LLTej3OaxCTggeQcO9otnwe8gOrFp+kc8bi+Jmx6wHH1Fi3y1/BVjJSyR0Oivc6XA== 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=uS5gJ/tB+u4bAfvnizvH8LH4nt5vTHNhMQ8BApAYnvY=; b=lfE89Ji/p+XXmRnLUQWj9wmPHfsufEl89C529NhHh2pymdr14B6y/GQwEhRfJyanBPeRrnBfzFsVgHxfGgokaudBNp5ZpMVnpbpD8atCWLEoNiK8cID/6YTHmtQ37vFIOM8GUf1xudu6NmLdykoV/Ji6PTJy6nraoUVOR+dVyXYcDcViFy3Xntwfuy4FMZYR7s8dMNsUWL9rb2+K91WGYf+jHfrrlrYMhXtQzo0xXWBWMaiG1Y8X8rK/Xb0HG8/MWdGeq/x5jjMV9hgzXaaNZP28u/zOgYEgeMenEOh0Fgq/TEEv3YZCI7sYxwQb5Uk7bHscPI8SLBt6f5+q1wbVKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB6333.eurprd04.prod.outlook.com (2603:10a6:803:fe::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 03:36:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 03:36:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v10 4/5] Squash to "selftests: bpf: add MPTCP test base" Date: Wed, 9 Mar 2022 11:36:00 +0800 Message-ID: <5c8dcc45ff846aac179897bb0c02a5bd4e59a31d.1646796538.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0302CA0005.apcprd03.prod.outlook.com (2603:1096:202::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e6595e1-56b9-43a2-ddaf-08da017e053f X-MS-TrafficTypeDiagnostic: VI1PR04MB6333: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: B650iR3BIaNm9B2xf77Ajc8WI/3U7Cw7aJaCmpnb/G17SLVSsjALMDqgpJ+0NIWoxk/JZ4HFqEwTsoBJKLmKD3Qe5NKaoLDnkhI9ofIfdHtE//TKqsHnOtK3U+PzHnNw7DGDmsHtMvz5C0PcolVKtGJrJw0stt5/fldcbAg5ZD/svQYJ+Ho8lztXOoqmrckRyU/td5rS60vmNcBFFrhrQBi2syk34nXjjiV9VIsn7LKhmNYUNb9d5YgNuhBkpBa1Ah0R0X6lPqXEA+yFXawy2I0uS2ZpvJInwr8cJGDZzU8bL/Irqwq4BV2XaO6FqfheDMzoM2mH66m54IZJaArM+gFmtFkeGZLYI/lCtZeBepKoz+LFMWaEICKWCr1LP/IZHvmI+bmvVOsAXYk9UyMe3U86ENMooGiYs6Q832biSL3sZQtGawYrkTHSXfKFGzfA8aJ4A7Av7PiYeOVrVm3kg4NhpgyttVSahMdBVlUS+yirmd5EP+S2lsPcE2H1UTjKcwEKrJt/cfxLYazT5qfEqjxHx+93n+2ANvl+FjzrUH9w92w1cc4mXyBbEPMcKPoyqZZplBFBML2U8Rn/qjNpTgklFUdnYTwPGUyo+hI5XaK0Ys4S/QCfftf5IuGn5dA/4LG8U0yE/MJwt44GK4PYfDDOaZxvD4IVlguK/KRINlr6IBDd3sv+ahyq4dLCH4Yge/vNWU6BvJlhOaWEg0wy+A== 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)(186003)(26005)(508600001)(2616005)(316002)(83380400001)(54906003)(6916009)(66556008)(6512007)(86362001)(44832011)(66946007)(66476007)(6506007)(8676002)(4326008)(36756003)(2906002)(5660300002)(6666004)(38100700002)(6486002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UPJBJtJWJ+qbGKkS9E3vuFkreJBmOibVdb6Kd4EkiVv7GG4ODGN4pTcckSHz?= =?us-ascii?Q?KmxhHHuHxqn2AXlCL7C+4f9hUohEdUlpUdlfrMZIbUMZuFkGy50bvAYS8F0R?= =?us-ascii?Q?ktopVecftoMVgSTq3F29zWtWbeVm4qoHeiJc8jK8npfsF73Z6KP7cYwVL3MW?= =?us-ascii?Q?roc79w1Yyck8ucR3OD1aALqtp+79W0qdPXxJaESJiJSfBIoxZ/G/snVrFyRi?= =?us-ascii?Q?KPACDEEgYCdEe66Elsxgo23DlxbMiUCVfrldRKZFGRIAJbW6NN/V3JadlD4R?= =?us-ascii?Q?39XJqtd6Q8VUAy9CVNBBkXfgSaJxnrziLNBuHjyCx4821qf9Sh0Cv8kVA3gq?= =?us-ascii?Q?W4tamh9nJf8V4uxzDUVKR+xLFNxtW5VTUhMeTttMUU2RXCQN/mzd8muZ28eQ?= =?us-ascii?Q?BewilSBDqSMbEAPd8MfKjqf5UVmn6f47NTjA5Y1SbTpS1fRAfhzUawO/+Rls?= =?us-ascii?Q?QP4IJFAJwLl6tY7c9HiFqGCwvA7oh/9BdfJxkxToMRdFcdheGFYw0zYY5caP?= =?us-ascii?Q?Zf47yE2n+jPMyAnyE5j4SrSRgepdBjRvXPADcOVoC9/hwBwqBWTrvBXMIcmo?= =?us-ascii?Q?Cr4m7nXyv0rI+xMljrgw+Sq/XV1fOYHHbgwkHgDD2VtgyIWsGldn+pRot5EL?= =?us-ascii?Q?mkj/miwttHWuT76GCSF4G6ywtM0ORAU5mT6Tzst01KQtmz1z6ke1osEVsuuJ?= =?us-ascii?Q?qfaLZX/Ffel9ML0F5CL4AlPwAG8qWDiHZxiV+EaN1k0A7VSAq6cWFulg1x+4?= =?us-ascii?Q?xMUbRgvZ9cO0MJ7op19/iXtBMOgdlQmPss/4crak/q67rDrKHnbEDyOZ6xge?= =?us-ascii?Q?teKPicpFbo0RwrxjnlkxGOuIHZ/spwloChA3n+R1pU8Hga3Uco6WGN/pLMCR?= =?us-ascii?Q?0my/PEGwjOzAkMxWrmMnllvapH/lKNoS8RmsMPOiecMdkHx6h0QRXcQEyBPe?= =?us-ascii?Q?1//0tizqrkFVpU0NLZDVIpIfpnhqpPASTn2ZLJOupzHxYpALFNG8l7n4U45b?= =?us-ascii?Q?EoOl4HDgrq+GIq+LbURH1723/nLNc+Ak45Vku3JT0UZcpx2iOa148YS6xCF9?= =?us-ascii?Q?6hHhiLiSOlI3bNv35wygaDwXKvxcn5/OJoxHgT7WMx7S7DrNm8lPV6zaaRzm?= =?us-ascii?Q?yJVYPXUZlxWSXltExn68MgFzx1sGmH287VbwoFYHrtheFRvZ88uhTmC4Irzx?= =?us-ascii?Q?+ZXr833y7vO9TTzJIgtLjIFvSZXqEZISg1AKxW1YLVqCAEgb/tU20dKEc8W4?= =?us-ascii?Q?sNc7MhFuRSLsQ5U0aWscROaGMt1+L+ExuyID+R885Pjk1eoPXiail9IyGIYH?= =?us-ascii?Q?U4rmFZQms4bmgfTJA68ITqxsWTi1VjONcfWhOavd58fbymBqw4/POh6PgAGy?= =?us-ascii?Q?0FzCOr5P9fQO3ARUsod6fRwHFtdNA1AICs7X6l4urx5s6OlcVaWkg4MKvIH2?= =?us-ascii?Q?ik9t3y05wpbsjSNI7ccvh0av7Ufz4nSl9cq7Cl4j0hRsBSCz4JC/U8mPD/RY?= =?us-ascii?Q?OkYUSa5+QFAa5PC88kn4bco/BeN4L4xtqiZagebg81J4502qg8U2nSZ157V1?= =?us-ascii?Q?oLT01RkQQEcbNuIQYaUU8k01i61qCBDOmaA8V5iroje8tulSXjU6LMyxuwUL?= =?us-ascii?Q?mNvz9oloCLmWYplrot6rNKI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e6595e1-56b9-43a2-ddaf-08da017e053f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 03:36:39.4893 (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: ROsObF6J9pxZrNGMaROId9DeMuzDCS172UQn22w10ZLcU6r2td+icr2HvUnEly0LgFXDzJSRsnldggVoC3qA1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6333 Content-Type: text/plain; charset="utf-8" Some cleanups. Acked-by: Matthieu Baerts Signed-off-by: Geliang Tang Acked-by: Mat Martineau --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 16 +++++----------- tools/testing/selftests/bpf/progs/mptcp.c | 14 +++++++------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 04aef0f147dc..87ee7bd8a689 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -13,12 +13,6 @@ static int verify_sk(int map_fd, int client_fd, const ch= ar *msg, __u32 is_mptcp) int err =3D 0, cfd =3D client_fd; struct mptcp_storage val; =20 - /* Currently there is no easy way to get back the subflow sk from the MPT= CP - * sk, thus we cannot access here the sk_storage associated to the subflow - * sk. Also, there is no sk_storage associated with the MPTCP sk since it - * does not trigger sockops events. - * We silently pass this situation at the moment. - */ if (is_mptcp =3D=3D 1) return 0; =20 @@ -28,14 +22,14 @@ static int verify_sk(int map_fd, int client_fd, const c= har *msg, __u32 is_mptcp) } =20 if (val.invoked !=3D 1) { - log_err("%s: unexpected invoked count %d !=3D %d", - msg, val.invoked, 1); + log_err("%s: unexpected invoked count %d !=3D 1", + msg, val.invoked); err++; } =20 - if (val.is_mptcp !=3D is_mptcp) { - log_err("%s: unexpected bpf_tcp_sock.is_mptcp %d !=3D %d", - msg, val.is_mptcp, is_mptcp); + if (val.is_mptcp !=3D 0) { + log_err("%s: unexpected bpf_tcp_sock.is_mptcp %d !=3D 0", + msg, val.is_mptcp); err++; } =20 diff --git a/tools/testing/selftests/bpf/progs/mptcp.c b/tools/testing/self= tests/bpf/progs/mptcp.c index be5ee8dac2b3..a14ed1b66da8 100644 --- a/tools/testing/selftests/bpf/progs/mptcp.c +++ b/tools/testing/selftests/bpf/progs/mptcp.c @@ -25,22 +25,22 @@ int _sockops(struct bpf_sock_ops *ctx) int op =3D (int)ctx->op; struct bpf_sock *sk; =20 + if (op !=3D BPF_SOCK_OPS_TCP_CONNECT_CB) + return 1; + sk =3D ctx->sk; if (!sk) return 1; =20 + tcp_sk =3D bpf_tcp_sock(sk); + if (!tcp_sk) + return 1; + storage =3D bpf_sk_storage_get(&socket_storage_map, sk, 0, BPF_SK_STORAGE_GET_F_CREATE); if (!storage) return 1; =20 - if (op !=3D BPF_SOCK_OPS_TCP_CONNECT_CB) - return 1; - - tcp_sk =3D bpf_tcp_sock(sk); - if (!tcp_sk) - return 1; - storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; =20 --=20 2.34.1 From nobody Sun Apr 28 18:39:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:2547:0:0:0:0 with SMTP id l7csp28472edb; Tue, 8 Mar 2022 19:36:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxf5svmEnQWxgr9h2fuZMMcKHK+Kk59RCYCwW0/NsJW0ivbolwCvgd357bxY4G+KWHxRu41 X-Received: by 2002:a25:cccf:0:b0:628:b49e:9d46 with SMTP id l198-20020a25cccf000000b00628b49e9d46mr14914328ybf.44.1646797014370; Tue, 08 Mar 2022 19:36:54 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id i132-20020a0ddf8a000000b002dc1982d3c3si486787ywe.411.2022.03.08.19.36.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2022 19:36:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4174-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=n1xHX1C8; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4174-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4174-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 ewr.edge.kernel.org (Postfix) with ESMTPS id D991C1C0A7F for ; Wed, 9 Mar 2022 03:36:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8F56F6476; Wed, 9 Mar 2022 03:36:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0FDA15A3 for ; Wed, 9 Mar 2022 03:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646797008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JRSfvmr2rahVaKaBCv874QorpD22zdBn0eMfKuehRaM=; b=n1xHX1C8sOqKMLfgcXRllWNes4KLdJbt/5OTQti37X/AjFhkF57CPR9Fu+SZ9VnHJc48LD yeo0qs640JEJu4b4qayFxCS0L03+EAXVS0AOgEMFJg850URuJF2b/I+qA2dMyyZcUqI7yv N1l5cnjt1PMn/t7g3994WGSV+wyWmjw= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2057.outbound.protection.outlook.com [104.47.2.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-M6nN2-GrMAqyawzU_dr3lQ-1; Wed, 09 Mar 2022 04:36:47 +0100 X-MC-Unique: M6nN2-GrMAqyawzU_dr3lQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eUod6F/JszpVw3ovCXQ4e6tsGluIkhkOTs12jgxmZUh39nBzwPttXTx4NgZ1XRsAkTVnBWfq0mmmCjsj9AqCWQO7KcICO/CQNG4pOxjv6Bb2YIhb4oq8ZRuWoraOpQU8YgiaUst1e+po5HcuF6gAvfphNy5rvpw5DA4iEepPfQCsqwFZMXktDRZmilcWkEBiweV/JUSXYajQZ3vR/3HDB+GS4tJl0vDvQ+91vuuxtrYINeZFqq/9aReBeabPhLmXWtkJYQJAqoJkqh/5tWeywUY2uASYm6R35s1y6o2J8hlYCOJHUTn8WfdMtMybcmjLgzhm6mmcn8sDFdbWcRs+kQ== 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=HBDJXYzBZyal9Y+EvAYpQBdA2LlZmF5M4pf5PYVMiU8=; b=VV1w+rjsfWxMxKAWtEJDjhSN2BmSD5eNeXn0N8s83+qk6TEIh+CRmoQsPB4eR4a1zkwiaC8iiq6/SwoESXY/R8Wd29UdgOh/D7gDcSgPAuKKWq6jabJfKORAn8GnCHCxrXd3btJ80tobZ7tgitwbTucCIfZXNWKQT44FxNBYIxanL+RduVk7jz/mqfPgf0c6Ceg5rv5WZFAwSaTlWEfejzr/KyesadaCsVXApO5q6Ov2PuRxpzrL1d/i9GhNCXIZeb5cDdcpBS5PKtkqOG+QV/TG5a9aDf7ObyFYN8I6Tyrp1SnufuQnjazbqjcMV2m4V/51s8w6BKPKyrmwE68y8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB6333.eurprd04.prod.outlook.com (2603:10a6:803:fe::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Wed, 9 Mar 2022 03:36:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 03:36:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v10 5/5] selftests: bpf: test bpf_skc_to_mptcp_sock Date: Wed, 9 Mar 2022 11:36:01 +0800 Message-ID: <0d5df55864d6714df55af8b281d1c4540f0a9678.1646796538.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0082.apcprd04.prod.outlook.com (2603:1096:202:15::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 606b1027-224f-45b3-0c2b-08da017e0973 X-MS-TrafficTypeDiagnostic: VI1PR04MB6333: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: XY8+6bHiwIh/AmY3HAhVweHtN92llcDAUc2WjuURknFkoTILyKUMIbZp8Ar6tFsietkyvr7rDjySvo3sKN/FsSKmdhtGH/V/aAMJ1Q2STGO72bjibJtViLLj6TYo7UQTaz0u3Ua4T3E1YgHCIUclRW2oTC7Vjb1YioWAYmeeyYPHYYL+bYmo1FfPlDDXhdPl7y54aQQL93q1Tf20l1ptY8DKzO26sumsZ0hrDOzK5oD45Z+gz3dRreObivjd2C6Q8t01VLHdgbItIA2nZbB8wQQHPr6gNCMHE1FGwSQl/xZ02eKdJPBFOXlFrztSvkWnHFIDhCT14pmaFTN1ts71cj5/rFK5QZ0rAy3cRVF1mouezaBVNO5D4qKEWdSmaBVANgAFlqjAao3hfooWSRMTmNNvX8q/BWrcz7vn76QrdSOoCfn9zJDv1AfStThM+ZT0QnQwD+4EEle1dPIgciGWmtlh/kzxv+tEQsRXbRGnVSBmfUOoJ4n42zPApATWQsC8zYTPSD9Y7nDu7SMe6KbjnN5oacZuE8X2eIqA/n/ORwmwQF2MLfp5Ds6AgWim8HJAITCAPqvcQKXI7u6RmvnMFbiIx/iYpMUpjSTOjJYlGokU+M/QxkE+3CEA8WuddK5V3iiHRn9MP32owF+lT5oM+xAk2QisEG+6tUaKxTKrjs236Mbril94n5u7qwMb930m 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)(186003)(26005)(508600001)(2616005)(316002)(83380400001)(54906003)(6916009)(66556008)(6512007)(86362001)(44832011)(66946007)(66476007)(6506007)(8676002)(4326008)(36756003)(2906002)(5660300002)(6666004)(38100700002)(6486002)(8936002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+AvsRrAjJpbvIJRn13JnFSrs4Be2pTvvaPXy5i5WAQg/9LXRCn1sCEl5of/k?= =?us-ascii?Q?hBpnIp56/pHoVFJ3RnV7fxxtYMo2k6YefwW7o+Xh5FWxw4yqA92LB8SakXOv?= =?us-ascii?Q?vz/ZnYCxmFfZfNsXYTJoCY7iDMIYSFYtboqKmhy9r1g+P7RlwnHX85GqFyl3?= =?us-ascii?Q?CFrXecrEq+p7NXvDl2KB4LreJgyfrKE08ZkbwgX/OYmNtwk769JpPNE04pJe?= =?us-ascii?Q?Bq25Gg9iyfYhOfwYMEtbCa7ImVZYX2qV2pQQx8ixB7sx2n7cxlzSxmLY3I8l?= =?us-ascii?Q?VqMlqgh7c+8FzQfisHIeiBwtVDIYyVUUiWeE/K7NaUH1gb79veXj4nd8pP9J?= =?us-ascii?Q?wiGiNUsaXGDuAGjKRDtPIGobvnozr1Dpm+OIAh/Qs1dy/P+aPOniwk8FE7Jk?= =?us-ascii?Q?su9P0vbK3VD6M97RCrYWErtBn7xBTD+4TfL5VIkOkeqGJxl6e9hRNaUhAedf?= =?us-ascii?Q?hILjUvuRxTPnGs8/XhrfMv0Z/3wRxvmmHzEii0vhmOJx5x79/1BQvk06Zx8f?= =?us-ascii?Q?R/l6qXrMRbpIY7YrzgTeCHCawC49itvEIPqzZoHLJne/mawHvo0d+CSUWTf2?= =?us-ascii?Q?xBe9qgyNRNzrnlGYryL+KRbf9ncaNQdZ7NEu96fsqJFiYt6jCFy/8K32MD0B?= =?us-ascii?Q?ah/V02GotGA7QeAJTmJ9WLvqqLNbCMyKdLnmD2xwvVExsxC0j14QnqUrsihL?= =?us-ascii?Q?bCTYBvJyB5Zlk7iYmx9hB8wAjtWkjyL6h1SLuMamgLXMIX7IahtdvPz0jlz6?= =?us-ascii?Q?GKE8PecWEsAEkqQCcj50ZO72pQb9ztEjLUf8Sbs4cMA/2/x41PzkDAHcvh6S?= =?us-ascii?Q?rv7bOn8w/6J71xgZCHKD3ARlY0Riip4I/HidEEgb3eNP9BzJ9RD9fsKTgOiA?= =?us-ascii?Q?63PK26DLSa+eOIj1zIAlV2BLjdf3qiiTgmidJqwvYXfzzhvjcEK2rzwcNivl?= =?us-ascii?Q?3ZE9R7D9gZOE7mRvxWtdKJuKrZwCTz0CgdI3n8lV5mlmisyYmX55XGry98Y7?= =?us-ascii?Q?SFigUKqwTYmqlmmbbzFY7WqEsusp7tGTi3wYinvYTdM0AIJJt2+VzSqrnXjR?= =?us-ascii?Q?mhhkrI95WcBQanBX90hpQWiAPm8xtJ4//tZD0CSFKjGfFHaY6GjaaGXMq341?= =?us-ascii?Q?tDMZxdDK1+tPHyyJ/TiQ0KQWfu2Mi0FVHH1aQ8/d9xba/MMtIcklS9Lc39W3?= =?us-ascii?Q?+Vds3+aIw62CAhM9HIT2h3+ECt/depjabyyzNBR3yrHx2rf5dX7ZgxW7ivu1?= =?us-ascii?Q?OvShcAlyrt/AbfwjllLQcVD02WOb7SdTvqVibOWvqkFiOXGlzToQUU7dhgUT?= =?us-ascii?Q?8YjXk/ennwSjmoQtUW3Ea2IgArEOXw8l4kHcMW3DlhAeMBKV2gqOmj5yG9G+?= =?us-ascii?Q?V4rGyiGu+dc8ZqJbY48qJJT19yUatP9vbO6i/VPyL48xAGIxhbyN3XRPKHVf?= =?us-ascii?Q?UUQYmwyrJGgmKC9afGE0oywghZVL19dCJJWmAhb7pM/mFrleNoeENTxBxSf8?= =?us-ascii?Q?2TJSD2eFlLDJD71O7D6K84ZIOuIdxddpPog0A3YQeCoEaAWfZqA9SMaS+KOq?= =?us-ascii?Q?6mjrZdIVMrYtLLN637yw2ZUMCrcof/ei1/DtkFrGk0HYzg/uSvO5ztnPG6gS?= =?us-ascii?Q?ZO5zu8V7bog9zQkLigiwono=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 606b1027-224f-45b3-0c2b-08da017e0973 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 03:36:46.4575 (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: cKnR52l6tMjhXxjw5hr9XXqlR27KhjgRE2QKOWFfjzDLvZB0hVwouAm4LWfScl9IqlpwHuF3QtEA9NT2NnaO6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6333 Content-Type: text/plain; charset="utf-8" This patch extended the MPTCP test base, to test the new helper bpf_skc_to_mptcp_sock(). Added a new function verify_msk() to verify the msk token, and a new function get_msk_token() to parse the msk token from the output of the command 'ip mptcp monitor'. Acked-by: Matthieu Baerts Signed-off-by: Geliang Tang Acked-by: Mat Martineau --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 ++ .../testing/selftests/bpf/prog_tests/mptcp.c | 102 ++++++++++++++++-- tools/testing/selftests/bpf/progs/mptcp.c | 28 ++++- 3 files changed, 126 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index b1ede6f0b821..05f62f81cc4d 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -83,6 +83,12 @@ struct tcp_sock { __u64 tcp_mstamp; /* most recent packet received/sent */ } __attribute__((preserve_access_index)); =20 +struct mptcp_sock { + struct inet_connection_sock sk; + + __u32 token; +} __attribute__((preserve_access_index)); + static __always_inline struct inet_connection_sock *inet_csk(const struct = sock *sk) { return (struct inet_connection_sock *)sk; diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 87ee7bd8a689..035a87755b94 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -3,19 +3,20 @@ #include "cgroup_helpers.h" #include "network_helpers.h" =20 +char monitor_log_path[64]; + struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + __u32 token; }; =20 -static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_= mptcp) +static int verify_tsk(int map_fd, int client_fd) { + char *msg =3D "plain TCP socket"; int err =3D 0, cfd =3D client_fd; struct mptcp_storage val; =20 - if (is_mptcp =3D=3D 1) - return 0; - if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) { perror("Failed to read socket storage"); return -1; @@ -36,6 +37,85 @@ static int verify_sk(int map_fd, int client_fd, const ch= ar *msg, __u32 is_mptcp) return err; } =20 +/* + * Parse the token from the output of 'ip mptcp monitor': + * + * [ CREATED] token=3D3ca933d3 remid=3D0 locid=3D0 saddr4=3D127.0.0.= 1 ... + * [ CREATED] token=3D2ab57040 remid=3D0 locid=3D0 saddr4=3D127.0.0.= 1 ... + */ +static __u32 get_msk_token(void) +{ + char *prefix =3D "[ CREATED] token=3D"; + char buf[BUFSIZ] =3D {}; + __u32 token =3D 0; + ssize_t len; + int fd; + + sync(); + + fd =3D open(monitor_log_path, O_RDONLY); + if (CHECK_FAIL(fd < 0)) { + log_err("Failed to open %s", monitor_log_path); + goto err; + } + + len =3D read(fd, buf, sizeof(buf)); + if (CHECK_FAIL(len < 0)) { + log_err("Failed to read %s", monitor_log_path); + goto err; + } + + if (strncmp(buf, prefix, strlen(prefix))) { + log_err("Invalid prefix %s", buf); + goto err; + } + + token =3D strtol(buf + strlen(prefix), NULL, 16); + +err: + close(fd); + return token; +} + +static int verify_msk(int map_fd, int client_fd) +{ + char *msg =3D "MPTCP subflow socket"; + int err =3D 0, cfd =3D client_fd; + struct mptcp_storage val; + __u32 token; + + token =3D get_msk_token(); + if (token <=3D 0) { + log_err("Unexpected token %x", token); + return -1; + } + + if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) { + perror("Failed to read socket storage"); + return -1; + } + + if (val.invoked !=3D 1) { + log_err("%s: unexpected invoked count %d !=3D 1", + msg, val.invoked); + err++; + } + + if (val.is_mptcp !=3D 1) { + log_err("%s: unexpected bpf_tcp_sock.is_mptcp %d !=3D 1", + msg, val.is_mptcp); + err++; + } + + if (val.token !=3D token) { + log_err("Unexpected mptcp_sock.token %x !=3D %x", + val.token, token); + err++; + } + + return err; +} + static int run_test(int cgroup_fd, int server_fd, bool is_mptcp) { int client_fd, prog_fd, map_fd, err; @@ -70,8 +150,8 @@ static int run_test(int cgroup_fd, int server_fd, bool i= s_mptcp) goto close_client_fd; } =20 - err +=3D is_mptcp ? verify_sk(map_fd, client_fd, "MPTCP subflow socket", = 1) : - verify_sk(map_fd, client_fd, "plain TCP socket", 0); + err +=3D is_mptcp ? verify_msk(map_fd, client_fd) : + verify_tsk(map_fd, client_fd); =20 close_client_fd: close(client_fd); @@ -83,6 +163,7 @@ static int run_test(int cgroup_fd, int server_fd, bool i= s_mptcp) =20 void test_mptcp(void) { + char cmd[256], tmp_dir[] =3D "/tmp/XXXXXX"; int server_fd, cgroup_fd; =20 cgroup_fd =3D test__join_cgroup("/mptcp"); @@ -100,6 +181,13 @@ void test_mptcp(void) =20 with_mptcp: /* with MPTCP */ + if (CHECK_FAIL(!mkdtemp(tmp_dir))) + goto close_cgroup_fd; + snprintf(monitor_log_path, sizeof(monitor_log_path), + "%s/ip_mptcp_monitor", tmp_dir); + snprintf(cmd, sizeof(cmd), "ip mptcp monitor > %s &", monitor_log_path); + if (CHECK_FAIL(system(cmd))) + goto close_cgroup_fd; server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); if (CHECK_FAIL(server_fd < 0)) goto close_cgroup_fd; @@ -107,6 +195,8 @@ void test_mptcp(void) CHECK_FAIL(run_test(cgroup_fd, server_fd, true)); =20 close(server_fd); + snprintf(cmd, sizeof(cmd), "rm -rf %s", tmp_dir); + system(cmd); =20 close_cgroup_fd: close(cgroup_fd); diff --git a/tools/testing/selftests/bpf/progs/mptcp.c b/tools/testing/self= tests/bpf/progs/mptcp.c index a14ed1b66da8..b08448a12c02 100644 --- a/tools/testing/selftests/bpf/progs/mptcp.c +++ b/tools/testing/selftests/bpf/progs/mptcp.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include "bpf_tcp_helpers.h" =20 char _license[] SEC("license") =3D "GPL"; __u32 _version SEC("version") =3D 1; @@ -8,6 +9,7 @@ __u32 _version SEC("version") =3D 1; struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + __u32 token; }; =20 struct { @@ -20,8 +22,10 @@ struct { SEC("sockops") int _sockops(struct bpf_sock_ops *ctx) { + char fmt[] =3D "invoked=3D%u is_mptcp=3D%u token=3D%x"; struct mptcp_storage *storage; struct bpf_tcp_sock *tcp_sk; + struct mptcp_sock *msk; int op =3D (int)ctx->op; struct bpf_sock *sk; =20 @@ -36,13 +40,29 @@ int _sockops(struct bpf_sock_ops *ctx) if (!tcp_sk) return 1; =20 - storage =3D bpf_sk_storage_get(&socket_storage_map, sk, 0, - BPF_SK_STORAGE_GET_F_CREATE); - if (!storage) - return 1; + if (!tcp_sk->is_mptcp) { + storage =3D bpf_sk_storage_get(&socket_storage_map, sk, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!storage) + return 1; + + storage->token =3D 0; + } else { + msk =3D bpf_skc_to_mptcp_sock(sk); + if (!msk) + return 1; + + storage =3D bpf_sk_storage_get(&socket_storage_map, msk, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!storage) + return 1; =20 + storage->token =3D msk->token; + } storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; + bpf_trace_printk(fmt, sizeof(fmt), + storage->invoked, storage->is_mptcp, storage->token); =20 return 1; } --=20 2.34.1