From nobody Mon Feb 9 07:05:44 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp2372925pid; Wed, 20 Apr 2022 15:25:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD/aeQdEYTSI8WsPptYhJ0xw0b0OrwHGB6TMwLeZZnUR2Mw0t1YCGUFKUmrLQ/K0WAX/9I X-Received: by 2002:a63:9:0:b0:3aa:7182:9868 with SMTP id 9-20020a630009000000b003aa71829868mr3410548pga.486.1650493526262; Wed, 20 Apr 2022 15:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650493526; cv=none; d=google.com; s=arc-20160816; b=0ghmnbJh+idgIoWMWYPx6l2kC3qTgbAm6xv7TbtbR1bNi66XD6Jv3oLiD3ReSExJaA JPkfmaoekUf9j0G9x6F9D5gE55Z64DPi1j4jReq4VvFM0P8Vah3z5T3k6iEEE/RapFhY 7/grzJwmjKg7M1jSdzzyrIJpv+P12TBHD0r49Am11LvlxX1Eipomee008s/74fFKimJd FQZfOlJ/BIGXhzImHRwooJJQ7Vr7GojrGS6FbRCI6Oj419z+XRyehbDdbvVX8FT27VOs 72lPuZkX/Og6xkfeZxZ6XgBeGxQiKVIenoakLt+Wa15wammDGEdWu3cUsLgTttXJEDHb 9KdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=DGJ3C3eXXb5VMg0c8BBis+Ob7xbNOXlDQH9esErswSA=; b=LTTcnG8cILSznpbj4Dknes8z9lRszY7Ofj4go8A3cuDgykw9QmzSdURQZkRbRl8oaC sJhc7qS7pafhqGoWGVbFnEjwdx9d/cnW3HWxCEDDTqSRjGjdYJ1SFpcyFIUpBBBDiuBj dqU1iOl2YAIE/B94mVE44kNvEGigBrLlceOUjRbG+vx6ByaXPi6XFfVV+7RPEhOnkRcL d3WxG/SmmRxbfWyTEQZwxUn/aEFqCrEL0rscuLtL4ppUYxOWMGlCujlvI/tFgs2Qqdti hfzgYmrc0+3cet0FeEm64tQlhHgaNCraiLVUKFLMqIgt5lQbznIFucoKPet1Zw6Zeati 1swg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Mzqaa9TL; spf=pass (google.com: domain of mptcp+bounces-4817-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4817-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id n13-20020a170903110d00b00153b2d16415si3799937plh.29.2022.04.20.15.25.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2022 15:25:26 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4817-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Mzqaa9TL; spf=pass (google.com: domain of mptcp+bounces-4817-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4817-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 75236280A9C for ; Wed, 20 Apr 2022 22:25:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 04C073D6C; Wed, 20 Apr 2022 22:25:21 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 C7AAD3D6A for ; Wed, 20 Apr 2022 22:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650493519; x=1682029519; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CPu4e6OUHz5baMW3HN5yprGNNE3W9upTmbpPnEKQkfk=; b=Mzqaa9TLg61IOQKtgwIahZ6DUvrO/XdfDJ8Uuv3/PhtY6FRZ4btpcSB5 F74QLwW+j8Z3Fq8PMMCbO3RPZ+JVhazO3y3AfJ6X+LtqFZ9Lt7AvvXZV2 umzmCs9ob7rv1HIq2THCR/vfk5OIRPrjnMtwwD5mgF2m+XqbOD4DS2NFO sYpYDZo1cBCCu8TmwR6Mjr9u2zxDyThDS+g7+ALQApaDwgme2KPygLMaA 5x8VQBWDdsxyGUsrFya8Czk1qiqqt8Mk/de/JaYvym3YrMqkF/3aZTyAX 8oLb13A9W6ovvkY0iHiJW/JpMyJ1/62iQf28gjEUU3HkwSh5uEhWQYV5b w==; X-IronPort-AV: E=McAfee;i="6400,9594,10323"; a="289277614" X-IronPort-AV: E=Sophos;i="5.90,276,1643702400"; d="scan'208";a="289277614" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 15:25:19 -0700 X-IronPort-AV: E=Sophos;i="5.90,276,1643702400"; d="scan'208";a="555422613" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.100.38]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2022 15:25:18 -0700 From: Mat Martineau To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: Geliang Tang , ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, mptcp@lists.linux.dev, Matthieu Baerts , Mat Martineau Subject: [PATCH bpf-next 7/7] selftests: bpf: verify first of struct mptcp_sock Date: Wed, 20 Apr 2022 15:24:59 -0700 Message-Id: <20220420222459.307649-8-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220420222459.307649-1-mathew.j.martineau@linux.intel.com> References: <20220420222459.307649-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch verifies the 'first' struct member of struct mptcp_sock, which points to the first subflow of msk. Save 'sk' in mptcp_storage, and verify it with 'first' in verify_msk(). Acked-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++++++ tools/testing/selftests/bpf/progs/mptcp_sock.c | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 463e4e061c96..b5a43b108982 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -10,6 +10,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 4518aa6e661e..7e704f5aab05 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -12,7 +12,9 @@ struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + struct sock *sk; __u32 token; + struct sock *first; char ca_name[TCP_CA_NAME_MAX]; }; =20 @@ -133,6 +135,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, TCP_CA_NAME_MAX)) { log_err("Unexpected mptcp_sock.ca_name %s !=3D %s", val.ca_name, ca_name); diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing= /selftests/bpf/progs/mptcp_sock.c index 53bf67580010..1d1ac7cda2a2 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_sock.c +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c @@ -12,7 +12,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 @@ -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,9 +66,11 @@ 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; =20 return 1; } --=20 2.36.0