Skip to contentSkip to conversation

riscv: Idle thread using Zawrs extension

PATCH In review Xu Lu 4 participants 9 messages Sep 25, 2024 – Sep 26, 2024 RISC-V

lore
Share & tools
lore

Xu Lu

author
#0 lore raw

v3 cover riscv: Idle thread using Zawrs extension

This is the third version of idle thread based on Zawrs extension. We noticed that Zawrs is supported in v6.11 now and rebased our code on it. Below is the original description.

This patch series introduces a new implementation of idle thread using Zawrs extension.

The Zawrs[0] extension introduces two new instructions named WRS.STO and WRS.NTO in RISC-V. When software registers a reservation set using LR instruction, a subsequent WRS.STO or WRS.NTO instruction will cause the hart to stall in a low-power state until a store happens to the reservation set or an interrupt becomes pending. The difference between these two instructions is that WRS.STO will terminate stall after an implementation-defined timeout while WRS.NTO won't.

This patch series implements idle thread using WRS.NTO instruction. Besides, we found there is no need to send a real IPI to wake up an idle CPU. Instead, we write IPI information to the reservation set of an idle CPU to wake it up and let it handle IPI quickly, without going through tranditional interrupt handling routine.

[0] https://github.com/riscv/riscv-zawrs/blob/main/zawrs.adoc

Xu Lu (2):
riscv: process: Introduce idle thread using Zawrs extension
riscv: Use Zawrs to accelerate IPI to idle cpu

 arch/riscv/Kconfig                 |  10 +++
 arch/riscv/include/asm/cpuidle.h   |  11 +---
 arch/riscv/include/asm/processor.h |  32 +++++++++
 arch/riscv/include/asm/smp.h       |  14 ++++
 arch/riscv/kernel/cpu.c            |   5 ++
 arch/riscv/kernel/process.c        | 102 ++++++++++++++++++++++++++++-
 arch/riscv/kernel/smp.c            |  51 +++++++++++----
 7 files changed, 203 insertions(+), 22 deletions(-)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v3 1/2 riscv: process: Introduce idle thread using Zawrs extension

The Zawrs extension introduces a new instruction WRS.NTO, which will register a reservation set and causes the hart to temporarily stall execution in a low-power state until a store occurs to the reservation set or an interrupt is observed.

This commit implements new version of idle thread for RISC-V via Zawrs extension.

---
 arch/riscv/Kconfig                 | 10 ++++++++
 arch/riscv/include/asm/cpuidle.h   | 11 +-------
 arch/riscv/include/asm/processor.h | 18 +++++++++++++
 arch/riscv/kernel/cpu.c            |  5 ++++
 arch/riscv/kernel/process.c        | 41 +++++++++++++++++++++++++++++-
 5 files changed, 74 insertions(+), 11 deletions(-)
arch/riscv/Kconfig +10 -0
index 939ea7f6a228..56cf6000d286 100644
@@ -23,6 +23,7 @@ config RISCV
 	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
 	select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
 	select ARCH_HAS_BINFMT_FLAT
+	select ARCH_HAS_CPU_FINALIZE_INIT
 	select ARCH_HAS_CURRENT_STACK_POINTER
 	select ARCH_HAS_DEBUG_VIRTUAL if MMU
 	select ARCH_HAS_DEBUG_VM_PGTABLE
@@ -1153,6 +1154,15 @@ endmenu # "Power management options"
 
 menu "CPU Power Management"
 
+config RISCV_ZAWRS_IDLE
+	bool "Idle thread using ZAWRS extensions"
+	depends on RISCV_ISA_ZAWRS
+	default y
+	help
+		Adds support to implement idle thread using ZAWRS extension.
+
+		If you don't know what to do here, say Y.
+
 source "drivers/cpuidle/Kconfig"
 
 source "drivers/cpufreq/Kconfig"
arch/riscv/include/asm/cpuidle.h +1 -10
index 71fdc607d4bc..94c9ecb46571 100644
@@ -10,15 +10,6 @@
 #include <asm/barrier.h>
 #include <asm/processor.h>
 
-static inline void cpu_do_idle(void)
-{
-	/*
-	 * Add mb() here to ensure that all
-	 * IO/MEM accesses are completed prior
-	 * to entering WFI.
-	 */
-	mb();
-	wait_for_interrupt();
-}
+void cpu_do_idle(void);
 
 #endif
arch/riscv/include/asm/processor.h +18 -0
index efa1b3519b23..d0dcdb7e7392 100644
@@ -12,6 +12,7 @@
 
 #include <vdso/processor.h>
 
+#include <asm/insn-def.h>
 #include <asm/ptrace.h>
 
 #define arch_get_mmap_end(addr, len, flags)			\
@@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void)
 	__asm__ __volatile__ ("wfi");
 }
 
+static inline void wrs_nto(unsigned long *addr)
+{
+	int val;
+
+	__asm__ __volatile__(
+#ifdef CONFIG_64BIT
+			"lr.d %[p], %[v]\n\t"
+#else
+			"lr.w %[p], %[v]\n\t"
+#endif
+			ZAWRS_WRS_NTO "\n\t"
+			: [p] "=&r" (val), [v] "+A" (*addr)
+			: : "memory");
+}
+
 extern phys_addr_t dma32_phys_limit;
 
 struct device_node;
@@ -177,6 +193,8 @@ extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val);
 #define RISCV_SET_ICACHE_FLUSH_CTX(arg1, arg2)	riscv_set_icache_flush_ctx(arg1, arg2)
 extern int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread);
 
+extern void select_idle_routine(void);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_RISCV_PROCESSOR_H */
arch/riscv/kernel/cpu.c +5 -0
index f6b13e9f5e6c..97a7144fa6cd 100644
@@ -23,6 +23,11 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
 	return phys_id == cpuid_to_hartid_map(cpu);
 }
 
+void __init arch_cpu_finalize_init(void)
+{
+	select_idle_routine();
+}
+
 /*
  * Returns the hart ID of the given device tree node, or -ENODEV if the node
  * isn't an enabled and valid RISC-V hart node.
arch/riscv/kernel/process.c +40 -1

57 lines not on this page · raw message

Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension

Quoted 85 lines · Xu Lu

The Zawrs extension introduces a new instruction WRS.NTO, which will register a reservation set and causes the hart to temporarily stall execution in a low-power state until a store occurs to the reservation set or an interrupt is observed.

This commit implements new version of idle thread for RISC-V via Zawrs extension.

---
 arch/riscv/Kconfig                 | 10 ++++++++
 arch/riscv/include/asm/cpuidle.h   | 11 +-------
 arch/riscv/include/asm/processor.h | 18 +++++++++++++
 arch/riscv/kernel/cpu.c            |  5 ++++
 arch/riscv/kernel/process.c        | 41 +++++++++++++++++++++++++++++-
 5 files changed, 74 insertions(+), 11 deletions(-)
arch/riscv/Kconfig +10 -0
index 939ea7f6a228..56cf6000d286 100644
@@ -23,6 +23,7 @@ config RISCV
 	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
 	select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
 	select ARCH_HAS_BINFMT_FLAT
+	select ARCH_HAS_CPU_FINALIZE_INIT
 	select ARCH_HAS_CURRENT_STACK_POINTER
 	select ARCH_HAS_DEBUG_VIRTUAL if MMU
 	select ARCH_HAS_DEBUG_VM_PGTABLE
@@ -1153,6 +1154,15 @@ endmenu # "Power management options"
 
 menu "CPU Power Management"
 
+config RISCV_ZAWRS_IDLE
+	bool "Idle thread using ZAWRS extensions"
+	depends on RISCV_ISA_ZAWRS
+	default y
+	help
+		Adds support to implement idle thread using ZAWRS extension.
+
+		If you don't know what to do here, say Y.
+
 source "drivers/cpuidle/Kconfig"
 
 source "drivers/cpufreq/Kconfig"
arch/riscv/include/asm/cpuidle.h +1 -10
index 71fdc607d4bc..94c9ecb46571 100644
@@ -10,15 +10,6 @@
 #include <asm/barrier.h>
 #include <asm/processor.h>
 
-static inline void cpu_do_idle(void)
-{
-	/*
-	 * Add mb() here to ensure that all
-	 * IO/MEM accesses are completed prior
-	 * to entering WFI.
-	 */
-	mb();
-	wait_for_interrupt();
-}
+void cpu_do_idle(void);
 
 #endif
arch/riscv/include/asm/processor.h +1 -0
index efa1b3519b23..d0dcdb7e7392 100644
@@ -12,6 +12,7 @@
 
 #include <vdso/processor.h>
 
+#include <asm/insn-def.h>
 #include <asm/ptrace.h>
 
 #define arch_get_mmap_end(addr, len, flags)			\
@@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void)
 	__asm__ __volatile__ ("wfi");
 }
 

arch/riscv/include/asm/processor.h static inline void wait_for_interrupt(void) · line 161

Quoted 10 lines
arch/riscv/include/asm/processor.h +10 -0
+static inline void wrs_nto(unsigned long *addr)
+{
+	int val;
+
+	__asm__ __volatile__(
+#ifdef CONFIG_64BIT
+			"lr.d %[p], %[v]\n\t"
+#else
+			"lr.w %[p], %[v]\n\t"
+#endif

val is always 32-bit since it's an int. We should always use lr.w.

arch/riscv/include/asm/processor.h static inline void wait_for_interrupt(void) · line 163

Quoted 2 lines
arch/riscv/include/asm/processor.h +2 -0
+			ZAWRS_WRS_NTO "\n\t"
+			: [p] "=&r" (val), [v] "+A" (*addr)

What do 'p' and 'v' represent? If they are pointer and value then they're backwards. I would just spell them out [val] and [addr].

Quoted 20 lines
arch/riscv/include/asm/processor.h +5 -0
+			: : "memory");
+}
+
 extern phys_addr_t dma32_phys_limit;
 
 struct device_node;
@@ -177,6 +193,8 @@ extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val);
 #define RISCV_SET_ICACHE_FLUSH_CTX(arg1, arg2)	riscv_set_icache_flush_ctx(arg1, arg2)
 extern int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread);
 
+extern void select_idle_routine(void);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_RISCV_PROCESSOR_H */
arch/riscv/kernel/cpu.c +0 -0
index f6b13e9f5e6c..97a7144fa6cd 100644

arch/riscv/kernel/cpu.c bool arch_match_cpu_phys_id(int cpu, u64 phys_id) · line 29

Quoted 7 lines
arch/riscv/kernel/cpu.c +4 -0
@@ -23,6 +23,11 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
 	return phys_id == cpuid_to_hartid_map(cpu);
 }
 
+void __init arch_cpu_finalize_init(void)
+{
+	select_idle_routine();
+}

Is there a reason we need to do this at arch_cpu_finalize_init() time? This seems like the type of thing we have typically done at the bottom of setup_arch().

Quoted 41 lines
arch/riscv/kernel/cpu.c +1 -0
+
 /*
  * Returns the hart ID of the given device tree node, or -ENODEV if the node
  * isn't an enabled and valid RISC-V hart node.
arch/riscv/kernel/process.c +21 -1
index e4bc61c4e58a..77769965609e 100644
@@ -15,6 +15,7 @@
 #include <linux/tick.h>
 #include <linux/ptrace.h>
 #include <linux/uaccess.h>
+#include <linux/static_call.h>
 
 #include <asm/unistd.h>
 #include <asm/processor.h>
@@ -35,11 +36,49 @@ EXPORT_SYMBOL(__stack_chk_guard);
 
 extern asmlinkage void ret_from_fork(void);
 
-void noinstr arch_cpu_idle(void)
+static __cpuidle void default_idle(void)
+{
+	/*
+	 * Add mb() here to ensure that all
+	 * IO/MEM accesses are completed prior
+	 * to entering WFI.
+	 */
+	mb();
+	wait_for_interrupt();
+}
+
+static __cpuidle void wrs_idle(void)
+{
+	/*
+	 * Add mb() here to ensure that all
+	 * IO/MEM accesses are completed prior
+	 * to entering WRS.NTO.
+	 */
+	mb();
+	wrs_nto(&current_thread_info()->flags);

arch/riscv/kernel/process.c EXPORT_SYMBOL(__stack_chk_guard); · line 68

Quoted 10 lines
arch/riscv/kernel/process.c +10 -0
+}
+
+DEFINE_STATIC_CALL_NULL(riscv_idle, default_idle);
+
+void __cpuidle cpu_do_idle(void)
+{
+	static_call(riscv_idle)();
+}
+
+void __cpuidle arch_cpu_idle(void)

Switching the section of this from '.noinstr.text' to 'cpuidle.text' should probably be a separate patch.

arch/riscv/kernel/process.c EXPORT_SYMBOL(__stack_chk_guard); · line 79

Quoted 11 lines
arch/riscv/kernel/process.c +7 -0
 {
 	cpu_do_idle();
 }
 
+void __init select_idle_routine(void)
+{
+	if (IS_ENABLED(CONFIG_RISCV_ZAWRS_IDLE) &&
+			riscv_has_extension_likely(RISCV_ISA_EXT_ZAWRS))
+		static_call_update(riscv_idle, wrs_idle);
+	else
+		static_call_update(riscv_idle, default_idle);

Do we need this 'else'? Can't we set the default at DEFINE_STATIC_CALL* time?

Quoted 8 lines
arch/riscv/kernel/process.c +2 -0
+}
+
 int set_unalign_ctl(struct task_struct *tsk, unsigned int val)
 {
 	if (!unaligned_ctl_available())
Signature · 1 line
2.20.1

Thanks,
drew

#3 lore raw

Re: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension

Quoted 5 lines · Andrew Jones
Quoted 4 lines · Xu Lu
arch/riscv/include/asm/processor.h +0 -0
@@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void)
 	__asm__ __volatile__ ("wfi");
 }
 
Quoted 12 lines

arch/riscv/include/asm/processor.h static inline void wait_for_interrupt(void) · line 161

Quoted 10 lines
arch/riscv/include/asm/processor.h +10 -0
+static inline void wrs_nto(unsigned long *addr)
+{
+	int val;
+
+	__asm__ __volatile__(
+#ifdef CONFIG_64BIT
+			"lr.d %[p], %[v]\n\t"
+#else
+			"lr.w %[p], %[v]\n\t"
+#endif

val is always 32-bit since it's an int. We should always use lr.w.

Shouldn't val be unsigned long like the pointer that is being read?

Signature · 3 lines
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
author
#4 lore raw

Re: [External] Re: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension

Hi Andreas,

Thanks a lot for your reply.

Quoted 21 lines · Andreas Schwab
Quoted 5 lines · Andrew Jones
Quoted 4 lines · Xu Lu
arch/riscv/include/asm/processor.h +0 -0
@@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void)
     __asm__ __volatile__ ("wfi");
 }
 
Quoted 12 lines

arch/riscv/include/asm/processor.h static inline void wait_for_interrupt(void) · line 161

Quoted 10 lines
arch/riscv/include/asm/processor.h +10 -0
+static inline void wrs_nto(unsigned long *addr)
+{
+    int val;
+
+    __asm__ __volatile__(
+#ifdef CONFIG_64BIT
+                    "lr.d %[p], %[v]\n\t"
+#else
+                    "lr.w %[p], %[v]\n\t"
+#endif

val is always 32-bit since it's an int. We should always use lr.w.

Quoted 1 line

Shouldn't val be unsigned long like the pointer that is being read?

Yes. As I replied Andrew, the 'int val' is a mistake here. The val can be an unsigned long (thread_info->flags) when CONFIG_SMP is disabled. I will update the declaration of val from 'int' to 'unsigned long'.

Quoted 5 lines

--
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

Thanks,

Xu Lu.

author
#5 lore raw

Re: [External] Re: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension

In reply to Andrew Jones

Hi Andrew,

Thanks a lot for your reply.

Quoted 87 lines · Andrew Jones
Quoted 85 lines · Xu Lu

The Zawrs extension introduces a new instruction WRS.NTO, which will register a reservation set and causes the hart to temporarily stall execution in a low-power state until a store occurs to the reservation set or an interrupt is observed.

This commit implements new version of idle thread for RISC-V via Zawrs extension.

---
 arch/riscv/Kconfig                 | 10 ++++++++
 arch/riscv/include/asm/cpuidle.h   | 11 +-------
 arch/riscv/include/asm/processor.h | 18 +++++++++++++
 arch/riscv/kernel/cpu.c            |  5 ++++
 arch/riscv/kernel/process.c        | 41 +++++++++++++++++++++++++++++-
 5 files changed, 74 insertions(+), 11 deletions(-)
arch/riscv/Kconfig +10 -0
index 939ea7f6a228..56cf6000d286 100644
@@ -23,6 +23,7 @@ config RISCV
      select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
      select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
      select ARCH_HAS_BINFMT_FLAT
+     select ARCH_HAS_CPU_FINALIZE_INIT
      select ARCH_HAS_CURRENT_STACK_POINTER
      select ARCH_HAS_DEBUG_VIRTUAL if MMU
      select ARCH_HAS_DEBUG_VM_PGTABLE
@@ -1153,6 +1154,15 @@ endmenu # "Power management options"
 
 menu "CPU Power Management"
 
+config RISCV_ZAWRS_IDLE
+     bool "Idle thread using ZAWRS extensions"
+     depends on RISCV_ISA_ZAWRS
+     default y
+     help
+             Adds support to implement idle thread using ZAWRS extension.
+
+             If you don't know what to do here, say Y.
+
 source "drivers/cpuidle/Kconfig"
 
 source "drivers/cpufreq/Kconfig"
arch/riscv/include/asm/cpuidle.h +1 -10
index 71fdc607d4bc..94c9ecb46571 100644
@@ -10,15 +10,6 @@
 #include <asm/barrier.h>
 #include <asm/processor.h>
 
-static inline void cpu_do_idle(void)
-{
-     /*
-      * Add mb() here to ensure that all
-      * IO/MEM accesses are completed prior
-      * to entering WFI.
-      */
-     mb();
-     wait_for_interrupt();
-}
+void cpu_do_idle(void);
 
 #endif
arch/riscv/include/asm/processor.h +1 -0
index efa1b3519b23..d0dcdb7e7392 100644
@@ -12,6 +12,7 @@
 
 #include <vdso/processor.h>
 
+#include <asm/insn-def.h>
 #include <asm/ptrace.h>
 
 #define arch_get_mmap_end(addr, len, flags)                  \
@@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void)
      __asm__ __volatile__ ("wfi");
 }
 
Quoted 12 lines

arch/riscv/include/asm/processor.h static inline void wait_for_interrupt(void) · line 161

Quoted 10 lines
arch/riscv/include/asm/processor.h +10 -0
+static inline void wrs_nto(unsigned long *addr)
+{
+     int val;
+
+     __asm__ __volatile__(
+#ifdef CONFIG_64BIT
+                     "lr.d %[p], %[v]\n\t"
+#else
+                     "lr.w %[p], %[v]\n\t"
+#endif

val is always 32-bit since it's an int. We should always use lr.w.

The 'int val' is a mistake here. The val can be an unsigned long (thread_info->flags) when CONFIG_SMP is disabled. So the lr.d is necessary. I will update the declaration of val from 'int' to 'unsigned long'.

Quoted 6 lines

arch/riscv/include/asm/processor.h static inline void wait_for_interrupt(void) · line 163

Quoted 3 lines
arch/riscv/include/asm/processor.h +2 -0
+                     ZAWRS_WRS_NTO "\n\t"
+                     : [p] "=&r" (val), [v] "+A" (*addr)

What do 'p' and 'v' represent? If they are pointer and value then they're backwards. I would just spell them out [val] and [addr].

Great insight. I will refine the name here to make it more readable.

Quoted 24 lines
Quoted 24 lines
arch/riscv/include/asm/processor.h +5 -0
+                     : : "memory");
+}
+
 extern phys_addr_t dma32_phys_limit;
 
 struct device_node;
@@ -177,6 +193,8 @@ extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val);
 #define RISCV_SET_ICACHE_FLUSH_CTX(arg1, arg2)       riscv_set_icache_flush_ctx(arg1, arg2)
 extern int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread);
 
+extern void select_idle_routine(void);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_RISCV_PROCESSOR_H */
arch/riscv/kernel/cpu.c +0 -0
index f6b13e9f5e6c..97a7144fa6cd 100644
@@ -23,6 +23,11 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
      return phys_id == cpuid_to_hartid_map(cpu);
 }
 
Quoted 8 lines

arch/riscv/kernel/cpu.c bool arch_match_cpu_phys_id(int cpu, u64 phys_id) · line 29

Quoted 4 lines
arch/riscv/kernel/cpu.c +4 -0
+void __init arch_cpu_finalize_init(void)
+{
+     select_idle_routine();
+}

Is there a reason we need to do this at arch_cpu_finalize_init() time? This seems like the type of thing we have typically done at the bottom of setup_arch().

Actually, there is no special reason here. Just imitated the placement of x86. It works well too if we put it at the end of setup_arch().

Quoted 60 lines
Quoted 42 lines
arch/riscv/kernel/cpu.c +1 -0
+
 /*
  * Returns the hart ID of the given device tree node, or -ENODEV if the node
  * isn't an enabled and valid RISC-V hart node.
arch/riscv/kernel/process.c +21 -1
index e4bc61c4e58a..77769965609e 100644
@@ -15,6 +15,7 @@
 #include <linux/tick.h>
 #include <linux/ptrace.h>
 #include <linux/uaccess.h>
+#include <linux/static_call.h>
 
 #include <asm/unistd.h>
 #include <asm/processor.h>
@@ -35,11 +36,49 @@ EXPORT_SYMBOL(__stack_chk_guard);
 
 extern asmlinkage void ret_from_fork(void);
 
-void noinstr arch_cpu_idle(void)
+static __cpuidle void default_idle(void)
+{
+     /*
+      * Add mb() here to ensure that all
+      * IO/MEM accesses are completed prior
+      * to entering WFI.
+      */
+     mb();
+     wait_for_interrupt();
+}
+
+static __cpuidle void wrs_idle(void)
+{
+     /*
+      * Add mb() here to ensure that all
+      * IO/MEM accesses are completed prior
+      * to entering WRS.NTO.
+      */
+     mb();
+     wrs_nto(&current_thread_info()->flags);

arch/riscv/kernel/process.c EXPORT_SYMBOL(__stack_chk_guard); · line 68

Quoted 10 lines
arch/riscv/kernel/process.c +10 -0
+}
+
+DEFINE_STATIC_CALL_NULL(riscv_idle, default_idle);
+
+void __cpuidle cpu_do_idle(void)
+{
+     static_call(riscv_idle)();
+}
+
+void __cpuidle arch_cpu_idle(void)

Switching the section of this from '.noinstr.text' to 'cpuidle.text' should probably be a separate patch.

Quoted 4 lines
arch/riscv/kernel/process.c +0 -0
 {
      cpu_do_idle();
 }
 
Quoted 10 lines

arch/riscv/kernel/process.c EXPORT_SYMBOL(__stack_chk_guard); · line 79

Quoted 7 lines
arch/riscv/kernel/process.c +7 -0
+void __init select_idle_routine(void)
+{
+     if (IS_ENABLED(CONFIG_RISCV_ZAWRS_IDLE) &&
+                     riscv_has_extension_likely(RISCV_ISA_EXT_ZAWRS))
+             static_call_update(riscv_idle, wrs_idle);
+     else
+             static_call_update(riscv_idle, default_idle);

Do we need this 'else'? Can't we set the default at DEFINE_STATIC_CALL* time?

Yes, the 'else' branch can be canceled if we set the default idle function to 'wfi' one using DEFINE_STATIC_CALL. Just not sure which code looks better.

Quoted 12 lines
Quoted 9 lines
arch/riscv/kernel/process.c +2 -1
+}
+
 int set_unalign_ctl(struct task_struct *tsk, unsigned int val)
 {
      if (!unaligned_ctl_available())
--

2.20.1

Thanks,
drew

Best regards,

Xu Lu.

#6 lore raw

Re: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension

In reply to Xu Lu
Quoted 177 lines · Xu Lu

The Zawrs extension introduces a new instruction WRS.NTO, which will register a reservation set and causes the hart to temporarily stall execution in a low-power state until a store occurs to the reservation set or an interrupt is observed.

This commit implements new version of idle thread for RISC-V via Zawrs extension.

---
 arch/riscv/Kconfig                 | 10 ++++++++
 arch/riscv/include/asm/cpuidle.h   | 11 +-------
 arch/riscv/include/asm/processor.h | 18 +++++++++++++
 arch/riscv/kernel/cpu.c            |  5 ++++
 arch/riscv/kernel/process.c        | 41 +++++++++++++++++++++++++++++-
 5 files changed, 74 insertions(+), 11 deletions(-)
arch/riscv/Kconfig +10 -0
index 939ea7f6a228..56cf6000d286 100644
@@ -23,6 +23,7 @@ config RISCV
        select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
        select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
        select ARCH_HAS_BINFMT_FLAT
+       select ARCH_HAS_CPU_FINALIZE_INIT
        select ARCH_HAS_CURRENT_STACK_POINTER
        select ARCH_HAS_DEBUG_VIRTUAL if MMU
        select ARCH_HAS_DEBUG_VM_PGTABLE
@@ -1153,6 +1154,15 @@ endmenu # "Power management options"
 
 menu "CPU Power Management"
 
+config RISCV_ZAWRS_IDLE
+       bool "Idle thread using ZAWRS extensions"
+       depends on RISCV_ISA_ZAWRS
+       default y
+       help
+               Adds support to implement idle thread using ZAWRS extension.
+
+               If you don't know what to do here, say Y.
+
 source "drivers/cpuidle/Kconfig"
 
 source "drivers/cpufreq/Kconfig"
arch/riscv/include/asm/cpuidle.h +1 -10
index 71fdc607d4bc..94c9ecb46571 100644
@@ -10,15 +10,6 @@
 #include <asm/barrier.h>
 #include <asm/processor.h>
 
-static inline void cpu_do_idle(void)
-{
-       /*
-        * Add mb() here to ensure that all
-        * IO/MEM accesses are completed prior
-        * to entering WFI.
-        */
-       mb();
-       wait_for_interrupt();
-}
+void cpu_do_idle(void);
 
 #endif
arch/riscv/include/asm/processor.h +18 -0
index efa1b3519b23..d0dcdb7e7392 100644
@@ -12,6 +12,7 @@
 
 #include <vdso/processor.h>
 
+#include <asm/insn-def.h>
 #include <asm/ptrace.h>
 
 #define arch_get_mmap_end(addr, len, flags)                    \
@@ -148,6 +149,21 @@ static inline void wait_for_interrupt(void)
        __asm__ __volatile__ ("wfi");
 }
 
+static inline void wrs_nto(unsigned long *addr)
+{
+       int val;
+
+       __asm__ __volatile__(
+#ifdef CONFIG_64BIT
+                       "lr.d %[p], %[v]\n\t"
+#else
+                       "lr.w %[p], %[v]\n\t"
+#endif
+                       ZAWRS_WRS_NTO "\n\t"
+                       : [p] "=&r" (val), [v] "+A" (*addr)
+                       : : "memory");
+}
+
 extern phys_addr_t dma32_phys_limit;
 
 struct device_node;
@@ -177,6 +193,8 @@ extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val);
 #define RISCV_SET_ICACHE_FLUSH_CTX(arg1, arg2) riscv_set_icache_flush_ctx(arg1, arg2)
 extern int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread);
 
+extern void select_idle_routine(void);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_RISCV_PROCESSOR_H */
arch/riscv/kernel/cpu.c +5 -0
index f6b13e9f5e6c..97a7144fa6cd 100644
@@ -23,6 +23,11 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
        return phys_id == cpuid_to_hartid_map(cpu);
 }
 
+void __init arch_cpu_finalize_init(void)
+{
+       select_idle_routine();
+}
+
 /*
  * Returns the hart ID of the given device tree node, or -ENODEV if the node
  * isn't an enabled and valid RISC-V hart node.
arch/riscv/kernel/process.c +31 -1
index e4bc61c4e58a..77769965609e 100644
@@ -15,6 +15,7 @@
 #include <linux/tick.h>
 #include <linux/ptrace.h>
 #include <linux/uaccess.h>
+#include <linux/static_call.h>
 
 #include <asm/unistd.h>
 #include <asm/processor.h>
@@ -35,11 +36,49 @@ EXPORT_SYMBOL(__stack_chk_guard);
 
 extern asmlinkage void ret_from_fork(void);
 
-void noinstr arch_cpu_idle(void)
+static __cpuidle void default_idle(void)
+{
+       /*
+        * Add mb() here to ensure that all
+        * IO/MEM accesses are completed prior
+        * to entering WFI.
+        */
+       mb();
+       wait_for_interrupt();
+}
+
+static __cpuidle void wrs_idle(void)
+{
+       /*
+        * Add mb() here to ensure that all
+        * IO/MEM accesses are completed prior
+        * to entering WRS.NTO.
+        */
+       mb();
+       wrs_nto(&current_thread_info()->flags);
+}
+
+DEFINE_STATIC_CALL_NULL(riscv_idle, default_idle);
+
+void __cpuidle cpu_do_idle(void)
+{
+       static_call(riscv_idle)();
+}
+
+void __cpuidle arch_cpu_idle(void)
 {

arch/riscv/kernel/process.c EXPORT_SYMBOL(__stack_chk_guard); · line 79

Quoted 10 lines
arch/riscv/kernel/process.c +7 -0
        cpu_do_idle();
 }
 
+void __init select_idle_routine(void)
+{
+       if (IS_ENABLED(CONFIG_RISCV_ZAWRS_IDLE) &&
+                       riscv_has_extension_likely(RISCV_ISA_EXT_ZAWRS))
+               static_call_update(riscv_idle, wrs_idle);
+       else
+               static_call_update(riscv_idle, default_idle);

The hardware implementations of "WFI & WRS" are different.
- The WFI could enter a more profound power consumption-saving needed to keep IRQ alive, but the WRS doesn't.
- WRS is designed for cond_load, which needs to keep cache coherency alive.

So, we couldn't simply & statically use an extension check to choose WRS or WFI for idle.

Quoted 8 lines
arch/riscv/kernel/process.c +2 -1
+}
+
 int set_unalign_ctl(struct task_struct *tsk, unsigned int val)
 {
        if (!unaligned_ctl_available())
--

2.20.1

Signature · 2 lines
Best Regards
 Guo Ren
author
#7 lore raw

Re: [External] Re: [PATCH v3 1/2] riscv: process: Introduce idle thread using Zawrs extension

Hi Guo Ren,

Quoted 7 lines

The hardware implementations of "WFI & WRS" are different.
- The WFI could enter a more profound power consumption-saving needed to keep IRQ alive, but the WRS doesn't.
- WRS is designed for cond_load, which needs to keep cache coherency alive.

So, we couldn't simply & statically use an extension check to choose WRS or WFI for idle.

Great comment.

I think maintaining cache coherence is not a big power problem for WRS. In a naive implementation, the wrs instruction only needs to maintain a valid cache line in L1 and wake up when other cpu wants to make it invalid. This behavior won't incur too much power consumption.

And there does exist a power consumption gap if some vendors implement WFI instruction to flush and power down the entire L1/L2 cache (for example, provide CPUPWRCTLR register to control WFI behavior like ARM), while WRS can not do the same thing. Whether WFI will power down cache is not mentioned in RISC-V spec and is somehow vendor-customized (Please remind me if I missed anything). So it is hard to use a unified method to detect or control the cache power down behavior of WFI instruction. And that is why we provide a CONFIG to let the user choose whether to enable WRS IDLE or not.

Quoted 14 lines
Quoted 9 lines
arch/riscv/kernel/process.c +2 -1
+}
+
 int set_unalign_ctl(struct task_struct *tsk, unsigned int val)
 {
        if (!unaligned_ctl_available())
--

2.20.1

--
Best Regards
Guo Ren

Best Regards,

Xu Lu

author
#8 lore raw

PATCH v3 2/2 riscv: Use Zawrs to accelerate IPI to idle cpu

In reply to Xu Lu

When sending IPI to a cpu which has entered idle state using Zawrs extension, there is no need to send a physical software interrupt. Instead, we can write the IPI information to the address reserved by target cpu, which will wake it from WRS.NTO. Then the target cpu can handle the IPI directly without falling into traditional interrupt handling routine.

---
 arch/riscv/include/asm/processor.h | 14 +++++++
 arch/riscv/include/asm/smp.h       | 14 +++++++
 arch/riscv/kernel/process.c        | 65 +++++++++++++++++++++++++++++-
 arch/riscv/kernel/smp.c            | 51 ++++++++++++++++++-----
 4 files changed, 131 insertions(+), 13 deletions(-)
arch/riscv/include/asm/processor.h +14 -0
index d0dcdb7e7392..0dbc9390c3b2 100644
@@ -164,6 +164,20 @@ static inline void wrs_nto(unsigned long *addr)
 			: : "memory");
 }
 
+static inline void wrs_nto_if(int *addr, int val)
+{
+	int prev;
+
+	__asm__ __volatile__(
+			"lr.w %[p], %[a]\n\t"
+			"bne %[p], %[v], 1f\n\t"
+			ZAWRS_WRS_NTO "\n\t"
+			"1:\n\t"
+			: [p] "=&r" (prev), [a] "+A" (*addr)
+			: [v] "r" (val)
+			: "memory");
+}
+
 extern phys_addr_t dma32_phys_limit;
 
 struct device_node;
arch/riscv/include/asm/smp.h +14 -0
index 7ac80e9f2288..8f2dfbf20e89 100644
@@ -19,6 +19,20 @@ extern unsigned long boot_cpu_hartid;
 
 #include <linux/jump_label.h>
 
+enum ipi_message_type {
+	IPI_RESCHEDULE,
+	IPI_CALL_FUNC,
+	IPI_CPU_STOP,
+	IPI_CPU_CRASH_STOP,
+	IPI_IRQ_WORK,
+	IPI_TIMER,
+	IPI_MAX
+};
+
+int ipi_virq_base_get(void);
+
+irqreturn_t handle_IPI(int irq, void *data);
+
 /*
  * Mapping between linux logical cpu index and hartid.
  */
arch/riscv/kernel/process.c +63 -2

110 lines not on this page · raw message

arch/riscv/kernel/smp.c +40 -11

79 lines not on this page · raw message

Signature · 1 line
2.20.1