From nobody Sun May 5 19:23:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp958664edc; Mon, 7 Mar 2022 20:03:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTX35lOW2e/MCasaAMY98xcqIgHNrh3Rcjr1v1ZXtzL3YBwXc9bIEpkM+PZGZ3Gw1m8K2k X-Received: by 2002:a81:5a57:0:b0:2dc:374c:4b92 with SMTP id o84-20020a815a57000000b002dc374c4b92mr11262579ywb.385.1646712206203; Mon, 07 Mar 2022 20:03: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 t198-20020a8183cf000000b002dc22c13ee7si9394562ywf.262.2022.03.07.20.03.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Mar 2022 20:03:26 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4142-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=NKTQSBnr; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4142-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4142-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 BF0601C0A4B for ; Tue, 8 Mar 2022 04:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 47C123222; Tue, 8 Mar 2022 04:03: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.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 87C582F33 for ; Tue, 8 Mar 2022 04:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646712200; 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=NKTQSBnrUNSpHT4VQOg2mQtfuqLl45NhIs4yDwY78P3pTVdmFJY8bIIjM1GTy+hAzDJ0cT UtbR0nXGdVAE7r+R8OvobA0H6eiwNHmZ7mslSigQReejvjNA91OkV8fIQ8JXlhiursble6 R8G31rtciE8qnihHw/aMJLkN9isSNOY= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2050.outbound.protection.outlook.com [104.47.13.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-cDPokWbONEKOJ9ZnrOP-NA-1; Tue, 08 Mar 2022 05:03:19 +0100 X-MC-Unique: cDPokWbONEKOJ9ZnrOP-NA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ijxZT+MPWV9yUPGM9teu3sVc2X6sw0h6Su2AzWOWwowT8goUdTTngdaNd4Yhix2ndu2Q02bb5iIqZHAaaQthJPGJwknYhRYo4U37vtl/qOZ/NIUASV7nip8kdCR1RjXsvh1MGpgUV0N5hbGmupnW82r/gObf8Zap0R+M1xi5VlgtvbHk+yE4dCPuLP+gBniVqkfLXZxPXXGyWtLTVTfsghtk4Y/RA5cpZFf1D7tmIuig/DtAo535kwq1aLqeKQH+f907xHQgJnSfgrEl1UNgO1ZdXqW9l+V+vU4uh8MMTR5pNKE6wTVEwdZy2u3xLpQpw91U2wjxBIFSzpcm3ZtLgQ== 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=bDPI5wiF7PlxX7P2SaZkQ6R90xIA1xlTUL4ggHUPFlN4nPROtlON8KyF0OZKA54bdWH0LskLof0cKig9yUwU+NB0LvZj41AeSY8Og1fB+EfGawt34+PgcLcO1psragfQ9kPzZDd/SjOkvNJ/JjyqApDNcaAcGjgclX/4JxCiUQiTNyrOq9ZyfyUdYElRwLdKXEe2Lz3iZ7pXY0/EvfMu3O4ctYbVEq8pAiHtGHV3+keOYoNz19mh71hx8GVdDyJ5uL3onHPtdxeQEdCO+t6Mu4Ihyvo6l0+I3qVs3HJ2SRRhNvhSX/ULWi44cwN/OjKClT/R/H+W0iSBERELfWILgg== 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 AS8PR04MB7862.eurprd04.prod.outlook.com (2603:10a6:20b:2a1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Tue, 8 Mar 2022 04:03: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; Tue, 8 Mar 2022 04:03:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 1/4] Revert "selftests: bpf: add bpf_mptcp_sock() verifier tests" Date: Tue, 8 Mar 2022 12:02:50 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0001.apcprd06.prod.outlook.com (2603:1096:202:2e::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 016c0a46-ec73-434e-c248-08da00b89402 X-MS-TrafficTypeDiagnostic: AS8PR04MB7862: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: KGf5mgLjXHg4O+W+TI89OqHzCWvk2H07Q60ttL23UumbfSFaalbuaotMikdOYrCHOsebNuhu1WLIXqwFTh1btYvVl6u/Z5DZ1Qy3w84NovYY4zctpGph+Pz2JjaSM14N+jmJu2OScjfPHiIJCpqOEmnwpMQMrz3C8FItcdWDUnR43ekpqWqXV79xaAYTzy3sEiOPeoFi3y6BCebYk7Ieij7cyN0QuxgVTyNpC37aKEAkYyWvYUsMWQ61pcleQjLY6hN8gTw95NzvJkjQ3Bgz+/nwNO2PaN1zoEQOY9jHJTyy+1zlH7xVaFNoGnzieFC/Ny1fRk6fmB0p5aTWlSm/1unnKLpFGXi7txtmKEz0tkG9nT1ss5LsuSoNKH0m7zgGK7vPuJkg308lMzR/yr9DCS/grIVhwlZbAGyc7FqpanYuERI0gkiLjJdLlOsCF9Oar49VfjxW1+MlEDaWMrfyNsfpmSuUnuo2hP16p+tm5xOK/Z3+5Ksj8zN4jIuUtXs9pGoeX0PPyjj0LCxXpNT1CcR9Wb3K6mF+5xqwRKCPU9A7h0VBHLjefHHqty3QVWacBXdpXjGAeSLZQNbDZJcfeyhX3UnOos1E6bz71LZrrBFCi3OThSd344l2rRvrIeiPOxlKPQ56pRvIbouHQSwg4KAt2X2YLOGAJq5+kavEFcjjAkTHkWe3D5UDD7JuLto8mHxbi+nqleQmtxM3rvw3ew== 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)(2616005)(107886003)(26005)(186003)(6486002)(6506007)(6666004)(6512007)(38100700002)(508600001)(4326008)(83380400001)(86362001)(2906002)(44832011)(8936002)(6916009)(5660300002)(316002)(8676002)(66946007)(66556008)(36756003)(66476007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xg8zGbl+6e6a83/ZjgKc3UXwAKTsi1nKuzE1HPQMZfHfSth7UOjZ0rwbLOf3?= =?us-ascii?Q?7foOp+rhbnJHoiggycH7kaASmvA769Bv+Sa63H9rKLtQhTYVO7BOL0LjVrOd?= =?us-ascii?Q?v7t/B2X8NeQt4J7ovNSiw0UucwdIBJFmnxjaS6xRavxW0x8eHw7JK2Tsnvnl?= =?us-ascii?Q?AoHkV3dJTYmSB7cikZYg9pzftqzDqcmZEAKPb3tEua6GlPJalxyEeIL9qhJq?= =?us-ascii?Q?Y7SZpmSwCqmbgTN4Kqs8/9SQKnopbfia4wBQL5pWQaOhQxxXhJ00DXdUZDKm?= =?us-ascii?Q?VUr+HJrlVlyI2ZgAI+II2grf2hy48XSasCTi1ZWvo18+g4yBSW3uAihfjcLy?= =?us-ascii?Q?vh8hcS0jC+94BznjnLcv+1b0eDl4pGxIHhLElZRvwHkFYK4kMu7tMfLjJwIh?= =?us-ascii?Q?z9mrIv8ADAP1W7ZQY3CfXGOKofu0ovUlJfR/cOam7LhOuyjXR/VnRzOrFtfk?= =?us-ascii?Q?ZF7Od9cnle439SLqVB2vQz4m5hymAmgYNbP/Pbo7nZmSDk4lMsyGoJI/FFCK?= =?us-ascii?Q?jGlr2NTH1lZYlhbrAopTx3IvthwsOPrh4lK6isd+oGaDApRkheY62+ShdhWA?= =?us-ascii?Q?AOas30kDG93F02YecGLvwQTOQijTPi4THhULc5OpaIEj5VGywfu3MZBnWUYp?= =?us-ascii?Q?Ym90DVSVATze5HD/bVJSGhyQaGOkkl+z4vYkVDRv7cwxvdzePXgaRD8fJef0?= =?us-ascii?Q?FGaLXM0IjBLiOHq1k7dXC+0Iw8t16LwSLjZr2SvAD5cP8/3C9bMT5fhwjrpc?= =?us-ascii?Q?CE9GNFD1RChnR+4UpHhMNwzmeQM9mthFG90bh2VDZgwFSZnomrAKI05NQ3sp?= =?us-ascii?Q?pB0/AD5D5TQaBa/2GVYmoGwrVaS8J+cqKWe7bwopQmK0Zvs5l46HpSqh2zgE?= =?us-ascii?Q?BilrFKjz0hgyX6R7TXuLYO8ydHOjARwXXTi8o3A559pYNGWzlP3JghbUlhdZ?= =?us-ascii?Q?8el4eKj3e2svCFlYwJo4fVZGPj03HxaMfNkgnfYIDGWOufar+BUuJFeg5e/l?= =?us-ascii?Q?JIN5drBPtNIgWMDPq1op8d4XL3oWCy6t/+NbRejZjpvJWk5f1W9cK1D44shQ?= =?us-ascii?Q?v5BAVEtXYNPQyeBj9uecv9QMknln1vSfKqaSu+SfCCilt1b4ytPzLWX4XdZw?= =?us-ascii?Q?naMTjLBsRPmQ1+sM60w29w1usKIHt9VrBjCj2DEE11wHlquavg9VGwuKSLeV?= =?us-ascii?Q?NTKfdc33UgqyF5bBFPJu0+i8C1klBcwXvrgxAzbA788VJHZrzy0jLz04ydQV?= =?us-ascii?Q?dtNQG5urFxWYVFMKX6EKlH9ZFwM3uBF7KLndQkx2PTPQ/kzma26K8OhS9lZZ?= =?us-ascii?Q?WopYARcYibO2I2IT1MOU02ka6omH3adYyNOuCPuplSXrE2I5Te3yeMPycil4?= =?us-ascii?Q?baRh64QXFyBPst3wcjtUvKiZ9Y68sKV8rjaTDPHK2PeRCZggrQxvBZIL2HQS?= =?us-ascii?Q?prm6aa5sVzcKhtUSu3+qCxzsxQYKUBrw/1Bss3Qi/fQb6w+A/vfheXWjzDJn?= =?us-ascii?Q?KzP8098BEwA5/1McV9SG6PltiUecArmb1+lB7hx0vMn3/upBg87xpISBegKh?= =?us-ascii?Q?s25Zb3qeBDVxjRBxRE6ASdSrigWwgVGCVDG18ehJWSCfz0gnOI1oSg4osqz+?= =?us-ascii?Q?1z1F77xvSYqTfzvZkBmG8nY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 016c0a46-ec73-434e-c248-08da00b89402 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2022 04:03:18.6974 (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: 6KRG6BlC0BEiCdftP6DVhNFA7VQ56qGp0pmO5vGvQ+jv+PB6dx/YG1OabYT7wEartrDAfcZLxuUFPSfZLerdcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7862 Content-Type: text/plain; charset="utf-8" This reverts commit f48f0143286db0d8dbded9542d9a2535533dd3b9. --- 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 May 5 19:23:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp958692edc; Mon, 7 Mar 2022 20:03:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNg1U+aQ3EcUScdZ5soJ9/FbSLPl+c8CLfaYSps/1B/NyfoJSMOWnnsPtMQ/S7DrBGAJNW X-Received: by 2002:a63:5451:0:b0:378:6b6c:ed83 with SMTP id e17-20020a635451000000b003786b6ced83mr12555148pgm.446.1646712213426; Mon, 07 Mar 2022 20:03:33 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id m9-20020a17090a71c900b001bd263d3d10si1088751pjs.77.2022.03.07.20.03.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Mar 2022 20:03:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4143-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="AyWIMcu/"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4143-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4143-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 90FAC3E0EA0 for ; Tue, 8 Mar 2022 04:03:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 615FE3222; Tue, 8 Mar 2022 04:03:31 +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 0CF252F33 for ; Tue, 8 Mar 2022 04:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646712207; 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=AyWIMcu/AhGA/6prabSnLCJregOcKggAJ4vzknZAiuHibu46AoxDLceKsLiX9Sf7bbiOiY O9j6/GGgYzcGlFvHSEPW4jNDfoiJt35mQX1loweZmuwpa9AjjKtfJbpSW2fxMxVvgW198r omibdGdW+ToaPK1JeM9gJs91fzrABQE= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2056.outbound.protection.outlook.com [104.47.13.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-BaRln9bdMFqOwOZph4OEPA-1; Tue, 08 Mar 2022 05:03:26 +0100 X-MC-Unique: BaRln9bdMFqOwOZph4OEPA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dYHY1FSxgTynHuPCVX0X337rl+9CW6b4QL5paLbuAQP0iYc/gLNVFytjx9ePp5MnPej0ylGY0h+p5Q8z4GBNt8BkysM/4mqfSvNt4qY04DEiJvTMYY+qq5D1DDPAtkspeNv00N9MzLBsEVQL0larwCVWAcc7KSbNqPPp9fqoxqGAbpy2Y6HK0JqfSjqdEIwFmr2bjNqHBusuLCAYqdQvTmUTRCTjnGtCBUC28pXCOnsaqKdp/56qx7IQtzaltHvRdcBvU3bE+uBSWQMCBK1cRufxRpwCoaeldVVpbY03JGJS+GGiX+oT2HaHczsa2lCpUzDjsxb6uupvq09pctRgSw== 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=jM3RXrzEiVRQlRyDIW/GkV9PST6P1GKX1UrMTxPIo8ScpDaijdIea6No5n9o4GOByI8eIxtcJPc8BCytaOiNDlK2Vs/tBVZuk7L/xOYNriVQLhkJHeuDjgrndWgNSUaGF3K8d207V47Gsam7Zqb4HQ9EHy0IKvtWb7mSNzj4JBwj7u3qwRu715or3UC/EgaprlLukCYjWS04Vc8qI7hODyUhmQGbsS+YA/Mgat5Dby38TZgWhkTlzM9bsE8LJ9W5L0Uk777uUBzusOXJ9RCDulhcdMrksIptkjto/oBsg7Y0Ytwk5Vmi2IfK+KulTFTGPT3z3DLa9OSzZ1zOSc5X3Q== 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 AS8PR04MB7862.eurprd04.prod.outlook.com (2603:10a6:20b:2a1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Tue, 8 Mar 2022 04:03: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; Tue, 8 Mar 2022 04:03:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 2/4] Revert "bpf: add 'bpf_mptcp_sock' structure and helper" Date: Tue, 8 Mar 2022 12:02:51 +0800 Message-ID: <5d0f38a0fb220bae4f170f2debf5a8b8a031ba7e.1646711943.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0016.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: c092c9f0-3331-4a59-0540-08da00b8982a X-MS-TrafficTypeDiagnostic: AS8PR04MB7862: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: glvqL6DZYbRFZ+/1N3DQqCU0C7gs1+d31XEgGcw3T5Bp9iEmcNkV0osPyl0b1GDFF4EZBp0rTRFvlHMKzZvZBPWWNMf56tgsHSQ593yWCVQrbK+lZcmew783fbk/xuFbfsKQth4PKWxJBbaNi0QJqL0Kb6pEfWD/EI0MFXm8CxWpcot5aNe9liWCrnvo0jQVDseUgyskeIUCL666B3bQy8oMctEnRCgdUAUT/lOvXbWqESayTMmaB8Fb211Qw4Liw9LiRaR2rKR7FMIopqNxEPY3+GzBCZUsmrCPFQe5ycEWnKVpQHu2dyQZgzxi+8ae238Oog+7ddGhcBAbkYCN7EKs7YrTvjaxY5h91VNKZ3sK9yXXAUwWphL/3T3DJrwRn/kux0ECFN1JpmCuXrHl+93RILj5MciiktfC0ugBpVVPuxmd3C7Jn4xfMOYtFD3kJMPWMfat09o1n7+jlGXghyhoN+ewfUkrPPhsKGwEX5KwbdpWKreX8sl4mTy1ChBK9ky6uuH2jrqmfnE2g9uPMapdLtTSrUSMdWENSPN8tNAo2hZM/Ts6vGDyzZpDvmmNsjsrueua37otCRbjyhgg0nKQsZk5TCh6rVdHISkQfyk9lPL9IRnfvnR7HWLzN+rwQyyKOoFCG9bVl3aklvS48zpILtrJ0R04ugWMa5qH3kSz9pqjdBjRnefAbHG0ZXsnHrESba2Z9BIgu4KMJ0/DGQ== 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)(2616005)(107886003)(26005)(186003)(6486002)(6506007)(6666004)(6512007)(38100700002)(508600001)(4326008)(83380400001)(86362001)(2906002)(44832011)(30864003)(8936002)(6916009)(5660300002)(316002)(8676002)(66946007)(66556008)(36756003)(66476007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4hRiLaZlHo870lJFKn+CEvjablvCF3QUt4bKrneHn4pdXxT7quxBJJNLcK0T?= =?us-ascii?Q?JOKY+pUohELy+1hi6oFZl2vY8Cp3HBSlyjGsaGqxhdymBBIs3hA/dIy71wGw?= =?us-ascii?Q?fXJVd68V++7hG2KkBjq8GaXKDSexf5pWRmxnaRKCYLiKJ//6hT44BKzA/ZOx?= =?us-ascii?Q?pZ5iP0XAawsuEW2kJ6zD9dydm0Lrpug/mccU/OHLwOKiWhJPQkwhAdfVlvxd?= =?us-ascii?Q?PeIJ06JsVImqP9c/WJyTmmqsDQs4Ko1rEgvEoMKvx2DIP0v4p05XQCESE5iu?= =?us-ascii?Q?NrCfzWfyxAnzd+P0TWIGiKtZ8ZrcxomlGATrnUl4Lu8EOJwOWUOMebHYAMXq?= =?us-ascii?Q?lKUvz2vOFobXfIPrl/nuVlY4NBf3P6mboXul0YLIgwyjrwADLTnm35qgDn6W?= =?us-ascii?Q?s+vhBJdtLyiAZz7aVMLgSRqmfSKeJcoKE1CXfVLNlGhQzYVIGPYINtY8Nny7?= =?us-ascii?Q?QrxR8+6njttRKd/4SU6GDyonCUTHwujjqgsFIuJCbmd69R+rNP9AuVmou+ZO?= =?us-ascii?Q?I9iokHcshpsph7DBHcV13XstnqFYvXFyKOMNgzVOtPgBUfOUUb0O3EFtz4pV?= =?us-ascii?Q?69ksyIfbonh1nXUUIytMTFbSh7E8G2EwJe1TwifeTwO4ACzQae0+vhA9gJzT?= =?us-ascii?Q?1XFMKQJkkCb+yf+ied2Q+I7ipfKImwf3n6zBWmYKKi3xX0Bv+Mjxiypxbwck?= =?us-ascii?Q?z2QX2bMxNmCpXRumsGwutj6sx9YG2I2KRludjK7CQmHkXPWzrHkWqbSmgrv2?= =?us-ascii?Q?68BEoOyXuAEvQkI29huuBL3MvOLeUOXVwuMjj82WeuxTWIMzc6qnwrI0SGn5?= =?us-ascii?Q?C31o9xUV4NJLllSIZ764ytn97NFU6fSATFZdnsKCjYG5aOALn5/hY01Rvx+E?= =?us-ascii?Q?9ZZeBWurfQkTgFA/CFtXk9tcNQH9oNNRZYPxXaw6YNN8LSX/auckWCBEgW5w?= =?us-ascii?Q?mRw5bJfLDNxUr06Cemb4tD78u0H3I4dE81rLtwSBZ5Biy/tuBKomMkIbdv9U?= =?us-ascii?Q?vqDd7V+pUFBb4LGQXSuQK5rUmkIHdLQIipd0A8ooxmGtMSx7IhkapvCTDYqx?= =?us-ascii?Q?PO2kmRH2RtbhCcwTsyTXGBjHUHw3EGB9YfP0FIuKtDoAv4pPtfziJcLGLFVq?= =?us-ascii?Q?nXmh3iGC5vKo89w20Ykga35tgmvFaGghhUDMw2OzJDamWZdwwepOR7EWFooX?= =?us-ascii?Q?v5jTxJd0mntP1PHHk+Bb3EmOyfc7IV6piwdXXmX9ZXtOT8B2ocytGKLI7x71?= =?us-ascii?Q?HKgKsvmzeek6Oms5qRl2mQjj4zuXz2A+Z92/JukdPld9rvPh8enEKn4zm74M?= =?us-ascii?Q?h7isvIphHp7ppFgfgqPkW3oxRHCRGFaEOO5O8IC+4vn1C+gR2ur0Ay9F4Kpm?= =?us-ascii?Q?hcleZ9Mk8HMCpR8JkmZgubVM2EzOekOJqJ+WZ8NpUL86c5HBsQdPAt2AK3Pi?= =?us-ascii?Q?gEc+6l3Gwg5ESiFNNlSmbw/oEzB1/JGtnvmygIpJoLdfPnoRV1vuJ/JEBPFO?= =?us-ascii?Q?xpfGPPw2tM+ZpuV0Yz75g4tHSqSCkkd9vJ9ZQlezDHjtNlI5frUfA6qtrUcZ?= =?us-ascii?Q?H8YPpGoF2H7okbwyTt5fsR4N7A2h4Sz+MpdqqxgLBqaExbKIObD3k6WmVrKd?= =?us-ascii?Q?A5PiaovJG6QYnDDQ4cBtfdc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c092c9f0-3331-4a59-0540-08da00b8982a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2022 04:03:25.4625 (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: dIe44x4vItwneSqmf8OLq0hJhIRmgDiEbx8eP5/CN1yg5EXE3OM5zEJq95LqUs9urDayIre92r13pglNltulKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7862 Content-Type: text/plain; charset="utf-8" This reverts commit 2ee22ce38ed4c7a416ce887eb6379aaf157634f9. --- 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 May 5 19:23:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp958717edc; Mon, 7 Mar 2022 20:03:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbFOzr6EdnUo5qk/jm33sHAl0VOHVoIfmfrW3NcErEV5PBO2l5srZ80mnxlf3NIqrkeD6H X-Received: by 2002:a63:388:0:b0:37c:8577:c8f3 with SMTP id 130-20020a630388000000b0037c8577c8f3mr12790415pgd.148.1646712219763; Mon, 07 Mar 2022 20:03:39 -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 l9-20020a170903120900b0014fdff69c2bsi15885805plh.528.2022.03.07.20.03.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Mar 2022 20:03:39 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4144-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=V4Ld5LZ+; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4144-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4144-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 00B673E0EC4 for ; Tue, 8 Mar 2022 04:03:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0A89B3222; Tue, 8 Mar 2022 04:03:38 +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 0DDE72F33 for ; Tue, 8 Mar 2022 04:03:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646712214; 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=362WZUzmVE200dFQmnEnopUwKgSMAI+IU3fj7/NionM=; b=V4Ld5LZ+Wkd3mFUhSBGfxAJ51rSVSfh/XT11tOz4E81eqIp5vw1+9e1qi+maMBgrfV701D XpOTuda6IXebfPC78+N89XMnmseU/g3OhLUz9r3JUxMocd7bUbFVyvCjPtP8Tk30r7L8k9 BUfuezp/v8cfT/SdHYWjbiS5HD/K4Pk= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2053.outbound.protection.outlook.com [104.47.13.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-20-etML4Sf1MymPjSrur47Isw-1; Tue, 08 Mar 2022 05:03:33 +0100 X-MC-Unique: etML4Sf1MymPjSrur47Isw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FPyZWQdfn0NlX9gTweqcZG458yngcPaw4h4KW3SGNVPXD/m4ROqld3bRbGqyJd9DvCy7HrDxqSTH0mbLOWzsVRmULoPoAg7TT89eKkzyvjb3N73yuk15apfTesi4yfRSeZG1DYHwHfXxdRLBbu++7YQps6vxt5LhXu8IOPXdnZBhxhkFt6jLc0BK29bvUulLyObEPSheiZE6rm1IesXDVd1kp+FQAhHPE/kZaRMav9xI1dezKNW4d/BZ1jCOHKdXC2sLcbW5hnPf6t7B+yOGHxGyxoucdVfTU03D2SY3RLJtcrjNHoxV96O9v9Zuokknuydd3LJz//Ia8BF7LrGVtw== 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=4cTG0orl1M2YPlxQmqgjFLA6PYZxQl1ZAYMHpAOFUrg=; b=TyJGlAxdElF9bAMKDc+qGvLT8awi2HjL73dXn20UnUe0rrqhlfh416mO4KAlE9grkV1qFmOUTk2y/7rvfmXNYERSM3BLhzJR6rxRTIRFW0KX0MV2zuNdlwPU8byqzjVi569BrLwG3M3/uniPARZ3Z19za3UcOu9FDIu2RfMo0k3icdNDCWGuRRGnyx3v2NDECnIByPB5bIOtApnEEp6KQG8OW7aQ4jIuwNPYiFXgyU4gjb7UPBW5Fcif0Ef+RVEQPByaWezzaYgcZbSWFrCr88En0wkGCZ0wPKNCxLpfEQo95mPtAAJNcZ0AjMD4sHcSNnlUX8uC6CYZOdURhEpNFg== 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 AS8PR04MB7862.eurprd04.prod.outlook.com (2603:10a6:20b:2a1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Tue, 8 Mar 2022 04:03:32 +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; Tue, 8 Mar 2022 04:03:31 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Nicolas Rybowski , Matthieu Baerts Subject: [PATCH mptcp-next v7 3/4] bpf: add skc_to_mptcp_sock helper Date: Tue, 8 Mar 2022 12:02:52 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0169.apcprd02.prod.outlook.com (2603:1096:201:1f::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cae4d249-4a92-45b5-39c2-08da00b89c00 X-MS-TrafficTypeDiagnostic: AS8PR04MB7862: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: ki6hI9qya+MtdYDzBo/iod6XU6wJ2mKqt1wAI6osFy0I4oLhw4xEh8XJagtmOt2/536j8h8hwYrz15gq/TvKYL3rXKnbafQQlKib6IqU1hHJJ0gDmU6M/h0ZgEUojKKJwggX8iONR45/k1wsCyTH+2wJt4GSSSjiqlaTfAYGCQFOVQicQ4U7keBgCSlNx/QSX+5AwlCUK6HuGUaUJ/5McCBH8ByXxd2p5/RyRhKvSyS9tpnzqvaYFc37F6YqIpFh1QuDll/HtH+5sqgyKoJ8qU2pBRkGT5o4WlwEwuWrgBFGsbyJe6APexX1aaiWqB3Wqa5xE+mSHFtQqemysIxZB3X5tN3ZhxIBq5SChtj8/V+/urN6Sg8iUGn8432d/5uT9yTYR3eQK/qplWT6oj/cf3hBYqiMLwB0bw7wo34+M4WQxURScPFpZ+eSlO6VZanj9TLGAicE6JwwwlridbcOJldb3DA4lMrmT98hMc2H4Cz+1/O06vnUmnih9RC+21CNbFx/Xi+7nDmM2vO5LuHnfwcToHcfdjVZu7Syzu8QFCyhUGmaAvc/Q9XzbnfnhVVPNzIQgyWZLKHxFBPq8c1Dfn7UbHHYkwh4cn8/asoUC9teBSxQrxlMhQa37gSGba8DANnDOo6q/OfW3Twh2+VHSIWOqgTtO1K27sLjOUfAXIe/gpjr2OniAnQYuToImYAES3cny+9+ORpoQFVrAxoKeA== 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)(2616005)(26005)(186003)(6486002)(6506007)(6666004)(6512007)(38100700002)(508600001)(4326008)(83380400001)(86362001)(2906002)(44832011)(8936002)(6916009)(5660300002)(316002)(54906003)(8676002)(66946007)(66556008)(36756003)(66476007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hkFLWH+K0mjPoXMZYPilgh14Pk6tbLsmL8NDjQHe0+Eq0KyGqswQQc5nRpje?= =?us-ascii?Q?CAi+y/VN96M7wIarvl2HnZou1RLOr0RFFxlr5TIlyDE1VWWf9liMMON/FxRb?= =?us-ascii?Q?ifId8aYEYnr+vT0peN/L80rLWW1fYc7hsgctVc0aVx9Yfq2tQoX9LnVgnwcU?= =?us-ascii?Q?KYtySk0571xKWP7Or3nfQUX4Zxx9MOXhjlYLlv5Jchudq9CCoiyXHXBeHoB9?= =?us-ascii?Q?6v0Vn9Jj4tfbRxpYeURE61WKu4k16JYqzdG85QE3NkjHRDl/gWoKMSFAaP+i?= =?us-ascii?Q?P19dSH5XIqeuSHA+tfbuAp7OnNkQZtlUfM9NGZtZrKFWze4auLcRSCacF/LG?= =?us-ascii?Q?LwFG+RRm9JzPnUX1U57UwnOV129eYF9N8CX7/LYU49rOURyCkwgDuI5m/kqr?= =?us-ascii?Q?hXRIX+FGmdM1qfgWdOpT5o1nPZlScjilgNAHHXdgISIPAnMZAJHt63nXDk+Y?= =?us-ascii?Q?AHBC3INO615xF6Ah+/aK8/ksV7iuUYrXrKcc7MbC+2AwoieUts8qK5Thji5l?= =?us-ascii?Q?fGM8FdVp3c5vYYRQjiNlNIzjbF85hgMuRLobljKF8ZWZG7yidDC+u3cduQYE?= =?us-ascii?Q?PVg2e3YHtaHMIl6Unlk7OKl4+HTBdXEYz0ITxB6Cpe8A0iRPk0jvRKy8+Ip2?= =?us-ascii?Q?74IGx++XZdEJevXq/Kph/JzVkRgtmePF3+8Bc/lGNUtJW5jhfqk8IFJT0kBA?= =?us-ascii?Q?ZsYAATN7pW4p+7F0dCFBVjMcokrFsPhQOUVQbAUYYH1FmVDpOoSgPlHVn41N?= =?us-ascii?Q?pgOuF2TDT3U0FrlSrpNjPyeovGlosjZ075kpiTcZ4glUR8RJwuXryc8UFi4/?= =?us-ascii?Q?fDZupJSb48DvFTY8Ejq426xpuIKIhzE/lhysMVcuT1NMkXPAs20M8q42COdp?= =?us-ascii?Q?QPgZ2LB1OmpMwXlLoIcc6iwaf21MK+epwHyDxvN5AgB3j2jBUEqYI2/6hPqb?= =?us-ascii?Q?/rEmQcOIITGn3ooR8R5Dr98GccMeGcPvH0z6ihUPDpPj00FMmCSdEyDteZha?= =?us-ascii?Q?qJfgupAgQRQ7nxNW2kpgwp2JTOKxm8FzEMxJC9eZeZJ8J62zP4KP6ji/+OjD?= =?us-ascii?Q?Ka0GruOpWtwEgA1Y8i+dGkgw7HEc5QWjLnCzVFfGsHKeCKfqvi1QyADDLW/C?= =?us-ascii?Q?UbRRPZp1tNktzAIhdIWLZmOsDeIazIj+hNrvnZ76Fcgk8H0LTrw9VSmIFWYM?= =?us-ascii?Q?6boxkEG9wHonACTCoXOXT7gY6c3OcB1X3CR4TyRBccg1dstFM/EsOml/QoBl?= =?us-ascii?Q?ZzGOCV2OfniP/JvsPfKZHHW5K9+NtDA1r+73ewJL+NBFBwXFEel7/weIjSEt?= =?us-ascii?Q?dYV/wtdemCuD6wmcLMwLNdpXVgzh4pyd6M2ZjFutNx3hChdS9WxqfCQuxhEl?= =?us-ascii?Q?e+1j3mxDPWpXElSxbonNBwKkL8T89fV6tj+yhYB0wQsT6RzIjsVjUrY6EjEp?= =?us-ascii?Q?K7qiefjwR1K7Psl0dqP8pNon50rUBxoeJvqkwc2I8zZ1u+RbdMlfKSf6HFNz?= =?us-ascii?Q?+9jzFDIXbMicPyo+oKT+3OR3yAPeJhBGcONvrAqUnseFJnwROkIFidSP5uQ8?= =?us-ascii?Q?2sFhILhOBNnN0YytO2UK5/qkGL01+t/B3kzim9UoZtsl9kDTsbsadwdCk0xC?= =?us-ascii?Q?vOcSl3vwVdeVk7mjOfYJytg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cae4d249-4a92-45b5-39c2-08da00b89c00 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2022 04:03:31.9308 (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: TElYRX8iwYxJeGEOWJQt5UrvKEsiz3iP3Tt0AQTYae+OY59+GXvc24gX/4pPSPz6vp4c8pBZu7dNcuxoA63Hdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7862 Content-Type: text/plain; charset="utf-8" This patch implemented bpf_skc_to_mptcp_sock helper. Defined a new bpf_id BTF_SOCK_TYPE_MPTCP, and added a new helper bpf_mptcp_sock_from_subflow() to get struct bpf_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 --- include/linux/bpf.h | 9 +++++++++ include/linux/btf_ids.h | 3 ++- include/uapi/linux/bpf.h | 7 +++++++ net/core/filter.c | 17 +++++++++++++++++ net/mptcp/Makefile | 2 ++ net/mptcp/bpf.c | 20 ++++++++++++++++++++ scripts/bpf_doc.py | 2 ++ tools/include/uapi/linux/bpf.h | 7 +++++++ 8 files changed, 66 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..538b6db4fd76 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,10 @@ 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: + return &bpf_skc_to_mptcp_sock_proto; +#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 May 5 19:23:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp958752edc; Mon, 7 Mar 2022 20:03:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzi766dSmlhoZtUQ5c9dRxVnp84A21kYWjj76p4r3GnPVtvWT2LsgjJniKUJvY9bCqzwClD X-Received: by 2002:a65:4d43:0:b0:380:68f3:4fbc with SMTP id j3-20020a654d43000000b0038068f34fbcmr4554526pgt.30.1646712226317; Mon, 07 Mar 2022 20:03:46 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id d135-20020a63368d000000b00373dd3e632csi16054606pga.798.2022.03.07.20.03.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Mar 2022 20:03:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4145-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=id85rSSt; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4145-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4145-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 641A93E0EA0 for ; Tue, 8 Mar 2022 04:03:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6FA9C3222; Tue, 8 Mar 2022 04:03:44 +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 791E42F33 for ; Tue, 8 Mar 2022 04:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646712220; 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=cE/+bukQ6c+H3/YUczMf1yydHo74H6KafTYxKky3IaU=; b=id85rSStUfYFMMDOiDeYlrVnh+zxI+sbGseRFk+YYRGFgsaD0sGoD6rhza3I/B5KRl6J03 RMRrkxN0lDKf1/ZHQiIxiHlRimYLX+8R67t+z/12u9umZ8vUhRdnkrSLz8J8qPa1OwZoWc XEM0DubqdLBNvnJgGvQ6EagBlifTZuU= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2055.outbound.protection.outlook.com [104.47.13.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-26-M2rk3_QXMfefeyjH6Dpi-A-1; Tue, 08 Mar 2022 05:03:39 +0100 X-MC-Unique: M2rk3_QXMfefeyjH6Dpi-A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MLH+2bxYD2Di62hKKiY6Ilj7LE2BLN1tS+APOEds6MedAICIcErOF5vmTxK141hFUDEHqE/nTDdaTdRc9Omc7St/zzTZOXEFkqvHWzsfZddkRFci/PRj7NRtidTRzJhLUMafzfxjM+S2wqRWBb5FOBI+gBobTBi33T6Ethzq+vRrwnL/XVBuUjGizhjfxOidKG2P7coNe1Vm9i7wGBqnwH7WKykirXXCPezLaS6VGrCaS0s4rXq4Ih1soh1NqYrHMNK3kJ8WTDiJr/6RaAo6fP3N2OZVBDSCHVZt4bHGwU/jMUxtb8RJJFuUTBpgF+bofQZuUcACsRz4GgoOoWPbbQ== 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=O+a025eHOvqxteg7kH0RWEydXfkUNHn/mKaHZDzzpSw=; b=nQdmWr42laigcf2GrtwyQR1bIhRuFDzcyszF1tISas5S1udvTbevWNc1BWBbaK+qAepGppkjQhR96fkDilIkCWkiJIDe8zUnY0tfQeQ+4hoaW0rKT+2Iz4ydhOAkZSHn3ilZ2JdwHqHr33UhTThaa2VAROsBan0J4Ecy/WWgebHO4jNWokf0qm9gYJWwapwVpUA6216Q9iOMNZGATh9UCcPcuEorI6wv0FwKuiDO/os6oiKrqa8IrrPKSt3+2MDFNnJl8FEOKBGSyupNNvorNu+nAuJZeO2wiRUQJZM6ntCKwzszU9WesxojZ0h3VyH6S6+qujrvQKpipbP+HlYCOA== 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 AS8PR04MB7862.eurprd04.prod.outlook.com (2603:10a6:20b:2a1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Tue, 8 Mar 2022 04:03:38 +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; Tue, 8 Mar 2022 04:03:38 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Nicolas Rybowski , Matthieu Baerts Subject: [PATCH mptcp-next v7 4/4] selftests: bpf: add skc_to_mptcp_sock test Date: Tue, 8 Mar 2022 12:02:53 +0800 Message-ID: <522733c62616c526a072ab5f8bc211efad1bbd66.1646711943.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0065.apcprd03.prod.outlook.com (2603:1096:202:17::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: 59ee8e6f-32c3-4e68-a9e6-08da00b89fd1 X-MS-TrafficTypeDiagnostic: AS8PR04MB7862: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: 9AGdznzeUwwUPvoqn7crbVaMx+LEzsEmXIv4RXCfqDhcH73kqD9sSBZ/cS95AU3FVbtNZOr7Ebk62ctqWZG8zTbTNXVRL2GNkRLbXITFGJH2N6RT6mk95nT0HTgL4mAhlZSmr6qaL3zYSa23ofGwNvDm7hqtJlqBLZZ786LeLWDJHGzZV3pRy/OoP/0XKgf+F9OucSKfN+WonwXrojUnpJYIqHPMaSITtwJvPTqchuriqp0VCGSoZG2Fg3vWf1TX6g26+ZIf+niPE82nhWkwbrm3a8u/9U7qGkSlm9t9TIZwfEVZXq0kwo/NAkrS3f/NLy/utV4sX2pLx85HGQb3+OnS82MaTw/qz9R2nCvt+yITO476jDi4QQCRZ2TSooSY7nPIO05pN7Y2PRMTLTNrJKuK10IebxDAXZKpBUvpa05zRjtOFtOkRwcNMLYXh2DgPpO6d7EEoj3HrdMMZ56dF2R39dQFF9snTQqTwmliLXtN8hEBl1BHK6MNrUxHyF6U7TUgfGbr6qT2kdWNSwTdIpUJeP6dw0LBKNB6FIcAKUrq3g22ckuHlP5kVL3P8nipmuncTTsdWx0GiKZ/M7h7STP2wnuSxP/1PpzAQvxl4FJztGQK8dyrGhWCyIiKoxNM9Lo/acUXELgmtDTFhtW5M6ylPHnn34IgHPtu0s70t5/a1hMGyfLbBaXILWJbzIkNIEfAZnGxs+TbeVAZc7PBhw== 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)(2616005)(26005)(186003)(6486002)(6506007)(6666004)(6512007)(38100700002)(508600001)(4326008)(83380400001)(86362001)(2906002)(44832011)(8936002)(6916009)(5660300002)(316002)(54906003)(8676002)(66946007)(66556008)(36756003)(66476007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+etE3PCYnKnnvIrTAABZSuIpXBv04cjyIk7zCOI9PPQZTwxm4GWnr2jY9/xk?= =?us-ascii?Q?tVQWD+w2rEH2kVF06fqMxfdeRVMhmRqAC/e5zABwYPH9Ea1EedrGgFk6Wo/d?= =?us-ascii?Q?RNXGETV2t3QOBrXCkUzXehfTKR2srcZdMkkNIHCEOjnaA6jR97ERj8dZrZqH?= =?us-ascii?Q?TEw5cojtmodlJDRgcoOwUkQvjq+Y0X4tZyMV5udRNQLxRUfwX+SE7vIRTAi5?= =?us-ascii?Q?rRwblFDjguZMAIWrKLf7TnoaJeHJfwZguEe74fCwo8JSmhWhruFAzTBuyd8d?= =?us-ascii?Q?dwLTmqoAa7/32hpoFpDao/HpQt9guApwjh+TTO8xzk7sSDdyxtMelWKv80wD?= =?us-ascii?Q?u+kyhwvmKUPVTiQJbghoXbL5rj9VnBNg7hZ+k0m8najOmlQJn9G2OcSCDZPg?= =?us-ascii?Q?c05sx79jx5mD3C5Hgfgx6wYOqFM5CgDmfWokKtYa28RjUYuBMHaTR347XE87?= =?us-ascii?Q?XnVhbH9IjDr3zxexBPY2vSDDpWYDbyng7cSCTSNxkarSXz2I5ozEbIqz0Yo5?= =?us-ascii?Q?+9wqpeJDDAjp1ELjtzto5BfJ8HE7EhWZy5r2qAFMbbYEN4NLojGHkmOwKC95?= =?us-ascii?Q?L6XltBAGU69Pjk8hotmhMPDRkt4nLVtEwkQ/vEFvVM/LESaj+2GOWgcFDBII?= =?us-ascii?Q?jlxLAGYyEGCofA1LXiuNf/FgOprhnPTEvbYAn8gvvTwRXky9V34iM1r+R244?= =?us-ascii?Q?Nl5pvCrqNweZxcU3XgBGnyjt/rgVIiM1SVuXJjIOsMiOfy9hB7+rFaKe6n80?= =?us-ascii?Q?iedquxf0nFpsBsyiOFjNY4DitFupXHvFk2o3+xF1XNml35RpI1ZtsYQ7jiUF?= =?us-ascii?Q?RIoNfJyQbe191dwHuwQzt9FQIqw5t6FFgvG1g8DRd77BY8oY0Ci1jUxQa4hY?= =?us-ascii?Q?UZnbGSsrrMatIlvdaTcAQq71ODoVVGkS9GWxw+WIAXdwlMf+esKC9JckYrr5?= =?us-ascii?Q?HbyJ3Wok3+uOZhi9GFxxQrEbl7il94nm5zpfeb86RgfEcAQfynI5cE5DrmIj?= =?us-ascii?Q?qQVylLm1GP20f3DQtDiULnRtTwLGV/H7S29Z53wOMX/w+WHANmjyA2sQ+4GP?= =?us-ascii?Q?8eJdq19qJnzj4ahLr1Pe+loVRo67nhSXixtL1TBDAhwhc8ckoYJLggJ9dpa0?= =?us-ascii?Q?fCK/mKXRHzjwaDTC7Y/eCT1/u5xK/K2bFspGaBNRGTGouFejtl2gFOuzkxfr?= =?us-ascii?Q?sgsBxUIkIVgRsv0TOVsgFD2BdaZNbZ7GnMiyPBABCxMv3D3cvRH00Z3N8jpv?= =?us-ascii?Q?FQSM/UwMmYn1Gza5ggPq94KbZsLqvzZSLvXXuT4kQUO1yTZlTmyvKlK8JatX?= =?us-ascii?Q?kRj/dxH8411gGgALk2gc+WXMb8/ZPj7jkFbqfFIDlag5CWJ6RCz54G66M5au?= =?us-ascii?Q?ABvnol5McsIqArO+HkoOLEDoCVX7rZzaEU5LTwAlgE4YADJYjxuFoou4cgfe?= =?us-ascii?Q?KmHtSdaDJ4pgcsFxqym/93vLBThpEmDb9sxS/du51PhRivPSQ9w5GbRX+mgq?= =?us-ascii?Q?ws2EXAgJKIcxTODIbPQu9zSe27egxqf3qhAac/E2O02cmBIwEITAxUIZ4oYo?= =?us-ascii?Q?IwuxX0HyEYXaJfMSp92UZopRJE9T/ntVXscaBBlFHQdeh0/gUXmYIu+yH2qH?= =?us-ascii?Q?wfBEf+71bCM2cKa4f/FcnYI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59ee8e6f-32c3-4e68-a9e6-08da00b89fd1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2022 04:03:38.3209 (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: i6hxi2BcCXj3UIZFcSzNIaAwYwIYhFl6lAambJHgKDHAMa1OPIWi7KvdM5xtttPUBjZHr+/H0ApeFX18gLRTMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7862 Content-Type: text/plain; charset="utf-8" This patch extended the MPTCP test base, to exercise the new helper bpf_skc_to_mptcp_sock() from C test as Alexei suggested in v3. 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'. 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 --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 ++ .../testing/selftests/bpf/prog_tests/mptcp.c | 73 +++++++++++++++++++ tools/testing/selftests/bpf/progs/mptcp.c | 19 +++++ 3 files changed, 98 insertions(+) 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 04aef0f147dc..d60525d5124f 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -3,9 +3,12 @@ #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) @@ -42,6 +45,62 @@ static int verify_sk(int map_fd, int client_fd, const ch= ar *msg, __u32 is_mptcp) return err; } =20 +static __u32 get_msk_token(void) +{ + char *prefix =3D "[ CREATED] token=3D"; + char buf[32] =3D {}; + __u32 token =3D 0; + ssize_t len; + int fd; + + 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, __u32 token) +{ + int err =3D 0, cfd =3D client_fd; + struct mptcp_storage val; + + 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.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; @@ -79,6 +138,9 @@ static int run_test(int cgroup_fd, int server_fd, bool i= s_mptcp) err +=3D is_mptcp ? verify_sk(map_fd, client_fd, "MPTCP subflow socket", = 1) : verify_sk(map_fd, client_fd, "plain TCP socket", 0); =20 + if (is_mptcp) + err +=3D verify_msk(map_fd, client_fd, get_msk_token()); + close_client_fd: close(client_fd); =20 @@ -89,7 +151,9 @@ static int run_test(int cgroup_fd, int server_fd, bool i= s_mptcp) =20 void test_mptcp(void) { + char tmp_dir[] =3D "/tmp/XXXXXX"; int server_fd, cgroup_fd; + char cmd[256]; =20 cgroup_fd =3D test__join_cgroup("/mptcp"); if (CHECK_FAIL(cgroup_fd < 0)) @@ -106,6 +170,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; @@ -113,6 +184,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 be5ee8dac2b3..7ddb73dc69a2 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 { @@ -44,5 +46,22 @@ int _sockops(struct bpf_sock_ops *ctx) storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; =20 + if (tcp_sk->is_mptcp) { + char fmt[] =3D "msk=3D%p token=3D%x\n"; + struct mptcp_sock *msk; + + 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; + + storage->token =3D msk->token; + bpf_trace_printk(fmt, sizeof(fmt), msk, storage->token); + } + return 1; } --=20 2.34.1