On Wed, 2022-08-31 at 10:50 +0200, Vitaly Kuznetsov wrote:
> It may not be clear what 'msr->availble' means. The test actually
> checks that accessing the particular MSR doesn't cause #GP, rename
> the varialble accordingly.
>
> Suggested-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
> ---
> .../selftests/kvm/x86_64/hyperv_features.c | 92 +++++++++----------
> 1 file changed, 46 insertions(+), 46 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/testing/selftests/kvm/x86_64/hyperv_features.c
> index 79ab0152d281..4ec4776662a4 100644
> --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c
> +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c
> @@ -33,7 +33,7 @@ static inline uint8_t hypercall(u64 control, vm_vaddr_t input_address,
>
> struct msr_data {
> uint32_t idx;
> - bool available;
> + bool should_not_gp;
> bool write;
> u64 write_val;
> };
> @@ -56,7 +56,7 @@ static void guest_msr(struct msr_data *msr)
> else
> vector = wrmsr_safe(msr->idx, msr->write_val);
>
> - if (msr->available)
> + if (msr->should_not_gp)
> GUEST_ASSERT_2(!vector, msr->idx, vector);
> else
> GUEST_ASSERT_2(vector == GP_VECTOR, msr->idx, vector);
> @@ -153,12 +153,12 @@ static void guest_test_msrs_access(void)
> */
> msr->idx = HV_X64_MSR_GUEST_OS_ID;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 1:
> msr->idx = HV_X64_MSR_HYPERCALL;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 2:
> feat->eax |= HV_MSR_HYPERCALL_AVAILABLE;
> @@ -169,116 +169,116 @@ static void guest_test_msrs_access(void)
> msr->idx = HV_X64_MSR_GUEST_OS_ID;
> msr->write = 1;
> msr->write_val = LINUX_OS_ID;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 3:
> msr->idx = HV_X64_MSR_GUEST_OS_ID;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 4:
> msr->idx = HV_X64_MSR_HYPERCALL;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 5:
> msr->idx = HV_X64_MSR_VP_RUNTIME;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 6:
> feat->eax |= HV_MSR_VP_RUNTIME_AVAILABLE;
> msr->idx = HV_X64_MSR_VP_RUNTIME;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 7:
> /* Read only */
> msr->idx = HV_X64_MSR_VP_RUNTIME;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
>
> case 8:
> msr->idx = HV_X64_MSR_TIME_REF_COUNT;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 9:
> feat->eax |= HV_MSR_TIME_REF_COUNT_AVAILABLE;
> msr->idx = HV_X64_MSR_TIME_REF_COUNT;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 10:
> /* Read only */
> msr->idx = HV_X64_MSR_TIME_REF_COUNT;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
>
> case 11:
> msr->idx = HV_X64_MSR_VP_INDEX;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 12:
> feat->eax |= HV_MSR_VP_INDEX_AVAILABLE;
> msr->idx = HV_X64_MSR_VP_INDEX;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 13:
> /* Read only */
> msr->idx = HV_X64_MSR_VP_INDEX;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
>
> case 14:
> msr->idx = HV_X64_MSR_RESET;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 15:
> feat->eax |= HV_MSR_RESET_AVAILABLE;
> msr->idx = HV_X64_MSR_RESET;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 16:
> msr->idx = HV_X64_MSR_RESET;
> msr->write = 1;
> msr->write_val = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 17:
> msr->idx = HV_X64_MSR_REFERENCE_TSC;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 18:
> feat->eax |= HV_MSR_REFERENCE_TSC_AVAILABLE;
> msr->idx = HV_X64_MSR_REFERENCE_TSC;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 19:
> msr->idx = HV_X64_MSR_REFERENCE_TSC;
> msr->write = 1;
> msr->write_val = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 20:
> msr->idx = HV_X64_MSR_EOM;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 21:
> /*
> @@ -287,145 +287,145 @@ static void guest_test_msrs_access(void)
> */
> msr->idx = HV_X64_MSR_EOM;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 22:
> feat->eax |= HV_MSR_SYNIC_AVAILABLE;
> msr->idx = HV_X64_MSR_EOM;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 23:
> msr->idx = HV_X64_MSR_EOM;
> msr->write = 1;
> msr->write_val = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 24:
> msr->idx = HV_X64_MSR_STIMER0_CONFIG;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 25:
> feat->eax |= HV_MSR_SYNTIMER_AVAILABLE;
> msr->idx = HV_X64_MSR_STIMER0_CONFIG;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 26:
> msr->idx = HV_X64_MSR_STIMER0_CONFIG;
> msr->write = 1;
> msr->write_val = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 27:
> /* Direct mode test */
> msr->idx = HV_X64_MSR_STIMER0_CONFIG;
> msr->write = 1;
> msr->write_val = 1 << 12;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 28:
> feat->edx |= HV_STIMER_DIRECT_MODE_AVAILABLE;
> msr->idx = HV_X64_MSR_STIMER0_CONFIG;
> msr->write = 1;
> msr->write_val = 1 << 12;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 29:
> msr->idx = HV_X64_MSR_EOI;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 30:
> feat->eax |= HV_MSR_APIC_ACCESS_AVAILABLE;
> msr->idx = HV_X64_MSR_EOI;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 31:
> msr->idx = HV_X64_MSR_TSC_FREQUENCY;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 32:
> feat->eax |= HV_ACCESS_FREQUENCY_MSRS;
> msr->idx = HV_X64_MSR_TSC_FREQUENCY;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 33:
> /* Read only */
> msr->idx = HV_X64_MSR_TSC_FREQUENCY;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
>
> case 34:
> msr->idx = HV_X64_MSR_REENLIGHTENMENT_CONTROL;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 35:
> feat->eax |= HV_ACCESS_REENLIGHTENMENT;
> msr->idx = HV_X64_MSR_REENLIGHTENMENT_CONTROL;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 36:
> msr->idx = HV_X64_MSR_REENLIGHTENMENT_CONTROL;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 37:
> /* Can only write '0' */
> msr->idx = HV_X64_MSR_TSC_EMULATION_STATUS;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
>
> case 38:
> msr->idx = HV_X64_MSR_CRASH_P0;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 39:
> feat->edx |= HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE;
> msr->idx = HV_X64_MSR_CRASH_P0;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 40:
> msr->idx = HV_X64_MSR_CRASH_P0;
> msr->write = 1;
> msr->write_val = 1;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 41:
> msr->idx = HV_X64_MSR_SYNDBG_STATUS;
> msr->write = 0;
> - msr->available = 0;
> + msr->should_not_gp = 0;
> break;
> case 42:
> feat->edx |= HV_FEATURE_DEBUG_MSRS_AVAILABLE;
> dbg->eax |= HV_X64_SYNDBG_CAP_ALLOW_KERNEL_DEBUGGING;
> msr->idx = HV_X64_MSR_SYNDBG_STATUS;
> msr->write = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
> case 43:
> msr->idx = HV_X64_MSR_SYNDBG_STATUS;
> msr->write = 1;
> msr->write_val = 0;
> - msr->available = 1;
> + msr->should_not_gp = 1;
> break;
>
> case 44:
Thanks,
Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
Best regards,
Maxim Levitsky
