From nobody Mon Feb 9 09:34:56 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp486547pis; Fri, 13 May 2022 15:48:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzACtU6JF07W6PJZAWxREAux9c2NIC8REPHSRADRrR9Ep5ShvfFaHOpvkf0/PN2ssmT7NQt X-Received: by 2002:a17:90a:191a:b0:1dc:a3d3:f579 with SMTP id 26-20020a17090a191a00b001dca3d3f579mr18473646pjg.30.1652482121551; Fri, 13 May 2022 15:48:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652482121; cv=none; d=google.com; s=arc-20160816; b=vcQs+zt6FmjpHOBjrdHUWA76jVqWV/lvv8xv1WSNdq7vHH1RZRnHwk5N75l1NEBYR9 6a10kkqFqzh6d4D+R6YO19oCYqY7nRDL9W2WPBfZ0Bnbq0KVU4krVC6wLefPaX8FdMiv 9BR1LSt9oHwq2ea9wP+Fg5oocHocFGy8gQQrlYmQiK2cQmz3TtYbLNlQRzSNZRhp+ziU 7dz0HBJOA7nPHIx1HTqNgiQAArJXx5EBBLUU9d5uWDE1OjiC9iZAfyAd1c8Q5tz02vyB vZHEouWD9KT4+NmbMirdxMcMkHaNnCdpgr1zh2ilXy5DvZQv/0rYa9yVeXo1Nqw5Surj mDJQ== 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=7Gj3rSAzmbNR3Bzedj/Jy8vD3QRMEtyQFmz4LO7ig4s=; b=lU/jpECT5CkGcOCleKZsqkVF7OW3+j4ZqwfdBG8EDyqlZCb0U9Or81BpJRIPZAEnjg gCDu1fNTRDR7u9v7R3EoD5yyGTTemg2NqnK8U9FZBrS3IsJ5DlV8eriijt+umpDqsBKo ybRDKNpq3+J4QZCVM9Ii35n/5DDxNanpWWflahYg2re8k5ClCVee3Zra1BOTuWzIGjKL O/NWaBwpGx7ygu/9KNAwo0ppQfWj+MEpIObtXLEbujCw/KsR23Yn35xYNHt4eSGnHz9H GIBCEsvDOr4q7TwZihgnPNRzmQa0fi0y07wEZBk1Yav+t4xUnhStGXmgBdVabmIh6VVv hTIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AgbReDXt; spf=pass (google.com: domain of mptcp+bounces-5286-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5286-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 bk14-20020a056a02028e00b003c23927073asi4285249pgb.613.2022.05.13.15.48.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2022 15:48:41 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5286-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=AgbReDXt; spf=pass (google.com: domain of mptcp+bounces-5286-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5286-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 E4558280C03 for ; Fri, 13 May 2022 22:48:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 010EB2579; Fri, 13 May 2022 22:48:39 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 2D37F2588 for ; Fri, 13 May 2022 22:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652482117; x=1684018117; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=URZIdz+kPYwRPTgIUb6zoaKFH5Th8DZkust7oQxgKFc=; b=AgbReDXtugXoIxtxgrrkDr+e9kmgVZ27YAU8C+nSmLC0UodZ5+g27bST ajkV7VHQEzCC0mR3rBBjKWVo/3S3S54nTcwmU7UfukvrHLhhBunh4Gner jweBz6C0Uf8kytlgluGndKBCRPmvDqXt+NU2eD2JHILBtYonYSwMaccyl J6kXVC6YHeeW0TG+5uuNZUoRFk/51pJJNQHeLKpuzFYX58mUUW4T7kAFd T+04S88SHnK99P4UMnRl0CpiTsIjYIrEY6r5USxOHhH8DMSRxO3O5zn7/ lTz6zM+VbZzZFGoJ9CUpJM03I2wLkIRqgGcZ1ykjWhEUP4K3W3D8uo0lt A==; X-IronPort-AV: E=McAfee;i="6400,9594,10346"; a="252475200" X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="252475200" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 15:48:36 -0700 X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="815588257" Received: from clakshma-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.160.121]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 15:48:35 -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 v4 7/7] selftests/bpf: verify first of struct mptcp_sock Date: Fri, 13 May 2022 15:48:27 -0700 Message-Id: <20220513224827.662254-8-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220513224827.662254-1-mathew.j.martineau@linux.intel.com> References: <20220513224827.662254-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_tcp_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_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 2ff7f18ea0ce..51a3e17acb9e 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -13,7 +13,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 @@ -136,6 +138,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 c36f2f6bd2f1..ab135edf3ae3 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 @@ -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 { if (!CONFIG_MPTCP) return 1; @@ -69,9 +72,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