arm64: arm64_ftr_reg->name may not be a human-readable string
PATCH 1/1 arm64: arm64_ftr_reg->name may not be a human-readable string
The id argument of ARM64_FTR_REG_OVERRIDE() is used for two purposes:
one as the system register encoding (used for the sys_id field of __ftr_reg_entry), and the other as the register name (stringified and used for the name field of arm64_ftr_reg), which is debug information. The id argument is supposed to be a macro that indicates an encoding of the register (eg. SYS_ID_AA64PFR0_EL1, etc).
ARM64_FTR_REG(), which also has the same id argument, uses ARM64_FTR_REG_OVERRIDE() and passes the id to the macro. Since the id argument is completely macro-expanded before it is substituted into a macro body of ARM64_FTR_REG_OVERRIDE(), the stringified id in the body of ARM64_FTR_REG_OVERRIDE is not a human-readable register name, but a string of numeric bitwise operations.
Fix this so that human-readable register names are available as debug information.
--- arch/arm64/kernel/cpufeature.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm64/kernel/cpufeature.c +7 -3
@@ -573,15 +573,19 @@ static const struct arm64_ftr_bits ftr_raz[] = { ARM64_FTR_END, }; -#define ARM64_FTR_REG_OVERRIDE (id, table, ovr) { \ +#define __ARM64_FTR_REG_OVERRIDE (id_str, id, table, ovr) { \ .sys_id = id, \ .reg = &(struct arm64_ftr_reg){ \ - .name = #id, \ + .name = id_str, \ .override = (ovr), \ .ftr_bits = &((table)[0]), \ }} -#define ARM64_FTR_REG (id, table) ARM64_FTR_REG_OVERRIDE(id, table, &no_override) +#define ARM64_FTR_REG_OVERRIDE (id, table, ovr) \ + __ARM64_FTR_REG_OVERRIDE(#id, id, table, ovr) + +#define ARM64_FTR_REG (id, table) \ + __ARM64_FTR_REG_OVERRIDE(#id, id, table, &no_override)struct arm64_ftr_override __ro_after_init id_aa64mmfr1_override;struct arm64_ftr_override __ro_after_init id_aa64pfr1_override;
Signature · 7 lines
2.33.1.1089.g2158813163f-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 42 lines · Reiji Watanabe
The id argument of
ARM64_FTR_REG_OVERRIDE()is used for two purposes:
one as the system register encoding (used for thesys_idfield of__ftr_reg_entry), and the other as the register name (stringified and used for the name field ofarm64_ftr_reg), which is debug information. The id argument is supposed to be a macro that indicates an encoding of the register (eg.SYS_ID_AA64PFR0_EL1, etc).
ARM64_FTR_REG(), which also has the same id argument, usesARM64_FTR_REG_OVERRIDE()and passes the id to the macro. Since the id argument is completely macro-expanded before it is substituted into a macro body ofARM64_FTR_REG_OVERRIDE(), the stringified id in the body ofARM64_FTR_REG_OVERRIDEis not a human-readable register name, but a string of numeric bitwise operations.Fix this so that human-readable register names are available as debug information.
Fixes 8f266a5d878a ("arm64: cpufeature: Add global feature override facility")Signed-off-by Reiji Watanabe <[email protected]>--- arch/arm64/kernel/cpufeature.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)arch/arm64/kernel/cpufeature.c +2
-2@@ -573,15 +573,19 @@ static const struct arm64_ftr_bits ftr_raz[] = { ARM64_FTR_END, }; -#define ARM64_FTR_REG_OVERRIDE (id, table, ovr) { \ +#define __ARM64_FTR_REG_OVERRIDE (id_str, id, table, ovr) { \ .sys_id = id, \ .reg = &(struct arm64_ftr_reg){ \ - .name = #id, \ + .name = id_str, \ .override = (ovr), \ .ftr_bits = &((table)[0]), \ }}
arch/arm64/kernel/cpufeature.c static const struct arm64_ftr_bits ftr_raz[] = { · line 591
Quoted 10 lines
arch/arm64/kernel/cpufeature.c +5
-1-#define ARM64_FTR_REG (id, table) ARM64_FTR_REG_OVERRIDE(id, table, &no_override) +#define ARM64_FTR_REG_OVERRIDE (id, table, ovr) \ + __ARM64_FTR_REG_OVERRIDE(#id, id, table, ovr) + +#define ARM64_FTR_REG (id, table) \ + __ARM64_FTR_REG_OVERRIDE(#id, id, table, &no_override)struct arm64_ftr_override __ro_after_init id_aa64mmfr1_override;struct arm64_ftr_override __ro_after_init id_aa64pfr1_override;
Seems reasonable to me.
M.
Signature · 6 lines
Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 16 lines · Reiji Watanabe
The id argument of
ARM64_FTR_REG_OVERRIDE()is used for two purposes:
one as the system register encoding (used for thesys_idfield of__ftr_reg_entry), and the other as the register name (stringified and used for the name field ofarm64_ftr_reg), which is debug information. The id argument is supposed to be a macro that indicates an encoding of the register (eg.SYS_ID_AA64PFR0_EL1, etc).
ARM64_FTR_REG(), which also has the same id argument, usesARM64_FTR_REG_OVERRIDE()and passes the id to the macro. Since the id argument is completely macro-expanded before it is substituted into a macro body ofARM64_FTR_REG_OVERRIDE(), the stringified id in the body ofARM64_FTR_REG_OVERRIDEis not a human-readable register name, but a string of numeric bitwise operations.
Quoted 5 lines
Fix this so that human-readable register names are available as debug information.
Fixes 8f266a5d878a ("arm64: cpufeature: Add global feature override facility")Signed-off-by Reiji Watanabe <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 8 lines · Reiji Watanabe
The id argument of
ARM64_FTR_REG_OVERRIDE()is used for two purposes:
one as the system register encoding (used for thesys_idfield of__ftr_reg_entry), and the other as the register name (stringified and used for the name field ofarm64_ftr_reg), which is debug information. The id argument is supposed to be a macro that indicates an encoding of the register (eg.SYS_ID_AA64PFR0_EL1, etc).[...]
Applied to arm64 (for-next/core), thanks!
[1/1] arm64: arm64_ftr_reg->name may not be a human-readable string
https://git.kernel.org/arm64/c/b0f364414a23
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel