From: Ricardo Koller <ricarkol@google.com> To: kvm@vger.kernel.org, maz@kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com, eric.auger@redhat.com, alexandru.elisei@arm.com Cc: Paolo Bonzini <pbonzini@redhat.com>, oupton@google.com, james.morse@arm.com, suzuki.poulose@arm.com, shuah@kernel.org, jingzhangos@google.com, pshier@google.com, rananta@google.com, reijiw@google.com, Ricardo Koller <ricarkol@google.com> Subject: [PATCH v3 01/10] kvm: arm64: vgic: Introduce vgic_check_iorange Date: Tue, 28 Sep 2021 11:47:55 -0700 [thread overview] Message-ID: <20210928184803.2496885-2-ricarkol@google.com> (raw) In-Reply-To: <20210928184803.2496885-1-ricarkol@google.com> Add the new vgic_check_iorange helper that checks that an iorange is sane: the start address and size have valid alignments, the range is within the addressable PA range, start+size doesn't overflow, and the start wasn't already defined. No functional change. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- arch/arm64/kvm/vgic/vgic-kvm-device.c | 22 ++++++++++++++++++++++ arch/arm64/kvm/vgic/vgic.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c index 7740995de982..f714aded67b2 100644 --- a/arch/arm64/kvm/vgic/vgic-kvm-device.c +++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c @@ -29,6 +29,28 @@ int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr, return 0; } +int vgic_check_iorange(struct kvm *kvm, phys_addr_t *ioaddr, + phys_addr_t addr, phys_addr_t alignment, + phys_addr_t size) +{ + int ret; + + ret = vgic_check_ioaddr(kvm, ioaddr, addr, alignment); + if (ret) + return ret; + + if (!IS_ALIGNED(size, alignment)) + return -EINVAL; + + if (addr + size < addr) + return -EINVAL; + + if (addr + size > kvm_phys_size(kvm)) + return -E2BIG; + + return 0; +} + static int vgic_check_type(struct kvm *kvm, int type_needed) { if (kvm->arch.vgic.vgic_model != type_needed) diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index 14a9218641f5..c4df4dcef31f 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -175,6 +175,10 @@ void vgic_irq_handle_resampling(struct vgic_irq *irq, int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr, phys_addr_t addr, phys_addr_t alignment); +int vgic_check_iorange(struct kvm *kvm, phys_addr_t *ioaddr, + phys_addr_t addr, phys_addr_t alignment, + phys_addr_t size); + void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu); void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr); void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr); -- 2.33.0.685.g46640cef36-goog
WARNING: multiple messages have this Message-ID (diff)
From: Ricardo Koller <ricarkol@google.com> To: kvm@vger.kernel.org, maz@kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com, eric.auger@redhat.com, alexandru.elisei@arm.com Cc: pshier@google.com, Paolo Bonzini <pbonzini@redhat.com>, shuah@kernel.org Subject: [PATCH v3 01/10] kvm: arm64: vgic: Introduce vgic_check_iorange Date: Tue, 28 Sep 2021 11:47:55 -0700 [thread overview] Message-ID: <20210928184803.2496885-2-ricarkol@google.com> (raw) In-Reply-To: <20210928184803.2496885-1-ricarkol@google.com> Add the new vgic_check_iorange helper that checks that an iorange is sane: the start address and size have valid alignments, the range is within the addressable PA range, start+size doesn't overflow, and the start wasn't already defined. No functional change. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- arch/arm64/kvm/vgic/vgic-kvm-device.c | 22 ++++++++++++++++++++++ arch/arm64/kvm/vgic/vgic.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c index 7740995de982..f714aded67b2 100644 --- a/arch/arm64/kvm/vgic/vgic-kvm-device.c +++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c @@ -29,6 +29,28 @@ int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr, return 0; } +int vgic_check_iorange(struct kvm *kvm, phys_addr_t *ioaddr, + phys_addr_t addr, phys_addr_t alignment, + phys_addr_t size) +{ + int ret; + + ret = vgic_check_ioaddr(kvm, ioaddr, addr, alignment); + if (ret) + return ret; + + if (!IS_ALIGNED(size, alignment)) + return -EINVAL; + + if (addr + size < addr) + return -EINVAL; + + if (addr + size > kvm_phys_size(kvm)) + return -E2BIG; + + return 0; +} + static int vgic_check_type(struct kvm *kvm, int type_needed) { if (kvm->arch.vgic.vgic_model != type_needed) diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index 14a9218641f5..c4df4dcef31f 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -175,6 +175,10 @@ void vgic_irq_handle_resampling(struct vgic_irq *irq, int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr, phys_addr_t addr, phys_addr_t alignment); +int vgic_check_iorange(struct kvm *kvm, phys_addr_t *ioaddr, + phys_addr_t addr, phys_addr_t alignment, + phys_addr_t size); + void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu); void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr); void vgic_v2_clear_lr(struct kvm_vcpu *vcpu, int lr); -- 2.33.0.685.g46640cef36-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-09-28 18:48 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-28 18:47 [PATCH v3 00/10] KVM: arm64: vgic: Missing checks for REDIST/CPU and ITS regions above the VM IPA size Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller [this message] 2021-09-28 18:47 ` [PATCH v3 01/10] kvm: arm64: vgic: Introduce vgic_check_iorange Ricardo Koller 2021-09-29 16:29 ` Eric Auger 2021-09-29 16:29 ` Eric Auger 2021-09-29 21:17 ` Ricardo Koller 2021-09-29 21:17 ` Ricardo Koller 2021-09-30 7:02 ` Eric Auger 2021-09-30 7:02 ` Eric Auger 2021-09-30 21:19 ` Ricardo Koller 2021-09-30 21:19 ` Ricardo Koller 2021-10-01 13:12 ` Marc Zyngier 2021-10-01 13:12 ` Marc Zyngier 2021-10-04 15:48 ` Ricardo Koller 2021-10-04 15:48 ` Ricardo Koller 2021-09-28 18:47 ` [PATCH v3 02/10] KVM: arm64: vgic-v3: Check redist region is not above the VM IPA size Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:23 ` Eric Auger 2021-09-29 16:23 ` Eric Auger 2021-09-29 21:10 ` Ricardo Koller 2021-09-29 21:10 ` Ricardo Koller 2021-09-30 7:05 ` Eric Auger 2021-09-30 7:05 ` Eric Auger 2021-10-01 13:14 ` Marc Zyngier 2021-10-01 13:14 ` Marc Zyngier 2021-10-04 15:51 ` Ricardo Koller 2021-10-04 15:51 ` Ricardo Koller 2021-09-28 18:47 ` [PATCH v3 03/10] KVM: arm64: vgic-v2: Check cpu interface " Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:30 ` Eric Auger 2021-09-29 16:30 ` Eric Auger 2021-09-28 18:47 ` [PATCH v3 04/10] KVM: arm64: vgic-v3: Check ITS " Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:24 ` Eric Auger 2021-09-29 16:24 ` Eric Auger 2021-09-28 18:47 ` [PATCH v3 05/10] KVM: arm64: selftests: Make vgic_init gic version agnostic Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 17:12 ` Eric Auger 2021-09-29 17:12 ` Eric Auger 2021-09-29 21:13 ` Ricardo Koller 2021-09-29 21:13 ` Ricardo Koller 2021-09-30 8:05 ` Marc Zyngier 2021-09-30 8:05 ` Marc Zyngier 2021-09-30 21:27 ` Ricardo Koller 2021-09-30 21:27 ` Ricardo Koller 2021-09-28 18:48 ` [PATCH v3 06/10] KVM: arm64: selftests: Make vgic_init/vm_gic_create " Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 7:17 ` Eric Auger 2021-09-30 7:17 ` Eric Auger 2021-09-28 18:48 ` [PATCH v3 07/10] KVM: arm64: selftests: Add some tests for GICv2 in vgic_init Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 7:42 ` Eric Auger 2021-09-30 7:42 ` Eric Auger 2021-09-30 21:14 ` Ricardo Koller 2021-09-30 21:14 ` Ricardo Koller 2021-09-28 18:48 ` [PATCH v3 08/10] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 8:51 ` Eric Auger 2021-09-30 8:51 ` Eric Auger 2021-09-30 20:49 ` Ricardo Koller 2021-09-30 20:49 ` Ricardo Koller 2021-09-28 18:48 ` [PATCH v3 09/10] KVM: arm64: selftests: Add test for legacy GICv3 REDIST base " Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 9:00 ` Eric Auger 2021-09-30 9:00 ` Eric Auger 2021-09-29 0:10 ` [PATCH v3 10/10] KVM: arm64: selftests: Add basic ITS device tests Ricardo Koller 2021-09-29 0:10 ` Ricardo Koller 2021-09-30 9:14 ` Eric Auger 2021-09-30 9:14 ` Eric Auger 2021-09-30 20:10 ` Ricardo Koller 2021-09-30 20:10 ` Ricardo Koller 2021-10-05 8:04 ` Eric Auger 2021-10-05 8:04 ` Eric Auger 2021-10-05 1:03 ` Ricardo Koller 2021-10-05 1:03 ` Ricardo Koller
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=20210928184803.2496885-2-ricarkol@google.com \ --to=ricarkol@google.com \ --cc=alexandru.elisei@arm.com \ --cc=drjones@redhat.com \ --cc=eric.auger@redhat.com \ --cc=james.morse@arm.com \ --cc=jingzhangos@google.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=oupton@google.com \ --cc=pbonzini@redhat.com \ --cc=pshier@google.com \ --cc=rananta@google.com \ --cc=reijiw@google.com \ --cc=shuah@kernel.org \ --cc=suzuki.poulose@arm.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.