| Message ID | 20240410152503.3593890-1-maz@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: arm64: Improve out-of-order sysreg table diagnostics | expand |
On 2024/4/10 23:25, Marc Zyngier wrote: > Adding new entries to our system register tables is a painful exercise, > as we require them to be ordered by Op0,Op1,CRn,CRm,Op2. > > If an entry is misordered, we output an error that indicates the > pointer to the entry and the number *of the last valid one*. > > That's not very helpful, and would be much better if we printed the > number of the *offending* entry as well as its name (which is present > in the vast majority of the cases). > > This makes debugging new additions to the tables much easier. > > Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> Thanks.
On Wed, 10 Apr 2024 16:25:03 +0100, Marc Zyngier wrote: > Adding new entries to our system register tables is a painful exercise, > as we require them to be ordered by Op0,Op1,CRn,CRm,Op2. > > If an entry is misordered, we output an error that indicates the > pointer to the entry and the number *of the last valid one*. > > That's not very helpful, and would be much better if we printed the > number of the *offending* entry as well as its name (which is present > in the vast majority of the cases). > > [...] Applied to next, thanks! [1/1] KVM: arm64: Improve out-of-order sysreg table diagnostics commit: a88a9ec1729a4687370856567919e1ab79a02483 Cheers, M.
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index a23f4e935a2e..60f548d8572e 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -3920,12 +3920,14 @@ static bool check_sysreg_table(const struct sys_reg_desc *table, unsigned int n, for (i = 0; i < n; i++) { if (!is_32 && table[i].reg && !table[i].reset) { - kvm_err("sys_reg table %pS entry %d lacks reset\n", &table[i], i); + kvm_err("sys_reg table %pS entry %d (%s) lacks reset\n", + &table[i], i, table[i].name); return false; } if (i && cmp_sys_reg(&table[i-1], &table[i]) >= 0) { - kvm_err("sys_reg table %pS entry %d out of order\n", &table[i - 1], i - 1); + kvm_err("sys_reg table %pS entry %d (%s -> %s) out of order\n", + &table[i], i, table[i - 1].name, table[i].name); return false; } }
Adding new entries to our system register tables is a painful exercise, as we require them to be ordered by Op0,Op1,CRn,CRm,Op2. If an entry is misordered, we output an error that indicates the pointer to the entry and the number *of the last valid one*. That's not very helpful, and would be much better if we printed the number of the *offending* entry as well as its name (which is present in the vast majority of the cases). This makes debugging new additions to the tables much easier. Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/kvm/sys_regs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)