Skip to content

Commit

Permalink
RISC-V: Fix hartid mask handling for hartid 31 and up
Browse files Browse the repository at this point in the history
Jessica reports that using "1 << hartid" causes undefined behavior for
hartid 31 and up.

Fix this by using the BIT() helper instead of an explicit shift.

Reported-by: Jessica Clarke <jrtc27@jrtc27.com>
Fixes: 26fb751 ("RISC-V: Do not use cpumask data structure for hartid bitmap")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
  • Loading branch information
Geert Uytterhoeven authored and Palmer Dabbelt committed Feb 14, 2022
1 parent 6df2a01 commit 12f4a66
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/riscv/kernel/sbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Copyright (c) 2020 Western Digital Corporation or its affiliates.
*/

#include <linux/bits.h>
#include <linux/init.h>
#include <linux/pm.h>
#include <linux/reboot.h>
Expand Down Expand Up @@ -85,7 +86,7 @@ static unsigned long __sbi_v01_cpumask_to_hartmask(const struct cpumask *cpu_mas
pr_warn("Unable to send any request to hartid > BITS_PER_LONG for SBI v0.1\n");
break;
}
hmask |= 1 << hartid;
hmask |= BIT(hartid);
}

return hmask;
Expand Down Expand Up @@ -268,7 +269,7 @@ static int __sbi_send_ipi_v02(const struct cpumask *cpu_mask)
}
if (!hmask)
hbase = hartid;
hmask |= 1UL << (hartid - hbase);
hmask |= BIT(hartid - hbase);
}

if (hmask) {
Expand Down Expand Up @@ -362,7 +363,7 @@ static int __sbi_rfence_v02(int fid, const struct cpumask *cpu_mask,
}
if (!hmask)
hbase = hartid;
hmask |= 1UL << (hartid - hbase);
hmask |= BIT(hartid - hbase);
}

if (hmask) {
Expand Down

0 comments on commit 12f4a66

Please sign in to comment.