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 6D441802A5 for ; Mon, 28 Sep 2026 19:44:55 +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 68SJhf0n014400; Mon, 28 Sep 2026 22:43:42 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68SJhf0n014400 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ShYGBDpZ" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68SJhZ42014387 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 28 Sep 2026 22:43:35 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68SJhZ42014387 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-488872aa05fso2391066f8f.3 for ; Mon, 28 Sep 2026 12:43:35 -0700 (PDT) X-Gm-Message-State: AFq9FYKog2JvpcoWwdENzLBmVR47PfkW/fUJZOnY+ZkbeosOMlF+IuVi jxAPqnOTNB93pZKFKmDQe3xA0sOoDZuMqPup+fkb9AaQN3ocMMZ3Zaq5DL9rUA5O4NIiSv8/8vp HZMui8YVz6+RxQ5amq2SvnXFo8PUfopZiPmC/E7KB5GLNImGs1mHMaQ== X-Gm-Gg: AYBFou3l7vJVfVQeCYv1PIRR1b1MnNI17jKJRgKNUU9aQKLU31bXs1zmDvJk/TmkT78 LelY//l5U50OwxflvBtLxODn9pLsLTh3jk/hbgkfOhjPoIiHgukFSoUKN/IwU16xCBPpx8SBbGV 5zkxmpXO5VF/fyHp/TWpH00YeCzL3v9n+iAsrpzz+i9EPNRYLNgjEdiBnxLlQHQiI75Z9hFPoy2 FMzrzijCt6m3u15KZFDsKKY+In4G4Mn/nOW7Rv+DpX4BgPT64eZh6AhAcMiFSRrdAcbh2OsgXHw 3/BwuEFmTU7Ti45MhhZtYtH5rvxRxYAncZe37X9Y7pZnlJhRa8g6U4anc0RcuK5MipUcGEifDFe 6g8Mr1197B9I3E94xIq6P3vrm X-Received: by 2002:a05:6000:2307:b0:487:7fd:734 with SMTP id ffacd0b85a97d-48871725006mr24721534f8f.18.1790624615443; Mon, 28 Sep 2026 12:43:35 -0700 (PDT) X-Received: by 2002:a05:6000:2307:b0:487:7fd:734 with SMTP id ffacd0b85a97d-48871725006mr24721504f8f.18.1790624614826; Mon, 28 Sep 2026 12:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790624614; cv=none; d=google.com; s=arc-20260327; b=HYUNgjBHpq/4raJelhwjrRWqcwWxzBIXyqwTpIDuYYt43mLW9P2v5m2SBT5KHzfBzG 1epwnQK2GztjfRue9lkalooZHhiI7ZgVFu/Olb7YA9f2kroR8IgcGXro7wvfiPFkbAtE jGiAdLS8N0wIcoYa5PmaPBqgjVxx/tPJOwliTyzgqOXVLEW8tp2hxo4LfRhnP3sg8xtk rIkCUjUXN6I0iG/ojpgOmcnd5jUW5DG3qYcooDCod2xbiWbak6/uzH6AzZd4vUIdYBer hzYoocxIKDwszcAcYzRCqQ3FU20l9obCZjMVyED47evj07aP3m7frFec8t7eadG8+meK VrEw== 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=0z4JxtfZfXAb7ItKc5wUIFIc1Xr+xsVEbhKNakgg2D4=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=FRynYeNRDxnASyACpAPXWno/z45RUL2l80OcJkFMcVQRc6ikMwzUyvwtJx7BjKwa8x YhgYiFC/tBC0eoTI6uA7idKhQ3QIy8SVF/Mih5ACnpraJ+g8zUVxU/E54saBcHFScesV zwI9cqfCRZYZvu6EPeHV+PRciZcGDK2ZUCc1pEWDi09l/G4zceT02aTddlGcyA+x1xOq suZGUvLfXobSfsjDcHy/fe+I+5VIg8TBMtKmHatGrzLmfyFf+u9Wq3JbKa575tUNC0C+ +PTVLcZYo7tTukB0p5KLz1j3RR6X350/t7QilKJb6odMdc+yEKoknnuXy5xA1AGcp21C 2Aog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=ShYGBDpZ; 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-4887a8693fcsi19905358f8f.346.2026.09.28.12.43.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 12:43:34 -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=ShYGBDpZ; 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=0z4JxtfZfXAb7ItKc5wUIFIc1Xr+xsVEbhKNakgg2D4=; b=ShYGBDpZMibu QlB3Yr+mUL6XjZ8L0h5/EpyJI6CkaBislUXhhaipI1FRl8NsfvMR9tDf1gMxsVVIWMEiLyENl+fcP kjlEAij++ey0X4D5pREdqJXXke5EcsdGbCCeGnanrRHijQHcVNbUOKB+neoLt016ZaSl+G2j7SRIW v9pioWbqEeg4pzeGy0ZGH6kzCpbrxduP2SDXzcfHKVdZ8nayZIwhvkOqXvjiANV+FdJsbHvICVBvj 2qECfp12Y8BotpZLyO7x+KE78M1DOn0E6fc62uo9Uk0/Hq1GK0dsRWpk/PZu0BnECjYRpv9TKkNBh IQB0nL5ETGv75o3HoHHmlw==; 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 1xBHD7-00A0xD-1U; Mon, 28 Sep 2026 21:43:25 +0200 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 28 Sep 2026 22:43:06 +0300 Message-ID: <20260928194332.551992-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260928194332.551992-1-eva.kurchatova@virtuozzo.com> References: <20260928194332.551992-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 1/1] selftests: drv-net-hw: skip the tests that need a real interface 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 ethtool, ethtool_extended_state, ethtool_rmon, hw_stats_l3 and hw_stats_l3_gre need hardware: link speed, extended link state, rmon counters, L3 statistics offload. With no interfaces configured lib.sh substitutes a veth pair, and every case fails on what veth does not have. Upstream runs these tests on real hardware only and dropped the veth check in commit 0c499a351777 ("selftests: forwarding: Ditch skip_on_veth()"), so this patch is not for upstream. Skip on veth before sourcing lib.sh, which creates the pair as it is sourced and would leave it behind. The check reads forwarding.config the way lib.sh does, so real interfaces configured there are honoured. https://virtuozzo.atlassian.net/browse/VSTOR-139651 Feature: fix selftests Signed-off-by: Eva Kurchatova --- .../testing/selftests/drivers/net/hw/Makefile | 1 + .../selftests/drivers/net/hw/ethtool.sh | 5 +++++ .../drivers/net/hw/ethtool_extended_state.sh | 5 +++++ .../selftests/drivers/net/hw/ethtool_rmon.sh | 5 +++++ .../selftests/drivers/net/hw/hw_stats_l3.sh | 5 +++++ .../drivers/net/hw/hw_stats_l3_gre.sh | 5 +++++ .../selftests/drivers/net/hw/skip_on_veth.sh | 22 +++++++++++++++++++ 7 files changed, 48 insertions(+) create mode 100644 tools/testing/selftests/drivers/net/hw/skip_on_veth.sh diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile index e556b5150a51..39aece5e2776 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -19,6 +19,7 @@ TEST_PROGS = \ TEST_FILES := \ ethtool_lib.sh \ + skip_on_veth.sh \ # TEST_INCLUDES := \ diff --git a/tools/testing/selftests/drivers/net/hw/ethtool.sh b/tools/testing/selftests/drivers/net/hw/ethtool.sh index fa6953de6b6d..b9eeeb56589f 100755 --- a/tools/testing/selftests/drivers/net/hw/ethtool.sh +++ b/tools/testing/selftests/drivers/net/hw/ethtool.sh @@ -11,6 +11,11 @@ ALL_TESTS=" " NUM_NETIFS=2 lib_dir=$(dirname "$0") + +# Needs a device that can set link speed and autonegotiation +source "$lib_dir"/skip_on_veth.sh +skip_on_veth + source "$lib_dir"/../../../net/forwarding/lib.sh source ethtool_lib.sh diff --git a/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh b/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh index a7584448416e..fd3ecd962342 100755 --- a/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh +++ b/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh @@ -9,6 +9,11 @@ ALL_TESTS=" NUM_NETIFS=2 lib_dir=$(dirname "$0") + +# Needs a device that reports an extended link state +source "$lib_dir"/skip_on_veth.sh +skip_on_veth + source "$lib_dir"/../../../net/forwarding/lib.sh source ethtool_lib.sh diff --git a/tools/testing/selftests/drivers/net/hw/ethtool_rmon.sh b/tools/testing/selftests/drivers/net/hw/ethtool_rmon.sh index 8f60c1685ad4..91445a379fac 100755 --- a/tools/testing/selftests/drivers/net/hw/ethtool_rmon.sh +++ b/tools/testing/selftests/drivers/net/hw/ethtool_rmon.sh @@ -8,6 +8,11 @@ ALL_TESTS=" NUM_NETIFS=2 lib_dir=$(dirname "$0") + +# Needs a device with rmon histogram counters +source "$lib_dir"/skip_on_veth.sh +skip_on_veth + source "$lib_dir"/../../../net/forwarding/lib.sh ETH_FCS_LEN=4 diff --git a/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh b/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh index 67fafefc80be..13104dc7d819 100755 --- a/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh +++ b/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh @@ -49,6 +49,11 @@ ALL_TESTS=" " NUM_NETIFS=4 lib_dir=$(dirname "$0") + +# Needs a device that offloads L3 statistics +source "$lib_dir"/skip_on_veth.sh +skip_on_veth + source "$lib_dir"/../../../net/forwarding/lib.sh source "$lib_dir"/../../../net/forwarding/tc_common.sh diff --git a/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh b/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh index a94d92e1abce..b94b2338c853 100755 --- a/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh +++ b/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh @@ -13,6 +13,11 @@ ALL_TESTS=" " NUM_NETIFS=6 lib_dir=$(dirname "$0") + +# Needs a device that offloads L3 statistics +source "$lib_dir"/skip_on_veth.sh +skip_on_veth + source "$lib_dir"/../../../net/forwarding/lib.sh source "$lib_dir"/../../../net/forwarding/ipip_lib.sh source "$lib_dir"/../../../net/forwarding/tc_common.sh diff --git a/tools/testing/selftests/drivers/net/hw/skip_on_veth.sh b/tools/testing/selftests/drivers/net/hw/skip_on_veth.sh new file mode 100644 index 000000000000..845cc65b1df7 --- /dev/null +++ b/tools/testing/selftests/drivers/net/hw/skip_on_veth.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# Source with lib_dir set, ahead of lib.sh, which creates the interfaces. + +forwarding_dir="$lib_dir"/../../../net/forwarding + +if [[ -f $forwarding_dir/forwarding.config ]]; then + source "$forwarding_dir/forwarding.config" +fi + +: "${NETIF_CREATE:=yes}" +: "${NETIF_TYPE:=veth}" + +# Call before sourcing lib.sh, exiting after it leaves the veth pair behind +skip_on_veth() +{ + if [[ "$NETIF_CREATE" = yes && "$NETIF_TYPE" = veth ]]; then + echo "SKIP: needs a real interface, set NETIFS in forwarding.config" + exit 4 # ksft_skip, lib.sh is not sourced yet + fi +} -- 2.55.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel