From: Gavin Shan <gshan@redhat.com>
To: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org, maz@kernel.org, will@kernel.org,
alexandru.elisei@arm.com, shan.gavin@gmail.com
Subject: [PATCH 3/4] KVM: arm64: Fix address check for memory slot
Date: Mon, 15 Mar 2021 12:18:43 +0800 [thread overview]
Message-ID: <20210315041844.64915-4-gshan@redhat.com> (raw)
In-Reply-To: <20210315041844.64915-1-gshan@redhat.com>
The last (IPA) page can't be specified when a new memory slot is
added. The error -EFAULT is returned when the memory slot is added
with the following parameters for the VM, which has 40-bits IPA
limit. The host has 4KB base page size. It's not correct because
the last (IPA) page is still usable.
struct kvm_userspace_memory_region {
__u32 slot; /* 1 */
__u32 flags; /* 0 */
__u64 guest_phys_addr; /* 0xfffffff000 */
__u64 memory_size; /* 0x1000 */
__u64 userspace_addr;
};
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
arch/arm64/kvm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 286b603ed0d3..a5a8ade9fde4 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1313,7 +1313,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
* Prevent userspace from creating a memory region outside of the IPA
* space addressable by the KVM guest IPA space.
*/
- if (memslot->base_gfn + memslot->npages >=
+ if (memslot->base_gfn + memslot->npages >
(kvm_phys_size(kvm) >> PAGE_SHIFT))
return -EFAULT;
--
2.23.0
next prev parent reply other threads:[~2021-03-15 4:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 4:18 [PATCH 0/4] KVM: arm64: Minor page fault handler improvement Gavin Shan
2021-03-15 4:18 ` [PATCH 1/4] KVM: arm64: Hide kvm_mmu_wp_memory_region() Gavin Shan
2021-03-15 7:49 ` Keqian Zhu
2021-03-15 4:18 ` [PATCH 2/4] KVM: arm64: Use find_vma_intersection() Gavin Shan
2021-03-15 8:04 ` Keqian Zhu
2021-03-15 9:42 ` Gavin Shan
2021-03-16 3:52 ` Gavin Shan
2021-03-16 4:20 ` Keqian Zhu
2021-03-15 8:52 ` Marc Zyngier
2021-03-15 9:40 ` Gavin Shan
2021-03-15 4:18 ` Gavin Shan [this message]
2021-03-15 7:33 ` [PATCH 3/4] KVM: arm64: Fix address check for memory slot Keqian Zhu
2021-03-15 9:46 ` Gavin Shan
2021-03-15 4:18 ` [PATCH 4/4] KVM: arm64: Don't retrieve memory slot again in page fault handler Gavin Shan
2021-03-15 8:25 ` Keqian Zhu
2021-03-15 9:56 ` Gavin Shan
2021-03-15 10:46 ` Keqian Zhu
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=20210315041844.64915-4-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®