From nobody Tue Dec 16 16:22:57 2025 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 1013BC4167B for ; Wed, 29 Nov 2023 22:49:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343526AbjK2WtR (ORCPT ); Wed, 29 Nov 2023 17:49:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231575AbjK2WtP (ORCPT ); Wed, 29 Nov 2023 17:49:15 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB12B131 for ; Wed, 29 Nov 2023 14:49:21 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-6cb9dd2ab9cso326338b3a.3 for ; Wed, 29 Nov 2023 14:49:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701298161; x=1701902961; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=jcB+0ufG8RNDzGznsHxIgoB+eIgiTMrBs/Lse4iREj8=; b=SunDNM5+HWKgI2Dw6O6zLkHFzNp81SfN6D8k9EE84c+NY1ZS5HjuXZtaPFvZz2lXuw wZZuNYc57zBjtx/iht6V13qU4sjzldsOIMBWaFlNAdOZorjGo64oxGaojZETQH4zBT9u w6vyWR7Jl6rzdrl/FOTjCn16aYZPvduNZ4pgRfgMzJYjGMZu/Hd5BuBuL8NJWu4msnhK jiz2FJpMcZ8+wmzwliDsp52VzW9dHvLz9QekyZwCGJ33DeL31SD36Pygv2MhkUZfPW6a kZPtgfW+RD8jkPRQNxNbuHI1hZ+yC28pigQe9r4ra4hSUiSlNlR97wAsMCm/wQ6Z/O3K wZkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701298161; x=1701902961; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jcB+0ufG8RNDzGznsHxIgoB+eIgiTMrBs/Lse4iREj8=; b=r156yOuFaO3lnU8OlKlVVlKxZpz81BS57fKuyn2P8QgJd8qhfl8zZxnd4ydTLOezjf bnfO7711fNXErOrAIOqz4Bs+effb6CA25E3tDfKCDxcjzY/VuTrz5/1HObBhp4WT3GUx mc/s69vLm8OyOrxo7jDTHnu+CfPN196SEblwW7eO46ev8GvgBlpsbE3SWkkxew7eaU5o K4vMcx5wCy25Cdh7N1oQNpUnlsgJ59ZGddsFRlvafMExHZXUXlDOEzxTSymGg+7Ly5VG uG1gMriMSSHL+mVgGuCAO5n4dzj4wuaVFeLXAIeLV/+vlrBAM84eq01VH6Fa6+zlR048 77eQ== X-Gm-Message-State: AOJu0YyYPM4h5yLOLlAAPZSvmr5HmEQioldLnA4KMWY6ttV6K+NqDN7z 3Tc9U7YaKNw5kpcy46Vz2zjbYo6pq3I= X-Google-Smtp-Source: AGHT+IGlptR+ACsn5xm5Y7kirHJtCxe5a03VMwEUdpXfliyZg3YTs1xMsjqpw1vLtzpj7r+7POud+dCpEzA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:1389:b0:6cb:95ab:cf8d with SMTP id t9-20020a056a00138900b006cb95abcf8dmr5297305pfg.6.1701298161246; Wed, 29 Nov 2023 14:49:21 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:49:13 -0800 In-Reply-To: <20231129224916.532431-1-seanjc@google.com> Mime-Version: 1.0 References: <20231129224916.532431-1-seanjc@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129224916.532431-2-seanjc@google.com> Subject: [PATCH v2 1/4] KVM: selftests: Fix MWAIT error message when guest assertion fails From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Print out the test and vector as intended when a guest assert fails an assertion regarding MONITOR/MWAIT faulting. Unfortunately, the guest printf support doesn't detect such issues at compile-time, so the bug manifests as a confusing error message, e.g. in the most confusing case, the test complains that it got vector "0" instead of expected vector "0". Fixes: 0f52e4aaa614 ("KVM: selftests: Convert the MONITOR/MWAIT test to use= printf guest asserts") Reviewed-by: Maxim Levitsky Link: https://lore.kernel.org/r/20231107182159.404770-1-seanjc@google.com Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c b/tool= s/testing/selftests/kvm/x86_64/monitor_mwait_test.c index 80aa3d8b18f8..853802641e1e 100644 --- a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +++ b/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c @@ -27,10 +27,12 @@ do { \ \ if (fault_wanted) \ __GUEST_ASSERT((vector) =3D=3D UD_VECTOR, \ - "Expected #UD on " insn " for testcase '0x%x', got '0x%x'", vect= or); \ + "Expected #UD on " insn " for testcase '0x%x', got '0x%x'", \ + testcase, vector); \ else \ __GUEST_ASSERT(!(vector), \ - "Expected success on " insn " for testcase '0x%x', got '0x%x'", = vector); \ + "Expected success on " insn " for testcase '0x%x', got '0x%x'", \ + testcase, vector); \ } while (0) =20 static void guest_monitor_wait(int testcase) --=20 2.43.0.rc1.413.gea7ed67945-goog From nobody Tue Dec 16 16:22:57 2025 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 257CAC4167B for ; Wed, 29 Nov 2023 22:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343546AbjK2WtU (ORCPT ); Wed, 29 Nov 2023 17:49:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343525AbjK2WtR (ORCPT ); Wed, 29 Nov 2023 17:49:17 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E50CA112 for ; Wed, 29 Nov 2023 14:49:23 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5cc3e334d16so5156397b3.3 for ; Wed, 29 Nov 2023 14:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701298163; x=1701902963; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=jt3afr9C/NIzRrhpIhGigrnj+umWBaK2U3Kv0056zgw=; b=oFDeVaszqKVpYECsszkTNp3hDCq4mOQ/hhLZwwKbGX/2IbL05++SIxSHozA+I1Zx0F JOasnrDzTVBYPGnoCxfQ+CcaHqrWnkxk2TlilZQF4LvxMZN8bI522kR8ma6nPg7gb5nQ vTCUu1knw80Zz/VdVbpkWeT69SC8elC1NqwsXvMQqw2aNbArNf8FrrxMi2y+8fEhOCyc jn+OVT3jIUi60yYeYvdWIZ0tyS/9/RnwSTDgmOAUMIeQ2uFFyTBGDe+GM7Hbx6boMtQ6 NC1CJrztFe5zsDq3gh7YBbLBJ9ecbWc4VOlfU+u63V0MbzljfYGxn1yBVB0vEI2V53sk K4fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701298163; x=1701902963; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jt3afr9C/NIzRrhpIhGigrnj+umWBaK2U3Kv0056zgw=; b=RjAfQ1KWsGKl16AMhaOsqOAM3rsNJIE/NhZzyLgcwWRU/VuN20KuaBfTlwnQeWu4Dc NxtJZj7FORtDO8YCxygBboO64RaoYHCjYepU5FhWX68/EXVc8rGYQwx/VmMQWWkJU/pK h0WZA5YkTfNd+qCRscOdSJqV+lPF5bIYNoCsqgYKDvD5wTMNmGuASiWq5nt+ffyxcBuw 1EOKm1KRYUhdNSbbn/9UpPzm2F8Pmnenna/fv72BKrP27s7VkXxBT1LuO6PG0MoPuCwZ fm/RBQoQ6+f1QRys+qw4ScG4y+OFjkIU0+dKN/gbbRMZjDLEiaHS6feMRubKQiToR+rA LVpw== X-Gm-Message-State: AOJu0Ywc3C+cKxdkPBF45WHycr10WJrT87CPn92cJDswBCSI0J6KJtkW mW1vebeN0H5tz3KFOvRZ8XaeLYCdziM= X-Google-Smtp-Source: AGHT+IGulxVXRNgaFOL2lJyl25oFAVWs5bdYEbG4SzfwCCsdRMsJGWH3Ec6G/kWD9vUh4OgGxi+dx9bVB6k= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:b614:0:b0:5cc:3af6:291 with SMTP id u20-20020a81b614000000b005cc3af60291mr614082ywh.5.1701298163174; Wed, 29 Nov 2023 14:49:23 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:49:14 -0800 In-Reply-To: <20231129224916.532431-1-seanjc@google.com> Mime-Version: 1.0 References: <20231129224916.532431-1-seanjc@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129224916.532431-3-seanjc@google.com> Subject: [PATCH v2 2/4] KVM: selftests: Fix benign %llx vs. %lx issues in guest asserts From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert %llx to %lx as appropriate in guest asserts. The guest printf implementation treats them the same as KVM selftests are 64-bit only, but strictly adhering to the correct format will allow annotating the underlying helpers with __printf() without introducing new warnings in the build. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/set_memory_region_test.c | 6 +++--- tools/testing/selftests/kvm/x86_64/hyperv_features.c | 2 +- .../selftests/kvm/x86_64/private_mem_conversions_test.c | 2 +- .../selftests/kvm/x86_64/svm_nested_soft_inject_test.c | 4 ++-- tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +- tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/t= esting/selftests/kvm/set_memory_region_test.c index 6637a0845acf..03ec7efd19aa 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -157,17 +157,17 @@ static void guest_code_move_memory_region(void) */ val =3D guest_spin_on_val(0); __GUEST_ASSERT(val =3D=3D 1 || val =3D=3D MMIO_VAL, - "Expected '1' or MMIO ('%llx'), got '%llx'", MMIO_VAL, val); + "Expected '1' or MMIO ('%lx'), got '%lx'", MMIO_VAL, val); =20 /* Spin until the misaligning memory region move completes. */ val =3D guest_spin_on_val(MMIO_VAL); __GUEST_ASSERT(val =3D=3D 1 || val =3D=3D 0, - "Expected '0' or '1' (no MMIO), got '%llx'", val); + "Expected '0' or '1' (no MMIO), got '%lx'", val); =20 /* Spin until the memory region starts to get re-aligned. */ val =3D guest_spin_on_val(0); __GUEST_ASSERT(val =3D=3D 1 || val =3D=3D MMIO_VAL, - "Expected '1' or MMIO ('%llx'), got '%llx'", MMIO_VAL, val); + "Expected '1' or MMIO ('%lx'), got '%lx'", MMIO_VAL, val); =20 /* Spin until the re-aligning memory region move completes. */ val =3D guest_spin_on_val(MMIO_VAL); diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/t= esting/selftests/kvm/x86_64/hyperv_features.c index 9f28aa276c4e..4bb63b6ee4a0 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c @@ -66,7 +66,7 @@ static void guest_msr(struct msr_data *msr) =20 if (msr->write) __GUEST_ASSERT(!vector, - "WRMSR(0x%x) to '0x%llx', RDMSR read '0x%llx'", + "WRMSR(0x%x) to '0x%lx', RDMSR read '0x%lx'", msr->idx, msr->write_val, msr_val); =20 /* Invariant TSC bit appears when TSC invariant control MSR is written to= */ diff --git a/tools/testing/selftests/kvm/x86_64/private_mem_conversions_tes= t.c b/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c index 4d6a37a5d896..65ad38b6be1f 100644 --- a/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c +++ b/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c @@ -35,7 +35,7 @@ do { \ \ for (i =3D 0; i < size; i++) \ __GUEST_ASSERT(mem[i] =3D=3D pattern, \ - "Guest expected 0x%x at offset %lu (gpa 0x%llx), got 0x%x", \ + "Guest expected 0x%x at offset %lu (gpa 0x%lx), got 0x%x", \ pattern, i, gpa + i, mem[i]); \ } while (0) =20 diff --git a/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test= .c b/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c index 7ee44496cf97..0c7ce3d4e83a 100644 --- a/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +++ b/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c @@ -103,7 +103,7 @@ static void l1_guest_code(struct svm_test_data *svm, ui= nt64_t is_nmi, uint64_t i =20 run_guest(vmcb, svm->vmcb_gpa); __GUEST_ASSERT(vmcb->control.exit_code =3D=3D SVM_EXIT_VMMCALL, - "Expected VMMCAL #VMEXIT, got '0x%x', info1 =3D '0x%llx, info2 = =3D '0x%llx'", + "Expected VMMCAL #VMEXIT, got '0x%x', info1 =3D '0x%lx, info2 =3D= '0x%lx'", vmcb->control.exit_code, vmcb->control.exit_info_1, vmcb->control.exit_info_2); =20 @@ -133,7 +133,7 @@ static void l1_guest_code(struct svm_test_data *svm, ui= nt64_t is_nmi, uint64_t i =20 run_guest(vmcb, svm->vmcb_gpa); __GUEST_ASSERT(vmcb->control.exit_code =3D=3D SVM_EXIT_HLT, - "Expected HLT #VMEXIT, got '0x%x', info1 =3D '0x%llx, info2 =3D '= 0x%llx'", + "Expected HLT #VMEXIT, got '0x%x', info1 =3D '0x%lx, info2 =3D '0= x%lx'", vmcb->control.exit_code, vmcb->control.exit_info_1, vmcb->control.exit_info_2); =20 diff --git a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c b/tools= /testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c index ebbcb0a3f743..2a8d4ac2f020 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c @@ -56,7 +56,7 @@ static void guest_test_perf_capabilities_gp(uint64_t val) uint8_t vector =3D wrmsr_safe(MSR_IA32_PERF_CAPABILITIES, val); =20 __GUEST_ASSERT(vector =3D=3D GP_VECTOR, - "Expected #GP for value '0x%llx', got vector '0x%x'", + "Expected #GP for value '0x%lx', got vector '0x%x'", val, vector); } =20 diff --git a/tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c b/tools/t= esting/selftests/kvm/x86_64/xcr0_cpuid_test.c index 77d04a7bdadd..dc6217440db3 100644 --- a/tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c +++ b/tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c @@ -25,7 +25,7 @@ do { \ \ __GUEST_ASSERT((__supported & (xfeatures)) !=3D (xfeatures) || \ __supported =3D=3D ((xfeatures) | (dependencies)), \ - "supported =3D 0x%llx, xfeatures =3D 0x%llx, dependencies =3D 0x%= llx", \ + "supported =3D 0x%lx, xfeatures =3D 0x%llx, dependencies =3D 0x%l= lx", \ __supported, (xfeatures), (dependencies)); \ } while (0) =20 @@ -42,7 +42,7 @@ do { \ uint64_t __supported =3D (supported_xcr0) & (xfeatures); \ \ __GUEST_ASSERT(!__supported || __supported =3D=3D (xfeatures), \ - "supported =3D 0x%llx, xfeatures =3D 0x%llx", \ + "supported =3D 0x%lx, xfeatures =3D 0x%llx", \ __supported, (xfeatures)); \ } while (0) =20 @@ -81,7 +81,7 @@ static void guest_code(void) =20 vector =3D xsetbv_safe(0, supported_xcr0); __GUEST_ASSERT(!vector, - "Expected success on XSETBV(0x%llx), got vector '0x%x'", + "Expected success on XSETBV(0x%lx), got vector '0x%x'", supported_xcr0, vector); =20 for (i =3D 0; i < 64; i++) { @@ -90,7 +90,7 @@ static void guest_code(void) =20 vector =3D xsetbv_safe(0, supported_xcr0 | BIT_ULL(i)); __GUEST_ASSERT(vector =3D=3D GP_VECTOR, - "Expected #GP on XSETBV(0x%llx), supported XCR0 =3D %llx, got ve= ctor '0x%x'", + "Expected #GP on XSETBV(0x%llx), supported XCR0 =3D %lx, got vec= tor '0x%x'", BIT_ULL(i), supported_xcr0, vector); } =20 --=20 2.43.0.rc1.413.gea7ed67945-goog From nobody Tue Dec 16 16:22:57 2025 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 E6944C4167B for ; Wed, 29 Nov 2023 22:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343573AbjK2WtY (ORCPT ); Wed, 29 Nov 2023 17:49:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343567AbjK2WtU (ORCPT ); Wed, 29 Nov 2023 17:49:20 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9280194 for ; Wed, 29 Nov 2023 14:49:25 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5caf86963ecso4259417b3.3 for ; Wed, 29 Nov 2023 14:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701298165; x=1701902965; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=obqRJwrAc0R30oE9DQOo5RZu0y3Es0pUF6guVfZd4RE=; b=j01pUN2FfrLsdIdVuWQONS6o2QYDAtPibP9zZIe4jIeN5cS2kUhvpbzr7BF3hZjSet 2ZkCXkWYDDb3LbvsCg6MNGp/uI3ZwWjvG3tB/NpKbth1cXF9xjFCY4IOkWXkyNsTMzdF cM44Fg6edusAbgN+/1twVIToLEu87QMLKubFhD3TyKwsu4VEiK9Be/rc25ZbGe7boCMG L7S3pTyB7sD3/nbhc26aKpXgbKsbslKIwSW3f69MdMyR/aGKMoK54MEgW+idjIXrMdv7 +DCabK675yKPbgf1InOA1Ocogyl1FPlGVwNWmlKBUtG/uY4NvG+dMkkd18VNkfQdQSlJ aPkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701298165; x=1701902965; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=obqRJwrAc0R30oE9DQOo5RZu0y3Es0pUF6guVfZd4RE=; b=kpZywE8TP02S0SUTHr8qEnubd+xuvg4zjH311AdmA1f1HKqT+lG+YN6gMp+zVRod8d L3YwyMS/0L06E5ZWu22d6o7U+e7nGORZD6X4sMT6W1D7aI4/JhdBXJJzK6ae1BsUW7MQ 8cJaNRQVWJtWE4Hj+zjY6WVlwpC3VPDgYxhaDlG1u5k4LzzC2nt7jEw1B91RhJOr5hgT 2XXwftF603CyxBclfDuoeeL8W0FQ5eI5MGeIuMWVTv0dES9rb7mV+4Jo9kX4xeI6YRtR CDbrpwwR0/Psjr7IaWZxI+o1W9b8EGGLdlRY8rXlgQ7+SkiRSbPvLXjajXALTMY8/6xM 5GRw== X-Gm-Message-State: AOJu0YzjBr9GBUfdhEz7SQES7JG9ecAxtyIaOFjmqnU3qzDgDTgvPISE 3FrGfvmpeoLLax+0hl8V6ksDc4/0a5I= X-Google-Smtp-Source: AGHT+IFiO/2Aj0FYANjdTLdz18AsCY+hgJd7gw2a7Qpd4J7gUjOl+TCyJnqhI0rjeJ5wx0LkoWDUuMe+l24= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:690c:e19:b0:5ca:724d:9256 with SMTP id cp25-20020a05690c0e1900b005ca724d9256mr709697ywb.7.1701298165115; Wed, 29 Nov 2023 14:49:25 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:49:15 -0800 In-Reply-To: <20231129224916.532431-1-seanjc@google.com> Mime-Version: 1.0 References: <20231129224916.532431-1-seanjc@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129224916.532431-4-seanjc@google.com> Subject: [PATCH v2 3/4] KVM: selftests: Fix broken assert messages in Hyper-V features test From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Swap the ordering of parameters to guest asserts related to {RD,WR}MSR success/failure in the Hyper-V features test. As is, the output will be mangled and broken due to passing an integer as a string and vice versa. Opportunistically fix a benign %u vs. %lu issue as well. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/hyperv_features.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 4bb63b6ee4a0..29f6bdbce817 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c @@ -55,11 +55,11 @@ static void guest_msr(struct msr_data *msr) if (msr->fault_expected) __GUEST_ASSERT(vector =3D=3D GP_VECTOR, "Expected #GP on %sMSR(0x%x), got vector '0x%x'", - msr->idx, msr->write ? "WR" : "RD", vector); + msr->write ? "WR" : "RD", msr->idx, vector); else __GUEST_ASSERT(!vector, "Expected success on %sMSR(0x%x), got vector '0x%x'", - msr->idx, msr->write ? "WR" : "RD", vector); + msr->write ? "WR" : "RD", msr->idx, vector); =20 if (vector || is_write_only_msr(msr->idx)) goto done; @@ -102,11 +102,11 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hc= all_data *hcall) vector =3D __hyperv_hypercall(hcall->control, input, output, &res); if (hcall->ud_expected) { __GUEST_ASSERT(vector =3D=3D UD_VECTOR, - "Expected #UD for control '%u', got vector '0x%x'", + "Expected #UD for control '%lu', got vector '0x%x'", hcall->control, vector); } else { __GUEST_ASSERT(!vector, - "Expected no exception for control '%u', got vector '0x%x'", + "Expected no exception for control '%lu', got vector '0x%x'", hcall->control, vector); GUEST_ASSERT_EQ(res, hcall->expect); } --=20 2.43.0.rc1.413.gea7ed67945-goog From nobody Tue Dec 16 16:22:57 2025 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 4077CC4167B for ; Wed, 29 Nov 2023 22:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343596AbjK2Wt0 (ORCPT ); Wed, 29 Nov 2023 17:49:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343556AbjK2WtW (ORCPT ); Wed, 29 Nov 2023 17:49:22 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBD43D69 for ; Wed, 29 Nov 2023 14:49:27 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5cddc35545dso4928307b3.2 for ; Wed, 29 Nov 2023 14:49:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701298167; x=1701902967; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=bWMFxsne+gpl88lI6YduYGZQRPXK3Vk37mspokD2wHM=; b=ZENs0hs/af+xss6arfJvEJ5iNBhj5w5Tw0B5WLQ/ahBMHb7/kuDwrbb0l37y2gFMQ2 IXHxvxwaTrC1GK+fm+Jwt5Iv8pBDepdDA4/JG3ymZVpq697ntXmm0ZM8fZRgYSUC7Cmt 2CDbgAbsWRn2OFGktvMbrYV5jTQntahQ9cxHBg2wlDXxitdY0CCYZNiva8W98jWCXOxp FI8fjQ7klVKVPO9loK1bmfPzhRPTJ42nlgzkwWLSkxlSyOXXY+vEp+YzxfXzQOW0yCRX 7Nt6NNsoG2FOwi3IK9rvHDmOiuKBnDDw1F/NmEYVSoD7MwpA/aj0sv7yLs3OikJqPrui CtzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701298167; x=1701902967; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bWMFxsne+gpl88lI6YduYGZQRPXK3Vk37mspokD2wHM=; b=fVA295SmQCbtTvcS7IipV1rKKxKFxCfgufB6BzXyjcliKUtYy7amAX8l9RPvA65Em8 pSRZb/sGJQTReA0Kj2nHEWlqLWCDV+lKdltmO7aJbP0LK6had3u+REPIM0itT0sUiRVZ emyAUaOirbVKY47nYtvarKGOI62CzcWh/clJ6dukqJuOrPlDyTtitSKnzSS6raxFql8V LpX36gJhdG4/ybDDImWw58QGeuzqki8pOcjCKdwH+MNyrMPbzx07uWiVh2Y+gfkfUPhb jwAn++gTIAH2xzpWXBsa+6G6y9Hb7TuTj2crGLSbWLCyaNKwDyVzyO6OB4j6T+soo2Qr kQrA== X-Gm-Message-State: AOJu0YzUMLOslD/KvqMfscCl9BA1EoPeYUg/95fhq4fgS6rEBjp813h+ RaFN4NkFAcVUTD5DnNedtfHhbWTDW+8= X-Google-Smtp-Source: AGHT+IFfWN+UtOLGwzsyM0bGshSYC31E3NK9PtvRfmfe+lo2abmXbvWxKKN8xpuOIW7WpNfpdw1ylMe6zJM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:be15:0:b0:5d0:a744:719a with SMTP id i21-20020a81be15000000b005d0a744719amr342961ywn.2.1701298167236; Wed, 29 Nov 2023 14:49:27 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:49:16 -0800 In-Reply-To: <20231129224916.532431-1-seanjc@google.com> Mime-Version: 1.0 References: <20231129224916.532431-1-seanjc@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129224916.532431-5-seanjc@google.com> Subject: [PATCH v2 4/4] KVM: selftests: Annotate guest ucall, printf, and assert helpers with __printf() From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Annotate guest printf helpers with __printf() so that the compiler will warn about incorrect formatting at compile time (see git log for how easy it is to screw up with the formatting). Suggested-by: Maxim Levitsky Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/test_util.h | 2 +- tools/testing/selftests/kvm/include/ucall_common.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testin= g/selftests/kvm/include/test_util.h index a0c7dd3a5b30..71a41fa924b7 100644 --- a/tools/testing/selftests/kvm/include/test_util.h +++ b/tools/testing/selftests/kvm/include/test_util.h @@ -191,7 +191,7 @@ static inline uint32_t atoi_non_negative(const char *na= me, const char *num_str) } =20 int guest_vsnprintf(char *buf, int n, const char *fmt, va_list args); -int guest_snprintf(char *buf, int n, const char *fmt, ...); +__printf(3, 4) int guest_snprintf(char *buf, int n, const char *fmt, ...); =20 char *strdup_printf(const char *fmt, ...) __attribute__((format(printf, 1,= 2), nonnull(1))); =20 diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/tes= ting/selftests/kvm/include/ucall_common.h index 0fb472a5a058..d9d6581b8d4f 100644 --- a/tools/testing/selftests/kvm/include/ucall_common.h +++ b/tools/testing/selftests/kvm/include/ucall_common.h @@ -34,9 +34,10 @@ void ucall_arch_do_ucall(vm_vaddr_t uc); void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu); =20 void ucall(uint64_t cmd, int nargs, ...); -void ucall_fmt(uint64_t cmd, const char *fmt, ...); -void ucall_assert(uint64_t cmd, const char *exp, const char *file, - unsigned int line, const char *fmt, ...); +__printf(2, 3) void ucall_fmt(uint64_t cmd, const char *fmt, ...); +__printf(5, 6) void ucall_assert(uint64_t cmd, const char *exp, + const char *file, unsigned int line, + const char *fmt, ...); uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc); void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa); int ucall_nr_pages_required(uint64_t page_size); --=20 2.43.0.rc1.413.gea7ed67945-goog