From patchwork Wed Jan 24 16:48:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 13529411 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 3DE7E77638 for ; Wed, 24 Jan 2024 16:49:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706114943; cv=none; b=m/ajDgRv4Cf612RkTINaOxTI3X7m68r8kTVjgAaH1hG+fRewvRBNgg7rTSOf7ydrk3XHJZwzyCx9eR+sQVWUUwe4FYjq8hZZ3Om8XDdudMujQBpIFxxCBV9diUNzeFG6yokuBLL03M0nJ8J6bTfeBQMaG9a/fzbP6Xboi772OuU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706114943; c=relaxed/simple; bh=CqtkdCNxl9n+RA9D/beypA4ENvb3fZHppFOaSs6zSAY=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=Kka6aW5dUOeEGvpaYNfmI83oWcT6hX+/+FHUHXAvUANgKTxaqJNX/mB9ttPP06OTeZC0Xe84cDEwyQDW5sxqduGfcWepoYxPVMaCH0bHoCKu3sr72vkzWJkxbcgIz6hdYNUREdLF4yuQJiSV0WLBmnWd4ze6tbtoYOHiEBZSY/M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=X616eYhO; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X616eYhO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706114941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XzGyD91tSFtwbaP/RZX9vrPIPZ99bsOrgK+5Q9UbRw=; b=X616eYhONdFj8xF9lPhayO4W4hsZ0wV2DuFOE6TUJPBrMT+J1O1zdd5cQX7JlZ2H23mpOe hT2bMoexFsP2Py4jhrXZu74zUtKCmRztI5kz10HEJxFdiWEk8xtbEHwqcecBj9p6SF8jPW WXP7z2e4wQjBO8HKNpSCVYZUeiVGhy8= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-V9urWlJmM82sqzWWOEa5og-1; Wed, 24 Jan 2024 11:48:59 -0500 X-MC-Unique: V9urWlJmM82sqzWWOEa5og-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68A73280604B; Wed, 24 Jan 2024 16:48:56 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id B15811C060AF; Wed, 24 Jan 2024 16:48:55 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Subject: [PATCH 1/2] KVM: selftests: Avoid infinite loop in hyperv_features when invtsc is missing Date: Wed, 24 Jan 2024 17:48:54 +0100 Message-ID: <20240124164855.2564824-1-vkuznets@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 When X86_FEATURE_INVTSC is missing, guest_test_msrs_access() was supposed to skip testing dependent Hyper-V invariant TSC feature. Unfortunately, 'continue' does not lead to that as stage is not incremented. Moreover, 'vm' allocated with vm_create_with_one_vcpu() is not freed and the test runs out of available file descriptors very quickly. Fixes: bd827bd77537 ("KVM: selftests: Test Hyper-V invariant TSC control") Signed-off-by: Vitaly Kuznetsov --- tools/testing/selftests/kvm/x86_64/hyperv_features.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/testing/selftests/kvm/x86_64/hyperv_features.c index 4f4193fc74ff..b923a285e96f 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c @@ -454,7 +454,7 @@ static void guest_test_msrs_access(void) case 44: /* MSR is not available when CPUID feature bit is unset */ if (!has_invtsc) - continue; + goto next_stage; msr->idx = HV_X64_MSR_TSC_INVARIANT_CONTROL; msr->write = false; msr->fault_expected = true; @@ -462,7 +462,7 @@ static void guest_test_msrs_access(void) case 45: /* MSR is vailable when CPUID feature bit is set */ if (!has_invtsc) - continue; + goto next_stage; vcpu_set_cpuid_feature(vcpu, HV_ACCESS_TSC_INVARIANT); msr->idx = HV_X64_MSR_TSC_INVARIANT_CONTROL; msr->write = false; @@ -471,7 +471,7 @@ static void guest_test_msrs_access(void) case 46: /* Writing bits other than 0 is forbidden */ if (!has_invtsc) - continue; + goto next_stage; msr->idx = HV_X64_MSR_TSC_INVARIANT_CONTROL; msr->write = true; msr->write_val = 0xdeadbeef; @@ -480,7 +480,7 @@ static void guest_test_msrs_access(void) case 47: /* Setting bit 0 enables the feature */ if (!has_invtsc) - continue; + goto next_stage; msr->idx = HV_X64_MSR_TSC_INVARIANT_CONTROL; msr->write = true; msr->write_val = 1; @@ -513,6 +513,7 @@ static void guest_test_msrs_access(void) return; } +next_stage: stage++; kvm_vm_free(vm); } From patchwork Wed Jan 24 16:48:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 13529412 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 1B9647E570 for ; Wed, 24 Jan 2024 16:49:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706114946; cv=none; b=QTIPLjeRGE6iVwicp0Q3GelRzHBs+NM4oOZ5tfyb07uk6CrxXGIRVu/9Rl2SjtvNTH+xy5igUPt2IGCwb4JeHplXodtAfopOlBiAuY5TkzTPtG8FIyvctCzVqc3Fjs/8A9P9C14X2xeWY9f332TbPKOXDevv8PRs6zs908ge+Fc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706114946; c=relaxed/simple; bh=s9KRXH9pAqJym9VChh3bZmkDlYyWfd9kBPwlf56Kdvg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sv/6ufxp4jT/wTukRPI5inkeE7VUyLKGTF2fvbXDMnNxSeKGkDtuCBAwBaBZXmJsS4BFtv5nEhehY5GsFaZprL9QNF4D+MZ23trUEf+fEngdH/WgLpFmP9FucHtG0T+PoyurzXUBGe9NiBBBmRFH5vTcoPOzj7xJbyfFHyRJIdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=elIUKdpP; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="elIUKdpP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706114944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x1KzYBefZJni0FCDP73spKMgvjNuzgWQ5eAFD4yX/Vg=; b=elIUKdpP4PqwPWAFnxg3I5692VAE21ALODnLRAl3YJbjglhHMdQ/L7sKd2hB6YtfdjNNmv JwXOVjl2MjDaoi7Eaqid7XxmISzgK9qsqy0Itiwoa4Vwep0Rh/yoXzH5AaSBJlspKVl84q 7wSht3cRX7l79AlcipvIQxMj2+WIzEE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-vw52FaqIOo6FU3af-du6_g-1; Wed, 24 Jan 2024 11:49:00 -0500 X-MC-Unique: vw52FaqIOo6FU3af-du6_g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 53B17108BF31; Wed, 24 Jan 2024 16:48:57 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CD161C060B1; Wed, 24 Jan 2024 16:48:56 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Subject: [PATCH 2/2] KVM: selftests: Fail tests when open() fails with !ENOENT Date: Wed, 24 Jan 2024 17:48:55 +0100 Message-ID: <20240124164855.2564824-2-vkuznets@redhat.com> In-Reply-To: <20240124164855.2564824-1-vkuznets@redhat.com> References: <20240124164855.2564824-1-vkuznets@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 open_path_or_exit() is used for '/dev/kvm', '/dev/sev', and '/sys/module/%s/parameters/%s' and skipping test when the entry is missing is completely reasonable. Other errors, however, may indicate a real issue which is easy to miss. E.g. when 'hyperv_features' test was entering an infinite loop the output was: ./hyperv_features Testing access to Hyper-V specific MSRs 1..0 # SKIP - /dev/kvm not available (errno: 24) and this can easily get overlooked. Keep ENOENT case 'special' for skipping tests and fail when open() results in any other errno. Signed-off-by: Vitaly Kuznetsov --- tools/testing/selftests/kvm/lib/kvm_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index e066d584c656..f3dfd0d38b7f 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -27,7 +27,8 @@ int open_path_or_exit(const char *path, int flags) int fd; fd = open(path, flags); - __TEST_REQUIRE(fd >= 0, "%s not available (errno: %d)", path, errno); + __TEST_REQUIRE(fd >= 0 || errno != ENOENT, "%s not present", path); + TEST_ASSERT(fd >= 0, "%s not available (errno: %d)", path, errno); return fd; }