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 674C3C07E9B for ; Tue, 6 Jul 2021 14:35:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 492B6611AE for ; Tue, 6 Jul 2021 14:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232259AbhGFOhp (ORCPT ); Tue, 6 Jul 2021 10:37:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55175 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232245AbhGFOhl (ORCPT ); Tue, 6 Jul 2021 10:37:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625582102; 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=HgpykafpViSKKg/vT0c+K8niR3uhRG40sTK1NxePChg=; b=OK/vLpwgFh8VsPP9lT8xi02bPe+Sq3PShK6Gnj9Jc9J/VLHIfMxJl6aRgExNCdAPUNfTFM FFwKyTTiXSVKHTiec5dyzv4sYZO6ugcDy6YURGHgHatxsesqk8zLgLzqJAkYLqcAl3YUlS FqXPmckVFM2pKenOba4xriOqdawsKpQ= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-589-su_XvzeSMQicAo6raj4yMA-1; Tue, 06 Jul 2021 10:17:58 -0400 X-MC-Unique: su_XvzeSMQicAo6raj4yMA-1 Received: by mail-ej1-f71.google.com with SMTP id my13-20020a1709065a4db02904dca50901ebso1588932ejc.12 for ; Tue, 06 Jul 2021 07:17:58 -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=HgpykafpViSKKg/vT0c+K8niR3uhRG40sTK1NxePChg=; b=M5XTuwAJL25kpV5tryGrDAxGGPX6/UIEyuJPaA5YTS33PGDHgIc8FyPXc61MVPv6EU L+/swK/+idpJ6LuPzgENqmnx8Kf+7Ybp9cQS6pkNEH1tVFSOpz8vafkIuj0Gfz/09P4U JrrXelcWZ0lD7qOFhbNOk+rWBQCR8dFju3P7ymMYTNqFea7fUndcCKR9nVhkwpz2/Lxr tIKTrVa8Ojs+kkRW+3idJ1SHBnd5kgo5qTyOokX+1hEGWwNi1dOm+qPxRkvP/nEvrz0r Qt/otCK4r7FVzZ24wdRTysIQm4a3JM5h7LejGp1fYuezCgr0TvYVb8xXS8CWwJ/T0LUR pP7Q== X-Gm-Message-State: AOAM531B2XgrqqDClbUJAGwODqZV95myfJ28o9jJFQx3GRCVAeqdEE2/ FUeY2Mnx16WSZ456LEkqnRu51fkE1JwqwcEETKR9TVRBMgaZESdX2pP5dMTEjOX+dCf0zvjZwfN J4MEzDj9t/8Ur45zQABsdTNxX X-Received: by 2002:a17:907:3f93:: with SMTP id hr19mr5978930ejc.174.1625581077642; Tue, 06 Jul 2021 07:17:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxP8Cjndmhd1l2fvfJwWimt9VGxUlRqCL0hmiWaSy8opx1DXsrM7zvmzJ1dfy99qJTnxD2Gog== X-Received: by 2002:a17:907:3f93:: with SMTP id hr19mr5978899ejc.174.1625581077455; Tue, 06 Jul 2021 07:17:57 -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 rp5sm4136176ejb.63.2021.07.06.07.17.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jul 2021 07:17:56 -0700 (PDT) Subject: Re: [RFC PATCH v2 63/69] KVM: VMX: Move .get_interrupt_shadow() implementation to common VMX code 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, Sean Christopherson References: <11a3389da6184785b238b0d5a7f60279aa0a93b1.1625186503.git.isaku.yamahata@intel.com> From: Paolo Bonzini Message-ID: <3343767a-f7b3-715b-8d99-9821a458a708@redhat.com> Date: Tue, 6 Jul 2021 16:17:55 +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: <11a3389da6184785b238b0d5a7f60279aa0a93b1.1625186503.git.isaku.yamahata@intel.com> 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:05, isaku.yamahata@intel.com wrote: > From: Sean Christopherson > > Signed-off-by: Sean Christopherson > Signed-off-by: Isaku Yamahata > --- > arch/x86/kvm/vmx/common.h | 14 ++++++++++++++ > arch/x86/kvm/vmx/vmx.c | 10 +--------- > 2 files changed, 15 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/kvm/vmx/common.h b/arch/x86/kvm/vmx/common.h > index 755aaec85199..817ff3e74933 100644 > --- a/arch/x86/kvm/vmx/common.h > +++ b/arch/x86/kvm/vmx/common.h > @@ -120,6 +120,20 @@ static inline int __vmx_handle_ept_violation(struct kvm_vcpu *vcpu, gpa_t gpa, > return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0); > } > > +static inline u32 __vmx_get_interrupt_shadow(struct kvm_vcpu *vcpu) > +{ > + u32 interruptibility; > + int ret = 0; > + > + interruptibility = vmread32(vcpu, GUEST_INTERRUPTIBILITY_INFO); > + if (interruptibility & GUEST_INTR_STATE_STI) > + ret |= KVM_X86_SHADOW_INT_STI; > + if (interruptibility & GUEST_INTR_STATE_MOV_SS) > + ret |= KVM_X86_SHADOW_INT_MOV_SS; > + > + return ret; > +} > + > static inline u32 vmx_encode_ar_bytes(struct kvm_segment *var) > { > u32 ar; > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index d69d4dc7c071..d31cace67907 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -1467,15 +1467,7 @@ void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags) > > u32 vmx_get_interrupt_shadow(struct kvm_vcpu *vcpu) > { > - u32 interruptibility = vmcs_read32(GUEST_INTERRUPTIBILITY_INFO); > - int ret = 0; > - > - if (interruptibility & GUEST_INTR_STATE_STI) > - ret |= KVM_X86_SHADOW_INT_STI; > - if (interruptibility & GUEST_INTR_STATE_MOV_SS) > - ret |= KVM_X86_SHADOW_INT_MOV_SS; > - > - return ret; > + return __vmx_get_interrupt_shadow(vcpu); > } > > void vmx_set_interrupt_shadow(struct kvm_vcpu *vcpu, int mask) > Is there any reason to add the __ version, since at this point kvm_x86_ops is already pointing to vt_get_interrupt_shadow? Paolo