| Message ID | 20231101141908.192198-2-ajones@ventanamicro.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 777c0d761be7d981a2ae5494dfbc636311908dfb |
| Headers | show |
| Series | [-next] RISC-V: hwprobe: Always use u64 for extension bits | expand |
Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Wed, 1 Nov 2023 15:19:09 +0100 you wrote: > Extensions are getting added quickly and their hwprobe bits will soon > exceed 31 (which pair values accommodate, since they're of type u64). > However, in one tree, where a bunch of extensions got merged prior to > zicboz, zicboz already got pushed to bit 32. Pushing it exposed a > 32-bit compilation bug, since unsigned long was used instead of u64. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202310311801.hxduISrr-lkp@intel.com/ > Fixes: 9c7646d5ffd2 ("RISC-V: hwprobe: Expose Zicboz extension and its block size") > Signed-off-by: Andrew Jones <ajones@ventanamicro.com> > > [...] Here is the summary with links: - [-next] RISC-V: hwprobe: Always use u64 for extension bits https://git.kernel.org/riscv/c/777c0d761be7 You are awesome, thank you!
diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index c712037dbe10..a2ca5b7756a5 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -169,7 +169,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, pair->value &= ~missing; } -static bool hwprobe_ext0_has(const struct cpumask *cpus, unsigned long ext) +static bool hwprobe_ext0_has(const struct cpumask *cpus, u64 ext) { struct riscv_hwprobe pair;
Extensions are getting added quickly and their hwprobe bits will soon exceed 31 (which pair values accommodate, since they're of type u64). However, in one tree, where a bunch of extensions got merged prior to zicboz, zicboz already got pushed to bit 32. Pushing it exposed a 32-bit compilation bug, since unsigned long was used instead of u64. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202310311801.hxduISrr-lkp@intel.com/ Fixes: 9c7646d5ffd2 ("RISC-V: hwprobe: Expose Zicboz extension and its block size") Signed-off-by: Andrew Jones <ajones@ventanamicro.com> --- arch/riscv/kernel/sys_riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)