| Message ID | 20211201170411.1561936-8-qperret@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: Introduce kvm_share_hyp() | expand |
On Wed, Dec 01, 2021 at 05:04:01PM +0000, Quentin Perret wrote: > The create_hyp_mappings() function can currently be called at any point > in time. However, its behaviour in protected mode changes widely > depending on when it is being called. Prior to KVM init, it is used to > create the temporary page-table used to bring-up the hypervisor, and > later on it is transparently turned into a 'share' hypercall when the > kernel has lost control over the hypervisor stage-1. In order to prepare > the ground for also unsharing pages with the hypervisor during guest > teardown, introduce a kvm_share_hyp() function to make it clear in which > places a share hypercall should be expected, as we will soon need a > matching unshare hypercall in all those places. > > Signed-off-by: Quentin Perret <qperret@google.com> > --- > arch/arm64/include/asm/kvm_mmu.h | 1 + > arch/arm64/kvm/arm.c | 4 ++-- > arch/arm64/kvm/fpsimd.c | 2 +- > arch/arm64/kvm/mmu.c | 27 +++++++++++++++++++++------ > arch/arm64/kvm/reset.c | 2 +- > 5 files changed, 26 insertions(+), 10 deletions(-) [...] > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index f8f1096a297f..fd868fb9d922 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -299,6 +299,25 @@ static int pkvm_share_hyp(phys_addr_t start, phys_addr_t end) > return 0; > } > > +int kvm_share_hyp(void *from, void *to) > +{ > + if (is_kernel_in_hyp_mode()) > + return 0; > + > + /* > + * The share hcall maps things in the 'fixed-offset' region of the hyp > + * VA space, so we can only share physically contiguous data-structures > + * for now. > + */ > + if (is_vmalloc_addr(from) || is_vmalloc_addr(to)) > + return -EINVAL; If we're adding these sanity checks, perhaps is_vmalloc_or_module_addr() would be worth using instead? Will
On Thursday 09 Dec 2021 at 11:13:10 (+0000), Will Deacon wrote: > On Wed, Dec 01, 2021 at 05:04:01PM +0000, Quentin Perret wrote: > > The create_hyp_mappings() function can currently be called at any point > > in time. However, its behaviour in protected mode changes widely > > depending on when it is being called. Prior to KVM init, it is used to > > create the temporary page-table used to bring-up the hypervisor, and > > later on it is transparently turned into a 'share' hypercall when the > > kernel has lost control over the hypervisor stage-1. In order to prepare > > the ground for also unsharing pages with the hypervisor during guest > > teardown, introduce a kvm_share_hyp() function to make it clear in which > > places a share hypercall should be expected, as we will soon need a > > matching unshare hypercall in all those places. > > > > Signed-off-by: Quentin Perret <qperret@google.com> > > --- > > arch/arm64/include/asm/kvm_mmu.h | 1 + > > arch/arm64/kvm/arm.c | 4 ++-- > > arch/arm64/kvm/fpsimd.c | 2 +- > > arch/arm64/kvm/mmu.c | 27 +++++++++++++++++++++------ > > arch/arm64/kvm/reset.c | 2 +- > > 5 files changed, 26 insertions(+), 10 deletions(-) > > [...] > > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > > index f8f1096a297f..fd868fb9d922 100644 > > --- a/arch/arm64/kvm/mmu.c > > +++ b/arch/arm64/kvm/mmu.c > > @@ -299,6 +299,25 @@ static int pkvm_share_hyp(phys_addr_t start, phys_addr_t end) > > return 0; > > } > > > > +int kvm_share_hyp(void *from, void *to) > > +{ > > + if (is_kernel_in_hyp_mode()) > > + return 0; > > + > > + /* > > + * The share hcall maps things in the 'fixed-offset' region of the hyp > > + * VA space, so we can only share physically contiguous data-structures > > + * for now. > > + */ > > + if (is_vmalloc_addr(from) || is_vmalloc_addr(to)) > > + return -EINVAL; > > If we're adding these sanity checks, perhaps is_vmalloc_or_module_addr() > would be worth using instead? Ack, I'll fix that up.
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 02d378887743..185d0f62b724 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -150,6 +150,7 @@ static __always_inline unsigned long __kern_hyp_va(unsigned long v) #include <asm/kvm_pgtable.h> #include <asm/stage2_pgtable.h> +int kvm_share_hyp(void *from, void *to); int create_hyp_mappings(void *from, void *to, enum kvm_pgtable_prot prot); int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size, void __iomem **kaddr, diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 9b745d2bc89a..c202abb448b1 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -146,7 +146,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) if (ret) return ret; - ret = create_hyp_mappings(kvm, kvm + 1, PAGE_HYP); + ret = kvm_share_hyp(kvm, kvm + 1); if (ret) goto out_free_stage2_pgd; @@ -342,7 +342,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) if (err) return err; - return create_hyp_mappings(vcpu, vcpu + 1, PAGE_HYP); + return kvm_share_hyp(vcpu, vcpu + 1); } void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c index 5526d79c7b47..86899d3aa9a9 100644 --- a/arch/arm64/kvm/fpsimd.c +++ b/arch/arm64/kvm/fpsimd.c @@ -30,7 +30,7 @@ int kvm_arch_vcpu_run_map_fp(struct kvm_vcpu *vcpu) struct user_fpsimd_state *fpsimd = ¤t->thread.uw.fpsimd_state; /* Make sure the host task fpsimd state is visible to hyp: */ - ret = create_hyp_mappings(fpsimd, fpsimd + 1, PAGE_HYP); + ret = kvm_share_hyp(fpsimd, fpsimd + 1); if (!ret) vcpu->arch.host_fpsimd_state = kern_hyp_va(fpsimd); diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index f8f1096a297f..fd868fb9d922 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -299,6 +299,25 @@ static int pkvm_share_hyp(phys_addr_t start, phys_addr_t end) return 0; } +int kvm_share_hyp(void *from, void *to) +{ + if (is_kernel_in_hyp_mode()) + return 0; + + /* + * The share hcall maps things in the 'fixed-offset' region of the hyp + * VA space, so we can only share physically contiguous data-structures + * for now. + */ + if (is_vmalloc_addr(from) || is_vmalloc_addr(to)) + return -EINVAL; + + if (kvm_host_owns_hyp_mappings()) + return create_hyp_mappings(from, to, PAGE_HYP); + + return pkvm_share_hyp(__pa(from), __pa(to)); +} + /** * create_hyp_mappings - duplicate a kernel virtual address range in Hyp mode * @from: The virtual kernel start address of the range @@ -319,12 +338,8 @@ int create_hyp_mappings(void *from, void *to, enum kvm_pgtable_prot prot) if (is_kernel_in_hyp_mode()) return 0; - if (!kvm_host_owns_hyp_mappings()) { - if (WARN_ON(prot != PAGE_HYP)) - return -EPERM; - return pkvm_share_hyp(kvm_kaddr_to_phys(from), - kvm_kaddr_to_phys(to)); - } + if (!kvm_host_owns_hyp_mappings()) + return -EPERM; start = start & PAGE_MASK; end = PAGE_ALIGN(end); diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index c7a0249df840..e3e2a79fbd75 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -113,7 +113,7 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu) if (!buf) return -ENOMEM; - ret = create_hyp_mappings(buf, buf + reg_sz, PAGE_HYP); + ret = kvm_share_hyp(buf, buf + reg_sz); if (ret) { kfree(buf); return ret;
The create_hyp_mappings() function can currently be called at any point in time. However, its behaviour in protected mode changes widely depending on when it is being called. Prior to KVM init, it is used to create the temporary page-table used to bring-up the hypervisor, and later on it is transparently turned into a 'share' hypercall when the kernel has lost control over the hypervisor stage-1. In order to prepare the ground for also unsharing pages with the hypervisor during guest teardown, introduce a kvm_share_hyp() function to make it clear in which places a share hypercall should be expected, as we will soon need a matching unshare hypercall in all those places. Signed-off-by: Quentin Perret <qperret@google.com> --- arch/arm64/include/asm/kvm_mmu.h | 1 + arch/arm64/kvm/arm.c | 4 ++-- arch/arm64/kvm/fpsimd.c | 2 +- arch/arm64/kvm/mmu.c | 27 +++++++++++++++++++++------ arch/arm64/kvm/reset.c | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-)