lkml.org 
[lkml]   [2015]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 31/63] KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
    Date
    From: Haibin Wang <wanghaibin.wang@huawei.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 30c2117085bc4e05d091cee6eba79f069b41a9cd upstream.

    Currently below check in vgic_ioaddr_overlap will always succeed,
    because the vgic dist base and vgic cpu base are still kept UNDEF
    after initialization. The code as follows will be return forever.

    if (IS_VGIC_ADDR_UNDEF(dist) || IS_VGIC_ADDR_UNDEF(cpu))
    return 0;

    So, before invoking the vgic_ioaddr_overlap, it needs to set the
    corresponding base address firstly.

    Signed-off-by: Haibin Wang <wanghaibin.wang@huawei.com>
    Acked-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
    Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    virt/kvm/arm/vgic.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
    index 74a014cdcac9..46221c99334f 100644
    --- a/virt/kvm/arm/vgic.c
    +++ b/virt/kvm/arm/vgic.c
    @@ -1475,10 +1475,11 @@ static int vgic_ioaddr_assign(struct kvm *kvm, phys_addr_t *ioaddr,
    if (addr + size < addr)
    return -EINVAL;

    + *ioaddr = addr;
    ret = vgic_ioaddr_overlap(kvm);
    if (ret)
    - return ret;
    - *ioaddr = addr;
    + *ioaddr = VGIC_ADDR_UNDEF;
    +
    return ret;
    }

    --
    2.3.5


    \
     
     \ /
      Last update: 2015-04-30 15:01    [W:4.352 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site