From nobody Sat Apr 25 11:49:30 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 41929C43334 for ; Mon, 11 Jul 2022 22:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231714AbiGKW6M (ORCPT ); Mon, 11 Jul 2022 18:58:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230455AbiGKW56 (ORCPT ); Mon, 11 Jul 2022 18:57:58 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 589D67E81E for ; Mon, 11 Jul 2022 15:57:57 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id q8-20020a17090a304800b001ef82a71a9eso4069964pjl.3 for ; Mon, 11 Jul 2022 15:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=DAD9AJ7hVwjGPDz75YLlVxSBr8Hz85c/OPljz7ZiLcc=; b=Hq1sJ5nd7x3bSwdQ4k+YM00ufbIfu5r8ZXXNo6rc+iJW2lsKeDvt3zMzP2w6W5mbQr JK6bM7r4G+IhGmOlpDcOCShmWyzfyFmBv9j5lQ/zY0lE8uzHz2B8+DPxkekPsQURrJUK EJ/EurtISNpmOtxo89M6ar3ZNNaUhClkwbAs7/Ndyocl1hVsj2Yune79ZZ6kZekmic/i XgR1Xl19alHsb6kSRfnDBA9bGpbIoqhan9I4y0H54mbBrxoHO6KtyafC0fFSb6/f2nEk xV05QXJJ58vaGHhaEtVlq+KYLAYiuonU87Es2LIN6JnBrJrhOpv4x83Xh7wfqi2IfYqo QKTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=DAD9AJ7hVwjGPDz75YLlVxSBr8Hz85c/OPljz7ZiLcc=; b=ry92tVE7TDu1v2487OuE9CvxsH21vJU7x7ttgwsO9xJJwUQxUXvqX0hlIldgj3TN69 oMx2wvwI+DoRA+i/ekg90yW+GSDcKUmfJvZCk9M8VsNJRjPfbXHK6lLaKEJw/0k4PKqa JyQ+jFuVuCmRkPdTCwAiIZZPlrFkF9LlWULNBDP2Uljvyv4m4FVWuvKOfyiJoKGGWDSp fqSxlUbi+jAXGCx4OQHWTatFpr8pQgwhodPXKwHA3ekbVysDlIiWXwcAjEB88yiGuhu6 XpopmWU0o5txWK/Mwk1fJ7aGnyJQPfS5b49H5NvbxAHj76JrbX5ku2Wgv1M0dKC2oKr0 eCuw== X-Gm-Message-State: AJIora8xF726WmwIx4tlsXA9bkJBZU42MbfCVEBow76Qcdoco3BC8mmq 5C92RFjr0vnsyZP+pkCUJfC0+FpbWuo= X-Google-Smtp-Source: AGRyM1srANk6OAlyQWS9Ezd7mhOg4d2we2G/mu8rFmQ0BGwOZGI75xAmbIW5VKBLR0DO9gq6iWlZwjUHJXU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:1a8b:b0:525:9c4f:ade5 with SMTP id e11-20020a056a001a8b00b005259c4fade5mr21124511pfv.74.1657580276910; Mon, 11 Jul 2022 15:57:56 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 11 Jul 2022 22:57:51 +0000 In-Reply-To: <20220711225753.1073989-1-seanjc@google.com> Message-Id: <20220711225753.1073989-2-seanjc@google.com> Mime-Version: 1.0 References: <20220711225753.1073989-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 1/3] KVM: selftests: Test MONITOR and MWAIT, not just MONITOR for quirk From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yuan Yao Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix a copy+paste error in monitor_mwait_test by switching one of the two "monitor" instructions to an "mwait". The intent of the test is very much to verify the quirk handles both MONITOR and MWAIT. Fixes: 2325d4dd7321 ("KVM: selftests: Add MONITOR/MWAIT quirk test") Reported-by: Yuan Yao Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 49f2ed1c53fe..f5c09cb528ae 100644 --- a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +++ b/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c @@ -34,7 +34,7 @@ static void guest_monitor_wait(int testcase) else GUEST_ASSERT_2(!vector, testcase, vector); =20 - vector =3D kvm_asm_safe("monitor"); + vector =3D kvm_asm_safe("mwait"); if (fault_wanted) GUEST_ASSERT_2(vector =3D=3D UD_VECTOR, testcase, vector); else --=20 2.37.0.144.g8ac04bfd2-goog From nobody Sat Apr 25 11:49:30 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 2A278CCA47B for ; Mon, 11 Jul 2022 22:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231842AbiGKW6Q (ORCPT ); Mon, 11 Jul 2022 18:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231148AbiGKW57 (ORCPT ); Mon, 11 Jul 2022 18:57:59 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CED680514 for ; Mon, 11 Jul 2022 15:57:59 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id k21-20020aa78215000000b005283ff3d0c3so1409373pfi.1 for ; Mon, 11 Jul 2022 15:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=NI191zpZ15P9h09/ueg1sIeWgoPkCYp08nvGyArfGco=; b=GQ0ndjo72A8Ia1b/67wS9QnGvQn7ar/J3TPY1hn0q/aOslGNnJUPK0P8kpKCzLAaxp nzG0AVN5Zs4FwYakth25DRiFXcluhbfSTSDPUl4ZjTdGFYd6KyAHakZ7bw5XDsUbTXGL 7gLuN6EBq1SwdNwcBj1PpYUNUsdP2OAfnY/b0hQyuFaZhEiFXLP1buT2+e/4bWJRh1ZI z/Kh9Q7Vb+Fep1k/rEqi1Xv+vmyuA+d+PjTCsYWgJvdI2QDpqi3zaZFx28PNXv5gt7yb O3/GFJzUuNFlkoCkYjfVXiWX882LsDgAPqDJr/Z9q7RN2SGpYkXPu/jW71cvknPuhRlw fPfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=NI191zpZ15P9h09/ueg1sIeWgoPkCYp08nvGyArfGco=; b=giRPhD0JQO2j5N7/cRYT8DIDjJA5dSt4l2fKSwrzA+aidPTxUBqR8tDJ7nz/tjKFtK pv7Yvnxcne3JKvPKKgAjps//oVX0zlC+GCYl3bv1EM5f95M6HV8O9/bfYqy/Z/si6T96 dmJ/BnfZtCeKTk5XTmLdRf+sxecLmr2Q1SOVh3vFiHicD7iNLXsbw/z1/GIfuLfMQUf8 X9IO9IRKh9VTBPEe701X+SAAAxcXuAaI8Bz12dN0Hft5WYFI1BaYKKS3hB0JPB/o3acY MWUmvkwMTzk090e65RnpFOCDtbOxioTSg5tJ6fiwApiKt193I0/63xS+NIUMDWB/lUmx d+cg== X-Gm-Message-State: AJIora8wPzqMUvvV4aTi4gs4ZCAtyQDxtTwH/ble75xgpUJCKJyVvIbX Lqm0l+qh/6rhtIg6frcF54+LoZDcwPc= X-Google-Smtp-Source: AGRyM1uFU8Jn8jGDdf820D6EVQK+nemvu4HswGOWuMQxzURAFMH+88teTf4FufFegpoRz58bAS4cTTVMJ1o= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:2481:b0:52a:d50e:e75e with SMTP id c1-20020a056a00248100b0052ad50ee75emr5880165pfv.43.1657580278580; Mon, 11 Jul 2022 15:57:58 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 11 Jul 2022 22:57:52 +0000 In-Reply-To: <20220711225753.1073989-1-seanjc@google.com> Message-Id: <20220711225753.1073989-3-seanjc@google.com> Mime-Version: 1.0 References: <20220711225753.1073989-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 2/3] KVM: selftests: Provide valid inputs for MONITOR/MWAIT regs From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yuan Yao Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Provide valid inputs for RAX, RCX, and RDX when testing whether or not KVM injects a #UD on MONITOR/MWAIT. SVM has a virtualization hole and checks for _all_ faults before checking for intercepts, e.g. MONITOR with an unsupported RCX will #GP before KVM gets a chance to intercept and emulate. Fixes: 2325d4dd7321 ("KVM: selftests: Add MONITOR/MWAIT quirk test") Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c | 8 ++++++-- 1 file changed, 6 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 f5c09cb528ae..6a4ebcdfa374 100644 --- a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +++ b/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c @@ -28,13 +28,17 @@ static void guest_monitor_wait(int testcase) =20 GUEST_SYNC(testcase); =20 - vector =3D kvm_asm_safe("monitor"); + /* + * Arbitrarily MONITOR this function, SVM performs fault checks before + * intercept checks, so the inputs for MONITOR and MWAIT must be valid. + */ + vector =3D kvm_asm_safe("monitor", "a"(guest_monitor_wait), "c"(0), "d"(0= )); if (fault_wanted) GUEST_ASSERT_2(vector =3D=3D UD_VECTOR, testcase, vector); else GUEST_ASSERT_2(!vector, testcase, vector); =20 - vector =3D kvm_asm_safe("mwait"); + vector =3D kvm_asm_safe("mwait", "a"(guest_monitor_wait), "c"(0), "d"(0)); if (fault_wanted) GUEST_ASSERT_2(vector =3D=3D UD_VECTOR, testcase, vector); else --=20 2.37.0.144.g8ac04bfd2-goog From nobody Sat Apr 25 11:49:30 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 DBB69C43334 for ; Mon, 11 Jul 2022 22:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231932AbiGKW6S (ORCPT ); Mon, 11 Jul 2022 18:58:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231402AbiGKW6C (ORCPT ); Mon, 11 Jul 2022 18:58:02 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A613680486 for ; Mon, 11 Jul 2022 15:58:00 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id k7-20020a17090a62c700b001ef9c16ba10so6554827pjs.1 for ; Mon, 11 Jul 2022 15:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=vtCvhz893+l2DWHLQu1OOqi/FdKA/QNbUD0v46ALnfE=; b=klVuCwNlrpf9V9c3vB1qT50TGfuZTGPAtq4m68XaeLg3IZRG1PeP05vQCRwcDWd8k0 oiKwoClwp/LYykqPJby874JrhDURNL/SLKe2e4Tmdpz9l8NCctHyAGsopeBAPXzmlpJV Yk9hOKRKB122qQYW7FtQuGEOp61UHpg/fDipuZaYs0kBFSHsZMHHxeoghHAVRWp+I8UO tvck6KsYGtUe6hJ4ymqc3KFX0VsadD9H1LHKaqcRO0YYIEzcpSn9Z8hzbSa0dvoR6lPP WCJPyWegj9a5nSlUR2eMRWKWVVXHUF9R8GxwBIusLgDmFrt7Y+CgRdxvTsPVg4siGpkW B2Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=vtCvhz893+l2DWHLQu1OOqi/FdKA/QNbUD0v46ALnfE=; b=L0PeV1KUmv0mXIkJgbgf5AsUURKZgB8AFUv5Y1xjFNyxVQdzPEk4riWVie0s7nNDpK GKySqXv9YM5WG7RloiJ119IG29KDGYZC1UqSSa3BGh5lKzprNh+D803uiOO276CsI4vR qv7kFaXEFxnN3MUZUhM9KKj2+dJSwy7ksHNrOJquigpZ7wIfQFd1iJ5TD1RcM1Ca16XJ 6bq2waZBJJtlrjFk6CWtPsBN88V3dLXfqBfbR+phlOgbKBGubbGA8DKXarCrmEtiCLDV o15BhKbImSaXPswEbG2/2CYHHxaLKD8vHJyV4mcEdczF+aPJrZnX8SLJQb5C/saiZIJc KcMA== X-Gm-Message-State: AJIora88kvtooFjkkg9tM06xFoWW/URfF6v5Ripjq6UWkT12k9zR+5o1 B5J1wFYeoxZ7qbpjZbVl/YihbtAyRYM= X-Google-Smtp-Source: AGRyM1vDQaY0dyCTNKdJTiZymYGnRQuB82JO2Ok2a3O4Wq18Bvvr73KLAnQUhOEviebiOkSIeVBvjBNh0ZM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:ebd2:b0:16c:2607:acbe with SMTP id p18-20020a170902ebd200b0016c2607acbemr20255535plg.14.1657580280272; Mon, 11 Jul 2022 15:58:00 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 11 Jul 2022 22:57:53 +0000 In-Reply-To: <20220711225753.1073989-1-seanjc@google.com> Message-Id: <20220711225753.1073989-4-seanjc@google.com> Mime-Version: 1.0 References: <20220711225753.1073989-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 3/3] KVM: x86: Tweak name of MONITOR/MWAIT #UD quirk to make it #UD specific From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yuan Yao Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a "UD" clause to KVM_X86_QUIRK_MWAIT_NEVER_FAULTS to make it clear that the quirk only controls the #UD behavior of MONITOR/MWAIT. KVM doesn't currently enforce fault checks when MONITOR/MWAIT are supported, but that could change in the future. SVM also has a virtualization hole in that it checks all faults before intercepts, and so "never faults" is already a lie when running on SVM. Fixes: bfbcc81bb82c ("KVM: x86: Add a quirk for KVM's "MONITOR/MWAIT are NO= Ps!" behavior") Signed-off-by: Sean Christopherson --- Documentation/virt/kvm/api.rst | 2 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/uapi/asm/kvm.h | 2 +- arch/x86/kvm/x86.c | 2 +- tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index bafaeedd455c..cd9361f22530 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -7523,7 +7523,7 @@ The valid bits in cap.args[0] are: incorrect hypercall instruction will generate a #UD within the guest. =20 -KVM_X86_QUIRK_MWAIT_NEVER_FAULTS By default, KVM emulates MONITOR/MWAIT= (if +KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS By default, KVM emulates MONITOR/MWAIT= (if they are intercepted) as NOPs regardle= ss of whether or not MONITOR/MWAIT are suppo= rted according to guest CPUID. When this q= uirk diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos= t.h index de5a149d0971..b9e85049743f 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2097,6 +2097,6 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, = unsigned long npages); KVM_X86_QUIRK_OUT_7E_INC_RIP | \ KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT | \ KVM_X86_QUIRK_FIX_HYPERCALL_INSN | \ - KVM_X86_QUIRK_MWAIT_NEVER_FAULTS) + KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS) =20 #endif /* _ASM_X86_KVM_HOST_H */ diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kv= m.h index ee3896416c68..a0c0ab0c898e 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -439,7 +439,7 @@ struct kvm_sync_regs { #define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3) #define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4) #define KVM_X86_QUIRK_FIX_HYPERCALL_INSN (1 << 5) -#define KVM_X86_QUIRK_MWAIT_NEVER_FAULTS (1 << 6) +#define KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS (1 << 6) =20 #define KVM_STATE_NESTED_FORMAT_VMX 0 #define KVM_STATE_NESTED_FORMAT_SVM 1 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 567d13405445..8065998c5bb6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2046,7 +2046,7 @@ EXPORT_SYMBOL_GPL(kvm_handle_invalid_op); =20 static int kvm_emulate_monitor_mwait(struct kvm_vcpu *vcpu, const char *in= sn) { - if (!kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_MWAIT_NEVER_FAULTS) && + if (!kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS) = && !guest_cpuid_has(vcpu, X86_FEATURE_MWAIT)) return kvm_handle_invalid_op(vcpu); =20 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 6a4ebcdfa374..094c68d744c0 100644 --- a/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +++ b/tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) =20 disabled_quirks =3D 0; if (testcase & MWAIT_QUIRK_DISABLED) - disabled_quirks |=3D KVM_X86_QUIRK_MWAIT_NEVER_FAULTS; + disabled_quirks |=3D KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS; if (testcase & MISC_ENABLES_QUIRK_DISABLED) disabled_quirks |=3D KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT; vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, disabled_quirks); --=20 2.37.0.144.g8ac04bfd2-goog