From nobody Thu Apr 2 16:43:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D719C433FE for ; Thu, 13 Oct 2022 09:59:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbiJMJ71 (ORCPT ); Thu, 13 Oct 2022 05:59:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbiJMJ7I (ORCPT ); Thu, 13 Oct 2022 05:59:08 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B400F9840 for ; Thu, 13 Oct 2022 02:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665655146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4d6sG8Es6XdqN+sm4wOSVdbq078l1FE+yvyXuAv9Zqs=; b=PW1YIYRTk4eYU0z7nDbfjlj+kU+wlbLY7lxcr4wg1kA9VGxxqIYafZ1Bj52NdD4Z47H+kO 71uKQDomTcaihpcKzzg1UxYCUHOjp6HZYMD81wCgePE5m2eOIf1DMDFxoqBW/IV5Iotbyr bXncEHEEnBwuUnm9346iFU/4lcMquYk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-RTycqATcNAaqHXN1U55u3A-1; Thu, 13 Oct 2022 05:59:03 -0400 X-MC-Unique: RTycqATcNAaqHXN1U55u3A-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 36EE2811E7A; Thu, 13 Oct 2022 09:59:03 +0000 (UTC) Received: from ovpn-194-196.brq.redhat.com (ovpn-194-196.brq.redhat.com [10.40.194.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F8D34A9254; Thu, 13 Oct 2022 09:59:01 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: Wanpeng Li , Jim Mattson , Michael Kelley , Maxim Levitsky , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 4/7] KVM: selftests: Rename 'msr->available' to 'msr->fault_exepected' in hyperv_features test Date: Thu, 13 Oct 2022 11:58:46 +0200 Message-Id: <20221013095849.705943-5-vkuznets@redhat.com> In-Reply-To: <20221013095849.705943-1-vkuznets@redhat.com> References: <20221013095849.705943-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It may not be clear what 'msr->available' means. The test actually checks that accessing the particular MSR doesn't cause #GP, rename the variable accordingly. While on it, use 'true'/'false' instead of '1'/'0' for 'write'/ 'fault_expected' as these are boolean. Signed-off-by: Vitaly Kuznetsov --- .../selftests/kvm/x86_64/hyperv_features.c | 184 +++++++++--------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/t= esting/selftests/kvm/x86_64/hyperv_features.c index 05b32e550a80..3a93e0eb7c6e 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c @@ -34,7 +34,7 @@ static inline uint8_t hypercall(u64 control, vm_vaddr_t i= nput_address, =20 struct msr_data { uint32_t idx; - bool available; + bool fault_expected; bool write; u64 write_val; }; @@ -57,10 +57,10 @@ static void guest_msr(struct msr_data *msr) else vector =3D wrmsr_safe(msr->idx, msr->write_val); =20 - if (msr->available) - GUEST_ASSERT_2(!vector, msr->idx, vector); - else + if (msr->fault_expected) GUEST_ASSERT_2(vector =3D=3D GP_VECTOR, msr->idx, vector); + else + GUEST_ASSERT_2(!vector, msr->idx, vector); GUEST_DONE(); } =20 @@ -153,13 +153,13 @@ static void guest_test_msrs_access(void) * Only available when Hyper-V identification is set */ msr->idx =3D HV_X64_MSR_GUEST_OS_ID; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 1: msr->idx =3D HV_X64_MSR_HYPERCALL; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 2: feat->eax |=3D HV_MSR_HYPERCALL_AVAILABLE; @@ -168,118 +168,118 @@ static void guest_test_msrs_access(void) * HV_X64_MSR_HYPERCALL available. */ msr->idx =3D HV_X64_MSR_GUEST_OS_ID; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D LINUX_OS_ID; - msr->available =3D 1; + msr->fault_expected =3D false; break; case 3: msr->idx =3D HV_X64_MSR_GUEST_OS_ID; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 4: msr->idx =3D HV_X64_MSR_HYPERCALL; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; =20 case 5: msr->idx =3D HV_X64_MSR_VP_RUNTIME; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 6: feat->eax |=3D HV_MSR_VP_RUNTIME_AVAILABLE; msr->idx =3D HV_X64_MSR_VP_RUNTIME; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 7: /* Read only */ msr->idx =3D HV_X64_MSR_VP_RUNTIME; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 0; + msr->fault_expected =3D true; break; =20 case 8: msr->idx =3D HV_X64_MSR_TIME_REF_COUNT; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 9: feat->eax |=3D HV_MSR_TIME_REF_COUNT_AVAILABLE; msr->idx =3D HV_X64_MSR_TIME_REF_COUNT; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 10: /* Read only */ msr->idx =3D HV_X64_MSR_TIME_REF_COUNT; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 0; + msr->fault_expected =3D true; break; =20 case 11: msr->idx =3D HV_X64_MSR_VP_INDEX; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 12: feat->eax |=3D HV_MSR_VP_INDEX_AVAILABLE; msr->idx =3D HV_X64_MSR_VP_INDEX; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 13: /* Read only */ msr->idx =3D HV_X64_MSR_VP_INDEX; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 0; + msr->fault_expected =3D true; break; =20 case 14: msr->idx =3D HV_X64_MSR_RESET; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 15: feat->eax |=3D HV_MSR_RESET_AVAILABLE; msr->idx =3D HV_X64_MSR_RESET; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 16: msr->idx =3D HV_X64_MSR_RESET; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 0; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 17: msr->idx =3D HV_X64_MSR_REFERENCE_TSC; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 18: feat->eax |=3D HV_MSR_REFERENCE_TSC_AVAILABLE; msr->idx =3D HV_X64_MSR_REFERENCE_TSC; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 19: msr->idx =3D HV_X64_MSR_REFERENCE_TSC; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 0; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 20: msr->idx =3D HV_X64_MSR_EOM; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 21: /* @@ -287,146 +287,146 @@ static void guest_test_msrs_access(void) * capability enabled and guest visible CPUID bit unset. */ msr->idx =3D HV_X64_MSR_EOM; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 22: feat->eax |=3D HV_MSR_SYNIC_AVAILABLE; msr->idx =3D HV_X64_MSR_EOM; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 23: msr->idx =3D HV_X64_MSR_EOM; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 0; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 24: msr->idx =3D HV_X64_MSR_STIMER0_CONFIG; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 25: feat->eax |=3D HV_MSR_SYNTIMER_AVAILABLE; msr->idx =3D HV_X64_MSR_STIMER0_CONFIG; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 26: msr->idx =3D HV_X64_MSR_STIMER0_CONFIG; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 0; - msr->available =3D 1; + msr->fault_expected =3D false; break; case 27: /* Direct mode test */ msr->idx =3D HV_X64_MSR_STIMER0_CONFIG; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1 << 12; - msr->available =3D 0; + msr->fault_expected =3D true; break; case 28: feat->edx |=3D HV_STIMER_DIRECT_MODE_AVAILABLE; msr->idx =3D HV_X64_MSR_STIMER0_CONFIG; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1 << 12; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 29: msr->idx =3D HV_X64_MSR_EOI; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 30: feat->eax |=3D HV_MSR_APIC_ACCESS_AVAILABLE; msr->idx =3D HV_X64_MSR_EOI; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 31: msr->idx =3D HV_X64_MSR_TSC_FREQUENCY; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 32: feat->eax |=3D HV_ACCESS_FREQUENCY_MSRS; msr->idx =3D HV_X64_MSR_TSC_FREQUENCY; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 33: /* Read only */ msr->idx =3D HV_X64_MSR_TSC_FREQUENCY; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 0; + msr->fault_expected =3D true; break; =20 case 34: msr->idx =3D HV_X64_MSR_REENLIGHTENMENT_CONTROL; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 35: feat->eax |=3D HV_ACCESS_REENLIGHTENMENT; msr->idx =3D HV_X64_MSR_REENLIGHTENMENT_CONTROL; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 36: msr->idx =3D HV_X64_MSR_REENLIGHTENMENT_CONTROL; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 1; + msr->fault_expected =3D false; break; case 37: /* Can only write '0' */ msr->idx =3D HV_X64_MSR_TSC_EMULATION_STATUS; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 0; + msr->fault_expected =3D true; break; =20 case 38: msr->idx =3D HV_X64_MSR_CRASH_P0; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 39: feat->edx |=3D HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE; msr->idx =3D HV_X64_MSR_CRASH_P0; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 40: msr->idx =3D HV_X64_MSR_CRASH_P0; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 1; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 41: msr->idx =3D HV_X64_MSR_SYNDBG_STATUS; - msr->write =3D 0; - msr->available =3D 0; + msr->write =3D false; + msr->fault_expected =3D true; break; case 42: feat->edx |=3D HV_FEATURE_DEBUG_MSRS_AVAILABLE; dbg->eax |=3D HV_X64_SYNDBG_CAP_ALLOW_KERNEL_DEBUGGING; msr->idx =3D HV_X64_MSR_SYNDBG_STATUS; - msr->write =3D 0; - msr->available =3D 1; + msr->write =3D false; + msr->fault_expected =3D false; break; case 43: msr->idx =3D HV_X64_MSR_SYNDBG_STATUS; - msr->write =3D 1; + msr->write =3D true; msr->write_val =3D 0; - msr->available =3D 1; + msr->fault_expected =3D false; break; =20 case 44: --=20 2.37.3