Skip to content

Commit

Permalink
KVM: arm64: vgic-its: vgic_its_check_id returns the entry's GPA
Browse files Browse the repository at this point in the history
As vgic_its_check_id() computes the device/collection entry's
GPA, let's return it so that new callers can retrieve it easily.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Christoffer Dall <cdall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
  • Loading branch information
eauger authored and Christoffer Dall committed May 8, 2017
1 parent ea1ad53 commit dceff70
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions virt/kvm/arm/vgic/vgic-its.c
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,8 @@ static int vgic_its_cmd_handle_movi(struct kvm *kvm, struct vgic_its *its,
* is actually valid (covered by a memslot and guest accessible).
* For this we have to read the respective first level entry.
*/
static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id)
static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,
gpa_t *eaddr)
{
int l1_tbl_size = GITS_BASER_NR_PAGES(baser) * SZ_64K;
u64 indirect_ptr, type = GITS_BASER_TYPE(baser);
Expand Down Expand Up @@ -725,6 +726,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id)
addr = BASER_ADDRESS(baser) + id * esz;
gfn = addr >> PAGE_SHIFT;

if (eaddr)
*eaddr = addr;
return kvm_is_visible_gfn(its->dev->kvm, gfn);
}

Expand Down Expand Up @@ -757,6 +760,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id)
indirect_ptr += index * esz;
gfn = indirect_ptr >> PAGE_SHIFT;

if (eaddr)
*eaddr = indirect_ptr;
return kvm_is_visible_gfn(its->dev->kvm, gfn);
}

Expand All @@ -766,7 +771,7 @@ static int vgic_its_alloc_collection(struct vgic_its *its,
{
struct its_collection *collection;

if (!vgic_its_check_id(its, its->baser_coll_table, coll_id))
if (!vgic_its_check_id(its, its->baser_coll_table, coll_id, NULL))
return E_ITS_MAPC_COLLECTION_OOR;

collection = kzalloc(sizeof(*collection), GFP_KERNEL);
Expand Down Expand Up @@ -939,7 +944,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its,
gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd);
struct its_device *device;

if (!vgic_its_check_id(its, its->baser_device_table, device_id))
if (!vgic_its_check_id(its, its->baser_device_table, device_id, NULL))
return E_ITS_MAPD_DEVICE_OOR;

if (valid && num_eventid_bits > VITS_TYPER_IDBITS)
Expand Down

0 comments on commit dceff70

Please sign in to comment.