[v2] genirq: Cleanups and conversion to lock guards

[patch V2 09/45] genirq/cpuhotplug: Convert to lock guards

Posted by Thomas Gleixner 7 months, 3 weeks ago

Convert all lock/unlock pairs to guards and tidy up the code.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 kernel/irq/cpuhotplug.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--- a/kernel/irq/cpuhotplug.c
+++ b/kernel/irq/cpuhotplug.c
@@ -177,9 +177,8 @@ void irq_migrate_all_off_this_cpu(void)
 		bool affinity_broken;
 
 		desc = irq_to_desc(irq);
-		raw_spin_lock(&desc->lock);
-		affinity_broken = migrate_one_irq(desc);
-		raw_spin_unlock(&desc->lock);
+		scoped_guard(raw_spinlock, &desc->lock)
+			affinity_broken = migrate_one_irq(desc);
 
 		if (affinity_broken) {
 			pr_debug_ratelimited("IRQ %u: no longer affine to CPU%u\n",
@@ -244,9 +243,8 @@ int irq_affinity_online_cpu(unsigned int
 	irq_lock_sparse();
 	for_each_active_irq(irq) {
 		desc = irq_to_desc(irq);
-		raw_spin_lock_irq(&desc->lock);
-		irq_restore_affinity_of_irq(desc, cpu);
-		raw_spin_unlock_irq(&desc->lock);
+		scoped_guard(raw_spinlock, &desc->lock)
+			irq_restore_affinity_of_irq(desc, cpu);
 	}
 	irq_unlock_sparse();

Re: [patch V2 09/45] genirq/cpuhotplug: Convert to lock guards

Posted by Marek Szyprowski 7 months, 1 week ago

Hi Thomas,

On 29.04.2025 08:55, Thomas Gleixner wrote:
> Convert all lock/unlock pairs to guards and tidy up the code.
>
> No functional change.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>
> ---
>   kernel/irq/cpuhotplug.c |   10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
>
> --- a/kernel/irq/cpuhotplug.c
> +++ b/kernel/irq/cpuhotplug.c
> @@ -177,9 +177,8 @@ void irq_migrate_all_off_this_cpu(void)
>   		bool affinity_broken;
>   
>   		desc = irq_to_desc(irq);
> -		raw_spin_lock(&desc->lock);
> -		affinity_broken = migrate_one_irq(desc);
> -		raw_spin_unlock(&desc->lock);
> +		scoped_guard(raw_spinlock, &desc->lock)
> +			affinity_broken = migrate_one_irq(desc);
>   
>   		if (affinity_broken) {
>   			pr_debug_ratelimited("IRQ %u: no longer affine to CPU%u\n",
> @@ -244,9 +243,8 @@ int irq_affinity_online_cpu(unsigned int
>   	irq_lock_sparse();
>   	for_each_active_irq(irq) {
>   		desc = irq_to_desc(irq);
> -		raw_spin_lock_irq(&desc->lock);
> -		irq_restore_affinity_of_irq(desc, cpu);
> -		raw_spin_unlock_irq(&desc->lock);
> +		scoped_guard(raw_spinlock, &desc->lock)

The above should be "scoped_guard(raw_spinlock_irq, &desc->lock)", otherwise the cpu hotplug is broken as in today's linux-next.


> +			irq_restore_affinity_of_irq(desc, cpu);
>   	}
>   	irq_unlock_sparse();
>   
>
>
>
>
Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [patch V2 09/45] genirq/cpuhotplug: Convert to lock guards

Posted by Thomas Gleixner 7 months, 1 week ago

On Thu, May 08 2025 at 16:56, Marek Szyprowski wrote:
>>   	irq_lock_sparse();
>>   	for_each_active_irq(irq) {
>>   		desc = irq_to_desc(irq);
>> -		raw_spin_lock_irq(&desc->lock);
>> -		irq_restore_affinity_of_irq(desc, cpu);
>> -		raw_spin_unlock_irq(&desc->lock);
>> +		scoped_guard(raw_spinlock, &desc->lock)
>
> The above should be "scoped_guard(raw_spinlock_irq, &desc->lock)", otherwise the cpu hotplug is broken as in today's linux-next.

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=irq/core&id=c855506257063f444044d0a85a2e9ad9ab1c7ecd

[tip: irq/core] genirq/cpuhotplug: Convert to lock guards

Posted by tip-bot2 for Thomas Gleixner 7 months, 2 weeks ago

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     88a4df117ad66100d0f870aa02032dfb9cb29179
Gitweb:        https://git.kernel.org/tip/88a4df117ad66100d0f870aa02032dfb9cb29179
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Tue, 29 Apr 2025 08:55:01 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 07 May 2025 09:08:12 +02:00

genirq/cpuhotplug: Convert to lock guards

Convert all lock/unlock pairs to guards and tidy up the code.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/all/20250429065420.560083665@linutronix.de


---
 kernel/irq/cpuhotplug.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c
index 15a7654..7bd4c2a 100644
--- a/kernel/irq/cpuhotplug.c
+++ b/kernel/irq/cpuhotplug.c
@@ -177,9 +177,8 @@ void irq_migrate_all_off_this_cpu(void)
 		bool affinity_broken;
 
 		desc = irq_to_desc(irq);
-		raw_spin_lock(&desc->lock);
-		affinity_broken = migrate_one_irq(desc);
-		raw_spin_unlock(&desc->lock);
+		scoped_guard(raw_spinlock, &desc->lock)
+			affinity_broken = migrate_one_irq(desc);
 
 		if (affinity_broken) {
 			pr_debug_ratelimited("IRQ %u: no longer affine to CPU%u\n",
@@ -244,9 +243,8 @@ int irq_affinity_online_cpu(unsigned int cpu)
 	irq_lock_sparse();
 	for_each_active_irq(irq) {
 		desc = irq_to_desc(irq);
-		raw_spin_lock_irq(&desc->lock);
-		irq_restore_affinity_of_irq(desc, cpu);
-		raw_spin_unlock_irq(&desc->lock);
+		scoped_guard(raw_spinlock, &desc->lock)
+			irq_restore_affinity_of_irq(desc, cpu);
 	}
 	irq_unlock_sparse();