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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 24B4CC433B4 for ; Mon, 26 Apr 2021 08:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEA1061157 for ; Mon, 26 Apr 2021 08:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232228AbhDZIuD (ORCPT ); Mon, 26 Apr 2021 04:50:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20647 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232068AbhDZIuC (ORCPT ); Mon, 26 Apr 2021 04:50:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619426961; 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: in-reply-to:in-reply-to:references:references; bh=+hmNV/IZvupUHnll2PVZlj2hkS5F6Q9x72zJCUhsn3I=; b=Ifu8iIDINB3dG4EaZw8sYrOlokForwdtnxaNy+dQJ4Fk5hMR6zyxuWGZYJknovD47V1+1m /rI4gqPAHryy3NF15pBfPqtQfT28JRqXLCc6gP93+4sK7IFgXRFv7SEss5HT+0mIPNkoH5 y3P4xKr+ietIj8bfpTz4bskg8tJ7Ae0= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-256-sON89J4pON-9zDo7CvGWog-1; Mon, 26 Apr 2021 04:49:18 -0400 X-MC-Unique: sON89J4pON-9zDo7CvGWog-1 Received: by mail-ej1-f72.google.com with SMTP id e18-20020a17090681d2b0290384d9ff1359so974426ejx.16 for ; Mon, 26 Apr 2021 01:49:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=+hmNV/IZvupUHnll2PVZlj2hkS5F6Q9x72zJCUhsn3I=; b=mS6xMmaSUpNB8dNgexHuDvCvTCjekj6tODYustGFVtokC7mU0biLCqgtbQd+aSA8sW GCe+sIrZA+slH3BXIZ9vOVLNfuMK5b7zFDHNBgpLpnuzyzQFHkmE64+/4z7Nqxhb2Znq 1YC68L8F8/UowH67KXpQ/xouKT7MZhMmFz9VZz7RALyfdqlqpdkqYKLsDtEYTrllnCHi oM0mMm+09ZW0z9OzdgJYFbNhWQEZcVB70UIefBnau66C3gs3czK/PL8HuAxG6szI6i++ onSPhH/RiMA9V6mIV6E+Q7bGCdjwwUxqJ9/iT8sQZm2xKkZLBO19ph5LK1e1L308mX0Y DpOw== X-Gm-Message-State: AOAM5330X4Nag5eyQKYT4xmB4RfggiO+5HUPhIecA+x7Av5LP1uvRjMP VmGm/frdegEdLAmwtSPWsGK2fvMFHIoi4TBXbkotJWcRBsCPD071uXFdFgk23gsZj2tgJ3ny55A BO9Bv2YSHudm3 X-Received: by 2002:a17:906:3952:: with SMTP id g18mr17526723eje.104.1619426957430; Mon, 26 Apr 2021 01:49:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzELkyRim4QK/Bo4IrncIGNRy3SNheoBCmAkR33CDn1xefpGnrpKft5WPKQP0jLi48+Vmtseg== X-Received: by 2002:a17:906:3952:: with SMTP id g18mr17526714eje.104.1619426957295; Mon, 26 Apr 2021 01:49:17 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id hc43sm11350506ejc.97.2021.04.26.01.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 01:49:16 -0700 (PDT) From: Vitaly Kuznetsov To: Sean Christopherson , Paolo Bonzini Cc: Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Reiji Watanabe Subject: Re: [PATCH v3 1/4] KVM: SVM: Inject #GP on guest MSR_TSC_AUX accesses if RDTSCP unsupported In-Reply-To: <20210423223404.3860547-2-seanjc@google.com> References: <20210423223404.3860547-1-seanjc@google.com> <20210423223404.3860547-2-seanjc@google.com> Date: Mon, 26 Apr 2021 10:49:15 +0200 Message-ID: <87mttlfn1w.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Sean Christopherson writes: > Inject #GP on guest accesses to MSR_TSC_AUX if RDTSCP is unsupported in > the guest's CPUID model. > > Fixes: 46896c73c1a4 ("KVM: svm: add support for RDTSCP") > Cc: stable@vger.kernel.org > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/svm/svm.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index cd8c333ed2dc..9ed9c7bd7cfd 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -2674,6 +2674,9 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > case MSR_TSC_AUX: > if (!boot_cpu_has(X86_FEATURE_RDTSCP)) > return 1; > + if (!msr_info->host_initiated && > + !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP)) > + return 1; Super-nit: a blank like before and after the condition would make this consistent with the hunk you add to svm_set_msr() below. > msr_info->data = svm->tsc_aux; > break; > /* > @@ -2892,6 +2895,10 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) > if (!boot_cpu_has(X86_FEATURE_RDTSCP)) > return 1; > > + if (!msr->host_initiated && > + !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP)) > + return 1; > + > /* > * This is rare, so we update the MSR here instead of using > * direct_access_msrs. Doing that would require a rdmsr in Reviewed-by: Vitaly Kuznetsov -- Vitaly