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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7E0DC4332F for ; Thu, 16 Dec 2021 16:00:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238614AbhLPQAP (ORCPT ); Thu, 16 Dec 2021 11:00:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45181 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238621AbhLPQAM (ORCPT ); Thu, 16 Dec 2021 11:00:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639670411; 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=K73gtROK9yHGDt0feRVcgm7GFOvu+wT3KMY2fXkTD0E=; b=UGAQHQ3jHp6P8OxUw4iktr8IpvRR7jvHrZlbLsZ3jrdNe61CJ9usktAsspsCB0mNKgphKg njLzgie0xLRLxjwt0YV61gyX4Bj+hl0j4aAZaurzsT1BDnpqpxEv+E9hzzpTnBOeriqhid kp85x0+PQjIANUkLRgS/ZAIkKEUEu3A= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-356--SIfNqVtPj6gAYdSd01LqA-1; Thu, 16 Dec 2021 11:00:10 -0500 X-MC-Unique: -SIfNqVtPj6gAYdSd01LqA-1 Received: by mail-wm1-f70.google.com with SMTP id v62-20020a1cac41000000b0033719a1a714so13955116wme.6 for ; Thu, 16 Dec 2021 08:00:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=K73gtROK9yHGDt0feRVcgm7GFOvu+wT3KMY2fXkTD0E=; b=Lp6vIzCAcSCw/9754wTaWpdfuw2kPifzK521tAiH5k1QSr0Nnjfgi84PyJUT619173 5OW6F+ENdW5pOcZ+e4hYi2DexQMu3vZe8gvofdzr/sNy9LQlm/nUj8HDw8zWmFk1Op0M qArHcWC7GTF1WAPGbkLaF1w3ykifEJiKlxqG5y2aNb+Y/IOgUhcmx0xvROj8cuhROY1K S8oBIauCIvCxMtMJcLlPim/xDW6G77WP3WFH0rYlqrFspLslIoxl7t12n/u+1Ygs76Q9 240/t+eAVyJ8XtjRwLjEG4UNOyEeNrmFdr+PO0tFBZkP0NT3arpzcAYXqSlOMlO2l7Wm NrCQ== X-Gm-Message-State: AOAM532JZN4UNrHiON0ilwFeq0CnyhGY4n9Lhj9cHUnJqa2VANF0Z5gW zojb/MCYirRYCT2JowCAvYg0c7d2f2BBOZTGBPlZPnW5Gm3PmSSBhqVK6pmkN+iNMEjqtOvJSxq U/kapAn6DvTvsKqKIXe9rNVnE0fBDiQAIuHew8umLt4O0WAhGnrtQiSWuZb/TRfTeGn1EBHNwAh Al X-Received: by 2002:a1c:4e17:: with SMTP id g23mr5784010wmh.158.1639670408773; Thu, 16 Dec 2021 08:00:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxy4f4e6ERjn00UIt+ootLIYaVF9OYCiHWhiuIzpCHZV9hE+Ni/ZN0Aqyu8u4aiuli3XaLyxA== X-Received: by 2002:a1c:4e17:: with SMTP id g23mr5783970wmh.158.1639670408380; Thu, 16 Dec 2021 08:00:08 -0800 (PST) Received: from fedora (nat-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id n9sm6117415wmq.37.2021.12.16.08.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 08:00:07 -0800 (PST) From: Vitaly Kuznetsov To: Sean Christopherson Cc: kvm@vger.kernel.org, Paolo Bonzini , Wanpeng Li , Jim Mattson , oliver.sang@intel.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] KVM: selftests: Avoid KVM_SET_CPUID2 after KVM_RUN in vmx_pmu_msrs_test In-Reply-To: References: <20211215161617.246563-1-vkuznets@redhat.com> <87a6h0vs36.fsf@redhat.com> Date: Thu, 16 Dec 2021 17:00:06 +0100 Message-ID: <87tuf8tu9l.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean Christopherson writes: > On Thu, Dec 16, 2021, Vitaly Kuznetsov wrote: >> Sean Christopherson writes: >> > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c >> > index 85127b3e3690..65e297875405 100644 >> > --- a/arch/x86/kvm/x86.c >> > +++ b/arch/x86/kvm/x86.c >> > @@ -3424,7 +3424,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) >> > >> > if (!msr_info->host_initiated) >> > return 1; >> > - if (guest_cpuid_has(vcpu, X86_FEATURE_PDCM) && kvm_get_msr_feature(&msr_ent)) >> > + if (kvm_get_msr_feature(&msr_ent)) >> > return 1; >> > if (data & ~msr_ent.data) >> > return 1; >> >> This looks OK. >> >> > @@ -3779,14 +3779,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) >> > msr_info->data = vcpu->arch.microcode_version; >> > break; >> > case MSR_IA32_ARCH_CAPABILITIES: >> > - if (!msr_info->host_initiated && >> > - !guest_cpuid_has(vcpu, X86_FEATURE_ARCH_CAPABILITIES)) >> > + if (!msr_info->host_initiated) >> > return 1; >> > msr_info->data = vcpu->arch.arch_capabilities; >> > break; >> > case MSR_IA32_PERF_CAPABILITIES: >> > - if (!msr_info->host_initiated && >> > - !guest_cpuid_has(vcpu, X86_FEATURE_PDCM)) >> > + if (!msr_info->host_initiated) >> > return 1; >> > msr_info->data = vcpu->arch.perf_capabilities; >> > break; >> > >> >> Hm, this change will unconditionally forbid reading >> MSR_IA32_ARCH_CAPABILITIES/MSR_IA32_PERF_CAPABILITIES from the guest. Is >> this what we want? > > No, I completely misread the code. The kvm_set_msr_common() goof seems to be > the only bug, and that would also explain the selftest's bad testcase. > Ok then, v2 is coming. -- Vitaly