From nobody Mon Feb 9 11:46:45 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp412728pih; Thu, 19 May 2022 16:30:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyA989HMJ42V9oA5YgFYRwxHDMyeskSbYF5e0duR/+hs3qO/HQZZtFl+YpNIkXW8PLHGlGM X-Received: by 2002:a17:90a:6ac5:b0:1df:77a0:a72f with SMTP id b5-20020a17090a6ac500b001df77a0a72fmr8065988pjm.125.1653003053007; Thu, 19 May 2022 16:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653003053; cv=none; d=google.com; s=arc-20160816; b=HOupKMq05RV5eH1fTq2gS1/G+Uzh6ff6nT/l1Xftby9PNO75Ov0Jug0KllzgGDDK1I BBWY9T5pF5TSUuZpHcb8sUNgQmVIy4k0bAh5ZNh2xbOR9vn+CmUCNVMlatubdHYyc6Qv +XuTYgOP15CaVDcXjPukbOZ3TxJI3uKHb0/J6mqdK0ufddmVwmeFoDSgqzTPmRVAD8h4 wNuKCwDgC+PaTKyhjYGA3+njU7V46BSEXYU1m5UR43uB/qFvraY7QOXHhGlO4gAsVbXA Fjs0ylbq+rTkflycSwEJMMAJeLQqBedIN5VNg+9CU1KyBJUWNbLapakZ/YQYtIhfdEOj nPDQ== 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=I6u2PCVUGlMkD9yfPdg6wNU8Ey749GV0qhOvsNsIE8E=; b=NdGhzHNOypGczV8xHf728DXqDsyQR3wqfdhUnsFMn5i+IRh6cHk0iNQGU7C1yKKEYb XoSR1mzNg2sbO+kn02Hci59XJu72fOZiB1F5Uwc7yUmJ6+PFBQlC3AChQvqIGaApdIa7 KAl+NmJJoTfxqxqUsn/LvrvffqCcOWRlKaFkSvK7nY402/9DoTGyffoYVS42bIqRhdl/ vur2vjEiIPDWOyFIDad86BY++YJ5CRCbpiFzcJPzLdNWq9QQkYy8YjWHQc78+aO4tSTg 2X0Xd+wDqfteiomZ4a/KRI9KmEn6gzpgyinK+RGvnT+JvjIF+FE3T8n0ZqHz9NVBNaPf GNlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=FZjp65JJ; spf=pass (google.com: domain of mptcp+bounces-5408-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5408-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 q9-20020a170902eb8900b0015884706ccasi7585794plg.6.2022.05.19.16.30.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2022 16:30:52 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5408-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=FZjp65JJ; spf=pass (google.com: domain of mptcp+bounces-5408-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5408-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 9F172280A94 for ; Thu, 19 May 2022 23:30:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 62DA833E8; Thu, 19 May 2022 23:30:49 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 1621C33FC for ; Thu, 19 May 2022 23:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653003047; x=1684539047; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=la3wcnMhgWCUcLyaEaClOPhyG2MoAKhnFpoSTvrOpAQ=; b=FZjp65JJeqFLWj5QUIr8hr8u21wgsUj6xBdlwdlQMoXHAb6NRyuvSqdw y3W9srv9easxLR6MGdcJW5jKIsvMJlAPLBIDxzN7Wv4llvXRMMWwQiYzo vZSE5pfKYyx5tZbAUJ81PwEzc+sWEZtEowgtnJlqHnDnOOLffa891Adwr 3D5af9kq+pbaK5zYzYhSeLfqcl7KbIhQhHEyscciuYn49Dkr/+MknETJv VUNiZradHGWnfuaTS6+GqdNklLF1dIEuJqS0KHe4X7oHR5xotsLPOs9a4 WX8xWDlQ6hhNRVbRJNFasg9Gy2bI4Zk4kKlRiPca/L1ELJ3Ng3nnwLmH1 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10352"; a="272381771" X-IronPort-AV: E=Sophos;i="5.91,238,1647327600"; d="scan'208";a="272381771" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 16:30:22 -0700 X-IronPort-AV: E=Sophos;i="5.91,238,1647327600"; d="scan'208";a="570491205" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.252.132.179]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 16:30:22 -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 v5 7/7] selftests/bpf: verify first of struct mptcp_sock Date: Thu, 19 May 2022 16:30:16 -0700 Message-Id: <20220519233016.105670-8-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220519233016.105670-1-mathew.j.martineau@linux.intel.com> References: <20220519233016.105670-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(). v5: - Use ASSERT_EQ() instead of a manual comparison + log (Andrii). Acked-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 5 +++++ tools/testing/selftests/bpf/progs/mptcp_sock.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index c38c66d5c1e6..82a7c9de95f9 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -234,6 +234,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 17ad1cb07339..257a8668ad40 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -14,7 +14,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 @@ -80,6 +82,9 @@ static int verify_msk(int map_fd, int client_fd, __u32 to= ken) if (!ASSERT_EQ(val.token, token, "unexpected token")) err++; =20 + if (!ASSERT_EQ(val.first, val.sk, "unexpected first")) + err++; + if (!ASSERT_STRNEQ(val.ca_name, ca_name, TCP_CA_NAME_MAX, "unexpected ca_= name")) err++; =20 diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing= /selftests/bpf/progs/mptcp_sock.c index 6a78e7b754a8..f638cb876424 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_sock.c +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c @@ -13,7 +13,9 @@ __u32 token =3D 0; struct mptcp_storage { __u32 invoked; __u32 is_mptcp; + struct sock *sk; __u32 token; + struct sock *first; char ca_name[TCP_CA_NAME_MAX]; }; =20 @@ -54,6 +56,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) @@ -66,9 +69,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 is_mptcp; + storage->sk =3D (struct sock *)sk; =20 return 1; } --=20 2.36.1