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=-18.7 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,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 115C8C07E96 for ; Tue, 6 Jul 2021 12:40:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EBD9261CC2 for ; Tue, 6 Jul 2021 12:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233591AbhGFMna (ORCPT ); Tue, 6 Jul 2021 08:43:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39245 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345460AbhGFMf7 (ORCPT ); Tue, 6 Jul 2021 08:35:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625574800; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IKAolIkWfGXIHgVjjUzyC4kaIUHRAjQA2cb6xVYX4ig=; b=euCjEuiBVsyzsK2sh+4oo4M6FbCtrovBOeu8t+E09DwbxitqCnx6C5bv3OvR3nItoDzXyc z8wMR4pid8oDp3YC4HbVm3mWK0l6ZeGT9mMQkouoWw4lor23IFSdYNQjsCcDinRG0Gcfyc IEx3JwQE8lXOU2qnlGRjeqYehSOKlBA= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-2TI_IJ3oNR6b_bvMqi2U9w-1; Tue, 06 Jul 2021 08:33:19 -0400 X-MC-Unique: 2TI_IJ3oNR6b_bvMqi2U9w-1 Received: by mail-ed1-f71.google.com with SMTP id u13-20020aa7d88d0000b0290397eb800ae3so6734867edq.9 for ; Tue, 06 Jul 2021 05:33: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:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=IKAolIkWfGXIHgVjjUzyC4kaIUHRAjQA2cb6xVYX4ig=; b=Jt9BIoky6A+g9q1iuyjOKLyp6OlZykEhatId2SYJl5HPXPdPmt8e1NeCOhTx4lFtj0 Ly1vu0ti+QT1Um0/Hi+ZGknyHGx5Ztw4bZeAQvzHHozln6oizTY9g6MWtfnNaGM0nWqv pBsnGRX7FOZ1TNVdmXaVdDdbeZkPsGGShO1tgi71cWnHa38EaU60UyOKyvtHdYLC6GZf Si18/XngvEjJg5O7diSi50U7aDJIVm4RTyHV0hsgckB98bGV1+Qt9pbJMqIgV+YfaZDv fluvbBZa0HIHT3a3s/9JHAlPy2ujGsIaa/JuHR4i9/ttDD3wPWzJTLPDBCSdiuX9tFoC RwjA== X-Gm-Message-State: AOAM531RubAx/6dDi4nIOPnKLrRgnAUIRO1ZOZe1y75G+MRcUOfswUkU ueB9K0zHjmxtIKiQ3fv/21AWDf05qFwd34jbB4+tRmsvbao1f02qx2yeSuk4XOAuuDbYZhBgGtl Mq17J9aGunxQBBgXddPLe5U/J X-Received: by 2002:a05:6402:510d:: with SMTP id m13mr22472198edd.179.1625574797933; Tue, 06 Jul 2021 05:33:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKvbEYLkOKiDEWkJdNUVXWSloDVpCNUhfsMNw0ISwJpI+/ox2yxxHXME+f+tc+GZAzZzAY8g== X-Received: by 2002:a05:6402:510d:: with SMTP id m13mr22472161edd.179.1625574797715; Tue, 06 Jul 2021 05:33:17 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id x21sm7186737eds.38.2021.07.06.05.33.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jul 2021 05:33:16 -0700 (PDT) Subject: Re: [RFC PATCH v2 02/69] KVM: X86: move kvm_cpu_vmxon() from vmx.c to virtext.h To: isaku.yamahata@intel.com, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , erdemaktas@google.com, Connor Kuehl , Sean Christopherson , x86@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: isaku.yamahata@gmail.com References: From: Paolo Bonzini Message-ID: Date: Tue, 6 Jul 2021 14:33:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/07/21 00:04, isaku.yamahata@intel.com wrote: > From: Isaku Yamahata > > This is preparatory clean up for TDX support. > Move out kvm_cpu_vmxon() from vmx.c to virtext.h with rename to > vcpu_vmxon(). Which will be used outside of kvm. > SEAMLDER to load TDX module which occurs at kernel early boot phase. > As bonus, this also increases the symetry with cpu_vmxoff(). > > No functional change is intended. > > Signed-off-by: Isaku Yamahata > --- > arch/x86/include/asm/virtext.h | 25 +++++++++++++++++++++++++ > arch/x86/kvm/vmx/vmx.c | 22 +--------------------- > 2 files changed, 26 insertions(+), 21 deletions(-) > > diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h > index 8757078d4442..9234b85dac24 100644 > --- a/arch/x86/include/asm/virtext.h > +++ b/arch/x86/include/asm/virtext.h > @@ -30,6 +30,31 @@ static inline int cpu_has_vmx(void) > } > > > +/** > + * cpu_vmxon() - Enable VMX on the current CPU > + * > + * Set CR4.VMXE and enable VMX > + */ > +static inline int cpu_vmxon(u64 vmxon_pointer) > +{ > + u64 msr; > + > + cr4_set_bits(X86_CR4_VMXE); > + > + asm_volatile_goto("1: vmxon %[vmxon_pointer]\n\t" > + _ASM_EXTABLE(1b, %l[fault]) > + : : [vmxon_pointer] "m"(vmxon_pointer) > + : : fault); > + return 0; > + > +fault: > + WARN_ONCE(1, "VMXON faulted, MSR_IA32_FEAT_CTL (0x3a) = 0x%llx\n", > + rdmsrl_safe(MSR_IA32_FEAT_CTL, &msr) ? 0xdeadbeef : msr); > + cr4_clear_bits(X86_CR4_VMXE); > + > + return -EFAULT; > +} > + > /** > * cpu_vmxoff() - Disable VMX on the current CPU > * > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index c2a779b688e6..d73ba7a6ff8d 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -2376,26 +2376,6 @@ static __init int vmx_disabled_by_bios(void) > !boot_cpu_has(X86_FEATURE_VMX); > } > > -static int kvm_cpu_vmxon(u64 vmxon_pointer) > -{ > - u64 msr; > - > - cr4_set_bits(X86_CR4_VMXE); > - > - asm_volatile_goto("1: vmxon %[vmxon_pointer]\n\t" > - _ASM_EXTABLE(1b, %l[fault]) > - : : [vmxon_pointer] "m"(vmxon_pointer) > - : : fault); > - return 0; > - > -fault: > - WARN_ONCE(1, "VMXON faulted, MSR_IA32_FEAT_CTL (0x3a) = 0x%llx\n", > - rdmsrl_safe(MSR_IA32_FEAT_CTL, &msr) ? 0xdeadbeef : msr); > - cr4_clear_bits(X86_CR4_VMXE); > - > - return -EFAULT; > -} > - > static int hardware_enable(void) > { > int cpu = raw_smp_processor_id(); > @@ -2415,7 +2395,7 @@ static int hardware_enable(void) > > intel_pt_handle_vmx(1); > > - r = kvm_cpu_vmxon(phys_addr); > + r = cpu_vmxon(phys_addr); > if (r) { > intel_pt_handle_vmx(0); > return r; > Reviewed-by: Paolo Bonzini