Skip to contentSkip to conversation

xtensa: patch_text: Fixup last cpu should be master

PATCH Superseded [email protected] 2 participants 3 messages Apr 6, 2022 – Apr 7, 2022

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 xtensa: patch_text: Fixup last cpu should be master

From: Guo Ren <[email protected]>

These patch_text implementations are using stop_machine_cpuslocked infrastructure with atomic cpu_count. The original idea: When the master CPU patch_text, the others should wait for it. But current implementation is using the first CPU as master, which couldn't guarantee the remaining CPUs are waiting. This patch changes the last CPU as the master to solve the potential risk.

---
 arch/xtensa/kernel/jump_label.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/jump_label.c +1 -1
index 0dde21e0d3de..ad1841cecdfb 100644
@@ -40,7 +40,7 @@ static int patch_text_stop_machine(void *data)
 {
 	struct patch *patch = data;
 
-	if (atomic_inc_return(&patch->cpu_count) == 1) {
+	if (atomic_inc_return(&patch->cpu_count) == num_online_cpus()) {
 		local_patch_text(patch->addr, patch->data, patch->sz);
 		atomic_inc(&patch->cpu_count);
 	} else {
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 10 lines · On Wed, Apr 6, 2022 at 7:28 AM <[email protected]> wrote:

From: Guo Ren <[email protected]>

These patch_text implementations are using stop_machine_cpuslocked infrastructure with atomic cpu_count. The original idea: When the master CPU patch_text, the others should wait for it. But current implementation is using the first CPU as master, which couldn't guarantee the remaining CPUs are waiting. This patch changes the last CPU as the master to solve the potential risk.

Quoted 8 lines
---
 arch/xtensa/kernel/jump_label.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks. Applied to my xtensa tree.

-- Max

author
#2 lore raw
Quoted 21 lines · Max Filippov
Quoted 10 lines · On Wed, Apr 6, 2022 at 7:28 AM <[email protected]> wrote:

From: Guo Ren <[email protected]>

These patch_text implementations are using stop_machine_cpuslocked infrastructure with atomic cpu_count. The original idea: When the master CPU patch_text, the others should wait for it. But current implementation is using the first CPU as master, which couldn't guarantee the remaining CPUs are waiting. This patch changes the last CPU as the master to solve the potential risk.

Quoted 8 lines
---
 arch/xtensa/kernel/jump_label.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 1 line

Thanks. Applied to my xtensa tree.

I've missed the "Fixes:" for [email protected], so I would update v3 to fix it.

Quoted 2 lines

-- Max

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/