From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 E1A8A3A784A for ; Fri, 12 Jun 2026 19:09:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781291364; cv=none; b=p+ThQRzYOxKGVTKIwucVZlYCleppWC2V5bVGIV3hmbHGT+MAqyUpxl3WTPoV6U8RoqPAp8x0uElpT+Yh4irhFiLb3W7x5YX9IvEasR2fwYQZrfoLCkVj8hclpwANH6eWed43oRuF18YMj1wXPEjxTWCe1jKMlSbQP+UDdgD5hXE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781291364; c=relaxed/simple; bh=bPlI/2xmJK0Qts5eddw/Vh21IiHuQaslrq963O+3tzY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QVILhJ+jGva9G22bSWdMwQfQglDyKO2eO1Lvuwqf+i5niw2e6iUvMVMkXQQ/AEy9kBw7S38iMOYbk51azYDAc4QqazRVKmkJWigJxgPN/ZvRiZcpj0PU+otKlGAh6xiomj0WN4r9gfsex/5xjU9OejC7amtaFsje0bgSNiAXn2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BL9awbNx; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BL9awbNx" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2c168baac83so6862255ad.2 for ; Fri, 12 Jun 2026 12:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781291362; x=1781896162; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=XRg96KjMZPBuPn1RKC3qLwa0FZMA6GdGbqmzSwsfaRM=; b=BL9awbNxvPfVsNfpQj1luXAl4MFsRWD4d1Lmsue8cB/NHkbz5ybKXADUH3hTU+hFwl UxV9IDYhi8T0vQFHz5W0DKsUaaW9rr10E/PCcjm4yiXaAb7bWY3JNtP9jijkkNsZ74Lh bfU7euv+Uhr/mT+NNI9R13h85aTTy7DUV1ZBB3HmJkciITv6VZ+Ck9OrL8l1ibGOBn2Y imvqTIgxxqTFkY96axUZfo3D8/Z11BQt9DfmsZl72X9qqCuSQ2pfKUy24OnPhT7q/C9b UA1JfZA/Is0RZeTW/ektUDIOmww8ISwBwoVohipJFGrwKT73T5eI0oUeYCLck9m8I6Ju n0Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781291362; x=1781896162; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XRg96KjMZPBuPn1RKC3qLwa0FZMA6GdGbqmzSwsfaRM=; b=TQ9O/Y0UzKSvPCbcrrENz7RB45MptJFsl+Qb5LwHBlQLgoHOqdorFMLHdo8oZi/5MN BPnlvybW0Aw2DLzKTL/jrAF8tWs2rSji+8fEgionMlZPPrN9fopCHHDOToQZroWcljU0 1tW/YMctB5JHWyCM6KZW+Z2I+7X+6M7mSrV25hd3kv50EUcKYLwIDNXmoex4mjNP+d9H fPJIo+QDMolg/Av4+cJ8bYRIiT/6ubpiZwCHiidKM/rXtME2THws4uELz836hXnIL4Na g7l54DdvP9Pud8UvUNaT5GIgLUQ7r1Jz2zn7H94Bmu6OZ9J4vyaAQ0SNauoSI3GyEQ1q e77w== X-Forwarded-Encrypted: i=1; AFNElJ9D4IRPGzv9L2EhNefMY7m54sihQ9Eg/wSoLW3UKqmlfoKiqMg7H2+eNUeUIM22QBsNGJvHKcGtHLDkFv0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6ImOiIL3wawy+mzKWzpX4PXSczHRsDZANeO69SHK0kwfcbQ++ 7sggOB9MSt6lGtJqcNSaa8j8XnFEIuOP6aa7LCGL+Cn9ccBBPG7+WIyMahs8aVqi X-Gm-Gg: Acq92OEUWbeb91PyJf8RdAWD9kxEzEP8sRP4wxvmhtsK+vjiEFqNwWtOAy7hP2StFk6 iCXGOZpGwDBBUhqFNohhur+QOHZWe0FURkkyxs+KNY74B0nREPOheDcdCOjohk0Vg2vZNxdaDUq PbvWsAjjuGPEMNBDsAYp08Lk1DjhtcEE5SZAWCkqeWqzkS4D+uFSFU8iyoxuQisdmgvTN4Dy03G tEw9/8GOjOy4wdwSFqsi7p6mv+/86VNVMP0amgJrn6h/FswhtlB8EETOZg9RSFcz/ga7v2KYwnU 9wuG8JEYOxEghVoOsg35XtS8pWcH+GIhogzZL/UOsN7NyQPZ+bp7lzK2YGt7cunDWfSqE7+DkGg JhoEMKoagnZtkCp7W7njsQJPKlMTAyI83T2aZDee3fIqAmYTnGczGiQY0kTGalU1GUxsxukJyOi urvjH7/sUYXLOg78210hU= X-Received: by 2002:a17:902:ced2:b0:2bd:7684:34b0 with SMTP id d9443c01a7336-2c4105092a4mr52571515ad.15.1781291362268; Fri, 12 Jun 2026 12:09:22 -0700 (PDT) Received: from localhost ([2a03:2880:ff:5c::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c433460a60sm34934225ad.76.2026.06.12.12.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 12:09:22 -0700 (PDT) From: Bobby Eshleman Date: Fri, 12 Jun 2026 12:08:41 -0700 Subject: [PATCH net-next 1/2] selftests/vsock: accept vng 1.33 or >= 1.36 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260612-vsock-test-update-v1-1-7d7eeed3ac8f@meta.com> References: <20260612-vsock-test-update-v1-0-7d7eeed3ac8f@meta.com> In-Reply-To: <20260612-vsock-test-update-v1-0-7d7eeed3ac8f@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman The current vng version check uses a discrete allowlist of "1.33", "1.36", and "1.37", which forces a script update on every new release even though all post-1.36 releases work. Replace the discrete list with: "1.33", or any version >= 1.36. 1.34 and 1.35 are skipped because they were not tested. Add a version_lt() helper that compares MAJOR.MINOR numerically, so the check reads as a straightforward version comparison. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 39 +++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index d97913a6bdc7..ee69ac9dd3dc 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -330,27 +330,34 @@ check_netns() { return 0 } +# Compare MAJOR.MINOR versions numerically. Returns 0 (true) if $1 < $2. +version_lt() { + local -a a=(${1//./ }) + local -a b=(${2//./ }) + + if [[ "${a[0]}" -lt "${b[0]}" ]]; then + return 0 + elif [[ "${a[0]}" -gt "${b[0]}" ]]; then + return 1 + elif [[ "${a[1]}" -lt "${b[1]}" ]]; then + return 0 + fi + + return 1 +} + check_vng() { - local tested_versions local version - local ok - tested_versions=("1.33" "1.36" "1.37") - version="$(vng --version)" + version="$(vng --version | awk '{print $2}')" - ok=0 - for tv in "${tested_versions[@]}"; do - if [[ "${version}" == *"${tv}"* ]]; then - ok=1 - break - fi - done - - if [[ ! "${ok}" -eq 1 ]]; then - printf "warning: vng version '%s' has not been tested and may " "${version}" >&2 - printf "not function properly.\n\tThe following versions have been tested: " >&2 - echo "${tested_versions[@]}" >&2 + # Supported: 1.33, or any version >= 1.36. 1.34 and 1.35 are untested. + if [[ "${version}" == "1.33" ]] || ! version_lt "${version}" "1.36"; then + return fi + + printf "warning: vng version '%s' has not been tested and may " "${version}" >&2 + printf "not function properly.\n\tSupported: 1.33 or >= 1.36\n" >&2 } check_socat() { -- 2.53.0-Meta