Re: [PATCH] KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections

[Auger Eric]

Hi Marc,

On 12/13/19 11:43 AM, Marc Zyngier wrote:
> Hi Eric,
> 
> On 2019-12-13 09:42, Eric Auger wrote:
>> Saving/restoring an unmapped collection is a valid scenario. For
>> example this happens if a MAPTI command was sent, featuring an
>> unmapped collection. At the moment the CTE fails to be restored.
>> Only compare against the number of online vcpus if the rdist
>> base is set.
>>
>> Cc: stable@xxxxxxxxxxxxxxx # v4.11+
>> Fixes: ea1ad53e1e31a ("KVM: arm64: vgic-its: Collection table
>> save/restore")
>> Signed-off-by: Eric Auger <eric.auger@xxxxxxxxxx>
>> ---
>> Âvirt/kvm/arm/vgic/vgic-its.c | 3 ++-
>> Â1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
>> index 98c7360d9fb7..17920d1b350a 100644
>> --- a/virt/kvm/arm/vgic/vgic-its.c
>> +++ b/virt/kvm/arm/vgic/vgic-its.c
>> @@ -2475,7 +2475,8 @@ static int vgic_its_restore_cte(struct vgic_its
>> *its, gpa_t gpa, int esz)
>> ÂÂÂÂ target_addr = (u32)(val >> KVM_ITS_CTE_RDBASE_SHIFT);
>> ÂÂÂÂ coll_id = val & KVM_ITS_CTE_ICID_MASK;
>>
>> -ÂÂÂ if (target_addr >= atomic_read(&kvm->online_vcpus))
>> +ÂÂÂ if (target_addr != COLLECTION_NOT_MAPPED &&
>> +ÂÂÂÂÂÂÂ target_addr >= atomic_read(&kvm->online_vcpus))
>> ÂÂÂÂÂÂÂÂ return -EINVAL;
>>
>> ÂÂÂÂ collection = find_collection(its, coll_id);
> 
> Looks good to me. Out of curiosity, how was this spotted?

I am currently writing some kvm-unit-tests to better test ITS and its
migration.

Thanks

Eric
> 
> Thanks,
> 
> ÂÂÂÂÂÂÂ M.