From nobody Thu Sep 18 08:18:37 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp2574902pis; Fri, 29 Apr 2022 15:02:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZYepvwNCNEKvKKRj+PVp+MvX0RnZ/ZsP4cXsYB8QwtSdSQ2Fys9Q4uNFOdB1wKZmAvvmN X-Received: by 2002:a05:6a00:ad0:b0:50a:51b3:1e3d with SMTP id c16-20020a056a000ad000b0050a51b31e3dmr1201968pfl.18.1651269753306; Fri, 29 Apr 2022 15:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651269753; cv=none; d=google.com; s=arc-20160816; b=xGQl3gIDkKO3BBd99j/cmCerSEl4W6umrNsSk9cyPEQg9UeTkA568bex1WAHvYJyOn gVG/gTtxOHRfQv1G4kQpbH/sf/tWj2obNWBgY44SAOKHh41kCyidI8v5NoRizy2Mi2fH xtzQKxOkBaedJxrMuSl497Af4+OyvCygmDqQDmF8sDEdTKbyITfg0LjQYIlrxDdJrCVl T2W6CV/k9ZYAa1xpq0WJK2YSoNTwAsQ+pLMIXSgpdQWMVTolZx1abe2+aiOgiNlBnCQo RpM8CXsH6tdE1wDBPZSPS2HMTXgiZhCk8eol6Dec8zAUvaypw2tTSGxCAOtoofUrkqnQ VCYQ== 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=H3KtuRIJ3GG5t4lCkBXCysnESc9ESjXdOKMqfnVK0iM=; b=SOnBgu736tYcH7Mfa1cAq64rfhVYRl6CFFoLhoz2dqRojGIO+zgu35gBhEa8iqyax5 5SInjinbSTo6M0s4t+nckXQsB5xjlf7j705fNzNOrsTc/5kvtIct5AWzQqeKRoszR2qV 9CJvk6sG6X8lxkIsZmN0DPn4rDAYbQ+pUU0aE6xFvlISjUrrKYwYLPD33RwTP8my8Zor P0JefNgd0scTwc3KYf5KVC909Df8J0oXZsIsdD6hj+tMjWxsdjiL03uPQwJ63zNoMg7x WeIgNf9eoxDGHMpW37hPlZ2yC1XKHrNMrjGd68PC7x4lrLRk2xMMNCJeBz7eb5j6pzpE 99Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=McozTu7m; spf=pass (google.com: domain of mptcp+bounces-4985-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4985-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 f9-20020a631f09000000b003aa670ef605si7995443pgf.348.2022.04.29.15.02.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Apr 2022 15:02:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4985-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=McozTu7m; spf=pass (google.com: domain of mptcp+bounces-4985-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4985-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 7B8D3280C35 for ; Fri, 29 Apr 2022 22:02:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4BC261FA7; Fri, 29 Apr 2022 22:02:28 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 0A3331FAA for ; Fri, 29 Apr 2022 22:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651269747; x=1682805747; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=46TkvwVe6kT2QHU1dppM94+iRV+lM/Q9yXNhuJoxKAY=; b=McozTu7mP+m7Wj/zr2hebE5NMezShD07N9IzXhNx64HOrV4KRzH1JXRn 4ptZMl8wVkNG2g2I3C7OXk3op20MGTJGEEGunatdvvtOwdkG5fX4Yi4Gk YQE6ExxQgqDBFm0rZPE2D64LChQQA9qNpox4n3vOQWHfYyQkhXqw+tROk lTjFaSshV76ZQeNGosMOrkf2D8esL+nNbApD1pcfkx7L2D4nWiKBxHH1Z SXdPn8sPjWIumZHJX/aVgVdYEFtdq8N48SIW3p+ZVB0iMGg6luLPUaKya oGN3EJUyyrMlCjIYB25hcwrvOXLzwBpcAXIScCnS1V9nxHwS3si+/mDrN w==; X-IronPort-AV: E=McAfee;i="6400,9594,10332"; a="246698331" X-IronPort-AV: E=Sophos;i="5.91,186,1647327600"; d="scan'208";a="246698331" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2022 15:02:10 -0700 X-IronPort-AV: E=Sophos;i="5.91,186,1647327600"; d="scan'208";a="582419805" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.217.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2022 15:02:10 -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 v2 8/8] selftests: bpf: verify first of struct mptcp_sock Date: Fri, 29 Apr 2022 15:02:04 -0700 Message-Id: <20220429220204.353225-9-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220429220204.353225-1-mathew.j.martineau@linux.intel.com> References: <20220429220204.353225-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 226571673800..b1e7f3b4330a 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_sock.c +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c @@ -13,7 +13,9 @@ extern bool CONFIG_MPTCP __kconfig; struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + struct sock *sk; __u32 token; + struct sock *first; char ca_name[TCP_CA_NAME_MAX]; }; =20 @@ -52,6 +54,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 { if (!CONFIG_MPTCP) return 1; @@ -67,9 +70,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