[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 0a2ed70a549e61c5181bad5db418d223b68ae932
WARNING: Author mismatch between patch and upstream commit:
Backport author: Nikita Zhandarovich <n.zhandarovich@xxxxxxxxxx>
Commit author: Seiji Nishikawa <snishika@xxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (different SHA1: 27c045f868f0)
6.6.y | Present (different SHA1: 68a8e45743d6)
6.1.y | Present (different SHA1: 68a599da16eb)
5.15.y | Present (different SHA1: 92e5661b7d07)
5.10.y | Not found
Note: The patch differs from the upstream commit:
---
1: 0a2ed70a549e6 ! 1: fa503f92cd35f ACPI: PAD: fix crash in exit_round_robin()
@@ Metadata
## Commit message ##
ACPI: PAD: fix crash in exit_round_robin()
+ [ Upstream commit 0a2ed70a549e61c5181bad5db418d223b68ae932 ]
+
The kernel occasionally crashes in cpumask_clear_cpu(), which is called
within exit_round_robin(), because when executing clear_bit(nr, addr) with
nr set to 0xffffffff, the address calculation may cause misalignment within
@@ Commit message
Link: https://patch.msgid.link/20240825141352.25280-1-snishika@xxxxxxxxxx
[ rjw: Subject edit, avoid updates to the same value ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
+ [ Nikita: fix conflict due to missing blank line from commit
+ c8eb628cbdd9 ("ACPI: acpi_pad: add a missed blank line after
+ declarations"). ]
+ Signed-off-by: Nikita Zhandarovich <n.zhandarovich@xxxxxxxxxx>
## drivers/acpi/acpi_pad.c ##
-@@ drivers/acpi/acpi_pad.c: static void exit_round_robin(unsigned int tsk_index)
+@@ drivers/acpi/acpi_pad.c: static void round_robin_cpu(unsigned int tsk_index)
+ static void exit_round_robin(unsigned int tsk_index)
{
struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
-
- cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
- tsk_in_cpu[tsk_index] = -1;
++
+ if (tsk_in_cpu[tsk_index] != -1) {
+ cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
+ tsk_in_cpu[tsk_index] = -1;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
