niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

kvm: arm64: vgic-v3: Introduce vgic_v3_free_redist_region()

Browse source 
To improve the readability, we introduce the new
vgic_v3_free_redist_region helper and also rename
vgic_v3_insert_redist_region into vgic_v3_alloc_redist_region

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210405163941.510258-8-eric.auger@redhat.com
This commit is contained in:
Eric Auger 2021-04-05 18:39:39 +02:00 • committed by Marc Zyngier
parent da38530976
commit e5a3563546
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm64/kvm/vgic/vgic-init.c
View file

@ -338,10 +338,8 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm)
dist->vgic_dist_base = VGIC_ADDR_UNDEF; dist->vgic_dist_base = VGIC_ADDR_UNDEF;
if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) { if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {
list_for_each_entry_safe(rdreg, next, &dist->rd_regions, list) { list_for_each_entry_safe(rdreg, next, &dist->rd_regions, list)
list_del(&rdreg->list); vgic_v3_free_redist_region(rdreg);
kfree(rdreg);
}
INIT_LIST_HEAD(&dist->rd_regions); INIT_LIST_HEAD(&dist->rd_regions);
} else { } else {
dist->vgic_cpu_base = VGIC_ADDR_UNDEF; dist->vgic_cpu_base = VGIC_ADDR_UNDEF;

17
arch/arm64/kvm/vgic/vgic-mmio-v3.c
View file

@ -768,7 +768,7 @@ static int vgic_register_all_redist_iodevs(struct kvm *kvm)
} }
/** /**
* vgic_v3_insert_redist_region - Insert a new redistributor region * vgic_v3_alloc_redist_region - Allocate a new redistributor region
* *
* Performs various checks before inserting the rdist region in the list. * Performs various checks before inserting the rdist region in the list.
* Those tests depend on whether the size of the rdist region is known * Those tests depend on whether the size of the rdist region is known
@ -782,8 +782,8 @@ static int vgic_register_all_redist_iodevs(struct kvm *kvm)
* *
* Return 0 on success, < 0 otherwise * Return 0 on success, < 0 otherwise
*/ */
static int vgic_v3_insert_redist_region(struct kvm *kvm, uint32_t index, static int vgic_v3_alloc_redist_region(struct kvm *kvm, uint32_t index,
gpa_t base, uint32_t count) gpa_t base, uint32_t count)
{ {
struct vgic_dist *d = &kvm->arch.vgic; struct vgic_dist *d = &kvm->arch.vgic;
struct vgic_redist_region *rdreg; struct vgic_redist_region *rdreg;
@ -848,11 +848,17 @@ free:
return ret; return ret;
} }
void vgic_v3_free_redist_region(struct vgic_redist_region *rdreg)
{
list_del(&rdreg->list);
kfree(rdreg);
}
int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count) int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count)
{ {
int ret; int ret;
ret = vgic_v3_insert_redist_region(kvm, index, addr, count); ret = vgic_v3_alloc_redist_region(kvm, index, addr, count);
if (ret) if (ret)
return ret; return ret;
@ -865,8 +871,7 @@ int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count)
struct vgic_redist_region *rdreg; struct vgic_redist_region *rdreg;
rdreg = vgic_v3_rdist_region_from_index(kvm, index); rdreg = vgic_v3_rdist_region_from_index(kvm, index);
list_del(&rdreg->list); vgic_v3_free_redist_region(rdreg);
kfree(rdreg);
return ret; return ret;
} }

1
arch/arm64/kvm/vgic/vgic.h
View file

@ -293,6 +293,7 @@ vgic_v3_rd_region_size(struct kvm *kvm, struct vgic_redist_region *rdreg)
struct vgic_redist_region *vgic_v3_rdist_region_from_index(struct kvm *kvm, struct vgic_redist_region *vgic_v3_rdist_region_from_index(struct kvm *kvm,
u32 index); u32 index);
void vgic_v3_free_redist_region(struct vgic_redist_region *rdreg);
bool vgic_v3_rdist_overlap(struct kvm *kvm, gpa_t base, size_t size); bool vgic_v3_rdist_overlap(struct kvm *kvm, gpa_t base, size_t size);