From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 472DE2F533D for ; Wed, 18 Jun 2025 07:36:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750232185; cv=none; b=ARMqgg/pZ2MDrEOXtTF6LM7/QPNoKs+F7kGUyl7UjKZhAB9ZxHEdyDB1eRUDkyUyKYpuEHwe08CmlC8ejAJnypXjoElbd4hNhRbwSh0vLd9W9ASm4jj6f2uzT0W52DPLnALbNtvp69yxxfIE3tcwf6WLFZBJLJsgqQe3gLsmXIU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750232185; c=relaxed/simple; bh=fFFF4dxwGMNmW8OffYmfQMv312sXB2ojGR5vgt3qPPI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iiB9pFSOHzr6LVxe+HIOFcqNvUqTXEBZuaWhExoDguUaUzHedvrux6jqazLpiiL5zmyRzRbIkBu8wTKEmi2/VM0hjjnYPfR1Qgh3/GKigL8IR/BpzOJaEvm0bQwx/SSlRMnFlD6xqLDGDRqnry4rSqQPVIhv0fAIUGmXadBciOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Qre4+a4d; arc=none smtp.client-ip=91.218.175.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Qre4+a4d" Message-ID: <77225fc9-845f-446a-9014-060b5cc73ba2@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1750232179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zdvl+pAO+bUqhZRChbu03wIqYl7v9j98HDmfPpTf/2g=; b=Qre4+a4dbN6G6Iy3F6FbPzM/ia5gqX926MBxqQQCHJ6admzrUdUlTwZG0CBjOUuRy+T9oH CVhP/OE1QFVMOTlZ7Ny6cXYYFAdsFcdvAL/9l0756dMgbj0Jyujm4NpLjKpuMZvYzFy8vT EksZYi/NnYfwr7XxdlD0VWYuiUT4VNw= Date: Wed, 18 Jun 2025 00:36:11 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH v2 09/12] RISC-V: KVM: Introduce struct kvm_gstage_mapping To: Anup Patel Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org References: <20250613065743.737102-1-apatel@ventanamicro.com> <20250613065743.737102-10-apatel@ventanamicro.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Atish Patra In-Reply-To: <20250613065743.737102-10-apatel@ventanamicro.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 6/12/25 11:57 PM, Anup Patel wrote: > Introduce struct kvm_gstage_mapping which represents a g-stage > mapping at a particular g-stage page table level. Also, update > the kvm_riscv_gstage_map() to return the g-stage mapping upon > success. > > Signed-off-by: Anup Patel > --- > arch/riscv/include/asm/kvm_mmu.h | 9 ++++- > arch/riscv/kvm/mmu.c | 58 ++++++++++++++++++-------------- > arch/riscv/kvm/vcpu_exit.c | 3 +- > 3 files changed, 43 insertions(+), 27 deletions(-) > > diff --git a/arch/riscv/include/asm/kvm_mmu.h b/arch/riscv/include/asm/kvm_mmu.h > index 4e1654282ee4..91c11e692dc7 100644 > --- a/arch/riscv/include/asm/kvm_mmu.h > +++ b/arch/riscv/include/asm/kvm_mmu.h > @@ -8,6 +8,12 @@ > > #include > > +struct kvm_gstage_mapping { > + gpa_t addr; > + pte_t pte; > + u32 level; > +}; > + > int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa, > phys_addr_t hpa, unsigned long size, > bool writable, bool in_atomic); > @@ -15,7 +21,8 @@ void kvm_riscv_gstage_iounmap(struct kvm *kvm, gpa_t gpa, > unsigned long size); > int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, > struct kvm_memory_slot *memslot, > - gpa_t gpa, unsigned long hva, bool is_write); > + gpa_t gpa, unsigned long hva, bool is_write, > + struct kvm_gstage_mapping *out_map); > int kvm_riscv_gstage_alloc_pgd(struct kvm *kvm); > void kvm_riscv_gstage_free_pgd(struct kvm *kvm); > void kvm_riscv_gstage_update_hgatp(struct kvm_vcpu *vcpu); > diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c > index c1a3eb076df3..806614b3e46d 100644 > --- a/arch/riscv/kvm/mmu.c > +++ b/arch/riscv/kvm/mmu.c > @@ -135,18 +135,18 @@ static void gstage_remote_tlb_flush(struct kvm *kvm, u32 level, gpa_t addr) > kvm_riscv_hfence_gvma_vmid_gpa(kvm, -1UL, 0, addr, BIT(order), order); > } > > -static int gstage_set_pte(struct kvm *kvm, u32 level, > - struct kvm_mmu_memory_cache *pcache, > - gpa_t addr, const pte_t *new_pte) > +static int gstage_set_pte(struct kvm *kvm, > + struct kvm_mmu_memory_cache *pcache, > + const struct kvm_gstage_mapping *map) > { > u32 current_level = gstage_pgd_levels - 1; > pte_t *next_ptep = (pte_t *)kvm->arch.pgd; > - pte_t *ptep = &next_ptep[gstage_pte_index(addr, current_level)]; > + pte_t *ptep = &next_ptep[gstage_pte_index(map->addr, current_level)]; > > - if (current_level < level) > + if (current_level < map->level) > return -EINVAL; > > - while (current_level != level) { > + while (current_level != map->level) { > if (gstage_pte_leaf(ptep)) > return -EEXIST; > > @@ -165,13 +165,13 @@ static int gstage_set_pte(struct kvm *kvm, u32 level, > } > > current_level--; > - ptep = &next_ptep[gstage_pte_index(addr, current_level)]; > + ptep = &next_ptep[gstage_pte_index(map->addr, current_level)]; > } > > - if (pte_val(*ptep) != pte_val(*new_pte)) { > - set_pte(ptep, *new_pte); > + if (pte_val(*ptep) != pte_val(map->pte)) { > + set_pte(ptep, map->pte); > if (gstage_pte_leaf(ptep)) > - gstage_remote_tlb_flush(kvm, current_level, addr); > + gstage_remote_tlb_flush(kvm, current_level, map->addr); > } > > return 0; > @@ -181,14 +181,16 @@ static int gstage_map_page(struct kvm *kvm, > struct kvm_mmu_memory_cache *pcache, > gpa_t gpa, phys_addr_t hpa, > unsigned long page_size, > - bool page_rdonly, bool page_exec) > + bool page_rdonly, bool page_exec, > + struct kvm_gstage_mapping *out_map) > { > - int ret; > - u32 level = 0; > - pte_t new_pte; > pgprot_t prot; > + int ret; > > - ret = gstage_page_size_to_level(page_size, &level); > + out_map->addr = gpa; > + out_map->level = 0; > + > + ret = gstage_page_size_to_level(page_size, &out_map->level); > if (ret) > return ret; > > @@ -216,10 +218,10 @@ static int gstage_map_page(struct kvm *kvm, > else > prot = PAGE_WRITE; > } > - new_pte = pfn_pte(PFN_DOWN(hpa), prot); > - new_pte = pte_mkdirty(new_pte); > + out_map->pte = pfn_pte(PFN_DOWN(hpa), prot); > + out_map->pte = pte_mkdirty(out_map->pte); > > - return gstage_set_pte(kvm, level, pcache, gpa, &new_pte); > + return gstage_set_pte(kvm, pcache, out_map); > } > > enum gstage_op { > @@ -352,7 +354,6 @@ int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa, > phys_addr_t hpa, unsigned long size, > bool writable, bool in_atomic) > { > - pte_t pte; > int ret = 0; > unsigned long pfn; > phys_addr_t addr, end; > @@ -360,22 +361,25 @@ int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa, > .gfp_custom = (in_atomic) ? GFP_ATOMIC | __GFP_ACCOUNT : 0, > .gfp_zero = __GFP_ZERO, > }; > + struct kvm_gstage_mapping map; > > end = (gpa + size + PAGE_SIZE - 1) & PAGE_MASK; > pfn = __phys_to_pfn(hpa); > > for (addr = gpa; addr < end; addr += PAGE_SIZE) { > - pte = pfn_pte(pfn, PAGE_KERNEL_IO); > + map.addr = addr; > + map.pte = pfn_pte(pfn, PAGE_KERNEL_IO); > + map.level = 0; > > if (!writable) > - pte = pte_wrprotect(pte); > + map.pte = pte_wrprotect(map.pte); > > ret = kvm_mmu_topup_memory_cache(&pcache, gstage_pgd_levels); > if (ret) > goto out; > > spin_lock(&kvm->mmu_lock); > - ret = gstage_set_pte(kvm, 0, &pcache, addr, &pte); > + ret = gstage_set_pte(kvm, &pcache, &map); > spin_unlock(&kvm->mmu_lock); > if (ret) > goto out; > @@ -593,7 +597,8 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) > > int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, > struct kvm_memory_slot *memslot, > - gpa_t gpa, unsigned long hva, bool is_write) > + gpa_t gpa, unsigned long hva, bool is_write, > + struct kvm_gstage_mapping *out_map) > { > int ret; > kvm_pfn_t hfn; > @@ -608,6 +613,9 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, > unsigned long vma_pagesize, mmu_seq; > struct page *page; > > + /* Setup initial state of output mapping */ > + memset(out_map, 0, sizeof(*out_map)); > + > /* We need minimum second+third level pages */ > ret = kvm_mmu_topup_memory_cache(pcache, gstage_pgd_levels); > if (ret) { > @@ -677,10 +685,10 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu, > if (writable) { > mark_page_dirty(kvm, gfn); > ret = gstage_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT, > - vma_pagesize, false, true); > + vma_pagesize, false, true, out_map); > } else { > ret = gstage_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT, > - vma_pagesize, true, true); > + vma_pagesize, true, true, out_map); > } > > if (ret) > diff --git a/arch/riscv/kvm/vcpu_exit.c b/arch/riscv/kvm/vcpu_exit.c > index 965df528de90..6b4694bc07ea 100644 > --- a/arch/riscv/kvm/vcpu_exit.c > +++ b/arch/riscv/kvm/vcpu_exit.c > @@ -15,6 +15,7 @@ > static int gstage_page_fault(struct kvm_vcpu *vcpu, struct kvm_run *run, > struct kvm_cpu_trap *trap) > { > + struct kvm_gstage_mapping host_map; > struct kvm_memory_slot *memslot; > unsigned long hva, fault_addr; > bool writable; > @@ -43,7 +44,7 @@ static int gstage_page_fault(struct kvm_vcpu *vcpu, struct kvm_run *run, > } > > ret = kvm_riscv_gstage_map(vcpu, memslot, fault_addr, hva, > - (trap->scause == EXC_STORE_GUEST_PAGE_FAULT) ? true : false); > + (trap->scause == EXC_STORE_GUEST_PAGE_FAULT) ? true : false, &host_map); > if (ret < 0) > return ret; > Reviewed-by: Atish Patra