riscv: kvm: Skip preventive hfence.gvma for new G-stage mappings with Svvptc
Subsystems (3)
PATCH 1/1 riscv: kvm: Skip preventive hfence.gvma for new G-stage mappings with Svvptc
For Invalid->Valid G-stage leaf PTE updates, the flush in kvm_riscv_gstage_set_pte() is preventive. When Svvptc is available, new valid PTEs become visible to the page-table walker within a bounded time, so an immediate hfence.gvma is unnecessary.
Skip gstage_tlb_flush() for that case. Permission-restricting updates continue to use the existing flush path.
--- arch/riscv/kvm/gstage.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/riscv/kvm/gstage.c +6 -1
@@ -10,6 +10,8 @@#include <linux/module.h> #include <linux/pgtable.h> #include <asm/kvm_gstage.h> +#include <asm/cpufeature.h> +#include <asm/hwcap.h> #ifdef CONFIG_64BIT unsigned long kvm_riscv_gstage_max_pgd_levels__ro_after_init =3 ;
@@ -171,8 +173,11 @@ int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage, }if (pte_val (*ptep) !=pte_val (map->pte)) { +bool was_invalid = !pte_val (*ptep);set_pte (ptep, map->pte); -if (gstage_pte_leaf (ptep)) +if (gstage_pte_leaf (ptep) && + !(was_invalid && +riscv_has_extension_unlikely (RISCV_ISA_EXT_SVVPTC )))gstage_tlb_flush (gstage, current_level, map->addr); }
Signature · 1 line
2.34.1
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Missing smp_wmb() before linking newly allocated intermediate page tables, exposing uninitialized memory to concurrent hardware page table walkers.
- [High] Non-atomic write-protection of G-stage PTEs clobbers hardware Access/Dirty bit updates.
--
commit 8c5791358f444706f77027dbaa2cea7abc95b1e0
Author: Dylan.Wu <[email protected]>
riscv: kvm: Skip preventive hfence.gvma for new G-stage mappings with Svvptc
For Invalid->Valid G-stage leaf PTE updates, the flush in kvm_riscv_gstage_set_pte() is preventive. When Svvptc is available, new valid PTEs become visible to the page-table walker within a bounded time, so an immediate hfence.gvma is unnecessary. Skip gstage_tlb_flush() for that case.
Quoted 4 lines
arch/riscv/kvm/gstage.c +0
-0
[ ... ]
arch/riscv/kvm/gstage.c int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage,
Quoted 1 line
arch/riscv/kvm/gstage.c +0
-0@@ -171,8 +173,11 @@ int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage,
[Severity: High]
This isn't a bug introduced by this patch, but does kvm_riscv_gstage_set_pte() need an smp_wmb() before linking a newly allocated intermediate page table?
When a new page table is allocated during a guest page fault, the setup looks like this:
next_ptep = kvm_mmu_memory_cache_alloc(pcache); if (!next_ptep) return -ENOMEM; set_pte(ptep, pfn_pte(PFN_DOWN(__pa(next_ptep)), __pgprot(_PAGE_TABLE)));
Without a memory barrier before set_pte(), the zeroing of the newly allocated page table could be delayed past its publication in the parent page table.
If a concurrent hardware page table walker follows the pointer to the new page table and observes uninitialized memory, could it interpret random old data as valid PTEs and cause wild memory accesses or guest memory corruption?
arch/riscv/kvm/gstage.c int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage, · line 183
Quoted 12 lines
arch/riscv/kvm/gstage.c +4
-1}if (pte_val (*ptep) !=pte_val (map->pte)) { +bool was_invalid = !pte_val (*ptep);set_pte (ptep, map->pte); -if (gstage_pte_leaf (ptep)) +if (gstage_pte_leaf (ptep) && + !(was_invalid && +riscv_has_extension_unlikely (RISCV_ISA_EXT_SVVPTC )))gstage_tlb_flush (gstage, current_level, map->addr); }
[Severity: High]
This is a pre-existing issue, but can the non-atomic write-protection in kvm_riscv_gstage_op_pte() clobber hardware Access/Dirty bit updates?
During dirty logging, GSTAGE_OP_WP uses a non-atomic read-modify-write to clear the write bit:
else if (op == GSTAGE_OP_WP) set_pte(ptep, __pte(pte_val(ptep_get(ptep)) & ~_PAGE_WRITE));
If the hardware page-table walker asynchronously updates the Access or Dirty bit between ptep_get() and set_pte(), would that hardware update be silently overwritten and lost?
Losing a Dirty bit might cause KVM to treat a modified page as clean during dirty logging. Could this lead to silent data corruption during live migration since the modified guest data wouldn't be transferred?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 6 lines · Dylan.Wu
For
Invalid->ValidG-stage leaf PTE updates, the flush inkvm_riscv_gstage_set_pte()is preventive. When Svvptc is available, new valid PTEs become visible to the page-table walker within a bounded time, so an immediate hfence.gvma is unnecessary.
Quoted 7 lines
Skip
gstage_tlb_flush()for that case. Permission-restricting updates continue to use the existing flush path.Assisted-by YuanSheng: deepseek-v4-proCo-developed-by Quan Zhou <[email protected]>Signed-off-by Quan Zhou <[email protected]>Signed-off-by Dylan.Wu <[email protected]>
The patch subject is unnecessarily long and needs some simplification. Also, there is minor warning reported by checkpatch.pl related to include of asm/cpufeature.h. I will take care of both of these at the time of merging this patch.
Queued this patch as a fix for Linux-7.2-rcX
Thanks,
Anup
Quoted 33 lines
--- arch/riscv/kvm/gstage.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)arch/riscv/kvm/gstage.c +6
-2@@ -10,6 +10,8 @@#include <linux/module.h> #include <linux/pgtable.h> #include <asm/kvm_gstage.h> +#include <asm/cpufeature.h> +#include <asm/hwcap.h> #ifdef CONFIG_64BIT unsigned long kvm_riscv_gstage_max_pgd_levels__ro_after_init =3 ;@@ -171,8 +173,11 @@ int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage, }if (pte_val (*ptep) !=pte_val (map->pte)) { +bool was_invalid = !pte_val (*ptep);set_pte (ptep, map->pte); -if (gstage_pte_leaf (ptep)) +if (gstage_pte_leaf (ptep) && + !(was_invalid && +riscv_has_extension_unlikely (RISCV_ISA_EXT_SVVPTC )))gstage_tlb_flush (gstage, current_level, map->addr); } --2.34.1