From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42AD3C4320A for ; Wed, 18 Aug 2021 21:43:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20450610A6 for ; Wed, 18 Aug 2021 21:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234247AbhHRVnx (ORCPT ); Wed, 18 Aug 2021 17:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234140AbhHRVnv (ORCPT ); Wed, 18 Aug 2021 17:43:51 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EEC0C061764 for ; Wed, 18 Aug 2021 14:43:16 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id n5so3546848pjt.4 for ; Wed, 18 Aug 2021 14:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Urwa3UzEqM6bx1rqTWjruQFp6e8+joKwTq2oMTg9VIE=; b=HFPtXnpPGToF7LCczbWSo9uUFLMpq1xJe6bOqNTdwgZ/Hr6PAZgnVrspCPVfWRhFWt rXuBP7jVpW7XDWjtzuYMkoW3oqSSAq2RPNpjdDYIAu3KB9SdI8VnW2apoOES+q2zYfNP HifGUo6eGQfzj1Zd/Oisr47+RHwWxJUbxEQij+zH6t0HWiNLVvUGyBjHWbIKN588QnxF bXGIf1/FeTC4ph2lD1GqFNF3cbPOpCZoeYAPHQCavJdwom5os3Pbz/92qDQic+qC9Fu5 04DFs+QWycTIIZ05qptcENV8520XVElyTa/b2FsAHIISxxksSkaKOMpNletTdNPmAVbw WHIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Urwa3UzEqM6bx1rqTWjruQFp6e8+joKwTq2oMTg9VIE=; b=m8hGI8TR1HR21Rjcd7QVFbOUAVpFzav+z9cHcOlLYpSq4mBAmrmHCRmW/qIV9XwPjI 2hKdsBtWo9qSVt1mnXNbRTCjjgcu3GQr0DcgVHdzDVErvWPt8kpOrSPYFuSO/qLTn12N KcZvkxOs4eizj3AandHDzkfVAcSZU8GZfY/ABu9AN3uzQKZQXH+y2Gx1qgRGZBUwBr9v MT44jMIUh07CghvqrYzNqaKCJiwt4foNz9WBkHfWGukOqcd9Cf5jCftgPKVpY1DOboB4 46QHaKdPB5M/8KDgVM4F31H2YCLk03+SSa0fg0Sv/jw2c+1v5iTmcEdWGfTCXYphMI0s EHgg== X-Gm-Message-State: AOAM532vBTaWi/sVsYzuf+pyRitAaitoVLEBmpRcAVt5Lvn3ISgo8vBm IL7edGY0R0VnOwuF1nDfdOhDSg== X-Google-Smtp-Source: ABdhPJxt6sDtb2wo4PVjm4LVmvOTJ2/mxYkpW4jXJXIh0eYt3JJ/1DSVMNFXZHEPQlo6BCB0iUrAGA== X-Received: by 2002:a17:902:e9c6:b029:12d:4cb3:3985 with SMTP id 6-20020a170902e9c6b029012d4cb33985mr8921304plk.56.1629322995681; Wed, 18 Aug 2021 14:43:15 -0700 (PDT) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id r16sm705172pje.10.2021.08.18.14.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:43:15 -0700 (PDT) Date: Wed, 18 Aug 2021 21:43:09 +0000 From: Sean Christopherson To: Hou Wenlong Cc: kvm@vger.kernel.org, Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Avi Kivity , linux-kernel@vger.kernel.org Subject: Re: [PATCH] kvm: fix wrong exception emulation in check_rdtsc Message-ID: References: <1297c0dd3f1bb47a6d089f850b629c7aa0247040.1629257115.git.houwenlong93@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1297c0dd3f1bb47a6d089f850b629c7aa0247040.1629257115.git.houwenlong93@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 18, 2021, Hou Wenlong wrote: > According to Intel's SDM Vol2 and AMD's APM Vol3, when > CR4.TSD is set, use rdtsc/rdtscp instruction above privilege > level 0 should trigger a #GP. > > Fixes: d7eb82030699e ("KVM: SVM: Add intercept checks for remaining group7 instructions") > Signed-off-by: Hou Wenlong > --- > arch/x86/kvm/emulate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c > index 2837110e66ed..c589ac832265 100644 > --- a/arch/x86/kvm/emulate.c > +++ b/arch/x86/kvm/emulate.c > @@ -4206,7 +4206,7 @@ static int check_rdtsc(struct x86_emulate_ctxt *ctxt) > u64 cr4 = ctxt->ops->get_cr(ctxt, 4); > > if (cr4 & X86_CR4_TSD && ctxt->ops->cpl(ctxt)) > - return emulate_ud(ctxt); > + return emulate_gp(ctxt, 0); Heh, I was having some serious deja vu, but the fix I was thinking of was for em_rdpid, and that was changing #GP -> #UD (commit a9e2e0ae6860). Reviewed-by: Sean Christopherson > return X86EMUL_CONTINUE; > } > -- > 2.31.1 >