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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 B53BFC11D2F for ; Mon, 24 Feb 2020 15:28:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8876820714 for ; Mon, 24 Feb 2020 15:28:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cBPKqPu4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727858AbgBXP2d (ORCPT ); Mon, 24 Feb 2020 10:28:33 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33487 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727359AbgBXP2d (ORCPT ); Mon, 24 Feb 2020 10:28:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582558111; 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=wHAZ9y2pihKYw7c3k4iQPIjf+uieiRyVBchHD/9GTS4=; b=cBPKqPu4bGAwlYoArpKyqfbwRluWP3RR0nGdsQcTu/nkxsGpxKqTLi5HJRWHJ5D6U2+0yR 3Kv/0aK1CwvSs1MvsGbMpkWPsZ/d+1VuPVtk+cDTKScDZ5grLxEQIaWTlONxMJufDLVJMN ic4HFjnRDzPviXcc4NiWCXVrTXk2Sts= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-436-iSu4aeNCNc2vBGM8t8j1FQ-1; Mon, 24 Feb 2020 10:28:30 -0500 X-MC-Unique: iSu4aeNCNc2vBGM8t8j1FQ-1 Received: by mail-wr1-f72.google.com with SMTP id s13so5730238wru.7 for ; Mon, 24 Feb 2020 07:28:29 -0800 (PST) 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=wHAZ9y2pihKYw7c3k4iQPIjf+uieiRyVBchHD/9GTS4=; b=uCioFm31T8Qgp0DpcIHI2hpV1eKAFDJznJEcvtx45DZ0u5pHdVLC4L8TFOwG6YqAaa uNPvog9vZKWZXtPXlY/WSDPyvaipt38g9c7NkXlGdAfj8bvw+GMi/1GtsY/9Pp5/KGUV kyXfWRJl5H4/0K29A/XS2c3rWPP8rRNcgz8qZ7aqrzIB7epf5pwOxm0opHeLvA0aVGhg cnyYyGUrEzB+VE4iyu2YaADeTcBi1M6Z5TDxkMLf6LN7+/KI+V9Wpj9Gbwfs6WbbN3Yb uxYWsmukMDsXnAlXZ5j9pk3jHx1xRZj5Sl92scQKZIBNl+QStvf0PTnmwLxLswkIlVBq 191g== X-Gm-Message-State: APjAAAW5xA6u1VEPAsYMYhfgxswRuSHs1hm0JCDCEc/LBTurUNGA3gYg hJpYKqYyDYU+tfvIYK2IjUo/M5PBZYC38R5uP5v0nhZ9QxuwTfi6DcQVYWN/14vS2prf0iw72AN JqDkkvsinnemYd4EC+6B8oRzX X-Received: by 2002:a5d:6390:: with SMTP id p16mr70107150wru.170.1582558108751; Mon, 24 Feb 2020 07:28:28 -0800 (PST) X-Google-Smtp-Source: APXvYqznNullXZQLscLdq0n1IkBlvgG6ZPyWj5WqLqKUAuN46cIaUur5xnd6Jzyz2xgqMhCUyDpmXw== X-Received: by 2002:a5d:6390:: with SMTP id p16mr70107133wru.170.1582558108551; Mon, 24 Feb 2020 07:28:28 -0800 (PST) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id b10sm19832764wrw.61.2020.02.24.07.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 07:28:28 -0800 (PST) From: Vitaly Kuznetsov To: Sean Christopherson Cc: Paolo Bonzini , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 34/61] KVM: x86: Handle RDTSCP CPUID adjustment in VMX code In-Reply-To: <20200201185218.24473-35-sean.j.christopherson@intel.com> References: <20200201185218.24473-1-sean.j.christopherson@intel.com> <20200201185218.24473-35-sean.j.christopherson@intel.com> Date: Mon, 24 Feb 2020 16:28:27 +0100 Message-ID: <87sgj0ngx0.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean Christopherson writes: > Move the clearing of the RDTSCP CPUID bit into VMX, which has a separate > VMCS control to enable RDTSCP in non-root, to eliminate an instance of > the undesirable "unsigned f_* = *_supported ? F(*) : 0" pattern in the > common CPUID handling code. Drop ->rdtscp_supported() since CPUID > adjustment was the last remaining user. > > No functional change intended. > > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/cpuid.c | 3 +-- > arch/x86/kvm/vmx/vmx.c | 4 ++++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index a1f46b3ca16e..fc507270f3f3 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -424,7 +424,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) > unsigned f_gbpages = 0; > unsigned f_lm = 0; > #endif > - unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported() ? F(RDTSCP) : 0; > unsigned f_xsaves = kvm_x86_ops->xsaves_supported() ? F(XSAVES) : 0; > unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0; > > @@ -446,7 +445,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) > F(MTRR) | F(PGE) | F(MCA) | F(CMOV) | > F(PAT) | F(PSE36) | 0 /* Reserved */ | > f_nx | 0 /* Reserved */ | F(MMXEXT) | F(MMX) | > - F(FXSR) | F(FXSR_OPT) | f_gbpages | f_rdtscp | > + F(FXSR) | F(FXSR_OPT) | f_gbpages | F(RDTSCP) | > 0 /* Reserved */ | f_lm | F(3DNOWEXT) | F(3DNOW); > /* cpuid 1.ecx */ > const u32 kvm_cpuid_1_ecx_x86_features = > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index a9728cc0c343..3990ba691d07 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7119,6 +7119,10 @@ static void vmx_set_supported_cpuid(struct kvm_cpuid_entry2 *entry) > boot_cpu_has(X86_FEATURE_OSPKE)) > cpuid_entry_set(entry, X86_FEATURE_PKU); > break; > + case 0x80000001: > + if (!cpu_has_vmx_rdtscp()) > + cpuid_entry_clear(entry, X86_FEATURE_RDTSCP); > + break; > default: > break; > } Reviewed-by: Vitaly Kuznetsov -- Vitaly