From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 18FFB80266 for ; Mon, 31 Aug 2026 22:50:14 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67VMn2jE030934; Tue, 1 Sep 2026 01:49:03 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67VMn2jE030934 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="xro+uCzv" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67VMmrIV030896 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 1 Sep 2026 01:48:54 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67VMmrIV030896 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-47f6db77430so2079455f8f.0 for ; Mon, 31 Aug 2026 15:48:53 -0700 (PDT) X-Gm-Message-State: AFuF++kaylJevVPNccz+i2U+MI1K3sxg+qm8a4xPft5r03sbTLHn2rur Fle7MBpWP+Q4PQCfQMo1JlCL7Hg/+qHWKvSlPhcL/uZ4nVzFBSsNm3MIy/RGfLS0xdyrUxZ2gNu Gfge5lyRqWluKfsmtBFoJbfUGHBlM5Sc13aUJ8I0OKkkgHp4i+8NLug== X-Gm-Gg: AYBFou0JlOfGJjy4/+V3ZA6+X8gxcI4lD8j78+9mVCOwiR5kS981lAwIVekJ665N2Ho +g2PAyC1E7ouCVIA+gAuT9KcSDWhqEgAF/pgc3rjZfYVnSrt9HJ9hhC9XZkrSql50TEB/DrJpfk 3ZhHF+7yTjnXNhzGn4qrj7QeD6jUjao9/HTyCWl1AUIGUVwRBqNPNLa8uHhnXOF6360xDUAdsl7 HVcI2YEGTPZLhtX8avOAAQjimMWVlWYVPTVJ0ytiRfvcJgGLdsoFpa892D3qzXfFCqnO0J0qK9y s4/jwCpkocLJ/l3chE5etcG9JP5n7j2zJWZ41oqcpimCrE7IOupp8a2F23U19+LNIGs0LV6Kv2/ JihVbtsRvZcdW2IXrDWYwCbci X-Received: by 2002:a05:6000:4553:b0:481:5b58:c589 with SMTP id ffacd0b85a97d-48440fea795mr6124666f8f.10.1788216533672; Mon, 31 Aug 2026 15:48:53 -0700 (PDT) X-Received: by 2002:a05:6000:4553:b0:481:5b58:c589 with SMTP id ffacd0b85a97d-48440fea795mr6124629f8f.10.1788216533223; Mon, 31 Aug 2026 15:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1788216533; cv=none; d=google.com; s=arc-20260327; b=j1qyf8fs1VQPSds+I3OBY3CqOdYIf2l0DVZWyvVqk+slYHoUZ7S+g44WEIxN5J9g/n MwuyuccutXbgSagrFFWeq1W6gO2sogTTdEEO7TvfbcVmB+LpYgto71GEV8z/RaDyFjft w95M2rXmCXxtuu116+CI9L2l5DkAhQeFsLSxPvevMCLPkxya8owmsNDzXbg+bQhCeoAQ 4QNT97oIeccD+yd8DpSZmAWFZndMoqA95ndYfctkUr7X8u76FnIJCUBrSljoBdzgwrRP ow5XETrY11pBw2gMU2C7nLbYHM0gpc69dHd4YCh1OLKuZt2Jr9avPr/8TJeqiWS3/+Ln 7ysw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=IQYzuVBac7ykGO/+QprJJPre+Vdr9+dSgY7jvnjGMDU=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=su9jZW5BiZUQIZyN5vTR9AkwChkuokd12PkP1xnizV8PZcLjLcAwSHrf/NR7dodQtp MayYojaqI1yEsjLHlpOJgE5v8UgFTfO9aiuC0WF2SbQj8+/OYo0IqX9NWHQ+rjJymHKD WTv3IX8VM7WZaunLu1Bjj0EMzgqzgyuP6NA6Ab3vO7FvGzV3fhBpJgNh00Gq78qAI1zE 7m0H9sOwPGa34aP9v18XThxI8EJNDcbZ1mtmjKsLTKXq3EEs2tp+phLlkQJbOhDMz8YP m1ZCu3h5OTKRLRdM/6sGP8n4nDs2neDfUVAiy9IY36GAXu8zAeMIRsA5U4fIehI/Kbg+ 29VA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=xro+uCzv; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48442d86b80si768896f8f.390.2026.08.31.15.48.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 15:48:53 -0700 (PDT) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=xro+uCzv; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=IQYzuVBac7ykGO/+QprJJPre+Vdr9+dSgY7jvnjGMDU=; b=xro+uCzv1Vfe ptx3DpF583yquo7L3vcR/uljMG/ig93Ik8OXEr9RV9IsSLnspm6AawNxIBqSqG5kT3XZKJqphVu6H zgisC1Vz6CaU4UFoU1UuaeTg6hLKQtR7TbMSOeYylI5U9XxNTXOAx32m84vshzVfrloANGrk81C/o ooMfYon1XrBXn/NdgQjik2uGyy6XLzLdHB1vcw1qlz/1WGstfEtuf8bI0+oiM6RNmCRNMV8SgGWL8 VQUNS39vFYGNddsPAcHWFk5tz5zdxnJ0zRQ8xdLQj+a004s35d1P12lXYR5SQWuFAmitj5Z+Se8X9 Nf8ZeYguR4z4B6ElQCXoIw==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x1Alm-009jQI-0Z; Tue, 01 Sep 2026 00:48:44 +0200 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Tue, 1 Sep 2026 01:48:21 +0300 Message-ID: <20260831224850.1642265-3-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260831224850.1642265-1-eva.kurchatova@virtuozzo.com> References: <20260831224850.1642265-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH vz10 3/7] selftests: net: skip what this kernel and iproute2 do not have X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org Five cases report a failure where a feature is simply not there. tls asks for every cipher it knows and fails on the ones the kernel does not implement, SM4 and ARIA, which answer ENOENT at setsockopt time. Skip a cipher the kernel refuses that way; the run then reports 632 passed, 264 skipped and none failed. rtnetlink.sh sets up an erspan tunnel, which this kernel does not have and which fails with "Unknown device type", and checks a netconf dump whose exit status iproute2 gets wrong: 6.11 exits 2 on a dump that worked, 6.17 exits 0. Probe for both and skip when unusable. rtnetlink.py asks for an IPv4 multicast address dump the kernel answers with EOPNOTSUPP, and ip_local_port_range asks for protocols it does not have. Skip those too. https://virtuozzo.atlassian.net/browse/VSTOR-139651 Feature: fix selftests Signed-off-by: Eva Kurchatova --- .../selftests/net/ip_local_port_range.c | 17 +++++++--- tools/testing/selftests/net/rtnetlink.py | 11 +++++-- tools/testing/selftests/net/rtnetlink.sh | 31 +++++++++++++++++++ tools/testing/selftests/net/tls.c | 2 ++ 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/ip_local_port_range.c b/tools/testing/selftests/net/ip_local_port_range.c index 29451d2244b7..2d7b9c852b2b 100644 --- a/tools/testing/selftests/net/ip_local_port_range.c +++ b/tools/testing/selftests/net/ip_local_port_range.c @@ -118,10 +118,6 @@ static int get_ip_local_port_range(int fd, __u32 *range) FIXTURE(ip_local_port_range) {}; -FIXTURE_SETUP(ip_local_port_range) -{ -} - FIXTURE_TEARDOWN(ip_local_port_range) { } @@ -180,6 +176,19 @@ FIXTURE_VARIANT_ADD(ip_local_port_range, ip6_mptcp) { .so_protocol = IPPROTO_MPTCP, }; +FIXTURE_SETUP(ip_local_port_range) +{ + int fd; + + /* Not every protocol under test is built into every kernel. */ + fd = socket(variant->so_domain, variant->so_type, variant->so_protocol); + if (fd < 0 && (errno == EPROTONOSUPPORT || errno == ESOCKTNOSUPPORT || + errno == EAFNOSUPPORT)) + SKIP(return, "%s", strerror(errno)); + ASSERT_GE(fd, 0) TH_LOG("socket failed"); + close(fd); +} + TEST_F(ip_local_port_range, invalid_option_value) { __u16 val16; diff --git a/tools/testing/selftests/net/rtnetlink.py b/tools/testing/selftests/net/rtnetlink.py index baa7b33f313e..425fc7a3941b 100755 --- a/tools/testing/selftests/net/rtnetlink.py +++ b/tools/testing/selftests/net/rtnetlink.py @@ -1,7 +1,9 @@ #! /usr/bin/python3 -sP # SPDX-License-Identifier: GPL-2.0 -from lib.py import ksft_exit, ksft_run, ksft_ge, RtnlAddrFamily +from lib.py import ksft_exit, ksft_run, ksft_ge, KsftSkipEx +from lib.py import NlError, RtnlAddrFamily +import errno import socket IPV4_ALL_HOSTS_MULTICAST = b'\xe0\x00\x00\x01' @@ -12,7 +14,12 @@ def dump_mcaddr_check(rtnl: RtnlAddrFamily) -> None: At least the loopback interface should have this address. """ - addresses = rtnl.getmulticast({"ifa-family": socket.AF_INET}, dump=True) + try: + addresses = rtnl.getmulticast({"ifa-family": socket.AF_INET}, dump=True) + except NlError as e: + if e.nl_msg.error == -errno.EOPNOTSUPP: + raise KsftSkipEx("IPv4 multicast address dump is not supported") + raise all_host_multicasts = [ addr for addr in addresses if addr['multicast'] == IPV4_ALL_HOSTS_MULTICAST diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 5f72b447e940..cc4e94b90002 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -142,10 +142,30 @@ kci_del_dummy() run_cmd ip link del dev "$devdummy" } +# Some iproute2 versions exit non-zero from a netconf dump that worked, +# printing the devconf and then failing anyway. Nothing about the kernel +# can be learned from the exit status of such an ip, so find out once. +netconf_exit_status_usable() +{ + local out + + out=$(ip -4 netconf show dev lo 2>/dev/null) + if [ $? -ne 0 ] && [ -n "$out" ]; then + return 1 + fi + return 0 +} + kci_test_netconf() { dev="$1" r=$ret + + if ! netconf_exit_status_usable; then + end_test "SKIP: ip netconf $dev: iproute2 fails a dump that worked" + return $ksft_skip + fi + run_cmd ip netconf show dev "$dev" for f in 4 6; do run_cmd ip -$f netconf show dev "$dev" @@ -920,6 +940,17 @@ kci_test_erspan() return $ksft_skip fi + # the kernel can be built without erspan, rtnetlink then has no ops + # for the type and says so. A kernel that has it gets past this and + # fails on the attributes the probe leaves out. + if ip -netns "$testns" link add dev "$DEV_NS" type erspan 2>&1 | \ + grep -q "Unknown device type"; then + end_test "SKIP: erspan: not supported by the kernel" + ip netns del "$testns" + return $ksft_skip + fi + ip -netns "$testns" link del dev "$DEV_NS" 2>/dev/null + # test native tunnel erspan v1 run_cmd ip -netns "$testns" link add dev "$DEV_NS" type erspan seq \ key 102 local 172.16.1.100 remote 172.16.1.200 \ diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index c9b0b4337e12..07f2b454d755 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -413,6 +413,8 @@ FIXTURE_SETUP(tls) return; ret = setsockopt(self->fd, SOL_TLS, TLS_TX, &tls12, tls12.len); + if (ret < 0 && errno == ENOENT) + SKIP(return, "Cipher not built into the kernel"); ASSERT_EQ(ret, 0); ret = setsockopt(self->cfd, SOL_TLS, TLS_RX, &tls12, tls12.len); -- 2.55.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel