From patchwork Fri Dec 22 01:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 757729 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E9CDEB8 for ; Fri, 22 Dec 2023 01:59:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=arista.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arista.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="YX3E2ayZ" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40c3ceded81so13875315e9.1 for ; Thu, 21 Dec 2023 17:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1703210356; x=1703815156; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I0ZZHyRUOudrPPat9HrPnVQdIseVaW1H9mPsRN0/wVQ=; b=YX3E2ayZpqYCD+BxGbTIE04TMVXcg4TzZMdC60WcivbVzX5mpfaAcbGCEZhHz/bVFC 0dfTFgrNhvczaIonJgSyin9RlLF0hNCcIZ1I3guCJuzpoYSMBjj3Qr2jU8AA/hpr6cx4 VwQc9oYRV8ILv7nILMh9/TPEo4PmR7bebfFIUgzoE5A+2am3T7DXjRoLM8va+Uv9ruu7 lxTRV5FSQCP4Kjuiy2ynPPX8nWisiK+2A+y7me2zjbOVbAzE0towjIs8P3N/l6vKLiQm /jT4JzwL0alFWDNwU+FjW1azfR4+gxrvl+C39mOfv6Ar1eBg+AFm8UYGecdU3ekxQDfz ZFMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703210356; x=1703815156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I0ZZHyRUOudrPPat9HrPnVQdIseVaW1H9mPsRN0/wVQ=; b=dLrn+RJZ2zTcB6RHiISWAG+juOgisQStoElQ7oXJ6Xe6gL44NB9fWb4Z0FPj1jaSRs c3jp/ZPI8dBMANVuBXEczw3GSQBFGPFSLu6C9Qy1UwL+h+D3xOtsmpZmc/3VjYiwdhmI 12q09Su/B9R/qCdO89e8CxFSS5OB9+QFCWU89zL77z0mzhEyxx28gicQHTXt6sZmW+Op uhBRGGpkL2YImV8Gh1ekB2JrbI174R03OHux1pYvOJWFoD+hP4yVe1LNiIBmvK0vd9j8 6ChwUpIGoJh795o1cePkmRLpfsRtHPVyVPuPhbzZM1+F7TF7qjnIm2GD9+gElHq55S1H qIIA== X-Gm-Message-State: AOJu0YxAFcZZCuIaA0SvRB5igB2f7nIteeZzNFDKzKyCs/QQiubv921P N6ZFVVi+dK3dj4J7vdmuTB+S5va5zFor X-Google-Smtp-Source: AGHT+IE3vs/NykBo7NUkxFNtBovxM1kRWQiA8cZli4ryyJNq4gT3Zixc766nGnYbSSOxEx7EfcJzFQ== X-Received: by 2002:a05:600c:4e08:b0:40d:443c:533b with SMTP id b8-20020a05600c4e0800b0040d443c533bmr170236wmq.73.1703210355728; Thu, 21 Dec 2023 17:59:15 -0800 (PST) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id g3-20020a05600c310300b0040c6b2c8fa9sm12991667wmo.41.2023.12.21.17.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 17:59:14 -0800 (PST) From: Dmitry Safonov To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: Dmitry Safonov , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Safonov <0x7f454c46@gmail.com>, Hangbin Liu Subject: [PATCH net-next 1/2] selftest/tcp-ao: Set routes in a proper VRF table id Date: Fri, 22 Dec 2023 01:59:06 +0000 Message-ID: <20231222-selftests-tcp-ao-fixups-v1-1-39c73817c372@arista.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222-selftests-tcp-ao-fixups-v1-0-39c73817c372@arista.com> References: <20231222-selftests-tcp-ao-fixups-v1-0-39c73817c372@arista.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mailer: b4 0.13-dev-b6b4b X-Developer-Signature: v=1; a=ed25519-sha256; t=1703210346; l=3819; i=dima@arista.com; s=20231212; h=from:subject:message-id; bh=8oUqobZh1rQ6EPFePyfLPfw6YTJWq/V1xAlZPegsEw0=; b=NWgzbSD4Bw0jiy+VdLxT93KGXlqdQwZ9UlMZuwK/jtiGLaXLGBXS79oFKf7xUoSFnl/AaTa6K 3EON2UdCrqAD1asACxwZIhklcjo4cWubagp80jOg/aTHwtKS24WWzcY X-Developer-Key: i=dima@arista.com; a=ed25519; pk=hXINUhX25b0D/zWBKvd6zkvH7W2rcwh/CH6cjEa3OTk= In unsigned-md5 selftests ip_route_add() is not needed in client_add_ip(): the route was pre-setup in __test_init() => link_init() for subnet, rather than a specific ip-address. Currently, __ip_route_add() mistakenly always sets VRF table to RT_TABLE_MAIN - this seems to have sneaked in during unsigned-md5 tests debugging. That also explains, why ip_route_add_vrf() ignored EEXIST, returned by fib6. Yet, keep EEXIST ignoring in bench-lookups selftests as it's expected that those selftests may add the same (duplicate) routes. Reported-by: Hangbin Liu Signed-off-by: Dmitry Safonov --- tools/testing/selftests/net/tcp_ao/bench-lookups.c | 4 +++- tools/testing/selftests/net/tcp_ao/lib/netlink.c | 4 +--- tools/testing/selftests/net/tcp_ao/unsigned-md5.c | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/tcp_ao/bench-lookups.c b/tools/testing/selftests/net/tcp_ao/bench-lookups.c index 7be8a7d9308c..a1e6e007c291 100644 --- a/tools/testing/selftests/net/tcp_ao/bench-lookups.c +++ b/tools/testing/selftests/net/tcp_ao/bench-lookups.c @@ -46,8 +46,10 @@ static void test_add_routes(union tcp_addr *ips, size_t ips_nr) for (i = 0; i < ips_nr; i++) { union tcp_addr *p = (union tcp_addr *)&ips[i]; + int err; - if (ip_route_add(veth_name, TEST_FAMILY, this_ip_addr, *p)) + err = ip_route_add(veth_name, TEST_FAMILY, this_ip_addr, *p); + if (err && err != -EEXIST) test_error("Failed to add route"); } } diff --git a/tools/testing/selftests/net/tcp_ao/lib/netlink.c b/tools/testing/selftests/net/tcp_ao/lib/netlink.c index b731f2c84083..7f108493a29a 100644 --- a/tools/testing/selftests/net/tcp_ao/lib/netlink.c +++ b/tools/testing/selftests/net/tcp_ao/lib/netlink.c @@ -261,7 +261,7 @@ static int __ip_route_add(int sock, uint32_t seq, const char *intf, int family, req.nh.nlmsg_seq = seq; req.rt.rtm_family = family; req.rt.rtm_dst_len = (family == AF_INET) ? 32 : 128; - req.rt.rtm_table = RT_TABLE_MAIN; + req.rt.rtm_table = vrf; req.rt.rtm_protocol = RTPROT_BOOT; req.rt.rtm_scope = RT_SCOPE_UNIVERSE; req.rt.rtm_type = RTN_UNICAST; @@ -294,8 +294,6 @@ int ip_route_add_vrf(const char *intf, int family, ret = __ip_route_add(route_sock, route_seq++, intf, family, src, dst, vrf); - if (ret == -EEXIST) /* ignoring */ - ret = 0; close(route_sock); return ret; diff --git a/tools/testing/selftests/net/tcp_ao/unsigned-md5.c b/tools/testing/selftests/net/tcp_ao/unsigned-md5.c index 7cffde02d2be..f5b6d488d501 100644 --- a/tools/testing/selftests/net/tcp_ao/unsigned-md5.c +++ b/tools/testing/selftests/net/tcp_ao/unsigned-md5.c @@ -30,7 +30,7 @@ static void setup_vrfs(void) err = ip_route_add_vrf(veth_name, TEST_FAMILY, this_ip_addr, this_ip_dest, test_vrf_tabid); if (err) - test_error("Failed to add a route to VRF"); + test_error("Failed to add a route to VRF: %d", err); } static void try_accept(const char *tst_name, unsigned int port, @@ -494,15 +494,14 @@ static void try_to_add(const char *tst_name, unsigned int port, static void client_add_ip(union tcp_addr *client, const char *ip) { - int family = TEST_FAMILY; + int err, family = TEST_FAMILY; if (inet_pton(family, ip, client) != 1) test_error("Can't convert ip address %s", ip); - if (ip_addr_add(veth_name, family, *client, TEST_PREFIX)) - test_error("Failed to add ip address"); - if (ip_route_add(veth_name, family, *client, this_ip_dest)) - test_error("Failed to add route"); + err = ip_addr_add(veth_name, family, *client, TEST_PREFIX); + if (err) + test_error("Failed to add ip address: %d", err); } static void client_add_ips(void) From patchwork Fri Dec 22 01:59:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 758329 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 095EE2115 for ; Fri, 22 Dec 2023 01:59:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=arista.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arista.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="OdYNJNFa" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-40d3bf30664so13955285e9.0 for ; Thu, 21 Dec 2023 17:59:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1703210357; x=1703815157; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F4/lFuQQ8aRjKsTJBeQApKDK4hOJ7gyWGAx/V6cHGCw=; b=OdYNJNFaxFk2iN2YF0mbpqyIMNA4S7NjQnLkmCCtfiYfhiexFpxc1XTWW4tU39Dc75 U+PJ+Fiy8fUtG07LMoD74KsxmDTCSw+sarmk7y+pQlfJFOoD/N8Tg4d6ehT+p8eKMbOH t7yJjU2BwtKhiW025Seo71y4BI5NJo5d72UyJ3ftZ7PkqUlNke9NTdtNiTCbLGJeN24G 02ySfjQ4gdXylOsXIjHhgvT/PByXsvroEmKgD442atx8v+k2y3sU+HwJmFY1WbDRRojM Ua5L+SD1vPGk/Ie3M5uZzzLN33u5L0JbYVEvNBdRu0U1iN7v4UJw4swIpmFocxEzPelS YiFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703210357; x=1703815157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F4/lFuQQ8aRjKsTJBeQApKDK4hOJ7gyWGAx/V6cHGCw=; b=OU52u6chOc6kmrpiTA0/RfLvUzK42qGhWEzjV5coIzgQt4icwn0JHEC47cSO9eEUpJ 2mG+h2kU9eeL0taTuWkv9U6uc3oMo5tHovW+Ulrkhe0fVO4pC7Kz5/onfxWsSzHjf8us X9gi39YzT6XNFkQB6ad/u/wFB18TgYoFKytm8ifIhw2Q/a8cksvQMzXZDSwryqsdt2oS V3B8wScEAAhGtaP2E14evnq1rkpfaWKS2bM6Nfy/PPDKF0+nsXnN8Lgbr9H+Ow6ODysN 4OslrIHnvZ7CY2L5AZDWEO1o/h0gZCuQPzraUuYpXroMF3smjpFYFurkC9ic3uJCC4mO q7mQ== X-Gm-Message-State: AOJu0Yz9CtuXCD/ebTC63yRKuyEKvYeb1UeaAlUd0XqVb2zU18NJxAOh oWIP6Tk2UM85G/YWOBytu6NxFOQQ802Bhu14VFulmL3rWg== X-Google-Smtp-Source: AGHT+IH0xcKaXPa+NaR8F7vKcQ7Ml2MM8rqbFcOFYbfAEowW+XEKlfZE7rP5ZmekIo8e5GdaGC/vEA== X-Received: by 2002:a05:600c:cf:b0:40d:3d6b:c310 with SMTP id u15-20020a05600c00cf00b0040d3d6bc310mr320620wmm.84.1703210357433; Thu, 21 Dec 2023 17:59:17 -0800 (PST) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id g3-20020a05600c310300b0040c6b2c8fa9sm12991667wmo.41.2023.12.21.17.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 17:59:16 -0800 (PST) From: Dmitry Safonov To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: Dmitry Safonov , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Safonov <0x7f454c46@gmail.com> Subject: [PATCH net-next 2/2] selftest/tcp-ao: Work on namespace-ified sysctl_optmem_max Date: Fri, 22 Dec 2023 01:59:07 +0000 Message-ID: <20231222-selftests-tcp-ao-fixups-v1-2-39c73817c372@arista.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222-selftests-tcp-ao-fixups-v1-0-39c73817c372@arista.com> References: <20231222-selftests-tcp-ao-fixups-v1-0-39c73817c372@arista.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mailer: b4 0.13-dev-b6b4b X-Developer-Signature: v=1; a=ed25519-sha256; t=1703210346; l=3509; i=dima@arista.com; s=20231212; h=from:subject:message-id; bh=aAhgKSShLm2so0+GO2W3s1G0l6uod//MDjvHynQQ5Wg=; b=koV9a+5/3Pucgn48VBu2Sh1ZHLSSqOqy9ycM0YGAc0ddXk7FEpUuFDo2sHnn8An1OyxjOsBqx 4iml95eTdL6CFy7TXArUqZ1pJxCvRBW52MXuWYXgWz2iGWn33hwX9KN X-Developer-Key: i=dima@arista.com; a=ed25519; pk=hXINUhX25b0D/zWBKvd6zkvH7W2rcwh/CH6cjEa3OTk= Since commit f5769faeec36 ("net: Namespace-ify sysctl_optmem_max") optmem_max is per-netns, so need of switching to root namespace. It seems trivial to keep the old logic working, so going to keep it for a while (at least, until kernel with netns-optmem_max will be release). Currently, there is a test that checks that optmem_max limit applies to TCP-AO keys and a little benchmark that measures linked-list TCP-AO keys scaling, those are fixed by this. Cc: Eric Dumazet Signed-off-by: Dmitry Safonov --- tools/testing/selftests/net/tcp_ao/lib/setup.c | 35 ++++++++++++++++++++------ 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/tcp_ao/lib/setup.c b/tools/testing/selftests/net/tcp_ao/lib/setup.c index 374b27c26ebd..92276f916f2f 100644 --- a/tools/testing/selftests/net/tcp_ao/lib/setup.c +++ b/tools/testing/selftests/net/tcp_ao/lib/setup.c @@ -277,22 +277,38 @@ void __test_init(unsigned int ntests, int family, unsigned int prefix, /* /proc/sys/net/core/optmem_max artifically limits the amount of memory * that can be allocated with sock_kmalloc() on each socket in the system. - * It is not virtualized, so it has to written outside test namespaces. - * To be nice a test will revert optmem back to the old value. + * It is not virtualized in v6.7, so it has to written outside test + * namespaces. To be nice a test will revert optmem back to the old value. * Keeping it simple without any file lock, which means the tests that * need to set/increase optmem value shouldn't run in parallel. * Also, not re-entrant. + * Since commit f5769faeec36 ("net: Namespace-ify sysctl_optmem_max") + * it is per-namespace, keeping logic for non-virtualized optmem_max + * for v6.7, which supports TCP-AO. */ static const char *optmem_file = "/proc/sys/net/core/optmem_max"; static size_t saved_optmem; +static int optmem_ns = -1; + +static bool is_optmem_namespaced(void) +{ + if (optmem_ns == -1) { + int old_ns = switch_save_ns(nsfd_child); + + optmem_ns = !access(optmem_file, F_OK); + switch_ns(old_ns); + } + return !!optmem_ns; +} size_t test_get_optmem(void) { + int old_ns = 0; FILE *foptmem; - int old_ns; size_t ret; - old_ns = switch_save_ns(nsfd_outside); + if (!is_optmem_namespaced()) + old_ns = switch_save_ns(nsfd_outside); foptmem = fopen(optmem_file, "r"); if (!foptmem) test_error("failed to open %s", optmem_file); @@ -300,19 +316,21 @@ size_t test_get_optmem(void) if (fscanf(foptmem, "%zu", &ret) != 1) test_error("can't read from %s", optmem_file); fclose(foptmem); - switch_ns(old_ns); + if (!is_optmem_namespaced()) + switch_ns(old_ns); return ret; } static void __test_set_optmem(size_t new, size_t *old) { + int old_ns = 0; FILE *foptmem; - int old_ns; if (old != NULL) *old = test_get_optmem(); - old_ns = switch_save_ns(nsfd_outside); + if (!is_optmem_namespaced()) + old_ns = switch_save_ns(nsfd_outside); foptmem = fopen(optmem_file, "w"); if (!foptmem) test_error("failed to open %s", optmem_file); @@ -320,7 +338,8 @@ static void __test_set_optmem(size_t new, size_t *old) if (fprintf(foptmem, "%zu", new) <= 0) test_error("can't write %zu to %s", new, optmem_file); fclose(foptmem); - switch_ns(old_ns); + if (!is_optmem_namespaced()) + switch_ns(old_ns); } static void test_revert_optmem(void)