From nobody Thu May 2 05:49:36 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp622342ede; Sun, 13 Mar 2022 03:59:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzssmWTtr9R0jh/LlRaBd3AgfCvm3O+e7hYFhKDR8sWHT3w9B3Eg2lLG+2ApWbgZiV3dxGT X-Received: by 2002:a05:6214:d67:b0:440:ab2b:b2e3 with SMTP id 7-20020a0562140d6700b00440ab2bb2e3mr572994qvs.71.1647169172632; Sun, 13 Mar 2022 03:59:32 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id w15-20020a05622a190f00b002e07148ec05si6446342qtc.211.2022.03.13.03.59.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Mar 2022 03:59:32 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4220-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=TtnLHU1r; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4220-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4220-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 405801C0E6C for ; Sun, 13 Mar 2022 10:59:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 33C32A4C; Sun, 13 Mar 2022 10:59: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 80655A46 for ; Sun, 13 Mar 2022 10:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647169167; 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=96gp+xDOUKz2nkxzu1pslLJnKIKTgNg4aMpwpyNVUkQ=; b=TtnLHU1rTA4fXj8TUAAVph+x0uEKnuyFk0x2yWwpmCFwxtgsNAoBqj0T1oGyok9bscAF60 F9763E8og9KgBHGuGdBpIlN67L3whIbFXm2lFpuOVi5eKRk5PinAj6uj564dUAkrjfCsQn AKAQs4wum8dGnrBY+sqUn1JbDgTZOUA= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2109.outbound.protection.outlook.com [104.47.17.109]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-CGyBVZ5bMSuXF81NVagbIg-1; Sun, 13 Mar 2022 11:59:26 +0100 X-MC-Unique: CGyBVZ5bMSuXF81NVagbIg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cMbbKx2xueeVy1AfVzBhMdNVyU0y81mXN9l0g5PcYcHghZSfq6nL51mDYzZhclmqiQEsl70OplhLxH2WqnM1ZTwHvIdP2ZotbRaGG2R4XXICRouhq37hygTVxSMXEjIIsAP/u7rYSnmwSwGcaBbTwrnrtPgrIohQW93N9UGLgU6kzGhECFBmcelOm/EtseDa5idCMqMTj5POI/yDQKdMDGxIvr2ezFUrLrIzb7VopsuhyqdrN6xr6kR60n1adMqVcPP4Fa+7Hi6oLGtoJTBGKOVKotHx7pYovBaDdP/ui1GBJSVRHZafUeOql+aF7AFDf9eqd//CP5wNmvvPK8TopA== 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=Bwv9Z5SMmd5qjqtFaYOnbluR8kJrkFOUVCLlwPAdCb8=; b=YQhgEvdOCsUtZ2FcJsuqFqbc164HvN7YA0x2RfRD9qcea8usa9X9Uqrb28w5rG7ss1XyOhPI2WVOE7zS8IipUquPWVwwxeBruP23IIwc9dzmSNFEncbykM/+8ziaR5TOUJvIznLAFH2tYqYzSJJvRjsss5yi3TLIIToxjMCFgaui78sQaCXMX1AkGjcske0KOe9sValdMq6u+V+Z30LWfO/uKjMUxUQm9NFmQmv+IP33Civfcz+Xb9nfxsrf6KknNSp6I3Fp/SBcmhy/uhdRTuWmO6Ft1asvoQQePneBB+g0GNu2q9b/oAfGbtSK9LE+nz6RBU/QRhc5qDEJY/VxBw== 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 DB9PR04MB9283.eurprd04.prod.outlook.com (2603:10a6:10:36d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.25; Sun, 13 Mar 2022 10:59: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.5061.026; Sun, 13 Mar 2022 10:59:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/3] Squash to "selftests: bpf: test bpf_skc_to_mptcp_sock" Date: Sun, 13 Mar 2022 18:59:11 +0800 Message-ID: <7c826fe90ab1d4aa3a1d604b97dfea94420aa778.1647168955.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0048.apcprd04.prod.outlook.com (2603:1096:202:14::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e9c485b-a6fc-4ad8-154e-08da04e08931 X-MS-TrafficTypeDiagnostic: DB9PR04MB9283: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: LHyP+als8ch5TjBmlKvKaM9F3G/Ox97T70lZWi9QIYz+BFvdsDkx/23S5o92cQlu3A1kLp34jnn5563q6j7OnnuVjVboHU30NYuzQE+tr57iwCVuLH+ks91PXUYQjIQYb0TYElfGH/y826qQ6OsFSDCejksNi3XtONEiaOmWgUzPFYifeFmlKAKdIgBAZyPIlJJI2of588JSamKKsdzJWommZMVag5wVIKR9vnkHqlvvGjRGXtWJ7WaiSMFlZacXiK/OjZcNXbtw+Zx3HWd/BT8g9+cS8AYN07MwikIybyQuJ4h/OBTtOdS8Qr8KrAH7v49vWJ8HXrjhPYmtaxOdEX/JOpFKzaG+W/2GxdcAOUh7u4Dzo0mt1R55nlKgxb9kWMff0ma+GMFDrlQByylNeq5WM5wTl4+Gg1YN+Hl8lJoUhZb7Q39nW7TIJ6B3hSSuVrby1zedFQMwhIXvTibVOPmYdtqBmReiOv8wExCLCt/e4AFXTlCWsAlslRTxMJ7EJEs/Tq4t6UfUsyI7asMwWSdV1oHf/shbOyiWv+4SHZLz31AxXfqELop3RDC0L2/NeJRt8B7VKyvbzPMh7F+cE6ecNf4XhXN5FXrAzaIdmmfz1rmNv6EVS4Vx2PHUuwJMlTvvpB5nvrJKDAoS/zUueI7k6otO+3YXrUwiKz68YCI5Vs4PKe6erxrlD4fHezXzCQa/gRMsSmVDbTn0KQNotQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(107886003)(2616005)(38100700002)(26005)(186003)(6916009)(86362001)(66476007)(8676002)(4326008)(66556008)(2906002)(316002)(66946007)(8936002)(5660300002)(44832011)(36756003)(508600001)(6666004)(6512007)(6506007)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Mzbx2WAxLpIA+YyioWRTFTCfq9T9zNC1ucXaDlfVJbcw9jyZ9Om0dEze2KhL?= =?us-ascii?Q?7JJIR3GotXcQM+1gVdUT8uJzIidZGukvtplO1M98xIvrGTUTeOcZqWRT7172?= =?us-ascii?Q?jEs6xMLhdNNPnkLHKReHHBSRhMuz8KHE8/VJB3FDA8lS3YKQXwzEvSfh5HUP?= =?us-ascii?Q?yxWKMJaOs92U5pRhslMYA8Ez4ad7W3Sc43JpQstipMMdCuX6x2X45O2DJOdg?= =?us-ascii?Q?j75n7AOW2ml77ls5C/hEzxs1shbrzMyTwqzNdrUcOEQTuQgsjOx7sFrnWQYn?= =?us-ascii?Q?HD1k/GWwRvK7VlNZX2lBOQlyDBEdDQVxzjaBEC54H1l+o4aCNj1iXGikBHbF?= =?us-ascii?Q?jnNFEc1wWK1RX4PTbRSu9IghrELxk8+Fmk1KzocSjQXiSDq409yt3tFS5Mv2?= =?us-ascii?Q?oytlmHnsgKnaxboGa6tdZMRMOB7bpg9wUJ/AV57VI6kNcZaKBDM42jinRjKA?= =?us-ascii?Q?3EZBqk5IsSbiVNG34TY4g62z8N0OckzyubIRm5pHqE9bs5lzBJGoS1Ucq4Z3?= =?us-ascii?Q?RulOGCnRcemy8cslMt+GtmwwaYULbUx+sOOUKKgsBN6XV3rmWT/AxCO/JOpb?= =?us-ascii?Q?Y2vaMtbP6+thQx1ZbmbDLuij/EmqimUnlHf+ihGG2fbWpLXOwoTvziznFaMv?= =?us-ascii?Q?hHi9OA7A2c/+McVAhLollY8miWadtUm91jchlF7ni1y5MS0CuNEsIDvzBoZt?= =?us-ascii?Q?n3XheryRAhFDWaBdCCBLDZCc2DLmqPTRIi2CCoOudt+EQZSVuwDIYBrmhdfR?= =?us-ascii?Q?URVyYEoAQ2OIiOWoXc9hg6xHhAPg+TUOB16dbLs25icmmay0VwFje87zTHPD?= =?us-ascii?Q?B3ELHFecOrtPR1OSv7MYDQF1Q/1S0mK2hQvikx+V5q3S7n+GKRzSMH6By1JM?= =?us-ascii?Q?ke6i6qQPiy76ihm5qBesv0omyMnzKr7dTXFL0klP7MEZkIgkJhWAfHy1iatM?= =?us-ascii?Q?biUF0hX/Du77vORuF0VXLZqdwfoNhXUkw5P0ieu5XgELOcimjAriYdbJkCqY?= =?us-ascii?Q?olFFpI/s+ShZsI/KLyKwPTsOLm3PVOr6He4TiefJfuZ8NpbE7uoYdf8KN0IC?= =?us-ascii?Q?xj3Ie01komqn5xTqXy5MtdndULxatmPOWw2JfbmPBbDJXwUBm5dx0H0Yjk3f?= =?us-ascii?Q?gJFbmvhGsJuOgBtkOBTolWcBS5N0XGT+DnwoCEM/6CMzwKDo3B37xULalF6V?= =?us-ascii?Q?k+U7+DgwA4s67u4Wu60/n4P3gcH5cD/s8x05KuZPGJ/o3pBmVG8It+9XqHo9?= =?us-ascii?Q?cA4hIshqPQG3hFpjdXIfpcsyQEhCtcVChIuS/oHRzy/beSQWb/62v+7cQqzH?= =?us-ascii?Q?ml9QKZ1pRQqGplOyl0tg0oEk7eZJlY3jRv2c2rJSU58JSfEqaL33boy4xPT3?= =?us-ascii?Q?SKwge9nZA1+2Ol7KDLB1ku19PnjOxH9JAh0DcF/ct1aaouSofPct3I5TYMVm?= =?us-ascii?Q?v+jIBglXhU00eDvzpBntOBkDWOBeSPcy5kdL76HwoQMFAc788a54yQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e9c485b-a6fc-4ad8-154e-08da04e08931 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2022 10:59:25.0195 (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: ts2pf5QcFq/iYEpg27wmqU5Vh6tk/tYavWlxCz4n7jRY9Lso2ZClq8U0UD+wDO2NApVnQEIVHl7O8vu2hyn34w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9283 Content-Type: text/plain; charset="utf-8" Some small cleanups. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 2 +- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- tools/testing/selftests/bpf/progs/mptcp.c | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 05f62f81cc4d..9ea6687c8f4d 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -86,7 +86,7 @@ struct tcp_sock { struct mptcp_sock { struct inet_connection_sock sk; =20 - __u32 token; + __u32 token; } __attribute__((preserve_access_index)); =20 static __always_inline struct inet_connection_sock *inet_csk(const struct = sock *sk) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 035a87755b94..80ae5a9777bf 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -56,7 +56,7 @@ static __u32 get_msk_token(void) fd =3D open(monitor_log_path, O_RDONLY); if (CHECK_FAIL(fd < 0)) { log_err("Failed to open %s", monitor_log_path); - goto err; + return token; } =20 len =3D read(fd, buf, sizeof(buf)); diff --git a/tools/testing/selftests/bpf/progs/mptcp.c b/tools/testing/self= tests/bpf/progs/mptcp.c index b08448a12c02..928111f56f69 100644 --- a/tools/testing/selftests/bpf/progs/mptcp.c +++ b/tools/testing/selftests/bpf/progs/mptcp.c @@ -22,7 +22,8 @@ struct { SEC("sockops") int _sockops(struct bpf_sock_ops *ctx) { - char fmt[] =3D "invoked=3D%u is_mptcp=3D%u token=3D%x"; + char fmt1[] =3D "invoked=3D%u is_mptcp=3D%u"; + char fmt2[] =3D "token=3D%x"; struct mptcp_storage *storage; struct bpf_tcp_sock *tcp_sk; struct mptcp_sock *msk; @@ -61,8 +62,10 @@ int _sockops(struct bpf_sock_ops *ctx) } storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; - bpf_trace_printk(fmt, sizeof(fmt), - storage->invoked, storage->is_mptcp, storage->token); + bpf_trace_printk(fmt1, sizeof(fmt1), + storage->invoked, storage->is_mptcp); + bpf_trace_printk(fmt2, sizeof(fmt2), + storage->token); =20 return 1; } --=20 2.34.1 From nobody Thu May 2 05:49:36 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp622371ede; Sun, 13 Mar 2022 03:59:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxu7oLKXymD1Qpu1SsG40aNWM5BX4rNKJrkqqI/b8tTKpkQV07sgaWVJWmZb67fUQqzr/O X-Received: by 2002:a63:d045:0:b0:380:c32e:3f59 with SMTP id s5-20020a63d045000000b00380c32e3f59mr16015695pgi.625.1647169178781; Sun, 13 Mar 2022 03:59:38 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id p5-20020a170902e74500b0014fbc90f619si13230375plf.348.2022.03.13.03.59.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Mar 2022 03:59:38 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4221-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=Vo99a2f5; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4221-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4221-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 2FCA13E0F68 for ; Sun, 13 Mar 2022 10:59:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 44063A4C; Sun, 13 Mar 2022 10:59: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.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 5F482A46 for ; Sun, 13 Mar 2022 10:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647169173; 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=HOEOdw14pDykTt6YIAuKv+FOYOgk4GJugxNkPtgNKSQ=; b=Vo99a2f52ycSn0n/kIx2H7Heb3d1LjS56nWoTdAIJDyUPOSNBVsRU1NrzTCkdO/GM6ZH/f uStXMC1oqvJEeMe2FIdr+snGLWfH54pqIuE4lAyBRHkamxejtzCzXhTGdU6zgG89PFq4AK CDM5ur49My6VKyQfhP5NU/PWTE+qClk= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2104.outbound.protection.outlook.com [104.47.17.104]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-ht_dxphuMSSfxYSWNkjkuw-1; Sun, 13 Mar 2022 11:59:32 +0100 X-MC-Unique: ht_dxphuMSSfxYSWNkjkuw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qh/9Zg57qDHnDse9R9/MiyvFqqJ23FBI9VJyMEjf+gzNgAg6nwyk9nT7ana3iE+/CQGTAuvRCb4AwB6qutw/7V/QyWzCLheoxipJPPt7c8qA6lY2FA/e6AUcKJnDAJJaCGgE2xoijb7ngMyVb/rnQt9pjMJsdhiMDXOw++tya8UVrRSRy4kvrJa3VA71BAqfzpuW7tF1vmt4/M1ndQ6ZQHbZqXeRtdG94Eb4se1NKDUyu98w745/Q71fLJX86ZOiscrweAuufUCuulg5rQqS/fip1J7gScO6fUMD983qPEf2tGdIhugilbRWfRf53zW6O/eNc2pjmmWsEwsrND/ATA== 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=uG7RWQ6QufPqJ+FFMWAzMa45vyIW0j78rZ5gJHYF+yg=; b=XtSLNKChu1vlJ9UzQbfdxWa58HqA/Bk1lWUdOWiSfBrcnHPPdBMwITxQA7svyVQHxbt2nw+5cjpZdw71XfFGx5iUFE1ySbW721rZWXqTBSyZe01Y6h8ZnCIasRW4WEfSnMDT6rI/apLP3wdcqriTmg9PlHWXSXefpJVBB3hk0sB7pAlhLrymFdk6dO080mk8WXpWfErjmaCjetRXnTJbQL3TydY5b7C1ZCNBt+SsqJvT3jMIkxP+jJv5NBTUYJfUhcOgClknBRm4I4vdcOEkzLB79Y4T0gKIEOX0d5+g7BkHsYN4ok//CqCp+pPzXmEEx/g6+7WWcJ3S/47Bn5Vt6g== 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 DB9PR04MB9283.eurprd04.prod.outlook.com (2603:10a6:10:36d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.25; Sun, 13 Mar 2022 10:59: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.5061.026; Sun, 13 Mar 2022 10:59:31 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/3] selftests: bpf: verify ca_name of struct mptcp_sock Date: Sun, 13 Mar 2022 18:59:12 +0800 Message-ID: <02c05e67dc58698cdebb95664f1d636c64259973.1647168955.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0023.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: 359acd7f-4584-4a08-d517-08da04e08cf1 X-MS-TrafficTypeDiagnostic: DB9PR04MB9283: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: wvmHAqfrkaHcWhtPjkjb+OgttDfuJ0XxinLyJzU/6FgFH+ZhkXBvKj0C0WGxF4Yc7z9S64C6AdJ3ARNl42d1JYzpYuYxTFTso2mobNf2Uuws5q+rYgnVA0oej1J1RmFBIL2DqL7bv5BqCSF4Szjx7uBJkpR5wBxntGt5bbTQjdGgyalQ/+mkSIzPD4WIghNp57+SSpnht5S3FRV28TuF5By2xm5qUzNlI2f1We8dwvyXlwvGDN9xsmBaDG4WgMtqCfRvbfPjtGV3Dv6rX3raYcJyRiBMqNbuT377VSQqKtxu8MuM+CGG0mB5NbbuOWb7ljlkBGJjTwAtpdLnanMX39Jca9XXAg36rchvY7OHTHeEiVCCYKGlTvbZU5FfLxdq8E8D/epGZX5KjeGTrMKq3ibWKjwEjCqwSeDUnsaRhMJFE8Xn4km2bgWYN+rJzJDS4Otj26aluFt6qu0eOXVkB+t+l7AeFjT7JLmy5tHAkbgwqSBzrPG5fVGxA27rpIBsC/pIiQ6HBtrZjg4BYWaVl89qOQYzS1u8+FQiV3KQ3EgiBIE1zWQtpPvJqOTrAWQYFG8tqKIRpFJ4qjveHJ3OFNuU8wTTWcph4EJR6I1h1oeE2tJ0l0WanavNqCIrNr/gEEtHqOVgApZmU+fbbNmwHzf5LOQyN9w0lEgjmGDrsvoDvfYpObBZbnQYS90z8MON X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(107886003)(2616005)(38100700002)(26005)(186003)(6916009)(86362001)(66476007)(8676002)(4326008)(66556008)(2906002)(316002)(66946007)(8936002)(5660300002)(44832011)(36756003)(15650500001)(508600001)(6666004)(6512007)(6506007)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EssGOIbJ/02dkSBz4K9Og2ucGCur2SgLAGdvoYxq1O6h2+xUVzr3fu1to13g?= =?us-ascii?Q?4wc+yiegvO5TRYt92Qwb+NPiEFfjNEN/jTj6Q8vTYAYK0WQZ2X2Y2eIoQWLV?= =?us-ascii?Q?20eA9RD4pdKQVR1chs34e9FEKKGS+4YZPPsa4x/EQn88qkD6JVwMKQgljYN+?= =?us-ascii?Q?KfgyDpB3xFEjfVCEzr3anOo1zAn5kK2d0WGqHIRjQVWFvH2oFTIRpeD0V/So?= =?us-ascii?Q?qHBROmfGGFpcwPSm3tMbGnc9JEkuNDcIgnhVRC1UmOuWvrJJs8TgEpr4brOu?= =?us-ascii?Q?16UwntV579rvoUCHzlAsN3xJDQU2l5ZuzsjUTVAFOWUVVfusl0aHWsUSnfHA?= =?us-ascii?Q?+lXOEjhm300dqgeHAV9ynxsGj9auZ11rtWVutw7utm2HubBJcn5HGQs9JUYY?= =?us-ascii?Q?d1ourt5V6zU9aHUg3h8AMvLLb3KqDF5UOanCLkW4H+2O4i+vNR9r8Nmb7iN+?= =?us-ascii?Q?2gCmDCSPXMB7iBQkfgj53U+U0BgrP24xJRvAXEv0jkN/mN06UcTuDgP+4dwI?= =?us-ascii?Q?ovA06NN7R9aoiTFTXSWnda1P2jvn9G9rL49dWW4ph8iNmbzudXNBBz9PIBFA?= =?us-ascii?Q?WQfUW02RjBgpmsQf/qFc6++QQLSePp/+oovXLL4w0x3JDJpmLzqhk7kOyn7b?= =?us-ascii?Q?acTd9rgEeefRmrkhoYYk7lz4mDcy7k+1Kz9Wc4hon8MWw2RKWoCXjiE+xGUm?= =?us-ascii?Q?k5UntTtUCvPWh6RF8rwEgTDRqc9BPrX+Fca4cUQogIb5B0e2Xw8KcfuZi+it?= =?us-ascii?Q?uwIOEC14C9DC/14wo/aPX77+FyOW5ciR8sZOgmWo7nr6DefUUq+bPAgoLrhc?= =?us-ascii?Q?neJ2N0E25tLKSGMwrVsKTjObvZrFp1/xwW/A9hT3cgTXw/Cg+ZI64ovopmLc?= =?us-ascii?Q?1Q3nHq43f5Yv6B8z2jQqcLFBXs7hbXzzRMIrmsC3sajj/db2nW/CPbPYkbt0?= =?us-ascii?Q?4xQI8nexCgvpODOEBsFI/xC71TD6WEB4eVnVxQ70JW2k5ZoB/+ZtOB6wbqdd?= =?us-ascii?Q?DO88RTJL4utL9g3lX67sDWMTQEKibaIUVlYGhI8v1JyLSp+fwS7SLCOF17Cf?= =?us-ascii?Q?SoTZ4PONnMyUfF3Hfz9hSS/RUA0nXRZHCjY/tfZbPci2qKGWplYwG5UThQpm?= =?us-ascii?Q?baXYn4AdlxWOjK3bOuel6bXwd22OEyXrtagEGgkcTCqQGc9JEehLlAWb04ZM?= =?us-ascii?Q?SIFWpniy0OsLZPGppXIBDJ9G2RlVPsHcOHsYoRsMDSJZcyUEnm0hntHz1/4B?= =?us-ascii?Q?Qgy70MmsDJU2BJ75/4b36btliE5vAB8kxB4pTrW5GLKfV736XvpadpzVg2Fi?= =?us-ascii?Q?Pk1wAqtF+tHaDir1ocq9JC0tUSgS2arwg/oES4gHc0KK0FGxyIz/EOMR2e23?= =?us-ascii?Q?4YSHq5OpTTWC7P2ziwwccISCuEUUA+/sSQLlIbP0OfHypnudnezkFrq1Afkn?= =?us-ascii?Q?tLmi+GqgGbH+4/5RCn6lztHWIiWtcVTjl7p922NI3hR9A73D4zblRA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 359acd7f-4584-4a08-d517-08da04e08cf1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2022 10:59:31.3159 (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: HKrOFFeOF5Ri9DE7UprSHi00pT3J+fAjAKOuBlGKooY/zxiKFEbpxOijSA9QOXcHem63awsknu15GHoLImAljw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9283 Content-Type: text/plain; charset="utf-8" This patch verified another member of struct mptcp_sock, ca_name. Added a new function get_msk_ca_name() to read the sysctl tcp_congestion_control and verified it in verify_msk(). Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 3 ++ .../testing/selftests/bpf/prog_tests/mptcp.c | 33 +++++++++++++++++++ tools/testing/selftests/bpf/progs/mptcp.c | 8 +++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 9ea6687c8f4d..57de5ca5ed50 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -16,6 +16,8 @@ BPF_PROG(name, args) #define SOL_TCP 6 #endif =20 +#define TCP_CA_NAME_MAX 16 + #define tcp_jiffies32 ((__u32)bpf_jiffies64()) =20 struct sock_common { @@ -87,6 +89,7 @@ struct mptcp_sock { struct inet_connection_sock sk; =20 __u32 token; + char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 static __always_inline struct inet_connection_sock *inet_csk(const struct = sock *sk) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 80ae5a9777bf..aff35ab33379 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -3,12 +3,16 @@ #include "cgroup_helpers.h" #include "network_helpers.h" =20 +#define TCP_CA_SYSCTL "/proc/sys/net/ipv4/tcp_congestion_control" +#define TCP_CA_NAME_MAX 16 + char monitor_log_path[64]; =20 struct mptcp_storage { __u32 invoked; __u32 is_mptcp; __u32 token; + char ca_name[TCP_CA_NAME_MAX]; }; =20 static int verify_tsk(int map_fd, int client_fd) @@ -77,14 +81,37 @@ static __u32 get_msk_token(void) return token; } =20 +void get_msk_ca_name(char ca_name[]) +{ + ssize_t len; + int fd; + + fd =3D open(TCP_CA_SYSCTL, O_RDONLY); + if (CHECK_FAIL(fd < 0)) { + log_err("Failed to open %s", TCP_CA_SYSCTL); + return; + } + + len =3D read(fd, ca_name, TCP_CA_NAME_MAX); + if (CHECK_FAIL(len < 0)) { + log_err("Failed to read %s", TCP_CA_SYSCTL); + goto err; + } + +err: + close(fd); +} + 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; + char ca_name[TCP_CA_NAME_MAX]; __u32 token; =20 token =3D get_msk_token(); + get_msk_ca_name(ca_name); if (token <=3D 0) { log_err("Unexpected token %x", token); return -1; @@ -113,6 +140,12 @@ static int verify_msk(int map_fd, int client_fd) err++; } =20 + if (strncmp(val.ca_name, ca_name, strlen(val.ca_name))) { + log_err("Unexpected mptcp_sock.ca_name %s !=3D %s", + val.ca_name, ca_name); + err++; + } + return err; } =20 diff --git a/tools/testing/selftests/bpf/progs/mptcp.c b/tools/testing/self= tests/bpf/progs/mptcp.c index 928111f56f69..61adc4396abf 100644 --- a/tools/testing/selftests/bpf/progs/mptcp.c +++ b/tools/testing/selftests/bpf/progs/mptcp.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include #include "bpf_tcp_helpers.h" @@ -10,6 +11,7 @@ struct mptcp_storage { __u32 invoked; __u32 is_mptcp; __u32 token; + char ca_name[TCP_CA_NAME_MAX]; }; =20 struct { @@ -23,7 +25,7 @@ SEC("sockops") int _sockops(struct bpf_sock_ops *ctx) { char fmt1[] =3D "invoked=3D%u is_mptcp=3D%u"; - char fmt2[] =3D "token=3D%x"; + char fmt2[] =3D "token=3D%x ca_name=3D%s"; struct mptcp_storage *storage; struct bpf_tcp_sock *tcp_sk; struct mptcp_sock *msk; @@ -48,6 +50,7 @@ int _sockops(struct bpf_sock_ops *ctx) return 1; =20 storage->token =3D 0; + bzero(storage->ca_name, TCP_CA_NAME_MAX); } else { msk =3D bpf_skc_to_mptcp_sock(sk); if (!msk) @@ -59,13 +62,14 @@ int _sockops(struct bpf_sock_ops *ctx) return 1; =20 storage->token =3D msk->token; + memcpy(storage->ca_name, msk->ca_name, TCP_CA_NAME_MAX); } storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; bpf_trace_printk(fmt1, sizeof(fmt1), storage->invoked, storage->is_mptcp); bpf_trace_printk(fmt2, sizeof(fmt2), - storage->token); + storage->token, storage->ca_name); =20 return 1; } --=20 2.34.1 From nobody Thu May 2 05:49:36 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp622404ede; Sun, 13 Mar 2022 03:59:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgLZ494o/IJes2I1zRffqL+23qo83lTZAARx8uD985K7mx1zuSneCBYfY4qpLcLDOLTW4c X-Received: by 2002:a17:90b:124c:b0:1bc:369b:7db5 with SMTP id gx12-20020a17090b124c00b001bc369b7db5mr31036771pjb.179.1647169184658; Sun, 13 Mar 2022 03:59:44 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id j25-20020a635959000000b00378a2926d7fsi12651565pgm.530.2022.03.13.03.59.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Mar 2022 03:59:44 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4222-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=mpS8wANh; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4222-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4222-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 1AEEF3E0F68 for ; Sun, 13 Mar 2022 10:59:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E789CA4C; Sun, 13 Mar 2022 10:59:42 +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 3BE24A46 for ; Sun, 13 Mar 2022 10:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1647169179; 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=TnowKe6x5obPQmpFPENqjOny2LgfEVNRcdMLdbPqOXY=; b=mpS8wANh6Cu0r/y4lV8M4AhJzcfDVB2li5HyozgscflXI8FZq+jPfwuoJtBzZ+/uJkWFY0 xoSJd5Gje87OuUSfj7SZVvZHUjg+lW7JYIEp4AO7dP4O+t3n0cY5cJORSCarOSHoU6GIg6 nsauLwbyfe9neZoVmT18AOMo8ktaxp8= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2104.outbound.protection.outlook.com [104.47.17.104]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-MafBChIMN_KFReNL6TzMpQ-1; Sun, 13 Mar 2022 11:59:38 +0100 X-MC-Unique: MafBChIMN_KFReNL6TzMpQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F8K3v22aC75KwMySba2h5758KdcvSsqqYuBLPxhbzXDqtgAiO8FaDnNdNtCZQTXW4m1wjubeeTELY5Zi0vtzsK96Sl1eHCsJPxsGruDEy48L62bseHOuA3dP3tAEMQnzrjGesf3bL/U00UsXIDHSWCa3zPkcE/zN4yz3mu50LRwhYjT0sd3wz/MM2cURQ7bQxlmIYPzdit9r/MvcKcsocKIaBex/fabJBWY8lDI7rqaUvi+Ngm9kXTfGU1e+82IDflmMl5MwyTG9Eiwah1Ax1G4bhufxVeifGzpQDs76FcdK6Dxu2Sk/aCCm1S33i2xk241E4wrHk8GfwxzbkYw/Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I/gViiPl9cNM++9ZePqGw0untIZFgzGamTvNp/G1OfQ=; b=aNd+OV+8VuYToeIR8Tdht9b874QsCVgSuQvVTvQYvjmcacm1vZPjVmtrSRyku4AoTXh0w7vt6dg1uQMLewl5XubMb/lhYzlvH/IpbXDIF/qPBntuA3gR+UKsVWrDi1j9weTqxesedbcvQIKU6gP+BFfH3jOFTdLVWGa3dVNvW0Ad1kM+OOpGafVHKs4w8SJ3WB8vkEGDg77AMrPhs79HkK5l8KUPR7uxIIVvCMwrJwb6w+cDyVkdGRHMHvLo0a8IvM/EN/ERWYZWpVt7erF1zALTRRxa7PE35clhR/QxiqjNhDUbe9vegZqwcD6/I5DzbyLMvQcT4TEsQyoPFWYVrg== 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 DB9PR04MB9283.eurprd04.prod.outlook.com (2603:10a6:10:36d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.25; Sun, 13 Mar 2022 10:59:37 +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.5061.026; Sun, 13 Mar 2022 10:59:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/3] selftests: bpf: verify first subflow of mptcp_sock Date: Sun, 13 Mar 2022 18:59:13 +0800 Message-ID: <3613220025caaaf4fa1bb941a0b7f7c2efc6c3b3.1647168955.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0060.apcprd04.prod.outlook.com (2603:1096:202:14::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffda7021-ce0c-4ca8-097d-08da04e090c8 X-MS-TrafficTypeDiagnostic: DB9PR04MB9283: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: lI331xAI3FmfYh7zT7nps0wD0Edc5SqE3b/fuS069RaB2SaIOUGQXNPIWtIA6GE7NaPVEVIHfSBbi9ZsrqrjQzKssnRMf74WCYVVpwvpPNFJxmg1kHhvWUzobAOHfZa6Gkz8Z1DVBkTZQQyw3Cg1p4jka4LS4lyn5cT0jzlAusNsDbgQVbKPeIpX35JT1/vL5IBzVP6FBRVD6yZpHmFvgG+qsfIAV6IXzjQZIebwCfkVQH1pQ+Tdc9ZBNypEDRBtVk5+D0uOUgLIjofT12C6ByVcL4qQFafXx1uCN6ZANrLc7v0oeNwkiVRd7HC4auwp4aLgc9LQFWxas00+u62XPUWadcoIwFtOC8C2W6MZ6lP3bde4Aq4WYmwwhIkfD5emYsoJ7dQ3L0nKFZlvBCHC5anaks/AivI9BOriU6ULs3SwqMNbQO5AqC6l8gLNyMKpZvilwFO7CnOllcBoulIvE0vkebTcxtuBZvIDfabYrle28uCFYRj1vtxMz84uzJmRq293BM1rdr4Ek5KeqbDEMbBRyPR3BhmmwDV3l+nhcLLXAx6fF3qYjI466uU7/FsPOEzZFoNjZ4uPhE47dtU4y/lRIITopfPs+ZARgGufr9/2Fum0aFs3Yt1dLrds37NQjcgZ0Dp9CschsxIBqAWfCkv0WOZt/blmWFo+MtApN2SFH+7Mh0UGjsudRzNw1bLD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(107886003)(2616005)(38100700002)(26005)(186003)(6916009)(86362001)(66476007)(8676002)(4326008)(66556008)(2906002)(316002)(66946007)(8936002)(5660300002)(44832011)(36756003)(15650500001)(508600001)(6666004)(6512007)(6506007)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?T3rY0Zii2nQTdRAlQdvO/I4W/kqHd+BYSoQzEwGjnD52htV17kxKljtralgw?= =?us-ascii?Q?KRWxfSV+fcnSzX5p84m4CgALz24VocA2V1klWcBCNb/49pC/U6MR2FOmtxCe?= =?us-ascii?Q?Hm2dmrBQYVGi1tDGpiXVsJTt99hYkYBTFePOj8EOwO86cpWXG7nWyCQs+J1t?= =?us-ascii?Q?wLpFdNqAUcnNymxU8pGxcxEGaMszFZFwLthTDl9mTb0Df06unC8uaOYCKFGk?= =?us-ascii?Q?0LJfBpo/VW8F9mYh8U5/NddHmU5ablsnRSW1W0iYpwg1kBi9FGynmIZHuLja?= =?us-ascii?Q?NS1GZ2xZN23VBkWW2sPWe1ZxXmY+0pEUPppsMScHXUpEinKWQXR0GgP9yDjX?= =?us-ascii?Q?PLXvBvgn9sumCZfM0Shg1Wf4wlxn1gfRPwpzVa8K4mqcYsQF+/FEUSD9MohH?= =?us-ascii?Q?Y180mBQSXmwcIHklpPWsce6nHILfmGsJwEFqYWW4ED9uGi9+QioEFqtPKVMl?= =?us-ascii?Q?que+Y9ToHClI7ZO0NrHfSx+BEQq+xN3VbjbteTJyZzjAP+uc0oGyhmHRpzhI?= =?us-ascii?Q?geXMp5w7IM1Ex3OKIwJ2qRCsNsB/VQhkXf2iI5QpYY5La3vt/HAJVgp7tQ93?= =?us-ascii?Q?z5nSBBJJZfmgk3PMCruJG0IYpWVUZRMGOYyP22quL7BVVN7t/63CD/2nA7JM?= =?us-ascii?Q?AvkLTis3IpY6gberUvOl15nIzKDyECQ+Dm+Amcw8Wcdi6t4OSSm2Nl4sCuTR?= =?us-ascii?Q?w5BGbb/tISp1tuG35byVm2CNiqo0a21jvbUdAevwLd9xiB1rrDtm2qDjjB0z?= =?us-ascii?Q?h27uGkheKI02Kt36PTZXfMhBXtAMpTDJrZVBKVRtEHRsoMxRDtnbGtupM8JR?= =?us-ascii?Q?5/mu7rwA0FUtfOsp4s8aVgbEr3S9fzSmi1CL7z1TBqEGyVAnZmbhOjWKnjmk?= =?us-ascii?Q?6nTlt0OGpu9xa1O39a1acaCMoPSljwuR5cD1MUOni7K5Ije+8tCqpPV8BgWk?= =?us-ascii?Q?9E96KGMBQFEurTzQ0+XPVNBG0i6GVnNFxbkEJNCUYZsOAP37TvFgw6iZWm7v?= =?us-ascii?Q?ywDF4MILNphhKctwVRKi/f7RWwJscNpNR3vt7XwzghdUdzhbSydKTyE1A5xM?= =?us-ascii?Q?09Ch/K/e8kflFT+70UHkWN6bm1HICd6YvTvJH+n4I9GsPh3HcDXYf8daRn4N?= =?us-ascii?Q?WZbGTEZLLY+gC0aMIQv0De21rwFXPZirACwwmYURl1nxMim0GK3/VlOuiz1b?= =?us-ascii?Q?blcY4IqNTFW702d6UqMfqhTOc48nj7oHE1k3q7UvGXBC7ygxsMKpA9a5KyQ3?= =?us-ascii?Q?8SIpETX2mgklq8duU7SB+aDNzHmpadxqehghGs78/niv4xbhvPQZ5Vr2VDp/?= =?us-ascii?Q?FVbiIknDDIcz2XEKhdtFp9oVcuHGq82ID0MMrs2XmHX5V1LYFsWNCQ3JPlTn?= =?us-ascii?Q?ZJiaVso5/xv08Q74XFvNqsgJR/qfy6rwFSwix2skSx7GlT99u6EV9U8lrDdR?= =?us-ascii?Q?VvJw5NpKxGSY1I24bgTID7eLnCXmgi78xuK7JlPT7T20VIHWjv06Jw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffda7021-ce0c-4ca8-097d-08da04e090c8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2022 10:59:37.5810 (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: CWZkYLC0SXybW4AszT3358yg6AkgEGh15UqwI120i/Dn2zPZ6za2NjT0A9DTARE2gviOGHvF94n0BCis7rsvlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9283 Content-Type: text/plain; charset="utf-8" This patch verified the 'first' struct member of struct mptcp_sock, which pointed to the first subflow of msk. Saved 'sk' in mptcp_storage, and verified it with 'first' in verify_msk(). Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++++++ tools/testing/selftests/bpf/progs/mptcp.c | 13 +++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 57de5ca5ed50..728ab2fba0c9 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -89,6 +89,7 @@ struct mptcp_sock { struct inet_connection_sock sk; =20 __u32 token; + struct sock *first; char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index aff35ab33379..eb3b542a4d73 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -11,7 +11,9 @@ char monitor_log_path[64]; struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + struct sock *sk; __u32 token; + struct sock *first; char ca_name[TCP_CA_NAME_MAX]; }; =20 @@ -140,6 +142,12 @@ static int verify_msk(int map_fd, int client_fd) err++; } =20 + if (val.first !=3D val.sk) { + log_err("Unexpected mptcp_sock.first %p !=3D %p", + val.first, val.sk); + err++; + } + if (strncmp(val.ca_name, ca_name, strlen(val.ca_name))) { log_err("Unexpected mptcp_sock.ca_name %s !=3D %s", val.ca_name, ca_name); diff --git a/tools/testing/selftests/bpf/progs/mptcp.c b/tools/testing/self= tests/bpf/progs/mptcp.c index 61adc4396abf..5c8dfd5774fc 100644 --- a/tools/testing/selftests/bpf/progs/mptcp.c +++ b/tools/testing/selftests/bpf/progs/mptcp.c @@ -10,7 +10,9 @@ __u32 _version SEC("version") =3D 1; struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + struct sock *sk; __u32 token; + struct sock *first; char ca_name[TCP_CA_NAME_MAX]; }; =20 @@ -24,8 +26,8 @@ struct { SEC("sockops") int _sockops(struct bpf_sock_ops *ctx) { - char fmt1[] =3D "invoked=3D%u is_mptcp=3D%u"; - char fmt2[] =3D "token=3D%x ca_name=3D%s"; + char fmt1[] =3D "invoked=3D%u is_mptcp=3D%u sk=3D%p"; + char fmt2[] =3D "token=3D%x ca_name=3D%s first=3D%p"; struct mptcp_storage *storage; struct bpf_tcp_sock *tcp_sk; struct mptcp_sock *msk; @@ -51,6 +53,7 @@ int _sockops(struct bpf_sock_ops *ctx) =20 storage->token =3D 0; bzero(storage->ca_name, TCP_CA_NAME_MAX); + storage->first =3D NULL; } else { msk =3D bpf_skc_to_mptcp_sock(sk); if (!msk) @@ -63,13 +66,15 @@ int _sockops(struct bpf_sock_ops *ctx) =20 storage->token =3D msk->token; memcpy(storage->ca_name, msk->ca_name, TCP_CA_NAME_MAX); + storage->first =3D msk->first; } storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; + storage->sk =3D (struct sock *)sk; bpf_trace_printk(fmt1, sizeof(fmt1), - storage->invoked, storage->is_mptcp); + storage->invoked, storage->is_mptcp, storage->sk); bpf_trace_printk(fmt2, sizeof(fmt2), - storage->token, storage->ca_name); + storage->token, storage->ca_name, storage->first); =20 return 1; } --=20 2.34.1