[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <186ade3c372b44ef8ca1830da8c5002b@huawei.com>
Date: Mon, 16 Nov 2020 09:29:31 +0000
From: Jiangyifei <jiangyifei@...wei.com>
To: Anup Patel <anup.patel@....com>,
Palmer Dabbelt <palmer@...belt.com>,
Palmer Dabbelt <palmerdabbelt@...gle.com>,
Paul Walmsley <paul.walmsley@...ive.com>,
Albert Ou <aou@...s.berkeley.edu>,
Paolo Bonzini <pbonzini@...hat.com>
CC: Alexander Graf <graf@...zon.com>,
Atish Patra <atish.patra@....com>,
Alistair Francis <Alistair.Francis@....com>,
Damien Le Moal <damien.lemoal@....com>,
Anup Patel <anup@...infault.org>,
"kvm@...r.kernel.org" <kvm@...r.kernel.org>,
"kvm-riscv@...ts.infradead.org" <kvm-riscv@...ts.infradead.org>,
"linux-riscv@...ts.infradead.org" <linux-riscv@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"Zhangxiaofeng (F)" <victor.zhangxiaofeng@...wei.com>,
"Wubin (H)" <wu.wubin@...wei.com>,
"dengkai (A)" <dengkai1@...wei.com>,
yinyipeng <yinyipeng1@...wei.com>
Subject: RE: [PATCH v15 10/17] RISC-V: KVM: Implement stage2 page table
programming
> -----Original Message-----
> From: Anup Patel [mailto:anup.patel@....com]
> Sent: Monday, November 9, 2020 7:33 PM
> To: Palmer Dabbelt <palmer@...belt.com>; Palmer Dabbelt
> <palmerdabbelt@...gle.com>; Paul Walmsley <paul.walmsley@...ive.com>;
> Albert Ou <aou@...s.berkeley.edu>; Paolo Bonzini <pbonzini@...hat.com>
> Cc: Alexander Graf <graf@...zon.com>; Atish Patra <atish.patra@....com>;
> Alistair Francis <Alistair.Francis@....com>; Damien Le Moal
> <damien.lemoal@....com>; Anup Patel <anup@...infault.org>;
> kvm@...r.kernel.org; kvm-riscv@...ts.infradead.org;
> linux-riscv@...ts.infradead.org; linux-kernel@...r.kernel.org; Anup Patel
> <anup.patel@....com>; Jiangyifei <jiangyifei@...wei.com>
> Subject: [PATCH v15 10/17] RISC-V: KVM: Implement stage2 page table
> programming
>
> This patch implements all required functions for programming the stage2 page
> table for each Guest/VM.
>
> At high-level, the flow of stage2 related functions is similar from KVM
> ARM/ARM64 implementation but the stage2 page table format is quite
> different for KVM RISC-V.
>
> [jiangyifei: stage2 dirty log support]
> Signed-off-by: Yifei Jiang <jiangyifei@...wei.com>
> Signed-off-by: Anup Patel <anup.patel@....com>
> Acked-by: Paolo Bonzini <pbonzini@...hat.com>
> Reviewed-by: Paolo Bonzini <pbonzini@...hat.com>
> ---
> arch/riscv/include/asm/kvm_host.h | 12 +
> arch/riscv/include/asm/pgtable-bits.h | 1 +
> arch/riscv/kvm/Kconfig | 1 +
> arch/riscv/kvm/main.c | 19 +
> arch/riscv/kvm/mmu.c | 649
> +++++++++++++++++++++++++-
> arch/riscv/kvm/vm.c | 6 -
> 6 files changed, 672 insertions(+), 16 deletions(-)
>
......
>
> int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, @@ -69,27 +562,163 @@
> int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu,
> gpa_t gpa, unsigned long hva,
> bool writeable, bool is_write)
> {
> - /* TODO: */
> - return 0;
> + int ret;
> + kvm_pfn_t hfn;
> + short vma_pageshift;
> + gfn_t gfn = gpa >> PAGE_SHIFT;
> + struct vm_area_struct *vma;
> + struct kvm *kvm = vcpu->kvm;
> + struct kvm_mmu_page_cache *pcache = &vcpu->arch.mmu_page_cache;
> + bool logging = (memslot->dirty_bitmap &&
> + !(memslot->flags & KVM_MEM_READONLY)) ? true : false;
> + unsigned long vma_pagesize;
> +
> + mmap_read_lock(current->mm);
> +
> + vma = find_vma_intersection(current->mm, hva, hva + 1);
> + if (unlikely(!vma)) {
> + kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
> + mmap_read_unlock(current->mm);
> + return -EFAULT;
> + }
> +
> + if (is_vm_hugetlb_page(vma))
> + vma_pageshift = huge_page_shift(hstate_vma(vma));
> + else
> + vma_pageshift = PAGE_SHIFT;
> + vma_pagesize = 1ULL << vma_pageshift;
> + if (logging || (vma->vm_flags & VM_PFNMAP))
> + vma_pagesize = PAGE_SIZE;
> +
> + if (vma_pagesize == PMD_SIZE || vma_pagesize == PGDIR_SIZE)
> + gfn = (gpa & huge_page_mask(hstate_vma(vma))) >> PAGE_SHIFT;
> +
> + mmap_read_unlock(current->mm);
> +
> + if (vma_pagesize != PGDIR_SIZE &&
> + vma_pagesize != PMD_SIZE &&
> + vma_pagesize != PAGE_SIZE) {
> + kvm_err("Invalid VMA page size 0x%lx\n", vma_pagesize);
> + return -EFAULT;
> + }
> +
> + /* We need minimum second+third level pages */
> + ret = stage2_cache_topup(pcache, stage2_pgd_levels,
> + KVM_MMU_PAGE_CACHE_NR_OBJS);
> + if (ret) {
> + kvm_err("Failed to topup stage2 cache\n");
> + return ret;
> + }
> +
> + hfn = gfn_to_pfn_prot(kvm, gfn, is_write, NULL);
> + if (hfn == KVM_PFN_ERR_HWPOISON) {
> + send_sig_mceerr(BUS_MCEERR_AR, (void __user *)hva,
> + vma_pageshift, current);
> + return 0;
> + }
> + if (is_error_noslot_pfn(hfn))
> + return -EFAULT;
> +
> + /*
> + * If logging is active then we allow writable pages only
> + * for write faults.
> + */
> + if (logging && !is_write)
> + writeable = false;
> +
> + spin_lock(&kvm->mmu_lock);
> +
> + if (writeable) {
Hi Anup,
What is the purpose of "writable = !memslot_is_readonly(slot)" in this series?
When mapping the HVA to HPA above, it doesn't know that the PTE writeable of stage2 is "!memslot_is_readonly(slot)".
This may causes the difference between the writability of HVA->HPA and GPA->HPA.
For example, GPA->HPA is writeable, but HVA->HPA is not writeable.
Is it better that the writability of HVA->HPA is also determined by whether the memslot is readonly in this change?
Like this:
- hfn = gfn_to_pfn_prot(kvm, gfn, is_write, NULL);
+ hfn = gfn_to_pfn_prot(kvm, gfn, writeable, NULL);
Regards,
Yifei
> + kvm_set_pfn_dirty(hfn);
> + mark_page_dirty(kvm, gfn);
> + ret = stage2_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT,
> + vma_pagesize, false, true);
> + } else {
> + ret = stage2_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT,
> + vma_pagesize, true, true);
> + }
> +
> + if (ret)
> + kvm_err("Failed to map in stage2\n");
> +
> + spin_unlock(&kvm->mmu_lock);
> + kvm_set_pfn_accessed(hfn);
> + kvm_release_pfn_clean(hfn);
> + return ret;
> }
>
......
Powered by blists - more mailing lists