Commit c435a4f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - kCFI is restricted to clang-17 or newer, as earlier versions have
   known bugs

 - sbi_hsm_hart_start is now staticly allocated, to avoid tripping up
   the SBI HSM page mapping on sparse systems.

* tag 'riscv-for-linus-6.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: cpu_ops_sbi: Use static array for boot_data
  riscv: Require clang-17 or newer for kCFI
parents 4b02ed4a 5903a745

arch/riscv/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ config RISCV 
	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT

	select ARCH_STACKWALK

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_CFI_CLANG

	# clang >= 17: https://github.com/llvm/llvm-project/commit/62fa708ceb027713b386c7e0efda994f8bdc27e2

	select ARCH_SUPPORTS_CFI_CLANG if CLANG_VERSION >= 170000

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU

	select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE

	select ARCH_SUPPORTS_HUGETLBFS if MMU

arch/riscv/kernel/cpu_ops_sbi.c

+3 −3
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ const struct cpu_operations cpu_ops_sbi; 


/*

 * Ordered booting via HSM brings one cpu at a time. However, cpu hotplug can

 * be invoked from multiple threads in parallel. Define a per cpu data

 * be invoked from multiple threads in parallel. Define an array of boot data

 * to handle that.

 */

static DEFINE_PER_CPU(struct sbi_hart_boot_data, boot_data);

static struct sbi_hart_boot_data boot_data[NR_CPUS];



static int sbi_hsm_hart_start(unsigned long hartid, unsigned long saddr,

			      unsigned long priv)
@@ -67,7 +67,7 @@ static int sbi_cpu_start(unsigned int cpuid, struct task_struct *tidle) 
	unsigned long boot_addr = __pa_symbol(secondary_start_sbi);

	unsigned long hartid = cpuid_to_hartid_map(cpuid);

	unsigned long hsm_data;

	struct sbi_hart_boot_data *bdata = &per_cpu(boot_data, cpuid);

	struct sbi_hart_boot_data *bdata = &boot_data[cpuid];



	/* Make sure tidle is updated */

	smp_mb();