From nobody Mon Feb 9 09:32:21 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4161685pis; Mon, 2 May 2022 14:12:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/cACK4J6V5F7Cnb5DIpj96i5OG1mNJjZPg3YzkucBEBJ0j6TI+j4fHkc/eyHDCzaWKOtP X-Received: by 2002:a05:6870:a1a8:b0:e2:182d:6375 with SMTP id a40-20020a056870a1a800b000e2182d6375mr474055oaf.247.1651525972627; Mon, 02 May 2022 14:12:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651525972; cv=none; d=google.com; s=arc-20160816; b=iGR63Sz7j415saVRMwhMRIGYk9LsIMhPto2mGLS3f6IKjIzYajkPJDbR4RvVS7LbJ4 ExwVNBf3e6SBBbaoZVnPGTdPMj7NEbC/0pbnsPOjkNb5ka6cg1BkMik2G1VtVcbeh+Yj bRDgXhK0gljqpVgOIVE9V3huj4sQ5Y3fPezTPloXVtTrlXyb0C/otxcIAUcsvZQiO4Ir RGXZxC/BPJ7K0FxWU3Ht1A4d37ZXeEBx4QLtFN8FrwOSwNhaL8FXvlTvdXZdrc4OmxwS 9YVVKsc4ynYjIbNvln8HA4PGErEYIjfh+h+GSQKf/YLFXQXQfCzPd4JqnPxRSjjjBr6y QiLw== 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=nFApvUP/hdG5PNIomIlsaclXWqJoKRloB1lZgBrZpjo=; b=uS1e3hbeqFzdKxNBcMMVMraZULHz4NaYqU0H95239E9f0QjB/grMVrLL1c9OE0t5cX HpvOfnZ25ZYCmFn8w3mOGbH/r4+KS5C6jy7nn8/h+f7c6csheewHmIqfI0Hs6XHh+k+e FXxIkwzK2GvNfU+pGbbsEHCb+mbWDjRKgXJLtUXTFQbw58pqGcFcN59TxWOH/t45sEE6 gVGVIPq3kwE3ressV4d9hsCTK8ZV4nND0UqnakBNHnZ2D97MKL87KfI5sLtT5kzKZpKl QBxSFMLG6Xu2KvOkF3Fse8tuScMBd+g3kVjkFJ8iE5cSbGcWY6ESdD9s4vzARWko1ssO lFIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=B0WsOw3i; spf=pass (google.com: domain of mptcp+bounces-5040-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5040-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id g4-20020a4adc84000000b0035ecda9d5e1si4561106oou.37.2022.05.02.14.12.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2022 14:12:52 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5040-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=B0WsOw3i; spf=pass (google.com: domain of mptcp+bounces-5040-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5040-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 da.mirrors.kernel.org (Postfix) with ESMTPS id 39E6D2E09FA for ; Mon, 2 May 2022 21:12:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 87EEF3212; 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 6673A3217 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=szTMMA+89v2H8xSDvTnXgwA74cZHtkhg7qzXfwihkzw=; b=B0WsOw3iOUZO+//gtslm+Z5qMJ8KiypWkdC9dTzrMI/0AXhHk1319nlw j6OMCgMydHtMbJcrrkBr03nL6B4qpdQpaSPLfDcmtY1VwHpyowF4Jhf3Y 0PwI6oOdSISSySd0cDCQKBwXusuxi+XQiI40jRY6mriRNVhNwMEgwAY70 aQWbmB0DCkYUOs79cxTR110FKrmKt/SkvF6CbdmWMgvdtOCMtamIwaw+h Nh+OdN1v5B1WzCCPShUlIANZTPZ9LrN6CyLRRETGYDcWMUFUd4/4di/Q7 iTAOnCmUJakdKXTHH00diTmlh5egDI7cvVXfecrx4KEuRX5zaYFJaVWIJ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10335"; a="247878475" X-IronPort-AV: E=Sophos;i="5.91,193,1647327600"; d="scan'208";a="247878475" 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:42 -0700 X-IronPort-AV: E=Sophos;i="5.91,193,1647327600"; d="scan'208";a="810393796" 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 7/8] selftests: bpf: verify ca_name of struct mptcp_sock Date: Mon, 2 May 2022 14:12:33 -0700 Message-Id: <20220502211235.142250-8-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 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(). v3: Access the sysctl through the filesystem to avoid compatibility issues with the busybox sysctl command. 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 | 38 +++++++++++++++++++ .../testing/selftests/bpf/progs/mptcp_sock.c | 4 ++ 4 files changed, 47 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..f2d22507431c 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,36 @@ static __u32 get_msk_token(void) return token; } =20 +void get_msk_ca_name(char ca_name[]) +{ + size_t len; + int fd; + + fd =3D open("/proc/sys/net/ipv4/tcp_congestion_control", O_RDONLY); + if (CHECK_FAIL(fd < 0)) { + log_err("Failed to open tcp_congestion_control"); + return; + } + + len =3D read(fd, ca_name, TCP_CA_NAME_MAX); + if (CHECK_FAIL(len < 0)) { + log_err("Failed to read ca_name"); + goto err; + } + + if (len > 0 && ca_name[len - 1] =3D=3D '\n') + ca_name[len - 1] =3D '\0'; + +err: + close(fd); +} + 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 +122,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 +147,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