Re: [PATCH v2 06/13] KVM: arm64: dirty_bit: Add base FEAT_HACDBS cleaning routine
Leonardo Bras <[email protected]> Tue, 30 Jun 2026 15:59:38 +0100
| Newsgroups | dev.linux.lists.acpica-devel,dev.linux.lists.kvmarm,org.infradead.lists.linux-arm-kernel,org.kernel.vger.kvm,org.kernel.vger.linux-acpi,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <akPZ2bnh3k6ZZgYx@LeoBrasDK> |
On Mon, Jun 29, 2026 at 10:36:40AM -0700, Oliver Upton wrote: > On Mon, Jun 29, 2026 at 12:17:54PM +0100, Leonardo Bras wrote: > > Introduce the basic cleaning routine that is going to be used for both > > dirty-bitmap and dirty-ring routines. > > > > It sets the required registers with the input buffer, and wait for > > HACDBSIRQ to happen, which means either the task is done, or there was some > > error during processing. > > > > It is ran with preemption disabled, as a task being scheduled in could > > change the translation registers used by HACDBS and end up corrupting the > > current dirty-bit tracking and the sched-in task's S2 pagetables. > > > > Signed-off-by: Leonardo Bras <[email protected]> > > --- > > arch/arm64/kvm/dirty_bit.c | 81 ++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 81 insertions(+) > > > > diff --git a/arch/arm64/kvm/dirty_bit.c b/arch/arm64/kvm/dirty_bit.c > > index 789da8712b1b..e4283828b780 100644 > > --- a/arch/arm64/kvm/dirty_bit.c > > +++ b/arch/arm64/kvm/dirty_bit.c > > @@ -1,36 +1,117 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > /* > > * Copyright (C) 2026 ARM Ltd. > > * Author: Leonardo Bras <[email protected]> > > */ > > > > #include <asm/kvm_dirty_bit.h> > > +#include <asm/kvm_mmu.h> > > #include <linux/kconfig.h> > > #include <linux/acpi.h> > > > > DEFINE_PER_CPU(struct hacdbs, hacdbs_pcp) = { > > .status = HACDBS_OFF, > > .size = 0, > > }; > > > > /* HDBSS entry field definitions */ > > #define HDBSS_ENTRY_VALID BIT(0) > > #define HDBSS_ENTRY_TTWL_SHIFT (1) > > #define HDBSS_ENTRY_TTWL_MASK (GENMASK(3, 1)) > > #define HDBSS_ENTRY_TTWL(x) \ > > (((x) << HDBSS_ENTRY_TTWL_SHIFT) & HDBSS_ENTRY_TTWL_MASK) > > #define HDBSS_ENTRY_TTWL_RESV HDBSS_ENTRY_TTWL(-4) > > #define HDBSS_ENTRY_IPA GENMASK_ULL(55, 12) > > > > static __ro_after_init int hacdbsirq = -1; > > > > +static void hacdbs_start(u64 *hw_entries, int size) > > +{ > > + u64 br; > > + /* Each entry is 8 bytes */ > > + int size_b = size * sizeof(hw_entries[0]); > > + int size_p2 = max(roundup_pow_of_two(size_b), PAGE_SIZE); > > + > > + /* If not using the full size of the array, put a stop entry at the end */ > > + if (size_b < size_p2) > > + hw_entries[size] = HDBSS_ENTRY_VALID | HDBSS_ENTRY_TTWL_RESV; > > + > > + sysreg_clear_set_s(SYS_HACDBSCONS_EL2, > > + HACDBSCONS_EL2_ERR_REASON | HACDBSCONS_EL2_INDEX, 0); > > + > > + br = (virt_to_phys(hw_entries) & HACDBSBR_EL2_BADDR_MASK) | > > + FIELD_PREP(HACDBSBR_EL2_SZ, ilog2(size_p2) - 12) | > > + FIELD_PREP(HACDBSBR_EL2_EN, 1); > > + > > + this_cpu_write(hacdbs_pcp.status, HACDBS_RUNNING); > > + this_cpu_write(hacdbs_pcp.size, size); > > + write_sysreg_s(br, SYS_HACDBSBR_EL2); > > + isb(); > > +} > > + > > +static int hacdbs_stop(void) > > +{ > > + write_sysreg_s(0, SYS_HACDBSBR_EL2); > > + isb(); > > + > > + if (this_cpu_read(hacdbs_pcp.status) == HACDBS_ERROR) { > > + /* In case of error, HACDBSCONS_EL2.INDEX should point the faulty entry */ > > + u64 cons = read_sysreg_s(SYS_HACDBSCONS_EL2); > > + int idx = FIELD_GET(HACDBSCONS_EL2_INDEX, cons); > > + > > + this_cpu_write(hacdbs_pcp.status, HACDBS_IDLE); > > + > > + return idx; > > + } > > + > > + return this_cpu_read(hacdbs_pcp.size); > > +} > > + > > +/* > > + * Clears dirty-bits for an array of pages (hw_entries) using HACDBS > > + * Returns the number of items cleaned from the array. If returns value < size, > > + * there was an error in the processing. > > + */ > > +static int dirty_bit_clear(struct kvm *kvm, u64 *hw_entries, int size) > > +{ > > + u64 hcr_el2; > > + int ret; > > + > > + preempt_disable(); > > + > > + hcr_el2 = read_sysreg(HCR_EL2); > > + write_sysreg(hcr_el2 | HCR_EL2_VM, HCR_EL2); > > sysreg_clear_set_hcr(). I'm pretty sure all the speculative AT errata > depend on HCR_EL2.VM being set _after_ the stage-2 MMU has been loaded. > So, move this to after __load_stage2()? ok > > + __load_stage2(&kvm->arch.mmu); > > Pretty sure you need an ISB here to ensure loading the MMU is ordered > with enabling HACDBS. > does not __load_stage2() have an isb() here? In any case, will add an isb() after sysreg_clear_set_hcr(), which should come after __load_stage2() IIUC. > > + hacdbs_start(hw_entries, size); > > + > > + do { > > + wfi(); > > + } while (this_cpu_read(hacdbs_pcp.status) == HACDBS_RUNNING); > > This is exactly why I said you should just poll hardware instead. It is > entirely possible that the IRQ arrives before you WFI. It should be fine with WFIT, though, right? I understand the reason in pooling, and even done some workaround in pooling for getting this to run in the model. Based on the previous reply, do you think I should only use polling for now, and implement the IRQ later? > > > + ret = hacdbs_stop(); > > + > > + write_sysreg(hcr_el2, HCR_EL2); > > write_sysreg_hcr() Sure! Thanks for reviewing! Leo