Commit dceff702 authored by Eric Auger's avatar Eric Auger Committed by Christoffer Dall

KVM: arm64: vgic-its: vgic_its_check_id returns the entry's GPA

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: default avatarEric Auger <eric.auger@redhat.com>
Acked-by: default avatarChristoffer Dall <cdall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent ea1ad53e
...@@ -694,7 +694,8 @@ static int vgic_its_cmd_handle_movi(struct kvm *kvm, struct vgic_its *its, ...@@ -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). * is actually valid (covered by a memslot and guest accessible).
* For this we have to read the respective first level entry. * 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; int l1_tbl_size = GITS_BASER_NR_PAGES(baser) * SZ_64K;
u64 indirect_ptr, type = GITS_BASER_TYPE(baser); u64 indirect_ptr, type = GITS_BASER_TYPE(baser);
...@@ -725,6 +726,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) ...@@ -725,6 +726,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id)
addr = BASER_ADDRESS(baser) + id * esz; addr = BASER_ADDRESS(baser) + id * esz;
gfn = addr >> PAGE_SHIFT; gfn = addr >> PAGE_SHIFT;
if (eaddr)
*eaddr = addr;
return kvm_is_visible_gfn(its->dev->kvm, gfn); return kvm_is_visible_gfn(its->dev->kvm, gfn);
} }
...@@ -757,6 +760,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) ...@@ -757,6 +760,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id)
indirect_ptr += index * esz; indirect_ptr += index * esz;
gfn = indirect_ptr >> PAGE_SHIFT; gfn = indirect_ptr >> PAGE_SHIFT;
if (eaddr)
*eaddr = indirect_ptr;
return kvm_is_visible_gfn(its->dev->kvm, gfn); return kvm_is_visible_gfn(its->dev->kvm, gfn);
} }
...@@ -766,7 +771,7 @@ static int vgic_its_alloc_collection(struct vgic_its *its, ...@@ -766,7 +771,7 @@ static int vgic_its_alloc_collection(struct vgic_its *its,
{ {
struct its_collection *collection; 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; return E_ITS_MAPC_COLLECTION_OOR;
collection = kzalloc(sizeof(*collection), GFP_KERNEL); collection = kzalloc(sizeof(*collection), GFP_KERNEL);
...@@ -939,7 +944,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, ...@@ -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); gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd);
struct its_device *device; 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; return E_ITS_MAPD_DEVICE_OOR;
if (valid && num_eventid_bits > VITS_TYPER_IDBITS) if (valid && num_eventid_bits > VITS_TYPER_IDBITS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment