lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 324/800] KVM: nVMX: Add a return code to vmx_complete_nested_posted_interrupt
    Date
    From: Jim Mattson <jmattson@google.com>

    [ Upstream commit 650293c3de6b042c4a2e87b2bc678efcff3843e8 ]

    No functional change intended.

    Signed-off-by: Jim Mattson <jmattson@google.com>
    Reviewed-by: Oliver Upton <oupton@google.com>
    Message-Id: <20210604172611.281819-4-jmattson@google.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kvm/vmx/nested.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
    index 4ceadec6aeb6..5677cef81642 100644
    --- a/arch/x86/kvm/vmx/nested.c
    +++ b/arch/x86/kvm/vmx/nested.c
    @@ -3682,7 +3682,7 @@ void nested_mark_vmcs12_pages_dirty(struct kvm_vcpu *vcpu)
    }
    }

    -static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)
    +static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)
    {
    struct vcpu_vmx *vmx = to_vmx(vcpu);
    int max_irr;
    @@ -3690,17 +3690,17 @@ static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)
    u16 status;

    if (!vmx->nested.pi_desc || !vmx->nested.pi_pending)
    - return;
    + return 0;

    vmx->nested.pi_pending = false;
    if (!pi_test_and_clear_on(vmx->nested.pi_desc))
    - return;
    + return 0;

    max_irr = find_last_bit((unsigned long *)vmx->nested.pi_desc->pir, 256);
    if (max_irr != 256) {
    vapic_page = vmx->nested.virtual_apic_map.hva;
    if (!vapic_page)
    - return;
    + return 0;

    __kvm_apic_update_irr(vmx->nested.pi_desc->pir,
    vapic_page, &max_irr);
    @@ -3713,6 +3713,7 @@ static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)
    }

    nested_mark_vmcs12_pages_dirty(vcpu);
    + return 0;
    }

    static void nested_vmx_inject_exception_vmexit(struct kvm_vcpu *vcpu,
    @@ -3887,8 +3888,7 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu)
    }

    no_vmexit:
    - vmx_complete_nested_posted_interrupt(vcpu);
    - return 0;
    + return vmx_complete_nested_posted_interrupt(vcpu);
    }

    static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:2.983 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site