[PATCH next] rcu: Unlock correctly in rcu_dump_cpu_stacks()

Dan Carpenter posted 1 patch 1 month ago
kernel/rcu/tree_stall.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH next] rcu: Unlock correctly in rcu_dump_cpu_stacks()
Posted by Dan Carpenter 1 month ago
The unlock needs to be outside the } close curly braces for this if
statement.  Otherwise it leads to a deadlock.

Fixes: 744e87210b1a ("rcu: Finer-grained grace-period-end checks in rcu_dump_cpu_stacks()")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 kernel/rcu/tree_stall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h
index 8994391b95c7..925fcdad5dea 100644
--- a/kernel/rcu/tree_stall.h
+++ b/kernel/rcu/tree_stall.h
@@ -357,8 +357,8 @@ static void rcu_dump_cpu_stacks(unsigned long gp_seq)
 					pr_err("Offline CPU %d blocking current GP.\n", cpu);
 				else
 					dump_cpu_task(cpu);
-			raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
 			}
+			raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
 		}
 		printk_deferred_exit();
 	}
-- 
2.45.2
Re: [PATCH next] rcu: Unlock correctly in rcu_dump_cpu_stacks()
Posted by Paul E. McKenney 1 month ago
On Fri, Oct 25, 2024 at 10:06:43AM +0300, Dan Carpenter wrote:
> The unlock needs to be outside the } close curly braces for this if
> statement.  Otherwise it leads to a deadlock.
> 
> Fixes: 744e87210b1a ("rcu: Finer-grained grace-period-end checks in rcu_dump_cpu_stacks()")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>

Good catch!

Reviewed-by: Paul E. McKenney <paulmck@kernel.org>

This is a regression from this past merge window, if I am keeping track.
So it is a candidate for going in before the next merge window opens.

							Thanx, Paul

> ---
>  kernel/rcu/tree_stall.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h
> index 8994391b95c7..925fcdad5dea 100644
> --- a/kernel/rcu/tree_stall.h
> +++ b/kernel/rcu/tree_stall.h
> @@ -357,8 +357,8 @@ static void rcu_dump_cpu_stacks(unsigned long gp_seq)
>  					pr_err("Offline CPU %d blocking current GP.\n", cpu);
>  				else
>  					dump_cpu_task(cpu);
> -			raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
>  			}
> +			raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
>  		}
>  		printk_deferred_exit();
>  	}
> -- 
> 2.45.2
>