From nobody Thu Sep 18 08:14:48 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp2574880pis; Fri, 29 Apr 2022 15:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVXcUMk+VE+7O5P0ZyrlNYa5aEa/W9kQWamxAqpDNh1dvHlCJ6f3wbB1WsxjRA0wi/R9LY X-Received: by 2002:a17:90b:3904:b0:1da:2957:b5ee with SMTP id ob4-20020a17090b390400b001da2957b5eemr6013113pjb.59.1651269751551; Fri, 29 Apr 2022 15:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651269751; cv=none; d=google.com; s=arc-20160816; b=FWzPc5slV7TJl8BWRRXMao6NMZEqSU18JstENBXnVqzdbZdDiSBl1oBqKvLKK6DWiS RsJ3gNtL59p6moCliepxBygazaSkheXVXGE6Re5DTrOCXp6H3JxAk5pg6DBlDNRavxQ5 PG1NpWp/clr4XpATwwFO8brnoHfslwxTYrVQiCzkzko3ceByIJ7Pv4aqyJ3yRsalpQ+3 OBPipssG3uB3nKiJc4p5dBS09IN0J4pD1wk0o+bgovAvzyAIqp2verxij5W5eGxWy7G2 75TnJyIWjaVvt4gQQGv0P1X/86NJed/M6J/eT7/MFZGLGJpxSgRmX2K0FXpabHlnXrDt tGsg== 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=EOdNKXexo+FFipWowITyYZU4x2oQQc9YfwyffX3QDjw=; b=alPRK5JTPn+D1tNdxfbvYQygi81fp97DWHKUf2UlBRxkqCa63YUNTXk1NTH3g9kt7+ LGYXW2Z6pXSJswgSL6hU8Q+xV7gU5xYnW72TPZcNOF0nqa+ywg+nZMEELJDejGBPbMYY Ce/tbZ0EiuBhFTnRzLGetjVRj2l12NpsRRcR7rs8iTmwJMRb+BjRwiuBTv1D/FgPkUpf YkLFdjmF5L+JsEptD/JQe7BMTVV9U00IknBJtQRFHaAymge/SIN/OFrzDCv0rFQlUWyQ h1u2hzaoePe8Fm0lJlmkXIFDDp0BR9GsfUdk/6AxVrK5w1q9klC5zwl90OdRgwgr13Hg O3uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GxRDfNvr; spf=pass (google.com: domain of mptcp+bounces-4984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4984-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 k129-20020a632487000000b0039e45222007si8531756pgk.227.2022.04.29.15.02.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Apr 2022 15:02:31 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4984-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=GxRDfNvr; spf=pass (google.com: domain of mptcp+bounces-4984-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4984-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 5BB43280A98 for ; Fri, 29 Apr 2022 22:02:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3C2751FA4; 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 C69161FA7 for ; Fri, 29 Apr 2022 22:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651269746; x=1682805746; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aLkF5iautQtoCByDZ1EM15ok+OCMKaaRGi5jkl6MJpQ=; b=GxRDfNvr9yXCC/pn5bbHhhfk3j/AS/4KT5NeTwgjk1MU3kDZGM6sbZ8G FUFInemE3tye9+WjtY7tJKMJ/QT+0SPxXyZhsBuLSXAvePGyS94NwcqTo ploj2c4hrDRWySMsWwyo1GLM8AukTGIi5Mn78kLp2Mbmxaywv44mtbvhH ePSZG62bahj+Ic0L5NdGfRqifc5UtlsFwxXQk7xQhrO4vIc5Im20sBFkn njfzH0n7sZKltQTtCXnvsNdxMDlkXAcZeum53i2UvUAFzITS1UXKtkO3P veXK+x9PRn6da3OEI2dcPYyfyd24vMJG4TtfJkr9KKMAgaIt3ZKRXJH7b g==; X-IronPort-AV: E=McAfee;i="6400,9594,10332"; a="246698330" X-IronPort-AV: E=Sophos;i="5.91,186,1647327600"; d="scan'208";a="246698330" 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="582419804" 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 7/8] selftests: bpf: verify ca_name of struct mptcp_sock Date: Fri, 29 Apr 2022 15:02:03 -0700 Message-Id: <20220429220204.353225-8-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 another member of struct mptcp_sock, ca_name. Add a new function get_msk_ca_name() to read the sysctl tcp_congestion_control and verify it in verify_msk(). Acked-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/bpf/bpf_mptcp_helpers.h | 1 + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 4 ++++ .../testing/selftests/bpf/prog_tests/mptcp.c | 24 +++++++++++++++++++ .../testing/selftests/bpf/progs/mptcp_sock.c | 4 ++++ 4 files changed, 33 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 87e15810997d..463e4e061c96 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; + char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 #endif diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index b1ede6f0b821..89750d732cfa 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -16,6 +16,10 @@ BPF_PROG(name, args) #define SOL_TCP 6 #endif =20 +#ifndef TCP_CA_NAME_MAX +#define TCP_CA_NAME_MAX 16 +#endif + #define tcp_jiffies32 ((__u32)bpf_jiffies64()) =20 struct sock_common { diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index c5d96ba81e04..4518aa6e661e 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -5,10 +5,15 @@ #include "cgroup_helpers.h" #include "network_helpers.h" =20 +#ifndef TCP_CA_NAME_MAX +#define TCP_CA_NAME_MAX 16 +#endif + struct mptcp_storage { __u32 invoked; __u32 is_mptcp; __u32 token; + char ca_name[TCP_CA_NAME_MAX]; }; =20 static char monitor_log_path[64]; @@ -79,11 +84,22 @@ static __u32 get_msk_token(void) return token; } =20 +void get_msk_ca_name(char ca_name[]) +{ + FILE *stream =3D popen("sysctl -b net.ipv4.tcp_congestion_control", "r"); + + if (!fgets(ca_name, TCP_CA_NAME_MAX, stream)) + log_err("Failed to read ca_name"); + + pclose(stream); +} + static int verify_msk(int map_fd, int client_fd) { char *msg =3D "MPTCP subflow socket"; int err =3D 0, cfd =3D client_fd; struct mptcp_storage val; + char ca_name[TCP_CA_NAME_MAX]; __u32 token; =20 token =3D get_msk_token(); @@ -92,6 +108,8 @@ static int verify_msk(int map_fd, int client_fd) return -1; } =20 + get_msk_ca_name(ca_name); + if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) { perror("Failed to read socket storage"); return -1; @@ -115,6 +133,12 @@ static int verify_msk(int map_fd, int client_fd) err++; } =20 + 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); + err++; + } + return err; } =20 diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing= /selftests/bpf/progs/mptcp_sock.c index c58c191d8416..226571673800 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_sock.c +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020, Tessares SA. */ =20 +#include #include #include #include "bpf_mptcp_helpers.h" @@ -13,6 +14,7 @@ struct mptcp_storage { __u32 invoked; __u32 is_mptcp; __u32 token; + char ca_name[TCP_CA_NAME_MAX]; }; =20 struct { @@ -49,6 +51,7 @@ int _sockops(struct bpf_sock_ops *ctx) return 1; =20 storage->token =3D 0; + bzero(storage->ca_name, TCP_CA_NAME_MAX); } else { if (!CONFIG_MPTCP) return 1; @@ -63,6 +66,7 @@ int _sockops(struct bpf_sock_ops *ctx) return 1; =20 storage->token =3D msk->token; + memcpy(storage->ca_name, msk->ca_name, TCP_CA_NAME_MAX); } storage->invoked++; storage->is_mptcp =3D tcp_sk->is_mptcp; --=20 2.36.0