From nobody Mon Feb 9 09:22:47 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4161701pis; Mon, 2 May 2022 14:12:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyw+xFdu22AwGasG5/EHEEWRAWXOenZfoz4j8/qd2uQGzPHJOeHJL/hCETxB1lo9UCiMbYV X-Received: by 2002:a17:902:cec5:b0:15e:6c60:2d1d with SMTP id d5-20020a170902cec500b0015e6c602d1dmr14022710plg.155.1651525973810; Mon, 02 May 2022 14:12:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651525973; cv=none; d=google.com; s=arc-20160816; b=eL+7uZ5wz1ttTgHhuofkILx/hL5/3e8F1/wkNgRDZrM4jL2PzViAwrv0Sig7pH1tHn flnst8bM0zww33lWX5a9NjrCNXnAMaok0m7nqRcFpCjRLL+G6tvyYsYrzKAw6UC7Tg+0 2xcEdB1uXmVeGp6SzFK/8ksDnuI/mDgRDjx/GFArV7zh01xxay+5zmSjglW/JMzVFQR1 JVJAPonQwOzJWu+6WrtpxJaPZQnKlAYNW2lGLMzIbWMoB84L/XHKQRHuwNs3IqU7Ivtu TYJlN7dkLme+/dSb+zSLCoc6iT/Z5S+4zq5nukXrmLZsLgISgDUpcZNjwKRJWSfxEXCs jIkQ== 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=ITADeBCP8At/JluMnICzU/ymeNWWYfFMu0qigVinTCk=; b=K4FAqX/uL/FpHJafoWkg9b6E18E528PR26GKOdJ72SqCSE+SPZKmkOx3uwfnH43QH/ Rr1aJ6bVYkJV4DnBDbfcn4cpk2y/2CvwW5gWIJYam24KVcdPJQD4l5hz9S2U/37fgvBY seF+/dkaCOMHcYbLc8PDuiVMtRIALMSBa2eM+lEs4eHgsyE8poXEgW3mnugMsjO4xa91 ReMD8Fo3Jm3VtrJ57dOvTv9KKs3daJP9+QkzEJpZ3ADFkzL63tVYCjstCtByrj+h8B+0 F6BrLUxswvQVZ4neGRh0outwWYojfPkDRbPJGLgIghiSA+7r0VUBrFglwjZVQ4OvEqmC TCZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=e79cNpTc; spf=pass (google.com: domain of mptcp+bounces-5041-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5041-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. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id f24-20020a631f18000000b003985223c137si14562202pgf.354.2022.05.02.14.12.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2022 14:12:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5041-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=e79cNpTc; spf=pass (google.com: domain of mptcp+bounces-5041-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5041-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 2F6A2280BE5 for ; Mon, 2 May 2022 21:12:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BBB563217; Mon, 2 May 2022 21:12:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 BA045321B for ; Mon, 2 May 2022 21:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651525965; x=1683061965; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ePBoh8AS4mwSPeuWl8RsJ+xb84HPUdh2FWvDwxtDwec=; b=e79cNpTcg5yPxr0faNCpkbLdZ9TsTo1hw1grHsEO1T+mf5NS4gJrYwA0 6k0OKUhs3ouZOB45Y9E2A2H/eYjmhh+WoO8//tgXvlOl+Nh5wUHJv6FGf lajqraLKWut61ZzxfGAUcnDR1aeLw8u/9z4WV/P3/Q1lWbtpA+63O65OH 49zxMmMW/a/UHyG7GiL7dN1kW2heAf4UwGqh9YT5pW3MoCwG0iBxfIidg nvaAYbbfci+hU0hMIPgdAmqgAsM+pCNAlvyJtq0nWsh8LYx6bMd48LYFv JjgtCkojhH3UdkvTs48CfPfx17M5sviYodYw1O4i2hGcY8eTZL8j99LCu g==; X-IronPort-AV: E=McAfee;i="6400,9594,10335"; a="247878478" X-IronPort-AV: E=Sophos;i="5.91,193,1647327600"; d="scan'208";a="247878478" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 May 2022 14:12:43 -0700 X-IronPort-AV: E=Sophos;i="5.91,193,1647327600"; d="scan'208";a="810393797" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.141.55]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 May 2022 14:12:42 -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 v3 8/8] selftests: bpf: verify first of struct mptcp_sock Date: Mon, 2 May 2022 14:12:34 -0700 Message-Id: <20220502211235.142250-9-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220502211235.142250-1-mathew.j.martineau@linux.intel.com> References: <20220502211235.142250-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 f2d22507431c..ed5773c26045 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 @@ -147,6 +149,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