]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 17:14:58 +0000 (19:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 17:14:58 +0000 (19:14 +0200)
added patches:
acpi-processor-perflib-fix-initial-_ppc-limit-application.patch
acpi-processor-perflib-move-problematic-pr-performance-check.patch
block-make-req_op_zone_finish-a-write-operation.patch
mm-memory-tier-fix-abstract-distance-calculation-overflow.patch

queue-6.12/acpi-processor-perflib-fix-initial-_ppc-limit-application.patch [new file with mode: 0644]
queue-6.12/acpi-processor-perflib-move-problematic-pr-performance-check.patch [new file with mode: 0644]
queue-6.12/block-make-req_op_zone_finish-a-write-operation.patch [new file with mode: 0644]
queue-6.12/mm-memory-tier-fix-abstract-distance-calculation-overflow.patch [new file with mode: 0644]
queue-6.12/series

diff --git a/queue-6.12/acpi-processor-perflib-fix-initial-_ppc-limit-application.patch b/queue-6.12/acpi-processor-perflib-fix-initial-_ppc-limit-application.patch
new file mode 100644 (file)
index 0000000..926b990
--- /dev/null
@@ -0,0 +1,80 @@
+From d33bd88ac0ebb49e7f7c8f29a8c7ee9eae85d765 Mon Sep 17 00:00:00 2001
+From: Jiayi Li <lijiayi@kylinos.cn>
+Date: Mon, 21 Jul 2025 11:26:06 +0800
+Subject: ACPI: processor: perflib: Fix initial _PPC limit application
+
+From: Jiayi Li <lijiayi@kylinos.cn>
+
+commit d33bd88ac0ebb49e7f7c8f29a8c7ee9eae85d765 upstream.
+
+If the BIOS sets a _PPC frequency limit upfront, it will fail to take
+effect due to a call ordering issue.  Namely, freq_qos_update_request()
+is called before freq_qos_add_request() for the given request causing
+the constraint update to be ignored.  The call sequence in question is
+as follows:
+
+cpufreq_policy_online()
+  acpi_cpufreq_cpu_init()
+    acpi_processor_register_performance()
+      acpi_processor_get_performance_info()
+        acpi_processor_get_platform_limit()
+         freq_qos_update_request(&perflib_req) <- inactive QoS request
+  blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                               CPUFREQ_CREATE_POLICY)
+    acpi_processor_notifier()
+      acpi_processor_ppc_init()
+        freq_qos_add_request(&perflib_req) <- QoS request activation
+
+Address this by adding an acpi_processor_get_platform_limit() call
+to acpi_processor_ppc_init(), after the perflib_req activation via
+freq_qos_add_request(), which causes the initial _PPC limit to be
+picked up as appropriate.  However, also ensure that the _PPC limit
+will not be picked up in the cases when the cpufreq driver does not
+call acpi_processor_register_performance() by adding a pr->performance
+check to the related_cpus loop in acpi_processor_ppc_init().
+
+Fixes: d15ce412737a ("ACPI: cpufreq: Switch to QoS requests instead of cpufreq notifier")
+Signed-off-by: Jiayi Li <lijiayi@kylinos.cn>
+Link: https://patch.msgid.link/20250721032606.3459369-1-lijiayi@kylinos.cn
+[ rjw: Consolidate pr-related checks in acpi_processor_ppc_init() ]
+[ rjw: Subject and changelog adjustments ]
+Cc: 5.4+ <stable@vger.kernel.org> # 5.4+: 2d8b39a62a5d ACPI: processor: Avoid NULL pointer dereferences at init time
+Cc: 5.4+ <stable@vger.kernel.org> # 5.4+: 3000ce3c52f8 cpufreq: Use per-policy frequency QoS
+Cc: 5.4+ <stable@vger.kernel.org> # 5.4+: a1bb46c36ce3 ACPI: processor: Add QoS requests for all CPUs
+Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/acpi/processor_perflib.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/drivers/acpi/processor_perflib.c
++++ b/drivers/acpi/processor_perflib.c
+@@ -174,11 +174,14 @@ void acpi_processor_ppc_init(struct cpuf
+ {
+       unsigned int cpu;
++      if (ignore_ppc == 1)
++              return;
++
+       for_each_cpu(cpu, policy->related_cpus) {
+               struct acpi_processor *pr = per_cpu(processors, cpu);
+               int ret;
+-              if (!pr)
++              if (!pr || !pr->performance)
+                       continue;
+               /*
+@@ -194,6 +197,11 @@ void acpi_processor_ppc_init(struct cpuf
+               if (ret < 0)
+                       pr_err("Failed to add freq constraint for CPU%d (%d)\n",
+                              cpu, ret);
++
++              ret = acpi_processor_get_platform_limit(pr);
++              if (ret)
++                      pr_err("Failed to update freq constraint for CPU%d (%d)\n",
++                             cpu, ret);
+       }
+ }
diff --git a/queue-6.12/acpi-processor-perflib-move-problematic-pr-performance-check.patch b/queue-6.12/acpi-processor-perflib-move-problematic-pr-performance-check.patch
new file mode 100644 (file)
index 0000000..b14bb09
--- /dev/null
@@ -0,0 +1,55 @@
+From d405ec23df13e6df599f5bd965a55d13420366b8 Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Tue, 12 Aug 2025 14:57:06 +0200
+Subject: ACPI: processor: perflib: Move problematic pr->performance check
+
+From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+
+commit d405ec23df13e6df599f5bd965a55d13420366b8 upstream.
+
+Commit d33bd88ac0eb ("ACPI: processor: perflib: Fix initial _PPC limit
+application") added a pr->performance check that prevents the frequency
+QoS request from being added when the given processor has no performance
+object.  Unfortunately, this causes a WARN() in freq_qos_remove_request()
+to trigger on an attempt to take the given CPU offline later because the
+frequency QoS object has not been added for it due to the missing
+performance object.
+
+Address this by moving the pr->performance check before calling
+acpi_processor_get_platform_limit() so it only prevents a limit from
+being set for the CPU if the performance object is not present.  This
+way, the frequency QoS request is added as it was before the above
+commit and it is present all the time along with the CPU's cpufreq
+policy regardless of whether or not the CPU is online.
+
+Fixes: d33bd88ac0eb ("ACPI: processor: perflib: Fix initial _PPC limit application")
+Tested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Link: https://patch.msgid.link/2801421.mvXUDI8C0e@rafael.j.wysocki
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/acpi/processor_perflib.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/acpi/processor_perflib.c
++++ b/drivers/acpi/processor_perflib.c
+@@ -181,7 +181,7 @@ void acpi_processor_ppc_init(struct cpuf
+               struct acpi_processor *pr = per_cpu(processors, cpu);
+               int ret;
+-              if (!pr || !pr->performance)
++              if (!pr)
+                       continue;
+               /*
+@@ -198,6 +198,9 @@ void acpi_processor_ppc_init(struct cpuf
+                       pr_err("Failed to add freq constraint for CPU%d (%d)\n",
+                              cpu, ret);
++              if (!pr->performance)
++                      continue;
++
+               ret = acpi_processor_get_platform_limit(pr);
+               if (ret)
+                       pr_err("Failed to update freq constraint for CPU%d (%d)\n",
diff --git a/queue-6.12/block-make-req_op_zone_finish-a-write-operation.patch b/queue-6.12/block-make-req_op_zone_finish-a-write-operation.patch
new file mode 100644 (file)
index 0000000..a33f3ea
--- /dev/null
@@ -0,0 +1,49 @@
+From 3f66ccbaaef3a0c5bd844eab04e3207b4061c546 Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <dlemoal@kernel.org>
+Date: Wed, 25 Jun 2025 18:33:23 +0900
+Subject: block: Make REQ_OP_ZONE_FINISH a write operation
+
+From: Damien Le Moal <dlemoal@kernel.org>
+
+commit 3f66ccbaaef3a0c5bd844eab04e3207b4061c546 upstream.
+
+REQ_OP_ZONE_FINISH is defined as "12", which makes
+op_is_write(REQ_OP_ZONE_FINISH) return false, despite the fact that a
+zone finish operation is an operation that modifies a zone (transition
+it to full) and so should be considered as a write operation (albeit
+one that does not transfer any data to the device).
+
+Fix this by redefining REQ_OP_ZONE_FINISH to be an odd number (13), and
+redefine REQ_OP_ZONE_RESET and REQ_OP_ZONE_RESET_ALL using sequential
+odd numbers from that new value.
+
+Fixes: 6c1b1da58f8c ("block: add zone open, close and finish operations")
+Cc: stable@vger.kernel.org
+Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
+Reviewed-by: Bart Van Assche <bvanassche@acm.org>
+Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Link: https://lore.kernel.org/r/20250625093327.548866-2-dlemoal@kernel.org
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/blk_types.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/linux/blk_types.h
++++ b/include/linux/blk_types.h
+@@ -342,11 +342,11 @@ enum req_op {
+       /* Close a zone */
+       REQ_OP_ZONE_CLOSE       = (__force blk_opf_t)11,
+       /* Transition a zone to full */
+-      REQ_OP_ZONE_FINISH      = (__force blk_opf_t)12,
++      REQ_OP_ZONE_FINISH      = (__force blk_opf_t)13,
+       /* reset a zone write pointer */
+-      REQ_OP_ZONE_RESET       = (__force blk_opf_t)13,
++      REQ_OP_ZONE_RESET       = (__force blk_opf_t)15,
+       /* reset all the zone present on the device */
+-      REQ_OP_ZONE_RESET_ALL   = (__force blk_opf_t)15,
++      REQ_OP_ZONE_RESET_ALL   = (__force blk_opf_t)17,
+       /* Driver private requests */
+       REQ_OP_DRV_IN           = (__force blk_opf_t)34,
diff --git a/queue-6.12/mm-memory-tier-fix-abstract-distance-calculation-overflow.patch b/queue-6.12/mm-memory-tier-fix-abstract-distance-calculation-overflow.patch
new file mode 100644 (file)
index 0000000..3ab13a3
--- /dev/null
@@ -0,0 +1,65 @@
+From cce35103135c7ffc7bebc32ebfc74fe1f2c3cb5d Mon Sep 17 00:00:00 2001
+From: Li Zhijian <lizhijian@fujitsu.com>
+Date: Tue, 10 Jun 2025 14:27:51 +0800
+Subject: mm/memory-tier: fix abstract distance calculation overflow
+
+From: Li Zhijian <lizhijian@fujitsu.com>
+
+commit cce35103135c7ffc7bebc32ebfc74fe1f2c3cb5d upstream.
+
+In mt_perf_to_adistance(), the calculation of abstract distance (adist)
+involves multiplying several int values including
+MEMTIER_ADISTANCE_DRAM.
+
+*adist = MEMTIER_ADISTANCE_DRAM *
+               (perf->read_latency + perf->write_latency) /
+               (default_dram_perf.read_latency + default_dram_perf.write_latency) *
+               (default_dram_perf.read_bandwidth + default_dram_perf.write_bandwidth) /
+               (perf->read_bandwidth + perf->write_bandwidth);
+
+Since these values can be large, the multiplication may exceed the
+maximum value of an int (INT_MAX) and overflow (Our platform did),
+leading to an incorrect adist.
+
+User-visible impact:
+The memory tiering subsystem will misinterpret slow memory (like CXL)
+as faster than DRAM, causing inappropriate demotion of pages from
+CXL (slow memory) to DRAM (fast memory).
+
+For example, we will see the following demotion chains from the dmesg, where
+Node0,1 are DRAM, and Node2,3 are CXL node:
+ Demotion targets for Node 0: null
+ Demotion targets for Node 1: null
+ Demotion targets for Node 2: preferred: 0-1, fallback: 0-1
+ Demotion targets for Node 3: preferred: 0-1, fallback: 0-1
+
+Change MEMTIER_ADISTANCE_DRAM to be a long constant by writing it with
+the 'L' suffix.  This prevents the overflow because the multiplication
+will then be done in the long type which has a larger range.
+
+Link: https://lkml.kernel.org/r/20250611023439.2845785-1-lizhijian@fujitsu.com
+Link: https://lkml.kernel.org/r/20250610062751.2365436-1-lizhijian@fujitsu.com
+Fixes: 3718c02dbd4c ("acpi, hmat: calculate abstract distance with HMAT")
+Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
+Reviewed-by: Huang Ying <ying.huang@linux.alibaba.com>
+Acked-by: Balbir Singh <balbirs@nvidia.com>
+Reviewed-by: Donet Tom <donettom@linux.ibm.com>
+Reviewed-by: Oscar Salvador <osalvador@suse.de>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/memory-tiers.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/memory-tiers.h
++++ b/include/linux/memory-tiers.h
+@@ -18,7 +18,7 @@
+  * adistance value (slightly faster) than default DRAM adistance to be part of
+  * the same memory tier.
+  */
+-#define MEMTIER_ADISTANCE_DRAM        ((4 * MEMTIER_CHUNK_SIZE) + (MEMTIER_CHUNK_SIZE >> 1))
++#define MEMTIER_ADISTANCE_DRAM        ((4L * MEMTIER_CHUNK_SIZE) + (MEMTIER_CHUNK_SIZE >> 1))
+ struct memory_tier;
+ struct memory_dev_type {
index eb65c6a203f5b901e25c50204263398ed7bc0ade..61295a552b47e64e70299a784794ff2dd5c49864 100644 (file)
@@ -36,3 +36,7 @@ fscrypt-don-t-use-problematic-non-inline-crypto-engines.patch
 fs-prevent-file-descriptor-table-allocations-exceeding-int_max.patch
 eventpoll-fix-semi-unbounded-recursion.patch
 documentation-acpi-fix-parent-device-references.patch
+acpi-processor-perflib-fix-initial-_ppc-limit-application.patch
+acpi-processor-perflib-move-problematic-pr-performance-check.patch
+block-make-req_op_zone_finish-a-write-operation.patch
+mm-memory-tier-fix-abstract-distance-calculation-overflow.patch