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 D08BDC43334 for ; Tue, 12 Jul 2022 11:57:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232870AbiGLL5I (ORCPT ); Tue, 12 Jul 2022 07:57:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232884AbiGLL4t (ORCPT ); Tue, 12 Jul 2022 07:56:49 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E337E21BE for ; Tue, 12 Jul 2022 04:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657626988; 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=qfc1A89ED4fhg0R8xqH3w64VTj5vw+dyc3zkUFhfwYU=; b=M6kD08EQMoCInTgq3WuvBAKYZrxMq33yV2/vl8i0zcISah7k3uHNwbKs9ZrNMvXMt6kciW +nIcEOqweT4iYDVc7iapqpV4hE0VEIj2gKjU3oTL5+c6l5ybZz0lGsPOu1lfX010w+ond0 pexeKbbLDnrbQAi6a2TYwM3FdTlv8eM= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-ZbPLPYviOf--MEourZaV3g-1; Tue, 12 Jul 2022 07:56:26 -0400 X-MC-Unique: ZbPLPYviOf--MEourZaV3g-1 Received: by mail-qv1-f72.google.com with SMTP id ln2-20020a0562145a8200b0047301e9bc53so1647991qvb.3 for ; Tue, 12 Jul 2022 04:56:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=qfc1A89ED4fhg0R8xqH3w64VTj5vw+dyc3zkUFhfwYU=; b=8JSFZyJ0IS4eWGgWbkPlsviPYc8ZorYxpVldA03FuMWhXaBGUXvyobkPjkH9QfYqIe C8S3AuQwoGetZo7PPrnWAjZKSam7/5cUwPRHTeLU6E6fLq9TklUSc/iwCqekG88oYyyi gJczbxoVz3Oxw9FvHchUYXuh6ZYX+gwib91nGtcIIUvZJBk7SSYrKIRNyyzbKjMTCn3n spg/BTqgH8yhNvzBcpEHTPizgJnZ1D3puqztz9bv5B3h+oF8O2xqno78Ud8ormhAVdaz nG96NfZhLWy21E83T7tmQQEHDWYJqip4pLbGK7pCAISpWeJKMPup/FcQQJgYeVDIv8mq GbIQ== X-Gm-Message-State: AJIora+PHJPJSv6vsev+3loTAJeRBqrAmMrbsj1ThnlUpw7k6wa/nvEp tGJ4//fgu0gw/hRLEHgkEGOoNAN2IHffjIPZ2ME1I+nvTIXhzTyYAMU2A55yaK8/zeqKnQeutnU ePuDYlluwEjFAowWSC3uRKi5h X-Received: by 2002:ac8:5e46:0:b0:317:6146:6f05 with SMTP id i6-20020ac85e46000000b0031761466f05mr18139060qtx.490.1657626986469; Tue, 12 Jul 2022 04:56:26 -0700 (PDT) X-Google-Smtp-Source: AGRyM1smwE8DmmPk8Zo8gZR1AzKKySTix/flcz8j70kP3A4KvDNHGomiSv4SWkOBMk2VnYq5OceaNQ== X-Received: by 2002:ac8:5e46:0:b0:317:6146:6f05 with SMTP id i6-20020ac85e46000000b0031761466f05mr18139039qtx.490.1657626986214; Tue, 12 Jul 2022 04:56:26 -0700 (PDT) Received: from [10.35.4.238] (bzq-82-81-161-50.red.bezeqint.net. [82.81.161.50]) by smtp.gmail.com with ESMTPSA id w15-20020ac86b0f000000b0031eb00e6fc9sm6120884qts.32.2022.07.12.04.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 04:56:25 -0700 (PDT) Message-ID: <27bfdbc9ef7e7471fd20b18d697f6845fdceb388.camel@redhat.com> Subject: Re: [PATCH v3 14/25] KVM: VMX: Tweak the special handling of SECONDARY_EXEC_ENCLS_EXITING in setup_vmcs_config() From: Maxim Levitsky To: Vitaly Kuznetsov , kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: Anirudh Rayabharam , Wanpeng Li , Jim Mattson , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 12 Jul 2022 14:56:21 +0300 In-Reply-To: <20220708144223.610080-15-vkuznets@redhat.com> References: <20220708144223.610080-1-vkuznets@redhat.com> <20220708144223.610080-15-vkuznets@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4 (3.40.4-5.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2022-07-08 at 16:42 +0200, Vitaly Kuznetsov wrote: > SECONDARY_EXEC_ENCLS_EXITING is conditionally added to the 'optional' > checklist in setup_vmcs_config() but there's little value in doing so. > First, as the control is optional, we can always check for its > presence, no harm done. Second, the only real value cpu_has_sgx() check > gives is that on the CPUs which support SECONDARY_EXEC_ENCLS_EXITING but > don't support SGX, the control is not getting enabled. It's highly unlikely > such CPUs exist but it's possible that some hypervisors expose broken vCPU > models. > > Preserve cpu_has_sgx() check but filter the result of adjust_vmx_controls() > instead of the input. > > Reviewed-by: Jim Mattson > Signed-off-by: Vitaly Kuznetsov > --- >  arch/x86/kvm/vmx/vmx.c | 9 ++++++--- >  1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index ce54f13d8da1..566be73c6509 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -2528,9 +2528,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, >                         SECONDARY_EXEC_PT_CONCEAL_VMX | >                         SECONDARY_EXEC_ENABLE_VMFUNC | >                         SECONDARY_EXEC_BUS_LOCK_DETECTION | > -                       SECONDARY_EXEC_NOTIFY_VM_EXITING; > -               if (cpu_has_sgx()) > -                       opt2 |= SECONDARY_EXEC_ENCLS_EXITING; > +                       SECONDARY_EXEC_NOTIFY_VM_EXITING | > +                       SECONDARY_EXEC_ENCLS_EXITING; > + >                 if (adjust_vmx_controls(min2, opt2, >                                         MSR_IA32_VMX_PROCBASED_CTLS2, >                                         &_cpu_based_2nd_exec_control) < 0) > @@ -2577,6 +2577,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, >                 vmx_cap->vpid = 0; >         } >   > +       if (!cpu_has_sgx()) > +               _cpu_based_2nd_exec_control &= ~SECONDARY_EXEC_ENCLS_EXITING; > + >         if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_TERTIARY_CONTROLS) { >                 u64 opt3 = TERTIARY_EXEC_IPI_VIRT; >   Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky