From: Eric Auger <eric.auger@redhat.com> To: eric.auger.pro@gmail.com, eric.auger@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, vijayak@caviumnetworks.com, Vijaya.Kumar@cavium.com, peter.maydell@linaro.org, linux-arm-kernel@lists.infradead.org, drjones@redhat.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: andre.przywara@arm.com, pbonzini@redhat.com, dgilbert@redhat.com, quintela@redhat.com, Prasun.Kapoor@cavium.com Subject: [PATCH v3 10/19] KVM: arm64: ITS: Check the device id matches TYPER DEVBITS range Date: Mon, 6 Mar 2017 12:34:25 +0100 [thread overview] Message-ID: <1488800074-21991-11-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1488800074-21991-1-git-send-email-eric.auger@redhat.com> On MAPD we currently check the device id can be stored in the device table. Let's first check it can be encoded within the range defined by TYPER DEVBITS. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- virt/kvm/arm/vgic/vgic-its.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 694023f..322e370 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -180,6 +180,7 @@ static struct its_ite *find_ite(struct vgic_its *its, u32 device_id, #define VITS_ESZ 8 #define VITS_TYPER_IDBITS 0xF +#define VITS_TYPER_DEVBITS 0xF /* * Finds and returns a collection in the ITS collection table. @@ -402,7 +403,7 @@ static unsigned long vgic_mmio_read_its_typer(struct kvm *kvm, * To avoid memory waste in the guest, we keep the number of IDBits and * DevBits low - as least for the time being. */ - reg |= 0x0f << GITS_TYPER_DEVBITS_SHIFT; + reg |= VITS_TYPER_DEVBITS << GITS_TYPER_DEVBITS_SHIFT; reg |= VITS_TYPER_IDBITS << GITS_TYPER_IDBITS_SHIFT; reg |= (VITS_ESZ - 1) << GITS_TYPER_ITT_ENTRY_SIZE_SHIFT; @@ -631,7 +632,7 @@ static int vgic_its_cmd_handle_movi(struct kvm *kvm, struct vgic_its *its, * Check whether an ID can be stored into the corresponding guest table. * For a direct table this is pretty easy, but gets a bit nasty for * indirect tables. We check whether the resulting guest physical address - * is actually valid (covered by a memslot and guest accessbible). + * 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, int id) @@ -642,6 +643,9 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, int id) gfn_t gfn; int esz = GITS_BASER_ENTRY_SIZE(baser); + if (id >= (2 << (VITS_TYPER_DEVBITS + 1))) + return false; + if (!(baser & GITS_BASER_INDIRECT)) { phys_addr_t addr; -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@redhat.com (Eric Auger) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 10/19] KVM: arm64: ITS: Check the device id matches TYPER DEVBITS range Date: Mon, 6 Mar 2017 12:34:25 +0100 [thread overview] Message-ID: <1488800074-21991-11-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1488800074-21991-1-git-send-email-eric.auger@redhat.com> On MAPD we currently check the device id can be stored in the device table. Let's first check it can be encoded within the range defined by TYPER DEVBITS. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- virt/kvm/arm/vgic/vgic-its.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 694023f..322e370 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -180,6 +180,7 @@ static struct its_ite *find_ite(struct vgic_its *its, u32 device_id, #define VITS_ESZ 8 #define VITS_TYPER_IDBITS 0xF +#define VITS_TYPER_DEVBITS 0xF /* * Finds and returns a collection in the ITS collection table. @@ -402,7 +403,7 @@ static unsigned long vgic_mmio_read_its_typer(struct kvm *kvm, * To avoid memory waste in the guest, we keep the number of IDBits and * DevBits low - as least for the time being. */ - reg |= 0x0f << GITS_TYPER_DEVBITS_SHIFT; + reg |= VITS_TYPER_DEVBITS << GITS_TYPER_DEVBITS_SHIFT; reg |= VITS_TYPER_IDBITS << GITS_TYPER_IDBITS_SHIFT; reg |= (VITS_ESZ - 1) << GITS_TYPER_ITT_ENTRY_SIZE_SHIFT; @@ -631,7 +632,7 @@ static int vgic_its_cmd_handle_movi(struct kvm *kvm, struct vgic_its *its, * Check whether an ID can be stored into the corresponding guest table. * For a direct table this is pretty easy, but gets a bit nasty for * indirect tables. We check whether the resulting guest physical address - * is actually valid (covered by a memslot and guest accessbible). + * 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, int id) @@ -642,6 +643,9 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, int id) gfn_t gfn; int esz = GITS_BASER_ENTRY_SIZE(baser); + if (id >= (2 << (VITS_TYPER_DEVBITS + 1))) + return false; + if (!(baser & GITS_BASER_INDIRECT)) { phys_addr_t addr; -- 2.5.5
next prev parent reply other threads:[~2017-03-06 11:34 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-06 11:34 [PATCH v3 00/19] vITS save/restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-06 11:34 ` [PATCH v3 01/19] KVM: arm/arm64: Add vITS save/restore API documentation Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-13 13:08 ` Peter Maydell 2017-03-13 13:08 ` Peter Maydell 2017-03-13 14:42 ` Auger Eric 2017-03-13 14:42 ` Auger Eric 2017-03-13 17:38 ` Peter Maydell 2017-03-13 17:38 ` Peter Maydell 2017-03-16 15:25 ` Auger Eric 2017-03-16 15:25 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 02/19] KVM: arm/arm64: rename itte into ite Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-06 11:34 ` [PATCH v3 03/19] arm/arm64: vgic: turn vgic_find_mmio_region into public Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 14:38 ` Andre Przywara 2017-03-17 14:38 ` Andre Przywara 2017-03-21 17:38 ` Auger Eric 2017-03-21 17:38 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 04/19] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_REGS group Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:12 ` Andre Przywara 2017-03-20 18:12 ` Andre Przywara 2017-03-06 11:34 ` [PATCH v3 05/19] KVM: arm64: ITS: Implement vgic_its_has_attr_regs and attr_regs_access Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:13 ` Andre Przywara 2017-03-20 18:13 ` Andre Przywara 2017-03-22 14:15 ` Auger Eric 2017-03-22 14:15 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 06/19] KVM: arm64: ITS: Implement vgic_mmio_uaccess_write_its_creadr Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:14 ` Andre Przywara 2017-03-20 18:14 ` Andre Przywara 2017-03-24 10:38 ` Auger Eric 2017-03-24 10:38 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 07/19] KVM: arm64: ITS: Report the ITE size in GITS_TYPER Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 14:39 ` Andre Przywara 2017-03-17 14:39 ` Andre Przywara 2017-03-21 17:38 ` Auger Eric 2017-03-21 17:38 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 08/19] KVM: arm64: ITS: Interpret MAPD Size field and check related errors Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 15:03 ` Andre Przywara 2017-03-17 15:03 ` Andre Przywara 2017-03-21 17:40 ` Auger Eric 2017-03-21 17:40 ` Auger Eric 2017-03-21 17:57 ` Andre Przywara 2017-03-21 17:57 ` Andre Przywara 2017-03-06 11:34 ` [PATCH v3 09/19] KVM: arm64: ITS: Interpret MAPD ITT_addr field Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 15:19 ` Andre Przywara 2017-03-17 15:19 ` Andre Przywara 2017-03-21 17:41 ` Auger Eric 2017-03-21 17:41 ` Auger Eric 2017-03-06 11:34 ` Eric Auger [this message] 2017-03-06 11:34 ` [PATCH v3 10/19] KVM: arm64: ITS: Check the device id matches TYPER DEVBITS range Eric Auger 2017-03-17 15:41 ` Andre Przywara 2017-03-17 15:41 ` Andre Przywara 2017-03-21 17:42 ` Auger Eric 2017-03-21 17:42 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 11/19] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_TABLES group Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:14 ` Andre Przywara 2017-03-20 18:14 ` Andre Przywara 2017-03-22 14:29 ` Auger Eric 2017-03-22 14:29 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 12/19] KVM: arm64: ITS: vgic_its_alloc_ite/device Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 17:01 ` Andre Przywara 2017-03-17 17:01 ` Andre Przywara 2017-03-21 17:42 ` Auger Eric 2017-03-21 17:42 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 13/19] KVM: arm64: ITS: Sort the device and ITE lists Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:14 ` Andre Przywara 2017-03-20 18:14 ` Andre Przywara 2017-03-06 11:34 ` [PATCH v3 14/19] KVM: arm64: ITS: Add infrastructure for table lookup Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:12 ` Andre Przywara 2017-03-21 18:12 ` Andre Przywara 2017-03-22 14:40 ` Auger Eric 2017-03-22 14:40 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 15/19] KVM: arm64: ITS: Collection table save/restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:13 ` Andre Przywara 2017-03-21 18:13 ` Andre Przywara 2017-03-22 14:12 ` Auger Eric 2017-03-22 14:12 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 16/19] KVM: arm64: ITS: vgic_its_check_id returns the entry's GPA Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:12 ` Andre Przywara 2017-03-21 18:12 ` Andre Przywara 2017-03-22 14:11 ` Auger Eric 2017-03-22 14:11 ` Auger Eric 2017-03-22 14:22 ` Auger Eric 2017-03-22 14:22 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 17/19] KVM: arm64: ITS: ITT flush and restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:13 ` Andre Przywara 2017-03-21 18:13 ` Andre Przywara 2017-03-22 14:17 ` Auger Eric 2017-03-22 14:17 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 18/19] KVM: arm64: ITS: Device table save/restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-22 14:39 ` Andre Przywara 2017-03-22 14:39 ` Andre Przywara 2017-03-24 10:38 ` Auger Eric 2017-03-24 10:38 ` Auger Eric 2017-03-24 10:45 ` Auger Eric 2017-03-24 10:45 ` Auger Eric 2017-03-24 11:12 ` Andre Przywara 2017-03-24 11:12 ` Andre Przywara 2017-03-24 11:27 ` Auger Eric 2017-03-24 11:27 ` Auger Eric 2017-03-24 11:14 ` Andre Przywara 2017-03-24 11:14 ` Andre Przywara 2017-03-24 11:28 ` Auger Eric 2017-03-24 11:28 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 19/19] KVM: arm64: ITS: Pending " Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:21 ` Andre Przywara 2017-03-20 18:21 ` Andre Przywara 2017-03-22 15:12 ` Auger Eric 2017-03-22 15:12 ` Auger Eric 2017-03-22 16:22 ` André Przywara 2017-03-22 16:22 ` André Przywara 2017-03-22 14:39 ` Andre Przywara 2017-03-22 14:39 ` Andre Przywara 2017-03-24 11:20 ` Auger Eric 2017-03-24 11:20 ` Auger Eric
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1488800074-21991-11-git-send-email-eric.auger@redhat.com \ --to=eric.auger@redhat.com \ --cc=Prasun.Kapoor@cavium.com \ --cc=Vijaya.Kumar@cavium.com \ --cc=andre.przywara@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=dgilbert@redhat.com \ --cc=drjones@redhat.com \ --cc=eric.auger.pro@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=quintela@redhat.com \ --cc=vijayak@caviumnetworks.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.